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

package/src/tests/public_helpers.test.ts

@@ -1,15 +1,14 @@
 import { 
   getMockServer,
   getConnectedSocket,
-  waitForExpect,
-} from './helpers.js';
+} from './mock-server.js';
+import { waitForExpect } from './test-utils.js';
 
 import { jest } from '@jest/globals';
 
 import { addContextMenuItems } from '../PublicHelpers.js';
 import { SelectedMenuItemListenerData, MenuItemListHookData, MenuItemListHookAcceptData } from '../types/public_helpers_internal.js';
 import { HookSubscriberInfo, MenuCallbackProperties, MenuClickHandlerProperties } from '../types/index.js';
-import { IncomingSubscriptionEvent } from '../types/api_internal.js';
 
 
 let server: ReturnType<typeof getMockServer>;
@@ -97,19 +96,10 @@ describe('public helpers', () => {
       // Socket handlers
       const { socket } = await getConnectedSocket(server);
 
-      const listenerAddCallback = jest.fn();
-      server.addDataHandler('POST', `menus/listeners/${MENU_ID}_menuitem_selected`, undefined, listenerAddCallback);
-
-      const hookAddCallback = jest.fn();
-      const hookResolveCallback = jest.fn();
-      server.addDataHandler('POST', `menus/hooks/${MENU_ID}_list_menuitems`, undefined, hookAddCallback);
-      server.addDataHandler(
-        'POST', 
-        `menus/hooks/${MENU_ID}_list_menuitems/${HOOK_COMPLETION_ID}/resolve`, 
-        menuItemListData, 
-        hookResolveCallback
-      );
+      const itemSelectedListener = server.addSubscriptionHandler('menus', `${MENU_ID}_menuitem_selected`);
 
+      const listItemsHook = server.addHookHandler('menus', `${MENU_ID}_list_menuitems`);
+      const listItemsResolver = listItemsHook.addResolver(HOOK_COMPLETION_ID);
 
       // Add menu items
       const onClickItem1Mock = jest.fn();
@@ -166,33 +156,29 @@ describe('public helpers', () => {
         SUBSCRIBER_INFO,
       );
       
-      expect(listenerAddCallback).toHaveBeenCalledTimes(1);
-      expect(hookAddCallback).toHaveBeenCalledTimes(1);
+      expect(itemSelectedListener.subscribeFn).toHaveBeenCalledTimes(1);
+      expect(listItemsHook.subscribeFn).toHaveBeenCalledTimes(1);
 
 
       // List items hook
       {
-        const hookEventData: IncomingSubscriptionEvent<MenuItemListHookData<string, null>> = {
-          event: `${MENU_ID}_list_menuitems`,
-          data: {
-            selected_ids: selectedMenuIds,
-            entity_id: null,
-            permissions: PERMISSIONS,
-            supports: SUPPORTS,
-          },
-          completion_id: 1,
+        const menuItemListData: MenuItemListHookData<string, null> = {
+          selected_ids: selectedMenuIds,
+          entity_id: null,
+          permissions: PERMISSIONS,
+          supports: SUPPORTS,
         };
 
-        server.send(hookEventData);
+        listItemsResolver.fire(menuItemListData);
       }
 
       // Validate list items results
       {
         await waitForExpect(() => {
-          expect(hookResolveCallback).toHaveBeenCalledTimes(1);
+          expect(listItemsResolver.resolveFn).toHaveBeenCalledTimes(1);
         });
 
-        expect(hookResolveCallback).toHaveBeenCalledWith(
+        expect(listItemsResolver.resolveFn).toHaveBeenCalledWith(
           expect.objectContaining({
             data: menuItemListData
           }),
@@ -214,22 +200,18 @@ describe('public helpers', () => {
 
       // Select event listener
       {
-        const selectEventData: IncomingSubscriptionEvent<SelectedMenuItemListenerData<string, null>> = {
-          event: `${MENU_ID}_menuitem_selected`,
-          data: {
-            menuitem_id: MENU_ITEM1_ID,
-            hook_id: SUBSCRIBER_INFO.id,
-            menu_id: MENU_ID,
-            entity_id: null,
-            selected_ids: selectedMenuIds,
-            permissions: PERMISSIONS,
-            supports: SUPPORTS,
-            form_values: FORM_VALUES
-          },
-          completion_id: HOOK_COMPLETION_ID,
+        const selectData: SelectedMenuItemListenerData<string, null> = {
+          menuitem_id: MENU_ITEM1_ID,
+          hook_id: SUBSCRIBER_INFO.id,
+          menu_id: MENU_ID,
+          entity_id: null,
+          selected_ids: selectedMenuIds,
+          permissions: PERMISSIONS,
+          supports: SUPPORTS,
+          form_values: FORM_VALUES
         };
 
-        server.send(selectEventData);
+        itemSelectedListener.fire(selectData);
       }
 
       // Validate select event results

package/src/tests/test-utils.ts

@@ -0,0 +1,12 @@
+import waitForExpectOriginal from 'wait-for-expect';
+
+const EXCEPT_TIMEOUT = 1000;
+//@ts-ignore
+export const waitForExpect = (func: () => void | Promise<void>) => waitForExpectOriginal.default(func, EXCEPT_TIMEOUT);
+
+
+// This is a helper function that will suppress the error of a promise.
+export const defusedPromise = (promise: Promise<any>) => {
+  promise.catch(() => {});
+  return promise;
+}

package/src/types/api_internal.ts

@@ -1,6 +1,5 @@
 // HELPERS
 export type CompletionIdType = number;
-//export type SubscriptionIdType = string;
 
 
 // REQUESTS

package/src/types/public_helpers_internal.ts

@@ -20,8 +20,8 @@ export interface MenuItemListHookData<IdT, EntityIdT> {
 }
 
 export interface ResponseMenuItemCallbackFields {
-  urls?: string[] | undefined;
-  form_definitions?: object[] | undefined;
+  urls?: string[];
+  form_definitions?: object[];
 }
 
 export type ResponseMenuItem<IdT, EntityIdT> = Omit<ContextMenuItem<IdT, EntityIdT>, 'onClick' | 'filter' | 'urls' | 'form_definitions'> & ResponseMenuItemCallbackFields;

package/dist-es/tests/helpers.js

@@ -1,135 +0,0 @@
-import { Socket } from '../NodeSocket.js';
-import { Server, WebSocket } from 'mock-socket';
-import { jest } from '@jest/globals';
-import ApiConstants from '../ApiConstants.js';
-import { EventEmitter } from 'events';
-import waitForExpectOriginal from 'wait-for-expect';
-const EXCEPT_TIMEOUT = 1000;
-//@ts-ignore
-export const waitForExpect = (func) => waitForExpectOriginal.default(func, EXCEPT_TIMEOUT);
-const VERBOSE = false;
-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.addDataHandler('POST', ApiConstants.LOGIN_URL, options.authResponse, options.authCallback);
-    const { socket, mockConsole } = getSocket(options.socketOptions, options.console);
-    await socket.connect();
-    return { socket, mockConsole };
-};
-const toEmitId = (path, method) => {
-    return `${path}_${method}`;
-};
-const getMockServer = (url = DEFAULT_CONNECT_PARAMS.url) => {
-    const mockServer = new Server(url);
-    let socket;
-    const emitter = new EventEmitter();
-    const addServerHandler = (method, path, responseData, subscriptionCallback) => {
-        emitter.addListener(toEmitId(path, method), (request, s) => {
-            if (subscriptionCallback) {
-                subscriptionCallback(request);
-            }
-            const response = {
-                callback_id: request.callback_id,
-                ...responseData,
-            };
-            s.send(JSON.stringify(response));
-        });
-    };
-    mockServer.on('connection', s => {
-        socket = s;
-        socket.on('message', (messageObj) => {
-            const request = JSON.parse(messageObj);
-            emitter.emit(toEmitId(request.path, request.method), request, s);
-        });
-    });
-    mockServer.on('close', () => {
-        emitter.removeAllListeners();
-    });
-    return {
-        addDataHandler: (method, path, data, subscriptionCallback) => {
-            addServerHandler(method, path, {
-                data,
-                code: 200,
-            }, subscriptionCallback);
-        },
-        addErrorHandler: (method, path, errorStr, errorCode, subscriptionCallback) => {
-            addServerHandler(method, path, {
-                error: !errorStr ? null : {
-                    message: errorStr,
-                },
-                code: errorCode,
-            }, subscriptionCallback);
-        },
-        stop: () => {
-            mockServer.stop(() => {
-                // ...
-            });
-        },
-        send: (data) => {
-            socket.send(JSON.stringify(data));
-        },
-        url,
-    };
-};
-export { getMockServer, getSocket, getConnectedSocket, DEFAULT_CONNECT_PARAMS, DEFAULT_AUTH_RESPONSE };
-//# sourceMappingURL=helpers.js.map

package/dist-es/tests/helpers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/tests/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAU,MAAM,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAIrC,OAAO,YAAY,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,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;AAEvH,MAAM,OAAO,GAAG,KAAK,CAAC;AAEtB,MAAM,cAAc,GAAG,GAAG,EAAE,CAAC,CAAC;IAC5B,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;AAEH,MAAM,sBAAsB,GAAG;IAC7B,QAAQ,EAAE,MAAM;IAChB,QAAQ,EAAE,MAAM;IAChB,GAAG,EAAE,6BAA6B;CACnC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,WAA8B,EAA4B,EAAE,CAAC,CAAC;IAC7F,GAAG,sBAAsB;IACzB,SAAS,EAAE,WAAW;IACtB,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;CACvC,CAAC,CAAC;AAEH,MAAM,qBAAqB,GAAG;IAC5B,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;AAQF,MAAM,SAAS,GAAG,CAAC,gBAAmC,EAAE,EAAE,WAAW,GAAG,cAAc,EAAE,EAAE,EAAE;IAC1F,MAAM,MAAM,GAAG,MAAM,CACnB;QACE,GAAG,uBAAuB,CAAC,WAAW,CAAC;QACvC,GAAG,aAAa;KACjB,EACD,SAAgB,CACjB,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;AACjC,CAAC,CAAC;AAYF,MAAM,wBAAwB,GAAG,GAAG,EAAE,CAAC,CAAC;IACtC,OAAO,EAAE,cAAc,EAAE;IACzB,YAAY,EAAE,qBAAqB;CACpC,CAAC,CAAC;AAEH,MAAM,kBAAkB,GAAG,KAAK,EAC9B,MAAwC,EACxC,WAA4B,EAC5B,EAAE;IACF,MAAM,OAAO,GAAG;QACd,GAAG,wBAAwB,EAAE;QAC7B,GAAG,WAAW;KACf,CAAC;IAEF,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAElG,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAClF,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;IAEvB,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE;IAChD,OAAO,GAAG,IAAI,IAAI,MAAM,EAAE,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,GAAG,GAAG,sBAAsB,CAAC,GAAG,EAAE,EAAE;IACzD,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,MAAc,CAAC;IACnB,MAAM,OAAO,GAAG,IAAI,YAAY,EAAE,CAAC;IAEnC,MAAM,gBAAgB,GAAG,CACvB,MAAc,EACd,IAAY,EACZ,YAA4G,EAC5G,oBAA+B,EAC/B,EAAE;QACF,OAAO,CAAC,WAAW,CACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,EACtB,CAAC,OAAwB,EAAE,CAAY,EAAE,EAAE;YACzC,IAAI,oBAAoB,EAAE,CAAC;gBACzB,oBAAoB,CAAC,OAAO,CAAC,CAAC;YAChC,CAAC;YAED,MAAM,QAAQ,GAAkD;gBAC9D,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,GAAG,YAAY;aAChB,CAAC;YAEF,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnC,CAAC,CACF,CAAC;IACJ,CAAC,CAAC;IAEF,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE;QAC9B,MAAM,GAAG,CAAC,CAAC;QAEX,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,UAAU,EAAE,EAAE;YAClC,MAAM,OAAO,GAAoB,IAAI,CAAC,KAAK,CAAC,UAAoB,CAAC,CAAC;YAClE,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QAC1B,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,cAAc,EAAE,CACd,MAAc,EACd,IAAY,EACZ,IAAY,EACZ,oBAA+B,EAC/B,EAAE;YACF,gBAAgB,CACd,MAAM,EACN,IAAI,EAAE;gBACJ,IAAI;gBACJ,IAAI,EAAE,GAAG;aACV,EACD,oBAAoB,CACrB,CAAC;QACJ,CAAC;QACD,eAAe,EAAE,CACf,MAAc,EACd,IAAY,EACZ,QAAuB,EACvB,SAAiB,EACjB,oBAA+B,EAC/B,EAAE;YACF,gBAAgB,CACd,MAAM,EACN,IAAI,EACJ;gBACE,KAAK,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAW,CAAC,CAAC,CAAC;oBAC/B,OAAO,EAAE,QAAQ;iBAClB;gBACD,IAAI,EAAE,SAAS;aAChB,EACD,oBAAoB,CACrB,CAAC;QACJ,CAAC;QACD,IAAI,EAAE,GAAG,EAAE;YACT,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE;gBACnB,MAAM;YACR,CAAC,CAAC,CAAC;QACL,CAAC;QACD,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE;YACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACpC,CAAC;QACD,GAAG;KACJ,CAAC;AACJ,CAAC,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,CAAC"}

package/src/tests/helpers.ts

@@ -1,211 +0,0 @@
-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 { EventEmitter } from 'events';
-
-import waitForExpectOriginal from 'wait-for-expect';
-
-const EXCEPT_TIMEOUT = 1000;
-//@ts-ignore
-export const waitForExpect = (func: () => void | Promise<void>) => waitForExpectOriginal.default(func, EXCEPT_TIMEOUT);
-
-const VERBOSE = false;
-
-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 };
-};
-
-
-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.addDataHandler('POST', ApiConstants.LOGIN_URL, options.authResponse, options.authCallback);
-
-  const { socket, mockConsole } = getSocket(options.socketOptions, options.console);
-  await socket.connect();
-
-  return { socket, mockConsole };
-};
-
-const toEmitId = (path: string, method: string) => {
-  return `${path}_${method}`;
-};
-
-const getMockServer = (url = DEFAULT_CONNECT_PARAMS.url) => {
-  const mockServer = new Server(url);
-  let socket: Client;
-  const emitter = new EventEmitter();
-
-  const addServerHandler = <DataT extends object | undefined>(
-    method: string, 
-    path: string, 
-    responseData: Omit<RequestSuccessResponse<DataT>, 'callback_id'> | Omit<RequestErrorResponse, 'callback_id'>, 
-    subscriptionCallback?: Callback
-  ) => {
-    emitter.addListener(
-      toEmitId(path, method), 
-      (request: OutgoingRequest, s: WebSocket) => {
-        if (subscriptionCallback) {
-          subscriptionCallback(request);
-        }
-
-        const response: RequestSuccessResponse | RequestErrorResponse = {
-          callback_id: request.callback_id,
-          ...responseData,
-        };
-
-        s.send(JSON.stringify(response));
-      }
-    );
-  };
-
-  mockServer.on('connection', s => {
-    socket = s;
-
-    socket.on('message', (messageObj) => {
-      const request: OutgoingRequest = JSON.parse(messageObj as string);
-      emitter.emit(toEmitId(request.path, request.method), request, s);
-    });
-  });
-
-  mockServer.on('close', () => {
-    emitter.removeAllListeners();
-  });
-
-  return {
-    addDataHandler: <DataT extends object | undefined>(
-      method: string, 
-      path: string, 
-      data?: DataT, 
-      subscriptionCallback?: Callback
-    ) => {
-      addServerHandler<DataT>(
-        method, 
-        path, {
-          data,
-          code: 200,
-        }, 
-        subscriptionCallback
-      );
-    },
-    addErrorHandler: (
-      method: string, 
-      path: string, 
-      errorStr: string | null, 
-      errorCode: number, 
-      subscriptionCallback?: Callback
-    ) => {
-      addServerHandler(
-        method, 
-        path, 
-        {
-          error: !errorStr ? null as any : {
-            message: errorStr,
-          },
-          code: errorCode,
-        }, 
-        subscriptionCallback
-      );
-    },
-    stop: () => {
-      mockServer.stop(() => {
-        // ...
-      });
-    },
-    send: (data: object) => {
-      socket.send(JSON.stringify(data));
-    },
-    url,
-  };
-};
-
-export { getMockServer, getSocket, getConnectedSocket, DEFAULT_CONNECT_PARAMS, DEFAULT_AUTH_RESPONSE };