@onekeyfe/hd-core 1.2.2-alpha.119 → 1.2.2-alpha.120

package/dist/index.js

@@ -43705,18 +43705,6 @@ class TransportManager {
         this.defaultMessages = DataManager.getProtobufMessages();
         this.currentMessages = this.defaultMessages;
         this.protocolV1MessageSchema = 'v1CurrentSchema';
-        this.webUsbInit = false;
-    }
-    static ensureInitialized() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const env = DataManager.getSettings('env');
-            if (env !== 'webusb' && env !== 'desktop-webusb')
-                return;
-            if (this.webUsbInit)
-                return;
-            yield this.transport.init(WebUsbLogger, DevicePool.emitter);
-            this.webUsbInit = true;
-        });
     }
     static configure() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -43745,7 +43733,7 @@ class TransportManager {
                     yield this.transport.init(WebBleLogger, DevicePool.emitter);
                 }
                 else if (env === 'webusb' || env === 'desktop-webusb') {
-                    yield this.ensureInitialized();
+                    yield this.transport.init(WebUsbLogger, DevicePool.emitter);
                 }
                 else {
                     yield this.transport.init(HttpLogger);
@@ -43828,7 +43816,6 @@ class TransportManager {
     }
 }
 TransportManager.reactNativeInit = false;
-TransportManager.webUsbInit = false;
 TransportManager.protocolV1MessageSchema = 'v1CurrentSchema';
 TransportManager.plugin = null;
 
@@ -46508,7 +46495,6 @@ class Device extends events.exports {
                 }
                 else if (!acquired) {
                     if (mainId && (deviceConnector === null || deviceConnector === void 0 ? void 0 : deviceConnector.disconnect)) {
-                        Log$h.debug('interruptionFromUser: disconnecting device without acquire, mainId:', mainId);
                         yield deviceConnector.disconnect(mainId);
                     }
                     if (this.connectionAttempt === attempt)
@@ -47277,48 +47263,6 @@ class PreInitialize extends BaseMethod {
 }
 
 const Log$e = getLogger(exports.LoggerNames.DevicePool);
-const getDescriptorKeys = (descriptor) => [descriptor.path, descriptor.id].filter((key) => typeof key === 'string' && key.length > 0);
-const isOwnedByActiveWebUsbRequest = (descriptor, requestQueue) => {
-    if (!requestQueue)
-        return false;
-    return getDescriptorKeys(descriptor).some(key => requestQueue.getRequestTasksIdByConnectId(key).length > 0);
-};
-const getUsbHandle = (descriptor) => descriptor === null || descriptor === void 0 ? void 0 : descriptor.device;
-const getOwningRequestDevice = (descriptor, requestQueue) => {
-    var _a, _b;
-    if (!requestQueue)
-        return undefined;
-    const usbHandle = getUsbHandle(descriptor);
-    if (usbHandle === undefined)
-        return undefined;
-    for (const key of getDescriptorKeys(descriptor)) {
-        for (const requestId of requestQueue.getRequestTasksIdByConnectId(key)) {
-            const device = (_a = requestQueue.getTask(requestId)) === null || _a === void 0 ? void 0 : _a.method.device;
-            if ((device === null || device === void 0 ? void 0 : device.features) &&
-                (device.mainId === key || ((_b = device.originalDescriptor) === null || _b === void 0 ? void 0 : _b.path) === key) &&
-                getUsbHandle(device.originalDescriptor) === usbHandle) {
-                return device;
-            }
-        }
-    }
-    return undefined;
-};
-const toSearchDeviceFromDescriptor = (descriptor) => {
-    const connectId = descriptor.path || descriptor.id || null;
-    return {
-        connectId,
-        uuid: '',
-        serialNo: null,
-        deviceId: null,
-        deviceType: hdShared.EDeviceType.Unknown,
-        name: descriptor.name || connectId || '',
-        commType: descriptor.commType,
-    };
-};
-const toSearchDevice = (device) => {
-    const message = device.toMessageObject();
-    return message ? message : null;
-};
 class SearchDevices extends BaseMethod {
     init() {
         this.useDevice = false;
@@ -47326,32 +47270,20 @@ class SearchDevices extends BaseMethod {
         this.skipForceUpdateCheck = true;
     }
     run() {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
+            yield TransportManager.configure();
+            const deviceDiff = yield ((_a = this.connector) === null || _a === void 0 ? void 0 : _a.enumerate());
+            const devicesDescriptor = (_b = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _b !== void 0 ? _b : [];
             const env = DataManager.getSettings('env');
-            const isWebUsb = env === 'webusb' || env === 'desktop-webusb';
-            const requestQueue = (_a = this.context) === null || _a === void 0 ? void 0 : _a.requestQueue;
-            const hasActiveWebUsbRequest = isWebUsb && ((_b = requestQueue === null || requestQueue === void 0 ? void 0 : requestQueue.getRequestTasksId().length) !== null && _b !== void 0 ? _b : 0) > 0;
-            if (isWebUsb) {
-                try {
-                    yield TransportManager.ensureInitialized();
-                }
-                catch (error) {
-                    Log$e.debug('WebUSB bring-up unavailable', error);
-                }
-            }
-            if (!hasActiveWebUsbRequest)
-                yield TransportManager.configure();
-            const deviceDiff = yield ((_c = this.connector) === null || _c === void 0 ? void 0 : _c.enumerate());
-            const devicesDescriptor = (_d = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _d !== void 0 ? _d : [];
             if (DataManager.isBleConnect(env)) {
                 const devices = [];
                 const seenIds = new Set();
                 for (const device of devicesDescriptor) {
-                    const lowerId = (_e = device.id) === null || _e === void 0 ? void 0 : _e.toLowerCase();
+                    const lowerId = (_c = device.id) === null || _c === void 0 ? void 0 : _c.toLowerCase();
                     if (!seenIds.has(lowerId)) {
                         seenIds.add(lowerId);
-                        const rawBleName = (_g = (_f = device.name) !== null && _f !== void 0 ? _f : device.localName) !== null && _g !== void 0 ? _g : '';
+                        const rawBleName = (_e = (_d = device.name) !== null && _d !== void 0 ? _d : device.localName) !== null && _e !== void 0 ? _e : '';
                         const bleName = hdShared.canonicalizePro2BleAdvertisementName(rawBleName);
                         devices.push(Object.assign(Object.assign({}, device), { connectId: device.id, serialNo: null, uuid: '', deviceId: null, name: bleName || device.name, deviceType: getDeviceTypeByBleName(bleName) }));
                     }
@@ -47360,34 +47292,22 @@ class SearchDevices extends BaseMethod {
             }
             const deviceList = [];
             for (const descriptor of devicesDescriptor) {
-                if (hasActiveWebUsbRequest && isOwnedByActiveWebUsbRequest(descriptor, requestQueue)) {
-                    const cached = DevicePool.getDeviceByPath(descriptor.path);
-                    const known = (cached === null || cached === void 0 ? void 0 : cached.features) ? cached : getOwningRequestDevice(descriptor, requestQueue);
-                    const message = known ? toSearchDevice(known) : null;
-                    deviceList.push(message !== null && message !== void 0 ? message : toSearchDeviceFromDescriptor(descriptor));
+                try {
+                    const result = yield DevicePool.getDevices([descriptor], descriptor.path, {
+                        connectProtocol: undefined,
+                        forceProtocolDetection: true,
+                        refreshRuntimeState: true,
+                    });
+                    deviceList.push(...result.deviceList);
                 }
-                else {
-                    try {
-                        const result = yield DevicePool.getDevices([descriptor], descriptor.path, {
-                            connectProtocol: undefined,
-                            forceProtocolDetection: true,
-                            refreshRuntimeState: true,
-                        });
-                        for (const device of result.deviceList) {
-                            const message = toSearchDevice(device);
-                            if (message)
-                                deviceList.push(message);
-                        }
-                    }
-                    catch (error) {
-                        const errorCode = error && typeof error === 'object' && 'errorCode' in error
-                            ? error.errorCode
-                            : undefined;
-                        Log$e.debug('Skip unavailable device during search', Object.assign({ path: descriptor.path }, (errorCode !== undefined ? { errorCode } : {})));
-                    }
+                catch (error) {
+                    const errorCode = error && typeof error === 'object' && 'errorCode' in error
+                        ? error.errorCode
+                        : undefined;
+                    Log$e.debug('Skip unavailable device during search', Object.assign({ path: descriptor.path }, (errorCode !== undefined ? { errorCode } : {})));
                 }
             }
-            return deviceList;
+            return deviceList.map(device => device.toMessageObject());
         });
     }
 }
@@ -55995,6 +55915,7 @@ class AllNetworkGetAddressBase extends BaseMethod {
         super(...arguments);
         this.abortController = null;
         this.loadingCleanupInBackground = false;
+        this.protocolV2ResumedSeedDomains = new Set();
     }
     getSupportedProtocols() {
         return ['V1', 'V2'];
@@ -56030,6 +55951,19 @@ class AllNetworkGetAddressBase extends BaseMethod {
             _originalIndex: originalIndex,
         };
     }
+    hasProtocolV2WalletResume(deriveCardano) {
+        if (deriveCardano) {
+            return this.protocolV2ResumedSeedDomains.has('cardano');
+        }
+        return (this.protocolV2ResumedSeedDomains.has('standard') ||
+            this.protocolV2ResumedSeedDomains.has('cardano'));
+    }
+    markProtocolV2WalletResumed(deriveCardano) {
+        this.protocolV2ResumedSeedDomains.add('standard');
+        if (deriveCardano) {
+            this.protocolV2ResumedSeedDomains.add('cardano');
+        }
+    }
     callMethod(methodName, params, rootFingerprint) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
@@ -56092,11 +56026,14 @@ class AllNetworkGetAddressBase extends BaseMethod {
                         const useEmptyPassphrase = this.payload.useEmptyPassphrase === true;
                         const deriveCardano = method.name.startsWith('cardano') ? true : undefined;
                         const shouldResumeWalletSession = useEmptyPassphrase || !!this.payload.passphraseState;
-                        if (this.device.isProtocolV2() && shouldResumeWalletSession) {
+                        if (this.device.isProtocolV2() &&
+                            shouldResumeWalletSession &&
+                            !this.hasProtocolV2WalletResume(deriveCardano)) {
                             const passphraseStateSafety = yield this.device.checkPassphraseStateSafety(this.payload.passphraseState, useEmptyPassphrase, this.payload.skipPassphraseCheck, deriveCardano, (_d = this.protocolV2UnlockContext) === null || _d === void 0 ? void 0 : _d.preflightMainPinSelected);
                             if (!passphraseStateSafety) {
                                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError);
                             }
+                            this.markProtocolV2WalletResumed(deriveCardano);
                         }
                     }),
                 });
@@ -56248,7 +56185,7 @@ function handleSkippableHardwareError(e, device, method) {
 
 class AllNetworkGetAddress extends AllNetworkGetAddressBase {
     getAllNetworkAddress(rootFingerprint) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             const responses = [];
             const resultMap = {};
@@ -56258,40 +56195,53 @@ class AllNetworkGetAddress extends AllNetworkGetAddressBase {
                 payload: param,
                 originalIndex: index,
             }));
-            const groupedMethodParams = methodParams.reduce((groups, param) => {
+            const methodGroups = methodParams.reduce((groups, param) => {
                 var _a;
                 const group = (_a = groups.get(param.methodName)) !== null && _a !== void 0 ? _a : [];
                 group.push(param);
                 groups.set(param.methodName, group);
                 return groups;
             }, new Map());
-            const requiresProtocolV2WalletHandoff = this.device.isProtocolV2() &&
-                (this.payload.useEmptyPassphrase === true || !!this.payload.passphraseState);
-            const methodGroups = requiresProtocolV2WalletHandoff
-                ? methodParams.map(param => [param.methodName, [param]])
-                : Array.from(groupedMethodParams.entries());
-            let i = 0;
-            for (const [methodName, params] of methodGroups) {
-                const methodParams = {
+            let processed = 0;
+            for (const [methodName, params] of methodGroups.entries()) {
+                const methodCallParams = {
                     bundle: params.map(param => (Object.assign({}, param.params))),
                 };
                 if ((_a = this.abortController) === null || _a === void 0 ? void 0 : _a.signal.aborted) {
                     throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
                 }
-                const response = yield this.callMethod(methodName, methodParams, rootFingerprint);
-                if ((_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.aborted) {
+                const isProtocolV2 = this.device.isProtocolV2();
+                const runIndividually = isProtocolV2 &&
+                    params.length > 1 &&
+                    params.some(param => param._originRequestParams.showOnOneKey !== false);
+                let response = [];
+                if (!runIndividually) {
+                    response = yield this.callMethod(methodName, methodCallParams, rootFingerprint);
+                }
+                if (isProtocolV2 &&
+                    params.length > 1 &&
+                    (runIndividually || response.every(item => !item.success))) {
+                    response = [];
+                    for (const param of params) {
+                        if ((_b = this.abortController) === null || _b === void 0 ? void 0 : _b.signal.aborted) {
+                            throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
+                        }
+                        const itemResponse = yield this.callMethod(methodName, { bundle: [Object.assign({}, param.params)] }, rootFingerprint);
+                        response.push(...itemResponse);
+                    }
+                }
+                if ((_c = this.abortController) === null || _c === void 0 ? void 0 : _c.signal.aborted) {
                     throw new Error(hdShared.HardwareErrorCodeMessage[hdShared.HardwareErrorCode.RepeatUnlocking]);
                 }
-                for (let i = 0; i < params.length; i++) {
-                    const { _originRequestParams, _originalIndex } = params[i];
-                    const responseKey = `${_originalIndex}`;
-                    resultMap[responseKey] = Object.assign(Object.assign({}, _originRequestParams), response[i]);
+                for (let index = 0; index < params.length; index++) {
+                    const { _originRequestParams, _originalIndex } = params[index];
+                    resultMap[`${_originalIndex}`] = Object.assign(Object.assign({}, _originRequestParams), response[index]);
                 }
-                if (((_d = (_c = this.payload) === null || _c === void 0 ? void 0 : _c.bundle) === null || _d === void 0 ? void 0 : _d.length) > 1) {
-                    const progress = Math.round(((i + 1) / this.payload.bundle.length) * 100);
+                processed += params.length;
+                if (bundle.length > 1) {
+                    const progress = Math.round((processed / bundle.length) * 100);
                     this.postMessage(createUiMessage(UI_REQUEST.DEVICE_PROGRESS, { progress }));
                 }
-                i++;
             }
             for (let i = 0; i < bundle.length; i++) {
                 responses.push(resultMap[i]);
@@ -65930,7 +65880,7 @@ const createUiProgressMessageFilter = (intervalMs = DEFAULT_UI_PROGRESS_INTERVAL
 
 const Log = getLogger(exports.LoggerNames.Core);
 const PRE_INITIALIZE_TTL_MS = 60 * 1000;
-const PRE_PENDING_CALL_TIMEOUT_MS = 5 * 1000;
+const PRE_PENDING_CALL_TIMEOUT_MS = 15 * 1000;
 const PRO2_USB_SIGNING_COOLDOWN_MS = 1000;
 const preWarmInflight = new Map();
 const preWarmDoneAt = new Map();
@@ -66010,7 +65960,6 @@ const callAPI = (context, message) => __awaiter(void 0, void 0, void 0, function
             }
         };
         (_a = method.setContext) === null || _a === void 0 ? void 0 : _a.call(method, context);
-        method.context = context;
         method.requestContext = createRequestContext(method.responseID, method.name, {
             sdkInstanceId: context.sdkInstanceId,
             connectId: method.connectId,
@@ -66028,11 +65977,7 @@ const callAPI = (context, message) => __awaiter(void 0, void 0, void 0, function
     if (!method.useDevice) {
         updateMethodRequestContext(method, { status: 'running' });
         try {
-            const env = DataManager.getSettings('env');
-            const response = method.name === 'searchDevices' &&
-                (DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env))
-                ? yield context.methodSynchronize(() => method.run(), 'webusb-discovery')
-                : yield method.run();
+            const response = yield method.run();
             completeMethodRequestContext(method);
             return createResponseMessage(method.responseID, true, response);
         }
@@ -66103,28 +66048,20 @@ const waitForPendingPromise = (connectId, getPrePendingCallPromise, removePrePen
     if (pendingPromise) {
         Log.debug('pre pending call promise before call method, wait for it');
         let timer;
-        let timedOut = false;
-        let completed = false;
         try {
             yield Promise.race([
                 pendingPromise,
-                new Promise(resolve => {
+                new Promise((_, reject) => {
                     timer = setTimeout(() => {
-                        timedOut = true;
-                        resolve();
+                        reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceBusy, 'Previous device cancellation is still draining'));
                     }, PRE_PENDING_CALL_TIMEOUT_MS);
                 }),
             ]);
-            completed = !timedOut;
+            removePrePendingCallPromise === null || removePrePendingCallPromise === void 0 ? void 0 : removePrePendingCallPromise(connectId, pendingPromise);
         }
         finally {
             if (timer)
                 clearTimeout(timer);
-            if (timedOut || completed)
-                removePrePendingCallPromise === null || removePrePendingCallPromise === void 0 ? void 0 : removePrePendingCallPromise(connectId, pendingPromise);
-        }
-        if (timedOut) {
-            Log.warn('pre pending call promise timed out before call method', { connectId });
         }
         Log.debug('pre pending call promise before call method done');
     }
@@ -66172,22 +66109,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
             context.registerCallbackTask(method.connectId, preWarmCallbackTask);
         }
         const pollingId = pollingManager.start(connectId);
-        const env = DataManager.getSettings('env');
-        const connect = () => ensureConnected(context, method, connectId, pollingId, method.abortSignal);
-        if (DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env)) {
-            const connectPromise = context.methodSynchronize(() => __awaiter(void 0, void 0, void 0, function* () {
-                var _k;
-                if ((_k = method.abortSignal) === null || _k === void 0 ? void 0 : _k.aborted) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled);
-                }
-                return connect();
-            }), 'webusb-discovery');
-            connectPromise.catch(() => undefined);
-            device = yield requestQueue.waitForTask(task, () => connectPromise);
-        }
-        else {
-            device = yield connect();
-        }
+        device = yield ensureConnected(context, method, connectId, pollingId, method.abortSignal);
         if ((_e = method.abortSignal) === null || _e === void 0 ? void 0 : _e.aborted) {
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallQueueActionCancelled);
         }
@@ -66252,12 +66174,12 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
             return waitForPendingPromise((_a = method.connectId) !== null && _a !== void 0 ? _a : '', getPrePendingCallPromise, removePrePendingCallPromise);
         });
         const inner = () => __awaiter(void 0, void 0, void 0, function* () {
-            var _l, _m;
+            var _k, _l;
             method.assertProtocolSupported(device.getProtocol(), device.getCurrentFirmwareType());
             protocolV2Operation = device.isProtocolV2();
             const versionRange = device.getCurrentMethodVersionRange(type => method.getVersionRange()[type]);
-            const currentFirmwareVersion = (_l = device.getCurrentFirmwareVersionString()) !== null && _l !== void 0 ? _l : '0.0.0';
-            const currentBleVersion = (_m = device.getCurrentBLEFirmwareVersionString()) !== null && _m !== void 0 ? _m : '0.0.0';
+            const currentFirmwareVersion = (_k = device.getCurrentFirmwareVersionString()) !== null && _k !== void 0 ? _k : '0.0.0';
+            const currentBleVersion = (_l = device.getCurrentBLEFirmwareVersionString()) !== null && _l !== void 0 ? _l : '0.0.0';
             const deviceFirmwareType = device.getCurrentFirmwareType();
             let newVersionStatus;
             if (device.features && !device.isProtocolV2()) {
@@ -66335,7 +66257,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                         }
                     },
                     prepare: () => __awaiter(void 0, void 0, void 0, function* () {
-                        var _o, _p, _q, _r, _s, _t;
+                        var _m, _o, _p, _q, _r, _s;
                         if (method.deviceId && method.checkDeviceId && !deviceIdCheckedDuringUnlockPreflight) {
                             const isSameDeviceID = yield checkLiveDeviceId(device, method.deviceId);
                             if (!isSameDeviceID) {
@@ -66355,7 +66277,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                                     require: support.require,
                                 });
                             }
-                            const passphraseStateSafety = yield device.checkPassphraseStateSafety((_o = method.payload) === null || _o === void 0 ? void 0 : _o.passphraseState, (_p = method.payload) === null || _p === void 0 ? void 0 : _p.useEmptyPassphrase, (_q = method.payload) === null || _q === void 0 ? void 0 : _q.skipPassphraseCheck, resolveDeriveCardano(method), (_r = method.protocolV2UnlockContext) === null || _r === void 0 ? void 0 : _r.preflightMainPinSelected);
+                            const passphraseStateSafety = yield device.checkPassphraseStateSafety((_m = method.payload) === null || _m === void 0 ? void 0 : _m.passphraseState, (_o = method.payload) === null || _o === void 0 ? void 0 : _o.useEmptyPassphrase, (_p = method.payload) === null || _p === void 0 ? void 0 : _p.skipPassphraseCheck, resolveDeriveCardano(method), (_q = method.protocolV2UnlockContext) === null || _q === void 0 ? void 0 : _q.preflightMainPinSelected);
                             checkPassphraseEnableState(method, device.features);
                             if (!passphraseStateSafety) {
                                 DevicePool.clearDeviceCache(method.payload.connectId);
@@ -66373,7 +66295,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                                 ? e
                                 : hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'open safety check failed.');
                         }
-                        (_t = (_s = method.device) === null || _s === void 0 ? void 0 : _s.commands) === null || _t === void 0 ? void 0 : _t.checkDisposed();
+                        (_s = (_r = method.device) === null || _r === void 0 ? void 0 : _r.commands) === null || _s === void 0 ? void 0 : _s.checkDisposed();
                     }),
                 });
                 messageResponse = createResponseMessage(method.responseID, true, response);
@@ -66728,11 +66650,10 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
     const POLL_INTERVAL_TIME = (method.payload && method.payload.pollIntervalTime) || 1000;
     const TIME_OUT = (method.payload && method.payload.timeout) || 10000;
     let timer = null;
-    let lastInitializeError;
     Log.debug(`EnsureConnected function start, MAX_RETRY_COUNT=${MAX_RETRY_COUNT}, POLL_INTERVAL_TIME=${POLL_INTERVAL_TIME}  `);
     const poll = (time = POLL_INTERVAL_TIME) => __awaiter(void 0, void 0, void 0, function* () {
         return new Promise((resolve, reject) => __awaiter(void 0, void 0, void 0, function* () {
-            var _u;
+            var _t;
             const abort = () => {
                 if (abortSignal && abortSignal.aborted) {
                     if (timer) {
@@ -66761,10 +66682,8 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
             Log.debug('EnsureConnected function try count: ', tryCount, ' poll interval time: ', time);
             try {
                 yield initDeviceList(method);
-                lastInitializeError = undefined;
             }
             catch (error) {
-                lastInitializeError = error;
                 Log.debug('device list error: ', error);
                 if ([
                     hdShared.HardwareErrorCode.BridgeNotInstalled,
@@ -66777,7 +66696,6 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                 }
                 if (error.errorCode === hdShared.HardwareErrorCode.TransportNotConfigured) {
                     yield TransportManager.configure();
-                    lastInitializeError = undefined;
                 }
             }
             if (abort()) {
@@ -66860,16 +66778,13 @@ const ensureConnected = (_context, method, connectId, pollingId, abortSignal) =>
                     clearTimeout(timer);
                 }
                 Log.debug('EnsureConnected get to max try count, will return: ', tryCount);
-                const preserveWebUsbInitError = DataManager.isBrowserWebUsb(env) || DataManager.isDesktopWebUsb(env);
-                const needsPermissionPrompt = DataManager.isBrowserWebUsb(env) && !((_u = method.payload) === null || _u === void 0 ? void 0 : _u.skipWebDevicePrompt);
-                const fallbackError = needsPermissionPrompt
-                    ? hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WebDeviceNotFoundOrNeedsPermission)
-                    : hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
-                const errorToReject = preserveWebUsbInitError && lastInitializeError ? lastInitializeError : fallbackError;
-                if (needsPermissionPrompt && errorToReject === fallbackError) {
+                if (DataManager.isBrowserWebUsb(env) && !((_t = method.payload) === null || _t === void 0 ? void 0 : _t.skipWebDevicePrompt)) {
                     postMessage(createUiMessage(UI_REQUEST.WEB_DEVICE_PROMPT_ACCESS_PERMISSION));
+                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WebDeviceNotFoundOrNeedsPermission));
+                }
+                else {
+                    reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound));
                 }
-                reject(errorToReject);
                 return;
             }
             if (abort()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.2-alpha.119",
+  "version": "1.2.2-alpha.120",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.2-alpha.119",
-    "@onekeyfe/hd-transport": "1.2.2-alpha.119",
+    "@onekeyfe/hd-shared": "1.2.2-alpha.120",
+    "@onekeyfe/hd-transport": "1.2.2-alpha.120",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "222ec4a49467e77a73766a07227069d76d9116f6"
+  "gitHead": "26958fa2be6aa34a07f42403fb7022d2785e70b9"
 }