@trezor/connect 9.0.6 → 9.0.8

package/lib/device/DeviceList.js

@@ -14,9 +14,9 @@ const transportInfo_1 = require("../data/transportInfo");
 const debug_1 = require("../utils/debug");
 const promiseUtils_1 = require("../utils/promiseUtils");
 const workers_1 = require("../workers/workers");
-const AbortController_1 = require("./AbortController");
 const { BridgeV2, Fallback } = transport_1.default;
 const _log = (0, debug_1.initLog)('DeviceList');
+let autoResolveTransportEventTimeout;
 class DeviceList extends events_1.default {
     constructor() {
         var _a;
@@ -25,23 +25,27 @@ class DeviceList extends events_1.default {
         this.creatingDevicesDescriptors = {};
         this.transportStartPending = 0;
         this.penalizedDevices = {};
-        const { env, webusb } = DataManager_1.DataManager.settings;
+        const env = DataManager_1.DataManager.getSettings('env');
+        let transportSettings = DataManager_1.DataManager.getSettings('transports');
         const transports = [];
+        if (!(transportSettings === null || transportSettings === void 0 ? void 0 : transportSettings.length)) {
+            transportSettings = ['BridgeTransport'];
+        }
         if (env === 'react-native' && typeof workers_1.ReactNativeUsbPlugin !== 'undefined') {
             transports.push((0, workers_1.ReactNativeUsbPlugin)());
         }
-        else {
+        else if (transportSettings === null || transportSettings === void 0 ? void 0 : transportSettings.includes('BridgeTransport')) {
             const bridgeLatestVersion = (0, transportInfo_1.getBridgeInfo)().version.join('.');
             const bridge = new BridgeV2(undefined, undefined);
             bridge.setBridgeLatestVersion(bridgeLatestVersion);
-            this.fetchController = (0, AbortController_1.getAbortController)();
+            this.fetchController = new AbortController();
             const { signal } = this.fetchController;
             const fetchWithSignal = (args, options = {}) => (0, cross_fetch_1.default)(args, { ...options, signal });
             const isNode = !!((_a = process === null || process === void 0 ? void 0 : process.release) === null || _a === void 0 ? void 0 : _a.name) && process.release.name.search(/node|io\.js/) !== -1;
             BridgeV2.setFetch(fetchWithSignal, isNode);
             transports.push(bridge);
         }
-        if (webusb && typeof workers_1.WebUsbPlugin !== 'undefined') {
+        if ((transportSettings === null || transportSettings === void 0 ? void 0 : transportSettings.includes('WebUsbTransport')) && typeof workers_1.WebUsbPlugin !== 'undefined') {
             transports.push((0, workers_1.WebUsbPlugin)());
         }
         this.transport = new Fallback(transports);
@@ -56,7 +60,7 @@ class DeviceList extends events_1.default {
             await transport.configure(JSON.stringify(this.messages));
             _log.debug('Configuring transports done');
             const { activeName } = transport;
-            if (activeName === 'LowlevelTransportWithSharedConnections') {
+            if (activeName === 'WebUsbTransport') {
                 this.transportPlugin = transport.activeTransport.plugin;
             }
             await this._initStream();
@@ -88,9 +92,15 @@ class DeviceList extends events_1.default {
         const stream = new DescriptorStream_1.DescriptorStream(this.transport);
         stream.on(events_2.TRANSPORT.START_PENDING, (pending) => {
             this.transportStartPending = pending;
+            autoResolveTransportEventTimeout = setTimeout(() => {
+                this.resolveTransportEvent();
+            }, 5000);
         });
         stream.on(events_2.TRANSPORT.START, () => {
             this.emit(events_2.TRANSPORT.START, this.getTransportInfo());
+            if (autoResolveTransportEventTimeout) {
+                clearTimeout(autoResolveTransportEventTimeout);
+            }
         });
         stream.on(events_2.TRANSPORT.UPDATE, (diff) => {
             new DiffHandler(this, diff).handle();
@@ -156,15 +166,9 @@ class DeviceList extends events_1.default {
         return this.asArray().length;
     }
     transportType() {
-        const { transport, transportPlugin } = this;
+        const { transport } = this;
         const { activeName } = transport;
-        if (activeName === 'BridgeTransport') {
-            return 'bridge';
-        }
-        if (transportPlugin) {
-            return transportPlugin.name;
-        }
-        return transport.name;
+        return activeName || 'UnknownTransport';
     }
     getTransportInfo() {
         return {
@@ -178,6 +182,9 @@ class DeviceList extends events_1.default {
         if (this.stream) {
             this.stream.stop();
         }
+        if (autoResolveTransportEventTimeout) {
+            clearTimeout(autoResolveTransportEventTimeout);
+        }
         await Promise.all(this.allDevices().map(device => device.dispose()));
         if (this.transport) {
             this.transport.stop();
@@ -238,20 +245,21 @@ class CreateDeviceHandler {
         this.path = descriptor.path.toString();
     }
     async handle() {
+        var _a;
         this.list.creatingDevicesDescriptors[this.path] = this.descriptor;
         try {
             await this._takeAndCreateDevice();
         }
         catch (error) {
             _log.debug('Cannot create device', error);
-            if (error.code === 'Device_NotFound') {
+            if (error.code === 'Device_NotFound' || error.message === 'device not found') {
             }
             else if (error.message === constants_1.ERRORS.WRONG_PREVIOUS_SESSION_ERROR_MESSAGE ||
                 error.toString() === constants_1.ERRORS.WEBUSB_ERROR_MESSAGE) {
                 this.list.enumerate();
                 this._handleUsedElsewhere();
             }
-            else if (error.message.indexOf(constants_1.ERRORS.LIBUSB_ERROR_MESSAGE) >= 0) {
+            else if (((_a = error.message) === null || _a === void 0 ? void 0 : _a.indexOf(constants_1.ERRORS.LIBUSB_ERROR_MESSAGE)) >= 0) {
                 const device = this.list._createUnreadableDevice(this.list.creatingDevicesDescriptors[this.path], error.message);
                 this.list.devices[this.path] = device;
                 this.list.emit(events_2.DEVICE.CONNECT_UNACQUIRED, device.toMessageObject());
@@ -263,7 +271,7 @@ class CreateDeviceHandler {
                 this._handleUsedElsewhere();
             }
             else {
-                await (0, promiseUtils_1.resolveAfter)(501, null);
+                await (0, promiseUtils_1.resolveAfter)(501, null).promise;
                 await this.handle();
             }
         }
@@ -337,7 +345,7 @@ class DiffHandler {
             const penalty = this.list.getAuthPenalty();
             _log.debug('Connected', priority, penalty, descriptor.session, this.list.devices);
             if (priority || penalty) {
-                await (0, promiseUtils_1.resolveAfter)(501 + penalty + 100 * priority, null);
+                await (0, promiseUtils_1.resolveAfter)(501 + penalty + 100 * priority, null).promise;
             }
             if (descriptor.session == null) {
                 await this.list._createAndSaveDevice(descriptor);
@@ -363,7 +371,7 @@ class DiffHandler {
             const device = this.list.devices[path];
             if (device) {
                 if (device.isUnacquired() && !device.isInconsistent()) {
-                    await (0, promiseUtils_1.resolveAfter)(501, null);
+                    await (0, promiseUtils_1.resolveAfter)(501, null).promise;
                     _log.debug('Create device from unacquired', device);
                     await this.list._createAndSaveDevice(descriptor);
                 }

package/lib/events/iframe.d.ts

@@ -1,5 +1,5 @@
 import { UI_EVENT } from './ui-request';
-import type { ConnectSettings } from '../types';
+import type { ConnectSettings, SystemInfo } from '../types';
 import type { MessageFactoryFn } from '../types/utils';
 export declare const IFRAME: {
     readonly BOOTSTRAP: "iframe-bootstrap";
@@ -19,6 +19,7 @@ export interface IFrameLoaded {
     type: typeof IFRAME.LOADED;
     payload: {
         useBroadcastChannel: boolean;
+        systemInfo: SystemInfo;
     };
 }
 export interface IFrameInit {

package/lib/events/popup.d.ts

@@ -1,6 +1,6 @@
 import { UI_EVENT } from './ui-request';
 import type { TransportInfo } from './transport';
-import type { ConnectSettings } from '../types';
+import type { ConnectSettings, SystemInfo } from '../types';
 import type { MessageFactoryFn } from '../types/utils';
 export declare const POPUP: {
     readonly BOOTSTRAP: "popup-bootstrap";
@@ -18,6 +18,7 @@ export interface PopupInit {
     payload: {
         settings: ConnectSettings;
         useBroadcastChannel: boolean;
+        systemInfo: SystemInfo;
     };
 }
 export interface PopupHandshake {

package/lib/events/transport.d.ts

@@ -1,4 +1,5 @@
 import type { MessageFactoryFn } from '../types/utils';
+import type { Transport } from '@trezor/transport';
 export declare const TRANSPORT_EVENT = "TRANSPORT_EVENT";
 export declare const TRANSPORT: {
     readonly START: "transport-start";
@@ -32,7 +33,7 @@ export interface UdevInfo {
     }[];
 }
 export interface TransportInfo {
-    type: string;
+    type: Transport['name'];
     version: string;
     outdated: boolean;
     bridge?: BridgeInfo;

package/lib/factory.js

@@ -110,7 +110,7 @@ const factory = ({ eventEmitter, manifest, init, call, requestLogin, uiResponse,
         checkFirmwareAuthenticity: params => call({ ...params, method: 'checkFirmwareAuthenticity' }),
         applyFlags: params => call({ ...params, method: 'applyFlags' }),
         applySettings: params => call({ ...params, method: 'applySettings' }),
-        authorizeCoinJoin: params => call({ ...params, method: 'authorizeCoinJoin' }),
+        authorizeCoinjoin: params => call({ ...params, method: 'authorizeCoinjoin' }),
         backupDevice: params => call({ ...params, method: 'backupDevice' }),
         changePin: params => call({ ...params, method: 'changePin' }),
         firmwareUpdate: params => call({ ...params, method: 'firmwareUpdate' }),

package/lib/index.js

@@ -90,16 +90,17 @@ function postMessage(message, usePromise = true) {
     _core.handleMessage(message, true);
 }
 const init = async (settings = {}) => {
+    var _a;
     if (_core) {
         throw constants_1.ERRORS.TypedError('Init_AlreadyInitialized');
     }
-    _settings = (0, connectSettings_1.parseConnectSettings)({ ..._settings, ...settings });
-    _settings.origin = 'http://node.trezor.io/';
-    _settings.popup = false;
-    _settings.env = 'node';
+    _settings = (0, connectSettings_1.parseConnectSettings)({ ..._settings, ...settings, popup: false });
     if (!_settings.manifest) {
         throw constants_1.ERRORS.TypedError('Init_ManifestMissing');
     }
+    if (!((_a = _settings.transports) === null || _a === void 0 ? void 0 : _a.length)) {
+        _settings.transports = ['BridgeTransport'];
+    }
     if (_settings.lazyLoad) {
         _settings.lazyLoad = false;
         return;

package/lib/types/api/{authorizeCoinJoin.d.ts → authorizeCoinjoin.d.ts}

@@ -1,6 +1,6 @@
 import type { PROTO } from '../../constants';
 import type { Params, Response } from '../params';
-export interface AuthorizeCoinJoin {
+export interface AuthorizeCoinjoin {
     path: string | number[];
     coordinator: string;
     maxRounds: number;
@@ -11,5 +11,5 @@ export interface AuthorizeCoinJoin {
     amountUnit?: PROTO.AmountUnit;
     preauthorized?: boolean;
 }
-export declare function authorizeCoinJoin(params: Params<AuthorizeCoinJoin>): Response<PROTO.Success>;
-//# sourceMappingURL=authorizeCoinJoin.d.ts.map
+export declare function authorizeCoinjoin(params: Params<AuthorizeCoinjoin>): Response<PROTO.Success>;
+//# sourceMappingURL=authorizeCoinjoin.d.ts.map

package/lib/types/api/{authorizeCoinJoin.js → authorizeCoinjoin.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=authorizeCoinJoin.js.map
+//# sourceMappingURL=authorizeCoinjoin.js.map

package/lib/types/api/bitcoin/index.d.ts

@@ -1,5 +1,7 @@
 import type { PROTO } from '../../../constants';
 import type { AccountAddresses } from '@trezor/blockchain-link';
+import type { Transaction as BlockbookTransaction } from '@trezor/blockchain-link-types/lib/blockbook';
+import { AccountUtxo } from '../../account';
 export interface SignMessage {
     path: string | number[];
     coin: string;
@@ -54,6 +56,7 @@ export interface SignTransaction {
     refTxs?: RefTransaction[];
     account?: {
         addresses: AccountAddresses;
+        utxo: AccountUtxo[];
     };
     coin: string;
     locktime?: number;
@@ -76,6 +79,7 @@ export type SignedTransaction = {
     serializedTx: string;
     witnesses?: (string | undefined)[];
     txid?: string;
+    signedTransaction?: BlockbookTransaction;
 };
 export interface VerifyMessage {
     address: string;

package/lib/types/api/cardano/index.d.ts

@@ -137,22 +137,23 @@ export interface CardanoReferenceInput {
     prev_hash: string;
     prev_index: number;
 }
-export interface CardanoGovernanceRegistrationDelegation {
-    votingPublicKey: string;
+export interface CardanoCVoteRegistrationDelegation {
+    votePublicKey: string;
     weight: number;
 }
-export interface CardanoGovernanceRegistrationParameters {
-    votingPublicKey?: string;
+export interface CardanoCVoteRegistrationParameters {
+    votePublicKey?: string;
     stakingPath: string | number[];
-    rewardAddressParameters: CardanoAddressParameters;
+    paymentAddressParameters?: CardanoAddressParameters;
     nonce: string;
-    format?: PROTO.CardanoGovernanceRegistrationFormat;
-    delegations?: CardanoGovernanceRegistrationDelegation[];
+    format?: PROTO.CardanoCVoteRegistrationFormat;
+    delegations?: CardanoCVoteRegistrationDelegation[];
     votingPurpose?: number;
+    paymentAddress?: string;
 }
 export interface CardanoAuxiliaryData {
     hash?: string;
-    governanceRegistrationParameters?: CardanoGovernanceRegistrationParameters;
+    cVoteRegistrationParameters?: CardanoCVoteRegistrationParameters;
 }
 export interface CardanoSignTransaction {
     inputs: CardanoInput[];
@@ -186,7 +187,7 @@ export interface CardanoSignedTxWitness {
 export interface CardanoAuxiliaryDataSupplement {
     type: PROTO.CardanoTxAuxiliaryDataSupplementType;
     auxiliaryDataHash: string;
-    governanceSignature?: string;
+    cVoteRegistrationSignature?: string;
 }
 export interface CardanoSignedTxData {
     hash: string;

package/lib/types/api/firmwareUpdate.d.ts

@@ -1,3 +1,4 @@
+import type { IntermediaryVersion } from '../firmware';
 import type { Params, Response } from '../params';
 export interface FirmwareUpdateBinary {
     binary: ArrayBuffer;
@@ -6,7 +7,7 @@ export interface FirmwareUpdate {
     version: number[];
     btcOnly?: boolean;
     baseUrl?: string;
-    intermediary?: boolean;
+    intermediaryVersion?: IntermediaryVersion;
 }
 export interface FirmwareUpdateResponse {
     hash: string;

package/lib/types/api/index.d.ts

@@ -1,6 +1,6 @@
 import { applyFlags } from './applyFlags';
 import { applySettings } from './applySettings';
-import { authorizeCoinJoin } from './authorizeCoinJoin';
+import { authorizeCoinjoin } from './authorizeCoinjoin';
 import { backupDevice } from './backupDevice';
 import { binanceGetAddress } from './binanceGetAddress';
 import { binanceGetPublicKey } from './binanceGetPublicKey';
@@ -78,7 +78,7 @@ import { checkFirmwareAuthenticity } from './checkFirmwareAuthenticity';
 export interface TrezorConnect {
     applyFlags: typeof applyFlags;
     applySettings: typeof applySettings;
-    authorizeCoinJoin: typeof authorizeCoinJoin;
+    authorizeCoinjoin: typeof authorizeCoinjoin;
     backupDevice: typeof backupDevice;
     binanceGetAddress: typeof binanceGetAddress;
     binanceGetPublicKey: typeof binanceGetPublicKey;

package/lib/types/firmware.d.ts

@@ -22,15 +22,14 @@ export type FirmwareRelease = {
     url_bitcoinonly?: string;
     fingerprint_bitcoinonly?: string;
     notes?: string;
-    rollout?: number;
     channel?: string;
 };
+export type IntermediaryVersion = 1 | 2 | 3;
 export type ReleaseInfo = {
     changelog: FirmwareRelease[] | null;
     release: FirmwareRelease;
-    isLatest: boolean;
-    latest: FirmwareRelease;
     isRequired: boolean | null;
     isNewer: boolean | null;
+    intermediaryVersion?: IntermediaryVersion;
 };
 //# sourceMappingURL=firmware.d.ts.map

package/lib/types/index.d.ts

@@ -15,5 +15,5 @@ export * from './api/stellar';
 export * from './api/tezos';
 export type { ComposeOutput, PrecomposedTransaction } from './api/composeTransaction';
 export type { RecoveryDevice } from './api/recoveryDevice';
-export type { TokenInfo, Transaction as AccountTransaction, Target as TransactionTarget, AccountBalanceHistory as BlockchainAccountBalanceHistory, } from '@trezor/blockchain-link';
+export type { TokenInfo, TokenTransfer, InternalTransfer, FiatRates, Transaction as AccountTransaction, Target as TransactionTarget, AccountBalanceHistory as BlockchainAccountBalanceHistory, } from '@trezor/blockchain-link';
 //# sourceMappingURL=index.d.ts.map

package/lib/types/params.d.ts

@@ -8,6 +8,7 @@ export interface CommonParams {
     useEventListener?: boolean;
     allowSeedlessDevice?: boolean;
     keepSession?: boolean;
+    override?: boolean;
     skipFinalReload?: boolean;
     useCardanoDerivation?: boolean;
 }

package/lib/types/settings.d.ts

@@ -1,4 +1,5 @@
 import type { BlockchainSettings } from '@trezor/blockchain-link';
+import type { Transport } from '@trezor/transport';
 export interface Manifest {
     appUrl: string;
     email: string;
@@ -13,6 +14,7 @@ export interface ConnectSettings {
     popup?: boolean;
     transportReconnect?: boolean;
     webusb?: boolean;
+    transports?: Transport['name'][];
     pendingTransportEvent?: boolean;
     lazyLoad?: boolean;
     interactionTimeout?: number;
@@ -24,10 +26,19 @@ export interface ConnectSettings {
     version: string;
     priority: number;
     trustedHost: boolean;
-    supportedBrowser?: boolean;
     extension?: string;
     env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native';
     timestamp: number;
     proxy?: Proxy;
 }
+export interface SystemInfo {
+    os: {
+        family?: 'Linux' | 'MacOS' | 'Windows';
+        mobile: boolean;
+    };
+    browser: {
+        supported: boolean;
+        outdated: boolean;
+    };
+}
 //# sourceMappingURL=settings.d.ts.map

package/lib/utils/firmwareUtils.d.ts

@@ -1,7 +1,6 @@
 import type { Features, StrictFeatures, FirmwareRelease, VersionArray } from '../types';
 export declare const isStrictFeatures: (extFeatures: Features) => extFeatures is StrictFeatures;
 export declare const isValidReleases: (extReleases: any) => extReleases is FirmwareRelease[];
-export declare const getScore: (device_id: string) => number;
 export declare const filterSafeListByBootloader: (releasesList: FirmwareRelease[], bootloaderVersion: VersionArray) => FirmwareRelease[];
 export declare const filterSafeListByFirmware: (releasesList: FirmwareRelease[], firmwareVersion: VersionArray) => FirmwareRelease[];
 //# sourceMappingURL=firmwareUtils.d.ts.map

package/lib/utils/firmwareUtils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterSafeListByFirmware = exports.filterSafeListByBootloader = exports.getScore = exports.isValidReleases = exports.isStrictFeatures = void 0;
-const crypto_1 = require("crypto");
+exports.filterSafeListByFirmware = exports.filterSafeListByBootloader = exports.isValidReleases = exports.isStrictFeatures = void 0;
 const utils_1 = require("@trezor/utils");
 const isStrictFeatures = (extFeatures) => [1, 2].includes(extFeatures.major_version) &&
     (extFeatures.firmware_present === false ||
@@ -11,13 +10,6 @@ exports.isStrictFeatures = isStrictFeatures;
 const isValidReleases = (extReleases) => Array.isArray(extReleases) &&
     extReleases.every(release => release.version && release.min_firmware_version && release.min_bootloader_version);
 exports.isValidReleases = isValidReleases;
-const getScore = (device_id) => {
-    const hash = (0, crypto_1.createHash)('sha256');
-    hash.update(device_id);
-    const output = parseInt(hash.digest('hex'), 16) / 2 ** 256;
-    return Math.round(output * 100) / 100;
-};
-exports.getScore = getScore;
 const filterSafeListByBootloader = (releasesList, bootloaderVersion) => releasesList.filter(item => (!item.min_bootloader_version ||
     utils_1.versionUtils.isNewerOrEqual(bootloaderVersion, item.min_bootloader_version)) &&
     (!item.bootloader_version ||

package/lib/utils/pathUtils.d.ts

@@ -3,6 +3,7 @@ import type { CoinInfo } from '../types';
 export declare const HD_HARDENED = 2147483648;
 export declare const toHardened: (n: number) => number;
 export declare const fromHardened: (n: number) => number;
+export declare const getSlip44ByPath: (path: number[]) => number;
 export declare const getHDPath: (path: string) => number[];
 export declare const isSegwitPath: (path: number[] | undefined) => boolean;
 export declare const isBech32Path: (path: number[] | undefined) => boolean;

package/lib/utils/pathUtils.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLabel = exports.fixPath = exports.getIndexFromPath = exports.getPathFromIndex = exports.getSerializedPath = exports.validatePath = exports.getOutputScriptType = exports.getScriptType = exports.getAccountType = exports.isTaprootPath = exports.isBech32Path = exports.isSegwitPath = exports.getHDPath = exports.fromHardened = exports.toHardened = exports.HD_HARDENED = void 0;
+exports.getLabel = exports.fixPath = exports.getIndexFromPath = exports.getPathFromIndex = exports.getSerializedPath = exports.validatePath = exports.getOutputScriptType = exports.getScriptType = exports.getAccountType = exports.isTaprootPath = exports.isBech32Path = exports.isSegwitPath = exports.getHDPath = exports.getSlip44ByPath = exports.fromHardened = exports.toHardened = exports.HD_HARDENED = void 0;
 const constants_1 = require("../constants");
 exports.HD_HARDENED = 0x80000000;
 const toHardened = (n) => (n | exports.HD_HARDENED) >>> 0;
 exports.toHardened = toHardened;
 const fromHardened = (n) => (n & ~exports.HD_HARDENED) >>> 0;
 exports.fromHardened = fromHardened;
+const getSlip44ByPath = (path) => (0, exports.fromHardened)(path[1]);
+exports.getSlip44ByPath = getSlip44ByPath;
 const PATH_NOT_VALID = constants_1.ERRORS.TypedError('Method_InvalidParameter', 'Not a valid path');
 const PATH_NEGATIVE_VALUES = constants_1.ERRORS.TypedError('Method_InvalidParameter', 'Path cannot contain negative values');
 const getHDPath = (path) => {

package/lib/utils/promiseUtils.d.ts

@@ -1,2 +1,6 @@
-export declare const resolveAfter: (msec: number, value?: any) => Promise<any>;
+/// <reference types="node" />
+export declare const resolveAfter: (msec: number, value?: any) => {
+    promise: Promise<any>;
+    timeout: NodeJS.Timeout | undefined;
+};
 //# sourceMappingURL=promiseUtils.d.ts.map

package/lib/utils/promiseUtils.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveAfter = void 0;
-const resolveAfter = (msec, value) => new Promise(resolve => {
-    setTimeout(resolve, msec, value);
-});
+const resolveAfter = (msec, value) => {
+    let timeout;
+    const promise = new Promise(resolve => {
+        timeout = setTimeout(resolve, msec, value);
+    });
+    return { promise, timeout };
+};
 exports.resolveAfter = resolveAfter;
 //# sourceMappingURL=promiseUtils.js.map

package/lib/utils/urlUtils.d.ts

@@ -1,4 +1,5 @@
-export declare const getOrigin: (url: string) => string;
+export declare const getOrigin: (url: unknown) => string;
+export declare const getHost: (url: unknown) => string | undefined;
 export declare const getOnionDomain: <T extends string | string[]>(url: T, dict: {
     [domain: string]: string;
 }) => T;

package/lib/utils/urlUtils.js

@@ -1,15 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOnionDomain = exports.getOrigin = void 0;
+exports.getOnionDomain = exports.getHost = exports.getOrigin = void 0;
 const getOrigin = (url) => {
+    var _a;
     if (typeof url !== 'string')
         return 'unknown';
     if (url.indexOf('file://') === 0)
         return 'file://';
-    const parts = url.match(/^.+\:\/\/[^\/]+/);
-    return Array.isArray(parts) && parts.length > 0 ? parts[0] : 'unknown';
+    const [origin] = (_a = url.match(/^https?:\/\/[^/]+/)) !== null && _a !== void 0 ? _a : [];
+    return origin !== null && origin !== void 0 ? origin : 'unknown';
 };
 exports.getOrigin = getOrigin;
+const getHost = (url) => {
+    var _a;
+    if (typeof url !== 'string')
+        return;
+    const [, , uri] = (_a = url.match(/^(https?):\/\/([^:/]+)?/i)) !== null && _a !== void 0 ? _a : [];
+    if (uri) {
+        const parts = uri.split('.');
+        return parts.length > 2
+            ?
+                parts.slice(parts.length - 2, parts.length).join('.')
+            : uri;
+    }
+};
+exports.getHost = getHost;
 const getOnionDomain = (url, dict) => {
     var _a;
     if (Array.isArray(url)) {

package/lib/utils/versionUtils.d.ts

@@ -1,5 +1,7 @@
+import type { VersionArray } from '../types';
 export declare const isValidVersionString: (version: string) => boolean;
-export declare const isValidVersionArray: (version: number[]) => boolean;
+export declare const isValidVersionArray: (version: (number | null)[]) => boolean;
+export declare const isVersionArray: (arr: (number | null)[]) => arr is VersionArray;
 export declare const normalizeVersionArray: (version: number[]) => number[];
 export declare const versionSplit: (version: string) => number[];
 export declare const versionCompare: (a: string | number[], b: string | number[]) => 1 | 0 | -1;

package/lib/utils/versionUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.versionCompare = exports.versionSplit = exports.normalizeVersionArray = exports.isValidVersionArray = exports.isValidVersionString = void 0;
+exports.versionCompare = exports.versionSplit = exports.normalizeVersionArray = exports.isVersionArray = exports.isValidVersionArray = exports.isValidVersionString = void 0;
 const VER_NUMS = 3;
 const versionRegex = new RegExp(/^[0-9]{1,3}(\.[0-9]{1,3}){0,2}$/);
 const isValidVersionString = (version) => versionRegex.test(version);
@@ -16,13 +16,16 @@ const isValidVersionArray = (version) => {
         return false;
     }
     for (let i = 0; i < version.length; i++) {
-        if (typeof version[i] !== 'number' || version[i] < 0) {
+        const versionNumber = version[i];
+        if (typeof versionNumber !== 'number' || versionNumber === null || versionNumber < 0) {
             return false;
         }
     }
     return true;
 };
 exports.isValidVersionArray = isValidVersionArray;
+const isVersionArray = (arr) => (0, exports.isValidVersionArray)(arr);
+exports.isVersionArray = isVersionArray;
 const normalizeVersionArray = (version) => {
     if (version.length === VER_NUMS) {
         return version;