@mixd-id/web-scaffold 0.1.230406238 → 0.1.230406239

package/package.json

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

package/src/utils/wss.js

@@ -136,7 +136,10 @@ class WSS extends EventEmitter2{
       socket.leave = (channel) => {
         if((socket.channels ?? {})[channel]){
           delete socket.channels[channel]
-          //console.log('leave', channel)
+
+          if(this._opt.debug){
+            console.log('leave', channel)
+          }
         }
       }
 
@@ -146,7 +149,10 @@ class WSS extends EventEmitter2{
         }
 
         socket.channels[channel] = 1
-        //console.log('join', channel)
+
+        if(this._opt.debug){
+          console.log('join', channel)
+        }
       }
 
       socket.to = (channel) => {
@@ -222,7 +228,10 @@ class WSS extends EventEmitter2{
   }
 
   async broadcast(channel, { model, event, items }){
-    //console.log('broadcast', channel, JSON.stringify({ model, event, items }).substring(0, 70))
+
+    if(this._opt.debug){
+      console.log('broadcast', channel, JSON.stringify({ model, event, items }).substring(0, 70))
+    }
 
     for(let socket of this._instance.clients){
       if(socket.readyState === WebSocket.OPEN && (socket.channels ?? {})[channel]){

package/src/utils/wss.mjs

@@ -1,6 +1,15 @@
 import CryptoJS from "crypto-js";
 import EventEmitter2 from "eventemitter2";
 
+const fileToDataURL = (file) => {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onload = (event) => resolve(event.target.result);
+    reader.onerror = (error) => reject(error);
+    reader.readAsDataURL(file);
+  });
+};
+
 class WSS extends EventEmitter2{
 
   _instance
@@ -12,93 +21,30 @@ class WSS extends EventEmitter2{
 
   static async convertDataUrlObj(obj){
 
-    const fileToDataURL = (file) => {
-      return new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.onload = (event) => resolve(event.target.result);
-        reader.onerror = (error) => reject(error);
-        reader.readAsDataURL(file);
-      });
-    };
-
-    const processObjectProperties = async (inputObj) => {
-      let outputObj;
-
-      if(Array.isArray(inputObj)){
-        outputObj = []
-        for(let i = 0; i < inputObj.length; i++){
-          const value = inputObj[i];
-
-          if (value instanceof File) {
-            outputObj[i] = await fileToDataURL(value);
-          } else if (typeof value === 'object' && value !== null) {
-            outputObj[i] = await processObjectProperties(value);
-          } else {
-            outputObj[i] = value;
-          }
-        }
-      }
-      else{
-        outputObj = {}
-
-        for (const key in inputObj) {
-          if (inputObj.hasOwnProperty(key)) {
-            const value = inputObj[key];
-
-            if (value instanceof File) {
-              outputObj[key] = await fileToDataURL(value);
-            } else if (typeof value === 'object' && value !== null) {
-              outputObj[key] = await processObjectProperties(value);
-            } else {
-              outputObj[key] = value;
-            }
-          }
-        }
-      }
-
-
-      return outputObj;
-    };
-
-    return processObjectProperties(obj);
-  }
-
-  static async revertDataUrlObj(obj){
-
-    const processObjectProperties = async (inputObj) => {
-      let outputObj;
+    let output
 
-      if(Array.isArray(inputObj)){
-        outputObj = []
-        for (let i = 0; i < inputObj.length; i++) {
-          let value = inputObj[i];
-
-          if (typeof value === 'object' && value !== null) {
-            outputObj[i] = await processObjectProperties(value);
-          } else {
-            outputObj[i] = value;
-          }
-        }
+    if(Array.isArray(obj)){
+      output = []
+      for(let i = 0; i < obj.length; i++){
+        output.push(await WSS.convertDataUrlObj(obj[i]));
       }
-      else if(typeof inputObj === 'object' && inputObj !== null){
-        outputObj = {}
-        for (const key in inputObj) {
-          if (inputObj.hasOwnProperty(key)) {
-            let value = inputObj[key];
-
-            if (typeof value === 'object' && value !== null) {
-              outputObj[key] = await processObjectProperties(value);
-            } else {
-              outputObj[key] = value;
-            }
-          }
+    }
+    else if(obj instanceof File || obj instanceof Blob) {
+      output = await fileToDataURL(obj);
+    }
+    else if(typeof obj === 'object' && obj !== null){
+      output = {}
+      for (const key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          output[key] = await WSS.convertDataUrlObj(obj[key])
         }
       }
+    }
+    else{
+      output = obj;
+    }
 
-      return outputObj;
-    };
-
-    return processObjectProperties(obj);
+    return output
   }
 
   constructor(opt) {
@@ -130,7 +76,7 @@ class WSS extends EventEmitter2{
   }
 
   _onFocus = () => {
-    this.emit('focus')
+    this.emit('window', 'focus', [])
 
     if(this._lastBlurAt){
       this.send('ping', {}, { timeout:1000 })
@@ -142,10 +88,10 @@ class WSS extends EventEmitter2{
 
   _onOnlineChanged = (e) => {
     if(!navigator.onLine){
-      this.emit('disconnect', e)
+      this.emit('disconnect', e, [])
     }
     else{
-      this.emit('connect')
+      this.emit('connect', null, [])
     }
   }
 
@@ -153,8 +99,7 @@ class WSS extends EventEmitter2{
     const secretKey = this._opt.key;
     const encryptedString = new TextDecoder().decode(binaryData)
     const decryptedData = CryptoJS.AES.decrypt(encryptedString, secretKey).toString(CryptoJS.enc.Utf8);
-    const receivedObject = JSON.parse(decryptedData);
-    return await WSS.revertDataUrlObj(receivedObject);
+    return JSON.parse(decryptedData)
   }
 
   async toBinaryData(obj){
@@ -172,7 +117,7 @@ class WSS extends EventEmitter2{
     this._instance.onopen = () => {
       this.send('_auth', this._opt.auth)
         .then(() => {
-          reconnect ? this.emit('reconnect') : this.emit('connect')
+          reconnect ? this.emit('reconnect', null, []) : this.emit('connect', null, [])
 
           for(let sendParams of this._pendingSend){
             this.sendSync(sendParams.path, sendParams.params, sendParams.cb, sendParams.err)
@@ -209,7 +154,7 @@ class WSS extends EventEmitter2{
     };
 
     this._instance.onerror = (e) => {
-      this.emit('error', e)
+      this.emit('error', e, [])
     }
 
     this._instance.onclose = (e) => {
@@ -217,11 +162,11 @@ class WSS extends EventEmitter2{
       switch(e.code){
 
         case 1002:
-          this.emit('connect_error', e)
+          this.emit('connect_error', e, [])
           break
 
         default:
-          this.emit('disconnect')
+          this.emit('disconnect', null, [])
           break
       }
     };