@onekeyfe/hd-core 1.2.0-alpha.42 → 1.2.0-alpha.44

package/dist/index.js

@@ -38095,11 +38095,26 @@ var nested = {
 			DeviceSessionError_Busy: 5
 		}
 	},
+	DeviceSessionSeedDomain: {
+		values: {
+			SeedDomain_Standard: 1,
+			SeedDomain_Cardano: 2
+		}
+	},
 	DeviceSessionGet: {
 		fields: {
 			session_id: {
 				type: "bytes",
 				id: 1
+			},
+			btc_test_address: {
+				type: "string",
+				id: 2
+			},
+			seed_domains: {
+				rule: "repeated",
+				type: "DeviceSessionSeedDomain",
+				id: 3
 			}
 		}
 	},
@@ -40329,11 +40344,17 @@ const negotiateEventlessWalletSession = (device) => __awaiter(void 0, void 0, vo
     yield device.ensureProtocolV2RuntimeContext();
 });
 const getDeviceSession = (device, request) => __awaiter(void 0, void 0, void 0, function* () { return device.commands.typedCall('DeviceSessionGet', 'DeviceSession', request); });
+const buildDeviceSessionGetRequest = ({ sessionId, expectedPassphraseState, deriveCardano, } = {}) => (Object.assign(Object.assign(Object.assign({}, (sessionId ? { session_id: sessionId } : {})), (expectedPassphraseState ? { btc_test_address: expectedPassphraseState } : {})), { seed_domains: deriveCardano === undefined
+        ? []
+        : [
+            hdTransport.DeviceSessionSeedDomain.SeedDomain_Standard,
+            ...(deriveCardano ? [hdTransport.DeviceSessionSeedDomain.SeedDomain_Cardano] : []),
+        ] }));
 const askDevicePassphrase = (device, requestPayload) => __awaiter(void 0, void 0, void 0, function* () {
     yield device.commands.typedCall('DeviceSessionAskPassphrase', 'Success', requestPayload);
     yield refreshProtocolV2DeviceStatus(device);
 });
-const selectDeviceSession = (device, expectedPassphraseState) => __awaiter(void 0, void 0, void 0, function* () {
+const selectDeviceSession = (device, expectedPassphraseState, deriveCardano) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c;
     const existsAttachPinUser = ((_a = device.features) === null || _a === void 0 ? void 0 : _a.attachToPinEnabled) === true;
     const metadata = Object.assign({ source: 'wallet-session-coordinator', reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet' }, (expectedPassphraseState ? { expectedPassphraseState } : {}));
@@ -40366,21 +40387,21 @@ const selectDeviceSession = (device, expectedPassphraseState) => __awaiter(void
             emitUiEvent: false,
             interaction: attachPinInteraction,
         });
-        return getDeviceSession(device, {});
+        return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
     }
     if (hasHostPassphrase) {
         yield askDevicePassphrase(device, {
             passphrase: hostPassphrase,
             on_device: false,
         });
-        return getDeviceSession(device, {});
+        return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
     }
     device.emit(DEVICE.PASSPHRASE_ON_DEVICE, device, Object.assign(Object.assign({}, metadata), (passphraseInteraction ? { interaction: passphraseInteraction } : {})));
     yield askDevicePassphrase(device, { on_device: true });
-    return getDeviceSession(device, {});
+    return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
 });
 function getProtocolV2WalletSession(device, 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 forceWalletSelection = (options === null || options === void 0 ? void 0 : options.forceWalletSelection) === true || (options === null || options === void 0 ? void 0 : options.initSession) === true;
         if (forceWalletSelection) {
@@ -40407,7 +40428,9 @@ function getProtocolV2WalletSession(device, options) {
             : undefined;
         let response;
         let resumed = false;
-        let mainWalletSelected = false;
+        let mainPinSelected = (options === null || options === void 0 ? void 0 : options.onlyMainPin) === true &&
+            ((_d = device.features) === null || _d === void 0 ? void 0 : _d.unlocked) === true &&
+            ((_e = device.features) === null || _e === void 0 ? void 0 : _e.unlockedAttachPin) === false;
         const clearCurrentWalletSession = () => {
             var _a;
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
@@ -40425,19 +40448,29 @@ function getProtocolV2WalletSession(device, options) {
             try {
                 yield device.lockDevice();
             }
-            catch (_h) {
+            catch (_k) {
             }
             clearCurrentWalletSession();
             throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckUnlockTypeError);
         });
-        const selectMainWallet = (force = false) => __awaiter(this, void 0, void 0, function* () {
-            if (force || !mainWalletSelected) {
+        const selectMainPin = (force = false) => __awaiter(this, void 0, void 0, function* () {
+            if (force || !mainPinSelected) {
                 yield device.unlockDevice(hdTransport.DeviceSessionPinType.Main, {
                     source: 'wallet-session-coordinator',
                     reason: expectedPassphraseState ? 'session-recovery' : 'open-wallet',
                     deviceOnly: true,
                 });
-                mainWalletSelected = true;
+                mainPinSelected = true;
+            }
+        });
+        const selectStandardWallet = () => __awaiter(this, void 0, void 0, function* () {
+            var _l;
+            yield selectMainPin();
+            if (((_l = device.features) === null || _l === void 0 ? void 0 : _l.passphraseProtection) === true) {
+                yield askDevicePassphrase(device, {
+                    passphrase: '',
+                    on_device: false,
+                });
             }
         });
         if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
@@ -40445,15 +40478,17 @@ function getProtocolV2WalletSession(device, options) {
             if (cachedStandardSession) {
                 try {
                     if (options === null || options === void 0 ? void 0 : options.selectMainWalletBeforeRestore) {
-                        yield selectMainWallet();
+                        yield selectMainPin();
                     }
-                    response = yield getDeviceSession(device, {
-                        session_id: cachedStandardSession.sessionId,
-                    });
+                    response = yield getDeviceSession(device, buildDeviceSessionGetRequest({
+                        sessionId: cachedStandardSession.sessionId,
+                        expectedPassphraseState,
+                        deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano,
+                    }));
                     resumed = true;
                 }
                 catch (error) {
-                    (_d = device.clearStandardInternalState) === null || _d === void 0 ? void 0 : _d.call(device);
+                    (_f = device.clearStandardInternalState) === null || _f === void 0 ? void 0 : _f.call(device);
                     if (!isWalletSessionInvalidError(error)) {
                         throw error;
                     }
@@ -40461,15 +40496,17 @@ function getProtocolV2WalletSession(device, options) {
                 }
             }
             if (!response) {
-                yield selectMainWallet();
-                response = yield getDeviceSession(device, {});
+                yield selectStandardWallet();
+                response = yield getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano }));
             }
         }
         else if (cachedSessionId && expectedPassphraseState) {
             try {
-                response = yield getDeviceSession(device, {
-                    session_id: cachedSessionId,
-                });
+                response = yield getDeviceSession(device, buildDeviceSessionGetRequest({
+                    sessionId: cachedSessionId,
+                    expectedPassphraseState,
+                    deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano,
+                }));
                 resumed = true;
             }
             catch (error) {
@@ -40482,7 +40519,10 @@ function getProtocolV2WalletSession(device, options) {
         }
         else if (expectedPassphraseState) {
             try {
-                response = yield getDeviceSession(device, {});
+                response = yield getDeviceSession(device, buildDeviceSessionGetRequest({
+                    expectedPassphraseState,
+                    deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano,
+                }));
             }
             catch (error) {
                 if ((options === null || options === void 0 ? void 0 : options.resumeOnly) || !isWalletSessionInvalidError(error)) {
@@ -40495,7 +40535,7 @@ function getProtocolV2WalletSession(device, options) {
                 device.clearInternalState();
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
-            response = yield selectDeviceSession(device, expectedPassphraseState);
+            response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano);
         }
         let { message } = response;
         try {
@@ -40503,7 +40543,7 @@ function getProtocolV2WalletSession(device, options) {
         }
         catch (error) {
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                (_e = device.clearStandardInternalState) === null || _e === void 0 ? void 0 : _e.call(device);
+                (_g = device.clearStandardInternalState) === null || _g === void 0 ? void 0 : _g.call(device);
             }
             else {
                 device.clearInternalState();
@@ -40518,13 +40558,13 @@ function getProtocolV2WalletSession(device, options) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.WalletSessionInvalid);
             }
             if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                (_f = device.clearStandardInternalState) === null || _f === void 0 ? void 0 : _f.call(device);
-                yield selectMainWallet(true);
-                response = yield getDeviceSession(device, {});
+                (_h = device.clearStandardInternalState) === null || _h === void 0 ? void 0 : _h.call(device);
+                yield selectStandardWallet();
+                response = yield getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano: options === null || options === void 0 ? void 0 : options.deriveCardano }));
             }
             else {
                 device.clearInternalState();
-                response = yield selectDeviceSession(device, expectedPassphraseState);
+                response = yield selectDeviceSession(device, expectedPassphraseState, options === null || options === void 0 ? void 0 : options.deriveCardano);
             }
             message = response.message;
             try {
@@ -40532,7 +40572,7 @@ function getProtocolV2WalletSession(device, options) {
             }
             catch (error) {
                 if (options === null || options === void 0 ? void 0 : options.onlyMainPin) {
-                    (_g = device.clearStandardInternalState) === null || _g === void 0 ? void 0 : _g.call(device);
+                    (_j = device.clearStandardInternalState) === null || _j === void 0 ? void 0 : _j.call(device);
                 }
                 else {
                     device.clearInternalState();
@@ -40561,7 +40601,7 @@ function getProtocolV2WalletSession(device, options) {
         return {
             passphraseState: message.btc_test_address,
             newSession: message.session_id,
-            unlockedAttachPin: mainWalletSelected ? false : undefined,
+            unlockedAttachPin: mainPinSelected ? false : undefined,
             resumed,
         };
     });
@@ -41333,6 +41373,45 @@ const PRO2_NFT_DEFAULT_PACE_MS = 20;
 const PRO2_NFT_DEFAULT_TIMEOUT_MS = 15000;
 const PRO2_NFT_MIN_CHUNK_SIZE = 64;
 const PRO2_NFT_MAX_CHUNK_SIZE = 2048;
+const PRO2_NFT_MAX_ITEMS = 10;
+const PRO2_NFT_BASENAME_PATTERN = /^nft-[0-9a-f]{8}-[1-9][0-9]*$/;
+function parsePro2NftFile(listedPath) {
+    const filename = listedPath.trim().split('/').at(-1);
+    if (!filename)
+        return undefined;
+    let basename;
+    let fileType;
+    if (filename.endsWith('_m.bin')) {
+        basename = filename.slice(0, -'_m.bin'.length);
+        fileType = 'thumbnail';
+    }
+    else if (filename.endsWith('.json')) {
+        basename = filename.slice(0, -'.json'.length);
+        fileType = 'metadata';
+    }
+    else if (filename.endsWith('.bin')) {
+        basename = filename.slice(0, -'.bin'.length);
+        fileType = 'image';
+    }
+    return basename && fileType && PRO2_NFT_BASENAME_PATTERN.test(basename)
+        ? { basename, fileType }
+        : undefined;
+}
+function getCompletePro2NftBasenames(childFiles) {
+    var _a, _b;
+    const filesByBasename = new Map();
+    for (const listedPath of (_a = childFiles === null || childFiles === void 0 ? void 0 : childFiles.split('\n')) !== null && _a !== void 0 ? _a : []) {
+        const file = parsePro2NftFile(listedPath);
+        if (file) {
+            const fileTypes = (_b = filesByBasename.get(file.basename)) !== null && _b !== void 0 ? _b : new Set();
+            fileTypes.add(file.fileType);
+            filesByBasename.set(file.basename, fileTypes);
+        }
+    }
+    return new Set([...filesByBasename.entries()]
+        .filter(([, fileTypes]) => fileTypes.size === 3)
+        .map(([basename]) => basename));
+}
 function utf8Length(value) {
     return new TextEncoder().encode(value).byteLength;
 }
@@ -44637,17 +44716,24 @@ class Device extends events.exports {
             outcome,
         });
     }
-    finishProtocolV2UiInteraction(outcome = 'succeeded') {
+    finishProtocolV2UiInteraction(outcome, options) {
         const interaction = this.protocolV2UiInteraction;
-        if (!(interaction === null || interaction === void 0 ? void 0 : interaction.opened)) {
+        if (!interaction || (!interaction.opened && !(options === null || options === void 0 ? void 0 : options.ensureMetadata))) {
             this.protocolV2UiInteraction = undefined;
             return undefined;
         }
         const phaseId = `${interaction.interactionId}:phase-${Math.max(interaction.phaseCounter, 1)}`;
-        const metadata = this.createProtocolV2UiPhaseMetadata('processing', 'finish', {
+        interaction.opened = true;
+        interaction.sequence += 1;
+        const metadata = {
+            interactionId: interaction.interactionId,
             phaseId,
-            outcome,
-        });
+            sequence: interaction.sequence,
+            phase: 'processing',
+            transition: 'finish',
+            outcome: outcome !== null && outcome !== void 0 ? outcome : 'succeeded',
+            protocol: 'V2',
+        };
         this.protocolV2UiInteraction = undefined;
         return metadata;
     }
@@ -50423,6 +50509,7 @@ class DeviceUploadWallpaper extends BaseMethod {
 }
 
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
+const FILESYSTEM_DIR_LIST_MESSAGE_TYPE = 60808;
 const NFT_UPDATE_MESSAGE_TYPE = 61500;
 class DeviceUploadNft extends BaseMethod {
     getSupportedProtocols() {
@@ -50451,12 +50538,25 @@ class DeviceUploadNft extends BaseMethod {
         return __awaiter(this, void 0, void 0, function* () {
             const protocolInfo = yield this.device.ensureProtocolV2RuntimeContext();
             const hasFileWrite = supportsProtocolV2Message(protocolInfo, FILESYSTEM_FILE_WRITE_MESSAGE_TYPE);
+            const hasDirList = supportsProtocolV2Message(protocolInfo, FILESYSTEM_DIR_LIST_MESSAGE_TYPE);
             const hasNftUpdate = supportsProtocolV2Message(protocolInfo, NFT_UPDATE_MESSAGE_TYPE);
-            if (!hasFileWrite || !hasNftUpdate) {
+            if (!hasFileWrite || !hasDirList || !hasNftUpdate) {
                 throw hdShared.createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
             }
         });
     }
+    assertStorageCapacity(basename) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { message } = yield this.device.commands.typedCall('FilesystemDirList', 'FilesystemDir', { path: PRO2_NFT_DIRECTORY, depth: 1 }, { timeoutMs: this.params.timeoutMs });
+            const existingBasenames = getCompletePro2NftBasenames(message.child_files);
+            if (existingBasenames.size >= PRO2_NFT_MAX_ITEMS && !existingBasenames.has(basename)) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.NftStorageLimitReached, undefined, {
+                    count: existingBasenames.size,
+                    limit: PRO2_NFT_MAX_ITEMS,
+                });
+            }
+        });
+    }
     updateNft(basename) {
         return __awaiter(this, void 0, void 0, function* () {
             const params = { file_name_no_ext: basename };
@@ -50480,6 +50580,9 @@ class DeviceUploadNft extends BaseMethod {
             if (!bundle)
                 throw invalidParameter$1('NFT data has not been initialized.');
             yield this.assertCapabilities();
+            this.throwIfAborted();
+            yield this.assertStorageCapacity(bundle.basename);
+            this.throwIfAborted();
             const files = [
                 { path: `${PRO2_NFT_DIRECTORY}/${bundle.basename}.bin`, data: bundle.image },
                 { path: `${PRO2_NFT_DIRECTORY}/${bundle.basename}_m.bin`, data: bundle.thumbnail },
@@ -50747,17 +50850,23 @@ class ProtocolV2UiInteractionCoordinator {
     resumeMethodInteraction() {
         this.enterMethodInteraction(this.methodInteraction);
     }
-    close() {
+    close(options = {}) {
         var _a, _b, _c, _d;
-        if (!this.device.isProtocolV2() ||
-            (!this.opened && !((_b = (_a = this.device).hasOpenProtocolV2UiInteraction) === null || _b === void 0 ? void 0 : _b.call(_a))) ||
+        if ((!options.protocolV2Operation && !this.device.isProtocolV2()) ||
+            (!options.ensureOperationClose &&
+                !this.opened &&
+                !((_b = (_a = this.device).hasOpenProtocolV2UiInteraction) === null || _b === void 0 ? void 0 : _b.call(_a))) ||
             this.closed)
-            return;
+            return false;
         this.closed = true;
-        const interaction = (_d = (_c = this.device).finishProtocolV2UiInteraction) === null || _d === void 0 ? void 0 : _d.call(_c);
+        const interaction = (_d = (_c = this.device).finishProtocolV2UiInteraction) === null || _d === void 0 ? void 0 : _d.call(_c, 'succeeded', {
+            ensureMetadata: options.ensureOperationClose,
+        });
+        const device = this.device.toMessageObject();
         this.postMessage(interaction
-            ? createUiMessage(UI_REQUEST.CLOSE_UI_WINDOW, interaction)
+            ? createUiMessage(UI_REQUEST.CLOSE_UI_WINDOW, Object.assign(Object.assign({}, interaction), (device ? { device } : {})))
             : createUiMessage(UI_REQUEST.CLOSE_UI_WINDOW));
+        return true;
     }
     emit(type, payload, phase) {
         if (!this.device.isProtocolV2() || this.closed || this.currentPhase === phase)
@@ -50776,7 +50885,7 @@ const createProtocolV2UnlockContext = () => ({
     preflightCompleted: false,
 });
 function runMethodWithUnlockPolicy(method, device, options = {}) {
-    var _a, _b;
+    var _a, _b, _c;
     return __awaiter(this, void 0, void 0, function* () {
         const { context = createProtocolV2UnlockContext(), uiCoordinator, afterStatusBeforeUnlock, prepare, run: configuredRun, } = options;
         const run = configuredRun !== null && configuredRun !== void 0 ? configuredRun : (() => method.run());
@@ -50793,7 +50902,11 @@ function runMethodWithUnlockPolicy(method, device, options = {}) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 DeviceStatus did not report an explicit unlock state.');
             }
             yield (afterStatusBeforeUnlock === null || afterStatusBeforeUnlock === void 0 ? void 0 : afterStatusBeforeUnlock());
-            if (!status.unlocked) {
+            const isStandardWalletRequest = method.unlockPolicy !== 'unlock-before-run' &&
+                method.useDevicePassphraseState &&
+                ((_c = method.payload) === null || _c === void 0 ? void 0 : _c.useEmptyPassphrase) === true;
+            const standardWalletSessionOwnsUnlock = isStandardWalletRequest && status.passphraseProtection === true;
+            if (!status.unlocked && !standardWalletSessionOwnsUnlock) {
                 const unlockInteraction = shouldCoordinateUi
                     ? uiCoordinator.enterUnlockInteraction(method.name)
                     : undefined;
@@ -61031,6 +61144,8 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
     device.on(DEVICE.STATE, onDeviceStateHandler);
     device.on(DEVICE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE, onSelectDeviceInBootloaderForWebDeviceHandler);
     const protocolV2UiCoordinator = new ProtocolV2UiInteractionCoordinator(device, postMessage);
+    let protocolV2Operation = false;
+    let protocolV2CloseEmitted = false;
     device.beginProtocolV2UiInteraction();
     device.on(DEVICE.SELECT_DEVICE_FOR_SWITCH_FIRMWARE_WEB_DEVICE, onSelectDeviceForSwitchFirmwareWebDeviceHandler);
     try {
@@ -61041,6 +61156,7 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
         const inner = () => __awaiter(void 0, void 0, void 0, function* () {
             var _j, _k;
             method.assertProtocolSupported(device.getProtocol(), device.getCurrentFirmwareType());
+            protocolV2Operation = device.isProtocolV2();
             const versionRange = device.getCurrentMethodVersionRange(type => method.getVersionRange()[type]);
             const currentFirmwareVersion = (_j = device.getCurrentFirmwareVersionString()) !== null && _j !== void 0 ? _j : '0.0.0';
             const currentBleVersion = (_k = device.getCurrentBLEFirmwareVersionString()) !== null && _k !== void 0 ? _k : '0.0.0';
@@ -61177,7 +61293,12 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
                 }
             }
             finally {
-                protocolV2UiCoordinator.close();
+                if (isProtocolV2UiEnabled(method)) {
+                    protocolV2CloseEmitted = protocolV2UiCoordinator.close({
+                        ensureOperationClose: protocolV2Operation,
+                        protocolV2Operation,
+                    });
+                }
             }
         });
         Log.debug('Call API - Device Run: ', device.mainId);
@@ -61209,7 +61330,15 @@ const onCallDevice = (context, message, method) => __awaiter(void 0, void 0, voi
         }
         requestQueue.releaseTask(method.responseID);
         if (isProtocolV2UiEnabled(method)) {
-            closePopup();
+            if (!protocolV2CloseEmitted && protocolV2Operation) {
+                protocolV2CloseEmitted = protocolV2UiCoordinator.close({
+                    ensureOperationClose: true,
+                    protocolV2Operation: true,
+                });
+            }
+            if (!protocolV2CloseEmitted) {
+                closePopup();
+            }
         }
         cleanup();
         if (device) {

package/dist/protocols/protocol-v2/uiInteraction.d.ts

@@ -32,7 +32,10 @@ export declare class ProtocolV2UiInteractionCoordinator {
     enterMethodInteraction(interaction?: ProtocolV2InteractionDescriptor): void;
     enterUnlockInteraction(method?: string): HardwareUiInteractionMeta | undefined;
     resumeMethodInteraction(): void;
-    close(): void;
+    close(options?: {
+        ensureOperationClose?: boolean;
+        protocolV2Operation?: boolean;
+    }): boolean;
     private emit;
 }
 export {};

package/dist/protocols/protocol-v2/uiInteraction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uiInteraction.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/uiInteraction.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACnG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,OAAO,EAAE,QAAQ,GAAG,KAAK,CAAC;IAC1B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EACF,YAAY,GACZ,eAAe,GACf,eAAe,GACf,sBAAsB,GACtB,yBAAyB,GACzB,sBAAsB,GACtB,mBAAmB,CAAC;IACxB,UAAU,EAAE,sBAAsB,CAAC;IACnC,UAAU,EAAE,IAAI,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,2BAA2B,GAAG;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,uBAAuB,CAAC,EAAE,+BAA+B,CAAC;CAC3D,CAAC;AAEF,KAAK,iBAAiB,GAAG,IAAI,CAAC,MAAM,EAAE,cAAc,GAAG,iBAAiB,CAAC,GACvE,OAAO,CACL,IAAI,CACF,MAAM,EACJ,iCAAiC,GACjC,+BAA+B,GAC/B,gCAAgC,CACnC,CACF,CAAC;AACJ,KAAK,WAAW,GAAG,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;AAElD,eAAO,MAAM,qBAAqB,WAAY;IAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,YAChD,CAAC;AA4DrC,eAAO,MAAM,8BAA8B,WACjC,2BAA2B,KAClC,+BAA+B,GAAG,SAsCpC,CAAC;AAEF,qBAAa,kCAAkC;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAE3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAE1C,OAAO,CAAC,iBAAiB,CAAC,CAAkC;IAE5D,OAAO,CAAC,YAAY,CAAC,CAAS;IAE9B,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW;IAK/D,sBAAsB,CAAC,WAAW,CAAC,EAAE,+BAA+B;IAsBpE,sBAAsB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,yBAAyB,GAAG,SAAS;IAiB9E,uBAAuB;IAIvB,KAAK;IAgBL,OAAO,CAAC,IAAI;CAcb"}
+{"version":3,"file":"uiInteraction.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/uiInteraction.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACnG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,OAAO,EAAE,QAAQ,GAAG,KAAK,CAAC;IAC1B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EACF,YAAY,GACZ,eAAe,GACf,eAAe,GACf,sBAAsB,GACtB,yBAAyB,GACzB,sBAAsB,GACtB,mBAAmB,CAAC;IACxB,UAAU,EAAE,sBAAsB,CAAC;IACnC,UAAU,EAAE,IAAI,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,2BAA2B,GAAG;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,uBAAuB,CAAC,EAAE,+BAA+B,CAAC;CAC3D,CAAC;AAEF,KAAK,iBAAiB,GAAG,IAAI,CAAC,MAAM,EAAE,cAAc,GAAG,iBAAiB,CAAC,GACvE,OAAO,CACL,IAAI,CACF,MAAM,EACJ,iCAAiC,GACjC,+BAA+B,GAC/B,gCAAgC,CACnC,CACF,CAAC;AACJ,KAAK,WAAW,GAAG,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;AAElD,eAAO,MAAM,qBAAqB,WAAY;IAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,YAChD,CAAC;AA4DrC,eAAO,MAAM,8BAA8B,WACjC,2BAA2B,KAClC,+BAA+B,GAAG,SAsCpC,CAAC;AAEF,qBAAa,kCAAkC;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoB;IAE3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAE1C,OAAO,CAAC,iBAAiB,CAAC,CAAkC;IAE5D,OAAO,CAAC,YAAY,CAAC,CAAS;IAE9B,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW;IAK/D,sBAAsB,CAAC,WAAW,CAAC,EAAE,+BAA+B;IAsBpE,sBAAsB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,yBAAyB,GAAG,SAAS;IAiB9E,uBAAuB;IAIvB,KAAK,CACH,OAAO,GAAE;QACP,oBAAoB,CAAC,EAAE,OAAO,CAAC;QAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;KAC1B,GACL,OAAO;IAyBV,OAAO,CAAC,IAAI;CAcb"}

package/dist/protocols/protocol-v2/unlockPolicyRunner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unlockPolicyRunner.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/unlockPolicyRunner.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAC;AAI1E,MAAM,MAAM,uBAAuB,GAAG;IACpC,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAO,uBAE/C,CAAC;AAEH,KAAK,cAAc,GAAG,IAAI,CACxB,UAAU,EACR,KAAK,GACL,cAAc,GACd,0BAA0B,GAC1B,yBAAyB,GACzB,kBAAkB,GAClB,QAAQ,GACR,SAAS,CACZ,GAAG;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;CACnD,CAAC;AAEF,KAAK,wBAAwB,GAAG,IAAI,CAClC,kCAAkC,EAClC,wBAAwB,GAAG,wBAAwB,CACpD,CAAC;AAEF,KAAK,gCAAgC,CAAC,CAAC,IAAI;IACzC,OAAO,CAAC,EAAE,uBAAuB,CAAC;IAClC,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,uBAAuB,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAsB,yBAAyB,CAAC,CAAC,GAAG,OAAO,EACzD,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,gCAAgC,CAAC,CAAC,CAAM,GAChD,OAAO,CAAC,CAAC,CAAC,CAgEZ"}
+{"version":3,"file":"unlockPolicyRunner.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/unlockPolicyRunner.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,iBAAiB,CAAC;AAI1E,MAAM,MAAM,uBAAuB,GAAG;IACpC,kBAAkB,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,6BAA6B,QAAO,uBAE/C,CAAC;AAEH,KAAK,cAAc,GAAG,IAAI,CACxB,UAAU,EACR,KAAK,GACL,cAAc,GACd,0BAA0B,GAC1B,yBAAyB,GACzB,kBAAkB,GAClB,QAAQ,GACR,SAAS,CACZ,GAAG;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;CACnD,CAAC;AAEF,KAAK,wBAAwB,GAAG,IAAI,CAClC,kCAAkC,EAClC,wBAAwB,GAAG,wBAAwB,CACpD,CAAC;AAEF,KAAK,gCAAgC,CAAC,CAAC,IAAI;IACzC,OAAO,CAAC,EAAE,uBAAuB,CAAC;IAClC,aAAa,CAAC,EAAE,wBAAwB,CAAC;IACzC,uBAAuB,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,GAAG,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC;CACxB,CAAC;AAEF,wBAAsB,yBAAyB,CAAC,CAAC,GAAG,OAAO,EACzD,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,gCAAgC,CAAC,CAAC,CAAM,GAChD,OAAO,CAAC,CAAC,CAAC,CAuEZ"}

package/dist/protocols/protocol-v2/walletSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"walletSession.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/walletSession.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAuBlD,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,0DAGjE;AAED,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,qCAGjE;AAED,wBAAsB,qCAAqC,CAAC,MAAM,EAAE,MAAM,oBAgBzE;AA8FD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;;;;;GA0LF;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,MAAM,EAC/B,aAAa,CAAC,EAAE,OAAO;;;;;GAOxB"}
+{"version":3,"file":"walletSession.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/walletSession.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAuBlD,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,0DAGjE;AAED,wBAAsB,6BAA6B,CAAC,MAAM,EAAE,MAAM,qCAGjE;AAED,wBAAsB,qCAAqC,CAAC,MAAM,EAAE,MAAM,oBAgBzE;AAsHD,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,6BAA6B,CAAC,EAAE,OAAO,CAAC;IACxC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;;;;;GA8NF;AAED,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,EACd,uBAAuB,EAAE,MAAM,EAC/B,aAAa,CAAC,EAAE,OAAO;;;;;GAOxB"}

package/dist/utils/pro2Nft.d.ts

@@ -8,6 +8,7 @@ export declare const PRO2_NFT_DEFAULT_PACE_MS = 20;
 export declare const PRO2_NFT_DEFAULT_TIMEOUT_MS = 15000;
 export declare const PRO2_NFT_MIN_CHUNK_SIZE = 64;
 export declare const PRO2_NFT_MAX_CHUNK_SIZE = 2048;
+export declare const PRO2_NFT_MAX_ITEMS = 10;
 export type Pro2NftImage = {
     width: number;
     height: number;
@@ -19,6 +20,7 @@ export type Pro2NftBundle = {
     thumbnail: Uint8Array;
     metadata: Uint8Array;
 };
+export declare function getCompletePro2NftBasenames(childFiles?: string): Set<string>;
 export declare function buildPro2NftBundle(options: {
     image: Pro2NftImage;
     thumbnail: Pro2NftImage;

package/dist/utils/pro2Nft.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pro2Nft.d.ts","sourceRoot":"","sources":["../../src/utils/pro2Nft.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAC5C,eAAO,MAAM,yBAAyB,MAAM,CAAC;AAC7C,eAAO,MAAM,kBAAkB,cAAc,CAAC;AAC9C,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAC/C,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAC3C,eAAO,MAAM,2BAA2B,QAAS,CAAC;AAClD,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAC1C,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAE5C,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AAsBF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAC1C,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,EAAE,YAAY,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,aAAa,CAkChB"}
+{"version":3,"file":"pro2Nft.d.ts","sourceRoot":"","sources":["../../src/utils/pro2Nft.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAC5C,eAAO,MAAM,yBAAyB,MAAM,CAAC;AAC7C,eAAO,MAAM,kBAAkB,cAAc,CAAC;AAC9C,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAC/C,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAC3C,eAAO,MAAM,2BAA2B,QAAS,CAAC;AAClD,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAC1C,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAC5C,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AAiCF,wBAAgB,2BAA2B,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAiB5E;AAsBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAC1C,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,EAAE,YAAY,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,aAAa,CAkChB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.42",
+  "version": "1.2.0-alpha.44",
   "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.0-alpha.42",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.42",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.44",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.44",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "876db04e726acaa06fe51dd78f807df1d101c24d"
+  "gitHead": "6de180b61cd4a64f41cf4ffd32eeb8a1cc4e64e7"
 }

package/src/api/protocol-v2/DeviceUploadNft.ts

@@ -1,4 +1,4 @@
-import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
+import { ERRORS, HardwareErrorCode, createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
 
 import { UI_REQUEST, createUiMessage } from '../../events/ui-request';
 import { supportsProtocolV2Message } from '../../protocols/protocol-v2/features';
@@ -8,10 +8,12 @@ import {
   PRO2_NFT_DEFAULT_TIMEOUT_MS,
   PRO2_NFT_DIRECTORY,
   PRO2_NFT_MAX_CHUNK_SIZE,
+  PRO2_NFT_MAX_ITEMS,
   PRO2_NFT_MIN_CHUNK_SIZE,
   type Pro2NftBundle,
   type Pro2NftImage,
   buildPro2NftBundle,
+  getCompletePro2NftBasenames,
 } from '../../utils/pro2Nft';
 import { BaseMethod } from '../BaseMethod';
 import { invalidParameter } from '../helpers/filesystemValidation';
@@ -39,6 +41,7 @@ export type DeviceUploadNftResponse = {
 };
 
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
+const FILESYSTEM_DIR_LIST_MESSAGE_TYPE = 60808;
 const NFT_UPDATE_MESSAGE_TYPE = 61500;
 
 export default class DeviceUploadNft extends BaseMethod<DeviceUploadNftParams> {
@@ -88,12 +91,29 @@ export default class DeviceUploadNft extends BaseMethod<DeviceUploadNftParams> {
       protocolInfo,
       FILESYSTEM_FILE_WRITE_MESSAGE_TYPE
     );
+    const hasDirList = supportsProtocolV2Message(protocolInfo, FILESYSTEM_DIR_LIST_MESSAGE_TYPE);
     const hasNftUpdate = supportsProtocolV2Message(protocolInfo, NFT_UPDATE_MESSAGE_TYPE);
-    if (!hasFileWrite || !hasNftUpdate) {
+    if (!hasFileWrite || !hasDirList || !hasNftUpdate) {
       throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
     }
   }
 
+  private async assertStorageCapacity(basename: string) {
+    const { message } = await this.device.commands.typedCall(
+      'FilesystemDirList',
+      'FilesystemDir',
+      { path: PRO2_NFT_DIRECTORY, depth: 1 },
+      { timeoutMs: this.params.timeoutMs }
+    );
+    const existingBasenames = getCompletePro2NftBasenames(message.child_files);
+    if (existingBasenames.size >= PRO2_NFT_MAX_ITEMS && !existingBasenames.has(basename)) {
+      throw ERRORS.TypedError(HardwareErrorCode.NftStorageLimitReached, undefined, {
+        count: existingBasenames.size,
+        limit: PRO2_NFT_MAX_ITEMS,
+      });
+    }
+  }
+
   private async updateNft(basename: string) {
     const params = { file_name_no_ext: basename };
     const options = { timeoutMs: this.params.timeoutMs };
@@ -113,6 +133,9 @@ export default class DeviceUploadNft extends BaseMethod<DeviceUploadNftParams> {
     if (!bundle) throw invalidParameter('NFT data has not been initialized.');
 
     await this.assertCapabilities();
+    this.throwIfAborted();
+    await this.assertStorageCapacity(bundle.basename);
+    this.throwIfAborted();
 
     const files = [
       { path: `${PRO2_NFT_DIRECTORY}/${bundle.basename}.bin`, data: bundle.image },

package/src/core/index.ts

@@ -429,6 +429,8 @@ const onCallDevice = async (
   );
 
   const protocolV2UiCoordinator = new ProtocolV2UiInteractionCoordinator(device, postMessage);
+  let protocolV2Operation = false;
+  let protocolV2CloseEmitted = false;
   device.beginProtocolV2UiInteraction();
   device.on(
     DEVICE.SELECT_DEVICE_FOR_SWITCH_FIRMWARE_WEB_DEVICE,
@@ -447,6 +449,7 @@ const onCallDevice = async (
       // Protocol is established from an active device response during acquire/initialize.
       // Reject unsupported methods before any method-specific device command is sent.
       method.assertProtocolSupported(device.getProtocol(), device.getCurrentFirmwareType());
+      protocolV2Operation = device.isProtocolV2();
 
       // check firmware version
       const versionRange = device.getCurrentMethodVersionRange(
@@ -659,7 +662,12 @@ const onCallDevice = async (
           throw error;
         }
       } finally {
-        protocolV2UiCoordinator.close();
+        if (isProtocolV2UiEnabled(method)) {
+          protocolV2CloseEmitted = protocolV2UiCoordinator.close({
+            ensureOperationClose: protocolV2Operation,
+            protocolV2Operation,
+          });
+        }
       }
     };
     Log.debug('Call API - Device Run: ', device.mainId);
@@ -714,7 +722,15 @@ const onCallDevice = async (
     requestQueue.releaseTask(method.responseID);
 
     if (isProtocolV2UiEnabled(method)) {
-      closePopup();
+      if (!protocolV2CloseEmitted && protocolV2Operation) {
+        protocolV2CloseEmitted = protocolV2UiCoordinator.close({
+          ensureOperationClose: true,
+          protocolV2Operation: true,
+        });
+      }
+      if (!protocolV2CloseEmitted) {
+        closePopup();
+      }
     }
 
     cleanup();