@sprucelabs/mercury-client 41.0.385 → 42.0.0

package/build/clients/MercuryClientFactory.js

@@ -9,10 +9,15 @@ const constants_1 = require("../constants");
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 const MutableContractClient_1 = __importDefault(require("./MutableContractClient"));
 class MercuryClientFactory {
+    static isTestMode = false;
+    static defaultContract;
+    static timeoutMs = 30000;
+    static totalClients = 0;
+    static clients = [];
+    static ClientClass;
     static async Client(connectionOptions) {
-        var _a;
         const { host: hostOption, contracts, reconnectDelayMs, allowSelfSignedCrt, emitTimeoutMs = this.timeoutMs, shouldReconnect, maxEmitRetries, connectionRetries, } = connectionOptions || {};
-        const host = hostOption !== null && hostOption !== void 0 ? hostOption : constants_1.DEFAULT_HOST;
+        const host = hostOption ?? constants_1.DEFAULT_HOST;
         if (host.substr(0, 4) !== 'http') {
             throw new SpruceError_1.default({ code: 'INVALID_PROTOCOL', uri: host });
         }
@@ -25,15 +30,15 @@ class MercuryClientFactory {
         const eventContract = !contracts && this.defaultContract
             ? this.defaultContract
             : //@ts-ignore
-                spruce_event_utils_1.eventContractUtil.unifyContracts(contracts !== null && contracts !== void 0 ? contracts : []);
+                spruce_event_utils_1.eventContractUtil.unifyContracts(contracts ?? []);
         let Client = MutableContractClient_1.default;
         if (this.isTestMode) {
             //TODO, make this something fitxures sets to make the test client available
             Client = require('../clients/MercuryTestClient').default;
         }
-        const client = new ((_a = MercuryClientFactory.ClientClass) !== null && _a !== void 0 ? _a : 
-        //@ts-ignore
-        Client)({
+        const client = new (MercuryClientFactory.ClientClass ??
+            //@ts-ignore
+            Client)({
             host,
             reconnection: false,
             reconnectDelayMs,
@@ -83,8 +88,4 @@ class MercuryClientFactory {
         return this.clients;
     }
 }
-MercuryClientFactory.isTestMode = false;
-MercuryClientFactory.timeoutMs = 30000;
-MercuryClientFactory.totalClients = 0;
-MercuryClientFactory.clients = [];
 exports.default = MercuryClientFactory;

package/build/clients/MercurySocketIoClient.d.ts

@@ -3,7 +3,9 @@ import { Schema, SchemaValues } from '@sprucelabs/schema';
 import { io, SocketOptions, ManagerOptions } from 'socket.io-client';
 import { ConnectionOptions, MercuryClient } from '../types/client.types';
 export default class MercurySocketIoClient<Contract extends EventContract> implements MercuryClient<Contract> {
-    protected eventContract?: Contract;
+    protected _eventContract?: Contract;
+    protected get eventContract(): Contract;
+    protected set eventContract(contract: Contract);
     static io: typeof io;
     private host;
     private ioOptions;

package/build/clients/MercurySocketIoClient.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -22,46 +11,66 @@ const socket_io_client_1 = require("socket.io-client");
 const SpruceError_1 = __importDefault(require("../errors/SpruceError"));
 const socketIoEventUtil_utility_1 = __importDefault(require("../utilities/socketIoEventUtil.utility"));
 class MercurySocketIoClient {
+    _eventContract;
+    get eventContract() {
+        return this._eventContract;
+    }
+    set eventContract(contract) {
+        this._eventContract = contract;
+    }
+    static io = socket_io_client_1.io;
+    host;
+    ioOptions;
+    socket;
+    proxyToken = null;
+    emitTimeoutMs;
+    reconnectDelayMs;
+    isReAuthing = false;
+    reconnectPromise = null;
+    lastAuthOptions;
+    shouldReconnect;
+    connectionRetriesRemaining = 5;
+    connectionRetries;
+    registeredListeners = [];
+    allowNextEventToBeAuthenticate = false;
+    auth;
+    shouldAutoRegisterListeners = true;
+    isManuallyDisconnected = false;
+    isReconnecting = false;
+    id;
+    skipWaitIfReconnecting = false;
+    maxEmitRetries;
+    authRawResults;
+    authPromise;
+    shouldRegisterProxyOnReconnect = false;
+    reconnectKey;
     constructor(options) {
-        this.proxyToken = null;
-        this.isReAuthing = false;
-        this.reconnectPromise = null;
-        this.connectionRetriesRemaining = 5;
-        this.registeredListeners = [];
-        this.allowNextEventToBeAuthenticate = false;
-        this.shouldAutoRegisterListeners = true;
-        this.isManuallyDisconnected = false;
-        this.isReconnecting = false;
-        this.skipWaitIfReconnecting = false;
-        this.shouldRegisterProxyOnReconnect = false;
-        const { host, eventContract, emitTimeoutMs, reconnectDelayMs, shouldReconnect, maxEmitRetries = 5, connectionRetries } = options, ioOptions = __rest(options, ["host", "eventContract", "emitTimeoutMs", "reconnectDelayMs", "shouldReconnect", "maxEmitRetries", "connectionRetries"]);
+        const { host, eventContract, emitTimeoutMs, reconnectDelayMs, shouldReconnect, maxEmitRetries = 5, connectionRetries, ...ioOptions } = options;
         this.host = host;
-        this.ioOptions = Object.assign(Object.assign({}, ioOptions), { withCredentials: false });
+        this.ioOptions = { ...ioOptions, withCredentials: false };
         this.eventContract = eventContract;
-        this.emitTimeoutMs = emitTimeoutMs !== null && emitTimeoutMs !== void 0 ? emitTimeoutMs : 30000;
-        this.reconnectDelayMs = reconnectDelayMs !== null && reconnectDelayMs !== void 0 ? reconnectDelayMs : 5000;
-        this.shouldReconnect = shouldReconnect !== null && shouldReconnect !== void 0 ? shouldReconnect : true;
+        this.emitTimeoutMs = emitTimeoutMs ?? 30000;
+        this.reconnectDelayMs = reconnectDelayMs ?? 5000;
+        this.shouldReconnect = shouldReconnect ?? true;
         this.id = new Date().getTime().toString();
         this.maxEmitRetries = maxEmitRetries;
-        this.connectionRetriesRemaining = connectionRetries !== null && connectionRetries !== void 0 ? connectionRetries : 5;
-        this.connectionRetries = connectionRetries !== null && connectionRetries !== void 0 ? connectionRetries : 5;
+        this.connectionRetriesRemaining = connectionRetries ?? 5;
+        this.connectionRetries = connectionRetries ?? 5;
     }
     async connect() {
         this.socket = MercurySocketIoClient.io(this.host, this.ioOptions);
         this.emitStatusChange('connecting');
         await new Promise((resolve, reject) => {
-            var _a, _b;
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.on('connect', () => {
-                var _a, _b;
+            this.socket?.on('connect', () => {
                 this.connectionRetriesRemaining = this.connectionRetries;
                 //@ts-ignore
-                (_a = this.socket) === null || _a === void 0 ? void 0 : _a.removeAllListeners();
+                this.socket?.removeAllListeners();
                 this.log(`Connection established!`);
                 if (!this.isReconnecting) {
                     this.emitStatusChange('connected');
                 }
                 if (this.shouldReconnect) {
-                    (_b = this.socket) === null || _b === void 0 ? void 0 : _b.once('disconnect', async (opts) => {
+                    this.socket?.once('disconnect', async (opts) => {
                         this.log('Mercury disconnected, reason:', opts);
                         await this.attemptReconnectAfterDelay();
                     });
@@ -69,7 +78,7 @@ class MercurySocketIoClient {
                 this.attachConnectError();
                 resolve(undefined);
             });
-            (_b = this.socket) === null || _b === void 0 ? void 0 : _b.on('timeout', () => {
+            this.socket?.on('timeout', () => {
                 reject(new SpruceError_1.default({
                     code: 'TIMEOUT',
                     eventName: 'connect',
@@ -89,26 +98,24 @@ class MercurySocketIoClient {
         });
     }
     attachConnectError(reject, resolve) {
-        var _a;
-        (_a = this.socket) === null || _a === void 0 ? void 0 : _a.on('connect_error', async (err) => {
-            var _a;
+        this.socket?.on('connect_error', async (err) => {
             const error = this.mapSocketErrorToSpruceError(err);
             //@ts-ignore
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.removeAllListeners();
+            this.socket?.removeAllListeners();
             this.log('Failed to connect to Mercury', error.message);
             this.log('Connection retries left', `${this.connectionRetriesRemaining}`);
             if (this.connectionRetriesRemaining === 0) {
-                reject === null || reject === void 0 ? void 0 : reject(error);
+                reject?.(error);
                 return;
             }
             try {
                 this.isReconnecting = false;
                 await this.attemptReconnectAfterDelay();
-                resolve === null || resolve === void 0 ? void 0 : resolve();
+                resolve?.();
             }
             catch (err) {
                 //@ts-ignore
-                reject === null || reject === void 0 ? void 0 : reject(err);
+                reject?.(err);
             }
         });
     }
@@ -136,7 +143,6 @@ class MercurySocketIoClient {
         return this.reconnectPromise;
     }
     async reconnect(resolve, reject, retriesLeft) {
-        var _a;
         try {
             this.connectionRetriesRemaining--;
             const key = new Date().getTime();
@@ -174,7 +180,7 @@ class MercurySocketIoClient {
         }
         catch (err) {
             ;
-            ((_a = console.error) !== null && _a !== void 0 ? _a : console.log)(err.message);
+            (console.error ?? console.log)(err.message);
             this.isReconnecting = false;
             this.skipWaitIfReconnecting = false;
             retriesLeft = retriesLeft - 1;
@@ -204,8 +210,7 @@ class MercurySocketIoClient {
         await all;
     }
     mapSocketErrorToSpruceError(err) {
-        var _a;
-        const originalError = new Error((_a = err.message) !== null && _a !== void 0 ? _a : err);
+        const originalError = new Error(err.message ?? err);
         if (err.stack) {
             originalError.stack = err.stack;
         }
@@ -238,10 +243,10 @@ class MercurySocketIoClient {
         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({
+                const cb = listener?.[1];
+                cb?.({
                     //@ts-ignore
-                    payload: targetAndPayload === null || targetAndPayload === void 0 ? void 0 : targetAndPayload.payload,
+                    payload: targetAndPayload?.payload,
                 });
             }
             return {
@@ -256,13 +261,12 @@ class MercurySocketIoClient {
     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);
-        if (errors === null || errors === void 0 ? void 0 : errors[0]) {
+        if (errors?.[0]) {
             throw errors[0];
         }
         return payloads;
     }
     async _emit(retriesRemaining, eventName, payload, cb) {
-        var _a;
         if (!this.skipWaitIfReconnecting) {
             await this.waitIfReconnecting();
         }
@@ -299,12 +303,16 @@ class MercurySocketIoClient {
             }
         };
         if (cb) {
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.on(responseEventName, singleResponseHandler);
+            this.socket?.on(responseEventName, singleResponseHandler);
         }
         const args = [];
         if (payload || this.proxyToken) {
-            const p = Object.assign({}, payload);
-            if (eventName !== exports.authenticateFqen && this.proxyToken && !p.source) {
+            const p = {
+                ...payload,
+            };
+            if (eventName !== exports.authenticateFqen &&
+                this.proxyToken &&
+                !p.source) {
                 p.source = {
                     proxyToken: this.proxyToken,
                 };
@@ -312,11 +320,9 @@ class MercurySocketIoClient {
             args.push(p);
         }
         const results = await new Promise((resolve, reject) => {
-            var _a;
             try {
                 const emitTimeout = setTimeout(async () => {
-                    var _a;
-                    (_a = this.socket) === null || _a === void 0 ? void 0 : _a.off(responseEventName, singleResponseHandler);
+                    this.socket?.off(responseEventName, singleResponseHandler);
                     if (retriesRemaining == 0) {
                         const err = new SpruceError_1.default({
                             code: 'TIMEOUT',
@@ -330,7 +336,8 @@ class MercurySocketIoClient {
                     }
                     retriesRemaining--;
                     try {
-                        if (eventName === exports.authenticateFqen && this.authRawResults) {
+                        if (eventName === exports.authenticateFqen &&
+                            this.authRawResults) {
                             resolve(this.authRawResults);
                             return;
                         }
@@ -345,14 +352,13 @@ class MercurySocketIoClient {
                     }
                 }, this.emitTimeoutMs);
                 args.push((results) => {
-                    var _a;
                     clearTimeout(emitTimeout);
                     this.handleConfirmPinResponse(eventName, results);
-                    (_a = this.socket) === null || _a === void 0 ? void 0 : _a.off(responseEventName, singleResponseHandler);
+                    this.socket?.off(responseEventName, singleResponseHandler);
                     resolve(results);
                 });
                 const ioName = socketIoEventUtil_utility_1.default.toSocketName(eventName);
-                (_a = this.socket) === null || _a === void 0 ? void 0 : _a.emit(ioName, ...args);
+                this.socket?.emit(ioName, ...args);
             }
             catch (err) {
                 reject(err);
@@ -365,7 +371,7 @@ class MercurySocketIoClient {
         const signature = this.getEventSignatureByName(eventName);
         if (signature.emitPayloadSchema) {
             try {
-                (0, schema_1.validateSchemaValues)(signature.emitPayloadSchema, payload !== null && payload !== void 0 ? payload : {});
+                (0, schema_1.validateSchemaValues)(signature.emitPayloadSchema, payload ?? {});
             }
             catch (err) {
                 throw new SpruceError_1.default({
@@ -383,9 +389,8 @@ class MercurySocketIoClient {
         }
     }
     handleConfirmPinResponse(eventName, results) {
-        var _a, _b;
-        const payload = (_b = (_a = results === null || results === void 0 ? void 0 : results.responses) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.payload;
-        if (eventName.search('confirm-pin') === 0 && (payload === null || payload === void 0 ? void 0 : payload.person)) {
+        const payload = results?.responses?.[0]?.payload;
+        if (eventName.search('confirm-pin') === 0 && payload?.person) {
             this.lastAuthOptions = { token: payload.token };
             this.auth = {
                 person: payload.person,
@@ -402,7 +407,6 @@ class MercurySocketIoClient {
         this.shouldAutoRegisterListeners = should;
     }
     async on(eventName, cb) {
-        var _a, _b, _c;
         this.registeredListeners.push([eventName, cb]);
         const isLocalEvent = this.isEventLocal(eventName);
         if (isLocalEvent) {
@@ -414,11 +418,11 @@ class MercurySocketIoClient {
                 payload: { events: [{ eventName }] },
             });
             if (results.totalErrors > 0) {
-                const options = (_b = (_a = results.responses[0].errors) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : 'UNKNOWN_ERROR';
+                const options = results.responses[0].errors?.[0] ?? 'UNKNOWN_ERROR';
                 throw error_1.default.parse(options, SpruceError_1.default);
             }
         }
-        (_c = this.socket) === null || _c === void 0 ? void 0 : _c.on(eventName, 
+        this.socket?.on(eventName, 
         //@ts-ignore
         async (targetAndPayload, ioCallback) => {
             if (cb) {
@@ -451,12 +455,11 @@ class MercurySocketIoClient {
     }
     async off(eventName) {
         return new Promise((resolve, reject) => {
-            var _a;
             if (!this.socket || !this.auth || this.isEventLocal(eventName)) {
                 resolve(0);
                 return;
             }
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.emit('unregister-listeners::v2020_12_25', {
+            this.socket?.emit('unregister-listeners::v2020_12_25', {
                 payload: {
                     fullyQualifiedEventNames: [eventName],
                 },
@@ -475,30 +478,27 @@ class MercurySocketIoClient {
         return this.id;
     }
     async disconnect() {
-        var _a;
         this.isManuallyDisconnected = true;
         if (this.isSocketConnected()) {
             //@ts-ignore
-            (_a = this.socket) === null || _a === void 0 ? void 0 : _a.removeAllListeners();
+            this.socket?.removeAllListeners();
             await new Promise((resolve) => {
-                var _a, _b;
-                (_a = this.socket) === null || _a === void 0 ? void 0 : _a.once('disconnect', () => {
+                this.socket?.once('disconnect', () => {
                     this.socket = undefined;
                     resolve(undefined);
                 });
-                (_b = this.socket) === null || _b === void 0 ? void 0 : _b.disconnect();
+                this.socket?.disconnect();
             });
         }
         return;
     }
     async authenticate(options) {
-        var _a, _b;
         const { skillId, apiKey, token } = options;
         if (this.authPromise) {
             await this.authPromise;
             return {
-                skill: (_a = this.auth) === null || _a === void 0 ? void 0 : _a.skill,
-                person: (_b = this.auth) === null || _b === void 0 ? void 0 : _b.person,
+                skill: this.auth?.skill,
+                person: this.auth?.person,
             };
         }
         this.lastAuthOptions = options;
@@ -528,8 +528,7 @@ class MercurySocketIoClient {
         return !this.isReAuthing && this.isSocketConnected();
     }
     isSocketConnected() {
-        var _a, _b;
-        return (_b = (_a = this.socket) === null || _a === void 0 ? void 0 : _a.connected) !== null && _b !== void 0 ? _b : false;
+        return this.socket?.connected ?? false;
     }
     getProxyToken() {
         return this.proxyToken;
@@ -549,6 +548,5 @@ class MercurySocketIoClient {
         return false;
     }
 }
-MercurySocketIoClient.io = socket_io_client_1.io;
 exports.default = MercurySocketIoClient;
 exports.authenticateFqen = 'authenticate::v2020_12_25';

package/build/clients/MercuryTestClient.d.ts

@@ -8,6 +8,7 @@ declare class InternalEmitter<Contract extends EventContract> extends AbstractEv
     mixinOnlyUniqueSignatures(contract: EventContract): void;
     overrideSignatures(contract: EventContract): void;
     getContract(): SpruceSchemas.Mercury.v2020_12_25.EventContract;
+    setContract(contract: Contract): void;
 }
 export default class MercuryTestClient<
 /** @ts-ignore */
@@ -21,7 +22,6 @@ Contract extends EventContract = SkillEventContract> extends MutableContractClie
     private static namespacesThatHaveToBeHandledLocally;
     private shouldWaitForDelayedConnectIfAuthing;
     private static shouldRequireLocalListeners;
-    /** @ts-ignore */
     protected get eventContract(): Contract;
     protected set eventContract(contract: Contract);
     static setShouldCheckPermissionsOnLocalEvents(should: boolean): void;

package/build/clients/MercuryTestClient.js

@@ -16,12 +16,12 @@ class InternalEmitter extends mercury_event_emitter_1.AbstractEventEmitter {
             spruce_event_utils_1.eventContractUtil.getSignatureByName(this.eventContract, eventName);
             return true;
         }
-        catch (_a) {
+        catch {
             return false;
         }
     }
     validateEmitPayload(schema, actualPayload, eventName) {
-        const payload = Object.assign({}, actualPayload);
+        const payload = { ...actualPayload };
         delete payload.source;
         return super.validateEmitPayload(schema, payload, eventName);
     }
@@ -37,21 +37,31 @@ class InternalEmitter extends mercury_event_emitter_1.AbstractEventEmitter {
     overrideSignatures(contract) {
         const fqens = Object.keys(contract.eventSignatures);
         for (const fqen of fqens) {
-            this.eventContract.eventSignatures[fqen] = contract.eventSignatures[fqen];
+            this.eventContract.eventSignatures[fqen] =
+                contract.eventSignatures[fqen];
         }
     }
     getContract() {
         return this.eventContract;
     }
+    setContract(contract) {
+        this.eventContract = contract;
+    }
 }
 class MercuryTestClient extends MutableContractClient_1.default {
-    /** @ts-ignore */
+    static emitter;
+    _isConnected = false;
+    isConnectedToApi = false;
+    connectPromise;
+    static shouldCheckPermissionsOnLocalEvents = false;
+    shouldHandleAuthenticateLocallyIfListenerSet = true;
+    static namespacesThatHaveToBeHandledLocally = [];
+    shouldWaitForDelayedConnectIfAuthing = true;
+    static shouldRequireLocalListeners = true;
     get eventContract() {
         return MercuryTestClient.emitter.getContract();
     }
-    set eventContract(contract) {
-        MercuryTestClient.getInternalEmitter().overrideSignatures(contract);
-    }
+    set eventContract(contract) { }
     static setShouldCheckPermissionsOnLocalEvents(should) {
         this.shouldCheckPermissionsOnLocalEvents = should;
     }
@@ -63,27 +73,29 @@ class MercuryTestClient extends MutableContractClient_1.default {
     }
     constructor(options) {
         const contract = options.eventContract;
-        super(Object.assign(Object.assign({}, options), { eventContract: contract }));
-        this._isConnected = false;
-        this.isConnectedToApi = false;
-        this.shouldHandleAuthenticateLocallyIfListenerSet = true;
-        this.shouldWaitForDelayedConnectIfAuthing = true;
-        MercuryTestClient.getInternalEmitter(contract);
+        super({ ...options, eventContract: contract });
+        if (!MercuryTestClient.emitter) {
+            MercuryTestClient.getInternalEmitter(contract);
+        }
+        else if (contract) {
+            MercuryTestClient.emitter.overrideSignatures(contract);
+        }
     }
     /** @ts-ignore */
     static getInternalEmitter(contract) {
-        const mixed = mixinConnectionEvents(contract);
         if (!MercuryTestClient.emitter) {
-            MercuryTestClient.emitter = new InternalEmitter({ eventSignatures: {} });
+            MercuryTestClient.emitter = new InternalEmitter({
+                eventSignatures: {},
+            });
         }
+        const mixed = mixinConnectionEvents(contract);
         MercuryTestClient.emitter.mixinOnlyUniqueSignatures(mixed);
         /** @ts-ignore */
         return MercuryTestClient.emitter;
     }
     async off(eventName, cb) {
-        var _a, _b;
-        await ((_a = MercuryTestClient.emitter) === null || _a === void 0 ? void 0 : _a.off(eventName, cb));
-        if (((_b = MercuryTestClient.emitter) === null || _b === void 0 ? void 0 : _b.listenCount(eventName)) === 0) {
+        await MercuryTestClient.emitter?.off(eventName, cb);
+        if (MercuryTestClient.emitter?.listenCount(eventName) === 0) {
             return super.off(eventName);
         }
         else {
@@ -99,16 +111,14 @@ class MercuryTestClient extends MutableContractClient_1.default {
         MercuryTestClient.emitter.mixinContract(contract);
     }
     doesHandleEvent(eventName) {
-        var _a;
         return (super.doesHandleEvent(eventName) ||
-            ((_a = MercuryTestClient.emitter) === null || _a === void 0 ? void 0 : _a.doesHandleEvent(eventName)));
+            MercuryTestClient.emitter?.doesHandleEvent(eventName));
     }
     async on(...args) {
         //@ts-ignore
         return MercuryTestClient.emitter.on(...args);
     }
     async emit(...args) {
-        var _a, _b, _c, _d, _e;
         const fqen = args[0];
         try {
             if (this.shouldHandleEventLocally(fqen)) {
@@ -126,15 +136,16 @@ class MercuryTestClient extends MutableContractClient_1.default {
                 await this.connectIfNotConnected(fqen);
                 //@ts-ignore
                 const results = await super.emit(...args);
-                const firstError = (_c = (_b = (_a = results.responses) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.errors) === null || _c === void 0 ? void 0 : _c[0];
-                if (firstError && ((_d = firstError.options) === null || _d === void 0 ? void 0 : _d.code) === 'INVALID_EVENT_NAME') {
+                const firstError = results.responses?.[0]?.errors?.[0];
+                if (firstError &&
+                    firstError.options?.code === 'INVALID_EVENT_NAME') {
                     firstError.message = `Event not found! Make sure you are booting your skill in your test with \`await this.bootSkill()\`. If you haven't, you'll need to create a listener with \`spruce create.listener\`.\n\nOriginal Error:\n\n${firstError.options.friendlyMessage}`;
                 }
                 return results;
             }
         }
         catch (err) {
-            if (((_e = err.options) === null || _e === void 0 ? void 0 : _e.code) === 'INVALID_EVENT_NAME') {
+            if (err.options?.code === 'INVALID_EVENT_NAME') {
                 err.message = `${err.message} Double check it's spelled correctly (types are passing) and that you've run \`spruce create.event\` to create the event.`;
             }
             throw err;
@@ -157,7 +168,6 @@ class MercuryTestClient extends MutableContractClient_1.default {
         return emitter.listenCount(fqen) > 0;
     }
     async handleEventLocally(args) {
-        var _a;
         const emitter = MercuryTestClient.emitter;
         const fqen = args[0];
         const payload = args[1];
@@ -207,7 +217,7 @@ class MercuryTestClient extends MutableContractClient_1.default {
                                     code: 'UNAUTHORIZED_ACCESS',
                                     fqen,
                                     action: 'emit',
-                                    target: (_a = args[1]) !== null && _a !== void 0 ? _a : {},
+                                    target: args[1] ?? {},
                                     permissionContractId: sig.emitPermissionContract.id,
                                 }),
                             ],
@@ -221,8 +231,7 @@ class MercuryTestClient extends MutableContractClient_1.default {
         return (0, just_clone_1.default)(results);
     }
     assertValidEventSignature(sig, fqen) {
-        var _a, _b;
-        if (!sig.isGlobal && !((_b = (_a = sig.emitPayloadSchema) === null || _a === void 0 ? void 0 : _a.fields) === null || _b === void 0 ? void 0 : _b.target)) {
+        if (!sig.isGlobal && !sig.emitPayloadSchema?.fields?.target) {
             throw new SpruceError_1.default({
                 code: 'INVALID_EVENT_SIGNATURE',
                 fqen,
@@ -231,16 +240,15 @@ class MercuryTestClient extends MutableContractClient_1.default {
         }
     }
     async optionallyCheckPermissions(args, permissionContractId, fqen) {
-        var _a;
         if (!MercuryTestClient.shouldCheckPermissionsOnLocalEvents) {
             return true;
         }
-        let { target } = (_a = args[1]) !== null && _a !== void 0 ? _a : {};
+        let { target } = args[1] ?? {};
         const permTarget = {};
-        if (target === null || target === void 0 ? void 0 : target.organizationId) {
+        if (target?.organizationId) {
             permTarget.organizationId = target.organizationId;
         }
-        if (target === null || target === void 0 ? void 0 : target.locationId) {
+        if (target?.locationId) {
             throw new Error('checking permissions against a location is not supported. Add to mercury-workspace -> mercury-client');
         }
         const results = await this.emit('does-honor-permission-contract::v2020_12_25', {
@@ -257,12 +265,13 @@ class MercuryTestClient extends MutableContractClient_1.default {
         return doesHonor;
     }
     buildSource(args) {
-        var _a, _b, _c;
-        let source = Object.assign({}, (_a = args[1]) === null || _a === void 0 ? void 0 : _a.source);
-        if ((_b = this.auth) === null || _b === void 0 ? void 0 : _b.person) {
+        let source = {
+            ...args[1]?.source,
+        };
+        if (this.auth?.person) {
             source.personId = this.auth.person.id;
         }
-        if ((_c = this.auth) === null || _c === void 0 ? void 0 : _c.skill) {
+        if (this.auth?.skill) {
             source.skillId = this.auth.skill.id;
         }
         if (args[0] !== 'authenticate::v2020_12_25' &&
@@ -273,7 +282,10 @@ class MercuryTestClient extends MutableContractClient_1.default {
         const argsWithSource = [...args];
         if (typeof argsWithSource[1] !== 'function' &&
             Object.keys(source).length > 0) {
-            argsWithSource[1] = Object.assign(Object.assign({}, argsWithSource[1]), { source });
+            argsWithSource[1] = {
+                ...argsWithSource[1],
+                source,
+            };
         }
         return { source, argsWithSource: (0, just_clone_1.default)(argsWithSource) };
     }
@@ -331,13 +343,10 @@ class MercuryTestClient extends MutableContractClient_1.default {
         return this.shouldRequireLocalListeners;
     }
 }
-MercuryTestClient.shouldCheckPermissionsOnLocalEvents = false;
-MercuryTestClient.namespacesThatHaveToBeHandledLocally = [];
-MercuryTestClient.shouldRequireLocalListeners = true;
 exports.default = MercuryTestClient;
 function mixinConnectionEvents(contract) {
     return spruce_event_utils_1.eventContractUtil.unifyContracts([
-        contract !== null && contract !== void 0 ? contract : { eventSignatures: {} },
+        contract ?? { eventSignatures: {} },
         statusChangePayloadSchema_1.connectionStatusContract,
     ]);
 }