@socket-mesh/client 18.1.4 → 18.1.6

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

@@ -1,15 +1,17 @@
-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.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 +23,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 +66,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 { EmptySocketMap, Plugin, SendRequestPluginArgs, SocketMap } from "@socket-mesh/core";
-export declare class OfflinePlugin<T extends SocketMap = EmptySocketMap> implements Plugin<T> {
+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> {
+    private _continue;
     private _isReady;
     private _requests;
-    private _continue;
+    type: 'offline';
     constructor();
-    type: "offline";
-    sendRequest({ requests, cont }: SendRequestPluginArgs<T>): void;
-    onReady(): void;
+    private flush;
     onClose(): void;
     onDisconnected(): void;
-    private flush;
+    onReady(): void;
+    sendRequest({ cont, requests }: SendRequestPluginArgs<TIncoming, TOutgoing, TPrivateOutgoing, TService, TState>): void;
 }

package/dist/plugins/offline-plugin.js

@@ -1,12 +1,38 @@
 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;
@@ -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,58 +1,60 @@
 {
 	"name": "@socket-mesh/client",
 	"description": "A TCP socket pair for easily transmitting full messages without worrying about request size limits.",
-	"version": "18.1.4",
-  "type": "module",
-  "main": "dist/index.js",
+	"version": "18.1.6",
+	"type": "module",
+	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"files": ["./dist"],
-  "browser": {
-    "ws": "./lib/ws-browser.js"
-  },	
+	"browser": {
+		"ws": "./lib/ws-browser.js"
+	},	
 	"author": {
 		"name": "Greg Kimmy"
 	},
 	"scripts": {
-    "build": "node ../../scripts/build.mjs && tsc --project tsconfig.build.json",
+		"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",
-    "url": "git+https://github.com/socket-mesh/client-server.git"
-  },
-  "bugs": {
+	"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": {
-		"@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.18.1",
-		"rollup-plugin-dts": "^6.1.1",
-		"tslib": "^2.6.3"
+		"@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.2",
-		"@socket-mesh/errors": "^3.2.0",
-		"@socket-mesh/formatter": "^4.1.0",
-    "buffer": "^5.2.1",
-		"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",

package/dist/maps/socket-map.d.ts

@@ -1,17 +0,0 @@
-import { ClientMap, ClientPrivateMap } from "./client-map.js";
-import { PublicMethodMap } from "@socket-mesh/core";
-import { ServerPrivateMap } from "./server-map.js";
-export interface SocketMapFromClient<T extends ClientMap> {
-    Incoming: T['Incoming'] & ClientPrivateMap;
-    Service: T['Service'];
-    Outgoing: T['Outgoing'];
-    PrivateOutgoing: T['PrivateOutgoing'] & ServerPrivateMap;
-    State: T['State'];
-}
-export interface BasicSocketMapClient<TOutgoing extends PublicMethodMap = {}, TState extends object = {}> {
-    Incoming: ClientPrivateMap;
-    Service: {};
-    Outgoing: TOutgoing;
-    PrivateOutgoing: ServerPrivateMap;
-    State: TState;
-}

package/dist/maps/socket-map.js

@@ -1 +0,0 @@
-export {};