airdcpp-apisocket 2.4.4 → 2.5.0-beta.1

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

@@ -1,31 +1,31 @@
-export declare type PrintHandler = (...optionalParams: any[]) => void;
-export interface LogOutput {
-    log: PrintHandler;
-    info: PrintHandler;
-    warn: PrintHandler;
-    error: PrintHandler;
-}
-export declare 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;
-}
-declare type UserOptions = RequiredSocketOptions & Partial<AdvancedSocketOptions> & LoggerOptions & SocketSubscriptionOptions & SocketRequestOptions;
-export { UserOptions as APISocketOptions };
+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-es/types/options.js

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

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

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

package/dist-es/types/public_helpers.js

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

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

@@ -1,25 +1,27 @@
-import { ContextMenuItem } from './public_helpers';
-export interface SelectedMenuItemListenerData<IdT, EntityIdT> {
-    hook_id: string;
-    menu_id: string;
-    menuitem_id: string;
-    selected_ids: IdT[];
-    entity_id: EntityIdT | null;
-    permissions: string[];
-    supports: string[];
-    form_values: object;
-}
-export interface MenuItemListHookData<IdT, EntityIdT> {
-    selected_ids: IdT[];
-    entity_id: EntityIdT | null;
-    permissions: string[];
-    supports: string[];
-}
-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 interface MenuItemListHookAcceptData<IdT, EntityIdT> {
-    menuitems: ResponseMenuItem<IdT, EntityIdT>[];
-}
+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 | null;
+    permissions: string[];
+    supports: string[];
+    form_values: object;
+}
+export interface MenuItemListHookData<IdT, EntityIdT> {
+    selected_ids: IdT[];
+    entity_id: EntityIdT | null;
+    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-es/types/public_helpers_internal.js

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

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

@@ -1,14 +1,14 @@
-import * as API from './api';
-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;
-}
+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-es/types/requests.js

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

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

@@ -1,23 +1,23 @@
-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;
-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;
-}
+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-es/types/socket.js

@@ -1,3 +1,2 @@
-// REQUESTS
-export {};
+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;
-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 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 declare type AddHook = SocketSubscriptions['addHook'];
-export declare type AddListener = SocketSubscriptions['addListener'];
-export declare type AddViewUpdateListener = SocketSubscriptions['addViewUpdateListener'];
+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-es/types/subscriptions.js

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

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,12 +1,12 @@
-export var eventIgnored = function (path, ignoredEvents) {
-    if (!ignoredEvents) {
-        return false;
-    }
-    // Array?
-    if (Array.isArray(ignoredEvents)) {
-        return ignoredEvents.indexOf(path) !== -1;
-    }
-    // Regexp
-    return ignoredEvents.test(path);
-};
+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-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,15 @@ module.exports = {
   collectCoverage: true,
   roots: [
     '<rootDir>/src/'
-  ]
-};
+  ],
+  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.4",
+  "version": "2.5.0-beta.1",
   "description": "Javascript connector for AirDC++ Web API",
   "license": "MIT",
   "authors": [
@@ -22,7 +22,7 @@
   "scripts": {
     "build": "npm run build-commonjs && npm run build-es",
     "build-commonjs": "rimraf dist && tsc -d --outDir dist --module CommonJS",
-    "build-es": "rimraf dist-es && tsc -d --outDir dist-es --module es2015",
+    "build-es": "rimraf dist-es && tsc -d --outDir dist-es --module es2020",
     "clean": "rimraf dist/*",
     "lint": "tslint --project tsconfig.json",
     "lint-fix": "tslint --project tsconfig.json --fix",
@@ -37,25 +37,27 @@
     "events": "^3.3.0",
     "invariant": "^2.2.4",
     "is-in-browser": "^2.0.0",
-    "promise": "^8.1.0"
+    "promise": "^8.3.0"
   },
   "devDependencies": {
+    "@babel/preset-env": "^7.20.2",
     "@types/invariant": "^2.2.35",
-    "@types/jest": "^27.0.1",
-    "@types/node": "^16.7.3",
-    "jest": "^27.1.0",
-    "jest-cli": "^27.1.0",
+    "@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.4.2",
+    "typescript": "^5.0.2",
     "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 { APISocket, ContextMenuItem, EntityId, ContextMenu } 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 => {
@@ -71,15 +71,15 @@ const parseCallbackData = async <IdT, EntityIdT extends EntityId | undefined = u
 
 export const addContextMenuItems = async <IdT, EntityIdT extends EntityId | undefined = undefined>(
   socket: APISocket,
-  menuItems: ContextMenuItem<IdT, EntityIdT>[], 
-  menuId: string, 
-  subscriberInfo: HookSubscriberInfo
+  menuItems: ContextMenuItem<IdT, EntityIdT>[],
+  menuTypeId: string,
+  menu: ContextMenu
 ) => {
   const removeListener = await socket.addListener<SelectedMenuItemListenerData<IdT, EntityIdT>, EntityIdT>(
     'menus', 
-    `${menuId}_menuitem_selected`, 
+    `${menuTypeId}_menuitem_selected`, 
     async (data) => {
-      if (data.hook_id === subscriberInfo.id) {
+      if (data.hook_id === menu.id) {
         const menuItem = menuItems.find(i => data.menuitem_id === i.id);
         if (!!menuItem) {
           const isValid = await validateItem(menuItem, data);
@@ -97,7 +97,7 @@ export const addContextMenuItems = async <IdT, EntityIdT extends EntityId | unde
     MenuItemListHookAcceptData<IdT, EntityIdT> | undefined
   >(
     'menus', 
-    `${menuId}_list_menuitems`, 
+    `${menuTypeId}_list_menuitems`, 
     async (data, accept, reject) => {
       const validItems = [];
       for (const item of menuItems) {
@@ -118,10 +118,11 @@ export const addContextMenuItems = async <IdT, EntityIdT extends EntityId | unde
       }
 
       accept({
-        menuitems: validItems
+        menuitems: validItems,
+        icon: menu.icon,
       });
     }, 
-    subscriberInfo
+    menu
   );
 
   return () => {

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,11 +24,10 @@ 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];
+  const logLevel = Severities[logSetting as keyof typeof Severities];
 
   invariant(
     // @ts-ignore: This condition will always return true since the function is always defined

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 {
@@ -25,7 +25,7 @@ const SocketRequestHandler = (
   { requestTimeout = 30, ignoredRequestPaths }: Options.SocketRequestOptions
 ) => {
 
-  let callbacks: { [key: number]: Callback } = {};
+  let callbacks: Record<string, Callback> = {};
   let currentCallbackId = 0;
   
   let timeoutReportInterval: any;
@@ -85,7 +85,7 @@ const SocketRequestHandler = (
     // Callback
     const resolver = Promise.pending();
 
-    callbacks[callbackId] = {
+    callbacks[callbackId.toString()] = {
       time: Date.now(),
       resolver,
       ignored,

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 { 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 { eventIgnored } from './utils.js';
+import Promise, { PendingResult } from './Promise.js';
+
+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 {