@mixd-id/web-scaffold 0.1.230406263 → 0.1.230406265

package/package.json

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

package/src/utils/wss.js

@@ -128,6 +128,7 @@ class WSS extends EventEmitter2{
       }
 
       socket.on('message', async (binaryData) => {
+        console.log('message#1', socket.isAuth)
         if(!socket.isAuth) return
 
         let obj

package/src/utils/wss.mjs

@@ -45,7 +45,6 @@ class WSS extends EventEmitter2{
   _counter = 0
   _callbacks = {}
   _pendingSend = []
-  _lastBlurAt
 
   constructor(opt) {
     super();
@@ -58,40 +57,9 @@ class WSS extends EventEmitter2{
       url: '',
     }, opt ?? {})
 
-    /*if(typeof window !== 'undefined'){
-      window.addEventListener('online', this._onOnlineChanged)
-      window.addEventListener('offline', this._onOnlineChanged)
-      window.addEventListener('blur', this._onBlur)
-      window.addEventListener('focus', this._onFocus)
-    }*/
-
     this.connect().then()
   }
 
-  _onBlur = () => {
-    this._lastBlurAt = new Date().getTime()
-  }
-
-  _onFocus = () => {
-    this.emit('window', 'focus', [])
-
-    if(this._lastBlurAt){
-      this.send('ping', {}, { timeout:1000 })
-        .catch(_ => {
-          this.reconnect().then()
-        })
-    }
-  }
-
-  _onOnlineChanged = (e) => {
-    if(!navigator.onLine){
-      this.emit('disconnect', e, [])
-    }
-    else{
-      this.emit('connect', null, [])
-    }
-  }
-
   async fromBinaryData(binaryData){
     const encryptedString = new TextDecoder().decode(binaryData)
     const decryptedData = this._opt.key ?
@@ -119,6 +87,8 @@ class WSS extends EventEmitter2{
       const { _requestId, status, data, auth } = obj
 
       if(auth){
+        this._instance.isAuth = auth
+
         reconnect ? this.emit('reconnect', null, []) : this.emit('connect', null, [])
 
         for(let sendParams of this._pendingSend){
@@ -181,13 +151,13 @@ class WSS extends EventEmitter2{
   }
 
   sendSync(path, params, cb, err, override){
-
-    if(this._instance.readyState === 0){
-      this._pendingSend.push({ path, params, cb, err })
+    if(this._instance.readyState > 1){
+      console.log('unable to send, ready state not 1', this._instance.readyState)
       return
     }
-    else if(this._instance.readyState !== 1){
-      console.log('unable to send, ready state not 1', this._instance.readyState)
+    else if(!this._instance.isAuth){
+      console.log('add pending send', { path, params, cb, err })
+      this._pendingSend.push({ path, params, cb, err })
       return
     }
 
@@ -206,7 +176,6 @@ class WSS extends EventEmitter2{
       .then(async(dataUrlObj) => {
 
         const binaryData = await this.toBinaryData(dataUrlObj)
-        console.log('sendSync', this._instance.readyState, dataUrlObj)
         this._instance.send(binaryData)
 
         this._callbacks[_requestId] = {