@onekeyfe/hd-core 1.2.0-alpha.48 → 1.2.0-alpha.49

package/dist/index.js

@@ -101,26 +101,61 @@ const executeCallback = (id, ...args) => {
 const cleanupCallback = (id) => {
     callbackManager.delete(id);
 };
+const normalizeConnectId = (connectId) => connectId.trim().toLowerCase();
+const createProtocolAwareCall = (rawCall) => {
+    const protocolByConnectId = new Map();
+    const setDeviceConnectProtocol = (connectId, connectProtocol) => {
+        const normalizedConnectId = normalizeConnectId(connectId);
+        if (!normalizedConnectId)
+            return;
+        if (connectProtocol) {
+            protocolByConnectId.set(normalizedConnectId, connectProtocol);
+        }
+        else {
+            protocolByConnectId.delete(normalizedConnectId);
+        }
+    };
+    const call = params => {
+        if (!params || typeof params !== 'object') {
+            return rawCall(params);
+        }
+        const connectId = typeof params.connectId === 'string' ? params.connectId : undefined;
+        const boundProtocol = connectId
+            ? protocolByConnectId.get(normalizeConnectId(connectId))
+            : undefined;
+        if (boundProtocol &&
+            params.connectProtocol === undefined &&
+            params.forceProtocolDetection !== true) {
+            return rawCall(Object.assign(Object.assign({}, params), { connectProtocol: boundProtocol }));
+        }
+        return rawCall(params);
+    };
+    return { call, setDeviceConnectProtocol };
+};
 const inject = ({ call, cancel, dispose, eventEmitter, init, updateSettings, switchTransport, uiResponse, }) => {
+    const protocolAwareCall = createProtocolAwareCall(call);
     const api = Object.assign({ on: (type, fn) => {
             eventEmitter.on(type, fn);
         }, emit: () => { }, off: (type, fn) => {
             eventEmitter.removeListener(type, fn);
         }, removeAllListeners: type => {
             eventEmitter.removeAllListeners(type);
-        }, init,
-        call,
-        dispose,
+        }, init, call: protocolAwareCall.call, setDeviceConnectProtocol: protocolAwareCall.setDeviceConnectProtocol, dispose,
         uiResponse,
         cancel,
         updateSettings,
-        switchTransport }, createCoreApi(call));
+        switchTransport }, createCoreApi(protocolAwareCall.call));
     return api;
 };
 const createCoreApi = (call) => ({
     getLogs: () => call({ method: 'getLogs' }),
     clearSessionCache: params => call(Object.assign(Object.assign({}, params), { method: 'clearSessionCache' })),
     searchDevices: params => call(Object.assign(Object.assign({}, params), { method: 'searchDevices' })),
+    detectDeviceConnectProtocol: connectId => call({
+        connectId,
+        method: 'detectDeviceConnectProtocol',
+        forceProtocolDetection: true,
+    }),
     getFeatures: (connectId, params) => call(Object.assign(Object.assign({}, params), { connectId, method: 'getFeatures' })),
     getDeviceState: (connectId, params) => {
         const _a = (params !== null && params !== void 0 ? params : {}), commonParams = __rest(_a, ["refresh", "includeRaw"]);
@@ -277,15 +312,14 @@ const createCoreApi = (call) => ({
 });
 
 const lowLevelInject = ({ call, cancel, dispose, eventEmitter, init, uiResponse, updateSettings, switchTransport, addHardwareGlobalEventListener, }) => {
+    const protocolAwareCall = createProtocolAwareCall(call);
     const api = Object.assign({ addHardwareGlobalEventListener, removeAllListeners: type => {
             eventEmitter.removeAllListeners(type);
-        }, init,
-        call,
-        dispose,
+        }, init, call: protocolAwareCall.call, setDeviceConnectProtocol: protocolAwareCall.setDeviceConnectProtocol, dispose,
         uiResponse,
         cancel,
         updateSettings,
-        switchTransport, emit: () => { } }, createCoreApi(call));
+        switchTransport, emit: () => { } }, createCoreApi(protocolAwareCall.call));
     return api;
 };
 
@@ -773,6 +807,7 @@ const topLevelInject = () => {
             return Promise.resolve(undefined);
         return lowLevelApi.call(params);
     };
+    const protocolAwareCall = createProtocolAwareCall(call);
     const api = Object.assign(Object.assign({ on: (type, fn) => {
             eventEmitter.on(type, fn);
         }, emit: (eventName, ...args) => {
@@ -783,7 +818,7 @@ const topLevelInject = () => {
             var _a;
             lowLevelApi = hardwareLowLeverApi;
             return (_a = lowLevelApi === null || lowLevelApi === void 0 ? void 0 : lowLevelApi.init(settings)) !== null && _a !== void 0 ? _a : Promise.resolve(false);
-        }, call }, createCoreApi(call)), { removeAllListeners: type => {
+        }, call: protocolAwareCall.call, setDeviceConnectProtocol: protocolAwareCall.setDeviceConnectProtocol }, createCoreApi(protocolAwareCall.call)), { removeAllListeners: type => {
             eventEmitter.removeAllListeners(type);
             lowLevelApi === null || lowLevelApi === void 0 ? void 0 : lowLevelApi.removeAllListeners(type);
         }, dispose: () => lowLevelApi === null || lowLevelApi === void 0 ? void 0 : lowLevelApi.dispose(), uiResponse: response => lowLevelApi === null || lowLevelApi === void 0 ? void 0 : lowLevelApi.uiResponse(response), cancel: (connectId) => lowLevelApi === null || lowLevelApi === void 0 ? void 0 : lowLevelApi.cancel(connectId), updateSettings: settings => { var _a; return (_a = lowLevelApi === null || lowLevelApi === void 0 ? void 0 : lowLevelApi.updateSettings(settings)) !== null && _a !== void 0 ? _a : Promise.resolve(false); }, switchTransport: (env) => { var _a; return (_a = lowLevelApi === null || lowLevelApi === void 0 ? void 0 : lowLevelApi.switchTransport(env)) !== null && _a !== void 0 ? _a : Promise.resolve({ success: false }); } });
@@ -41970,7 +42005,9 @@ class DevicePool extends events.exports {
             if (!device) {
                 device = Device.fromDescriptor(descriptor);
                 device.deviceConnector = this.connector;
-                yield device.connect(initOptions === null || initOptions === void 0 ? void 0 : initOptions.connectProtocol);
+                yield device.connect(initOptions === null || initOptions === void 0 ? void 0 : initOptions.connectProtocol, {
+                    forceProtocolDetection: initOptions === null || initOptions === void 0 ? void 0 : initOptions.forceProtocolDetection,
+                });
                 try {
                     yield device.initialize(initOptions);
                     if ((initOptions === null || initOptions === void 0 ? void 0 : initOptions.refreshRuntimeState) && device.isProtocolV2()) {
@@ -41996,7 +42033,10 @@ class DevicePool extends events.exports {
                 catch (error) {
                     refreshError = error;
                 }
-            }), { connectProtocol: initOptions.connectProtocol });
+            }), {
+                connectProtocol: initOptions.connectProtocol,
+                forceProtocolDetection: initOptions.forceProtocolDetection,
+            });
             if (refreshError instanceof Error)
                 throw refreshError;
             if (refreshError)
@@ -43742,7 +43782,7 @@ class Device extends events.exports {
             unavailableCapabilities: this.unavailableCapabilities,
         };
     }
-    connect(connectProtocol) {
+    connect(connectProtocol, options) {
         const env = DataManager.getSettings('env');
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             if (DataManager.isBleConnect(env)) {
@@ -43751,7 +43791,7 @@ class Device extends events.exports {
                     return;
                 }
                 try {
-                    yield this.acquire(connectProtocol);
+                    yield this.acquire(connectProtocol, options);
                     resolve(true);
                 }
                 catch (error) {
@@ -43761,7 +43801,7 @@ class Device extends events.exports {
             }
             if (!this.mainId || (!this.isUsedHere() && this.originalDescriptor)) {
                 try {
-                    yield this.acquire(connectProtocol);
+                    yield this.acquire(connectProtocol, options);
                     resolve(true);
                 }
                 catch (error) {
@@ -43777,35 +43817,58 @@ class Device extends events.exports {
         }));
     }
     acquire(expectedProtocol, options) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         return __awaiter(this, void 0, void 0, function* () {
             const env = DataManager.getSettings('env');
             const mainIdKey = DataManager.isBleConnect(env) ? 'id' : 'session';
-            const protocolHint = expectedProtocol ? undefined : this.originalDescriptor.protocolType;
+            const previousProtocol = this.originalDescriptor.protocolType;
+            const strictProtocol = (options === null || options === void 0 ? void 0 : options.forceProtocolDetection)
+                ? undefined
+                : expectedProtocol !== null && expectedProtocol !== void 0 ? expectedProtocol : this.originalDescriptor.protocolType;
             try {
                 let acquireResult;
                 if (DataManager.isBleConnect(env)) {
-                    acquireResult = yield ((_a = this.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.originalDescriptor.id, undefined, true, expectedProtocol, protocolHint));
+                    acquireResult = yield ((_a = this.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.originalDescriptor.id, undefined, true, strictProtocol, undefined));
                     this.mainId = (_b = acquireResult === null || acquireResult === void 0 ? void 0 : acquireResult.uuid) !== null && _b !== void 0 ? _b : '';
                     Log$e.debug('Expected uuid:', this.mainId);
                 }
                 else {
-                    acquireResult = yield ((_c = this.deviceConnector) === null || _c === void 0 ? void 0 : _c.acquire(this.originalDescriptor.path, this.originalDescriptor.session, undefined, expectedProtocol, protocolHint));
+                    acquireResult = yield ((_c = this.deviceConnector) === null || _c === void 0 ? void 0 : _c.acquire(this.originalDescriptor.path, this.originalDescriptor.session, undefined, strictProtocol, undefined));
                     this.mainId = acquireResult;
                     Log$e.debug('Expected session id:', this.mainId);
                 }
-                this.deviceAcquired = true;
-                this.updateDescriptor({ [mainIdKey]: this.mainId });
                 const detectedProtocol = (_d = acquireResult === null || acquireResult === void 0 ? void 0 : acquireResult.protocolType) !== null && _d !== void 0 ? _d : (_f = (_e = TransportManager.transport) === null || _e === void 0 ? void 0 : _e.getProtocolType) === null || _f === void 0 ? void 0 : _f.call(_e, DataManager.isBleConnect(env) ? this.originalDescriptor.id : this.originalDescriptor.path);
+                if ((options === null || options === void 0 ? void 0 : options.forceProtocolDetection) && !detectedProtocol) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Active protocol detection returned no protocol for ${this.originalDescriptor.path || this.originalDescriptor.id}`);
+                }
                 if (detectedProtocol) {
                     this.originalDescriptor.protocolType = detectedProtocol;
                 }
+                this.deviceAcquired = true;
+                this.updateDescriptor({ [mainIdKey]: this.mainId });
                 if (this.commands) {
                     yield this.commands.dispose(false);
                 }
                 this.commands = new DeviceCommands(this, (_g = this.mainId) !== null && _g !== void 0 ? _g : '');
             }
             catch (error) {
+                if (options === null || options === void 0 ? void 0 : options.forceProtocolDetection) {
+                    this.originalDescriptor.protocolType = previousProtocol;
+                    const failedSession = this.mainId;
+                    this.deviceAcquired = false;
+                    if (failedSession) {
+                        try {
+                            yield ((_j = (_h = this.deviceConnector) === null || _h === void 0 ? void 0 : _h.release) === null || _j === void 0 ? void 0 : _j.call(_h, failedSession, false));
+                        }
+                        catch (releaseError) {
+                            Log$e.debug('Failed to release an unsuccessful protocol probe', releaseError);
+                        }
+                    }
+                    if (!DataManager.isBleConnect(env)) {
+                        this.mainId = null;
+                        this.updateDescriptor({ session: null });
+                    }
+                }
                 if (options === null || options === void 0 ? void 0 : options.throwOnRunPromiseError) {
                     throw error;
                 }
@@ -44527,11 +44590,16 @@ class Device extends events.exports {
                     this.runPromise = null;
                 }
             };
-            if (!this.isUsedHere() || this.commands.disposed) {
-                const env = DataManager.getSettings('env');
+            const env = DataManager.getSettings('env');
+            if (options.forceProtocolDetection && env !== 'react-native' && this.isUsedHere()) {
+                yield this.release();
+            }
+            if (options.forceProtocolDetection || !this.isUsedHere() || this.commands.disposed) {
                 if (env !== 'react-native') {
                     try {
-                        yield this.acquire(options.connectProtocol);
+                        yield this.acquire(options.connectProtocol, {
+                            forceProtocolDetection: options.forceProtocolDetection,
+                        });
                     }
                     catch (error) {
                         clearRunPromise();
@@ -45355,7 +45423,8 @@ class SearchDevices extends BaseMethod {
             for (const descriptor of devicesDescriptor) {
                 try {
                     const result = yield DevicePool.getDevices([descriptor], descriptor.path, {
-                        connectProtocol: this.payload.connectProtocol,
+                        connectProtocol: undefined,
+                        forceProtocolDetection: true,
                         refreshRuntimeState: true,
                     });
                     deviceList.push(...result.deviceList);
@@ -45372,6 +45441,21 @@ class SearchDevices extends BaseMethod {
     }
 }
 
+class DetectDeviceConnectProtocol extends BaseMethod {
+    init() {
+        this.payload.forceProtocolDetection = true;
+        this.useDevicePassphraseState = false;
+        this.skipForceUpdateCheck = true;
+        this.unlockPolicy = 'none';
+    }
+    getSupportedProtocols() {
+        return ['V1', 'V2'];
+    }
+    run() {
+        return Promise.resolve(this.device.getProtocol());
+    }
+}
+
 class GetFeatures extends BaseMethod {
     init() {
         this.unlockPolicy = 'none';
@@ -46349,7 +46433,7 @@ class CheckAllFirmwareRelease extends BaseMethod {
             let resourceStatus = 'unknown';
             if (resources === null || resources === void 0 ? void 0 : resources.length) {
                 const loaderMode = state.status.mode === 'bootloader' || state.status.mode === 'romloader';
-                if (loaderMode || state.status.mode === 'normal') {
+                if (loaderMode) {
                     try {
                         const inventory = yield readProtocolV2ResourceInventory({
                             commands: this.device.getCommands(),
@@ -46358,13 +46442,13 @@ class CheckAllFirmwareRelease extends BaseMethod {
                         resourceStatus = buildProtocolV2ResourceUpdatePlan({
                             resources,
                             inventory,
-                            mode: loaderMode ? 'bootloader-recovery' : 'application',
+                            mode: 'bootloader-recovery',
                         }).status;
                     }
                     catch (_b) {
                         resourceStatus = buildProtocolV2ResourceUpdatePlan({
                             resources,
-                            mode: loaderMode ? 'bootloader-recovery' : 'application',
+                            mode: 'bootloader-recovery',
                         }).status;
                     }
                 }
@@ -47370,7 +47454,7 @@ const newTouchUpdateProcess = (updateType, postMessage, device, { payload }, reb
             try {
                 if (isBleReconnect) {
                     try {
-                        yield ((_d = device.deviceConnector) === null || _d === void 0 ? void 0 : _d.acquire(device.originalDescriptor.id, null, true));
+                        yield ((_d = device.deviceConnector) === null || _d === void 0 ? void 0 : _d.acquire(device.originalDescriptor.id, null, true, device.originalDescriptor.protocolType));
                         const typedCall = device.getCommands().typedCall.bind(device.getCommands());
                         yield Promise.race([
                             typedCall('Initialize', 'Features', {}),
@@ -47388,7 +47472,7 @@ const newTouchUpdateProcess = (updateType, postMessage, device, { payload }, reb
                 else {
                     const deviceDiff = yield ((_e = device.deviceConnector) === null || _e === void 0 ? void 0 : _e.enumerate());
                     const devicesDescriptor = (_f = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _f !== void 0 ? _f : [];
-                    const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, device.originalDescriptor.id);
+                    const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, device.originalDescriptor.id, { connectProtocol: device.originalDescriptor.protocolType });
                     if (deviceList.length === 1) {
                         device.updateFromCache(deviceList[0]);
                         yield device.acquire();
@@ -47451,14 +47535,16 @@ const emmcFileWriteWithRetry = (device, filePath, chunkLength, offset, chunk, ov
             const env = DataManager.getSettings('env');
             if (DataManager.isBleConnect(env)) {
                 yield wait(3000);
-                yield ((_h = device.deviceConnector) === null || _h === void 0 ? void 0 : _h.acquire(device.originalDescriptor.id, null, true));
+                yield ((_h = device.deviceConnector) === null || _h === void 0 ? void 0 : _h.acquire(device.originalDescriptor.id, null, true, device.originalDescriptor.protocolType));
                 yield device.initialize();
             }
             else if (((_j = error === null || error === void 0 ? void 0 : error.message) === null || _j === void 0 ? void 0 : _j.indexOf(SESSION_ERROR$2)) > -1 ||
                 ((_l = (_k = error === null || error === void 0 ? void 0 : error.response) === null || _k === void 0 ? void 0 : _k.data) === null || _l === void 0 ? void 0 : _l.indexOf(SESSION_ERROR$2)) > -1) {
                 const deviceDiff = yield ((_m = device.deviceConnector) === null || _m === void 0 ? void 0 : _m.enumerate());
                 const devicesDescriptor = (_o = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _o !== void 0 ? _o : [];
-                const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, undefined);
+                const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, undefined, {
+                    connectProtocol: device.originalDescriptor.protocolType,
+                });
                 if (deviceList.length === 1 && ((_p = deviceList[0]) === null || _p === void 0 ? void 0 : _p.isBootloader())) {
                     device.updateFromCache(deviceList[0]);
                     yield device.acquire();
@@ -47674,7 +47760,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
         const isTouchOrProDevice = ((_a = this === null || this === void 0 ? void 0 : this.device) === null || _a === void 0 ? void 0 : _a.getCurrentDeviceType()) === hdShared.EDeviceType.Touch ||
             ((_b = this === null || this === void 0 ? void 0 : this.device) === null || _b === void 0 ? void 0 : _b.getCurrentDeviceType()) === hdShared.EDeviceType.Pro;
         const intervalTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-            var _c, _d, _e;
+            var _c, _d, _e, _f;
             checkCount += 1;
             Log$9.log('FirmwareUpdateBaseMethod [checkDeviceToBootloader] isFirstCheck: ', isFirstCheck);
             if (isTouchOrProDevice && isFirstCheck) {
@@ -47709,11 +47795,11 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
             }
             if (isBleReconnect) {
                 try {
-                    yield ((_d = this.device.deviceConnector) === null || _d === void 0 ? void 0 : _d.acquire(this.device.originalDescriptor.id, null, true));
+                    yield ((_d = this.device.deviceConnector) === null || _d === void 0 ? void 0 : _d.acquire(this.device.originalDescriptor.id, null, true, (_e = this.payload.connectProtocol) !== null && _e !== void 0 ? _e : this.device.originalDescriptor.protocolType));
                     yield this.device.initialize();
                     if (this.device.isBootloader()) {
                         clearInterval(intervalTimer);
-                        (_e = this.checkPromise) === null || _e === void 0 ? void 0 : _e.resolve(true);
+                        (_f = this.checkPromise) === null || _f === void 0 ? void 0 : _f.resolve(true);
                     }
                 }
                 catch (e) {
@@ -47732,19 +47818,21 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
         }, 30000);
     }
     _checkDeviceInBootloaderMode(connectId, intervalTimer, timeoutTimer) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
             const deviceDiff = yield ((_a = this.device.deviceConnector) === 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 { deviceList } = yield DevicePool.getDevices(devicesDescriptor, connectId);
-            if (deviceList.length === 1 && ((_c = deviceList[0]) === null || _c === void 0 ? void 0 : _c.isBootloader())) {
+            const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, connectId, {
+                connectProtocol: (_c = this.payload.connectProtocol) !== null && _c !== void 0 ? _c : this.device.originalDescriptor.protocolType,
+            });
+            if (deviceList.length === 1 && ((_d = deviceList[0]) === null || _d === void 0 ? void 0 : _d.isBootloader())) {
                 this.device.updateFromCache(deviceList[0]);
                 this.device.commands.disposed = false;
                 if (intervalTimer)
                     clearInterval(intervalTimer);
                 if (timeoutTimer)
                     clearTimeout(timeoutTimer);
-                (_d = this.checkPromise) === null || _d === void 0 ? void 0 : _d.resolve(true);
+                (_e = this.checkPromise) === null || _e === void 0 ? void 0 : _e.resolve(true);
                 return true;
             }
             return false;
@@ -47855,10 +47943,10 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
         });
     }
     emmcFileWriteWithRetry(filePath, chunkLength, offset, chunk, overwrite, progress) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         return __awaiter(this, void 0, void 0, function* () {
             const writeFunc = () => __awaiter(this, void 0, void 0, function* () {
-                var _j;
+                var _l;
                 const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
                 const writeRes = yield typedCall('EmmcFileWrite', 'EmmcFile', {
                     file: {
@@ -47873,7 +47961,7 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
                 });
                 if (writeRes.type !== 'EmmcFile') {
                     if (writeRes.type === 'CallMethodError') {
-                        if (((_j = writeRes.message.error) !== null && _j !== void 0 ? _j : '').indexOf(SESSION_ERROR$1) > -1) {
+                        if (((_l = writeRes.message.error) !== null && _l !== void 0 ? _l : '').indexOf(SESSION_ERROR$1) > -1) {
                             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, SESSION_ERROR$1);
                         }
                     }
@@ -47896,18 +47984,20 @@ class FirmwareUpdateBaseMethod extends BaseMethod {
                     const env = DataManager.getSettings('env');
                     if (DataManager.isBleConnect(env)) {
                         yield wait(3000);
-                        yield ((_a = this.device.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.device.originalDescriptor.id, null, true));
+                        yield ((_a = this.device.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.device.originalDescriptor.id, null, true, (_b = this.payload.connectProtocol) !== null && _b !== void 0 ? _b : this.device.originalDescriptor.protocolType));
                         yield this.device.initialize();
                     }
-                    else if (((_b = error === null || error === void 0 ? void 0 : error.message) === null || _b === void 0 ? void 0 : _b.indexOf(SESSION_ERROR$1)) > -1 ||
-                        ((_d = (_c = error === null || error === void 0 ? void 0 : error.response) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.indexOf(SESSION_ERROR$1)) > -1) {
-                        const deviceDiff = yield ((_e = this.device.deviceConnector) === null || _e === void 0 ? void 0 : _e.enumerate());
-                        const devicesDescriptor = (_f = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _f !== void 0 ? _f : [];
-                        const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, undefined);
-                        if (deviceList.length === 1 && ((_g = deviceList[0]) === null || _g === void 0 ? void 0 : _g.isBootloader())) {
+                    else if (((_c = error === null || error === void 0 ? void 0 : error.message) === null || _c === void 0 ? void 0 : _c.indexOf(SESSION_ERROR$1)) > -1 ||
+                        ((_e = (_d = error === null || error === void 0 ? void 0 : error.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.indexOf(SESSION_ERROR$1)) > -1) {
+                        const deviceDiff = yield ((_f = this.device.deviceConnector) === null || _f === void 0 ? void 0 : _f.enumerate());
+                        const devicesDescriptor = (_g = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _g !== void 0 ? _g : [];
+                        const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, undefined, {
+                            connectProtocol: (_h = this.payload.connectProtocol) !== null && _h !== void 0 ? _h : this.device.originalDescriptor.protocolType,
+                        });
+                        if (deviceList.length === 1 && ((_j = deviceList[0]) === null || _j === void 0 ? void 0 : _j.isBootloader())) {
                             this.device.updateFromCache(deviceList[0]);
                             yield this.device.acquire();
-                            this.device.getCommands().mainId = (_h = this.device.mainId) !== null && _h !== void 0 ? _h : '';
+                            this.device.getCommands().mainId = (_k = this.device.mainId) !== null && _k !== void 0 ? _k : '';
                         }
                     }
                     yield wait(2000);
@@ -48126,14 +48216,14 @@ class FirmwareUpdate extends BaseMethod {
         const isBleReconnect = connectId && DataManager.isBleConnect(env);
         Log$8.log('FirmwareUpdate [checkDeviceToBootloader] isBleReconnect: ', isBleReconnect);
         const intervalTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             if (isBleReconnect) {
                 try {
-                    yield ((_a = this.device.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.device.originalDescriptor.id, null, true));
+                    yield ((_a = this.device.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.device.originalDescriptor.id, null, true, (_b = this.payload.connectProtocol) !== null && _b !== void 0 ? _b : this.device.originalDescriptor.protocolType));
                     yield this.device.initialize();
                     if (this.device.isBootloader()) {
                         clearInterval(intervalTimer);
-                        (_b = this.checkPromise) === null || _b === void 0 ? void 0 : _b.resolve(true);
+                        (_c = this.checkPromise) === null || _c === void 0 ? void 0 : _c.resolve(true);
                     }
                 }
                 catch (e) {
@@ -48141,14 +48231,16 @@ class FirmwareUpdate extends BaseMethod {
                 }
             }
             else {
-                const deviceDiff = yield ((_c = this.device.deviceConnector) === 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 : [];
-                const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, connectId);
-                if (deviceList.length === 1 && ((_e = deviceList[0]) === null || _e === void 0 ? void 0 : _e.isBootloader())) {
+                const deviceDiff = yield ((_d = this.device.deviceConnector) === null || _d === void 0 ? void 0 : _d.enumerate());
+                const devicesDescriptor = (_e = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _e !== void 0 ? _e : [];
+                const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, connectId, {
+                    connectProtocol: (_f = this.payload.connectProtocol) !== null && _f !== void 0 ? _f : this.device.originalDescriptor.protocolType,
+                });
+                if (deviceList.length === 1 && ((_g = deviceList[0]) === null || _g === void 0 ? void 0 : _g.isBootloader())) {
                     this.device.updateFromCache(deviceList[0]);
                     this.device.commands.disposed = false;
                     clearInterval(intervalTimer);
-                    (_f = this.checkPromise) === null || _f === void 0 ? void 0 : _f.resolve(true);
+                    (_h = this.checkPromise) === null || _h === void 0 ? void 0 : _h.resolve(true);
                 }
             }
         }), isBleReconnect ? 3000 : 2000);
@@ -48354,7 +48446,7 @@ class FirmwareUpdateV2 extends BaseMethod {
         const deviceType = (_a = this.device) === null || _a === void 0 ? void 0 : _a.getCurrentDeviceType();
         const isTouchOrProDevice = deviceType === hdShared.EDeviceType.Touch || deviceType === hdShared.EDeviceType.Pro;
         const intervalTimer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-            var _b, _c, _d;
+            var _b, _c, _d, _e;
             checkCount += 1;
             Log$7.log('FirmwareUpdateV2 [checkDeviceToBootloader] isFirstCheck: ', isFirstCheck);
             if (isTouchOrProDevice && isFirstCheck) {
@@ -48382,11 +48474,11 @@ class FirmwareUpdateV2 extends BaseMethod {
             }
             if (isBleReconnect) {
                 try {
-                    yield ((_c = this.device.deviceConnector) === null || _c === void 0 ? void 0 : _c.acquire(this.device.originalDescriptor.id, null, true));
+                    yield ((_c = this.device.deviceConnector) === null || _c === void 0 ? void 0 : _c.acquire(this.device.originalDescriptor.id, null, true, (_d = this.payload.connectProtocol) !== null && _d !== void 0 ? _d : this.device.originalDescriptor.protocolType));
                     yield this.device.initialize();
                     if (this.device.isBootloader()) {
                         clearInterval(intervalTimer);
-                        (_d = this.checkPromise) === null || _d === void 0 ? void 0 : _d.resolve(true);
+                        (_e = this.checkPromise) === null || _e === void 0 ? void 0 : _e.resolve(true);
                     }
                 }
                 catch (e) {
@@ -48405,19 +48497,21 @@ class FirmwareUpdateV2 extends BaseMethod {
         }, 30000);
     }
     _checkDeviceInBootloaderMode(connectId, intervalTimer, timeoutTimer) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
             const deviceDiff = yield ((_a = this.device.deviceConnector) === 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 { deviceList } = yield DevicePool.getDevices(devicesDescriptor, connectId);
-            if (deviceList.length === 1 && ((_c = deviceList[0]) === null || _c === void 0 ? void 0 : _c.isBootloader())) {
+            const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, connectId, {
+                connectProtocol: (_c = this.payload.connectProtocol) !== null && _c !== void 0 ? _c : this.device.originalDescriptor.protocolType,
+            });
+            if (deviceList.length === 1 && ((_d = deviceList[0]) === null || _d === void 0 ? void 0 : _d.isBootloader())) {
                 this.device.updateFromCache(deviceList[0]);
                 this.device.commands.disposed = false;
                 if (intervalTimer)
                     clearInterval(intervalTimer);
                 if (timeoutTimer)
                     clearTimeout(timeoutTimer);
-                (_d = this.checkPromise) === null || _d === void 0 ? void 0 : _d.resolve(true);
+                (_e = this.checkPromise) === null || _e === void 0 ? void 0 : _e.resolve(true);
                 return true;
             }
             return false;
@@ -48945,7 +49039,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
             this.device.listenerCount(DEVICE.SELECT_DEVICE_FOR_SWITCH_FIRMWARE_WEB_DEVICE) > 0);
     }
     waitForDeviceReconnect(timeout) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             const startTime = Date.now();
             const isBleReconnect = this.isBleReconnect();
@@ -48954,7 +49048,7 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                 try {
                     if (isBleReconnect) {
                         try {
-                            yield ((_a = this.device.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.device.originalDescriptor.id, null, true));
+                            yield ((_a = this.device.deviceConnector) === null || _a === void 0 ? void 0 : _a.acquire(this.device.originalDescriptor.id, null, true, (_b = this.payload.connectProtocol) !== null && _b !== void 0 ? _b : this.device.originalDescriptor.protocolType));
                             const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
                             yield Promise.race([
                                 typedCall('Initialize', 'Features', {}),
@@ -48971,8 +49065,8 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                         }
                     }
                     else {
-                        const deviceDiff = yield ((_b = this.device.deviceConnector) === null || _b === void 0 ? void 0 : _b.enumerate());
-                        const devicesDescriptor = (_c = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _c !== void 0 ? _c : [];
+                        const deviceDiff = yield ((_c = this.device.deviceConnector) === 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 : [];
                         const canPromptSwitchFirmwareReconnect = this.canPromptWebUsbSwitchFirmwareReconnect();
                         if (canPromptSwitchFirmwareReconnect) {
                             webUsbCheckCount += 1;
@@ -48990,12 +49084,14 @@ class FirmwareUpdateV3 extends FirmwareUpdateBaseMethod {
                         else {
                             webUsbCheckCount = 0;
                         }
-                        const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, this.connectId);
+                        const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, this.connectId, {
+                            connectProtocol: (_e = this.payload.connectProtocol) !== null && _e !== void 0 ? _e : this.device.originalDescriptor.protocolType,
+                        });
                         if (deviceList.length === 1) {
                             this.device.updateFromCache(deviceList[0]);
                             yield this.device.acquire();
                             this.device.commands.disposed = false;
-                            this.device.getCommands().mainId = (_d = this.device.mainId) !== null && _d !== void 0 ? _d : '';
+                            this.device.getCommands().mainId = (_f = this.device.mainId) !== null && _f !== void 0 ? _f : '';
                             return;
                         }
                     }
@@ -49409,13 +49505,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     runProtocolV2() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             yield this.captureProtocolV2PhysicalIdentity();
             const deviceFeatures = yield this.getProtocolV2DeviceFeatures();
             const deviceFirmwareType = getFirmwareType(deviceFeatures);
             const firmwareType = (_a = this.params.firmwareType) !== null && _a !== void 0 ? _a : deviceFirmwareType;
-            const resourceRecoveryMode = Boolean(this.isProtocolV2BootloaderMode() || this.isProtocolV2RomloaderMode());
+            const needsRemoteResources = !((_b = this.params.resourceBundleFiles) === null || _b === void 0 ? void 0 : _b.length) &&
+                !!((_c = this.params.targetsToUpdate) === null || _c === void 0 ? void 0 : _c.includes('resource'));
             let fwBinaryMap = [];
             let bootloaderBinary = null;
             let bootResourcesInstallItem;
@@ -49423,11 +49520,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             let resourceBundles;
             try {
                 this.postTipMessage(exports.FirmwareUpdateTipMessage.StartDownloadFirmware);
+                resourceBundles = this.prepareExplicitProtocolV2ResourceBundles();
                 fwBinaryMap = this.collectExplicitTargetBinaries();
                 bootloaderBinary = this.prepareBootloaderBinary();
                 const needsRemoteFirmware = !this.hasExplicitProtocolV2Payload(fwBinaryMap);
-                const needsRemoteResources = !((_b = this.params.resourceBundleFiles) === null || _b === void 0 ? void 0 : _b.length) &&
-                    !!((_c = this.params.targetsToUpdate) === null || _c === void 0 ? void 0 : _c.includes('resource'));
                 const needsRemoteBootResources = !this.params.bootResourcesBinary &&
                     !!((_d = this.params.targetsToUpdate) === null || _d === void 0 ? void 0 : _d.includes('boot_resources'));
                 if (needsRemoteFirmware || needsRemoteResources || needsRemoteBootResources) {
@@ -49446,8 +49542,9 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         ...(installItems !== null && installItems !== void 0 ? installItems : this.buildProtocolV2InstallItems({ bootloaderBinary, fwBinaryMap })),
                     ];
                 }
-                resourceBundles = yield this.prepareProtocolV2ResourceBundles(resourceRecoveryMode);
-                this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
+                if (!needsRemoteResources) {
+                    this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
+                }
             }
             catch (err) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_e = err.message) !== null && _e !== void 0 ? _e : err);
@@ -49455,14 +49552,28 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if (!bootloaderBinary &&
                 fwBinaryMap.length === 0 &&
                 !(installItems === null || installItems === void 0 ? void 0 : installItems.length) &&
-                !(resourceBundles === null || resourceBundles === void 0 ? void 0 : resourceBundles.length)) {
-                if (resourceBundles !== undefined) {
-                    this.postTipMessage(exports.FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
-                    return this.getProtocolV2VersionResult(deviceFeatures);
-                }
+                !(resourceBundles === null || resourceBundles === void 0 ? void 0 : resourceBundles.length) &&
+                !needsRemoteResources) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, 'No firmware to update');
             }
-            yield this.enterProtocolV2BootloaderMode();
+            const enteredBootloader = yield this.enterProtocolV2BootloaderMode();
+            if (needsRemoteResources) {
+                try {
+                    resourceBundles = yield this.prepareProtocolV2ResourceBundles();
+                    this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
+                }
+                catch (err) {
+                    if (enteredBootloader) {
+                        try {
+                            yield this.exitProtocolV2BootloaderToNormal();
+                        }
+                        catch (restoreError) {
+                            Log$5.warn('[FirmwareUpdateV4] failed to restore App mode after resource preparation error:', restoreError);
+                        }
+                    }
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, (_f = err.message) !== null && _f !== void 0 ? _f : err);
+                }
+            }
             yield this.executeProtocolV2Update(Object.assign(Object.assign({ fwBinaryMap,
                 bootloaderBinary }, (installItems ? { installItems } : undefined)), ((resourceBundles === null || resourceBundles === void 0 ? void 0 : resourceBundles.length) ? { resourceBundles } : undefined)));
             yield this.exitProtocolV2BootloaderToNormal();
@@ -49683,21 +49794,24 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             };
         });
     }
-    prepareProtocolV2ResourceBundles(recoveryMode) {
-        var _a, _b;
+    prepareExplicitProtocolV2ResourceBundles() {
+        var _a;
+        if (!((_a = this.params.resourceBundleFiles) === null || _a === void 0 ? void 0 : _a.length))
+            return undefined;
+        return this.params.resourceBundleFiles.map((file, index) => {
+            var _a;
+            const devicePath = validateProtocolV2FilesystemPath(file.devicePath, `resourceBundleFiles[${index}].devicePath`);
+            return {
+                name: (_a = devicePath.split('/').pop()) !== null && _a !== void 0 ? _a : devicePath,
+                binary: file.binary,
+                devicePath,
+            };
+        });
+    }
+    prepareProtocolV2ResourceBundles() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if ((_a = this.params.resourceBundleFiles) === null || _a === void 0 ? void 0 : _a.length) {
-                return this.params.resourceBundleFiles.map((file, index) => {
-                    var _a;
-                    const devicePath = validateProtocolV2FilesystemPath(file.devicePath, `resourceBundleFiles[${index}].devicePath`);
-                    return {
-                        name: (_a = devicePath.split('/').pop()) !== null && _a !== void 0 ? _a : devicePath,
-                        binary: file.binary,
-                        devicePath,
-                    };
-                });
-            }
-            if (!((_b = this.params.targetsToUpdate) === null || _b === void 0 ? void 0 : _b.includes('resource'))) {
+            if (!((_a = this.params.targetsToUpdate) === null || _a === void 0 ? void 0 : _a.includes('resource'))) {
                 return undefined;
             }
             const resources = DataManager.getProtocolV2Resources();
@@ -49715,10 +49829,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const plan = buildProtocolV2ResourceUpdatePlan({
                 resources,
                 inventory,
-                mode: recoveryMode ? 'bootloader-recovery' : 'application',
+                mode: 'bootloader-recovery',
                 forced: this.params.forcedUpdateRes,
             });
-            Log$5.log(`[FirmwareUpdateV4] Pro2 resource plan mode=${recoveryMode ? 'bootloader-recovery' : 'application'} status=${plan.status} count=${plan.resources.length}`);
+            Log$5.log(`[FirmwareUpdateV4] Pro2 resource plan mode=bootloader-recovery status=${plan.status} count=${plan.resources.length}`);
             const bundles = [];
             for (const resource of plan.resources) {
                 bundles.push(yield this.downloadProtocolV2Resource(resource));
@@ -50099,7 +50213,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     reconnectProtocolV2Device() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.isBleReconnect()) {
                 yield this.acquireProtocolV2BleDevice();
@@ -50118,14 +50232,23 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const { deviceList } = yield DevicePool.getDevices(devicesDescriptor, undefined, {
                 connectProtocol: PROTOCOL_V2_CONNECT_PROTOCOL,
             });
-            if (deviceList.length !== 1) {
+            const expectedSerialNumber = (_d = this.protocolV2ExpectedSerialNumber) === null || _d === void 0 ? void 0 : _d.trim();
+            const identityMatch = expectedSerialNumber
+                ? deviceList.find(candidate => { var _a; return ((_a = candidate.getCurrentSerialNo) === null || _a === void 0 ? void 0 : _a.call(candidate).trim()) === expectedSerialNumber; })
+                : undefined;
+            const singleCandidate = deviceList.length === 1 ? deviceList.at(0) : undefined;
+            const singleCandidateSerialNumber = (_e = singleCandidate === null || singleCandidate === void 0 ? void 0 : singleCandidate.getCurrentSerialNo) === null || _e === void 0 ? void 0 : _e.call(singleCandidate).trim();
+            const reconnectDevice = identityMatch !== null && identityMatch !== void 0 ? identityMatch : (singleCandidate && (!expectedSerialNumber || !singleCandidateSerialNumber)
+                ? singleCandidate
+                : undefined);
+            if (!reconnectDevice) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound);
             }
-            Log$5.debug('Protocol V2 firmware reconnect using single enumerated device:', deviceList[0].getConnectId());
-            this.device.updateFromCache(deviceList[0]);
+            Log$5.debug('Protocol V2 firmware reconnect using matched device:', reconnectDevice.getConnectId());
+            this.device.updateFromCache(reconnectDevice);
             yield this.ensureProtocolV2DeviceAcquired();
             this.device.commands.disposed = false;
-            this.device.getCommands().mainId = (_d = this.device.mainId) !== null && _d !== void 0 ? _d : '';
+            this.device.getCommands().mainId = (_f = this.device.mainId) !== null && _f !== void 0 ? _f : '';
         });
     }
     ensureProtocolV2DeviceAcquired() {
@@ -60548,6 +60671,7 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
     testProtocolV2Ping: Ping,
     preInitialize: PreInitialize,
     searchDevices: SearchDevices,
+    detectDeviceConnectProtocol: DetectDeviceConnectProtocol,
     getFeatures: GetFeatures,
     getDeviceState: GetDeviceState,
     getOnekeyFeatures: GetOnekeyFeatures,
@@ -61054,6 +61178,7 @@ const parseInitOptions = (method) => ({
     deviceId: method === null || method === void 0 ? void 0 : method.payload.deviceId,
     deriveCardano: method && hasDeriveCardano(method),
     connectProtocol: method === null || method === void 0 ? void 0 : method.payload.connectProtocol,
+    forceProtocolDetection: method === null || method === void 0 ? void 0 : method.payload.forceProtocolDetection,
     protocolV2DeviceInfoTimeoutMs: method === null || method === void 0 ? void 0 : method.payload.protocolV2DeviceInfoTimeoutMs,
 });
 let _core;
@@ -61608,9 +61733,17 @@ function connectDeviceForBle(method, device, retryCount = 0) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const shouldAcquire = !device.hasDeviceAcquire() || !device.commands || device.commands.disposed;
+            if (method.payload.forceProtocolDetection && device.hasDeviceAcquire()) {
+                yield device.release();
+            }
+            const shouldAcquire = method.payload.forceProtocolDetection ||
+                !device.hasDeviceAcquire() ||
+                !device.commands ||
+                device.commands.disposed;
             if (shouldAcquire) {
-                yield device.acquire(method.payload.connectProtocol);
+                yield device.acquire(method.payload.connectProtocol, {
+                    forceProtocolDetection: method.payload.forceProtocolDetection,
+                });
             }
             if ((_a = method.payload) === null || _a === void 0 ? void 0 : _a.onlyConnectBleDevice) {
                 if (shouldAcquire) {