airdcpp-apisocket 3.0.0-beta.7 → 3.0.0-beta.8

package/dist-es/tests/mocks/index.d.ts

@@ -0,0 +1,3 @@
+export * from './mock-data.js';
+export * from './mock-server.js';
+export * from './mock-socket.js';

package/dist-es/tests/mocks/index.js

@@ -0,0 +1,4 @@
+export * from './mock-data.js';
+export * from './mock-server.js';
+export * from './mock-socket.js';
+//# sourceMappingURL=index.js.map

package/dist-es/tests/mocks/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tests/mocks/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC"}

package/dist-es/tests/mocks/mock-data.d.ts

@@ -0,0 +1,24 @@
+export declare const DEFAULT_CONNECT_PARAMS: {
+    username: string;
+    password: string;
+    url: string;
+};
+export declare const DEFAULT_AUTH_RESPONSE: {
+    auth_token: string;
+    refresh_token: string;
+    user: {
+        permissions: string[];
+        username: string;
+        active_sessions: number;
+        last_login: number;
+    };
+    system: {
+        cid: string;
+        hostname: string;
+        network_type: string;
+        path_separator: string;
+        platform: string;
+        language: string;
+    };
+    wizard_pending: boolean;
+};

package/dist-es/tests/mocks/mock-data.js

@@ -0,0 +1,25 @@
+export const DEFAULT_CONNECT_PARAMS = {
+    username: 'test',
+    password: 'test',
+    url: 'ws://localhost:7171/api/v1/',
+};
+export const DEFAULT_AUTH_RESPONSE = {
+    auth_token: 'b823187f-4aab-4b71-9764-e63e88401a26',
+    refresh_token: '5124faasf-4aab-4b71-9764-e63e88401a26',
+    user: {
+        permissions: ['admin'],
+        username: 'test',
+        active_sessions: 1,
+        last_login: 0,
+    },
+    system: {
+        cid: 'AHLUODI2YZ2U7FDWMHFNJU65ERGKUN4MH7GW5LY',
+        hostname: 'ubuntu-htpc',
+        network_type: 'private',
+        path_separator: '/',
+        platform: 'other',
+        language: 'fi',
+    },
+    wizard_pending: false,
+};
+//# sourceMappingURL=mock-data.js.map

package/dist-es/tests/mocks/mock-data.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-data.js","sourceRoot":"","sources":["../../../src/tests/mocks/mock-data.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,GAAG,EAAE,6BAA6B;CACnC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,UAAU,EAAE,sCAAsC;IAClD,aAAa,EAAE,uCAAuC;IACtD,IAAI,EAAE;QACJ,WAAW,EAAE,CAAE,OAAO,CAAE;QACxB,QAAQ,EAAE,MAAM;QAChB,eAAe,EAAE,CAAC;QAClB,UAAU,EAAE,CAAC;KACd;IACD,MAAM,EAAE;QACN,GAAG,EAAE,yCAAyC;QAC9C,QAAQ,EAAE,aAAa;QACvB,YAAY,EAAE,SAAS;QACvB,cAAc,EAAE,GAAG;QACnB,QAAQ,EAAE,OAAO;QACjB,QAAQ,EAAE,IAAI;KACf;IACD,cAAc,EAAE,KAAK;CACtB,CAAC"}

package/dist-es/tests/mocks/mock-server.d.ts

@@ -0,0 +1,39 @@
+import { WebSocket } from 'mock-socket';
+import { OutgoingRequest, RequestSuccessResponse, RequestErrorResponse } from '../../types/api_internal.js';
+interface MockFunctionCreator {
+    fn: (...args: any[]) => any;
+}
+type RequestCallback = (requestData: object) => void;
+interface MockServerOptions {
+    url: string;
+    reportMissingListeners?: boolean;
+    mockF: MockFunctionCreator;
+}
+type MockRequestResponseDataObject<DataT extends object | undefined> = Omit<RequestSuccessResponse<DataT>, 'callback_id'> | Omit<RequestErrorResponse, 'callback_id'>;
+type MockRequestResponseDataHandler<DataT extends object | undefined> = (request: OutgoingRequest, s: WebSocket) => MockRequestResponseDataObject<DataT>;
+declare const getMockServer: (initialOptions?: Partial<MockServerOptions>) => {
+    addRequestHandler: <DataT extends object | undefined>(method: string, path: string, data?: DataT | MockRequestResponseDataHandler<DataT>, subscriptionCallback?: RequestCallback) => void;
+    addErrorHandler: (method: string, path: string, errorStr: string | null, errorCode: number, subscriptionCallback?: RequestCallback) => void;
+    addSubscriptionHandler: (moduleName: string, listenerName: string, entityId?: string | number) => {
+        fire: (data: object, entityId?: string | number) => void;
+        subscribeFn: any;
+        unsubscribeFn: any;
+        path: string;
+    };
+    addHookHandler: (moduleName: string, listenerName: string) => {
+        fire: (data: object, entityId?: string | number) => void;
+        subscribeFn: any;
+        unsubscribeFn: any;
+        path: string;
+        addResolver: (completionId: number) => {
+            fire: (data: object) => void;
+            resolveFn: any;
+            rejectFn: any;
+        };
+    };
+    ignoreMissingHandler: (method: string, path: string) => void;
+    stop: () => void;
+    send: (data: object) => void;
+    url: string;
+};
+export { getMockServer };

package/dist-es/tests/{mock-server.js → mocks/mock-server.js}

@@ -1,86 +1,20 @@
-import { Socket } from '../NodeSocket.js';
-import { Server, WebSocket } from 'mock-socket';
-import { jest } from '@jest/globals';
-import ApiConstants from '../ApiConstants.js';
+import { Server } from 'mock-socket';
 import { EventEmitter } from 'events';
-const VERBOSE = false;
-export const getMockConsole = () => ({
-    log: jest.fn((a1, a2, a3, a4) => {
-        if (VERBOSE) {
-            console.log(a1, a2, a3, a4);
-        }
-    }),
-    info: jest.fn((a1, a2, a3, a4) => {
-        if (VERBOSE) {
-            console.info(a1, a2, a3, a4);
-        }
-    }),
-    warn: jest.fn((a1, a2, a3, a4) => {
-        console.warn(a1, a2, a3, a4);
-    }),
-    error: jest.fn((a1, a2, a3, a4) => {
-        console.error(a1, a2, a3, a4);
-    }),
-});
-const DEFAULT_CONNECT_PARAMS = {
-    username: 'test',
-    password: 'test',
-    url: 'ws://localhost:7171/api/v1/',
-};
-const getDefaultSocketOptions = (mockConsole) => ({
-    ...DEFAULT_CONNECT_PARAMS,
-    logOutput: mockConsole,
-    logLevel: VERBOSE ? 'verbose' : 'warn',
-});
-const DEFAULT_AUTH_RESPONSE = {
-    auth_token: 'b823187f-4aab-4b71-9764-e63e88401a26',
-    refresh_token: '5124faasf-4aab-4b71-9764-e63e88401a26',
-    user: {
-        permissions: ['admin'],
-        username: 'test',
-        active_sessions: 1,
-        last_login: 0,
-    },
-    system: {
-        cid: 'AHLUODI2YZ2U7FDWMHFNJU65ERGKUN4MH7GW5LY',
-        hostname: 'ubuntu-htpc',
-        network_type: 'private',
-        path_separator: '/',
-        platform: 'other',
-        language: 'fi',
-    },
-    wizard_pending: false,
-};
-const getSocket = (socketOptions = {}, mockConsole = getMockConsole()) => {
-    const socket = Socket({
-        ...getDefaultSocketOptions(mockConsole),
-        ...socketOptions,
-    }, WebSocket);
-    return { socket, mockConsole };
-};
-const getDefaultConnectOptions = () => ({
-    console: getMockConsole(),
-    authResponse: DEFAULT_AUTH_RESPONSE,
-});
-const getConnectedSocket = async (server, userOptions) => {
-    const options = {
-        ...getDefaultConnectOptions(),
-        ...userOptions,
-    };
-    server.addRequestHandler('POST', ApiConstants.LOGIN_URL, options.authResponse, options.authCallback);
-    const { socket, mockConsole } = getSocket(options.socketOptions, options.console);
-    await socket.connect();
-    return { socket, mockConsole };
-};
+import { DEFAULT_CONNECT_PARAMS } from './mock-data.js';
+;
 const toEmitId = (path, method) => {
     return `${path}_${method}`;
 };
+const getDefaultMockCreatorF = () => ({
+    fn: () => { },
+});
 const DEFAULT_MOCK_SERVER_OPTIONS = {
     url: DEFAULT_CONNECT_PARAMS.url,
     reportMissingListeners: true,
+    mockF: getDefaultMockCreatorF(),
 };
 const getMockServer = (initialOptions = {}) => {
-    const { url, reportMissingListeners } = {
+    const { url, reportMissingListeners, mockF } = {
         ...DEFAULT_MOCK_SERVER_OPTIONS,
         ...initialOptions,
     };
@@ -124,8 +58,8 @@ const getMockServer = (initialOptions = {}) => {
         }, subscriptionCallback);
     };
     const addSubscriptionHandlerImpl = (moduleName, type, listenerName, entityId) => {
-        const subscribeFn = jest.fn();
-        const unsubscribeFn = jest.fn();
+        const subscribeFn = mockF.fn();
+        const unsubscribeFn = mockF.fn();
         const path = entityId ? `${moduleName}/${entityId}/${type}/${listenerName}` : `${moduleName}/${type}/${listenerName}`;
         addRequestHandler('POST', path, undefined, subscribeFn);
         addRequestHandler('DELETE', path, undefined, unsubscribeFn);
@@ -149,8 +83,8 @@ const getMockServer = (initialOptions = {}) => {
     const addHookHandler = (moduleName, listenerName) => {
         const subscriber = addSubscriptionHandlerImpl(moduleName, 'hooks', listenerName);
         const addResolver = (completionId) => {
-            const resolveFn = jest.fn();
-            const rejectFn = jest.fn();
+            const resolveFn = mockF.fn();
+            const rejectFn = mockF.fn();
             addRequestHandler('POST', `${subscriber.path}/${completionId}/resolve`, undefined, resolveFn);
             addRequestHandler('POST', `${subscriber.path}/${completionId}/reject`, undefined, rejectFn);
             const fire = (data) => {
@@ -196,5 +130,5 @@ const getMockServer = (initialOptions = {}) => {
         url,
     };
 };
-export { getMockServer, getSocket, getConnectedSocket, DEFAULT_CONNECT_PARAMS, DEFAULT_AUTH_RESPONSE };
+export { getMockServer };
 //# sourceMappingURL=mock-server.js.map

package/dist-es/tests/mocks/mock-server.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-server.js","sourceRoot":"","sources":["../../../src/tests/mocks/mock-server.ts"],"names":[],"mappings":"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"}

package/dist-es/tests/mocks/mock-socket.d.ts

@@ -0,0 +1,23 @@
+import * as Options from '../../types/options.js';
+import { getMockServer } from './mock-server.js';
+export type MockSocketConnectOptions = Omit<Options.APISocketOptions, 'username' | 'password' | 'url'> & {
+    username?: string;
+    password?: string;
+    url?: string;
+};
+type RequestCallback = (requestData: object) => void;
+interface MockSocketOptions {
+    console: Options.LogOutput;
+    socketOptions?: MockSocketConnectOptions;
+}
+interface MockConnectedSocketOptions extends MockSocketOptions {
+    authCallback?: RequestCallback;
+    authResponse: object;
+}
+export declare const getSocket: (socketOptions?: MockSocketConnectOptions) => {
+    socket: import("../../NodeSocket.js").APISocket;
+};
+export declare const getConnectedSocket: (server: ReturnType<typeof getMockServer>, userOptions?: Partial<MockConnectedSocketOptions>) => Promise<{
+    socket: import("../../NodeSocket.js").APISocket;
+}>;
+export {};

package/dist-es/tests/mocks/mock-socket.js

@@ -0,0 +1,31 @@
+import { Socket } from '../../NodeSocket.js';
+import { WebSocket } from 'mock-socket';
+import ApiConstants from '../../ApiConstants.js';
+import { DEFAULT_AUTH_RESPONSE, DEFAULT_CONNECT_PARAMS } from './mock-data.js';
+const getDefaultSocketOptions = () => ({
+    ...DEFAULT_CONNECT_PARAMS,
+    logOutput: console,
+    logLevel: 'warn',
+});
+export const getSocket = (socketOptions = {}) => {
+    const socket = Socket({
+        ...getDefaultSocketOptions(),
+        ...socketOptions,
+    }, WebSocket);
+    return { socket };
+};
+const getDefaultConnectOptions = () => ({
+    console,
+    authResponse: DEFAULT_AUTH_RESPONSE,
+});
+export const getConnectedSocket = async (server, userOptions) => {
+    const options = {
+        ...getDefaultConnectOptions(),
+        ...userOptions,
+    };
+    server.addRequestHandler('POST', ApiConstants.LOGIN_URL, options.authResponse, options.authCallback);
+    const { socket } = getSocket(options.socketOptions);
+    await socket.connect();
+    return { socket };
+};
+//# sourceMappingURL=mock-socket.js.map

package/dist-es/tests/mocks/mock-socket.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock-socket.js","sourceRoot":"","sources":["../../../src/tests/mocks/mock-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,YAAY,MAAM,uBAAuB,CAAC;AAGjD,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAE/E,MAAM,uBAAuB,GAAG,GAA6B,EAAE,CAAC,CAAC;IAC/D,GAAG,sBAAsB;IACzB,SAAS,EAAE,OAAO;IAClB,QAAQ,EAAE,MAAM;CACjB,CAAC,CAAC;AAsBH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,gBAA0C,EAAE,EAAE,EAAE;IACxE,MAAM,MAAM,GAAG,MAAM,CACnB;QACE,GAAG,uBAAuB,EAAE;QAC5B,GAAG,aAAa;KACjB,EACD,SAAgB,CACjB,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAAG,GAAG,EAAE,CAAC,CAAC;IACtC,OAAO;IACP,YAAY,EAAE,qBAAqB;CACpC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,MAAwC,EACxC,WAAiD,EACjD,EAAE;IACF,MAAM,OAAO,GAA+B;QAC1C,GAAG,wBAAwB,EAAE;QAC7B,GAAG,WAAW;KACf,CAAC;IAEF,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAErG,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACpD,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;IAEvB,OAAO,EAAE,MAAM,EAAE,CAAC;AACpB,CAAC,CAAC"}

package/dist-es/tests/test-utils.d.ts

@@ -1,2 +1,8 @@
 export declare const waitForExpect: (func: () => void | Promise<void>) => Promise<{}>;
 export declare const defusedPromise: (promise: Promise<any>) => Promise<any>;
+export declare const getMockConsole: (verbose?: boolean) => {
+    log: jest.Mock<void, [a1: any, a2: any, a3: any, a4: any], any>;
+    info: jest.Mock<void, [a1: any, a2: any, a3: any, a4: any], any>;
+    warn: jest.Mock<void, [a1: any, a2: any, a3: any, a4: any], any>;
+    error: jest.Mock<void, [a1: any, a2: any, a3: any, a4: any], any>;
+};

package/dist-es/tests/test-utils.js

@@ -7,4 +7,22 @@ export const defusedPromise = (promise) => {
     promise.catch(() => { });
     return promise;
 };
+export const getMockConsole = (verbose = false) => ({
+    log: jest.fn((a1, a2, a3, a4) => {
+        if (verbose) {
+            console.log(a1, a2, a3, a4);
+        }
+    }),
+    info: jest.fn((a1, a2, a3, a4) => {
+        if (verbose) {
+            console.info(a1, a2, a3, a4);
+        }
+    }),
+    warn: jest.fn((a1, a2, a3, a4) => {
+        console.warn(a1, a2, a3, a4);
+    }),
+    error: jest.fn((a1, a2, a3, a4) => {
+        console.error(a1, a2, a3, a4);
+    }),
+});
 //# sourceMappingURL=test-utils.js.map

package/dist-es/tests/test-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../../src/tests/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,iBAAiB,CAAC;AAEpD,MAAM,cAAc,GAAG,IAAI,CAAC;AAC5B,YAAY;AACZ,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAgC,EAAE,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;AAGvH,uEAAuE;AACvE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAqB,EAAE,EAAE;IACtD,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACxB,OAAO,OAAO,CAAC;AACjB,CAAC,CAAA"}
+{"version":3,"file":"test-utils.js","sourceRoot":"","sources":["../../src/tests/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,MAAM,iBAAiB,CAAC;AAEpD,MAAM,cAAc,GAAG,IAAI,CAAC;AAC5B,YAAY;AACZ,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAgC,EAAE,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;AAGvH,uEAAuE;AACvE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAqB,EAAE,EAAE;IACtD,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IACxB,OAAO,OAAO,CAAC;AACjB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAAO,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC;IAClD,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAO,EAAE,EAAO,EAAE,EAAO,EAAE,EAAO,EAAE,EAAE;QAClD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC;IACF,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAO,EAAE,EAAO,EAAE,EAAO,EAAE,EAAO,EAAE,EAAE;QACnD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC;IACF,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAO,EAAE,EAAO,EAAE,EAAO,EAAE,EAAO,EAAE,EAAE;QACnD,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/B,CAAC,CAAC;IACF,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,EAAO,EAAE,EAAO,EAAE,EAAO,EAAE,EAAO,EAAE,EAAE;QACpD,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC,CAAC;CACH,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "airdcpp-apisocket",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.8",
   "description": "Javascript connector for AirDC++ Web API",
   "license": "MIT",
   "authors": [
@@ -59,7 +59,7 @@
   "main": "./dist/NodeSocket.js",
   "exports": {
     ".": "./dist-es/NodeSocket.js",
-    "./tests/": "./dist-es/tests/"
+    "./tests": "./dist-es/tests/mocks/index.js"
   },
   "type": "module"
 }

package/src/tests/Socket.test.ts

@@ -1,7 +1,7 @@
 import { 
   DEFAULT_AUTH_RESPONSE, DEFAULT_CONNECT_PARAMS, 
-  getConnectedSocket, getMockServer, getSocket
-} from './mock-server.js';
+  getConnectedSocket as getOriginalConnectedSocket, getMockServer as getOriginalMockServer, getSocket as getOriginalSocket
+} from './mocks';
 
 import ApiConstants from '../ApiConstants.js';
 
@@ -9,18 +9,23 @@ import { HookCallback, HookSubscriberInfo, SubscriptionRemoveHandler } from '../
 import { IncomingSubscriptionEvent } from '../types/api_internal.js';
 
 import { jest } from '@jest/globals';
-import { defusedPromise, waitForExpect } from './test-utils.js';
-
-let server: ReturnType<typeof getMockServer>;
+import { defusedPromise, getMockConsole, waitForExpect } from './test-utils.js';
 
 const dummyfn = () => {
   // ..
 };
 
+
 // tslint:disable:no-empty
 describe('socket', () => {
+  let server: ReturnType<typeof getOriginalMockServer>;
+  let mockConsole: ReturnType<typeof getMockConsole>;
+  
   beforeEach(() => {
-    server = getMockServer();
+    mockConsole = getMockConsole();
+    server = getOriginalMockServer({
+      mockF: jest,
+    });
   });
 
   afterEach(() => {
@@ -28,12 +33,27 @@ describe('socket', () => {
     jest.useRealTimers();
   });
 
+  const getDefaultSocketOptions = () => ({
+    logOutput: mockConsole,
+  });
+
+  const getMockSocket = () => {
+    return getOriginalSocket(getDefaultSocketOptions());
+  }
+
+  
+  const getConnectedMockSocket = () => {
+    return getOriginalConnectedSocket(server, {
+      socketOptions: getDefaultSocketOptions(),
+    });
+  }
+
   describe('auth', () => {
     test('should handle valid credentials', async () => {
       server.addRequestHandler('POST', ApiConstants.LOGIN_URL, DEFAULT_AUTH_RESPONSE);
       const connectedCallback = jest.fn();
 
-      const { socket, mockConsole } = getSocket();
+      const { socket } = getMockSocket();
       socket.onConnected = connectedCallback;
       const response = await socket.connect();
 
@@ -52,7 +72,7 @@ describe('socket', () => {
       server.addRequestHandler('POST', ApiConstants.LOGIN_URL, DEFAULT_AUTH_RESPONSE);
       const connectedCallback = jest.fn();
 
-      const { socket, mockConsole } = getSocket();
+      const { socket } = getMockSocket();
       socket.onConnected = connectedCallback;
       const response = await socket.connectRefreshToken('refresh token');
 
@@ -70,7 +90,7 @@ describe('socket', () => {
     test('should handle invalid credentials', async () => {
       server.addErrorHandler('POST', ApiConstants.LOGIN_URL, 'Invalid username or password', 401);
 
-      const { socket, mockConsole } = getSocket();
+      const { socket } = getMockSocket();
       let error;
 
       try {
@@ -89,9 +109,10 @@ describe('socket', () => {
 
     test('should handle connect with custom credentials', async () => {
       server.stop();
-      const { socket } = getSocket({
+      const { socket } = getOriginalSocket({
         username: 'dummy',
         password: 'dummy',
+        ...getDefaultSocketOptions(),
       });
 
       // Fail without a server handler with auto reconnect disabled
@@ -106,7 +127,7 @@ describe('socket', () => {
       await waitForExpect(() => expect(socket.isActive()).toEqual(false));
 
       // Valid connect attempt
-      server = getMockServer();
+      server = getOriginalMockServer();
       server.addRequestHandler('POST', ApiConstants.LOGIN_URL, DEFAULT_AUTH_RESPONSE);
 
       await socket.connect(DEFAULT_CONNECT_PARAMS.username, DEFAULT_CONNECT_PARAMS.password, false);
@@ -121,7 +142,7 @@ describe('socket', () => {
       const sessionResetCallback = jest.fn();
       const disconnectedCallback = jest.fn();
 
-      const { socket, mockConsole } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
       socket.onSessionReset = sessionResetCallback;
       socket.onDisconnected = disconnectedCallback;
 
@@ -154,7 +175,7 @@ describe('socket', () => {
 
   describe('disconnect', () => {
     test('should handle disconnect', async () => {
-      const { socket, mockConsole } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
 
       socket.disconnect();
 
@@ -166,7 +187,7 @@ describe('socket', () => {
     });
 
     test('should handle wait disconnected timeout', async () => {
-      const { socket, mockConsole } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
 
       let error: Error | null = null;
       try {
@@ -187,7 +208,7 @@ describe('socket', () => {
 
   describe('reconnect', () => {
     test('should handle auto reconnect', async () => {
-      const { socket, mockConsole } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
 
       jest.useFakeTimers();
 
@@ -202,7 +223,7 @@ describe('socket', () => {
       jest.runOnlyPendingTimers();
       expect(mockConsole.error.mock.calls.length).toBe(1);
 
-      server = getMockServer();
+      server = getOriginalMockServer();
       server.addRequestHandler('POST', ApiConstants.CONNECT_URL, undefined);
       jest.runOnlyPendingTimers();
       jest.runOnlyPendingTimers();
@@ -223,7 +244,7 @@ describe('socket', () => {
     });
 
     test('should cancel auto reconnect', async () => {
-      const { socket, mockConsole } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
 
       jest.useFakeTimers();
 
@@ -249,7 +270,7 @@ describe('socket', () => {
     });
 
     test('should handle manual reconnect', async () => {
-      const { socket, mockConsole } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
 
       socket.disconnect();
       await waitForExpect(() => expect(socket.isActive()).toEqual(false));
@@ -271,7 +292,7 @@ describe('socket', () => {
       const connectErrorCallback = jest.fn();
 
       // Connect and disconnect
-      const { socket, mockConsole } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
 
       jest.useFakeTimers();
       socket.disconnect();
@@ -315,7 +336,7 @@ describe('socket', () => {
 
   describe('requests', () => {
     test('should report request timeouts', async () => {
-      const { socket, mockConsole } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
 
       server.ignoreMissingHandler('POST', 'hubs/listeners/hub_updated');
       server.ignoreMissingHandler('POST', 'hubs/listeners/hub_added');
@@ -345,7 +366,7 @@ describe('socket', () => {
     });
 
     test('should handle missing error messages', async () => {
-      const { socket } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
 
       server.addErrorHandler('POST', 'test/test', null, 401);
 
@@ -379,7 +400,7 @@ describe('socket', () => {
     };
 
     test('should handle listener messages', async () => {
-      const { socket, mockConsole } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
       server.addSubscriptionHandler('hubs', 'hub_updated');
       server.addSubscriptionHandler('hubs', 'hub_updated', entityId);
 
@@ -405,7 +426,7 @@ describe('socket', () => {
     });
 
     test('should handle listener removal', async () => {
-      const { socket, mockConsole } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
 
       const hubUpdatedListener = server.addSubscriptionHandler('hubs', 'hub_updated');
 
@@ -437,7 +458,7 @@ describe('socket', () => {
     });
 
     test('should handle view updates', async () => {
-      const { socket, mockConsole } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
       const viewUpdateCallback = jest.fn();
 
       const removeListener = socket.addViewUpdateListener('hub_user_view', viewUpdateCallback, entityId);
@@ -468,7 +489,7 @@ describe('socket', () => {
     };
 
     test('should handle hook actions', async () => {
-      const { socket, mockConsole } = await getConnectedSocket(server);
+      const { socket } = await getConnectedMockSocket();
       let removeListener: SubscriptionRemoveHandler | null = null;
 
       // Add hook
@@ -504,9 +525,10 @@ describe('socket', () => {
 
   describe('logging', () => {
     const connect = async (logLevel: string) => {
-      const { socket, mockConsole } = await getConnectedSocket(server, {
+      const { socket } = await getOriginalConnectedSocket(server, {
         socketOptions: {
           logLevel,
+          ...getDefaultSocketOptions(),
         },
       });
 

package/src/tests/mocks/index.ts

@@ -0,0 +1,3 @@
+export * from './mock-data.js';
+export * from './mock-server.js';
+export * from './mock-socket.js';

package/src/tests/mocks/mock-data.ts

@@ -0,0 +1,26 @@
+
+export const DEFAULT_CONNECT_PARAMS = {
+  username: 'test',
+  password: 'test',
+  url: 'ws://localhost:7171/api/v1/',
+};
+
+export const DEFAULT_AUTH_RESPONSE = {
+  auth_token: 'b823187f-4aab-4b71-9764-e63e88401a26',
+  refresh_token: '5124faasf-4aab-4b71-9764-e63e88401a26',
+  user: {
+    permissions: [ 'admin' ],
+    username: 'test',
+    active_sessions: 1,
+    last_login: 0,
+  },
+  system: {
+    cid: 'AHLUODI2YZ2U7FDWMHFNJU65ERGKUN4MH7GW5LY',
+    hostname: 'ubuntu-htpc',
+    network_type: 'private',
+    path_separator: '/',
+    platform: 'other',
+    language: 'fi',
+  },
+  wizard_pending: false,
+};

package/src/tests/{mock-server.ts → mocks/mock-server.ts}

@@ -1,127 +1,33 @@
-import { Socket } from '../NodeSocket.js';
 import { Client, Server, WebSocket } from 'mock-socket';
-import { jest } from '@jest/globals';
 
-import { OutgoingRequest, RequestSuccessResponse, RequestErrorResponse } from '../types/api_internal.js';
-import * as Options from '../types/options.js';
-import ApiConstants from '../ApiConstants.js';
+import { OutgoingRequest, RequestSuccessResponse, RequestErrorResponse } from '../../types/api_internal.js';
 import { EventEmitter } from 'events';
+import { DEFAULT_CONNECT_PARAMS } from './mock-data.js';
 
-const VERBOSE = false;
-
-export const getMockConsole = () => ({
-  log: jest.fn((a1: any, a2: any, a3: any, a4: any) => {
-    if (VERBOSE) {
-      console.log(a1, a2, a3, a4);
-    }
-  }),
-  info: jest.fn((a1: any, a2: any, a3: any, a4: any) => {
-    if (VERBOSE) {
-      console.info(a1, a2, a3, a4);
-    }
-  }),
-  warn: jest.fn((a1: any, a2: any, a3: any, a4: any) => {
-    console.warn(a1, a2, a3, a4);
-  }),
-  error: jest.fn((a1: any, a2: any, a3: any, a4: any) => {
-    console.error(a1, a2, a3, a4);
-  }),
-});
-
-const DEFAULT_CONNECT_PARAMS = {
-  username: 'test',
-  password: 'test',
-  url: 'ws://localhost:7171/api/v1/',
-};
-
-const getDefaultSocketOptions = (mockConsole: Options.LogOutput): Options.APISocketOptions => ({
-  ...DEFAULT_CONNECT_PARAMS,
-  logOutput: mockConsole,
-  logLevel: VERBOSE ? 'verbose' : 'warn',
-});
-
-const DEFAULT_AUTH_RESPONSE = {
-  auth_token: 'b823187f-4aab-4b71-9764-e63e88401a26',
-  refresh_token: '5124faasf-4aab-4b71-9764-e63e88401a26',
-  user: {
-    permissions: [ 'admin' ],
-    username: 'test',
-    active_sessions: 1,
-    last_login: 0,
-  },
-  system: {
-    cid: 'AHLUODI2YZ2U7FDWMHFNJU65ERGKUN4MH7GW5LY',
-    hostname: 'ubuntu-htpc',
-    network_type: 'private',
-    path_separator: '/',
-    platform: 'other',
-    language: 'fi',
-  },
-  wizard_pending: false,
-};
-
-export type MockSocketOptions = Omit<Options.APISocketOptions, 'username' | 'password' | 'url'> & {
-  username?: string;
-  password?: string;
-  url?: string;
-};
-
-const getSocket = (socketOptions: MockSocketOptions = {}, mockConsole = getMockConsole()) => {
-  const socket = Socket(
-    {
-      ...getDefaultSocketOptions(mockConsole),
-      ...socketOptions,
-    }, 
-    WebSocket as any
-  );
-  
-  return { socket, mockConsole };
+interface MockFunctionCreator {
+  fn: (...args: any[]) => any;
 };
 
-
-type Callback = (requestData: object) => void;
-
-interface ConnectOptions {
-  socketOptions?: MockSocketOptions;
-  authCallback?: Callback;
-  authResponse?: object;
-  console?: ReturnType<typeof getMockConsole>;
-}
-
-const getDefaultConnectOptions = () => ({
-  console: getMockConsole(),
-  authResponse: DEFAULT_AUTH_RESPONSE,
-});
-
-const getConnectedSocket = async (
-  server: ReturnType<typeof getMockServer>, 
-  userOptions?: ConnectOptions,
-) => {
-  const options = {
-    ...getDefaultConnectOptions(),
-    ...userOptions,
-  };
-
-  server.addRequestHandler('POST', ApiConstants.LOGIN_URL, options.authResponse, options.authCallback);
-
-  const { socket, mockConsole } = getSocket(options.socketOptions, options.console);
-  await socket.connect();
-
-  return { socket, mockConsole };
-};
+type RequestCallback = (requestData: object) => void;
 
 const toEmitId = (path: string, method: string) => {
   return `${path}_${method}`;
 };
 
+const getDefaultMockCreatorF = () => ({
+  fn: () => {},
+});
+
 interface MockServerOptions {
   url: string;
   reportMissingListeners?: boolean;
+  mockF: MockFunctionCreator;
 }
 
 const DEFAULT_MOCK_SERVER_OPTIONS: MockServerOptions = {
   url: DEFAULT_CONNECT_PARAMS.url,
   reportMissingListeners: true,
+  mockF: getDefaultMockCreatorF(),
 }
 
 type MockRequestResponseDataObject<DataT extends object | undefined> = Omit<RequestSuccessResponse<DataT>, 'callback_id'> | Omit<RequestErrorResponse, 'callback_id'>;
@@ -129,7 +35,7 @@ type MockRequestResponseDataHandler<DataT extends object | undefined> = (request
 type MockRequestResponseData<DataT extends object | undefined> = MockRequestResponseDataObject<DataT> | MockRequestResponseDataHandler<DataT>;
 
 const getMockServer = (initialOptions: Partial<MockServerOptions> = {}) => {
-  const { url, reportMissingListeners }: MockServerOptions = {
+  const { url, reportMissingListeners, mockF }: MockServerOptions = {
     ...DEFAULT_MOCK_SERVER_OPTIONS,
     ...initialOptions,
   };
@@ -146,7 +52,7 @@ const getMockServer = (initialOptions: Partial<MockServerOptions> = {}) => {
     method: string, 
     path: string, 
     responseData: MockRequestResponseData<DataT>,
-    subscriptionCallback?: Callback
+    subscriptionCallback?: RequestCallback
   ) => {
     emitter.addListener(
       toEmitId(path, method), 
@@ -179,7 +85,7 @@ const getMockServer = (initialOptions: Partial<MockServerOptions> = {}) => {
     method: string, 
     path: string, 
     data?: DataT | MockRequestResponseDataHandler<DataT>, 
-    subscriptionCallback?: Callback
+    subscriptionCallback?: RequestCallback
   ) => {
     const handlerData = typeof data === 'function' ? data : {
       data,
@@ -199,7 +105,7 @@ const getMockServer = (initialOptions: Partial<MockServerOptions> = {}) => {
     path: string, 
     errorStr: string | null, 
     errorCode: number, 
-    subscriptionCallback?: Callback
+    subscriptionCallback?: RequestCallback
   ) => {
     addServerHandler(
       method, 
@@ -220,8 +126,8 @@ const getMockServer = (initialOptions: Partial<MockServerOptions> = {}) => {
     listenerName: string,
     entityId?: string | number,
   ) => {
-    const subscribeFn = jest.fn();
-    const unsubscribeFn = jest.fn();
+    const subscribeFn = mockF.fn();
+    const unsubscribeFn = mockF.fn();
 
     const path = entityId ? `${moduleName}/${entityId}/${type}/${listenerName}` : `${moduleName}/${type}/${listenerName}`;
 
@@ -262,8 +168,8 @@ const getMockServer = (initialOptions: Partial<MockServerOptions> = {}) => {
     const subscriber = addSubscriptionHandlerImpl(moduleName, 'hooks', listenerName);
 
     const addResolver = (completionId: number) => {
-      const resolveFn = jest.fn();
-      const rejectFn = jest.fn();
+      const resolveFn = mockF.fn();
+      const rejectFn = mockF.fn();
 
       addRequestHandler(
         'POST', 
@@ -333,4 +239,4 @@ const getMockServer = (initialOptions: Partial<MockServerOptions> = {}) => {
   };
 };
 
-export { getMockServer, getSocket, getConnectedSocket, DEFAULT_CONNECT_PARAMS, DEFAULT_AUTH_RESPONSE };
+export { getMockServer };

package/src/tests/mocks/mock-socket.ts

@@ -0,0 +1,68 @@
+import { Socket } from '../../NodeSocket.js';
+import { WebSocket } from 'mock-socket';
+
+import * as Options from '../../types/options.js';
+import ApiConstants from '../../ApiConstants.js';
+
+import { getMockServer } from './mock-server.js';
+import { DEFAULT_AUTH_RESPONSE, DEFAULT_CONNECT_PARAMS } from './mock-data.js';
+
+const getDefaultSocketOptions = (): Options.APISocketOptions => ({
+  ...DEFAULT_CONNECT_PARAMS,
+  logOutput: console,
+  logLevel: 'warn',
+});
+
+export type MockSocketConnectOptions = Omit<Options.APISocketOptions, 'username' | 'password' | 'url'> & {
+  username?: string;
+  password?: string;
+  url?: string;
+};
+
+
+type RequestCallback = (requestData: object) => void;
+
+interface MockSocketOptions {
+  console: Options.LogOutput;
+  socketOptions?: MockSocketConnectOptions;
+}
+
+interface MockConnectedSocketOptions extends MockSocketOptions {
+  authCallback?: RequestCallback;
+  authResponse: object;
+}
+
+
+export const getSocket = (socketOptions: MockSocketConnectOptions = {}) => {
+  const socket = Socket(
+    {
+      ...getDefaultSocketOptions(),
+      ...socketOptions,
+    },
+    WebSocket as any
+  );
+  
+  return { socket };
+};
+
+const getDefaultConnectOptions = () => ({
+  console,
+  authResponse: DEFAULT_AUTH_RESPONSE,
+});
+
+export const getConnectedSocket = async (
+  server: ReturnType<typeof getMockServer>, 
+  userOptions?: Partial<MockConnectedSocketOptions>,
+) => {
+  const options: MockConnectedSocketOptions = {
+    ...getDefaultConnectOptions(),
+    ...userOptions,
+  };
+
+  server.addRequestHandler('POST', ApiConstants.LOGIN_URL, options.authResponse, options.authCallback);
+
+  const { socket } = getSocket(options.socketOptions);
+  await socket.connect();
+
+  return { socket };
+};

package/src/tests/public_helpers.test.ts

@@ -1,7 +1,7 @@
 import { 
   getMockServer,
   getConnectedSocket,
-} from './mock-server.js';
+} from './mocks';
 import { waitForExpect } from './test-utils.js';
 
 import { jest } from '@jest/globals';
@@ -17,7 +17,9 @@ let server: ReturnType<typeof getMockServer>;
 describe('public helpers', () => {
 
   beforeEach(() => {
-    server = getMockServer();
+    server = getMockServer({
+      mockF: jest,
+    });
   });
 
   afterEach(() => {

package/src/tests/test-utils.ts

@@ -10,3 +10,22 @@ export const defusedPromise = (promise: Promise<any>) => {
   promise.catch(() => {});
   return promise;
 }
+
+export const getMockConsole = (verbose = false) => ({
+  log: jest.fn((a1: any, a2: any, a3: any, a4: any) => {
+    if (verbose) {
+      console.log(a1, a2, a3, a4);
+    }
+  }),
+  info: jest.fn((a1: any, a2: any, a3: any, a4: any) => {
+    if (verbose) {
+      console.info(a1, a2, a3, a4);
+    }
+  }),
+  warn: jest.fn((a1: any, a2: any, a3: any, a4: any) => {
+    console.warn(a1, a2, a3, a4);
+  }),
+  error: jest.fn((a1: any, a2: any, a3: any, a4: any) => {
+    console.error(a1, a2, a3, a4);
+  }),
+});

package/dist-es/tests/mock-server.d.ts

@@ -1,100 +0,0 @@
-import { WebSocket } from 'mock-socket';
-import { OutgoingRequest, RequestSuccessResponse, RequestErrorResponse } from '../types/api_internal.js';
-import * as Options from '../types/options.js';
-export declare const getMockConsole: () => {
-    log: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-    info: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-    warn: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-    error: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-};
-declare const DEFAULT_CONNECT_PARAMS: {
-    username: string;
-    password: string;
-    url: string;
-};
-declare const DEFAULT_AUTH_RESPONSE: {
-    auth_token: string;
-    refresh_token: string;
-    user: {
-        permissions: string[];
-        username: string;
-        active_sessions: number;
-        last_login: number;
-    };
-    system: {
-        cid: string;
-        hostname: string;
-        network_type: string;
-        path_separator: string;
-        platform: string;
-        language: string;
-    };
-    wizard_pending: boolean;
-};
-export type MockSocketOptions = Omit<Options.APISocketOptions, 'username' | 'password' | 'url'> & {
-    username?: string;
-    password?: string;
-    url?: string;
-};
-declare const getSocket: (socketOptions?: MockSocketOptions, mockConsole?: {
-    log: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-    info: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-    warn: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-    error: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-}) => {
-    socket: import("../NodeSocket.js").APISocket;
-    mockConsole: {
-        log: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-        info: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-        warn: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-        error: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-    };
-};
-type Callback = (requestData: object) => void;
-interface ConnectOptions {
-    socketOptions?: MockSocketOptions;
-    authCallback?: Callback;
-    authResponse?: object;
-    console?: ReturnType<typeof getMockConsole>;
-}
-declare const getConnectedSocket: (server: ReturnType<typeof getMockServer>, userOptions?: ConnectOptions) => Promise<{
-    socket: import("../NodeSocket.js").APISocket;
-    mockConsole: {
-        log: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-        info: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-        warn: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-        error: import("jest-mock").Mock<(a1: any, a2: any, a3: any, a4: any) => void>;
-    };
-}>;
-interface MockServerOptions {
-    url: string;
-    reportMissingListeners?: boolean;
-}
-type MockRequestResponseDataObject<DataT extends object | undefined> = Omit<RequestSuccessResponse<DataT>, 'callback_id'> | Omit<RequestErrorResponse, 'callback_id'>;
-type MockRequestResponseDataHandler<DataT extends object | undefined> = (request: OutgoingRequest, s: WebSocket) => MockRequestResponseDataObject<DataT>;
-declare const getMockServer: (initialOptions?: Partial<MockServerOptions>) => {
-    addRequestHandler: <DataT extends object | undefined>(method: string, path: string, data?: DataT | MockRequestResponseDataHandler<DataT>, subscriptionCallback?: Callback) => void;
-    addErrorHandler: (method: string, path: string, errorStr: string | null, errorCode: number, subscriptionCallback?: Callback) => void;
-    addSubscriptionHandler: (moduleName: string, listenerName: string, entityId?: string | number) => {
-        fire: (data: object, entityId?: string | number) => void;
-        subscribeFn: import("jest-mock").Mock<import("jest-mock").UnknownFunction>;
-        unsubscribeFn: import("jest-mock").Mock<import("jest-mock").UnknownFunction>;
-        path: string;
-    };
-    addHookHandler: (moduleName: string, listenerName: string) => {
-        fire: (data: object, entityId?: string | number) => void;
-        subscribeFn: import("jest-mock").Mock<import("jest-mock").UnknownFunction>;
-        unsubscribeFn: import("jest-mock").Mock<import("jest-mock").UnknownFunction>;
-        path: string;
-        addResolver: (completionId: number) => {
-            fire: (data: object) => void;
-            resolveFn: import("jest-mock").Mock<import("jest-mock").UnknownFunction>;
-            rejectFn: import("jest-mock").Mock<import("jest-mock").UnknownFunction>;
-        };
-    };
-    ignoreMissingHandler: (method: string, path: string) => void;
-    stop: () => void;
-    send: (data: object) => void;
-    url: string;
-};
-export { getMockServer, getSocket, getConnectedSocket, DEFAULT_CONNECT_PARAMS, DEFAULT_AUTH_RESPONSE };

package/dist-es/tests/mock-server.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mock-server.js","sourceRoot":"","sources":["../../src/tests/mock-server.ts"],"names":[],"mappings":"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"}