improve registerWebsocket

josStorer · josStorer · commit e6e12a84e93a · 2024-03-24T16:02:47.000+08:00
diff --git a/src/services/apis/chatgpt-web.mjs b/src/services/apis/chatgpt-web.mjs
@@ -127,8 +127,13 @@ export async function registerWebsocket(accessToken) {
   const response = JSON.parse(
     (await request(accessToken, 'POST', '/register-websocket')).responseText,
   )
+  let resolve
   if (response.wss_url) {
     websocket = new WebSocket(response.wss_url)
+    websocket.onopen = () => {
+      console.debug('global websocket opened')
+      resolve()
+    }
     websocket.onclose = () => {
       websocket = null
       expires_at = null
@@ -139,6 +144,7 @@ export async function registerWebsocket(accessToken) {
     }
     expires_at = new Date(response.expires_at)
   }
+  return new Promise((r) => (resolve = r))
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,13 @@ export async function registerWebsocket(accessToken) {`
`127`	`127`	`const response = JSON.parse(`
`128`	`128`	`(await request(accessToken, 'POST', '/register-websocket')).responseText,`
`129`	`129`	`)`
	`130`	`+ let resolve`
`130`	`131`	`if (response.wss_url) {`
`131`	`132`	`websocket = new WebSocket(response.wss_url)`
	`133`	`+ websocket.onopen = () => {`
	`134`	`+ console.debug('global websocket opened')`
	`135`	`+ resolve()`
	`136`	`+ }`
`132`	`137`	`websocket.onclose = () => {`
`133`	`138`	`websocket = null`
`134`	`139`	`expires_at = null`
`@@ -139,6 +144,7 @@ export async function registerWebsocket(accessToken) {`
`139`	`144`	`}`
`140`	`145`	`expires_at = new Date(response.expires_at)`
`141`	`146`	`}`
	`147`	`+ return new Promise((r) => (resolve = r))`
`142`	`148`	`}`
`143`	`149`
`144`	`150`	`/**`