@onekeyfe/hd-core 1.2.0-alpha.78 → 1.2.0-alpha.79

package/dist/index.js

@@ -1265,6 +1265,204 @@ const assertFirmwareUpdatePreparedPlanBinding = ({ preparedPlan: value, executor
     return preparedPlan;
 };
 
+const PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH$1 = 'vol0:/loaders/bootloader/boot_resource.okpkg';
+const SHA256_HEX_LENGTH = 64;
+function normalizeHex$1(value, expectedLength, field) {
+    if (typeof value !== 'string') {
+        throw new Error(`Invalid Pro2 resource ${field}: expected a hexadecimal string`);
+    }
+    const normalized = value.replace(/^0x/i, '').toLowerCase();
+    if (normalized.length !== expectedLength || !/^[0-9a-f]+$/.test(normalized)) {
+        throw new Error(`Invalid Pro2 resource ${field}: expected ${expectedLength} hexadecimal characters`);
+    }
+    return normalized;
+}
+function parseProtocolV2Resources(value) {
+    if (value === undefined)
+        return undefined;
+    if (!value || typeof value !== 'object') {
+        throw new Error('Invalid Pro2 resources config');
+    }
+    const { source } = value;
+    if (!source || typeof source !== 'object') {
+        throw new Error('Invalid Pro2 resources config: source is required');
+    }
+    const { manifestUrl } = source;
+    if (typeof manifestUrl !== 'string' || !manifestUrl.startsWith('https://')) {
+        throw new Error('Invalid Pro2 resources config: source.manifestUrl must use HTTPS');
+    }
+    return {
+        source: { manifestUrl },
+    };
+}
+const PROTOCOL_V2_RESOURCE_MANIFEST_DEVICE_ROOTS = [
+    'vol0:/bundles/',
+    'vol0:/loaders/rom/',
+];
+function isAllowedManifestDevicePath(path) {
+    if (!path.endsWith('.okpkg') ||
+        path.includes('\\') ||
+        path.includes('//') ||
+        path.split('/').some(part => part === '.' || part === '..')) {
+        return false;
+    }
+    if (path === PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH$1) {
+        return true;
+    }
+    return PROTOCOL_V2_RESOURCE_MANIFEST_DEVICE_ROOTS.some(root => path.startsWith(root));
+}
+function assertManifestString(value, field) {
+    if (typeof value !== 'string' || value.length === 0) {
+        throw new Error(`Invalid Pro2 resource manifest ${field}`);
+    }
+    return value;
+}
+function assertManifestRelativePath(value, field) {
+    const path = assertManifestString(value, field);
+    if (path.startsWith('/') ||
+        path.includes('\\') ||
+        path.includes(':') ||
+        path.split('/').some(part => !part || part === '.' || part === '..')) {
+        throw new Error(`Invalid Pro2 resource manifest ${field}`);
+    }
+    return path;
+}
+function parseProtocolV2ResourceManifestFile(value, index) {
+    var _a;
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        throw new Error(`Invalid Pro2 resource manifest files[${index}]`);
+    }
+    const file = value;
+    const archivePath = assertManifestRelativePath(file.archive_path, `files[${index}].archive_path`);
+    const originalName = assertManifestRelativePath(file.original_name, `files[${index}].original_name`);
+    if (originalName.includes('/')) {
+        throw new Error(`Invalid Pro2 resource manifest files[${index}].original_name`);
+    }
+    const devicePath = assertManifestString(file.device_path, `files[${index}].device_path`);
+    if (!isAllowedManifestDevicePath(devicePath)) {
+        throw new Error(`Invalid Pro2 resource manifest files[${index}].device_path`);
+    }
+    if (!Number.isSafeInteger(file.size) || Number(file.size) <= 0) {
+        throw new Error(`Invalid Pro2 resource manifest files[${index}].size`);
+    }
+    const digest = normalizeHex$1(file.sha256, SHA256_HEX_LENGTH, `files[${index}].sha256`);
+    if (file.signed !== true) {
+        throw new Error(`Invalid Pro2 resource manifest files[${index}].signed`);
+    }
+    if (file.sig_algo !== 'ed25519' && file.sig_algo !== 'mldsa65') {
+        throw new Error(`Invalid Pro2 resource manifest files[${index}].sig_algo`);
+    }
+    if (file.payload_version !== null && typeof file.payload_version !== 'string') {
+        throw new Error(`Invalid Pro2 resource manifest files[${index}].payload_version`);
+    }
+    if (!archivePath.endsWith('.okpkg') || !originalName.endsWith('.okpkg')) {
+        throw new Error(`Invalid Pro2 resource manifest files[${index}] package extension`);
+    }
+    return {
+        archive_path: archivePath,
+        original_name: originalName,
+        device_path: devicePath,
+        size: Number(file.size),
+        sha256: digest,
+        signed: true,
+        sig_algo: file.sig_algo,
+        payload_version: (_a = file.payload_version) !== null && _a !== void 0 ? _a : null,
+    };
+}
+function parseProtocolV2ResourceManifest(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        throw new Error('Invalid Pro2 resource manifest');
+    }
+    const manifest = value;
+    if (manifest.schema !== 1 ||
+        manifest.variant !== 'resource' ||
+        manifest.device_root !== 'vol0:' ||
+        manifest.restore_mode !== 'bootloader_update' ||
+        !Array.isArray(manifest.trees) ||
+        !Array.isArray(manifest.files)) {
+        throw new Error('Invalid Pro2 resource manifest contract');
+    }
+    const files = manifest.files.map(parseProtocolV2ResourceManifestFile);
+    const devicePaths = new Set(files.map(file => file.device_path));
+    const archivePaths = new Set(files.map(file => file.archive_path));
+    if (files.length === 0 ||
+        devicePaths.size !== files.length ||
+        archivePaths.size !== files.length ||
+        !devicePaths.has(PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH$1) ||
+        !files.some(file => file.device_path.startsWith('vol0:/bundles/'))) {
+        throw new Error('Invalid Pro2 resource manifest file set');
+    }
+    return {
+        schema: 1,
+        artifact_name: assertManifestString(manifest.artifact_name, 'artifact_name'),
+        release_name: assertManifestString(manifest.release_name, 'release_name'),
+        variant: 'resource',
+        commit: assertManifestString(manifest.commit, 'commit'),
+        short_sha: assertManifestString(manifest.short_sha, 'short_sha'),
+        timestamp_utc: assertManifestString(manifest.timestamp_utc, 'timestamp_utc'),
+        core_version: assertManifestString(manifest.core_version, 'core_version'),
+        key_set: assertManifestString(manifest.key_set, 'key_set'),
+        device_root: 'vol0:',
+        restore_mode: 'bootloader_update',
+        trees: manifest.trees.map((tree, index) => {
+            if (!tree || typeof tree !== 'object') {
+                throw new Error(`Invalid Pro2 resource manifest trees[${index}]`);
+            }
+            const item = tree;
+            return {
+                path: assertManifestRelativePath(item.path, `trees[${index}].path`),
+                device: assertManifestString(item.device, `trees[${index}].device`),
+            };
+        }),
+        files,
+    };
+}
+function selectProtocolV2ResourceManifestFiles({ manifest, targetsToUpdate, }) {
+    const targets = new Set(targetsToUpdate);
+    return manifest.files.filter(file => {
+        if (file.device_path.startsWith('vol0:/bundles/')) {
+            return targets.has('resource');
+        }
+        return targets.has('boot_resources');
+    });
+}
+function resolveProtocolV2ResourceManifestFileUrl({ manifestUrl, archivePath, }) {
+    const url = new URL(assertManifestRelativePath(archivePath, 'archive_path'), manifestUrl);
+    if (url.protocol !== 'https:') {
+        throw new Error('Invalid Pro2 resource manifest file URL');
+    }
+    return url.toString();
+}
+function prepareProtocolV2ResourceFiles({ manifest: value, files, targetsToUpdate, }) {
+    const manifest = parseProtocolV2ResourceManifest(value);
+    const selected = selectProtocolV2ResourceManifestFiles({ manifest, targetsToUpdate });
+    const binaries = new Map(files.map(file => [file.archivePath, file.binary]));
+    return selected.map(file => {
+        const binary = binaries.get(file.archive_path);
+        if (!binary ||
+            !isProtocolV2ResourceFileValid(binary, {
+                size: file.size,
+                fileHash: file.sha256,
+            })) {
+            throw new Error(`Pro2 resource manifest file verification failed: ${file.archive_path}`);
+        }
+        return {
+            binary,
+            devicePath: file.device_path,
+            size: file.size,
+            fileHash: file.sha256,
+        };
+    });
+}
+function bytesToHex$3(bytes) {
+    return Array.from(bytes, byte => byte.toString(16).padStart(2, '0')).join('');
+}
+function isProtocolV2ResourceFileValid(binary, resource) {
+    if (binary.byteLength !== resource.size)
+        return false;
+    return bytesToHex$3(sha256.sha256(new Uint8Array(binary))) === resource.fileHash.toLowerCase();
+}
+
 const bindingError = (message) => {
     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, message, {
         firmwareUpdateCode: 'FirmwareArtifactReaderInvalid',
@@ -1414,6 +1612,7 @@ const createCoreApi = (call) => ({
     getFirmwareUpdateHostBindingGeneration,
     prepareFirmwareUpdatePlan,
     validateFirmwareUpdatePreparedPlan,
+    prepareProtocolV2ResourceFiles,
     getLogs: () => call({ method: 'getLogs' }),
     clearSessionCache: params => call(Object.assign(Object.assign({}, params), { method: 'clearSessionCache' })),
     searchDevices: params => call(Object.assign(Object.assign({}, params), { method: 'searchDevices' })),
@@ -40504,281 +40703,6 @@ const findLatestRelease = (releases) => {
     return leastRelease;
 };
 
-const PROTOCOL_V2_RESOURCE_TYPES = [
-    'images',
-    'animation',
-    'wallpaper',
-    'translations',
-    'roobert',
-    'noto',
-    'firmware_logo',
-];
-const PROTOCOL_V2_RESOURCE_DEVICE_PATHS = {
-    images: 'vol0:/bundles/images/images.okpkg',
-    animation: 'vol0:/bundles/images/animation.okpkg',
-    wallpaper: 'vol0:/bundles/images/wallpaper.okpkg',
-    translations: 'vol0:/bundles/translations/translations.okpkg',
-    roobert: 'vol0:/bundles/font/roobert.okpkg',
-    noto: 'vol0:/bundles/font/noto.okpkg',
-    firmware_logo: 'vol0:/bundles/firmware_logo.okpkg',
-};
-const RESOURCE_TYPE_SET = new Set(PROTOCOL_V2_RESOURCE_TYPES);
-const SHA256_HEX_LENGTH = 64;
-const SHA3_512_HEX_LENGTH = 128;
-const PROTOCOL_V2_OKPP_HEADER_SIZE$1 = 0x52a0;
-const PROTOCOL_V2_OKPP_TYPE_OFFSET = 0x08;
-const PROTOCOL_V2_OKPP_HEADER_LENGTH_OFFSET = 0x0c;
-const PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET$1 = 0x240;
-const PROTOCOL_V2_OKPP_HASH_SIZE$1 = 64;
-const PROTOCOL_V2_RESOURCE_IDENTITY_READ_SIZE = PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET$1 + PROTOCOL_V2_OKPP_HASH_SIZE$1;
-const PROTOCOL_V2_MIN_FILE_READ_CHUNK_SIZE = 64;
-const PROTOCOL_V2_RESOURCE_INVENTORY_TIMEOUT_MS = 5 * 1000;
-function toFiniteNumber(value) {
-    if (typeof value === 'number' && Number.isFinite(value))
-        return value;
-    if (typeof value === 'string') {
-        const numeric = Number(value);
-        return Number.isFinite(numeric) ? numeric : undefined;
-    }
-    if (value && typeof value === 'object') {
-        const longLike = value;
-        if (typeof longLike.toNumber === 'function') {
-            const numeric = longLike.toNumber();
-            return Number.isFinite(numeric) ? numeric : undefined;
-        }
-    }
-    return undefined;
-}
-function toUint8Array(value) {
-    if (value instanceof Uint8Array)
-        return value;
-    if (value instanceof ArrayBuffer)
-        return new Uint8Array(value);
-    if (ArrayBuffer.isView(value)) {
-        return new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
-    }
-    if (typeof value === 'string') {
-        const hex = value.replace(/^0x/i, '');
-        if (!hex || hex.length % 2 !== 0 || /[^0-9a-f]/i.test(hex)) {
-            return new Uint8Array(0);
-        }
-        const bytes = new Uint8Array(hex.length / 2);
-        for (let index = 0; index < bytes.length; index += 1) {
-            bytes[index] = Number.parseInt(hex.slice(index * 2, index * 2 + 2), 16);
-        }
-        return bytes;
-    }
-    return new Uint8Array(0);
-}
-function readAscii(bytes, offset, length) {
-    return Array.from(bytes.slice(offset, offset + length), byte => String.fromCharCode(byte)).join('');
-}
-function parseProtocolV2ResourceHeaderHash(bytes) {
-    if (bytes.byteLength < PROTOCOL_V2_RESOURCE_IDENTITY_READ_SIZE)
-        return undefined;
-    if (readAscii(bytes, 0, 4) !== 'OKPP')
-        return undefined;
-    if (readAscii(bytes, PROTOCOL_V2_OKPP_TYPE_OFFSET, 4) !== 'RESC')
-        return undefined;
-    const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
-    if (view.getUint32(PROTOCOL_V2_OKPP_HEADER_LENGTH_OFFSET, true) !== PROTOCOL_V2_OKPP_HEADER_SIZE$1) {
-        return undefined;
-    }
-    return bytesToHex$3(bytes.slice(PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET$1, PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET$1 + PROTOCOL_V2_OKPP_HASH_SIZE$1));
-}
-function readProtocolV2ResourceIdentity({ commands, resource, chunkSize, timeoutMs = PROTOCOL_V2_RESOURCE_INVENTORY_TIMEOUT_MS, }) {
-    var _a, _b, _c, _d;
-    return __awaiter(this, void 0, void 0, function* () {
-        const path = PROTOCOL_V2_RESOURCE_DEVICE_PATHS[resource.type];
-        const pathInfo = yield commands.typedCall('FilesystemPathInfoQuery', 'FilesystemPathInfo', { path }, { timeoutMs });
-        const size = toFiniteNumber((_a = pathInfo.message) === null || _a === void 0 ? void 0 : _a.size);
-        if (!((_b = pathInfo.message) === null || _b === void 0 ? void 0 : _b.exist) ||
-            ((_c = pathInfo.message) === null || _c === void 0 ? void 0 : _c.directory) ||
-            !Number.isSafeInteger(size) ||
-            size !== resource.size ||
-            size < PROTOCOL_V2_OKPP_HEADER_SIZE$1) {
-            return undefined;
-        }
-        const header = new Uint8Array(PROTOCOL_V2_RESOURCE_IDENTITY_READ_SIZE);
-        let offset = 0;
-        while (offset < header.byteLength) {
-            const readLength = Math.min(chunkSize, header.byteLength - offset);
-            const response = yield commands.typedCall('FilesystemFileRead', 'FilesystemFile', {
-                file: { path, offset, total_size: 0 },
-                chunk_len: readLength,
-            }, { timeoutMs });
-            const data = toUint8Array((_d = response.message) === null || _d === void 0 ? void 0 : _d.data);
-            if (data.byteLength === 0)
-                return undefined;
-            const copied = Math.min(data.byteLength, header.byteLength - offset);
-            header.set(data.subarray(0, copied), offset);
-            offset += copied;
-        }
-        const headerHash = parseProtocolV2ResourceHeaderHash(header);
-        return headerHash ? { type: resource.type, size, headerHash } : undefined;
-    });
-}
-function readProtocolV2ResourceInventory({ commands, resources, chunkSize = hdTransport.PROTOCOL_V2_BLE_FILE_READ_CHUNK_SIZE, timeoutMs = PROTOCOL_V2_RESOURCE_INVENTORY_TIMEOUT_MS, }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const normalizedChunkSize = Number.isFinite(chunkSize)
-            ? Math.max(Math.floor(chunkSize), PROTOCOL_V2_MIN_FILE_READ_CHUNK_SIZE)
-            : hdTransport.PROTOCOL_V2_BLE_FILE_READ_CHUNK_SIZE;
-        const inventory = [];
-        for (const resource of resources) {
-            try {
-                const item = yield readProtocolV2ResourceIdentity({
-                    commands,
-                    resource,
-                    chunkSize: normalizedChunkSize,
-                    timeoutMs,
-                });
-                if (item)
-                    inventory.push(item);
-            }
-            catch (_a) {
-            }
-        }
-        return inventory;
-    });
-}
-function normalizeHex$1(value, expectedLength, field) {
-    if (typeof value !== 'string') {
-        throw new Error(`Invalid Pro2 resource ${field}: expected a hexadecimal string`);
-    }
-    const normalized = value.replace(/^0x/i, '').toLowerCase();
-    if (normalized.length !== expectedLength || !/^[0-9a-f]+$/.test(normalized)) {
-        throw new Error(`Invalid Pro2 resource ${field}: expected ${expectedLength} hexadecimal characters`);
-    }
-    return normalized;
-}
-function validateResource(value, index) {
-    if (!value || typeof value !== 'object') {
-        throw new Error(`Invalid Pro2 resource at stable[${index}]`);
-    }
-    const resource = value;
-    if (typeof resource.type !== 'string' || !RESOURCE_TYPE_SET.has(resource.type)) {
-        throw new Error(`Invalid Pro2 resource type at stable[${index}]`);
-    }
-    if (typeof resource.url !== 'string' || !resource.url.startsWith('https://')) {
-        throw new Error(`Invalid Pro2 resource url at stable[${index}]`);
-    }
-    if (!Number.isSafeInteger(resource.size) || Number(resource.size) <= 0) {
-        throw new Error(`Invalid Pro2 resource size at stable[${index}]`);
-    }
-    return {
-        type: resource.type,
-        url: resource.url,
-        size: Number(resource.size),
-        fileHash: normalizeHex$1(resource.fileHash, SHA256_HEX_LENGTH, 'fileHash'),
-        headerHash: normalizeHex$1(resource.headerHash, SHA3_512_HEX_LENGTH, 'headerHash'),
-    };
-}
-function validateBootResources(value) {
-    if (!value || typeof value !== 'object') {
-        throw new Error('Invalid Pro2 boot resources config');
-    }
-    const resource = value;
-    if (resource.required !== false) {
-        throw new Error('Invalid Pro2 boot resources required flag: expected false');
-    }
-    if (resource.target !== 'RES') {
-        throw new Error('Invalid Pro2 boot resources target: expected RES');
-    }
-    if (resource.manifestUrl !== undefined &&
-        (typeof resource.manifestUrl !== 'string' || !resource.manifestUrl.startsWith('https://'))) {
-        throw new Error('Invalid Pro2 boot resources manifestUrl');
-    }
-    if (!Array.isArray(resource.files) || resource.files.length === 0) {
-        throw new Error('Invalid Pro2 boot resources files');
-    }
-    const files = resource.files.map((value, index) => {
-        if (!value || typeof value !== 'object') {
-            throw new Error(`Invalid Pro2 boot resource file at files[${index}]`);
-        }
-        const file = value;
-        if (typeof file.url !== 'string' || !file.url.startsWith('https://')) {
-            throw new Error(`Invalid Pro2 boot resource url at files[${index}]`);
-        }
-        if (typeof file.devicePath !== 'string' ||
-            !file.devicePath.startsWith('vol0:/') ||
-            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) {
-            throw new Error(`Invalid Pro2 boot resource size at files[${index}]`);
-        }
-        return Object.assign(Object.assign({}, (typeof file.name === 'string' && file.name ? { name: file.name } : undefined)), { url: file.url, devicePath: file.devicePath, size: Number(file.size), fileHash: normalizeHex$1(file.fileHash, SHA256_HEX_LENGTH, `boot files[${index}].fileHash`) });
-    });
-    if (new Set(files.map(file => file.devicePath)).size !== files.length) {
-        throw new Error('Invalid Pro2 boot resources files: duplicate devicePath');
-    }
-    return Object.assign(Object.assign({ required: false, target: 'RES' }, (resource.manifestUrl ? { manifestUrl: resource.manifestUrl } : undefined)), { files });
-}
-function parseProtocolV2Resources(value) {
-    if (value === undefined)
-        return undefined;
-    if (!value ||
-        typeof value !== 'object' ||
-        !Array.isArray(value.stable)) {
-        throw new Error('Invalid Pro2 resources config: stable must be an array');
-    }
-    const config = value;
-    const stable = config.stable.map(validateResource);
-    const types = new Set(stable.map(resource => resource.type));
-    if (stable.length !== PROTOCOL_V2_RESOURCE_TYPES.length || types.size !== stable.length) {
-        throw new Error(`Invalid Pro2 resources config: stable must contain ${PROTOCOL_V2_RESOURCE_TYPES.length} unique resource types`);
-    }
-    for (const type of PROTOCOL_V2_RESOURCE_TYPES) {
-        if (!types.has(type)) {
-            throw new Error(`Invalid Pro2 resources config: stable is missing ${type}`);
-        }
-    }
-    const boot = config.boot === undefined ? undefined : validateBootResources(config.boot);
-    return Object.assign({ stable: PROTOCOL_V2_RESOURCE_TYPES.map(type => {
-            const resource = stable.find(item => item.type === type);
-            if (!resource) {
-                throw new Error(`Invalid Pro2 resources config: stable is missing ${type}`);
-            }
-            return resource;
-        }) }, (boot ? { boot } : undefined));
-}
-function buildProtocolV2ResourceUpdatePlan({ resources, inventory, mode, forced = false, }) {
-    if (forced) {
-        return {
-            status: resources.length > 0 ? 'outdated' : 'valid',
-            resources: [...resources],
-        };
-    }
-    if (!inventory) {
-        return mode === 'bootloader-recovery'
-            ? {
-                status: resources.length > 0 ? 'outdated' : 'valid',
-                resources: [...resources],
-            }
-            : { status: 'unknown', resources: [] };
-    }
-    const inventoryByType = new Map(inventory.map(item => [item.type, item]));
-    const changedResources = resources.filter(resource => {
-        const current = inventoryByType.get(resource.type);
-        return (!current ||
-            current.size !== resource.size ||
-            current.headerHash.toLowerCase() !== resource.headerHash.toLowerCase());
-    });
-    return {
-        status: changedResources.length === 0 ? 'valid' : 'outdated',
-        resources: changedResources,
-    };
-}
-function bytesToHex$3(bytes) {
-    return Array.from(bytes, byte => byte.toString(16).padStart(2, '0')).join('');
-}
-function isProtocolV2ResourceFileValid(binary, resource) {
-    if (binary.byteLength !== resource.size)
-        return false;
-    return bytesToHex$3(sha256.sha256(new Uint8Array(binary))) === resource.fileHash.toLowerCase();
-}
-
 var _a$1;
 const FIRMWARE_UPDATE_CONFIG_FRESHNESS_MS = 5 * 60 * 1000;
 const Log$k = getLogger(exports.LoggerNames.Core);
@@ -40963,13 +40887,9 @@ class DataManager {
             this.lastCheckTimestamp = getTimeStamp();
         });
     }
-    static getProtocolV2Resources(deviceType = hdShared.EDeviceType.Pro2) {
+    static getProtocolV2ResourceSource(deviceType = hdShared.EDeviceType.Pro2) {
         var _b, _c;
-        return (_c = (_b = this.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b.resources) === null || _c === void 0 ? void 0 : _c.stable;
-    }
-    static getProtocolV2BootResources(deviceType = hdShared.EDeviceType.Pro2) {
-        var _b, _c;
-        return (_c = (_b = this.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b.resources) === null || _c === void 0 ? void 0 : _c.boot;
+        return (_c = (_b = this.deviceMap[deviceType]) === null || _b === void 0 ? void 0 : _b.resources) === null || _c === void 0 ? void 0 : _c.source;
     }
     static getProtobufMessages(schema = 'v1CurrentSchema') {
         return this.messages[schema];
@@ -47831,34 +47751,9 @@ class CheckAllFirmwareRelease extends BaseMethod {
                 deviceType: state.identity.deviceType,
             });
             const resourceDeviceType = state.identity.deviceType === 'neo' ? hdShared.EDeviceType.Neo : hdShared.EDeviceType.Pro2;
-            const resources = DataManager.getProtocolV2Resources(resourceDeviceType);
-            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) {
-                    try {
-                        const inventory = yield readProtocolV2ResourceInventory({
-                            commands: this.device.getCommands(),
-                            resources,
-                        });
-                        resourceStatus = buildProtocolV2ResourceUpdatePlan({
-                            resources,
-                            inventory,
-                            mode: 'bootloader-recovery',
-                        }).status;
-                    }
-                    catch (_b) {
-                        resourceStatus = buildProtocolV2ResourceUpdatePlan({
-                            resources,
-                            mode: 'bootloader-recovery',
-                        }).status;
-                    }
-                }
-            }
-            const targetsToUpdate = [
-                ...plan.targetsToUpdate,
-                ...(resourceStatus === 'outdated' ? ['resource'] : []),
-            ];
+            const resourceSource = DataManager.getProtocolV2ResourceSource(resourceDeviceType);
+            const resourceStatus = 'unknown';
+            const targetsToUpdate = [...plan.targetsToUpdate];
             const firmwareStatus = plan.status === 'unavailable' ? 'unknown' : plan.status;
             const emptyRelease = 'none';
             return Object.assign(Object.assign({ firmware: {
@@ -47872,7 +47767,7 @@ class CheckAllFirmwareRelease extends BaseMethod {
                 }, bootloader: {
                     status: 'valid',
                     release: emptyRelease,
-                }, features, protocol: 'V2', deviceType: state.identity.deviceType }, plan), { resourceStatus, hasUpgrade: plan.hasUpgrade || resourceStatus === 'outdated', targetsToUpdate });
+                }, features, protocol: 'V2', deviceType: state.identity.deviceType }, plan), { resourceStatus, resourceManifestUrl: resourceSource === null || resourceSource === void 0 ? void 0 : resourceSource.manifestUrl, hasUpgrade: plan.hasUpgrade, targetsToUpdate });
         });
     }
 }
@@ -51185,6 +51080,14 @@ const PROTOCOL_V2_REMOTE_COMPONENT_TARGETS = {
     },
 };
 const PROTOCOL_V2_FIRMWARE_STAGING_PATHS = new Set(Object.values(PROTOCOL_V2_REMOTE_COMPONENT_TARGETS).map(target => `${PROTOCOL_V2_FIRMWARE_STAGING_VOLUME}${target.fileName}`));
+const PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH = 'vol0:/loaders/bootloader/boot_resource.okpkg';
+const PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_STAGING_PATH = `${PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH}.staging`;
+const resolveProtocolV2ResourceWritePath = (devicePath) => {
+    const normalizedPath = devicePath.replace(/^vol0:(?!\/)/i, 'vol0:/').toLowerCase();
+    return normalizedPath === PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH
+        ? PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_STAGING_PATH
+        : devicePath;
+};
 const PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID = new Map([
     [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER, 'boot'],
     [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1, 'app_v1'],
@@ -51488,7 +51391,7 @@ 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();
@@ -51507,8 +51410,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const hasExplicitResourceFiles = !!((_c = this.params.resourceFiles) === null || _c === void 0 ? void 0 : _c.length);
             const wantsStableResources = !!((_d = this.params.targetsToUpdate) === null || _d === void 0 ? void 0 : _d.includes('resource'));
             const wantsBootResources = !!((_e = this.params.targetsToUpdate) === null || _e === void 0 ? void 0 : _e.includes('boot_resources'));
-            const needsRemoteResources = !hasExplicitResourceFiles && wantsStableResources;
-            const needsRemoteBootResources = !hasExplicitResourceFiles && (wantsBootResources || wantsStableResources);
+            const needsPreparedResources = !hasExplicitResourceFiles && (wantsStableResources || wantsBootResources);
             let fwBinaryMap = [];
             let bootloaderBinary = null;
             let installItems;
@@ -51519,17 +51421,20 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 fwBinaryMap = this.collectExplicitTargetBinaries();
                 bootloaderBinary = this.prepareBootloaderBinary();
                 const needsRemoteFirmware = !this.hasExplicitProtocolV2Payload(fwBinaryMap);
-                if ((needsRemoteFirmware || needsRemoteResources || needsRemoteBootResources) &&
+                if (needsPreparedResources) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 resource manifest must be prepared by the external firmware host', {
+                        firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
+                    });
+                }
+                if (needsRemoteFirmware &&
                     (this.params.artifactReader ||
                         DataManager.getSettings('firmwareManifestMode') === 'external-only')) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 firmware artifacts must be prepared by the external firmware host', {
                         firmwareUpdateCode: 'FirmwareArtifactsNotPrepared',
                     });
                 }
-                if (needsRemoteFirmware || needsRemoteResources || needsRemoteBootResources) {
-                    yield DataManager.forceReloadData({
-                        requireResources: needsRemoteResources || needsRemoteBootResources,
-                    });
+                if (needsRemoteFirmware) {
+                    yield DataManager.forceReloadData();
                 }
                 if (needsRemoteFirmware) {
                     const remoteBinaries = yield this.prepareRemoteProtocolV2Binaries(firmwareType, deviceFeatures);
@@ -51537,15 +51442,15 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                     fwBinaryMap = remoteBinaries.fwBinaryMap;
                     installItems = remoteBinaries.installItems;
                 }
-                const bootResourceFiles = yield this.prepareProtocolV2BootResources();
-                if (bootResourceFiles === null || bootResourceFiles === void 0 ? void 0 : bootResourceFiles.length) {
-                    resourceBundles = this.mergeProtocolV2ResourceBundles(resourceBundles, bootResourceFiles);
-                }
-                if (!needsRemoteResources) {
-                    this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
-                }
+                this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
             }
             catch (err) {
+                if (typeof err === 'object' &&
+                    err !== null &&
+                    'params' in err &&
+                    ((_f = err.params) === null || _f === void 0 ? void 0 : _f.firmwareUpdateCode) === 'FirmwareArtifactsNotPrepared') {
+                    throw err;
+                }
                 if (err instanceof hdShared.HardwareError && err.errorCode === hdShared.HardwareErrorCode.NetworkError) {
                     throw err;
                 }
@@ -51554,29 +51459,9 @@ 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) &&
-                !needsRemoteResources) {
+                !(resourceBundles === null || resourceBundles === void 0 ? void 0 : resourceBundles.length)) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareUpdateDownloadFailed, 'No firmware to update');
             }
-            if (needsRemoteResources) {
-                const enteredBootloader = yield this.enterProtocolV2BootloaderMode();
-                try {
-                    const stableResources = yield this.prepareProtocolV2ResourceBundles();
-                    resourceBundles = this.mergeProtocolV2ResourceBundles(resourceBundles, stableResources);
-                    this.postTipMessage(exports.FirmwareUpdateTipMessage.FinishDownloadFirmware);
-                }
-                catch (err) {
-                    if (enteredBootloader) {
-                        try {
-                            yield this.exitProtocolV2BootloaderToNormal();
-                        }
-                        catch (restoreError) {
-                            Log$6.warn('[FirmwareUpdateV4] failed to restore App mode after resource preparation error:', restoreError);
-                        }
-                    }
-                    throw normalizeFirmwarePreparationError(err);
-                }
-            }
             return this.executeProtocolV2Update(Object.assign(Object.assign({ fwBinaryMap,
                 bootloaderBinary }, (installItems ? { installItems } : undefined)), ((resourceBundles === null || resourceBundles === void 0 ? void 0 : resourceBundles.length) ? { resourceBundles } : undefined)));
         });
@@ -51984,102 +51869,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             };
         });
     }
-    getProtocolV2DeviceType() {
-        const deviceType = this.device.getCurrentDeviceType();
-        if (deviceType === hdShared.EDeviceType.Pro2 || deviceType === hdShared.EDeviceType.Neo)
-            return deviceType;
-        throw new Error(`Unsupported Protocol V2 device type: ${deviceType}`);
-    }
-    prepareProtocolV2BootResources() {
-        var _a, _b, _c, _d, _e;
-        return __awaiter(this, void 0, void 0, function* () {
-            const wantsStableResources = !!((_a = this.params.targetsToUpdate) === null || _a === void 0 ? void 0 : _a.includes('resource'));
-            const wantsBootResources = !!((_b = this.params.targetsToUpdate) === null || _b === void 0 ? void 0 : _b.includes('boot_resources'));
-            if (!wantsStableResources && !wantsBootResources) {
-                return undefined;
-            }
-            if ((_c = this.params.resourceFiles) === null || _c === void 0 ? void 0 : _c.length) {
-                return undefined;
-            }
-            const resource = DataManager.getProtocolV2BootResources(this.getProtocolV2DeviceType());
-            if (!resource) {
-                if (wantsBootResources) {
-                    throw new Error('Missing Protocol V2 boot resources configuration');
-                }
-                Log$6.debug('[FirmwareUpdateV4] no boot resources configured; continue with stable resources');
-                return undefined;
-            }
-            const files = [];
-            for (const file of resource.files) {
-                const isCurrent = !this.params.forcedUpdateRes && (yield this.isProtocolV2BootResourceCurrent(file));
-                if (isCurrent) {
-                    Log$6.log(`[FirmwareUpdateV4] boot resource unchanged, skipping ${file.devicePath}`);
-                }
-                else {
-                    Log$6.log(`[FirmwareUpdateV4] downloading boot resource ${file.devicePath}`);
-                    const { binary } = yield getSysResourceBinary(file.url);
-                    if (!isProtocolV2ResourceFileValid(binary, file)) {
-                        throw new Error(`Boot resource file verification failed: ${file.devicePath}`);
-                    }
-                    files.push({
-                        name: (_e = (_d = file.name) !== null && _d !== void 0 ? _d : file.devicePath.split('/').pop()) !== null && _e !== void 0 ? _e : file.devicePath,
-                        binary,
-                        devicePath: file.devicePath,
-                    });
-                }
-            }
-            return files;
-        });
-    }
-    isProtocolV2BootResourceCurrent(file) {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const commands = this.device.getCommands();
-                const pathInfo = yield commands.typedCall('FilesystemPathInfoQuery', 'FilesystemPathInfo', { path: file.devicePath }, { timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT });
-                const size = toProtocolV2FiniteNumber((_a = pathInfo.message) === null || _a === void 0 ? void 0 : _a.size);
-                if (!((_b = pathInfo.message) === null || _b === void 0 ? void 0 : _b.exist) ||
-                    ((_c = pathInfo.message) === null || _c === void 0 ? void 0 : _c.directory) ||
-                    !Number.isSafeInteger(size) ||
-                    size !== file.size) {
-                    return false;
-                }
-                const digest = sha256.sha256.create();
-                const chunkSize = this.getProtocolV2FirmwareChunkSize('write');
-                let offset = 0;
-                while (offset < file.size) {
-                    const response = yield commands.typedCall('FilesystemFileRead', 'FilesystemFile', {
-                        file: { path: file.devicePath, offset, total_size: 0 },
-                        chunk_len: Math.min(chunkSize, file.size - offset),
-                    }, { timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT });
-                    const data = toProtocolV2Bytes((_d = response.message) === null || _d === void 0 ? void 0 : _d.data);
-                    if (data.byteLength === 0)
-                        return false;
-                    const consumed = data.subarray(0, Math.min(data.byteLength, file.size - offset));
-                    digest.update(consumed);
-                    offset += consumed.byteLength;
-                }
-                return bytesToHex(digest.digest()) === normalizeProtocolV2Hex(file.fileHash);
-            }
-            catch (error) {
-                Log$6.debug(`[FirmwareUpdateV4] unable to compare boot resource ${file.devicePath}; scheduling rewrite`, error);
-                return false;
-            }
-        });
-    }
-    mergeProtocolV2ResourceBundles(...groups) {
-        const merged = groups.flatMap(group => group !== null && group !== void 0 ? group : []);
-        if (!merged.length)
-            return undefined;
-        const seenPaths = new Set();
-        for (const bundle of merged) {
-            if (seenPaths.has(bundle.devicePath)) {
-                throw new Error(`Duplicate Protocol V2 resource devicePath: ${bundle.devicePath}`);
-            }
-            seenPaths.add(bundle.devicePath);
-        }
-        return merged;
-    }
     prepareExplicitProtocolV2ResourceFiles() {
         var _a;
         const files = (_a = this.params.resourceFiles) !== null && _a !== void 0 ? _a : [];
@@ -52110,52 +51899,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         }
         return prepared;
     }
-    prepareProtocolV2ResourceBundles() {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!((_a = this.params.targetsToUpdate) === null || _a === void 0 ? void 0 : _a.includes('resource'))) {
-                return undefined;
-            }
-            const resources = DataManager.getProtocolV2Resources(this.getProtocolV2DeviceType());
-            if (!(resources === null || resources === void 0 ? void 0 : resources.length)) {
-                throw new Error('Missing Pro2 stable resource configuration');
-            }
-            const inventory = this.params.forcedUpdateRes
-                ? undefined
-                : yield readProtocolV2ResourceInventory({
-                    commands: this.device.getCommands(),
-                    resources,
-                    chunkSize: this.getProtocolV2FirmwareChunkSize('write'),
-                    timeoutMs: PROTOCOL_V2_SHORT_RESPONSE_TIMEOUT,
-                });
-            const plan = buildProtocolV2ResourceUpdatePlan({
-                resources,
-                inventory,
-                mode: 'bootloader-recovery',
-                forced: this.params.forcedUpdateRes,
-            });
-            Log$6.log(`[FirmwareUpdateV4] Protocol V2 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));
-            }
-            return bundles;
-        });
-    }
-    downloadProtocolV2Resource(resource) {
-        return __awaiter(this, void 0, void 0, function* () {
-            Log$6.log(`[FirmwareUpdateV4] downloading Pro2 resource ${resource.type}`);
-            const { binary } = yield getSysResourceBinary(resource.url);
-            if (!isProtocolV2ResourceFileValid(binary, resource)) {
-                throw new Error(`Pro2 resource file verification failed: ${resource.type}`);
-            }
-            return {
-                name: `${resource.type}.okpkg`,
-                binary,
-                devicePath: PROTOCOL_V2_RESOURCE_DEVICE_PATHS[resource.type],
-            };
-        });
-    }
     getProtocolV2ResourceFilePath(path) {
         if (path.startsWith('vol'))
             return path;
@@ -52347,13 +52090,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
     }
     buildProtocolV2ExecutionPhases({ installSources, resourceSources, }) {
         const phases = [];
-        if (resourceSources.length > 0) {
-            phases.push({
-                kind: 'resource-sync',
-                installSources: [],
-                resourceSources,
-            });
-        }
         const bootloaderSources = installSources.filter(source => source.kind === 'bootloader');
         if (bootloaderSources.length > 0) {
             phases.push({
@@ -52366,6 +52102,13 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 resourceSources: [],
             });
         }
+        if (resourceSources.length > 0) {
+            phases.push({
+                kind: 'resource-sync',
+                installSources: [],
+                resourceSources,
+            });
+        }
         const componentSources = installSources.filter(source => source.kind !== 'bootloader');
         if (componentSources.length > 0) {
             phases.push({
@@ -52464,13 +52207,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             this.postTipMessage(exports.FirmwareUpdateTipMessage.StartTransferData);
             let processedSize = 0;
             for (const resource of resourcesToSync) {
+                const writePath = resolveProtocolV2ResourceWritePath(resource.devicePath);
                 processedSize = yield this.protocolV2SourceUpdateProcess({
                     source: resource.source,
-                    filePath: resource.devicePath,
+                    filePath: writePath,
                     processedSize,
                     totalSize,
                 });
-                yield this.verifyProtocolV2StagedFile(resource.devicePath, resource.source.size);
+                yield this.verifyProtocolV2StagedFile(writePath, resource.source.size);
             }
             const stagedInstallTargets = [];
             for (const item of installSources) {
@@ -53460,7 +53204,7 @@ class DeviceUploadWallpaper extends BaseMethod {
 }
 
 const FILESYSTEM_PATH_INFO_QUERY_MESSAGE_TYPE = 60802;
-const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
+const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE$1 = 60805;
 const FILESYSTEM_DIR_LIST_MESSAGE_TYPE = 60808;
 const NFT_UPDATE_MESSAGE_TYPE = 61500;
 class DeviceUploadNft extends BaseMethod {
@@ -53489,7 +53233,7 @@ class DeviceUploadNft extends BaseMethod {
     assertCapabilities() {
         return __awaiter(this, void 0, void 0, function* () {
             const protocolInfo = yield this.device.ensureProtocolV2RuntimeContext();
-            const hasFileWrite = supportsProtocolV2Message(protocolInfo, FILESYSTEM_FILE_WRITE_MESSAGE_TYPE);
+            const hasFileWrite = supportsProtocolV2Message(protocolInfo, FILESYSTEM_FILE_WRITE_MESSAGE_TYPE$1);
             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);
@@ -53624,6 +53368,8 @@ class FileWrite extends BaseMethod {
 
 const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.okpkg.pending';
 const PORTFOLIO_CHUNK_SIZE = 2048;
+const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
+const PORTFOLIO_UPDATE_MESSAGE_TYPE = 61400;
 class UploadPortfolio extends FileWrite {
     init() {
         const { packageBytes, timeoutMs } = this.payload;
@@ -53637,6 +53383,12 @@ class UploadPortfolio extends FileWrite {
             run: { get: () => super.run }
         });
         return __awaiter(this, void 0, void 0, function* () {
+            const protocolInfo = yield this.device.ensureProtocolV2RuntimeContext();
+            const hasFileWrite = supportsProtocolV2Message(protocolInfo, FILESYSTEM_FILE_WRITE_MESSAGE_TYPE);
+            const hasPortfolioUpdate = supportsProtocolV2Message(protocolInfo, PORTFOLIO_UPDATE_MESSAGE_TYPE);
+            if (!hasFileWrite || !hasPortfolioUpdate) {
+                throw hdShared.createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
+            }
             const stagedFile = yield _super.run.call(this);
             this.throwIfAborted();
             yield this.device.commands.typedCall('PortfolioUpdate', 'Success', {});
@@ -65178,11 +64930,15 @@ exports.normalizeSafetyCheckLevel = normalizeSafetyCheckLevel;
 exports.normalizeVersionArray = normalizeVersionArray;
 exports.parseConnectSettings = parseConnectSettings;
 exports.parseMessage = parseMessage;
+exports.parseProtocolV2ResourceManifest = parseProtocolV2ResourceManifest;
 exports.patchFeatures = patchFeatures;
 exports.preloadSessionCache = preloadSessionCache;
+exports.prepareProtocolV2ResourceFiles = prepareProtocolV2ResourceFiles;
 exports.projectDeviceStateFeatures = projectFeatures;
 exports.registerFirmwareUpdateHostBinding = registerFirmwareUpdateHostBinding;
+exports.resolveProtocolV2ResourceManifestFileUrl = resolveProtocolV2ResourceManifestFileUrl;
 exports.safeThrowError = safeThrowError;
+exports.selectProtocolV2ResourceManifestFiles = selectProtocolV2ResourceManifestFiles;
 exports.setLoggerPostMessage = setLoggerPostMessage;
 exports.supportInputPinOnSoftware = supportInputPinOnSoftware;
 exports.switchTransport = switchTransport;