@mixd-id/web-scaffold 0.1.230406275 → 0.1.230406277

package/package.json

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

package/src/utils/preset-selector.js

@@ -342,9 +342,6 @@ const getValue = (filter, opt) => {
       break
   }
 
-
-  console.log('getValue', filter, key, type, operator, util.inspect(whereObj, false, null, true /* enable colors */))
-
   return whereObj
 }
 
@@ -366,6 +363,8 @@ const filtersToSequelizeWhere = async(filters, opt) => {
 
     const { key, value, operator } = filter
 
+    if(key.indexOf('.') >= 0) continue
+
     if(Array.isArray(value) && !operator){
       const { modifier = 'and' } = filter
 
@@ -393,7 +392,6 @@ const filtersToSequelizeWhere = async(filters, opt) => {
         ...getValue(filter, opt)
       }
     }
-
   }
 
   return {
@@ -808,6 +806,81 @@ const sortsToSequelizeWhere = async (sorts, opt) => {
   }
 }
 
+const filtersToSequelizeInclude = async(filters, opt, includes) => {
+  if(!Array.isArray(filters) || filters.length < 1){
+    return includes
+  }
+
+  // TODO: Test on 2 level or more level includes
+
+  // Generate where object
+  let whereObj = {}
+  for(let filter of filters) {
+    if (filter.enabled === false) continue
+
+    const {key, value, operator} = filter
+
+    if(key.indexOf('.') < 0) continue
+
+    if(Array.isArray(value) && !operator){
+      const { modifier = 'and' } = filter
+
+      if(![ 'and', 'or' ].includes(modifier)) continue
+
+      const opModifierValue = []
+      for(let v of value){
+        opModifierValue.push(getValue({ ...v, key }, {
+          ...opt,
+          withoutKey: true
+        }))
+      }
+
+      whereObj = {
+        ...whereObj,
+        [key]: {
+          [Op[modifier]]: opModifierValue
+        }
+      }
+    }
+    else{
+      whereObj = {
+        ...whereObj,
+        ...getValue(filter, opt)
+      }
+    }
+  }
+  //console.log('whereObj', whereObj)
+
+  // Apply where to includes
+  for(let key in whereObj){
+
+    const keyParts = key.split('.')
+    if(keyParts.length < 2) continue
+
+    // Walk through the includes to find the correct include
+    let include
+    for(let i = 0 ; i < keyParts.length - 1 ; i++){
+      const as = keyParts[i]
+      include = !include ? includes.find(_ => _.as === as) : include.includes ?? []
+    }
+
+    // If include is not found, skip
+    if(!include){
+      continue
+    }
+
+    // Generate where object for the correct include
+    const currentKey = keyParts[keyParts.length - 1]
+    if(!include.where){
+      include.where = { [Op.and]: [] }
+    }
+    include.where[Op.and].push({ [currentKey]: whereObj[key] })
+  }
+
+  //console.log('includes', includes)
+  return includes
+}
+
 module.exports = {
   filtersToSequelizeWhere,
   afterItemToSequelizeWhere,
@@ -815,4 +888,5 @@ module.exports = {
   chartToSequelizeWhere,
   pivotToSequelizeWhere,
   sortsToSequelizeWhere,
+  filtersToSequelizeInclude,
 }

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

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){
@@ -77,6 +92,8 @@ class WSS extends EventEmitter2{
 
   async connect(reconnect = false){
 
+    console.log('connect', this._opt.token)
+
     this._instance = new WebSocket(this._opt.url, [ this._opt.token ])
 
     this._instance.binaryType = 'arraybuffer';
@@ -85,15 +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('reconnect', null, []) : this.emit('connect', null, [])
+        this.emit('connect', reconnect, [])
 
         for(let sendParams of this._pendingSend){
           this.sendSync(sendParams.path, sendParams.params, sendParams.cb, sendParams.err)
@@ -139,6 +159,9 @@ class WSS extends EventEmitter2{
           this.emit('connect_error', e, [])
           break
 
+        case 1005:
+          break
+
         default:
           this.emit('disconnect', null, [])
           break
@@ -158,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){
@@ -191,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)
       })
   }
 
@@ -208,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 {