@zyzgroup/core-web 0.1.71 → 0.1.73

package/dist/zyzgroup_core_web.js

@@ -21681,9 +21681,9 @@ class me {
   requestid = 0;
   waitings = {};
   listeners = {};
-  // wss://echo.websocket.org
+  // wss://echo.websocket.org/
   // wss://xinge.ruolin-link.com/
-  // wss://tstxg.ruolin-link.com/
+  // wss://test.xinge.me/
   constructor(t = "", e) {
     this.url = t, this.socketCreatorProtocols = e?.socketCreatorProtocols, this.socketCreatorOptions = e?.socketCreatorOptions || {}, this.socketCreator = e?.socketCreator || s0, this.pingInterval = e?.pingInterval || 5e3, this.onopen = e?.onopen, this.onclose = e?.onclose, this.onerror = e?.onerror, this.reconnect = typeof e?.reconnect == "boolean" ? e.reconnect : !0, this.maxReconnectAttempts = typeof e?.maxReconnectAttempts == "number" ? e.maxReconnectAttempts : 1 / 0, this._connect();
   }
@@ -21699,35 +21699,35 @@ class me {
       this.socketCreatorProtocols,
       this.socketCreatorOptions
     ), this.socket.onopen = () => {
-      oe(`ws(${this.url}) onopen`), this.state = me.OPEN, this.reconnectTimerID && (clearTimeout(this.reconnectTimerID), this.reconnectTimerID = void 0, this.reconnectAttempts = 0), this.ping(), this.pingTimerID = setInterval(this.ping, this.pingInterval);
+      oe(`ws(${this.url}) onopen`), this.state = me.OPEN, this.ping(), this.pingTimerID = setInterval(this.ping.bind(this), this.pingInterval), this.reconnectTimerID && (clearTimeout(this.reconnectTimerID), this.reconnectTimerID = void 0, this.reconnectAttempts = 0);
       const t = this.messageQueue.slice();
       this.messageQueue = [], t.forEach(this._send), this.onopen?.();
     }, this.socket.onclose = (t) => {
       const { code: e, reason: s, wasClean: r } = t;
       oe(
-        `ws(${this.url}) onclose : code(${e}) reason(${s}) wasClean(${r})`
+        `ws(${this.url}) onclose: code(${e}) reason(${s}) wasClean(${r})`
       ), this.state = me.CLOSED, this.pingTimerID && (clearInterval(this.pingTimerID), this.pingTimerID = void 0), this.onclose?.(t), this.reconnect && this.reconnectAttempts < this.maxReconnectAttempts && (this.socket = void 0, this.reconnectTimerID = setTimeout(
         this._connect.bind(this),
         Fa(this.reconnectAttempts++)
-      ));
+      ), console.log(this.reconnectAttempts));
     }, this.socket.onerror = (t) => {
-      oe(`ws(${this.url}) onerror : ${t.type} ${t}`), this.onerror?.(t);
+      oe(`ws(${this.url}) onerror: ${t.type} ${t}`), this.onerror?.(t);
     }, this.socket.onmessage = (t) => {
-      if (oe(`ws(${this.url}) onmessage type(${t.type}): ${Ue(t)}`), typeof t.data == "string") {
+      if (oe(`ws(${this.url}) onmessage: { type: ${t.type}, data: ${t.data}}`), typeof t.data == "string") {
         let e;
         try {
-          e = JSON.parse(t.data);
+          e = JSON.parse(t.data.substring(1));
         } catch (s) {
-          Ke(`ws(${this.url}) onmessage : parse error : ${s}`), e = {
+          e = {
             type: "err",
             failureType: s.toString(),
             message: t.data
-          };
+          }, Ke(`${Ue(e)}`);
         }
         if (e.body && Object.prototype.hasOwnProperty.call(e.body, "requestid")) {
           const s = this.waitings[e.body.requestid];
           s ? s.resolve?.(e.body) : Ke(
-            `ws(${this.url}) onmessage : but found no associated request, already timed out`
+            `ws(${this.url}) onmessage: found no associated request, already timed out`
           );
         } else if (this.listeners[e.address]) {
           const s = this.listeners[e.address];
@@ -21738,9 +21738,9 @@ class me {
               message: e.message
             }) : s[r](null, e.body);
         } else
-          Ke(`ws(${this.url}) onmessage : unhandle string`), this.onunhandled(e);
+          Ke(`ws(${this.url}) onmessage: unhandle string`), this.onunhandled(e);
       } else
-        t.data instanceof ArrayBuffer ? Ke(`ws(${this.url}) onmessage : unhandle ArrayBuffer`) : t.data instanceof Blob && Ke(`ws(${this.url}) onmessage : unhandle Blob`);
+        t.data instanceof ArrayBuffer ? Ke(`ws(${this.url}) onmessage: unhandle ArrayBuffer`) : t.data instanceof Blob && Ke(`ws(${this.url}) onmessage: unhandle Blob`);
     });
   }
   onunhandled(t) {
@@ -21755,7 +21755,7 @@ class me {
   }
   // 可能需要根据协议变更传输格式
   _send(t) {
-    this.socket?.readyState === me.OPEN ? this.socket.send(JSON.stringify(t)) : (this.messageQueue.push(t), this._connect());
+    this.socket && this.socket.readyState === me.OPEN ? this.socket.send(JSON.stringify(t)) : (this.messageQueue.push(t), this._connect());
   }
   ping() {
     this._send({ type: "ping" });