@mixd-id/web-scaffold 0.1.240411109 → 0.1.240411111

package/package.json

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

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
 }