@mixd-id/web-scaffold 0.1.230406264 → 0.1.230406266

package/package.json

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

package/src/components/Modal.vue

@@ -114,7 +114,15 @@ export default{
 		},
 
 		close(){
-			this._state = false
+      if(this.hash){
+        this.$router.replace({
+          ...this.$route,
+          hash: this.$route.hash.replace(`${this.hash}`, '')
+        })
+      }
+      else{
+        this._state = false
+      }
 		},
 
     dismiss(){
@@ -255,9 +263,11 @@ export default{
       }
     },
 
-    '$route.hash'(to){
-      if(this.hash !== null){
-        this._state = to === this.hash
+    '$route.hash': {
+      handler(to){
+        if(this.hash !== null){
+          this._state = (to ?? '').indexOf(this.hash) >= 0
+        }
       }
     }
 
@@ -275,7 +285,7 @@ export default{
 			}
 
       if(this.hash !== null){
-        this._state = this.$route.hash === this.hash
+        this._state = (this.$route.hash ?? '').indexOf(this.hash) >= 0
       }
 		})
 	},

package/src/utils/wss.js

@@ -128,7 +128,6 @@ class WSS extends EventEmitter2{
       }
 
       socket.on('message', async (binaryData) => {
-        console.log('message#1', socket.isAuth)
         if(!socket.isAuth) return
 
         let obj
@@ -139,45 +138,46 @@ class WSS extends EventEmitter2{
           return socket.close(1002, e.message);
         }
 
-        const { _requestId, path, params } = obj
+        const { _requestId, path, params, pong } = obj
 
-        let status = 200
-        let data
-        switch(path){
-
-          case 'ping':
-            data = { type:'pong' }
-            break
+        if(pong){
+          delete socket.pinging
+        }
+        else{
+          let status = 200
+          let data
+          switch(path){
 
-          default:
-            try{
-              const arr = (await Promise.all(this._reqFn.map(fn => fn({ path, params }, socket))))
-                .filter(_ => _)
+            default:
+              try{
+                const arr = (await Promise.all(this._reqFn.map(fn => fn({ path, params }, socket))))
+                  .filter(_ => _)
 
-              data = arr.length > 0 ? JSON.parse(JSON.stringify(arr.pop())) : data
-            }
-            catch(e){
-              if(this._opt.debug){
-                console.error(e)
+                data = arr.length > 0 ? JSON.parse(JSON.stringify(arr.pop())) : data
               }
-
-              status = 500
-              data = {
-                name: e.name,
-                message: e.message,
-                errors: e.errors,
-                stack: process.env.APP_DEBUG === 'true' ?
-                  e.stack : undefined
+              catch(e){
+                if(this._opt.debug){
+                  console.error(e)
+                }
+
+                status = 500
+                data = {
+                  name: e.name,
+                  message: e.message,
+                  errors: e.errors,
+                  stack: process.env.APP_DEBUG === 'true' ?
+                    e.stack : undefined
+                }
               }
-            }
-            break
-        }
+              break
+          }
 
-        socket.send(await this.toBinaryData({
-          _requestId,
-          status,
-          data
-        }))
+          socket.send(await this.toBinaryData({
+            _requestId,
+            status,
+            data
+          }))
+        }
       });
 
       socket.on('close', (e) => {
@@ -193,6 +193,21 @@ class WSS extends EventEmitter2{
       catch(e){
         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)
+      }
+      setTimeout(ping, (Math.round(Math.random() * 10) % 5) * 5000)
     })
   }
 

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 ?
@@ -109,21 +77,24 @@ class WSS extends EventEmitter2{
 
   async connect(reconnect = false){
 
-    this._instance = new WebSocket(this._opt.url, this._opt.token)
+    this._instance = new WebSocket(this._opt.url, [ this._opt.token ])
 
     this._instance.binaryType = 'arraybuffer';
 
     this._instance.onmessage = async (event) => {
+
       const obj = await this.fromBinaryData(event.data);
 
-      const { _requestId, status, data, auth } = obj
+      const { _requestId, status, data, auth, ping } = obj
 
-      if(auth){
+      if(ping){
+        this._instance.send(await this.toBinaryData({ pong:1 }))
+      }
+      else if(auth){
         this._instance.isAuth = auth
 
         reconnect ? this.emit('reconnect', null, []) : this.emit('connect', null, [])
 
-        console.log('pending send', this._pendingSend)
         for(let sendParams of this._pendingSend){
           this.sendSync(sendParams.path, sendParams.params, sendParams.cb, sendParams.err)
         }
@@ -184,8 +155,6 @@ class WSS extends EventEmitter2{
   }
 
   sendSync(path, params, cb, err, override){
-    console.log('sendSync', path, this._instance.readyState)
-
     if(this._instance.readyState > 1){
       console.log('unable to send, ready state not 1', this._instance.readyState)
       return
@@ -211,7 +180,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] = {
@@ -239,12 +207,6 @@ class WSS extends EventEmitter2{
     })
   }
 
-  async resume(){
-    if(this._instance.readyState > 1){
-      return this.reconnect()
-    }
-  }
-
 }
 
 export {