@mixd-id/web-scaffold 0.1.240411108 → 0.1.240411110

package/package.json

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

package/src/middleware/http/trim-string.js

@@ -1,12 +1,4 @@
-function trimStrings(obj) {
-  for (const key in obj) {
-    if (typeof obj[key] === 'string') {
-      obj[key] = obj[key].trim();
-    } else if (typeof obj[key] === 'object') {
-      trimStrings(obj[key]);
-    }
-  }
-}
+const { trimStrings } = require('../../utils/helpers')
 
 module.exports = async function(req, res, next){
 

package/src/utils/helpers.cjs

@@ -598,6 +598,21 @@ const groupBy = (arr, key) => {
   }, {});
 }
 
+// Trims string values of an object/array in place (recursive), skips Buffers/typed arrays
+const trimStrings = (obj) => {
+  if(!obj || typeof obj !== 'object' || ArrayBuffer.isView(obj)) return obj
+
+  for(const key in obj){
+    const value = obj[key]
+    if(typeof value === 'string')
+      obj[key] = value.trim()
+    else if(value && typeof value === 'object')
+      trimStrings(value)
+  }
+
+  return obj
+}
+
 module.exports = {
   capitalize,
   ceil,
@@ -631,5 +646,6 @@ module.exports = {
   hashMake,
   hashCheck,
   transactionWithRetry,
-  groupBy
+  groupBy,
+  trimStrings
 }

package/src/utils/helpers.js

@@ -598,6 +598,21 @@ const groupBy = (arr, key) => {
   }, {});
 }
 
+// Trims string values of an object/array in place (recursive), skips Buffers/typed arrays
+const trimStrings = (obj) => {
+  if(!obj || typeof obj !== 'object' || ArrayBuffer.isView(obj)) return obj
+
+  for(const key in obj){
+    const value = obj[key]
+    if(typeof value === 'string')
+      obj[key] = value.trim()
+    else if(value && typeof value === 'object')
+      trimStrings(value)
+  }
+
+  return obj
+}
+
 module.exports = {
   capitalize,
   ceil,
@@ -631,5 +646,6 @@ module.exports = {
   hashMake,
   hashCheck,
   transactionWithRetry,
-  groupBy
+  groupBy,
+  trimStrings
 }

package/src/utils/helpers.mjs

@@ -510,6 +510,21 @@ const groupBy = (arr, key) => {
   }, {});
 }
 
+// Trims string values of an object/array in place (recursive), skips Buffers/typed arrays
+const trimStrings = (obj) => {
+  if(!obj || typeof obj !== 'object' || ArrayBuffer.isView(obj)) return obj
+
+  for(const key in obj){
+    const value = obj[key]
+    if(typeof value === 'string')
+      obj[key] = value.trim()
+    else if(value && typeof value === 'object')
+      trimStrings(value)
+  }
+
+  return obj
+}
+
 const arrayPush = (arr, items, opt = { update:true }) => {
   if(!Array.isArray(arr)) return
   if(!Array.isArray(items)) items = [ items ]
@@ -653,6 +668,7 @@ export {
   queueForLaterWithKey,
   transactionWithRetry,
   groupBy,
+  trimStrings,
   arrayPush,
   arrayRemove,
   arrayUnshift,

package/src/utils/importer.js

@@ -3,7 +3,7 @@ const fs = require("fs");
 const AdmZip = require("adm-zip");
 const glob = require("glob");
 const Exceljs = require("exceljs")
-const { saveBuffer, unflatten } = require('./helpers.js')
+const { saveBuffer, unflatten, trimStrings } = require('./helpers.js')
 
 const getCellText = (cell, image) => {
   if(!cell) return image?.buffer ?? ''
@@ -259,7 +259,7 @@ const importRequest = async(req) => {
         //Object.assign(obj, row)
       }
 
-      rows.push(unflatten(obj))
+      rows.push(trimStrings(unflatten(obj)))
     }
 
     Object.assign(doc, {

package/src/utils/wss.js

@@ -68,6 +68,8 @@ const revertDataUrlObj = (obj) => {
 const isClosedError = (e) =>
   e && (e.message === 'Disconnects client' || e.message === 'The client is closed')
 
+const REJECT_CLOSE_CODE = 4001
+
 const reportError = (e) => {
   if(isClosedError(e)) return
   '$report' in process ? process.$report(e) : console.error(e)
@@ -134,7 +136,11 @@ class WSS extends EventEmitter2{
 
       // Protocol errors (e.g. invalid close codes) emit 'error'; without a
       // listener they crash the process. ws closes the socket afterwards.
-      socket.on('error', reportError)
+      // WS_ERR_* are malformed frames from the client — not worth reporting.
+      socket.on('error', (e) => {
+        if(`${e?.code ?? ''}`.startsWith('WS_ERR_')) return
+        reportError(e)
+      })
 
       let closed = false
 
@@ -215,8 +221,6 @@ class WSS extends EventEmitter2{
         subscriber = client
         await client.connect()
 
-        // Socket closed while authenticating/connecting: the close handler may
-        // have run before the client was open, so release it here.
         if(closed){
           disconnectQuietly(client)
           return
@@ -228,7 +232,7 @@ class WSS extends EventEmitter2{
       catch(e){
         disconnectQuietly(subscriber)
         if(closed) return
-        return socket.close(1002, (e.message ?? '').substring(0, 123));
+        return socket.close(REJECT_CLOSE_CODE, (e.message ?? '').substring(0, 123));
       }
 
       if(this._opt.ping !== false && !closed){
@@ -285,7 +289,7 @@ class WSS extends EventEmitter2{
       if(typeof obj !== 'object' || obj === null) throw new Error('Invalid message')
     }
     catch(e){
-      return socket.close(1002, (e.message ?? '').substring(0, 123));
+      return socket.close(REJECT_CLOSE_CODE, (e.message ?? '').substring(0, 123));
     }
 
     const { _requestId, path, params, ping, pong } = obj
@@ -439,6 +443,7 @@ class WSS extends EventEmitter2{
 
 module.exports = {
   WSS,
+  REJECT_CLOSE_CODE,
   convertDataUrlObj,
   revertDataUrlObj
 }

package/src/utils/wss.mjs

@@ -1,6 +1,9 @@
 import CryptoJS from "crypto-js";
 import EventEmitter2 from "eventemitter2";
 
+// Must match REJECT_CLOSE_CODE in wss.js
+const REJECT_CLOSE_CODE = 4001
+
 const fileToDataURL = (file) => {
   return new Promise((resolve, reject) => {
     const reader = new FileReader();
@@ -157,7 +160,8 @@ class WSS extends EventEmitter2{
     this._instance.onclose = (e) => {
       switch(e.code){
 
-        case 1002:
+        // Rejected by server (auth failure etc.), retrying won't help
+        case REJECT_CLOSE_CODE:
           this.emit('connect_error', e, [])
           break
 
@@ -280,6 +284,7 @@ class WSS extends EventEmitter2{
 
 export {
   WSS,
+  REJECT_CLOSE_CODE,
   fileToDataURL,
   convertDataUrlObj
 }