@onekeyfe/hd-core 1.2.0-alpha.59 → 1.2.0-alpha.60

package/__tests__/deviceUploadNft.test.ts

@@ -15,7 +15,7 @@ const createRgba = (width: number, height: number) => {
 
 const createMethod = ({
   typedCall,
-  supportedMessages = [60805, 60808, 61500],
+  supportedMessages = [60802, 60805, 60808, 61500],
   useFullBundle = false,
 }: {
   typedCall: jest.Mock;
@@ -104,6 +104,9 @@ describe('DeviceUploadNft', () => {
 
   test('uploads the triplet in order without creating the firmware-owned directory', async () => {
     const typedCall = jest.fn((request: string, _response: string, params: any) => {
+      if (request === 'FilesystemPathInfoQuery') {
+        return { message: { exist: true, directory: true } };
+      }
       if (request === 'FilesystemDirList') {
         return { message: { path: 'vol1:/nft', child_files: '' } };
       }
@@ -116,9 +119,16 @@ describe('DeviceUploadNft', () => {
     const result = await method.run();
 
     const requests = typedCall.mock.calls.map(call => call[0]);
-    expect(requests[0]).toBe('FilesystemDirList');
+    expect(requests[0]).toBe('FilesystemPathInfoQuery');
     expect(typedCall).toHaveBeenNthCalledWith(
       1,
+      'FilesystemPathInfoQuery',
+      'FilesystemPathInfo',
+      { path: 'vol1:/nft' },
+      { timeoutMs: 15_000 }
+    );
+    expect(typedCall).toHaveBeenNthCalledWith(
+      2,
       'FilesystemDirList',
       'FilesystemDir',
       { path: 'vol1:/nft', depth: 1 },
@@ -160,11 +170,30 @@ describe('DeviceUploadNft', () => {
     });
   });
 
+  test('treats a missing NFT directory as empty before the first upload', async () => {
+    const typedCall = jest.fn((request: string, _response: string, params: any) => {
+      if (request === 'FilesystemPathInfoQuery') {
+        return { message: { exist: false, directory: false } };
+      }
+      if (request === 'FilesystemFileWrite') return fileWriteSuccess(params);
+      if (request === 'NftUpdate') return { message: { message: 'NFT updated' } };
+      throw new Error(`Unexpected request: ${request}`);
+    });
+    const method = createMethod({ typedCall });
+
+    await expect(method.run()).resolves.toMatchObject({ nftUpdated: true });
+    expect(typedCall.mock.calls.map(call => call[0])).not.toContain('FilesystemDirList');
+    expect(typedCall.mock.calls.some(call => call[0] === 'FilesystemFileWrite')).toBe(true);
+  });
+
   test('does not retry a timed-out NftUpdate', async () => {
     const timeout = Object.assign(new Error('Protocol V2 response timeout'), {
       code: 'response-timeout',
     });
     const typedCall = jest.fn((request: string, _response: string, params: any) => {
+      if (request === 'FilesystemPathInfoQuery') {
+        return { message: { exist: true, directory: true } };
+      }
       if (request === 'FilesystemDirList') {
         return { message: { path: 'vol1:/nft', child_files: '' } };
       }
@@ -182,6 +211,9 @@ describe('DeviceUploadNft', () => {
 
   test('does not retry a non-timeout NftUpdate failure', async () => {
     const typedCall = jest.fn((request: string, _response: string, params: any) => {
+      if (request === 'FilesystemPathInfoQuery') {
+        return { message: { exist: true, directory: true } };
+      }
       if (request === 'FilesystemDirList') {
         return { message: { path: 'vol1:/nft', child_files: '' } };
       }
@@ -197,6 +229,9 @@ describe('DeviceUploadNft', () => {
 
   test('does not publish when a file write fails', async () => {
     const typedCall = jest.fn((request: string) => {
+      if (request === 'FilesystemPathInfoQuery') {
+        return { message: { exist: true, directory: true } };
+      }
       if (request === 'FilesystemDirList') {
         return { message: { path: 'vol1:/nft', child_files: '' } };
       }
@@ -219,6 +254,9 @@ describe('DeviceUploadNft', () => {
 
   test('rejects a new NFT before writing when ten complete NFT bundles exist', async () => {
     const typedCall = jest.fn((request: string) => {
+      if (request === 'FilesystemPathInfoQuery') {
+        return { message: { exist: true, directory: true } };
+      }
       if (request === 'FilesystemDirList') {
         return { message: { path: 'vol1:/nft', child_files: nftFileList(10) } };
       }
@@ -230,11 +268,17 @@ describe('DeviceUploadNft', () => {
       errorCode: HardwareErrorCode.NftStorageLimitReached,
       params: { count: 10, limit: 10 },
     });
-    expect(typedCall.mock.calls.map(call => call[0])).toEqual(['FilesystemDirList']);
+    expect(typedCall.mock.calls.map(call => call[0])).toEqual([
+      'FilesystemPathInfoQuery',
+      'FilesystemDirList',
+    ]);
   });
 
   test('allows an idempotent retry for a basename already counted at the limit', async () => {
     const typedCall = jest.fn((request: string, _response: string, params: any) => {
+      if (request === 'FilesystemPathInfoQuery') {
+        return { message: { exist: true, directory: true } };
+      }
       if (request === 'FilesystemDirList') {
         return { message: { path: 'vol1:/nft', child_files: nftFileList(10, 0) } };
       }
@@ -250,6 +294,9 @@ describe('DeviceUploadNft', () => {
 
   test('does not count unrelated or incomplete files as stored NFTs', async () => {
     const typedCall = jest.fn((request: string, _response: string, params: any) => {
+      if (request === 'FilesystemPathInfoQuery') {
+        return { message: { exist: true, directory: true } };
+      }
       if (request === 'FilesystemDirList') {
         return {
           message: {

package/__tests__/protocol-v2-resources.test.ts

@@ -146,6 +146,21 @@ describe('Pro2 resource configuration', () => {
         },
       })
     ).toThrow('devicePath');
+
+    for (const devicePath of [
+      'vol0:/assets/loaders\\bootloader_crest.bin',
+      'vol0:/assets/loaders\\\\bootloader_crest.bin',
+    ]) {
+      expect(() =>
+        parseProtocolV2Resources({
+          stable: resources,
+          boot: {
+            ...bootResources,
+            files: [{ ...bootResources.files[0], devicePath }],
+          },
+        })
+      ).toThrow('devicePath');
+    }
   });
 
   test('downloads nothing when all resource identities match', () => {

package/__tests__/uiPromiseRegistry.test.ts

@@ -1,6 +1,6 @@
 import { createDeferred } from '@onekeyfe/hd-shared';
 
-import { findUiPromiseForResponse } from '../src/core/uiPromiseRegistry';
+import { findUiPromiseForResponse, rejectUiPromises } from '../src/core/uiPromiseRegistry';
 import { UI_RESPONSE } from '../src/events';
 
 import type { UiPromise, UiPromiseResponse } from '../src/events';
@@ -83,4 +83,15 @@ describe('UI response promise correlation', () => {
       })
     ).toBe(promise);
   });
+
+  test('rejects every pending UI promise removed during cleanup', async () => {
+    const deviceA = createPinPromise('interaction-a', 'device-a');
+    const deviceB = createPinPromise('interaction-b', 'device-b');
+    const cancellation = new Error('UI request was cancelled');
+
+    rejectUiPromises(asRegistry([deviceA, deviceB]), cancellation);
+
+    await expect(deviceA.promise).rejects.toBe(cancellation);
+    await expect(deviceB.promise).rejects.toBe(cancellation);
+  });
 });

package/dist/api/protocol-v2/DeviceUploadNft.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceUploadNft.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DeviceUploadNft.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,KAAK,YAAY,EAGlB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,EAAE,YAAY,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAMF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,qBAAqB,CAAC;IAC5E,OAAO,CAAC,MAAM,CAAC,CAAgB;IAE/B,qBAAqB;IAIrB,IAAI;YAkCU,kBAAkB;YAalB,qBAAqB;YAgBrB,SAAS;IASjB,GAAG,IAAI,OAAO,CAAC,uBAAuB,CAAC;CA0D9C"}
+{"version":3,"file":"DeviceUploadNft.d.ts","sourceRoot":"","sources":["../../../src/api/protocol-v2/DeviceUploadNft.ts"],"names":[],"mappings":"AAIA,OAAO,EASL,KAAK,YAAY,EAGlB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,EAAE,YAAY,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,IAAI,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAOF,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,qBAAqB,CAAC;IAC5E,OAAO,CAAC,MAAM,CAAC,CAAgB;IAE/B,qBAAqB;IAIrB,IAAI;YAkCU,kBAAkB;YAiBlB,qBAAqB;YAwBrB,SAAS;IASjB,GAAG,IAAI,OAAO,CAAC,uBAAuB,CAAC;CA0D9C"}

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AA+BlC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAsB1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAYxD,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAmD,MAAM,WAAW,CAAC;AAI9F,OAAO,KAAK,EACV,6BAA6B,EAG9B,MAAM,wBAAwB,CAAC;AAWhC,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAgE7D,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBAoFvE,CAAC;AA82BF,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SAkF9D,CAAC;AA8FF,eAAO,MAAM,qBAAqB,gFAejC,CAAC;AAwKF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,SAAgB,aAAa,EAAE,MAAM,CAAC;IAEtC,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,cAAc,CAAC,CAAgB;IAGvC,OAAO,CAAC,qBAAqB,CAA4B;IAEzD,OAAO,CAAC,iBAAiB,CAAoB;;IAS7C,OAAO,CAAC,cAAc;IAoBhB,aAAa,CAAC,OAAO,EAAE,WAAW;IAuExC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAOV,gBAAgB;CAiC/B;AAED,eAAO,MAAM,QAAQ,YAIpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAYzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAiBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AACA,OAAO,YAAY,MAAM,QAAQ,CAAC;AA+BlC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAsB1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAYxD,OAAO,KAAK,EAAE,eAAe,EAAyB,MAAM,UAAU,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAmD,MAAM,WAAW,CAAC;AAI9F,OAAO,KAAK,EACV,6BAA6B,EAG9B,MAAM,wBAAwB,CAAC;AAWhC,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAgE7D,eAAO,MAAM,OAAO,YAAmB,WAAW,WAAW,WAAW,iBAoFvE,CAAC;AA82BF,eAAO,MAAM,MAAM,YAAa,WAAW,cAAc,MAAM,SAkF9D,CAAC;AAmGF,eAAO,MAAM,qBAAqB,gFAejC,CAAC;AAwKF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IAC5C,OAAO,CAAC,cAAc,CAAoB;IAE1C,SAAgB,aAAa,EAAE,MAAM,CAAC;IAEtC,OAAO,CAAC,YAAY,CAAsB;IAE1C,OAAO,CAAC,cAAc,CAAC,CAAgB;IAGvC,OAAO,CAAC,qBAAqB,CAA4B;IAEzD,OAAO,CAAC,iBAAiB,CAAoB;;IAS7C,OAAO,CAAC,cAAc;IAoBhB,aAAa,CAAC,OAAO,EAAE,WAAW;IAuExC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAOV,gBAAgB;CAiC/B;AAED,eAAO,MAAM,QAAQ,YAIpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAYzB,CAAC;AAMF,eAAO,MAAM,IAAI,aACL,eAAe,aACd,GAAG,WACL,6BAA6B,8BAiBvC,CAAC;AAEF,eAAO,MAAM,eAAe;SAKrB,eAAe,CAAC,KAAK,CAAC;eAChB,GAAG;;UASf,CAAC"}

package/dist/core/uiPromiseRegistry.d.ts

@@ -1,4 +1,5 @@
 import type { UiPromise, UiPromiseResponse } from '../events/ui-promise';
 import type { UiResponseEvent } from '../events/ui-response';
+export declare const rejectUiPromises: (uiPromises: UiPromise<UiPromiseResponse['type']>[], error: Error) => void;
 export declare const findUiPromiseForResponse: (uiPromises: UiPromise<UiPromiseResponse['type']>[], response: UiResponseEvent) => UiPromise<"ui-receive_pin" | "ui-receive_passphrase" | "ui-receive_select-device-in-bootloader-for-web-device" | "ui-receive_select-device-for-switch-firmware-web-device" | "device-disconnect"> | undefined;
 //# sourceMappingURL=uiPromiseRegistry.d.ts.map

package/dist/core/uiPromiseRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uiPromiseRegistry.d.ts","sourceRoot":"","sources":["../../src/core/uiPromiseRegistry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAS7D,eAAO,MAAM,wBAAwB,eACvB,UAAU,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,YACxC,eAAe,kNA0B1B,CAAC"}
+{"version":3,"file":"uiPromiseRegistry.d.ts","sourceRoot":"","sources":["../../src/core/uiPromiseRegistry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,eAAO,MAAM,gBAAgB,eACf,UAAU,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,SAC3C,KAAK,SAKb,CAAC;AASF,eAAO,MAAM,wBAAwB,eACvB,UAAU,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,YACxC,eAAe,kNA0B1B,CAAC"}

package/dist/index.js

@@ -39663,7 +39663,7 @@ function validateBootResources(value) {
         if (typeof file.devicePath !== 'string' ||
             !file.devicePath.startsWith('vol0:/') ||
             file.devicePath.includes('..') ||
-            file.devicePath.includes('\\\\')) {
+            file.devicePath.includes('\\')) {
             throw new Error(`Invalid Pro2 boot resource devicePath at files[${index}]`);
         }
         if (!Number.isSafeInteger(file.size) || Number(file.size) <= 0) {
@@ -51081,6 +51081,7 @@ class DeviceUploadWallpaper extends BaseMethod {
     }
 }
 
+const FILESYSTEM_PATH_INFO_QUERY_MESSAGE_TYPE = 60802;
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
 const FILESYSTEM_DIR_LIST_MESSAGE_TYPE = 60808;
 const NFT_UPDATE_MESSAGE_TYPE = 61500;
@@ -51111,15 +51112,19 @@ 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 hasPathInfo = supportsProtocolV2Message(protocolInfo, FILESYSTEM_PATH_INFO_QUERY_MESSAGE_TYPE);
             const hasDirList = supportsProtocolV2Message(protocolInfo, FILESYSTEM_DIR_LIST_MESSAGE_TYPE);
             const hasNftUpdate = supportsProtocolV2Message(protocolInfo, NFT_UPDATE_MESSAGE_TYPE);
-            if (!hasFileWrite || !hasDirList || !hasNftUpdate) {
+            if (!hasFileWrite || !hasPathInfo || !hasDirList || !hasNftUpdate) {
                 throw hdShared.createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
             }
         });
     }
     assertStorageCapacity(basename) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { message: pathInfo } = yield this.device.commands.typedCall('FilesystemPathInfoQuery', 'FilesystemPathInfo', { path: PRO2_NFT_DIRECTORY }, { timeoutMs: this.params.timeoutMs });
+            if (!pathInfo.exist)
+                return;
             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)) {
@@ -61395,6 +61400,11 @@ class RequestQueue {
     }
 }
 
+const rejectUiPromises = (uiPromises, error) => {
+    for (const uiPromise of uiPromises) {
+        uiPromise.reject(error);
+    }
+};
 const isSensitiveUiResponse = (response) => response.type === UI_RESPONSE.RECEIVE_PIN || response.type === UI_RESPONSE.RECEIVE_PASSPHRASE;
 const findUiPromiseForResponse = (uiPromises, response) => {
     const candidates = uiPromises.filter(promise => promise.id === response.type);
@@ -62326,7 +62336,9 @@ const shouldCheckPassphraseState = (method, device) => {
     return device.hasUsePassphrase();
 };
 const cleanup = () => {
+    const pendingUiPromises = _uiPromises;
     _uiPromises = [];
+    rejectUiPromises(pendingUiPromises, hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ActionCancelled, 'UI request was cancelled'));
     Log.debug('Cleanup...');
 };
 const removeDeviceListener = (device) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.59",
+  "version": "1.2.0-alpha.60",
   "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.59",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.59",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.60",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.60",
     "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": "98794c3032aab55e13fb2afedc645d8281141d5f"
+  "gitHead": "bde29baa04ac87453fd0eff54fd1cafe905f0ec8"
 }

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

@@ -40,6 +40,7 @@ export type DeviceUploadNftResponse = {
   message?: string;
 };
 
+const FILESYSTEM_PATH_INFO_QUERY_MESSAGE_TYPE = 60802;
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
 const FILESYSTEM_DIR_LIST_MESSAGE_TYPE = 60808;
 const NFT_UPDATE_MESSAGE_TYPE = 61500;
@@ -91,14 +92,26 @@ export default class DeviceUploadNft extends BaseMethod<DeviceUploadNftParams> {
       protocolInfo,
       FILESYSTEM_FILE_WRITE_MESSAGE_TYPE
     );
+    const hasPathInfo = supportsProtocolV2Message(
+      protocolInfo,
+      FILESYSTEM_PATH_INFO_QUERY_MESSAGE_TYPE
+    );
     const hasDirList = supportsProtocolV2Message(protocolInfo, FILESYSTEM_DIR_LIST_MESSAGE_TYPE);
     const hasNftUpdate = supportsProtocolV2Message(protocolInfo, NFT_UPDATE_MESSAGE_TYPE);
-    if (!hasFileWrite || !hasDirList || !hasNftUpdate) {
+    if (!hasFileWrite || !hasPathInfo || !hasDirList || !hasNftUpdate) {
       throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
     }
   }
 
   private async assertStorageCapacity(basename: string) {
+    const { message: pathInfo } = await this.device.commands.typedCall(
+      'FilesystemPathInfoQuery',
+      'FilesystemPathInfo',
+      { path: PRO2_NFT_DIRECTORY },
+      { timeoutMs: this.params.timeoutMs }
+    );
+    if (!pathInfo.exist) return;
+
     const { message } = await this.device.commands.typedCall(
       'FilesystemDirList',
       'FilesystemDir',

package/src/core/index.ts

@@ -54,7 +54,7 @@ import {
 import TransportManager from '../data-manager/TransportManager';
 import DeviceConnector from '../device/DeviceConnector';
 import RequestQueue from './RequestQueue';
-import { findUiPromiseForResponse } from './uiPromiseRegistry';
+import { findUiPromiseForResponse, rejectUiPromises } from './uiPromiseRegistry';
 import { registerHardwareUiEventListeners } from './deviceEventRegistration';
 import { getSynchronize } from '../utils/getSynchronize';
 import { runMethodWithUnlockPolicy } from '../protocols/protocol-v2/unlockPolicyRunner';
@@ -1226,7 +1226,12 @@ const shouldCheckPassphraseState = (method: BaseMethod, device: Device) => {
 };
 
 const cleanup = () => {
+  const pendingUiPromises = _uiPromises;
   _uiPromises = [];
+  rejectUiPromises(
+    pendingUiPromises,
+    ERRORS.TypedError(HardwareErrorCode.ActionCancelled, 'UI request was cancelled')
+  );
   Log.debug('Cleanup...');
 };
 

package/src/core/uiPromiseRegistry.ts

@@ -3,6 +3,15 @@ import { UI_RESPONSE } from '../events/ui-response';
 import type { UiPromise, UiPromiseResponse } from '../events/ui-promise';
 import type { UiResponseEvent } from '../events/ui-response';
 
+export const rejectUiPromises = (
+  uiPromises: UiPromise<UiPromiseResponse['type']>[],
+  error: Error
+) => {
+  for (const uiPromise of uiPromises) {
+    uiPromise.reject(error);
+  }
+};
+
 const isSensitiveUiResponse = (
   response: UiResponseEvent
 ): response is Extract<

package/src/protocols/protocol-v2/resources.ts

@@ -272,7 +272,7 @@ function validateBootResources(value: unknown): IProtocolV2BootResources {
       typeof file.devicePath !== 'string' ||
       !file.devicePath.startsWith('vol0:/') ||
       file.devicePath.includes('..') ||
-      file.devicePath.includes('\\\\')
+      file.devicePath.includes('\\')
     ) {
       throw new Error(`Invalid Pro2 boot resource devicePath at files[${index}]`);
     }