@socket-mesh/client 18.1.0 → 18.1.2

package/dist/client-transport.d.ts

@@ -1,4 +1,4 @@
-import { AnyPacket, AnyResponse, FunctionReturnType, InvokeMethodOptions, InvokeServiceOptions, SocketTransport, SocketStatus } from "@socket-mesh/core";
+import { FunctionReturnType, InvokeMethodOptions, InvokeServiceOptions, SocketTransport, SocketStatus } from "@socket-mesh/core";
 import ws from "isomorphic-ws";
 import { ClientAuthEngine } from "./client-auth-engine.js";
 import { ServerPrivateMap } from "./maps/server-map.js";
@@ -22,16 +22,16 @@ export declare class ClientTransport<T extends ClientMap> extends SocketTranspor
     set autoReconnect(value: Partial<AutoReconnectOptions> | boolean);
     connect(options?: ConnectOptions): void;
     get connectAttempts(): number;
-    protected decode(data: string | ws.RawData): AnyPacket<SocketMapFromClient<T>> | AnyPacket<SocketMapFromClient<T>>[] | AnyResponse<SocketMapFromClient<T>> | AnyResponse<SocketMapFromClient<T>>[];
     disconnect(code?: number, reason?: string): void;
     private handshake;
-    protected onOpen(): void;
-    protected onPing(data: Buffer): void;
     protected onClose(code: number, reason?: Buffer): void;
+    protected onOpen(): void;
+    protected onPingPong(): void;
     get pendingReconnect(): boolean;
     get pingTimeoutMs(): number;
     set pingTimeoutMs(value: number);
     private resetReconnect;
+    send(data: Buffer | string): Promise<void>;
     setAuthorization(authToken: AuthToken): Promise<boolean>;
     setAuthorization(signedAuthToken: string, authToken?: AuthToken): Promise<boolean>;
     get status(): SocketStatus;

package/dist/client-transport.js

@@ -57,7 +57,7 @@ export class ClientTransport extends SocketTransport {
             }
         }
         if (this.status === 'closed') {
-            this.webSocket = new ws.WebSocket(this._uri, this._wsOptions);
+            this.webSocket = new ws(this._uri, this._wsOptions);
             this.socket.emit('connecting', {});
             this._connectTimeoutRef = setTimeout(() => {
                 this.disconnect(4007);
@@ -67,9 +67,6 @@ export class ClientTransport extends SocketTransport {
     get connectAttempts() {
         return this._connectAttempts;
     }
-    decode(data) {
-        return super.decode(data);
-    }
     disconnect(code = 1000, reason) {
         if (code !== 4007) {
             this.resetReconnect();
@@ -87,40 +84,6 @@ export class ClientTransport extends SocketTransport {
         }
         return status;
     }
-    onOpen() {
-        super.onOpen();
-        clearTimeout(this._connectTimeoutRef);
-        this._connectTimeoutRef = null;
-        this.resetReconnect();
-        this.resetPingTimeout(this.isPingTimeoutDisabled ? false : this.pingTimeoutMs, 4000);
-        let authError;
-        this.handshake()
-            .then(status => {
-            this.id = status.id;
-            this.pingTimeoutMs = status.pingTimeoutMs;
-            if ('authToken' in status && status.authToken) {
-                return this.setAuthorization(status.authToken);
-            }
-            if ('authError' in status) {
-                authError = status.authError;
-            }
-            return this.changeToUnauthenticatedState();
-        })
-            .then(() => {
-            this.setReadyStatus(this.pingTimeoutMs, authError);
-        })
-            .catch(err => {
-            if (err.statusCode == null) {
-                err.statusCode = 4003;
-            }
-            this.onError(err);
-            this.disconnect(err.statusCode, err.toString());
-        });
-    }
-    onPing(data) {
-        this.resetPingTimeout(this.isPingTimeoutDisabled ? false : this.pingTimeoutMs, 4000);
-        super.onPing(data);
-    }
     onClose(code, reason) {
         const status = this.status;
         let reconnecting = false;
@@ -153,6 +116,41 @@ export class ClientTransport extends SocketTransport {
             this.onDisconnect(status, code, strReason);
         }
     }
+    onOpen() {
+        super.onOpen();
+        clearTimeout(this._connectTimeoutRef);
+        this._connectTimeoutRef = null;
+        this.resetReconnect();
+        this.resetPingTimeout(this.isPingTimeoutDisabled ? false : this.pingTimeoutMs, 4000);
+        let authError;
+        this.handshake()
+            .then(status => {
+            this.id = status.id;
+            this.pingTimeoutMs = status.pingTimeoutMs;
+            if ('authToken' in status && status.authToken) {
+                return this.setAuthorization(status.authToken);
+            }
+            if ('authError' in status) {
+                authError = status.authError;
+            }
+            return this.changeToUnauthenticatedState();
+        })
+            .then(() => {
+            this.setReadyStatus(this.pingTimeoutMs, authError);
+        })
+            .catch(err => {
+            if (err.statusCode == null) {
+                err.statusCode = 4003;
+            }
+            this.onError(err);
+            this.disconnect(err.statusCode, err.toString());
+        });
+    }
+    onPingPong() {
+        this.send('');
+        this.resetPingTimeout(this.isPingTimeoutDisabled ? false : this.pingTimeoutMs, 4000);
+        this.socket.emit('ping', {});
+    }
     get pendingReconnect() {
         return (this._pendingReconnectTimeout !== null);
     }
@@ -167,6 +165,9 @@ export class ClientTransport extends SocketTransport {
         this._pendingReconnectTimeout = null;
         this._connectAttempts = 0;
     }
+    async send(data) {
+        this.webSocket.send(data);
+    }
     async setAuthorization(signedAuthToken, authToken) {
         const wasAuthenticated = !!this.signedAuthToken;
         const changed = await super.setAuthorization(signedAuthToken, authToken);
@@ -220,7 +221,7 @@ export class ClientTransport extends SocketTransport {
             }
         }
         super.webSocket = value;
-        if (this.webSocket) {
+        if (this.webSocket && this.webSocket.on) {
             // WebSockets will throw an error if they are closed before they are completely open.
             // We hook into these events to supress those errors and clean them up after a connection is established.
             function onOpenCloseError() {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@socket-mesh/client",
 	"description": "A TCP socket pair for easily transmitting full messages without worrying about request size limits.",
-	"version": "18.1.0",
+	"version": "18.1.2",
   "type": "module",
   "main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -18,6 +18,13 @@
     "deploy": "npm run build && node ../../scripts/publish.mjs",
 		"test": "cross-env node --test --import=./run-test.js test/client-test.ts"
 	},
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/socket-mesh/client-server.git"
+  },
+  "bugs": {
+		"url": "https://github.com/socket-mesh/client-server/labels/client"
+  },
 	"devDependencies": {
 		"@rollup/plugin-alias": "^5.1.0",
 		"@rollup/plugin-commonjs": "^26.0.1",
@@ -37,7 +44,7 @@
 		"@socket-mesh/async-stream-emitter": "^7.1.2",
 		"@socket-mesh/auth": "^2.2.0",
 		"@socket-mesh/channels": "^6.1.0",
-		"@socket-mesh/core": "^1.0.0",
+		"@socket-mesh/core": "^1.0.2",
 		"@socket-mesh/errors": "^3.2.0",
 		"@socket-mesh/formatter": "^4.1.0",
     "buffer": "^5.2.1",