@event-chat/rpc 0.1.30 → 0.1.31

package/dist/transports/WebSocketTransport.d.ts

@@ -2,6 +2,8 @@ import { ListenerType, MessageItem } from '../fields';
 import BaseTransport from './BaseTransport';
 declare class WebSocketTransport extends BaseTransport<WebSocket> {
     private _onconnect;
+    private _closeHandle;
+    private _messageHandle;
     destroy(): void;
     observe(close?: () => void): void;
     onmessage(listener: ListenerType): void;

package/dist/transports/WebSocketTransport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketTransport.d.ts","sourceRoot":"","sources":["../../src/transports/WebSocketTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAErD,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAS3C,cAAM,kBAAmB,SAAQ,aAAa,CAAC,SAAS,CAAC;IACvD,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO;IAOP,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAMjC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAavC,QAAQ,IAAI,IAAI;IAIhB,WAAW,CAAC,OAAO,EAAE,WAAW;CAajC;AAED,eAAe,kBAAkB,CAAA"}
+{"version":3,"file":"WebSocketTransport.d.ts","sourceRoot":"","sources":["../../src/transports/WebSocketTransport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAErD,OAAO,aAAa,MAAM,iBAAiB,CAAA;AAG3C,cAAM,kBAAmB,SAAQ,aAAa,CAAC,SAAS,CAAC;IACvD,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO,CAAC,YAAY,CAA0B;IAC9C,OAAO,CAAC,cAAc,CAA6C;IAEnE,OAAO;IAKP,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAOjC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IA8BvC,QAAQ,IAAI,IAAI;IAOhB,WAAW,CAAC,OAAO,EAAE,WAAW;CAQjC;AAED,eAAe,kBAAkB,CAAA"}

package/dist/transports/WebSocketTransport.js

@@ -2,29 +2,51 @@ import { ProxyPromise } from "../utils.js";
 import BaseTransport from "./BaseTransport.js";
 class WebSocketTransport extends BaseTransport {
     _onconnect = Promise.resolve(false);
+    _closeHandle;
+    _messageHandle;
     destroy() {
-        this._target.onclose = null;
-        this._target.onopen = null;
+        this._closeHandle = void 0;
         if (this._target.readyState === WebSocket.OPEN) this._target.close();
     }
     observe(close) {
-        this._target.onclose = ()=>{
-            close?.();
-        };
+        if (close) {
+            this._closeHandle = close;
+            this._target.addEventListener('close', this._closeHandle, {
+                once: true
+            });
+        }
     }
     onmessage(listener) {
-        this._target.onmessage = listener;
         this._onconnect = new Promise((resolve)=>{
-            this._target.onopen = ()=>{
-                resolve(true);
-            };
-            this._target.onclose = ()=>{
-                resolve(false);
+            const handleConnect = (event)=>{
+                this._target.removeEventListener('open', handleConnect);
+                this._target.removeEventListener('close', handleConnect);
+                resolve('open' === event.type);
             };
+            this._target.addEventListener('open', handleConnect, {
+                once: true
+            });
+            this._target.addEventListener('close', handleConnect, {
+                once: true
+            });
         });
+        this._messageHandle = (event)=>{
+            try {
+                if ('string' == typeof event.data) listener({
+                    data: JSON.parse(event.data),
+                    origin: event.origin,
+                    ports: event.ports,
+                    source: event.source
+                });
+            } catch  {}
+        };
+        this._target.addEventListener('message', this._messageHandle, this._options.message);
     }
     onremove() {
-        this._target.onmessage = null;
+        if (this._messageHandle) {
+            this._target.removeEventListener('message', this._messageHandle, this._options.message);
+            this._messageHandle = void 0;
+        }
     }
     postMessage(message) {
         const target = this._target;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@event-chat/rpc",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {