npm - @sprucelabs/mercury-client - Versions diffs - 42.0.30 → 42.0.32 - Mend

@sprucelabs/mercury-client 42.0.30 → 42.0.32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/build/clients/MercurySocketIoClient.d.ts +4 -1
package/build/clients/MercurySocketIoClient.js +37 -19
package/build/esm/clients/MercurySocketIoClient.d.ts +4 -1
package/build/esm/clients/MercurySocketIoClient.js +37 -19
package/package.json +10 -10

package/build/clients/MercurySocketIoClient.d.ts CHANGED Viewed

@@ -13,6 +13,7 @@ export default class MercurySocketIoClient<Contract extends EventContract> imple
     private proxyToken;
     private emitTimeoutMs;
     private reconnectDelayMs;
+    private listenerMap;
     private isReAuthing;
     private reconnectPromise;
     protected lastAuthOptions?: {
@@ -53,6 +54,7 @@ export default class MercurySocketIoClient<Contract extends EventContract> imple
     private reRegisterAllListeners;
     private mapSocketErrorToSpruceError;
     emit<Name extends EventName<Contract>, IEventSignature extends EventSignature = Contract['eventSignatures'][EventName], EmitSchema extends Schema = IEventSignature['emitPayloadSchema'] extends Schema ? IEventSignature['emitPayloadSchema'] : never, ResponseSchema extends Schema = IEventSignature['responsePayloadSchema'] extends Schema ? IEventSignature['responsePayloadSchema'] : never, ResponsePayload = ResponseSchema extends Schema ? SchemaValues<ResponseSchema> : never>(eventName: Name, targetAndPayload?: (EmitSchema extends Schema ? SchemaValues<EmitSchema> : never) | EmitCallback<Contract, Name>, cb?: EmitCallback<Contract, Name>): Promise<MercuryAggregateResponse<ResponsePayload>>;
+    private handleLocalEmit;
     emitAndFlattenResponses<Name extends EventName<Contract>, IEventSignature extends EventSignature = Contract['eventSignatures'][EventName], EmitSchema extends Schema = IEventSignature['emitPayloadSchema'] extends Schema ? IEventSignature['emitPayloadSchema'] : never, ResponseSchema extends Schema = IEventSignature['responsePayloadSchema'] extends Schema ? IEventSignature['responsePayloadSchema'] : never, ResponsePayload = ResponseSchema extends Schema ? SchemaValues<ResponseSchema> : never>(eventName: Name, payload?: (EmitSchema extends Schema ? SchemaValues<EmitSchema> : never) | EmitCallback<Contract, Name>, cb?: EmitCallback<Contract, Name>): Promise<ResponsePayload[]>;
     private _emit;
     protected assertValidEmitTargetAndPayload<Name extends EventName<Contract>>(eventName: Name, payload: any): void;
@@ -61,7 +63,8 @@ export default class MercurySocketIoClient<Contract extends EventContract> imple
     setShouldAutoRegisterListeners(should: boolean): void;
     on<Name extends EventName<Contract>, IEventSignature extends EventSignature = Contract['eventSignatures'][EventName], EmitSchema extends Schema = IEventSignature['emitPayloadSchema'] extends Schema ? IEventSignature['emitPayloadSchema'] : never>(eventName: Name, cb: (payload: EmitSchema extends Schema ? SchemaValues<EmitSchema> : never) => IEventSignature['responsePayloadSchema'] extends Schema ? Promise<SchemaValues<IEventSignature['responsePayloadSchema']>> | SchemaValues<IEventSignature['responsePayloadSchema']> : Promise<void> | void): Promise<void>;
     private isEventLocal;
-    off(eventName: EventName<Contract>): Promise<number>;
+    off(eventName: EventName<Contract>, cb?: () => void): Promise<number>;
+    private removeLocalListener;
     getId(): string;
     disconnect(): Promise<void>;
     authenticate(options: AuthenticateOptions): Promise<{

package/build/clients/MercurySocketIoClient.js CHANGED Viewed

@@ -19,6 +19,7 @@ class MercurySocketIoClient {
     }
     constructor(options) {
         this.proxyToken = null;
+        this.listenerMap = new WeakMap();
         this.isReAuthing = false;
         this.reconnectPromise = null;
         this.connectionRetriesRemaining = 5;
@@ -231,23 +232,26 @@ class MercurySocketIoClient {
     async emit(eventName, targetAndPayload, cb) {
         const isLocalEvent = this.isEventLocal(eventName);
         if (isLocalEvent) {
-            const listeners = this.registeredListeners.filter((r) => r[0] === eventName);
-            for (const listener of listeners) {
-                const cb = listener === null || listener === void 0 ? void 0 : listener[1];
-                cb === null || cb === void 0 ? void 0 : cb({
-                    //@ts-ignore
-                    payload: targetAndPayload === null || targetAndPayload === void 0 ? void 0 : targetAndPayload.payload,
-                });
-            }
-            return {
-                responses: [],
-                totalContracts: 0,
-                totalErrors: 0,
-                totalResponses: 0,
-            };
+            return this.handleLocalEmit(eventName, targetAndPayload);
         }
         return this._emit(this.maxEmitRetries, eventName, targetAndPayload, cb);
     }
+    handleLocalEmit(eventName, targetAndPayload) {
+        const listeners = this.registeredListeners.filter((r) => r[0] === eventName);
+        for (const listener of listeners) {
+            const cb = listener === null || listener === void 0 ? void 0 : listener[1];
+            cb === null || cb === void 0 ? void 0 : cb({
+                //@ts-ignore
+                payload: targetAndPayload === null || targetAndPayload === void 0 ? void 0 : targetAndPayload.payload,
+            });
+        }
+        return {
+            responses: [],
+            totalContracts: 0,
+            totalErrors: 0,
+            totalResponses: 0,
+        };
+    }
     async emitAndFlattenResponses(eventName, payload, cb) {
         const results = await this.emit(eventName, payload, cb);
         const { payloads, errors } = spruce_event_utils_1.eventResponseUtil.getAllResponsePayloadsAndErrors(results, SpruceError_1.default);
@@ -418,9 +422,7 @@ class MercurySocketIoClient {
                 throw error_1.default.parse(options, SpruceError_1.default);
             }
         }
-        (_c = this.socket) === null || _c === void 0 ? void 0 : _c.on(eventName,
-        //@ts-ignore
-        async (targetAndPayload, ioCallback) => {
+        const listener = async (targetAndPayload, ioCallback) => {
             if (cb) {
                 try {
                     const results = await cb(targetAndPayload);
@@ -444,12 +446,17 @@ class MercurySocketIoClient {
                     }
                 }
             }
-        });
+        };
+        this.listenerMap.set(cb, listener);
+        (_c = this.socket) === null || _c === void 0 ? void 0 : _c.on(eventName,
+        //@ts-ignore
+        listener);
     }
     isEventLocal(eventName) {
         return eventName === 'connection-status-change';
     }
-    async off(eventName) {
+    async off(eventName, cb) {
+        this.removeLocalListener(cb, eventName);
         return new Promise((resolve, reject) => {
             var _a;
             if (!this.socket || !this.auth || this.isEventLocal(eventName)) {
@@ -471,6 +478,17 @@ class MercurySocketIoClient {
             });
         });
     }
+    removeLocalListener(cb, eventName) {
+        var _a, _b;
+        const listener = this.listenerMap.get(cb);
+        if (listener) {
+            this.listenerMap.delete(cb);
+            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.off(eventName, listener);
+        }
+        else {
+            (_b = this.socket) === null || _b === void 0 ? void 0 : _b.removeAllListeners(eventName);
+        }
+    }
     getId() {
         return this.id;
     }

package/build/esm/clients/MercurySocketIoClient.d.ts CHANGED Viewed

@@ -13,6 +13,7 @@ export default class MercurySocketIoClient<Contract extends EventContract> imple
     private proxyToken;
     private emitTimeoutMs;
     private reconnectDelayMs;
+    private listenerMap;
     private isReAuthing;
     private reconnectPromise;
     protected lastAuthOptions?: {
@@ -53,6 +54,7 @@ export default class MercurySocketIoClient<Contract extends EventContract> imple
     private reRegisterAllListeners;
     private mapSocketErrorToSpruceError;
     emit<Name extends EventName<Contract>, IEventSignature extends EventSignature = Contract['eventSignatures'][EventName], EmitSchema extends Schema = IEventSignature['emitPayloadSchema'] extends Schema ? IEventSignature['emitPayloadSchema'] : never, ResponseSchema extends Schema = IEventSignature['responsePayloadSchema'] extends Schema ? IEventSignature['responsePayloadSchema'] : never, ResponsePayload = ResponseSchema extends Schema ? SchemaValues<ResponseSchema> : never>(eventName: Name, targetAndPayload?: (EmitSchema extends Schema ? SchemaValues<EmitSchema> : never) | EmitCallback<Contract, Name>, cb?: EmitCallback<Contract, Name>): Promise<MercuryAggregateResponse<ResponsePayload>>;
+    private handleLocalEmit;
     emitAndFlattenResponses<Name extends EventName<Contract>, IEventSignature extends EventSignature = Contract['eventSignatures'][EventName], EmitSchema extends Schema = IEventSignature['emitPayloadSchema'] extends Schema ? IEventSignature['emitPayloadSchema'] : never, ResponseSchema extends Schema = IEventSignature['responsePayloadSchema'] extends Schema ? IEventSignature['responsePayloadSchema'] : never, ResponsePayload = ResponseSchema extends Schema ? SchemaValues<ResponseSchema> : never>(eventName: Name, payload?: (EmitSchema extends Schema ? SchemaValues<EmitSchema> : never) | EmitCallback<Contract, Name>, cb?: EmitCallback<Contract, Name>): Promise<ResponsePayload[]>;
     private _emit;
     protected assertValidEmitTargetAndPayload<Name extends EventName<Contract>>(eventName: Name, payload: any): void;
@@ -61,7 +63,8 @@ export default class MercurySocketIoClient<Contract extends EventContract> imple
     setShouldAutoRegisterListeners(should: boolean): void;
     on<Name extends EventName<Contract>, IEventSignature extends EventSignature = Contract['eventSignatures'][EventName], EmitSchema extends Schema = IEventSignature['emitPayloadSchema'] extends Schema ? IEventSignature['emitPayloadSchema'] : never>(eventName: Name, cb: (payload: EmitSchema extends Schema ? SchemaValues<EmitSchema> : never) => IEventSignature['responsePayloadSchema'] extends Schema ? Promise<SchemaValues<IEventSignature['responsePayloadSchema']>> | SchemaValues<IEventSignature['responsePayloadSchema']> : Promise<void> | void): Promise<void>;
     private isEventLocal;
-    off(eventName: EventName<Contract>): Promise<number>;
+    off(eventName: EventName<Contract>, cb?: () => void): Promise<number>;
+    private removeLocalListener;
     getId(): string;
     disconnect(): Promise<void>;
     authenticate(options: AuthenticateOptions): Promise<{

package/build/esm/clients/MercurySocketIoClient.js CHANGED Viewed

@@ -33,6 +33,7 @@ class MercurySocketIoClient {
     }
     constructor(options) {
         this.proxyToken = null;
+        this.listenerMap = new WeakMap();
         this.isReAuthing = false;
         this.reconnectPromise = null;
         this.connectionRetriesRemaining = 5;
@@ -256,24 +257,27 @@ class MercurySocketIoClient {
         return __awaiter(this, void 0, void 0, function* () {
             const isLocalEvent = this.isEventLocal(eventName);
             if (isLocalEvent) {
-                const listeners = this.registeredListeners.filter((r) => r[0] === eventName);
-                for (const listener of listeners) {
-                    const cb = listener === null || listener === void 0 ? void 0 : listener[1];
-                    cb === null || cb === void 0 ? void 0 : cb({
-                        //@ts-ignore
-                        payload: targetAndPayload === null || targetAndPayload === void 0 ? void 0 : targetAndPayload.payload,
-                    });
-                }
-                return {
-                    responses: [],
-                    totalContracts: 0,
-                    totalErrors: 0,
-                    totalResponses: 0,
-                };
+                return this.handleLocalEmit(eventName, targetAndPayload);
             }
             return this._emit(this.maxEmitRetries, eventName, targetAndPayload, cb);
         });
     }
+    handleLocalEmit(eventName, targetAndPayload) {
+        const listeners = this.registeredListeners.filter((r) => r[0] === eventName);
+        for (const listener of listeners) {
+            const cb = listener === null || listener === void 0 ? void 0 : listener[1];
+            cb === null || cb === void 0 ? void 0 : cb({
+                //@ts-ignore
+                payload: targetAndPayload === null || targetAndPayload === void 0 ? void 0 : targetAndPayload.payload,
+            });
+        }
+        return {
+            responses: [],
+            totalContracts: 0,
+            totalErrors: 0,
+            totalResponses: 0,
+        };
+    }
     emitAndFlattenResponses(eventName, payload, cb) {
         return __awaiter(this, void 0, void 0, function* () {
             const results = yield this.emit(eventName, payload, cb);
@@ -447,9 +451,7 @@ class MercurySocketIoClient {
                     throw AbstractSpruceError.parse(options, SpruceError);
                 }
             }
-            (_c = this.socket) === null || _c === void 0 ? void 0 : _c.on(eventName,
-            //@ts-ignore
-            (targetAndPayload, ioCallback) => __awaiter(this, void 0, void 0, function* () {
+            const listener = (targetAndPayload, ioCallback) => __awaiter(this, void 0, void 0, function* () {
                 if (cb) {
                     try {
                         const results = yield cb(targetAndPayload);
@@ -473,14 +475,19 @@ class MercurySocketIoClient {
                         }
                     }
                 }
-            }));
+            });
+            this.listenerMap.set(cb, listener);
+            (_c = this.socket) === null || _c === void 0 ? void 0 : _c.on(eventName,
+            //@ts-ignore
+            listener);
         });
     }
     isEventLocal(eventName) {
         return eventName === 'connection-status-change';
     }
-    off(eventName) {
+    off(eventName, cb) {
         return __awaiter(this, void 0, void 0, function* () {
+            this.removeLocalListener(cb, eventName);
             return new Promise((resolve, reject) => {
                 var _a;
                 if (!this.socket || !this.auth || this.isEventLocal(eventName)) {
@@ -503,6 +510,17 @@ class MercurySocketIoClient {
             });
         });
     }
+    removeLocalListener(cb, eventName) {
+        var _a, _b;
+        const listener = this.listenerMap.get(cb);
+        if (listener) {
+            this.listenerMap.delete(cb);
+            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.off(eventName, listener);
+        }
+        else {
+            (_b = this.socket) === null || _b === void 0 ? void 0 : _b.removeAllListeners(eventName);
+        }
+    }
     getId() {
         return this.id;
     }

package/package.json CHANGED Viewed

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "42.0.30",
+  "version": "42.0.32",
   "files": [
     "build"
   ],
@@ -63,10 +63,10 @@
     "watch.tsc": "tsc -w"
   },
   "dependencies": {
-    "@sprucelabs/error": "^6.0.15",
-    "@sprucelabs/schema": "^30.0.25",
-    "@sprucelabs/spruce-core-schemas": "^40.0.20",
-    "@sprucelabs/spruce-event-utils": "^40.0.23",
+    "@sprucelabs/error": "^6.0.16",
+    "@sprucelabs/schema": "^30.0.26",
+    "@sprucelabs/spruce-core-schemas": "^40.0.21",
+    "@sprucelabs/spruce-event-utils": "^40.0.24",
     "dotenv": "^16.4.5",
     "just-clone": "^6.2.0",
     "socket.io-client": "^4.7.5"
@@ -74,13 +74,13 @@
   "devDependencies": {
     "@sprucelabs/esm-postbuild": "^6.0.14",
     "@sprucelabs/jest-json-reporter": "^8.0.18",
-    "@sprucelabs/mercury-core-events": "^24.0.25",
-    "@sprucelabs/mercury-event-emitter": "^42.0.30",
-    "@sprucelabs/mercury-types": "^47.0.20",
+    "@sprucelabs/mercury-core-events": "^24.0.26",
+    "@sprucelabs/mercury-event-emitter": "^42.0.32",
+    "@sprucelabs/mercury-types": "^47.0.21",
     "@sprucelabs/resolve-path-aliases": "^2.0.15",
     "@sprucelabs/semantic-release": "^5.0.1",
     "@sprucelabs/test": "^9.0.11",
-    "@sprucelabs/test-utils": "^5.0.17",
+    "@sprucelabs/test-utils": "^5.0.18",
     "@types/node": "^20.12.8",
     "chokidar-cli": "^3.0.0",
     "eslint": "^9.1.1",
@@ -111,5 +111,5 @@
       "^#spruce/(.*)$": "<rootDir>/build/.spruce/$1"
     }
   },
-  "gitHead": "68f707e101a825cb788eb6cc4eb6a972d0fc57ab"
+  "gitHead": "06e65c56c2654ca2d9c93722d04eaf50c3b53067"
 }