wspromisify 2.9.0 → 2.9.1

package/package.json

@@ -41,7 +41,7 @@
     "prod": "npm run gentypes && npm run prod:es && npm run prod:cjs",
     "all": "npm run dev && npm run prod"
   },
-  "version": "2.9.0",
+  "version": "2.9.1",
   "type": "module",
   "exports": {
     ".": {

package/src/WSC.ts

@@ -10,6 +10,7 @@ const zipnum = new Zipnum()
 const callit = callWith([])
 const isNumber = both(typeIs('Number'), notf(isNaN))
 const ping_send_opts: wsc.SendOptions = {_is_ping: true}
+const clearTO = (to: NodeJS.Timeout|null) => to && clearTimeout(to)
 
 type EventHandler<T extends keyof WebSocketEventMap> = AnyFunc<any, [WebSocketEventMap[T]]>
 type EventHandlers = {
@@ -284,7 +285,7 @@ class WebSocketClient {
         data_type: config.data_type,
         sent_time: config.timer ? Date.now() : null,
         ff(x: any) {
-          clearTimeout(to)
+          clearTO(to)
           ff(x)
         }
       }
@@ -301,16 +302,15 @@ class WebSocketClient {
     queue[message_id] = {
       msg,
       ff: (msg: ResponseDataType&{done?: boolean}) => {
-        if(to) {clearTimeout(to); to=null}
-        if(msg?.done) { cleanup(); done=true }
         fulfill(msg)
+        if(msg?.done) { cleanup(); done=true }
       },
       data_type: config.data_type,
       sent_time: config.timer ? Date.now() : null
     }
     while(!done) yield await new Promise<ResponseDataType>((ff, rj) => {
-      to = timeout(rj), fulfill=ff
-    })
+      clearTO(to), to=timeout(rj), fulfill=ff
+    }).finally(() => {clearTO(to), to=null})
   }
 
   // TODO: Add .on handlers to config!

package/test/specs/stream-real.ts

@@ -26,9 +26,7 @@ test('stream-real', timeout(1.5e4, () => new Promise<void>(async (ff, rj) => {
       const stream = ws.stream<typeof streamMsg, any>(streamMsg)
       const chunks: any[] = []
 
-      for await (const chunk of stream) {
-        chunks.push(chunk)
-      }
+      for await (const chunk of stream) chunks.push(chunk)
 
       clearTimeout(to)