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

package/dist/types/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AAEzB,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AAEnC,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAE7B,cAAc,qBAAqB,CAAC"}

package/dist/types/logger.d.ts

@@ -0,0 +1,6 @@
+export interface Logger {
+    verbose: (message?: any, ...optionalParams: any[]) => void;
+    info: (message?: any, ...optionalParams: any[]) => void;
+    warn: (message?: any, ...optionalParams: any[]) => void;
+    error: (message?: any, ...optionalParams: any[]) => void;
+}

package/dist/types/logger.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=logger.js.map

package/dist/types/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/types/logger.ts"],"names":[],"mappings":""}

package/dist/types/options.d.ts

@@ -0,0 +1,31 @@
+export type PrintHandler = (...optionalParams: any[]) => void;
+export interface LogOutput {
+    log: PrintHandler;
+    info: PrintHandler;
+    warn: PrintHandler;
+    error: PrintHandler;
+}
+export type IgnoreMatcher = string[] | RegExp;
+export interface SocketRequestOptions {
+    ignoredRequestPaths?: IgnoreMatcher;
+    requestTimeout?: number;
+}
+export interface SocketSubscriptionOptions {
+    ignoredListenerEvents?: IgnoreMatcher;
+}
+export interface RequiredSocketOptions {
+    url: string;
+    username?: string;
+    password?: string;
+}
+export interface AdvancedSocketOptions {
+    autoReconnect: boolean;
+    reconnectInterval: number;
+    userSession: boolean;
+}
+export interface LoggerOptions {
+    logLevel?: string;
+    logOutput?: LogOutput;
+}
+type UserOptions = RequiredSocketOptions & Partial<AdvancedSocketOptions> & LoggerOptions & SocketSubscriptionOptions & SocketRequestOptions;
+export { UserOptions as APISocketOptions };

package/dist/types/options.js

@@ -0,0 +1,3 @@
+// HELPERS
+export {};
+//# sourceMappingURL=options.js.map

package/dist/types/options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/types/options.ts"],"names":[],"mappings":"AAAA,UAAU"}

package/dist/types/public_helpers.d.ts

@@ -0,0 +1,28 @@
+import { HookSubscriberInfo } from './subscriptions.js';
+export interface MenuCallbackProperties<IdT, EntityIdT> {
+    selectedIds: IdT[];
+    entityId: EntityIdT;
+    permissions: string[];
+    supports: string[];
+}
+export interface MenuClickHandlerProperties<IdT, EntityIdT, FormValueT extends object = object> extends MenuCallbackProperties<IdT, EntityIdT> {
+    formValues: FormValueT;
+}
+type AsyncCallbackProperty<IdT, EntityIdT, ReturnT> = (props: MenuCallbackProperties<IdT, EntityIdT>) => ReturnT | Promise<ReturnT>;
+export type ContextMenuIcon = {
+    [key in string]: string;
+};
+export interface ContextMenu extends HookSubscriberInfo {
+    icon?: ContextMenuIcon;
+}
+export interface ContextMenuItem<IdT, EntityIdT, FormValueT extends object = object> {
+    id: string;
+    title: string;
+    icon?: ContextMenuIcon;
+    urls?: string[] | AsyncCallbackProperty<IdT, EntityIdT, string[] | undefined>;
+    onClick?: (props: MenuClickHandlerProperties<IdT, EntityIdT, FormValueT>) => void;
+    filter?: AsyncCallbackProperty<IdT, EntityIdT, boolean>;
+    access?: string;
+    formDefinitions?: object[] | AsyncCallbackProperty<IdT, EntityIdT, object[]>;
+}
+export {};

package/dist/types/public_helpers.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=public_helpers.js.map

package/dist/types/public_helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public_helpers.js","sourceRoot":"","sources":["../../src/types/public_helpers.ts"],"names":[],"mappings":""}

package/dist/types/public_helpers_internal.d.ts

@@ -0,0 +1,27 @@
+import { ContextMenuIcon, ContextMenuItem } from './public_helpers.js';
+export interface SelectedMenuItemListenerData<IdT, EntityIdT> {
+    hook_id: string;
+    menu_id: string;
+    menuitem_id: string;
+    selected_ids: IdT[];
+    entity_id: EntityIdT;
+    permissions: string[];
+    supports: string[];
+    form_values: object;
+}
+export interface MenuItemListHookData<IdT, EntityIdT> {
+    selected_ids: IdT[];
+    entity_id: EntityIdT;
+    permissions: string[];
+    supports: string[];
+}
+export interface ResponseMenuItemCallbackFields {
+    urls?: string[] | undefined;
+    form_definitions?: object[] | undefined;
+}
+export type ResponseMenuItem<IdT, EntityIdT> = Omit<ContextMenuItem<IdT, EntityIdT>, 'onClick' | 'filter' | 'urls' | 'form_definitions'> & ResponseMenuItemCallbackFields;
+export interface MenuItemListHookAcceptData<IdT, EntityIdT> {
+    menuitems: ResponseMenuItem<IdT, EntityIdT>[];
+    icon?: ContextMenuIcon;
+    title?: string;
+}

package/dist/types/public_helpers_internal.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=public_helpers_internal.js.map

package/dist/types/public_helpers_internal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public_helpers_internal.js","sourceRoot":"","sources":["../../src/types/public_helpers_internal.ts"],"names":[],"mappings":""}

package/dist/types/requests.d.ts

@@ -0,0 +1,14 @@
+import * as API from './api.js';
+export interface SocketRequestMethods {
+    put: <ResponseT extends object | void>(path: string, data?: object) => Promise<ResponseT>;
+    patch: <ResponseT extends object | void>(path: string, data?: object) => Promise<ResponseT>;
+    post: <ResponseT extends object | void>(path: string, data?: object) => Promise<ResponseT>;
+    delete: <ResponseT extends object | void>(path: string) => Promise<ResponseT>;
+    get: <ResponseT extends object | void>(path: string) => Promise<ResponseT>;
+    getPendingRequestCount: () => number;
+}
+export interface ErrorResponse {
+    message: string;
+    code: number;
+    json: API.FieldError | API.ErrorBase;
+}

package/dist/types/requests.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=requests.js.map

package/dist/types/requests.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"requests.js","sourceRoot":"","sources":["../../src/types/requests.ts"],"names":[],"mappings":""}

package/dist/types/socket.d.ts

@@ -0,0 +1,23 @@
+import { AuthTokenType, LogoutResponse, AuthenticationResponse } from './api.js';
+import { Logger } from './logger.js';
+import { SocketRequestMethods } from './requests.js';
+import { SocketSubscriptions } from './subscriptions.js';
+export type ConnectedCallback = (data: AuthenticationResponse) => void;
+export type SessionResetCallback = () => void;
+export type DisconnectedCallback = (reason: string, code: number, wasClean: boolean) => void;
+export interface APISocket extends SocketRequestMethods, SocketSubscriptions {
+    connect: (username?: string, password?: string, reconnectOnFailure?: boolean) => Promise<AuthenticationResponse>;
+    connectRefreshToken: (refreshToken: string, reconnectOnFailure?: boolean) => Promise<AuthenticationResponse>;
+    disconnect: (autoConnect?: boolean, reason?: string) => void;
+    waitDisconnected: (timeoutMs?: number) => Promise<void>;
+    reconnect: (token?: AuthTokenType, reconnectOnFailure?: boolean) => Promise<AuthenticationResponse>;
+    logout: () => Promise<LogoutResponse>;
+    isConnecting: () => boolean;
+    isConnected: () => boolean;
+    isActive: () => boolean;
+    logger: Logger;
+    onConnected: ConnectedCallback | null;
+    onSessionReset: SessionResetCallback | null;
+    onDisconnected: DisconnectedCallback | null;
+    readonly nativeSocket: WebSocket | null;
+}

package/dist/types/socket.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=socket.js.map

package/dist/types/socket.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../src/types/socket.ts"],"names":[],"mappings":""}

package/dist/types/subscriptions.d.ts

@@ -0,0 +1,20 @@
+import * as API from './api.js';
+export type SubscriptionRemoveHandler = (sendApi?: boolean) => void;
+export type SubscriptionCallback<DataT extends object | void = object, EntityIdT = API.EntityId | undefined> = (data: DataT, entityId: EntityIdT) => void;
+export interface HookSubscriberInfo {
+    id: string;
+    name: string;
+}
+export type HookRejectHandler = (rejectId: string, rejectMessage: string) => void;
+export type HookAcceptHandler<DataT extends object | undefined> = (data: DataT) => void;
+export type HookCallback<DataT extends object = object, CompletionDataT extends object | undefined = object | undefined> = (data: DataT, accept: HookAcceptHandler<CompletionDataT>, reject: HookRejectHandler) => void;
+export interface SocketSubscriptions {
+    addHook: <DataT extends object, CompletionDataT extends object | undefined>(apiModule: string, event: string, callback: HookCallback<DataT, CompletionDataT>, subscriberInfo: HookSubscriberInfo) => Promise<SubscriptionRemoveHandler>;
+    addListener: <DataT extends object | void, EntityIdT extends API.EntityId | undefined = undefined>(apiModule: string, event: string, callback: SubscriptionCallback<DataT, EntityIdT>, entityId?: API.EntityId) => Promise<SubscriptionRemoveHandler>;
+    addViewUpdateListener: <DataT extends object | void, EntityIdT extends API.EntityId | undefined = undefined>(viewName: string, callback: SubscriptionCallback<DataT, EntityIdT>, entityId?: API.EntityId) => () => void;
+    hasListeners: () => boolean;
+    getPendingSubscriptionCount: () => number;
+}
+export type AddHook = SocketSubscriptions['addHook'];
+export type AddListener = SocketSubscriptions['addListener'];
+export type AddViewUpdateListener = SocketSubscriptions['addViewUpdateListener'];

package/dist/types/subscriptions.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=subscriptions.js.map

package/dist/types/subscriptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subscriptions.js","sourceRoot":"","sources":["../../src/types/subscriptions.ts"],"names":[],"mappings":""}

package/dist/utils.d.ts

@@ -0,0 +1,2 @@
+import * as Options from './types/options.js';
+export declare const eventIgnored: (path: string, ignoredEvents?: Options.IgnoreMatcher) => boolean;

package/dist/utils.js

@@ -0,0 +1,12 @@
+export const eventIgnored = (path, ignoredEvents) => {
+    if (!ignoredEvents) {
+        return false;
+    }
+    // Array?
+    if (Array.isArray(ignoredEvents)) {
+        return ignoredEvents.indexOf(path) !== -1;
+    }
+    // Regexp
+    return ignoredEvents.test(path);
+};
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAE,aAAqC,EAAE,EAAE;IAClF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,SAAS;IACT,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;QACjC,OAAO,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,SAAS;IACT,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC,CAAC"}

package/dist-es/tests/helpers.d.ts

@@ -0,0 +1,75 @@
+import * as Options from '../types/options.js';
+export declare const waitForExpect: (func: () => void | Promise<void>) => Promise<{}>;
+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>;
+    };
+}>;
+declare const getMockServer: (url?: string) => {
+    addDataHandler: <DataT extends object | undefined>(method: string, path: string, data?: DataT, subscriptionCallback?: Callback) => void;
+    addErrorHandler: (method: string, path: string, errorStr: string | null, errorCode: number, subscriptionCallback?: Callback) => void;
+    stop: () => void;
+    send: (data: object) => void;
+    url: string;
+};
+export { getMockServer, getSocket, getConnectedSocket, DEFAULT_CONNECT_PARAMS, DEFAULT_AUTH_RESPONSE };

package/dist-es/tests/helpers.js

@@ -0,0 +1,135 @@
+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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "airdcpp-apisocket",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.5",
   "description": "Javascript connector for AirDC++ Web API",
   "license": "MIT",
   "authors": [
@@ -42,7 +42,7 @@
     "@babel/preset-env": "^7.20.2",
     "@types/invariant": "^2.2.35",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.14.9",
+    "@types/node": "^22.10.2",
     "jest": "^29.7.0",
     "jest-cli": "^29.7.0",
     "jest-environment-node-debug": "^2.0.0",
@@ -57,6 +57,9 @@
     "websocket": "^1.0.34"
   },
   "main": "./dist/NodeSocket.js",
-  "exports": "./dist-es/NodeSocket.js",
+  "exports": {
+    ".": "./dist-es/NodeSocket.js",
+    "./tests/": "./dist-es/tests/"
+  },
   "type": "module"
 }

package/src/tests/Socket.test.ts

@@ -1,5 +1,5 @@
 import { 
-  AUTH_RESPONSE, CONNECT_PARAMS, 
+  DEFAULT_AUTH_RESPONSE, DEFAULT_CONNECT_PARAMS, 
   getConnectedSocket, getMockServer, getSocket, waitForExpect
 } from './helpers.js';
 
@@ -29,15 +29,15 @@ describe('socket', () => {
 
   describe('auth', () => {
     test('should handle valid credentials', async () => {
-      server.addDataHandler('POST', ApiConstants.LOGIN_URL, AUTH_RESPONSE);
+      server.addDataHandler('POST', ApiConstants.LOGIN_URL, DEFAULT_AUTH_RESPONSE);
       const connectedCallback = jest.fn();
 
       const { socket, mockConsole } = getSocket();
       socket.onConnected = connectedCallback;
       const response = await socket.connect();
 
-      expect(connectedCallback).toHaveBeenCalledWith(AUTH_RESPONSE);
-      expect(response).toEqual(AUTH_RESPONSE);
+      expect(connectedCallback).toHaveBeenCalledWith(DEFAULT_AUTH_RESPONSE);
+      expect(response).toEqual(DEFAULT_AUTH_RESPONSE);
       expect(socket.isConnected()).toEqual(true);
 
       expect(mockConsole.warn.mock.calls.length).toBe(0);
@@ -48,15 +48,15 @@ describe('socket', () => {
     });
 
     test('should handle valid refresh token', async () => {
-      server.addDataHandler('POST', ApiConstants.LOGIN_URL, AUTH_RESPONSE);
+      server.addDataHandler('POST', ApiConstants.LOGIN_URL, DEFAULT_AUTH_RESPONSE);
       const connectedCallback = jest.fn();
 
       const { socket, mockConsole } = getSocket();
       socket.onConnected = connectedCallback;
       const response = await socket.connectRefreshToken('refresh token');
 
-      expect(connectedCallback).toHaveBeenCalledWith(AUTH_RESPONSE);
-      expect(response).toEqual(AUTH_RESPONSE);
+      expect(connectedCallback).toHaveBeenCalledWith(DEFAULT_AUTH_RESPONSE);
+      expect(response).toEqual(DEFAULT_AUTH_RESPONSE);
       expect(socket.isConnected()).toEqual(true);
 
       expect(mockConsole.warn.mock.calls.length).toBe(0);
@@ -96,7 +96,7 @@ describe('socket', () => {
       // Fail without a server handler with auto reconnect disabled
       let error;
       try {
-        await socket.connect(CONNECT_PARAMS.username, CONNECT_PARAMS.password, false);
+        await socket.connect(DEFAULT_CONNECT_PARAMS.username, DEFAULT_CONNECT_PARAMS.password, false);
       } catch (e) {
         error = e;
       }
@@ -106,9 +106,9 @@ describe('socket', () => {
 
       // Valid connect attempt
       server = getMockServer();
-      server.addDataHandler('POST', ApiConstants.LOGIN_URL, AUTH_RESPONSE);
+      server.addDataHandler('POST', ApiConstants.LOGIN_URL, DEFAULT_AUTH_RESPONSE);
 
-      await socket.connect(CONNECT_PARAMS.username, CONNECT_PARAMS.password, false);
+      await socket.connect(DEFAULT_CONNECT_PARAMS.username, DEFAULT_CONNECT_PARAMS.password, false);
 
       expect(socket.isConnected()).toEqual(true);
 
@@ -285,7 +285,7 @@ describe('socket', () => {
       server.addErrorHandler('POST', ApiConstants.CONNECT_URL, ErrorResponse, 400);
       
       const authCallback = jest.fn();
-      server.addDataHandler('POST', ApiConstants.LOGIN_URL, AUTH_RESPONSE, authCallback);
+      server.addDataHandler('POST', ApiConstants.LOGIN_URL, DEFAULT_AUTH_RESPONSE, authCallback);
 
       jest.runOnlyPendingTimers();
       socket.reconnect();
@@ -525,7 +525,9 @@ describe('socket', () => {
   describe('logging', () => {
     const connect = async (logLevel: string) => {
       const { socket, mockConsole } = await getConnectedSocket(server, {
-        logLevel,
+        socketOptions: {
+          logLevel,
+        },
       });
 
       socket.disconnect(true);