@nmtjs/ws-client 0.12.5 → 0.12.7

package/dist/index.d.ts

@@ -0,0 +1,30 @@
+import { ClientMessageType } from '@nmtjs/protocol';
+import { type Protocol, type ProtocolBaseClientCallOptions, type ProtocolBaseTransformer, ProtocolTransport } from '@nmtjs/protocol/client';
+export type WebSocketClientTransportOptions = {
+    /**
+     * The origin of the server
+     * @example 'http://localhost:3000'
+     */
+    origin: string;
+    /**
+     * Custom WebSocket class
+     * @default globalThis.WebSocket
+     */
+    wsFactory?: (url: URL) => WebSocket;
+    debug?: boolean;
+};
+export declare class WebSocketClientTransport extends ProtocolTransport {
+    protected readonly protocol: Protocol;
+    protected webSocket: WebSocket | null;
+    protected connecting: Promise<void> | null;
+    protected options: WebSocketClientTransportOptions;
+    constructor(protocol: Protocol, options: WebSocketClientTransportOptions);
+    connect(auth: any, transformer: ProtocolBaseTransformer): Promise<void>;
+    disconnect(): Promise<void>;
+    call(namespace: string, procedure: string, payload: any, options: ProtocolBaseClientCallOptions, transformer: ProtocolBaseTransformer): Promise<import("@nmtjs/common").InteractivePromise<unknown> & {
+        namespace: string;
+        procedure: string;
+        signal: AbortSignal;
+    }>;
+    send(messageType: ClientMessageType, buffer: ArrayBuffer): Promise<void>;
+}

package/dist/index.js

@@ -1,68 +1,72 @@
-import { ClientMessageType, concat, encodeNumber } from "@nmtjs/protocol";
-import { ProtocolTransport, ProtocolTransportStatus } from "@nmtjs/protocol/client";
+import { ClientMessageType, concat, encodeNumber } from '@nmtjs/protocol';
+import { ProtocolTransport, ProtocolTransportStatus, } from '@nmtjs/protocol/client';
 export class WebSocketClientTransport extends ProtocolTransport {
-	webSocket = null;
-	connecting = null;
-	options;
-	constructor(protocol, options) {
-		super();
-		this.protocol = protocol;
-		this.options = {
-			debug: false,
-			...options
-		};
-	}
-	connect(auth, transformer) {
-		const wsUrl = new URL("/api", this.options.origin);
-		if (this.protocol.contentType) {
-			wsUrl.searchParams.set("content-type", this.protocol.contentType);
-			wsUrl.searchParams.set("accept", this.protocol.contentType);
-		}
-		if (auth) wsUrl.searchParams.set("auth", auth);
-		const ws = this.options.wsFactory?.(wsUrl) ?? new WebSocket(wsUrl.toString());
-		ws.binaryType = "arraybuffer";
-		this.status = ProtocolTransportStatus.CONNECTING;
-		ws.addEventListener("message", ({ data }) => {
-			this.protocol.handleServerMessage(data, this, transformer);
-		});
-		ws.addEventListener("close", (event) => {
-			console.dir(event);
-			this.status = ProtocolTransportStatus.DISCONNECTED;
-			if (event.code !== 1e3) this.emit("disconnected");
-			this.webSocket = null;
-		}, { once: true });
-		this.webSocket = ws;
-		this.connecting = new Promise((resolve, reject) => {
-			ws.addEventListener("open", () => {
-				this.status = ProtocolTransportStatus.CONNECTED;
-				this.emit("connected");
-				resolve();
-			}, { once: true });
-			ws.addEventListener("error", (event) => {
-				reject(new Error("WebSocket error", { cause: event }));
-			}, { once: true });
-		});
-		return this.connecting;
-	}
-	async disconnect() {
-		if (this.webSocket === null) return;
-		this.webSocket.close(1e3, "user");
-		return _once(this.webSocket, "close");
-	}
-	async call(namespace, procedure, payload, options, transformer) {
-		const { call, buffer } = this.protocol.createRpc(namespace, procedure, payload, options, transformer);
-		await this.send(ClientMessageType.Rpc, buffer);
-		return call;
-	}
-	async send(messageType, buffer) {
-		if (this.connecting) await this.connecting;
-		this.webSocket.send(concat(encodeNumber(messageType, "Uint8"), buffer));
-	}
+    protocol;
+    webSocket = null;
+    connecting = null;
+    options;
+    constructor(protocol, options) {
+        super();
+        this.protocol = protocol;
+        this.options = {
+            debug: false,
+            ...options,
+        };
+    }
+    connect(auth, transformer) {
+        // this.auth = auth
+        const wsUrl = new URL('/api', this.options.origin);
+        if (this.protocol.contentType) {
+            wsUrl.searchParams.set('content-type', this.protocol.contentType);
+            wsUrl.searchParams.set('accept', this.protocol.contentType);
+        }
+        if (auth)
+            wsUrl.searchParams.set('auth', auth);
+        const ws = this.options.wsFactory?.(wsUrl) ?? new WebSocket(wsUrl.toString());
+        ws.binaryType = 'arraybuffer';
+        this.status = ProtocolTransportStatus.CONNECTING;
+        ws.addEventListener('message', ({ data }) => {
+            this.protocol.handleServerMessage(data, this, transformer);
+        });
+        ws.addEventListener('close', (event) => {
+            console.dir(event);
+            this.status = ProtocolTransportStatus.DISCONNECTED;
+            if (event.code !== 1000)
+                this.emit('disconnected');
+            this.webSocket = null;
+        }, { once: true });
+        this.webSocket = ws;
+        this.connecting = new Promise((resolve, reject) => {
+            ws.addEventListener('open', () => {
+                this.status = ProtocolTransportStatus.CONNECTED;
+                this.emit('connected');
+                resolve();
+            }, { once: true });
+            ws.addEventListener('error', (event) => {
+                reject(new Error('WebSocket error', { cause: event }));
+            }, { once: true });
+        });
+        return this.connecting;
+    }
+    async disconnect() {
+        if (this.webSocket === null)
+            return;
+        this.webSocket.close(1000, 'user');
+        return _once(this.webSocket, 'close');
+    }
+    async call(namespace, procedure, payload, options, transformer) {
+        const { call, buffer } = this.protocol.createRpc(namespace, procedure, payload, options, transformer);
+        await this.send(ClientMessageType.Rpc, buffer);
+        return call;
+    }
+    async send(messageType, buffer) {
+        if (this.connecting)
+            await this.connecting;
+        this.webSocket.send(concat(encodeNumber(messageType, 'Uint8'), buffer));
+    }
 }
 function _once(target, event) {
-	return new Promise((resolve) => {
-		target.addEventListener(event, () => resolve(), { once: true });
-	});
+    return new Promise((resolve) => {
+        target.addEventListener(event, () => resolve(), { once: true });
+    });
 }
-
-//# sourceMappingURL=index.js.map

package/package.json

@@ -3,29 +3,29 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./src/index.ts",
-      "import": "./dist/index.js"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "module-sync": "./dist/index.js"
     }
   },
   "dependencies": {
-    "@nmtjs/protocol": "0.12.5",
-    "@nmtjs/client": "0.12.5",
-    "@nmtjs/common": "0.12.5"
+    "@nmtjs/common": "0.12.7",
+    "@nmtjs/protocol": "0.12.7",
+    "@nmtjs/client": "0.12.7"
   },
   "peerDependencies": {
-    "@nmtjs/client": "0.12.5",
-    "@nmtjs/common": "0.12.5",
-    "@nmtjs/protocol": "0.12.5"
+    "@nmtjs/client": "0.12.7",
+    "@nmtjs/protocol": "0.12.7",
+    "@nmtjs/common": "0.12.7"
   },
   "files": [
-    "src",
     "dist",
     "LICENSE.md",
     "README.md"
   ],
-  "version": "0.12.5",
+  "version": "0.12.7",
   "scripts": {
-    "build": "neemata-build --root=./src './*.ts'",
+    "build": "tsc",
     "type-check": "tsc --noEmit"
   }
 }

package/dist/index.js.map

@@ -1 +0,0 @@
-{"mappings":"AAAA,SAAS,mBAAmB,QAAQ,oBAAoB,iBAAiB;AACzE,SAIE,mBACA,+BACK,wBAAwB;AAiB/B,OAAO,MAAM,iCAAiC,kBAAkB;CAC9D,AAAU,YAA8B;CACxC,AAAU,aAAmC;CAC7C,AAAU;CAEV,YACqBA,UACnBC,SACA;AACA,SAAO;OAHY;AAInB,OAAK,UAAU;GACb,OAAO;GACP,GAAG;EACJ;CACF;CAED,QAAQC,MAAWC,aAAqD;EAEtE,MAAM,QAAQ,IAAI,IAAI,QAAQ,KAAK,QAAQ;AAC3C,MAAI,KAAK,SAAS,aAAa;AAC7B,SAAM,aAAa,IAAI,gBAAgB,KAAK,SAAS,YAAY;AACjE,SAAM,aAAa,IAAI,UAAU,KAAK,SAAS,YAAY;EAC5D;AACD,MAAI,KAAM,OAAM,aAAa,IAAI,QAAQ,KAAK;EAE9C,MAAM,KACJ,KAAK,QAAQ,YAAY,MAAM,IAAI,IAAI,UAAU,MAAM,UAAU;AAEnE,KAAG,aAAa;AAEhB,OAAK,SAAS,wBAAwB;AAEtC,KAAG,iBAAiB,WAAW,CAAC,EAAE,MAAM,KAAK;AAC3C,QAAK,SAAS,oBAAoB,MAAqB,MAAM,YAAY;EAC1E,EAAC;AAEF,KAAG,iBACD,SACA,CAAC,UAAU;AACT,WAAQ,IAAI,MAAM;AAClB,QAAK,SAAS,wBAAwB;AACtC,OAAI,MAAM,SAAS,IAAM,MAAK,KAAK,eAAe;AAClD,QAAK,YAAY;EAClB,GACD,EAAE,MAAM,KAAM,EACf;AAED,OAAK,YAAY;AAEjB,OAAK,aAAa,IAAI,QAAQ,CAAC,SAAS,WAAW;AACjD,MAAG,iBACD,QACA,MAAM;AACJ,SAAK,SAAS,wBAAwB;AACtC,SAAK,KAAK,YAAY;AACtB,aAAS;GACV,GACD,EAAE,MAAM,KAAM,EACf;AAED,MAAG,iBACD,SACA,CAAC,UAAU;AACT,WAAO,IAAI,MAAM,mBAAmB,EAAE,OAAO,MAAO,GAAE;GACvD,GACD,EAAE,MAAM,KAAM,EACf;EACF;AAED,SAAO,KAAK;CACb;CAED,MAAM,aAA4B;AAChC,MAAI,KAAK,cAAc,KAAM;AAC7B,OAAK,UAAW,MAAM,KAAM,OAAO;AACnC,SAAO,MAAM,KAAK,WAAW,QAAQ;CACtC;CAED,MAAM,KACJC,WACAC,WACAC,SACAC,SACAJ,aACA;EACA,MAAM,EAAE,MAAM,QAAQ,GAAG,KAAK,SAAS,UACrC,WACA,WACA,SACA,SACA,YACD;AACD,QAAM,KAAK,KAAK,kBAAkB,KAAK,OAAO;AAC9C,SAAO;CACR;CAED,MAAM,KACJK,aACAC,QACe;AACf,MAAI,KAAK,WAAY,OAAM,KAAK;AAChC,OAAK,UAAW,KAAK,OAAO,aAAa,aAAa,QAAQ,EAAE,OAAO,CAAC;CACzE;AACF;AAED,SAAS,MAAMC,QAAqBC,OAAe;AACjD,QAAO,IAAI,QAAc,CAAC,YAAY;AACpC,SAAO,iBAAiB,OAAO,MAAM,SAAS,EAAE,EAAE,MAAM,KAAM,EAAC;CAChE;AACF","names":["protocol: Protocol","options: WebSocketClientTransportOptions","auth: any","transformer: ProtocolBaseTransformer","namespace: string","procedure: string","payload: any","options: ProtocolBaseClientCallOptions","messageType: ClientMessageType","buffer: ArrayBuffer","target: EventTarget","event: string"],"sources":["../src/index.ts"],"sourcesContent":["import { ClientMessageType, concat, encodeNumber } from '@nmtjs/protocol'\nimport {\n  type Protocol,\n  type ProtocolBaseClientCallOptions,\n  type ProtocolBaseTransformer,\n  ProtocolTransport,\n  ProtocolTransportStatus,\n} from '@nmtjs/protocol/client'\n\nexport type WebSocketClientTransportOptions = {\n  /**\n   * The origin of the server\n   * @example 'http://localhost:3000'\n   */\n  origin: string\n  /**\n   * Custom WebSocket class\n   * @default globalThis.WebSocket\n   */\n  wsFactory?: (url: URL) => WebSocket\n\n  debug?: boolean\n}\n\nexport class WebSocketClientTransport extends ProtocolTransport {\n  protected webSocket: WebSocket | null = null\n  protected connecting: Promise<void> | null = null\n  protected options: WebSocketClientTransportOptions\n\n  constructor(\n    protected readonly protocol: Protocol,\n    options: WebSocketClientTransportOptions,\n  ) {\n    super()\n    this.options = {\n      debug: false,\n      ...options,\n    }\n  }\n\n  connect(auth: any, transformer: ProtocolBaseTransformer): Promise<void> {\n    // this.auth = auth\n    const wsUrl = new URL('/api', this.options.origin)\n    if (this.protocol.contentType) {\n      wsUrl.searchParams.set('content-type', this.protocol.contentType)\n      wsUrl.searchParams.set('accept', this.protocol.contentType)\n    }\n    if (auth) wsUrl.searchParams.set('auth', auth)\n\n    const ws =\n      this.options.wsFactory?.(wsUrl) ?? new WebSocket(wsUrl.toString())\n\n    ws.binaryType = 'arraybuffer'\n\n    this.status = ProtocolTransportStatus.CONNECTING\n\n    ws.addEventListener('message', ({ data }) => {\n      this.protocol.handleServerMessage(data as ArrayBuffer, this, transformer)\n    })\n\n    ws.addEventListener(\n      'close',\n      (event) => {\n        console.dir(event)\n        this.status = ProtocolTransportStatus.DISCONNECTED\n        if (event.code !== 1000) this.emit('disconnected')\n        this.webSocket = null\n      },\n      { once: true },\n    )\n\n    this.webSocket = ws\n\n    this.connecting = new Promise((resolve, reject) => {\n      ws.addEventListener(\n        'open',\n        () => {\n          this.status = ProtocolTransportStatus.CONNECTED\n          this.emit('connected')\n          resolve()\n        },\n        { once: true },\n      )\n\n      ws.addEventListener(\n        'error',\n        (event) => {\n          reject(new Error('WebSocket error', { cause: event }))\n        },\n        { once: true },\n      )\n    })\n\n    return this.connecting\n  }\n\n  async disconnect(): Promise<void> {\n    if (this.webSocket === null) return\n    this.webSocket!.close(1000, 'user')\n    return _once(this.webSocket, 'close')\n  }\n\n  async call(\n    namespace: string,\n    procedure: string,\n    payload: any,\n    options: ProtocolBaseClientCallOptions,\n    transformer: ProtocolBaseTransformer,\n  ) {\n    const { call, buffer } = this.protocol.createRpc(\n      namespace,\n      procedure,\n      payload,\n      options,\n      transformer,\n    )\n    await this.send(ClientMessageType.Rpc, buffer)\n    return call\n  }\n\n  async send(\n    messageType: ClientMessageType,\n    buffer: ArrayBuffer,\n  ): Promise<void> {\n    if (this.connecting) await this.connecting\n    this.webSocket!.send(concat(encodeNumber(messageType, 'Uint8'), buffer))\n  }\n}\n\nfunction _once(target: EventTarget, event: string) {\n  return new Promise<void>((resolve) => {\n    target.addEventListener(event, () => resolve(), { once: true })\n  })\n}\n"],"version":3,"file":"index.js"}

package/src/index.ts

@@ -1,134 +0,0 @@
-import { ClientMessageType, concat, encodeNumber } from '@nmtjs/protocol'
-import {
-  type Protocol,
-  type ProtocolBaseClientCallOptions,
-  type ProtocolBaseTransformer,
-  ProtocolTransport,
-  ProtocolTransportStatus,
-} from '@nmtjs/protocol/client'
-
-export type WebSocketClientTransportOptions = {
-  /**
-   * The origin of the server
-   * @example 'http://localhost:3000'
-   */
-  origin: string
-  /**
-   * Custom WebSocket class
-   * @default globalThis.WebSocket
-   */
-  wsFactory?: (url: URL) => WebSocket
-
-  debug?: boolean
-}
-
-export class WebSocketClientTransport extends ProtocolTransport {
-  protected webSocket: WebSocket | null = null
-  protected connecting: Promise<void> | null = null
-  protected options: WebSocketClientTransportOptions
-
-  constructor(
-    protected readonly protocol: Protocol,
-    options: WebSocketClientTransportOptions,
-  ) {
-    super()
-    this.options = {
-      debug: false,
-      ...options,
-    }
-  }
-
-  connect(auth: any, transformer: ProtocolBaseTransformer): Promise<void> {
-    // this.auth = auth
-    const wsUrl = new URL('/api', this.options.origin)
-    if (this.protocol.contentType) {
-      wsUrl.searchParams.set('content-type', this.protocol.contentType)
-      wsUrl.searchParams.set('accept', this.protocol.contentType)
-    }
-    if (auth) wsUrl.searchParams.set('auth', auth)
-
-    const ws =
-      this.options.wsFactory?.(wsUrl) ?? new WebSocket(wsUrl.toString())
-
-    ws.binaryType = 'arraybuffer'
-
-    this.status = ProtocolTransportStatus.CONNECTING
-
-    ws.addEventListener('message', ({ data }) => {
-      this.protocol.handleServerMessage(data as ArrayBuffer, this, transformer)
-    })
-
-    ws.addEventListener(
-      'close',
-      (event) => {
-        console.dir(event)
-        this.status = ProtocolTransportStatus.DISCONNECTED
-        if (event.code !== 1000) this.emit('disconnected')
-        this.webSocket = null
-      },
-      { once: true },
-    )
-
-    this.webSocket = ws
-
-    this.connecting = new Promise((resolve, reject) => {
-      ws.addEventListener(
-        'open',
-        () => {
-          this.status = ProtocolTransportStatus.CONNECTED
-          this.emit('connected')
-          resolve()
-        },
-        { once: true },
-      )
-
-      ws.addEventListener(
-        'error',
-        (event) => {
-          reject(new Error('WebSocket error', { cause: event }))
-        },
-        { once: true },
-      )
-    })
-
-    return this.connecting
-  }
-
-  async disconnect(): Promise<void> {
-    if (this.webSocket === null) return
-    this.webSocket!.close(1000, 'user')
-    return _once(this.webSocket, 'close')
-  }
-
-  async call(
-    namespace: string,
-    procedure: string,
-    payload: any,
-    options: ProtocolBaseClientCallOptions,
-    transformer: ProtocolBaseTransformer,
-  ) {
-    const { call, buffer } = this.protocol.createRpc(
-      namespace,
-      procedure,
-      payload,
-      options,
-      transformer,
-    )
-    await this.send(ClientMessageType.Rpc, buffer)
-    return call
-  }
-
-  async send(
-    messageType: ClientMessageType,
-    buffer: ArrayBuffer,
-  ): Promise<void> {
-    if (this.connecting) await this.connecting
-    this.webSocket!.send(concat(encodeNumber(messageType, 'Uint8'), buffer))
-  }
-}
-
-function _once(target: EventTarget, event: string) {
-  return new Promise<void>((resolve) => {
-    target.addEventListener(event, () => resolve(), { once: true })
-  })
-}