@nmtjs/ws-client 0.15.0-beta.2 → 0.15.0-beta.20

package/dist/index.d.ts

@@ -0,0 +1,31 @@
+import type { ClientCallOptions, ClientTransportFactory, ClientTransportStartParams } from '@nmtjs/client';
+import type { ProtocolVersion } from '@nmtjs/protocol';
+import type { BaseClientFormat } from '@nmtjs/protocol/client';
+import { ConnectionType } from '@nmtjs/protocol';
+export type WsClientTransportOptions = {
+    /**
+     * The origin of the server
+     * @example 'ws://localhost:3000'
+     */
+    url: string;
+    debug?: boolean;
+    /**
+     * Custom WebSocket class
+     * @default globalThis.WebSocket
+     */
+    WebSocket?: typeof WebSocket;
+};
+export declare class WsTransportClient {
+    protected readonly format: BaseClientFormat;
+    protected readonly protocol: ProtocolVersion;
+    protected options: WsClientTransportOptions;
+    type: ConnectionType.Bidirectional;
+    protected webSocket: WebSocket | null;
+    protected connecting: Promise<void> | null;
+    constructor(format: BaseClientFormat, protocol: ProtocolVersion, options: WsClientTransportOptions);
+    connect(params: ClientTransportStartParams): Promise<void>;
+    disconnect(): Promise<void>;
+    send(message: ArrayBufferView, options: ClientCallOptions): Promise<void>;
+}
+export type WsTransportFactory = ClientTransportFactory<ConnectionType.Bidirectional, WsClientTransportOptions, WsTransportClient>;
+export declare const WsTransportFactory: WsTransportFactory;

package/dist/index.js

@@ -28,19 +28,21 @@ export class WsTransportClient {
         ws.binaryType = 'arraybuffer';
         this.connecting = new Promise((resolve, reject) => {
             ws.addEventListener('open', () => {
-                params.onConnect();
                 this.connecting = null;
+                params.onConnect();
                 resolve();
             });
             ws.addEventListener('message', (event) => {
                 params.onMessage(new Uint8Array(event.data));
             });
             ws.addEventListener('error', (event) => {
+                this.connecting = null;
                 reject(new Error('WebSocket error', { cause: event }));
             });
             ws.addEventListener('close', (event) => {
-                params.onDisconnect(event.reason);
                 this.webSocket = null;
+                this.connecting = null;
+                params.onDisconnect('server');
             });
         });
         this.webSocket = ws;
@@ -62,3 +64,4 @@ export class WsTransportClient {
     }
 }
 export const WsTransportFactory = (params, options) => new WsTransportClient(params.format, params.protocol, options);
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -5,26 +5,27 @@
     ".": "./dist/index.js"
   },
   "dependencies": {
-    "@nmtjs/common": "0.15.0-beta.2",
-    "@nmtjs/client": "0.15.0-beta.2"
+    "@nmtjs/client": "0.15.0-beta.20",
+    "@nmtjs/common": "0.15.0-beta.20"
   },
   "devDependencies": {
-    "@nmtjs/protocol": "0.15.0-beta.2"
+    "@nmtjs/protocol": "0.15.0-beta.20"
   },
   "peerDependencies": {
-    "@nmtjs/common": "0.15.0-beta.2",
-    "@nmtjs/protocol": "0.15.0-beta.2",
-    "@nmtjs/client": "0.15.0-beta.2"
+    "@nmtjs/client": "0.15.0-beta.20",
+    "@nmtjs/common": "0.15.0-beta.20",
+    "@nmtjs/protocol": "0.15.0-beta.20"
   },
   "files": [
     "dist",
+    "src",
     "LICENSE.md",
     "README.md"
   ],
-  "version": "0.15.0-beta.2",
+  "version": "0.15.0-beta.20",
   "scripts": {
     "clean-build": "rm -rf ./dist",
-    "build": "tsc",
+    "build": "tsc --declaration --sourcemap",
     "dev": "tsc --watch",
     "type-check": "tsc --noEmit"
   }

package/src/index.ts

@@ -0,0 +1,108 @@
+import type {
+  ClientCallOptions,
+  ClientTransportFactory,
+  ClientTransportStartParams,
+} from '@nmtjs/client'
+import type { ProtocolVersion } from '@nmtjs/protocol'
+import type { BaseClientFormat } from '@nmtjs/protocol/client'
+import { once } from '@nmtjs/common'
+import { ConnectionType } from '@nmtjs/protocol'
+
+export type WsClientTransportOptions = {
+  /**
+   * The origin of the server
+   * @example 'ws://localhost:3000'
+   */
+  url: string
+  debug?: boolean
+
+  /**
+   * Custom WebSocket class
+   * @default globalThis.WebSocket
+   */
+  WebSocket?: typeof WebSocket
+}
+
+export class WsTransportClient {
+  type: ConnectionType.Bidirectional = ConnectionType.Bidirectional
+
+  protected webSocket: WebSocket | null = null
+  protected connecting: Promise<void> | null = null
+
+  constructor(
+    protected readonly format: BaseClientFormat,
+    protected readonly protocol: ProtocolVersion,
+    protected options: WsClientTransportOptions,
+  ) {
+    this.options = { debug: false, ...options }
+  }
+
+  async connect(params: ClientTransportStartParams) {
+    const url = new URL(
+      params.application ? `/${params.application}` : '/',
+      this.options.url,
+    )
+
+    const secure = url.protocol === 'wss:' || url.protocol === 'https:'
+
+    url.protocol = secure ? 'wss:' : 'ws:'
+    url.searchParams.set('content-type', this.format.contentType)
+    url.searchParams.set('accept', this.format.contentType)
+
+    if (params.auth) {
+      url.searchParams.set('auth', params.auth)
+    }
+
+    const ws = this.options.WebSocket
+      ? new this.options.WebSocket(url)
+      : new WebSocket(url.toString())
+
+    ws.binaryType = 'arraybuffer'
+
+    this.connecting = new Promise((resolve, reject) => {
+      ws.addEventListener('open', () => {
+        this.connecting = null
+        params.onConnect()
+        resolve()
+      })
+      ws.addEventListener('message', (event) => {
+        params.onMessage(new Uint8Array(event.data as ArrayBuffer))
+      })
+      ws.addEventListener('error', (event) => {
+        this.connecting = null
+        reject(new Error('WebSocket error', { cause: event }))
+      })
+      ws.addEventListener('close', (event) => {
+        this.webSocket = null
+        this.connecting = null
+        params.onDisconnect('server')
+      })
+    })
+
+    this.webSocket = ws
+
+    return this.connecting
+  }
+
+  async disconnect() {
+    if (this.webSocket === null) return
+    const closing = once(this.webSocket, 'close')
+    this.webSocket!.close(1000, 'client')
+    return closing
+  }
+
+  async send(message: ArrayBufferView, options: ClientCallOptions) {
+    if (this.webSocket === null) throw new Error('WebSocket is not connected')
+    await this.connecting
+    if (!options.signal?.aborted) this.webSocket!.send(message)
+  }
+}
+
+export type WsTransportFactory = ClientTransportFactory<
+  ConnectionType.Bidirectional,
+  WsClientTransportOptions,
+  WsTransportClient
+>
+
+export const WsTransportFactory: WsTransportFactory = (params, options) =>
+  new WsTransportClient(params.format, params.protocol, options)