airdcpp-apisocket 2.4.3 → 2.4.5-beta.1

package/dist-es/types/public_helpers_internal.d.ts

@@ -1,4 +1,4 @@
-import { ContextMenuItem } from './public_helpers';
+import { ContextMenuItem } from './public_helpers.js';
 export interface SelectedMenuItemListenerData<IdT, EntityIdT> {
     hook_id: string;
     menu_id: string;
@@ -19,7 +19,7 @@ export interface ResponseMenuItemCallbackFields {
     urls?: string[] | undefined;
     form_definitions?: object[] | undefined;
 }
-export declare type ResponseMenuItem<IdT, EntityIdT> = Omit<ContextMenuItem<IdT, EntityIdT>, 'onClick' | 'filter' | 'urls' | 'form_definitions'> & ResponseMenuItemCallbackFields;
+export type ResponseMenuItem<IdT, EntityIdT> = Omit<ContextMenuItem<IdT, EntityIdT>, 'onClick' | 'filter' | 'urls' | 'form_definitions'> & ResponseMenuItemCallbackFields;
 export interface MenuItemListHookAcceptData<IdT, EntityIdT> {
     menuitems: ResponseMenuItem<IdT, EntityIdT>[];
 }

package/dist-es/types/requests.d.ts

@@ -1,4 +1,4 @@
-import * as API from './api';
+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>;

package/dist-es/types/socket.d.ts

@@ -1,10 +1,10 @@
-import { AuthTokenType, LogoutResponse, AuthenticationResponse } from './api';
-import { Logger } from './logger';
-import { SocketRequestMethods } from './requests';
-import { SocketSubscriptions } from './subscriptions';
-export declare type ConnectedCallback = (data: AuthenticationResponse) => void;
-export declare type SessionResetCallback = () => void;
-export declare type DisconnectedCallback = (reason: string, code: number, wasClean: boolean) => void;
+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>;

package/dist-es/types/socket.js

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

package/dist-es/types/socket.js.map

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

package/dist-es/types/subscriptions.d.ts

@@ -1,20 +1,20 @@
-import * as API from './api';
-export declare type SubscriptionRemoveHandler = (sendApi?: boolean) => void;
-export declare type SubscriptionCallback<DataT extends object | void = object, EntityIdT = API.EntityId | undefined> = (data: DataT, entityId: EntityIdT) => void;
+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 declare type HookRejectHandler = (rejectId: string, rejectMessage: string) => void;
-export declare type HookAcceptHandler<DataT extends object | undefined> = (data: DataT) => void;
-export declare type HookCallback<DataT extends object = object, CompletionDataT extends object | undefined = object | undefined> = (data: DataT, accept: HookAcceptHandler<CompletionDataT>, reject: HookRejectHandler) => void;
+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>(apiModuleUrl: string, event: string, callback: HookCallback<DataT, CompletionDataT>, subscriberInfo: HookSubscriberInfo) => Promise<SubscriptionRemoveHandler>;
-    addListener: <DataT extends object | void, EntityIdT extends API.EntityId | undefined = undefined>(apiModuleUrl: string, event: string, callback: SubscriptionCallback<DataT, EntityIdT>, entityId?: API.EntityId) => Promise<SubscriptionRemoveHandler>;
+    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 declare type AddHook = SocketSubscriptions['addHook'];
-export declare type AddListener = SocketSubscriptions['addListener'];
-export declare type AddViewUpdateListener = SocketSubscriptions['addViewUpdateListener'];
+export type AddHook = SocketSubscriptions['addHook'];
+export type AddListener = SocketSubscriptions['addListener'];
+export type AddViewUpdateListener = SocketSubscriptions['addViewUpdateListener'];

package/dist-es/utils.d.ts

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

package/dist-es/utils.js

@@ -1,4 +1,4 @@
-export var eventIgnored = function (path, ignoredEvents) {
+export const eventIgnored = (path, ignoredEvents) => {
     if (!ignoredEvents) {
         return false;
     }

package/dist-es/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,IAAM,YAAY,GAAG,UAAC,IAAY,EAAE,aAAqC;IAC9E,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,KAAK,CAAC;KACd;IAED,SAAS;IACT,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAChC,OAAO,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;KAC3C;IAED,SAAS;IACT,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC,CAAC"}
+{"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;QAClB,OAAO,KAAK,CAAC;KACd;IAED,SAAS;IACT,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAChC,OAAO,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;KAC3C;IAED,SAAS;IACT,OAAO,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC,CAAC"}

package/jest.config.js

@@ -1,4 +1,6 @@
-module.exports = {
+// import type { JestConfigWithTsJest } from 'ts-jest';
+
+const jestConfig = {
   preset: 'ts-jest',
   testEnvironment: 'node',
   coverageDirectory: './coverage/',
@@ -10,5 +12,18 @@ module.exports = {
   collectCoverage: true,
   roots: [
     '<rootDir>/src/'
-  ]
-};
+  ],
+  transformIgnorePatterns: [
+    '<rootDir>\/node_modules\/(?!chalk)\/'
+  ],
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+    '#(.*)': '<rootDir>/node_modules/$1',
+  },
+  transform: {
+    '^.+\\.jsx?$': 'babel-jest',
+    '^.+\\.tsx?$': 'ts-jest'
+  },
+};
+
+export default jestConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "airdcpp-apisocket",
-  "version": "2.4.3",
+  "version": "2.4.5-beta.1",
   "description": "Javascript connector for AirDC++ Web API",
   "license": "MIT",
   "authors": [
@@ -33,29 +33,31 @@
     "test"
   ],
   "dependencies": {
-    "chalk": "^4.1.2",
+    "chalk": "^5.1.2",
     "events": "^3.3.0",
     "invariant": "^2.2.4",
     "is-in-browser": "^2.0.0",
-    "promise": "^8.1.0"
+    "promise": "^8.3.0"
   },
   "devDependencies": {
-    "@types/invariant": "^2.2.34",
-    "@types/jest": "^27.0.1",
-    "@types/node": "^16.7.1",
-    "jest": "^27.0.6",
-    "jest-cli": "^27.0.6",
+    "@babel/preset-env": "^7.20.2",
+    "@types/invariant": "^2.2.35",
+    "@types/jest": "^28.1.1",
+    "@types/node": "^18.11.5",
+    "jest": "^28.1.3",
+    "jest-cli": "^28.1.3",
     "jest-environment-node-debug": "^2.0.0",
-    "mock-socket": "^9.0.3",
-    "mockdate": "^3.0.5",
+    "mock-socket": "^9.1.5",
     "pre-commit": "^1.2.2",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.5",
+    "rimraf": "^4.1.2",
+    "ts-jest": "^28.0.8",
+    "ts-node": "^10.9.1",
     "tslint": "^6.1.3",
-    "typescript": "^4.3.5",
+    "typescript": "^4.8.4",
     "wait-for-expect": "^3.0.2",
     "websocket": "^1.0.34"
   },
   "main": "./dist/NodeSocket.js",
-  "module": "./dist-es/NodeSocket.js"
+  "module": "./dist-es/NodeSocket.js",
+  "type": "module"
 }

package/src/NodeSocket.ts

@@ -1,7 +1,7 @@
-import SocketBase from './SocketBase';
+import SocketBase from './SocketBase.js';
 
 
-export * from './types';
-export * from './PublicHelpers';
+export * from './types/index.js';
+export * from './PublicHelpers.js';
 
 export { SocketBase as Socket };

package/src/PublicHelpers.ts

@@ -1,8 +1,8 @@
-import { HookSubscriberInfo, APISocket, ContextMenuItem, EntityId } from './types';
+import { HookSubscriberInfo, APISocket, ContextMenuItem, EntityId } from './types/index.js';
 import { 
   SelectedMenuItemListenerData, MenuItemListHookData, 
   MenuItemListHookAcceptData, ResponseMenuItemCallbackFields 
-} from './types/public_helpers_internal';
+} from './types/public_helpers_internal.js';
 
 
 const checkAccess = <IdT, EntityIdT>(menuItem: ContextMenuItem<IdT, EntityIdT>, permissions: string[]): boolean => {

package/src/SocketBase.ts

@@ -1,16 +1,16 @@
-import ApiConstants from './ApiConstants';
+import ApiConstants from './ApiConstants.js';
 
-import SocketLogger from './SocketLogger';
-import SocketSubscriptionHandler from './SocketSubscriptionHandler';
-import SocketRequestHandler from './SocketRequestHandler';
+import SocketLogger from './SocketLogger.js';
+import SocketSubscriptionHandler from './SocketSubscriptionHandler.js';
+import SocketRequestHandler from './SocketRequestHandler.js';
 
 import invariant from 'invariant';
-import Promise from './Promise';
+import Promise from './Promise.js';
 
-import * as API from './types/api';
-import * as Options from './types/options';
-import * as Socket from './types/socket';
-import * as Requests from './types/requests';
+import * as API from './types/api.js';
+import * as Options from './types/options.js';
+import * as Socket from './types/socket.js';
+import * as Requests from './types/requests.js';
 
 
 // INTERNAL TYPES

package/src/SocketLogger.ts

@@ -1,9 +1,10 @@
 import chalk from 'chalk';
-import isBrowser from 'is-in-browser';
+// @ts-ignore
+import { isBrowser, isJsDom } from 'is-in-browser';
 import invariant from 'invariant';
 
-import * as Options from './types/options';
-import { Logger } from './types/logger';
+import * as Options from './types/options.js';
+import { Logger } from './types/logger.js';
 
 
 export const LOG_NONE = 'none';
@@ -23,8 +24,7 @@ const Severities = {
 
 // Should we format the line with timestamp and coloring or let the logger implementation to handle it?
 // Do this when running in terminal (node.js/tests in browser env)
-const shouldFormatLine = !isBrowser || 
-  (!!global.process && !!global.process.env && global.process.env.NODE_ENV === 'test');
+const shouldFormatLine = isJsDom || !isBrowser;
 
 const Logger = ({ logLevel: logSetting = LOG_VERBOSE, logOutput = console }: Options.LoggerOptions) => {
   const logLevel = Severities[logSetting];

package/src/SocketRequestHandler.ts

@@ -1,15 +1,15 @@
 import chalk from 'chalk';
 import invariant from 'invariant';
-import Promise, { PendingResult } from './Promise';
+import Promise, { PendingResult } from './Promise.js';
 
-import { eventIgnored } from './utils';
+import { eventIgnored } from './utils.js';
 
-import * as API from './types/api';
-import * as APIInternal from './types/api_internal';
-import * as Options from './types/options';
-import * as Socket from './types/socket';
-import { Logger } from './types/logger';
-import { SocketRequestMethods, ErrorResponse } from './types/requests';
+import * as API from './types/api.js';
+import * as APIInternal from './types/api_internal.js';
+import * as Options from './types/options.js';
+import * as Socket from './types/socket.js';
+import { Logger } from './types/logger.js';
+import { SocketRequestMethods, ErrorResponse } from './types/requests.js';
 
 
 interface Callback {

package/src/SocketSubscriptionHandler.ts

@@ -1,16 +1,16 @@
 import invariant from 'invariant';
 import { EventEmitter } from 'events';
 
-import { eventIgnored } from './utils';
-import Promise, { PendingResult } from './Promise';
+import { eventIgnored } from './utils.js';
+import Promise, { PendingResult } from './Promise.js';
 
-import { Logger } from './types/logger';
-import * as API from './types/api';
-import * as APIInternal from './types/api_internal';
-import * as Options from './types/options';
-import * as Requests from './types/requests';
-import * as Socket from './types/socket';
-import * as Subscriptions from './types/subscriptions';
+import { Logger } from './types/logger.js';
+import * as API from './types/api.js';
+import * as APIInternal from './types/api_internal.js';
+import * as Options from './types/options.js';
+import * as Requests from './types/requests.js';
+import * as Socket from './types/socket.js';
+import * as Subscriptions from './types/subscriptions.js';
 
 
 interface PendingSubscription { 
@@ -77,7 +77,7 @@ const SocketSubscriptionHandler = (
   };
 
   const handleHookAction = <DataT extends object, CompletionDataT extends object>(
-    apiModuleUrl: string, 
+    subscriptionUrl: string, 
     callback: Subscriptions.HookCallback<DataT, CompletionDataT>, 
     data: DataT, 
     completionId: APIInternal.CompletionIdType
@@ -85,14 +85,14 @@ const SocketSubscriptionHandler = (
     callback(
       data, 
       completionData => {
-        socket().post(`${apiModuleUrl}/${completionId}/resolve`, completionData)
-          .catch((error) => logger.error('Failed to complete hook action', apiModuleUrl, error));
+        socket().post(`${subscriptionUrl}/${completionId}/resolve`, completionData)
+          .catch((error) => logger.error('Failed to complete hook action', subscriptionUrl, error));
       }, 
       (rejectId, rejectMessage) => {
-        socket().post(`${apiModuleUrl}/${completionId}/reject`, {
+        socket().post(`${subscriptionUrl}/${completionId}/reject`, {
           reject_id: rejectId,
           message: rejectMessage,
-        }).catch(error => logger.error('Failed to complete failed hook action', apiModuleUrl, error));
+        }).catch(error => logger.error('Failed to complete failed hook action', subscriptionUrl, error));
       }
     );
   };
@@ -160,13 +160,18 @@ const SocketSubscriptionHandler = (
     },
   
     // Listen to a specific event and manage the API subscription automatically
-    addListener: (apiModuleUrl, event, callback, entityId) => {
+    addListener: (apiModule, event, callback, entityId) => {
       if (!socket().isConnected()) {
         throw 'Listeners can be added only for a connected socket';
       }
+    
+      invariant(
+        apiModule.indexOf('/') === -1, 
+        'The first argument should only contain the API section without any path tokens (entity ID should be supplied separately)'
+      );
   
       const subscriptionId = getEmitId(event, entityId);
-      const subscriptionUrl = getSubscriptionUrl(apiModuleUrl, entityId, event);
+      const subscriptionUrl = getSubscriptionUrl(apiModule, entityId, event);
   
       emitter.on(subscriptionId, callback);
       return addPendingEntry(subscriptionUrl, subscriptionId, callback);
@@ -177,7 +182,7 @@ const SocketSubscriptionHandler = (
     },
   
     addHook: <DataT extends object, CompletionDataT extends object | undefined>(
-      apiModuleUrl: string, 
+      apiModule: string, 
       event: string, 
       callback: Subscriptions.HookCallback<DataT, CompletionDataT>, 
       subscriberInfo: Subscriptions.HookSubscriberInfo
@@ -185,13 +190,18 @@ const SocketSubscriptionHandler = (
       if (!socket().isConnected()) {
         throw 'Hooks can be added only for a connected socket';
       }
+    
+      invariant(
+        apiModule.indexOf('/') === -1, 
+        'The first argument should only contain the API section without any path tokens'
+      );
   
       const subscriptionId = event;
       if (subscriptions[subscriptionId] || pendingSubscriptions[subscriptionId]) {
         throw 'Hook exists';
       }
   
-      const subscriptionUrl = `${apiModuleUrl}/hooks/${event}`;
+      const subscriptionUrl = `${apiModule}/hooks/${event}`;
   
       callback = handleHookAction.bind(SocketSubscriptionHandler, subscriptionUrl, callback);
       emitter.on(subscriptionId, callback);

package/src/tests/Socket.test.ts

@@ -1,22 +1,31 @@
 import { 
   AUTH_RESPONSE, CONNECT_PARAMS, 
   getConnectedSocket, getMockServer, getSocket
-} from './helpers';
+} from './helpers.js';
 
-import ApiConstants from '../ApiConstants';
+import ApiConstants from '../ApiConstants.js';
 
-import { HookCallback, HookSubscriberInfo } from '../types/subscriptions';
-import { IncomingSubscriptionEvent } from '../types/api_internal';
+import { HookCallback, HookSubscriberInfo } from '../types/subscriptions.js';
+import { IncomingSubscriptionEvent } from '../types/api_internal.js';
 
-import * as MockDate from 'mockdate';
 import waitForExpectOriginal from 'wait-for-expect';
-
+import { jest } from '@jest/globals';
 
 let server: ReturnType<typeof getMockServer>;
 
 const EXCEPT_TIMEOUT = 1000;
-const waitForExpect = (func: () => void | Promise<void>) => waitForExpectOriginal(func, EXCEPT_TIMEOUT);
+const waitForExpect = (func: () => void | Promise<void>) => waitForExpectOriginal.default(func, EXCEPT_TIMEOUT);
+
+
+const dummyfn = () => {
+  // ..
+};
 
+const useFakeTimers = () => {
+  // Mocking performance would cause an error with Node 19, can be removed when using
+  // the latest version of Jest
+  jest.useFakeTimers({doNotFake: ['performance']});
+};
 
 // tslint:disable:no-empty
 describe('socket', () => {
@@ -27,7 +36,6 @@ describe('socket', () => {
   afterEach(() => {
     server.stop();
     jest.useRealTimers();
-    MockDate.reset();
   });
 
   describe('auth', () => {
@@ -129,10 +137,10 @@ describe('socket', () => {
 
       // Dummy listener
       server.addDataHandler('POST', 'hubs/listeners/hub_updated', undefined);
-      await socket.addListener('hubs', 'hub_updated', _ => {});
+      await socket.addListener('hubs', 'hub_updated', dummyfn);
 
       // Dummy pending request
-      socket.delete('dummyLogoutDelete').catch(error => {
+      socket.delete('dummyLogoutDelete').catch((error: Error) => {
         // TODO: fix, too unreliable at the moment (depends on the timings)
         //expect(error.message).toEqual('Socket disconnected');
       });
@@ -190,7 +198,7 @@ describe('socket', () => {
     test('should handle auto reconnect', async () => {
       const { socket, mockConsole } = await getConnectedSocket(server);
 
-      jest.useFakeTimers();
+      useFakeTimers();
 
       socket.disconnect(true);
       jest.runOnlyPendingTimers();
@@ -231,7 +239,7 @@ describe('socket', () => {
     test('should cancel auto reconnect', async () => {
       const { socket, mockConsole } = await getConnectedSocket(server);
 
-      jest.useFakeTimers();
+      useFakeTimers();
 
       // Disconnect with auto reconnect
       socket.disconnect(true);
@@ -278,7 +286,7 @@ describe('socket', () => {
       // Connect and disconnect
       const { socket, mockConsole } = await getConnectedSocket(server);
 
-      jest.useFakeTimers();
+      useFakeTimers();
       socket.disconnect();
       jest.runOnlyPendingTimers();
       expect(socket.isActive()).toEqual(false);
@@ -294,7 +302,7 @@ describe('socket', () => {
       socket.reconnect();
 
       {
-        const waitForExpectTask = waitForExpectOriginal(
+        const waitForExpectTask = waitForExpectOriginal.default(
           () => {
             jest.runOnlyPendingTimers();
             expect(authCallback.mock.calls.length).toBe(1);
@@ -331,15 +339,15 @@ describe('socket', () => {
     test('should report request timeouts', async () => {
       const { socket, mockConsole } = await getConnectedSocket(server);
 
-      jest.useFakeTimers();
-      socket.addListener('hubs', 'hub_updated', _ => {})
+      useFakeTimers();
+      socket.addListener('hubs', 'hub_updated', dummyfn)
         .catch(() => {});
-      socket.addListener('hubs', 'hub_added', _ => {})
+      socket.addListener('hubs', 'hub_added', dummyfn)
         .catch(() => {});
 
       jest.advanceTimersByTime(35000);
 
-      MockDate.set(Date.now() + 35000);
+      jest.setSystemTime(new Date(Date.now() + 35000));
       (socket as any).reportRequestTimeouts();
 
       expect(mockConsole.warn.mock.calls.length).toBe(2);
@@ -422,8 +430,8 @@ describe('socket', () => {
       server.addDataHandler('POST', 'hubs/listeners/hub_updated', undefined, subscribeCallback);
 
       // Add two simultaneous pending add events
-      const p1 = socket.addListener('hubs', 'hub_updated', _ => {});
-      const p2 = socket.addListener('hubs', 'hub_updated', _ => {});
+      const p1 = socket.addListener('hubs', 'hub_updated', dummyfn);
+      const p2 = socket.addListener('hubs', 'hub_updated', dummyfn);
 
       expect(socket.hasListeners()).toBe(false);
       expect(socket.getPendingSubscriptionCount()).toBe(1);
@@ -500,7 +508,7 @@ describe('socket', () => {
           hookSubscriberInfo
         );
 
-        expect(hookAddCallback.mock.calls[0][0].data).toEqual(hookSubscriberInfo);
+        expect((hookAddCallback.mock.calls[0][0] as any).data).toEqual(hookSubscriberInfo);
         expect(hookAddCallback.mock.calls.length).toBe(1);
       }
 
@@ -532,7 +540,7 @@ describe('socket', () => {
       });
 
       socket.disconnect(true);
-      await socket.delete('dummyLogDeleteWarning').catch(error => {
+      await socket.delete('dummyLogDeleteWarning').catch((error: Error) => {
         //...
       });
 

package/src/tests/helpers.ts

@@ -1,9 +1,10 @@
-import { Socket } from '../NodeSocket';
-import { WebSocket, Server } from 'mock-socket';
+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';
-import * as Options from '../types/options';
-import ApiConstants from '../ApiConstants';
+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';
 
 
@@ -101,7 +102,7 @@ const toEmitId = (path: string, method: string) => {
 
 const getMockServer = () => {
   const mockServer = new Server(CONNECT_PARAMS.url);
-  let socket: WebSocket;
+  let socket: Client;
   const emitter = new EventEmitter();
 
   const addServerHandler = <DataT extends object | undefined>(

package/src/tests/public_helpers.test.ts

@@ -1,14 +1,15 @@
 import { 
   getMockServer,
   getConnectedSocket,
-} from './helpers';
+} from './helpers.js';
 
 import waitForExpect from 'wait-for-expect';
+import { jest } from '@jest/globals';
 
-import { addContextMenuItems } from '../PublicHelpers';
-import { SelectedMenuItemListenerData, MenuItemListHookData, MenuItemListHookAcceptData } from '../types/public_helpers_internal';
-import { HookSubscriberInfo } from '../types';
-import { IncomingSubscriptionEvent } from '../types/api_internal';
+import { addContextMenuItems } from '../PublicHelpers.js';
+import { SelectedMenuItemListenerData, MenuItemListHookData, MenuItemListHookAcceptData } from '../types/public_helpers_internal.js';
+import { HookSubscriberInfo } from '../types/index.js';
+import { IncomingSubscriptionEvent } from '../types/api_internal.js';
 
 
 let server: ReturnType<typeof getMockServer>;
@@ -187,7 +188,7 @@ describe('public helpers', () => {
 
       // Validate list items results
       {
-        await waitForExpect(() => {
+        await waitForExpect.default(() => {
           expect(hookResolveCallback).toHaveBeenCalledTimes(1);
         });
 
@@ -197,7 +198,7 @@ describe('public helpers', () => {
           }),
         );
 
-        await waitForExpect(() => {
+        await waitForExpect.default(() => {
           expect(onGetUrlsItem3Mock).toHaveBeenCalledTimes(1);
         });
         expect(onGetUrlsItem3Mock).toHaveBeenCalledWith(selectedMenuIds, null, PERMISSIONS, SUPPORTS);
@@ -225,7 +226,7 @@ describe('public helpers', () => {
 
       // Validate select event results
       {
-        await waitForExpect(() => {
+        await waitForExpect.default(() => {
           expect(onClickItem1Mock).toHaveBeenCalledTimes(1);
         });
         expect(onClickItem1Mock).toHaveBeenCalledWith(selectedMenuIds, null, PERMISSIONS, SUPPORTS, FORM_VALUES);

package/src/types/api_internal.ts

@@ -5,7 +5,7 @@ export type CompletionIdType = number;
 
 // REQUESTS
 
-import { ErrorBase, FieldError, EntityId } from './api';
+import { ErrorBase, FieldError, EntityId } from './api.js';
 
 export interface RequestResponseBase {
   code: number;

package/src/types/index.ts

@@ -1,10 +1,10 @@
-export * from './api';
+export * from './api.js';
 
-export * from './logger';
-export * from './requests';
-export * from './subscriptions';
+export * from './logger.js';
+export * from './requests.js';
+export * from './subscriptions.js';
 
-export * from './socket';
-export * from './options';
+export * from './socket.js';
+export * from './options.js';
 
-export * from './public_helpers';
+export * from './public_helpers.js';

package/src/types/public_helpers_internal.ts

@@ -1,4 +1,4 @@
-import { ContextMenuItem } from './public_helpers';
+import { ContextMenuItem } from './public_helpers.js';
 
 
 export interface SelectedMenuItemListenerData<IdT, EntityIdT> {