@mixd-id/web-scaffold 0.1.230406276 → 0.1.230406278

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mixd-id/web-scaffold",
   "private": false,
-  "version": "0.1.230406276",
+  "version": "0.1.230406278",
   "scripts": {
     "dev": "vite serve",
     "build": "vite build",

package/src/utils/wss.js

@@ -138,11 +138,14 @@ class WSS extends EventEmitter2{
           return socket.close(1002, e.message);
         }
 
-        const { _requestId, path, params, pong } = obj
+        const { _requestId, path, params, ping, pong } = obj
 
         if(pong){
           delete socket.pinging
         }
+        else if(ping){
+          socket.send(await this.toBinaryData({ pong: 1 }))
+        }
         else{
           let status = 200
           let data
@@ -194,20 +197,22 @@ class WSS extends EventEmitter2{
         return socket.close(1002, e.message);
       }
 
-      const ping = async() => {
-        socket.send(await this.toBinaryData({ ping:1 }))
-        socket.pinging = true
-
-        setTimeout(() => {
-          if(socket.pinging){
-            socket.close(1002, 'ping timeout')
-          }
-          else{
-            setTimeout(ping, (Math.round(Math.random() * 10) % 5) * 5000)
-          }
-        }, 3000)
+      if(this._opt.ping !== false){
+        const ping = async() => {
+          socket.send(await this.toBinaryData({ ping:1 }))
+          socket.pinging = true
+
+          setTimeout(() => {
+            if(socket.pinging){
+              socket.close(1002, 'ping timeout')
+            }
+            else{
+              setTimeout(ping, (Math.round(Math.random() * 10) % 5) * 5000)
+            }
+          }, 3000)
+        }
+        setTimeout(ping, (Math.round(Math.random() * 10) % 5) * 5000)
       }
-      setTimeout(ping, (Math.round(Math.random() * 10) % 5) * 5000)
     })
   }
 

package/src/utils/wss.mjs

@@ -45,6 +45,7 @@ class WSS extends EventEmitter2{
   _counter = 0
   _callbacks = {}
   _pendingSend = []
+  _pinging = false
 
   constructor(opt) {
     super();
@@ -58,6 +59,20 @@ class WSS extends EventEmitter2{
     }, opt ?? {})
 
     this.connect().then()
+
+    if(typeof window !== 'undefined'){
+      window.addEventListener('visibilitychange', () => {
+        if(document.visibilityState === 'visible'){
+          console.log('visibilitychange', this._instance.readyState)
+          this.emit('visibilitychange', this._instance.readyState, [])
+
+          this.ping().catch(e => {
+            console.log('ping error', e)
+            this.reconnect().then()
+          })
+        }
+      })
+    }
   }
 
   async fromBinaryData(binaryData){
@@ -87,17 +102,18 @@ class WSS extends EventEmitter2{
 
       const obj = await this.fromBinaryData(event.data);
 
-      const { _requestId, status, data, auth, ping } = obj
+      const { _requestId, status, data, auth, ping, pong } = obj
 
       if(ping){
         this._instance.send(await this.toBinaryData({ pong:1 }))
       }
+      else if(pong){
+        this._pinging = false
+      }
       else if(auth){
         this._instance.isAuth = auth
 
-        reconnect ? this.emit('connect', true, []) : this.emit('connect', false, [])
-
-        console.log('pendingSend', this._pendingSend)
+        this.emit('connect', reconnect, [])
 
         for(let sendParams of this._pendingSend){
           this.sendSync(sendParams.path, sendParams.params, sendParams.cb, sendParams.err)
@@ -143,6 +159,9 @@ class WSS extends EventEmitter2{
           this.emit('connect_error', e, [])
           break
 
+        case 1005:
+          break
+
         default:
           this.emit('disconnect', null, [])
           break
@@ -162,7 +181,6 @@ class WSS extends EventEmitter2{
 
   sendSync(path, params, cb, err, override){
     if(this._instance.readyState > 1){
-      console.log('unable to send, ready state not 1', this._instance.readyState)
       return
     }
     else if(!this._instance.isAuth){
@@ -195,14 +213,12 @@ class WSS extends EventEmitter2{
           t1: new Date().getTime()
         }
 
-        /*setTimeout(() => {
+        setTimeout(() => {
           if(this._callbacks[_requestId]){
             err({ message: 'Timeout' })
             delete this._callbacks[_requestId]
-
-            this.reconnect()
           }
-        }, (override ?? {}).timeout ?? this._opt.timeout)*/
+        }, (override ?? {}).timeout ?? this._opt.timeout)
       })
   }
 
@@ -212,6 +228,45 @@ class WSS extends EventEmitter2{
     })
   }
 
+  get readyState(){
+    const state = (this._instance ?? {}).readyState
+
+    if(state === 1 && !this._instance.isAuth){
+      return 0
+    }
+    if(!this._instance.isAuth)
+      return 0
+    return (this._instance ?? {}).readyState
+  }
+
+  async ping(timeout = 3000){
+    return new Promise(async (resolve, reject) => {
+
+      this._pinging = true
+      this._instance.send(await this.toBinaryData({ ping:1 }))
+
+      const t1 = new Date().getTime()
+
+      const pingCheck = () => {
+        if(!this._pinging){
+          resolve()
+        }
+        else{
+          const t2 = new Date().getTime()
+
+          if(t2 - t1 > timeout){
+            reject({ message: 'Ping timeout' })
+          }
+          else{
+            setTimeout(pingCheck, 100)
+          }
+        }
+      }
+
+      setTimeout(pingCheck, 100)
+    })
+  }
+
 }
 
 export {