@onekeyfe/hd-core 1.2.0-alpha.141 → 1.2.0-alpha.143

package/dist/index.js

@@ -40675,18 +40675,16 @@ const findLatestRelease = (releases) => {
     return leastRelease;
 };
 
-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;
-}
+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 PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE = 0x5f90;
+const PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_VERSION = 1;
+const PROTOCOL_V2_RESOURCE_PACKAGE_FLEXIBLE_OFFSET = 0x6c;
+const PROTOCOL_V2_RESOURCE_PACKAGE_FLEXIBLE_SIZE = 64;
+const PROTOCOL_V2_RESOURCE_PACKAGE_PAYLOAD_HASH_OFFSET = 0x200;
+const PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_HASH_OFFSET = 0x240;
+const PROTOCOL_V2_RESOURCE_PACKAGE_HASH_SIZE = 64;
+const PROTOCOL_V2_RESOURCE_PACKAGE_TYPE = 'RESC';
 function parseProtocolV2Resources(value) {
     if (value === undefined)
         return undefined;
@@ -40715,86 +40713,75 @@ function parseProtocolV2Resources(value) {
         },
     };
 }
-const PROTOCOL_V2_RESOURCE_MANIFEST_DEVICE_ROOTS = [
-    'vol0:/bundles/',
-    'vol0:/loaders/rom/',
-];
-function isAllowedManifestDevicePath(path) {
-    if (!path.endsWith('.okpkg') ||
-        path.includes('\\') ||
+const PROTOCOL_V2_RESOURCE_DEVICE_ROOTS = ['vol0:/bundles/', 'vol0:/loaders/rom/'];
+function isAllowedResourceDevicePath(path) {
+    if (path.includes('\\') ||
         path.includes('//') ||
+        [...path].some(char => {
+            const code = char.charCodeAt(0);
+            return code <= 0x1f || code === 0x7f;
+        }) ||
         path.split('/').some(part => part === '.' || part === '..')) {
         return false;
     }
-    if (path === PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH$1) {
+    if (path === PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_STAGING_PATH) {
         return true;
     }
-    return PROTOCOL_V2_RESOURCE_MANIFEST_DEVICE_ROOTS.some(root => path.startsWith(root));
+    return (path.endsWith('.okpkg') && PROTOCOL_V2_RESOURCE_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 readAscii(bytes, offset, length) {
+    return Array.from(bytes.slice(offset, offset + length))
+        .map(byte => String.fromCharCode(byte))
+        .join('');
 }
-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}`);
+function readResourceDevicePath(bytes) {
+    const metadata = bytes.slice(PROTOCOL_V2_RESOURCE_PACKAGE_FLEXIBLE_OFFSET, PROTOCOL_V2_RESOURCE_PACKAGE_FLEXIBLE_OFFSET + PROTOCOL_V2_RESOURCE_PACKAGE_FLEXIBLE_SIZE);
+    const terminator = metadata.indexOf(0);
+    const pathBytes = terminator === -1 ? metadata : metadata.slice(0, terminator);
+    const padding = terminator === -1 ? new Uint8Array(0) : metadata.slice(terminator);
+    if (pathBytes.byteLength === 0 ||
+        Array.from(pathBytes).some(byte => byte < 0x20 || byte > 0x7e) ||
+        Array.from(padding).some(byte => byte !== 0)) {
+        throw new Error('Invalid Pro2 RESOURCE package device path metadata');
+    }
+    const path = readAscii(pathBytes, 0, pathBytes.byteLength);
+    if (!isAllowedResourceDevicePath(path)) {
+        throw new Error(`Invalid Pro2 RESOURCE package device path: ${path}`);
     }
     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 = file.original_name === undefined
-        ? (_a = archivePath.split('/').pop()) !== null && _a !== void 0 ? _a : archivePath
-        : 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 (!archivePath.endsWith('.okpkg') || !originalName.endsWith('.okpkg')) {
-        throw new Error(`Invalid Pro2 resource manifest files[${index}] package extension`);
-    }
-    return Object.assign(Object.assign(Object.assign({ archive_path: archivePath, original_name: originalName, device_path: devicePath, size: Number(file.size), sha256: digest }, (file.signed === undefined ? {} : { signed: file.signed })), (file.sig_algo === undefined ? {} : { sig_algo: file.sig_algo })), (file.payload_version === undefined ? {} : { payload_version: file.payload_version }));
-}
-function parseProtocolV2ResourceManifest(value) {
-    if (!value || typeof value !== 'object' || Array.isArray(value)) {
-        throw new Error('Invalid Pro2 resource manifest');
-    }
-    const manifest = value;
-    if (!Array.isArray(manifest.files)) {
-        throw new Error('Invalid Pro2 resource manifest files');
+function parseProtocolV2ResourcePackageHeader(bytes, packageSize) {
+    if (bytes.byteLength < PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE) {
+        throw new Error('Pro2 RESOURCE package is shorter than its header');
     }
-    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) {
-        throw new Error('Invalid Pro2 resource manifest file set');
+    const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+    const headerVersion = view.getUint32(0x04, true);
+    const headerLength = view.getUint32(0x0c, true);
+    const payloadLength = view.getUint32(0x14, true);
+    if (readAscii(bytes, 0, 4) !== 'OKPP' ||
+        readAscii(bytes, 0x08, 4) !== PROTOCOL_V2_RESOURCE_PACKAGE_TYPE ||
+        headerVersion !== PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_VERSION ||
+        headerLength !== PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE ||
+        payloadLength <= 0 ||
+        headerLength + payloadLength !== packageSize) {
+        throw new Error('Invalid Pro2 RESOURCE package header');
     }
+    const packedVersion = view.getUint32(0x10, true);
     return {
-        files,
+        version: [
+            Math.floor(packedVersion / 0x10000) % 0x100,
+            Math.floor(packedVersion / 0x100) % 0x100,
+            packedVersion % 0x100,
+        ],
+        payloadLength,
+        devicePath: readResourceDevicePath(bytes),
+        payloadHash: utils.bytesToHex(bytes.slice(PROTOCOL_V2_RESOURCE_PACKAGE_PAYLOAD_HASH_OFFSET, PROTOCOL_V2_RESOURCE_PACKAGE_PAYLOAD_HASH_OFFSET + PROTOCOL_V2_RESOURCE_PACKAGE_HASH_SIZE)),
+        headerHash: utils.bytesToHex(bytes.slice(PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_HASH_OFFSET, PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_HASH_OFFSET + PROTOCOL_V2_RESOURCE_PACKAGE_HASH_SIZE)),
     };
 }
-function selectProtocolV2ResourceManifestFiles({ manifest, targetsToUpdate, }) {
-    return targetsToUpdate.includes('resource') ? [...manifest.files] : [];
+function parseProtocolV2ResourcePackage(binary) {
+    const bytes = binary instanceof Uint8Array ? binary : new Uint8Array(binary);
+    return parseProtocolV2ResourcePackageHeader(bytes, bytes.byteLength);
 }
 
 var _a$1;
@@ -51771,17 +51758,8 @@ const PROTOCOL_V2_TRANSFER_PROGRESS_HEARTBEAT_MS = 1000;
 const PROTOCOL_V2_INSTALL_STATUS_CONFLICT_CODE = 'FirmwareInstallStatusConflict';
 const PROTOCOL_V2_INSTALL_FAILED_CODE = 'FirmwareInstallFailed';
 const PROTOCOL_V2_INSTALL_TIMEOUT_CODE = 'FirmwareInstallTimeout';
-const PROTOCOL_V2_OKPP_HEADER_SIZE = 0x52a0;
-const PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET = 0x200;
-const PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET = 0x240;
-const PROTOCOL_V2_OKPP_HASH_SIZE = 64;
-const PROTOCOL_V2_RESOURCE_MANIFEST_MAX_BYTES = 1024 * 1024;
 const PROTOCOL_V2_RESOURCE_FILE_MAX_COUNT = 512;
 const PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES = 256 * 1024 * 1024;
-const getProtocolV2LocalResourceArchivePath = (entryName) => {
-    const match = entryName.match(/(?:^|\/)((?:bundles\/|loaders\/(?:bootloader|rom)\/).+\.okpkg)$/iu);
-    return match === null || match === void 0 ? void 0 : match[1];
-};
 const PROTOCOL_V2_NEO_UNSUPPORTED_TARGETS = new Set(['se03', 'se04']);
 const getProtocolV2ZipEntrySizes = (entry) => {
     var _a;
@@ -51875,14 +51853,8 @@ 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 isProtocolV2BootResourcePackagePath = (devicePath) => typeof devicePath === 'string' &&
-    devicePath.replace(/^vol0:(?!\/)/i, 'vol0:/').toLowerCase() ===
-        PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH;
-const resolveProtocolV2ResourceWritePath = (devicePath) => isProtocolV2BootResourcePackagePath(devicePath)
-    ? PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_STAGING_PATH
-    : devicePath;
+    devicePath.toLowerCase() === PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_STAGING_PATH;
 const PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID = new Map([
     [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_BOOTLOADER, 'boot'],
     [ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_APPLICATION_P1, 'app_v1'],
@@ -52008,30 +51980,6 @@ const toProtocolV2FiniteNumber = (value) => {
     }
     return undefined;
 };
-const readProtocolV2Ascii = (bytes, offset, length) => Array.from(bytes.slice(offset, offset + length))
-    .map(byte => String.fromCharCode(byte))
-    .join('');
-const parseProtocolV2OkppHeader = (bytes) => {
-    if (bytes.byteLength < PROTOCOL_V2_OKPP_HEADER_SIZE)
-        return null;
-    if (readProtocolV2Ascii(bytes, 0, 4) !== 'OKPP')
-        return null;
-    const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
-    const headerLen = view.getUint32(0x0c, true);
-    if (headerLen !== PROTOCOL_V2_OKPP_HEADER_SIZE)
-        return null;
-    const packedVersion = view.getUint32(0x10, true);
-    return {
-        type: readProtocolV2Ascii(bytes, 0x08, 4),
-        version: [
-            Math.floor(packedVersion / 0x10000) % 0x100,
-            Math.floor(packedVersion / 0x100) % 0x100,
-            packedVersion % 0x100,
-        ],
-        payloadHash: bytesToHex(bytes.slice(PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET, PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET + PROTOCOL_V2_OKPP_HASH_SIZE)),
-        headerHash: bytesToHex(bytes.slice(PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET, PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET + PROTOCOL_V2_OKPP_HASH_SIZE)),
-    };
-};
 const isProtocolV2FirmwareFingerprintValid = (binary, fingerprint) => {
     const expectedFingerprint = normalizeProtocolV2Hex(fingerprint);
     if (!expectedFingerprint)
@@ -52539,7 +52487,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     prepareProtocolV2LocalResourceArchive(binary) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (binary.byteLength <= 0 || binary.byteLength > PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource ZIP archive size is invalid', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
@@ -52548,91 +52495,47 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             try {
                 zip = yield JSZip__default["default"].loadAsync(binary);
             }
-            catch (_b) {
+            catch (_a) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 resource ZIP cannot be parsed', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
             }
             const zipEntries = Object.values(zip.files);
-            if (zipEntries.some(entry => entry.unsafeOriginalName && entry.unsafeOriginalName !== entry.name)) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource ZIP contains an unsafe entry path', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-            }
-            const entries = zipEntries.filter(entry => !entry.dir);
-            if (entries.length === 0) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource ZIP entry set is invalid', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-            }
-            const manifestEntry = entries.find(entry => entry.name.split('/').pop() === 'manifest.json');
-            let manifestBinary;
-            let manifestDirectory = '';
-            let selectedFiles;
-            if (manifestEntry) {
-                if (getProtocolV2ZipEntrySizes(manifestEntry).uncompressedSize >
-                    PROTOCOL_V2_RESOURCE_MANIFEST_MAX_BYTES) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource manifest size is invalid', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-                }
-                manifestBinary = yield manifestEntry.async('arraybuffer');
-                if (manifestBinary.byteLength <= 0 ||
-                    manifestBinary.byteLength > PROTOCOL_V2_RESOURCE_MANIFEST_MAX_BYTES) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource manifest size is invalid', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-                }
-                let manifestValue;
-                try {
-                    manifestValue = JSON.parse(new TextDecoder().decode(manifestBinary));
-                }
-                catch (error) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 local resource manifest is invalid: ${String(error)}`, { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-                }
-                selectedFiles = selectProtocolV2ResourceManifestFiles({
-                    manifest: parseProtocolV2ResourceManifest(manifestValue),
-                    targetsToUpdate: (_a = this.params.targetsToUpdate) !== null && _a !== void 0 ? _a : [],
-                });
-                manifestDirectory = manifestEntry.name.slice(0, -'manifest.json'.length);
-            }
-            else {
-                selectedFiles = entries.flatMap(entry => {
-                    var _a;
-                    const archivePath = getProtocolV2LocalResourceArchivePath(entry.name);
-                    if (!archivePath)
-                        return [];
-                    return [
-                        {
-                            archive_path: archivePath,
-                            original_name: (_a = archivePath.split('/').pop()) !== null && _a !== void 0 ? _a : archivePath,
-                            device_path: `vol0:/${archivePath}`,
-                            size: getProtocolV2ZipEntrySizes(entry).uncompressedSize,
-                            sha256: '',
-                        },
-                    ];
-                });
-            }
-            if (selectedFiles.length === 0 || selectedFiles.length > PROTOCOL_V2_RESOURCE_FILE_MAX_COUNT) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 local resource ZIP has no resource packages', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
+            const resourceEntries = zipEntries.filter(entry => !entry.dir && entry.name.toLowerCase().endsWith('.okpkg'));
+            if (resourceEntries.length === 0 ||
+                resourceEntries.length > PROTOCOL_V2_RESOURCE_FILE_MAX_COUNT) {
+                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 resource ZIP has no valid resource package set', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
             }
             let totalSize = 0;
             const materializedEntries = [];
-            const normalizedFiles = [];
-            for (const file of selectedFiles) {
-                const entry = manifestEntry
-                    ? zip.file(`${manifestDirectory}${file.archive_path}`)
-                    : entries.find(candidate => getProtocolV2LocalResourceArchivePath(candidate.name) === file.archive_path);
-                if (!entry) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 local resource ZIP is missing ${file.archive_path}`, { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-                }
-                const { uncompressedSize } = getProtocolV2ZipEntrySizes(entry);
+            const resources = [];
+            const devicePaths = new Set();
+            for (const entry of resourceEntries) {
+                const { compressedSize, uncompressedSize } = getProtocolV2ZipEntrySizes(entry);
                 totalSize += uncompressedSize;
-                if (uncompressedSize !== file.size || totalSize > PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 local resource file declared size is invalid: ${file.archive_path}`, { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
+                if (compressedSize > binary.byteLength ||
+                    uncompressedSize > PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES ||
+                    totalSize > PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 resource package size is invalid: ${entry.name}`, { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
                 }
                 const fileBinary = yield entry.async('arraybuffer');
-                const digest = bytesToHex(sha256.sha256(new Uint8Array(fileBinary)));
-                if (fileBinary.byteLength !== file.size ||
-                    (file.sha256 && digest !== file.sha256.toLowerCase())) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 local resource file does not match manifest: ${file.archive_path}`, { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' });
+                if (fileBinary.byteLength !== uncompressedSize) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 resource package is incomplete: ${entry.name}`, { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' });
+                }
+                let header;
+                try {
+                    header = parseProtocolV2ResourcePackage(fileBinary);
+                }
+                catch (error) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 resource package is invalid: ${entry.name}: ${String(error)}`, { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
                 }
-                normalizedFiles.push(Object.assign(Object.assign({}, file), { sha256: digest }));
-                materializedEntries.push({ entryName: file.archive_path, binary: fileBinary });
+                const canonicalDevicePath = header.devicePath.toLowerCase();
+                if (devicePaths.has(canonicalDevicePath)) {
+                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 resource ZIP contains duplicate device path: ${header.devicePath}`, { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
+                }
+                devicePaths.add(canonicalDevicePath);
+                materializedEntries.push({ entryName: entry.name, binary: fileBinary });
+                resources.push({ entryName: entry.name, binary: fileBinary, header });
             }
-            manifestBinary !== null && manifestBinary !== void 0 ? manifestBinary : (manifestBinary = new TextEncoder().encode(JSON.stringify({ files: normalizedFiles })).buffer);
-            materializedEntries.unshift({ entryName: 'manifest.json', binary: manifestBinary });
-            return { binary, materializedEntries };
+            return { binary, materializedEntries, resources };
         });
     }
     prepareProtocolV2ResourceSources() {
@@ -52678,48 +52581,17 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource archive does not match its approved receipt', { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' });
             }
             const verifiedArchive = yield this.prepareProtocolV2LocalResourceArchive(archiveBinary);
-            const verifiedEntriesByName = new Map(verifiedArchive.materializedEntries.map(entry => [entry.entryName, entry.binary]));
-            const manifestBinary = verifiedEntriesByName.get('manifest.json');
-            if (!manifestBinary) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource archive has no valid manifest.json', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-            }
-            let manifestValue;
-            try {
-                manifestValue = JSON.parse(new TextDecoder().decode(manifestBinary));
-            }
-            catch (error) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 prepared resource manifest is invalid: ${String(error)}`, { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-            }
-            const manifest = parseProtocolV2ResourceManifest(manifestValue);
-            const selectedFiles = selectProtocolV2ResourceManifestFiles({
-                manifest,
-                targetsToUpdate: (_c = this.params.targetsToUpdate) !== null && _c !== void 0 ? _c : [],
-            });
-            if (selectedFiles.length > PROTOCOL_V2_RESOURCE_FILE_MAX_COUNT) {
-                throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource archive contains too many files', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-            }
-            let totalSize = 0;
             const sources = [];
-            for (const [index, file] of selectedFiles.entries()) {
-                const binary = verifiedEntriesByName.get(file.archive_path);
-                if (!binary || binary.byteLength !== file.size) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, `Protocol V2 prepared resource file does not match manifest: ${file.archive_path}`, { firmwareUpdateCode: 'FirmwareArtifactReceiptMismatch' });
-                }
-                totalSize += binary.byteLength;
-                if (totalSize > PROTOCOL_V2_RESOURCE_TOTAL_MAX_BYTES) {
-                    throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 prepared resource archive exceeds the total size limit', { firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' });
-                }
-                const source = yield this.openProtocolV2MemorySource(binary);
-                const header = source.size >= PROTOCOL_V2_OKPP_HEADER_SIZE
-                    ? parseProtocolV2OkppHeader(new Uint8Array(yield source.readAt(0, PROTOCOL_V2_OKPP_HEADER_SIZE)))
-                    : null;
-                sources.push(Object.assign({ name: file.original_name || `resource-${index}`, source, devicePath: file.device_path }, (header
-                    ? {
-                        version: header.version,
-                        payloadHash: header.payloadHash,
-                        headerHash: header.headerHash,
-                    }
-                    : {})));
+            for (const resource of verifiedArchive.resources) {
+                const source = yield this.openProtocolV2MemorySource(resource.binary);
+                sources.push({
+                    name: (_c = resource.entryName.split('/').pop()) !== null && _c !== void 0 ? _c : resource.entryName,
+                    source,
+                    devicePath: resource.header.devicePath,
+                    version: resource.header.version,
+                    payloadHash: resource.header.payloadHash,
+                    headerHash: resource.header.headerHash,
+                });
             }
             return sources;
         });
@@ -52784,11 +52656,11 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             return;
         const features = this.protocolV2LatestFinalFeatures;
         const deviceInfo = this.protocolV2LatestFinalDeviceInfo;
-        const requestedTargets = this.getProtocolV2RequestedTargets();
-        const applicationTargets = requestedTargets.filter(target => target === 'app_v1' || target === 'app_v2');
         const visibleVersions = {
             boot: features ? getDeviceBootloaderVersion(features).join('.') : undefined,
-            app_v1: (_c = (_b = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _b === void 0 ? void 0 : _b.application) === null || _c === void 0 ? void 0 : _c.version,
+            app_v1: features
+                ? getDeviceFirmwareVersion(features).join('.')
+                : (_c = (_b = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _b === void 0 ? void 0 : _b.application) === null || _c === void 0 ? void 0 : _c.version,
             app_v2: (_e = (_d = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.main_mcu) === null || _d === void 0 ? void 0 : _d.application_data) === null || _e === void 0 ? void 0 : _e.version,
             coprocessor: features ? getDeviceBLEFirmwareVersion(features).join('.') : undefined,
             se01: (_f = features === null || features === void 0 ? void 0 : features.se01Version) !== null && _f !== void 0 ? _f : undefined,
@@ -52796,9 +52668,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             se03: (_h = features === null || features === void 0 ? void 0 : features.se03Version) !== null && _h !== void 0 ? _h : undefined,
             se04: (_j = features === null || features === void 0 ? void 0 : features.se04Version) !== null && _j !== void 0 ? _j : undefined,
         };
-        if (features && applicationTargets.length === 1 && !visibleVersions[applicationTargets[0]]) {
-            visibleVersions[applicationTargets[0]] = getDeviceFirmwareVersion(features).join('.');
-        }
         const expectedEntries = Object.entries(expected).filter(([target]) => !targets || targets.includes(target));
         for (const [target, expectedVersion] of expectedEntries) {
             const targetId = (_k = Array.from(PROTOCOL_V2_UPDATE_TARGET_BY_TARGET_ID.entries()).find(([, mappedTarget]) => mappedTarget === target)) === null || _k === void 0 ? void 0 : _k[0];
@@ -52807,14 +52676,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 ? visibleVersions[target]
                 : `${Math.floor(statusVersion / 0x10000) % 0x100}.${Math.floor(statusVersion / 0x100) % 0x100}.${statusVersion % 0x100}`;
             if (!observedVersion) {
-                const requestedTargetIds = requestedTargets.flatMap(requestedTarget => {
-                    if (requestedTarget === 'resource' || requestedTarget === 'boot_resources')
-                        return [];
-                    const installTarget = PROTOCOL_V2_INSTALL_TARGET_BY_UPDATE_TARGET.get(requestedTarget);
-                    return installTarget ? [installTarget.targetId] : [];
-                });
-                const hasCompleteTargetEvidence = requestedTargetIds.length > 0 &&
-                    requestedTargetIds.every(targetId => this.protocolV2CompletedTargetIds.has(targetId));
+                const hasCompleteTargetEvidence = targetId !== undefined && this.protocolV2CompletedTargetIds.has(targetId);
                 if (hasCompleteTargetEvidence) {
                     Log$7.warn(`Protocol V2 target ${target} has no observable final version; install completion is authoritative`);
                 }
@@ -52827,34 +52689,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             }
         }
     }
-    getProtocolV2RequestedTargets() {
-        var _a, _b, _c;
-        if ((_a = this.params.targetsToUpdate) === null || _a === void 0 ? void 0 : _a.length) {
-            return [...new Set(this.params.targetsToUpdate)];
-        }
-        if ((_b = this.params.preparedPlan) === null || _b === void 0 ? void 0 : _b.targetsToUpdate.length) {
-            return [...new Set(this.params.preparedPlan.targetsToUpdate)];
-        }
-        const targets = new Set();
-        Object.keys((_c = this.params.componentArtifacts) !== null && _c !== void 0 ? _c : {}).forEach(target => targets.add(target));
-        if (this.params.bootloaderBinary)
-            targets.add('boot');
-        if (this.params.applicationP1Binary)
-            targets.add('app_v1');
-        if (this.params.applicationP2Binary)
-            targets.add('app_v2');
-        if (this.params.coprocessorBinary)
-            targets.add('coprocessor');
-        if (this.params.se01Binary)
-            targets.add('se01');
-        if (this.params.se02Binary)
-            targets.add('se02');
-        if (this.params.se03Binary)
-            targets.add('se03');
-        if (this.params.se04Binary)
-            targets.add('se04');
-        return Array.from(targets);
-    }
     getProtocolV2DeviceFeatures() {
         return __awaiter(this, void 0, void 0, function* () {
             let { features } = this.device;
@@ -53139,15 +52973,15 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if (!((_b = pathInfoRes.message) === null || _b === void 0 ? void 0 : _b.exist) ||
                 ((_c = pathInfoRes.message) === null || _c === void 0 ? void 0 : _c.directory) ||
                 fileSize === undefined ||
-                fileSize < PROTOCOL_V2_OKPP_HEADER_SIZE ||
+                fileSize < PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE ||
                 (expectedSize !== undefined && fileSize !== expectedSize)) {
                 return null;
             }
             const chunkSize = this.getProtocolV2FirmwareChunkSize('read');
             const chunks = [];
             let offset = 0;
-            while (offset < PROTOCOL_V2_OKPP_HEADER_SIZE) {
-                const readLen = Math.min(chunkSize, PROTOCOL_V2_OKPP_HEADER_SIZE - offset);
+            while (offset < PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE) {
+                const readLen = Math.min(chunkSize, PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE - offset);
                 const res = yield typedCall('FilesystemFileRead', 'FilesystemFile', {
                     file: {
                         path: filePath,
@@ -53169,7 +53003,12 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 headerBytes.set(chunk, cursor);
                 cursor += chunk.byteLength;
             });
-            return parseProtocolV2OkppHeader(headerBytes);
+            try {
+                return parseProtocolV2ResourcePackageHeader(headerBytes, fileSize);
+            }
+            catch (_e) {
+                return null;
+            }
         });
     }
     isProtocolV2ResourceBundleUpToDate(bundle) {
@@ -53395,7 +53234,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             this.protocolV2LastTransferProgressAt = 0;
             let processedSize = 0;
             for (const resource of resourcesToSync) {
-                const writePath = resolveProtocolV2ResourceWritePath(resource.devicePath);
+                const writePath = resource.devicePath;
                 processedSize = yield this.protocolV2SourceUpdateProcess({
                     source: resource.source,
                     filePath: writePath,
@@ -65669,8 +65508,10 @@ function canSkipInitialize(method, device) {
     return true;
 }
 function isRetryableBleProtocolV2ProbeError(method, error) {
-    const message = error instanceof Error ? error.message : String(error !== null && error !== void 0 ? error : '');
+    const typedError = error;
+    const message = typeof (typedError === null || typedError === void 0 ? void 0 : typedError.message) === 'string' ? typedError.message : String(error !== null && error !== void 0 ? error : '');
     return (method.payload.connectProtocol === 'V2' &&
+        (typedError === null || typedError === void 0 ? void 0 : typedError.errorCode) === hdShared.HardwareErrorCode.RuntimeError &&
         message.includes('Device protocol mismatch') &&
         message.includes('expected V2') &&
         message.includes('did not respond to expected protocol'));
@@ -66409,14 +66250,12 @@ exports.normalizeSafetyCheckLevel = normalizeSafetyCheckLevel;
 exports.normalizeVersionArray = normalizeVersionArray;
 exports.parseConnectSettings = parseConnectSettings;
 exports.parseMessage = parseMessage;
-exports.parseProtocolV2ResourceManifest = parseProtocolV2ResourceManifest;
 exports.patchFeatures = patchFeatures;
 exports.preloadSessionCache = preloadSessionCache;
 exports.prepareFirmwareUpdateV4MemoryHost = prepareFirmwareUpdateV4MemoryHost;
 exports.projectDeviceStateFeatures = projectFeatures;
 exports.registerFirmwareUpdateHostBinding = registerFirmwareUpdateHostBinding;
 exports.safeThrowError = safeThrowError;
-exports.selectProtocolV2ResourceManifestFiles = selectProtocolV2ResourceManifestFiles;
 exports.setLoggerPostMessage = setLoggerPostMessage;
 exports.supportInputPinOnSoftware = supportInputPinOnSoftware;
 exports.switchTransport = switchTransport;

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

@@ -1,12 +1,16 @@
-import type { IProtocolV2ResourceManifest, IProtocolV2ResourceManifestFile, IProtocolV2Resources } from '../../types';
-import type { FirmwareUpdateV4Target } from '../../types/api/firmwareUpdate';
+import type { IProtocolV2Resources, IVersionArray } from '../../types';
 export declare const PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_PATH = "vol0:/loaders/bootloader/boot_resource.okpkg";
 export declare const PROTOCOL_V2_BOOT_RESOURCE_PACKAGE_STAGING_PATH: string;
 export declare const PROTOCOL_V2_ROM_PARAMS_PACKAGE_PATH = "vol0:/loaders/rom/params.okpkg";
+export declare const PROTOCOL_V2_RESOURCE_PACKAGE_HEADER_SIZE = 24464;
 export declare function parseProtocolV2Resources(value: unknown): IProtocolV2Resources | undefined;
-export declare function parseProtocolV2ResourceManifest(value: unknown): IProtocolV2ResourceManifest;
-export declare function selectProtocolV2ResourceManifestFiles({ manifest, targetsToUpdate, }: {
-    manifest: IProtocolV2ResourceManifest;
-    targetsToUpdate: readonly FirmwareUpdateV4Target[];
-}): IProtocolV2ResourceManifestFile[];
+export type ProtocolV2ResourcePackageHeader = {
+    version: IVersionArray;
+    payloadLength: number;
+    devicePath: string;
+    payloadHash: string;
+    headerHash: string;
+};
+export declare function parseProtocolV2ResourcePackageHeader(bytes: Uint8Array, packageSize: number): ProtocolV2ResourcePackageHeader;
+export declare function parseProtocolV2ResourcePackage(binary: ArrayBuffer | Uint8Array): ProtocolV2ResourcePackageHeader;
 //# sourceMappingURL=resources.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/resources.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,2BAA2B,EAC3B,+BAA+B,EAC/B,oBAAoB,EACrB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAE7E,eAAO,MAAM,sCAAsC,iDACH,CAAC;AACjD,eAAO,MAAM,8CAA8C,QAAsD,CAAC;AAClH,eAAO,MAAM,mCAAmC,mCAAmC,CAAC;AAkBpF,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,GAAG,SAAS,CA8BzF;AAiFD,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,OAAO,GAAG,2BAA2B,CAqB3F;AAED,wBAAgB,qCAAqC,CAAC,EACpD,QAAQ,EACR,eAAe,GAChB,EAAE;IACD,QAAQ,EAAE,2BAA2B,CAAC;IACtC,eAAe,EAAE,SAAS,sBAAsB,EAAE,CAAC;CACpD,GAAG,+BAA+B,EAAE,CAEpC"}
+{"version":3,"file":"resources.d.ts","sourceRoot":"","sources":["../../../src/protocols/protocol-v2/resources.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEvE,eAAO,MAAM,sCAAsC,iDACH,CAAC;AACjD,eAAO,MAAM,8CAA8C,QAAsD,CAAC;AAClH,eAAO,MAAM,mCAAmC,mCAAmC,CAAC;AACpF,eAAO,MAAM,wCAAwC,QAAS,CAAC;AAW/D,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,GAAG,SAAS,CA8BzF;AAoDD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,OAAO,EAAE,aAAa,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,oCAAoC,CAClD,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,MAAM,GAClB,+BAA+B,CAyCjC;AAED,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,WAAW,GAAG,UAAU,GAC/B,+BAA+B,CAGjC"}

package/dist/types/settings.d.ts

@@ -43,19 +43,6 @@ export type IProtocolV2ResourceSource = {
 export type IProtocolV2Resources = {
     source: IProtocolV2ResourceSource;
 };
-export type IProtocolV2ResourceManifestFile = {
-    archive_path: string;
-    original_name?: string;
-    device_path: string;
-    size: number;
-    sha256: string;
-    signed?: boolean;
-    sig_algo?: string;
-    payload_version?: string | null;
-};
-export type IProtocolV2ResourceManifest = {
-    files: IProtocolV2ResourceManifestFile[];
-};
 export type IFirmwareReleaseInfo = {
     required: boolean;
     url: string;