@socket-mesh/client 18.1.5 → 19.0.0

package/dist/plugins/batching-plugin.js

@@ -1,8 +1,15 @@
 export class BatchingPlugin {
+    _batchingIntervalId;
+    _handshakeTimeoutId;
+    _isBatching;
+    batchInterval;
+    batchOnHandshakeDuration;
+    type;
     constructor(options) {
         this._isBatching = false;
-        this.batchInterval = options?.batchInterval || 50;
-        this.batchOnHandshakeDuration = options?.batchOnHandshakeDuration ?? false;
+        this.type = options.type;
+        this.batchInterval = options.batchInterval || 50;
+        this.batchOnHandshakeDuration = options.batchOnHandshakeDuration ?? false;
         this._batchingIntervalId = null;
         this._handshakeTimeoutId = null;
     }
@@ -16,6 +23,9 @@ export class BatchingPlugin {
     get isBatching() {
         return this._isBatching || this._batchingIntervalId !== null;
     }
+    onDisconnected() {
+        this.cancelBatching();
+    }
     onReady() {
         if (this._isBatching) {
             this.start();
@@ -27,13 +37,6 @@ export class BatchingPlugin {
             }, this.batchOnHandshakeDuration);
         }
     }
-    onDisconnected() {
-        this.cancelBatching();
-    }
-    startBatching() {
-        this._isBatching = true;
-        this.start();
-    }
     start() {
         if (this._batchingIntervalId !== null) {
             return;
@@ -42,9 +45,9 @@ export class BatchingPlugin {
             this.flush();
         }, this.batchInterval);
     }
-    stopBatching() {
-        this._isBatching = false;
-        this.stop();
+    startBatching() {
+        this._isBatching = true;
+        this.start();
     }
     stop() {
         if (this._batchingIntervalId !== null) {
@@ -57,11 +60,19 @@ export class BatchingPlugin {
         }
         this.flush();
     }
+    stopBatching() {
+        this._isBatching = false;
+        this.stop();
+    }
 }
 export class RequestBatchingPlugin extends BatchingPlugin {
+    _continue;
+    _requests;
     constructor(options) {
-        super(options);
-        this.type = 'requestBatching';
+        super({
+            ...(options ?? {}),
+            type: 'requestBatching'
+        });
         this._requests = [];
         this._continue = null;
     }
@@ -72,12 +83,14 @@ export class RequestBatchingPlugin extends BatchingPlugin {
     }
     flush() {
         if (this._requests.length) {
-            this._continue(this._requests);
+            if (this._continue) {
+                this._continue(this._requests);
+                this._continue = null;
+            }
             this._requests = [];
-            this._continue = null;
         }
     }
-    sendRequest({ requests, cont }) {
+    sendRequest({ cont, requests }) {
         if (!this.isBatching) {
             cont(requests);
             return;
@@ -87,20 +100,26 @@ export class RequestBatchingPlugin extends BatchingPlugin {
     }
 }
 export class ResponseBatchingPlugin extends BatchingPlugin {
+    _continue;
+    _responses;
     constructor(options) {
-        super(options);
-        this.type = 'responseBatching';
+        super({
+            ...(options ?? {}),
+            type: 'responseBatching'
+        });
         this._responses = [];
         this._continue = null;
     }
     flush() {
         if (this._responses.length) {
-            this._continue(this._responses);
+            if (this._continue) {
+                this._continue(this._responses);
+                this._continue = null;
+            }
             this._responses = [];
-            this._continue = null;
         }
     }
-    sendResponse({ responses, cont }) {
+    sendResponse({ cont, responses }) {
         if (!this.isBatching) {
             cont(responses);
             return;

package/dist/plugins/in-order-plugin.d.ts

@@ -1,10 +1,10 @@
-import { RawData } from "ws";
-import { MessageRawPluginArgs, MethodMap, Plugin, PluginArgs, PrivateMethodMap, PublicMethodMap, ServiceMap } from "@socket-mesh/core";
-export declare class InOrderPlugin<TIncoming extends MethodMap, TOutgoing extends PublicMethodMap, TPrivateOutgoing extends PrivateMethodMap, TService extends ServiceMap, TState extends object> implements Plugin<TIncoming, TOutgoing, TPrivateOutgoing, TService, TState> {
-    type: 'inOrder';
+import { MessageRawPluginArgs, Plugin, PluginArgs } from '@socket-mesh/core';
+import { RawData } from 'ws';
+export declare class InOrderPlugin implements Plugin {
     private readonly _inboundMessageStream;
+    type: 'inOrder';
     constructor();
     handleInboundMessageStream(): void;
-    onEnd({ transport }: PluginArgs<TIncoming, TOutgoing, TPrivateOutgoing, TService, TState>): void;
-    onMessageRaw(options: MessageRawPluginArgs<TIncoming, TOutgoing, TPrivateOutgoing, TService, TState>): Promise<string | RawData>;
+    onEnd({ transport }: PluginArgs): void;
+    onMessageRaw(options: MessageRawPluginArgs): Promise<RawData | string>;
 }

package/dist/plugins/in-order-plugin.js

@@ -1,15 +1,18 @@
-import { WritableConsumableStream } from "@socket-mesh/writable-consumable-stream";
+import { WritableConsumableStream } from '@socket-mesh/writable-consumable-stream';
 export class InOrderPlugin {
-    //private readonly _outboundMessageStream: WritableConsumableStream<SendRequestPluginArgs<T>>;
+    _inboundMessageStream;
+    type;
+    // private readonly _outboundMessageStream: WritableConsumableStream<SendRequestPluginArgs<T>>;
     constructor() {
         this._inboundMessageStream = new WritableConsumableStream();
-        //this._outboundMessageStream = new WritableConsumableStream<SendRequestPluginArgs<T>>;
+        // this._outboundMessageStream = new WritableConsumableStream<SendRequestPluginArgs<T>>;
+        this.type = 'inOrder';
         this.handleInboundMessageStream();
-        //this.handleOutboundMessageStream();
+        // this.handleOutboundMessageStream();
     }
     handleInboundMessageStream() {
         (async () => {
-            for await (let { message, callback, promise } of this._inboundMessageStream) {
+            for await (const { callback, message, promise } of this._inboundMessageStream) {
                 callback(null, message);
                 try {
                     await promise;
@@ -21,36 +24,36 @@ export class InOrderPlugin {
         })();
     }
     /*
-        handleOutboundMessageStream(): void {
-            (async () => {
-                for await (let { requests, cont } of this._outboundMessageStream) {
-                    await new Promise<void>((resolve) => {
-                        const reqCol = new RequestCollection(requests);
-    
-                        if (reqCol.isDone()) {
-                            resolve();
-                            cont(requests);
-                            return;
-                        }
-    
-                        reqCol.listen(() => {
-                            resolve();
-                        });
-    
+    handleOutboundMessageStream(): void {
+        (async () => {
+            for await (let { requests, cont } of this._outboundMessageStream) {
+                await new Promise<void>((resolve) => {
+                    const reqCol = new RequestCollection(requests);
+
+                    if (reqCol.isDone()) {
+                        resolve();
                         cont(requests);
+                        return;
+                    }
+
+                    reqCol.listen(() => {
+                        resolve();
                     });
-                }
-            })();
-        }
-    */
+
+                    cont(requests);
+                });
+            }
+        })();
+    }
+*/
     onEnd({ transport }) {
         if (transport.streamCleanupMode === 'close') {
             this._inboundMessageStream.close();
-            //this._outboundMessageStream.close();
+            // this._outboundMessageStream.close();
         }
         else if (transport.streamCleanupMode === 'kill') {
             this._inboundMessageStream.kill();
-            //this._outboundMessageStream.kill();
+            // this._outboundMessageStream.kill();
         }
     }
     onMessageRaw(options) {
@@ -64,7 +67,7 @@ export class InOrderPlugin {
                 resolve(data);
             };
         });
-        this._inboundMessageStream.write({ callback, ...options });
+        this._inboundMessageStream.write({ callback: callback, ...options });
         return promise;
     }
 }

package/dist/plugins/index.d.ts

@@ -1,3 +1,3 @@
-export * from "./batching-plugin.js";
-export * from "./in-order-plugin.js";
-export * from "./offline-plugin.js";
+export * from './batching-plugin.js';
+export * from './in-order-plugin.js';
+export * from './offline-plugin.js';

package/dist/plugins/index.js

@@ -1,3 +1,3 @@
-export * from "./batching-plugin.js";
-export * from "./in-order-plugin.js";
-export * from "./offline-plugin.js";
+export * from './batching-plugin.js';
+export * from './in-order-plugin.js';
+export * from './offline-plugin.js';

package/dist/plugins/offline-plugin.d.ts

@@ -1,13 +1,13 @@
-import { MethodMap, Plugin, PrivateMethodMap, PublicMethodMap, SendRequestPluginArgs, ServiceMap } from "@socket-mesh/core";
-export declare class OfflinePlugin<TIncoming extends MethodMap, TOutgoing extends PublicMethodMap, TPrivateOutgoing extends PrivateMethodMap, TService extends ServiceMap, TState extends object> implements Plugin<TIncoming, TOutgoing, TPrivateOutgoing, TService, TState> {
+import { Plugin, SendRequestPluginArgs } from '@socket-mesh/core';
+export declare class OfflinePlugin implements Plugin {
+    private _continue;
     private _isReady;
     private _requests;
-    private _continue;
+    type: 'offline';
     constructor();
-    type: "offline";
-    sendRequest({ requests, cont }: SendRequestPluginArgs<TIncoming, TOutgoing, TPrivateOutgoing, TService, TState>): void;
-    onReady(): void;
+    private flush;
     onClose(): void;
     onDisconnected(): void;
-    private flush;
+    onReady(): void;
+    sendRequest({ cont, requests }: SendRequestPluginArgs): void;
 }

package/dist/plugins/offline-plugin.js

@@ -1,20 +1,46 @@
 const SYSTEM_METHODS = ['#handshake', '#removeAuthToken'];
 export class OfflinePlugin {
+    _continue;
+    _isReady;
+    _requests;
+    type;
     constructor() {
         this.type = 'offline';
         this._isReady = false;
         this._requests = [];
         this._continue = null;
     }
-    sendRequest({ requests, cont }) {
+    flush() {
+        if (this._requests.length) {
+            if (this._continue) {
+                for (const reqs of this._requests) {
+                    this._continue(reqs);
+                }
+                this._continue = null;
+            }
+            this._requests = [];
+        }
+    }
+    onClose() {
+        this._isReady = false;
+    }
+    onDisconnected() {
+        this._requests = [];
+        this._continue = null;
+    }
+    onReady() {
+        this._isReady = true;
+        this.flush();
+    }
+    sendRequest({ cont, requests }) {
         if (this._isReady) {
             cont(requests);
             return;
         }
-        const systemRequests = requests.filter(item => SYSTEM_METHODS.indexOf(String(item.method)) > -1);
+        const systemRequests = requests.filter(item => SYSTEM_METHODS.indexOf(item.method) > -1);
         let otherRequests = requests;
         if (systemRequests.length) {
-            otherRequests = (systemRequests.length === requests.length) ? [] : requests.filter(item => SYSTEM_METHODS.indexOf(String(item.method)) < 0);
+            otherRequests = (systemRequests.length === requests.length) ? [] : requests.filter(item => SYSTEM_METHODS.indexOf(item.method) < 0);
         }
         if (otherRequests.length) {
             this._continue = cont;
@@ -24,24 +50,4 @@ export class OfflinePlugin {
             cont(systemRequests);
         }
     }
-    onReady() {
-        this._isReady = true;
-        this.flush();
-    }
-    onClose() {
-        this._isReady = false;
-    }
-    onDisconnected() {
-        this._requests = [];
-        this._continue = null;
-    }
-    flush() {
-        if (this._requests.length) {
-            for (const reqs of this._requests) {
-                this._continue(reqs);
-            }
-            this._requests = [];
-            this._continue = null;
-        }
-    }
 }

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.5",
+	"version": "19.0.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -15,8 +15,10 @@
 	"scripts": {
 		"build": "node ../../scripts/build.mjs && tsc --project tsconfig.build.json",
 		"bundle": "rollup --config ./rollup.config.js",
-		"deploy": "npm run build && node ../../scripts/publish.mjs",
-		"test": "cross-env node --test --import=./run-test.js test/client-test.ts"
+		"deploy": "node ../../scripts/publish.mjs",
+		"lint": "eslint . --c ../../eslint.config.mjs",
+		"lint:fix": "eslint . --c ../../eslint.config.mjs --fix",
+		"test": "tsx --tsconfig ./tsconfig.build.json --test ./src/**/*.{spec,test}.ts ./test/**/*.{spec,test}.ts"
 	},
 	"repository": {
 		"type": "git",
@@ -26,33 +28,33 @@
 		"url": "https://github.com/socket-mesh/client-server/labels/client"
 	},
 	"devDependencies": {
-		"@kineticcafe/rollup-plugin-delete": "^3.0.0",
-		"@rollup/plugin-alias": "^5.1.0",
-		"@rollup/plugin-commonjs": "^26.0.1",
-		"@rollup/plugin-node-resolve": "^15.2.3",
-		"@rollup/plugin-terser": "^0.4.4",
-		"@rollup/plugin-typescript": "^11.1.6",
-		"@socket-mesh/server": "*",
-		"@socket-mesh/local-storage": "^1.0.2",
-		"@types/clone-deep": "^4.0.4",
-		"@types/jsonwebtoken": "^9.0.6",
-		"@types/ws": "^8.5.10",
-		"jsonwebtoken": "^9.0.2",
-		"rollup": "^4.22.5",
-		"rollup-plugin-dts": "^6.1.1",
-		"tslib": "^2.7.0"
+		"@kineticcafe/rollup-plugin-delete": "catalog:rollup",
+		"@rollup/plugin-alias": "catalog:rollup",
+		"@rollup/plugin-commonjs": "catalog:rollup",
+		"@rollup/plugin-node-resolve": "catalog:rollup",
+		"@rollup/plugin-terser": "catalog:rollup",
+		"@rollup/plugin-typescript": "catalog:rollup",
+		"@socket-mesh/typescript-config": "workspace:^",
+		"@socket-mesh/writable-consumable-stream": "workspace:^",
+		"@types/clone-deep": "catalog:clone-deep",
+		"@types/jsonwebtoken": "catalog:json-web-token",
+		"@types/ws": "catalog:ws",
+		"jsonwebtoken": "catalog:json-web-token",
+		"rollup": "catalog:rollup",
+		"rollup-plugin-dts": "catalog:rollup",
+		"tslib": "catalog:"
 	},
 	"dependencies": {
-		"@socket-mesh/async-stream-emitter": "^7.1.2",
-		"@socket-mesh/auth": "^2.2.0",
-		"@socket-mesh/channels": "^6.1.2",
-		"@socket-mesh/core": "^1.0.3",
-		"@socket-mesh/errors": "^3.2.0",
-		"@socket-mesh/formatter": "^4.1.0",
-		"buffer": "^6.0.3",
-		"events": "^3.3.0",
-		"isomorphic-ws": "^5.0.0",
-		"ws": "^8.18.0"
+		"@socket-mesh/async-stream-emitter": "workspace:^",
+		"@socket-mesh/auth": "workspace:^",
+		"@socket-mesh/channels": "workspace:^",
+		"@socket-mesh/core": "workspace:^",
+		"@socket-mesh/errors": "workspace:^",
+		"@socket-mesh/formatter": "workspace:^",
+		"buffer": "catalog:",
+		"events": "catalog:",
+		"isomorphic-ws": "catalog:ws",
+		"ws": "catalog:ws"
 	},
 	"keywords": [
 		"ncom",