@onekeyfe/hd-core 1.2.0-alpha.102 → 1.2.0-alpha.103

package/dist/index.js

@@ -7,13 +7,14 @@ var sha256 = require('@noble/hashes/sha256');
 var utils = require('@noble/hashes/utils');
 var semver = require('semver');
 var hdTransport = require('@onekeyfe/hd-transport');
-var buffer = require('buffer');
 var axios = require('axios');
 var lodash = require('lodash');
 var ByteBuffer = require('bytebuffer');
 var blake2s = require('@noble/hashes/blake2s');
 var BigNumber = require('bignumber.js');
 var JSZip = require('jszip');
+var buffer = require('buffer');
+var jpegJs = require('jpeg-js');
 var sha3 = require('@noble/hashes/sha3');
 var blake2b = require('@noble/hashes/blake2b');
 
@@ -2219,132 +2220,14 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
   }
 }
 
-const BRIDGE_BINARY_PAYLOAD_MARKER = '__onekey_hd_bridge_binary_payload__';
-const BASE64_PATTERN = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
-const invalidBinaryPayload = (message) => hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, message);
-function isPlainObject(value) {
-    if (!value || typeof value !== 'object' || Array.isArray(value))
-        return false;
-    const prototype = Object.getPrototypeOf(value);
-    return prototype === Object.prototype || prototype === null;
-}
-function isArrayBufferValue(value) {
-    return Boolean(typeof ArrayBuffer !== 'undefined' &&
-        (value instanceof ArrayBuffer ||
-            Object.prototype.toString.call(value) === '[object ArrayBuffer]'));
-}
-function isBlobValue(value) {
-    return Boolean(typeof Blob !== 'undefined' &&
-        (value instanceof Blob || Object.prototype.toString.call(value) === '[object Blob]') &&
-        typeof value.arrayBuffer === 'function');
-}
-function readBinaryPayload(value) {
-    if (!isPlainObject(value) || !(BRIDGE_BINARY_PAYLOAD_MARKER in value))
-        return undefined;
-    const payload = value;
-    if (payload[BRIDGE_BINARY_PAYLOAD_MARKER] !== 1 ||
-        (payload.type !== 'array-buffer' && payload.type !== 'uint8-array') ||
-        typeof payload.data !== 'string') {
-        throw invalidBinaryPayload('Invalid bridge binary payload');
-    }
-    return payload;
-}
-function bytesToPayload(bytes, type) {
-    return {
-        [BRIDGE_BINARY_PAYLOAD_MARKER]: 1,
-        data: buffer.Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength).toString('base64'),
-        type,
-    };
-}
-function payloadToBytes(payload) {
-    if (payload.data.length % 4 !== 0 || !BASE64_PATTERN.test(payload.data)) {
-        throw invalidBinaryPayload('Invalid bridge binary payload data');
-    }
-    const decoded = buffer.Buffer.from(payload.data, 'base64');
-    if (decoded.toString('base64') !== payload.data) {
-        throw invalidBinaryPayload('Invalid bridge binary payload data');
-    }
-    return Uint8Array.from(decoded);
-}
-function encodeValue(value, seen) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (isArrayBufferValue(value)) {
-            return bytesToPayload(new Uint8Array(value), 'array-buffer');
-        }
-        if (typeof ArrayBuffer !== 'undefined' && ArrayBuffer.isView(value)) {
-            return bytesToPayload(new Uint8Array(value.buffer, value.byteOffset, value.byteLength), 'uint8-array');
-        }
-        if (isBlobValue(value)) {
-            return bytesToPayload(new Uint8Array(yield value.arrayBuffer()), 'uint8-array');
-        }
-        const encodedPayload = readBinaryPayload(value);
-        if (encodedPayload)
-            return encodedPayload;
-        if (Array.isArray(value)) {
-            if (seen.has(value))
-                throw invalidBinaryPayload('Circular bridge payload');
-            seen.add(value);
-            try {
-                const encoded = [];
-                for (const item of value) {
-                    encoded.push(yield encodeValue(item, seen));
-                }
-                return encoded.some((item, index) => item !== value[index]) ? encoded : value;
-            }
-            finally {
-                seen.delete(value);
-            }
-        }
-        if (!isPlainObject(value))
-            return value;
-        if (seen.has(value))
-            throw invalidBinaryPayload('Circular bridge payload');
-        seen.add(value);
-        try {
-            const entries = [];
-            for (const [key, item] of Object.entries(value)) {
-                entries.push([key, yield encodeValue(item, seen)]);
-            }
-            return entries.some(([key, item]) => item !== value[key]) ? Object.fromEntries(entries) : value;
-        }
-        finally {
-            seen.delete(value);
-        }
-    });
-}
-function decodeValue(value) {
-    const payload = readBinaryPayload(value);
-    if (payload) {
-        const bytes = payloadToBytes(payload);
-        return payload.type === 'array-buffer' ? bytes.buffer : bytes;
-    }
-    if (Array.isArray(value)) {
-        const decoded = value.map(decodeValue);
-        return decoded.some((item, index) => item !== value[index]) ? decoded : value;
-    }
-    if (!isPlainObject(value))
-        return value;
-    const entries = Object.entries(value).map(([key, item]) => [key, decodeValue(item)]);
-    return entries.some(([key, item]) => item !== value[key]) ? Object.fromEntries(entries) : value;
-}
-function encodeBridgeBinaryPayload(value) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return encodeValue(value, new WeakSet());
-    });
-}
-function decodeBridgeBinaryPayload(value) {
-    return decodeValue(value);
-}
-
 const eventEmitter = new events.exports();
 const topLevelInject = () => {
     let lowLevelApi;
-    const call = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const call = (params) => {
         if (!lowLevelApi)
             return Promise.resolve(undefined);
-        const encodedParams = yield encodeBridgeBinaryPayload(params);
-        return lowLevelApi.call(encodedParams);
-    });
+        return lowLevelApi.call(params);
+    };
     const protocolAwareCall = createProtocolAwareCall(call);
     const api = Object.assign(Object.assign({ on: (type, fn) => {
             eventEmitter.on(type, fn);
@@ -42841,18 +42724,14 @@ function getCompletePro2NftBasenames(childFiles) {
 function utf8Length(value) {
     return new TextEncoder().encode(value).byteLength;
 }
-function assertImage(name, image, expectedWidth, expectedHeight) {
-    if (image.width !== expectedWidth || image.height !== expectedHeight) {
-        throw invalidParameter$1(`Pro2 NFT ${name} dimensions must be ${expectedWidth}x${expectedHeight}.`);
+function buildPro2NftBundleFromEncodedImages(options) {
+    const { image, thumbnail, title, subtitle, timestampMs } = options;
+    if (!(image instanceof Uint8Array) || image.byteLength === 0) {
+        throw invalidParameter$1('Parameter [image] must contain encoded NFT image data.');
     }
-    if (!(image.rgba instanceof ArrayBuffer) && !ArrayBuffer.isView(image.rgba)) {
-        throw invalidParameter$1(`Parameter [${name}.rgba] must be an ArrayBuffer or Uint8Array.`);
+    if (!(thumbnail instanceof Uint8Array) || thumbnail.byteLength === 0) {
+        throw invalidParameter$1('Parameter [thumbnail] must contain encoded NFT thumbnail data.');
     }
-}
-function buildPro2NftBundle(options) {
-    const { image, thumbnail, title, subtitle, timestampMs } = options;
-    assertImage('image', image, PRO2_NFT_IMAGE_WIDTH, PRO2_NFT_IMAGE_HEIGHT);
-    assertImage('thumbnail', thumbnail, PRO2_NFT_THUMBNAIL_WIDTH, PRO2_NFT_THUMBNAIL_HEIGHT);
     const titleLength = typeof title === 'string' ? utf8Length(title) : 0;
     const subtitleLength = typeof subtitle === 'string' ? utf8Length(subtitle) : Number.POSITIVE_INFINITY;
     if (titleLength < 1 || titleLength > 63) {
@@ -42864,17 +42743,15 @@ function buildPro2NftBundle(options) {
     if (!Number.isSafeInteger(timestampMs) || timestampMs <= 0) {
         throw invalidParameter$1('Parameter [timestampMs] must be a positive safe integer.');
     }
-    const encodedImage = encodePro2Image(Object.assign(Object.assign({}, image), { alphaMode: 'black-background' })).data;
-    const encodedThumbnail = encodePro2Image(Object.assign(Object.assign({}, thumbnail), { alphaMode: 'black-background' })).data;
     const metadata = new TextEncoder().encode(JSON.stringify({ title, subtitle }));
     if (metadata.byteLength === 0 || metadata.byteLength > 512) {
         throw invalidParameter$1('Pro2 NFT metadata must contain 1 to 512 UTF-8 bytes.');
     }
-    const hash8 = utils.bytesToHex(blake2s.blake2s(encodedImage)).slice(0, 8);
+    const hash8 = utils.bytesToHex(blake2s.blake2s(image)).slice(0, 8);
     return {
         basename: `nft-${hash8}-${timestampMs}`,
-        image: encodedImage,
-        thumbnail: encodedThumbnail,
+        image,
+        thumbnail,
         metadata,
     };
 }
@@ -54094,6 +53971,61 @@ class DeviceGetOnboardingStatus extends BaseMethod {
     }
 }
 
+const BASE64_PATTERN = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
+const JPEG_CONTAINER_OVERHEAD_BYTES = 64 * 1024;
+const JPEG_MAX_MEMORY_USAGE_IN_MB = 32;
+const JPEG_MAX_RESOLUTION_IN_MP = 1;
+function decodeCanonicalBase64({ value, parameterName, maxBytes, }) {
+    if (typeof value !== 'string' || value.length === 0) {
+        throw invalidParameter$1(`Parameter [${parameterName}] must be a non-empty Base64 string.`);
+    }
+    if (value.length > Math.ceil(maxBytes / 3) * 4) {
+        throw invalidParameter$1(`Parameter [${parameterName}] exceeds the maximum supported size.`);
+    }
+    if (value.length % 4 !== 0 || !BASE64_PATTERN.test(value)) {
+        throw invalidParameter$1(`Parameter [${parameterName}] must use canonical Base64 encoding.`);
+    }
+    const decoded = buffer.Buffer.from(value, 'base64');
+    if (decoded.byteLength === 0 || decoded.byteLength > maxBytes) {
+        throw invalidParameter$1(`Parameter [${parameterName}] exceeds the maximum supported size.`);
+    }
+    if (decoded.toString('base64') !== value) {
+        throw invalidParameter$1(`Parameter [${parameterName}] must use canonical Base64 encoding.`);
+    }
+    return Uint8Array.from(decoded);
+}
+function decodeJpegBase64ToRgba({ jpegBase64, parameterName, expectedWidth, expectedHeight, }) {
+    const jpegBytes = decodeCanonicalBase64({
+        value: jpegBase64,
+        parameterName,
+        maxBytes: expectedWidth * expectedHeight * 8 + JPEG_CONTAINER_OVERHEAD_BYTES,
+    });
+    if (jpegBytes[0] !== 0xff || jpegBytes[1] !== 0xd8) {
+        throw invalidParameter$1(`Parameter [${parameterName}] must contain a JPEG image.`);
+    }
+    let decoded;
+    try {
+        decoded = jpegJs.decode(jpegBytes, {
+            useTArray: true,
+            formatAsRGBA: true,
+            tolerantDecoding: false,
+            maxResolutionInMP: JPEG_MAX_RESOLUTION_IN_MP,
+            maxMemoryUsageInMB: JPEG_MAX_MEMORY_USAGE_IN_MB,
+        });
+    }
+    catch (_a) {
+        throw invalidParameter$1(`Parameter [${parameterName}] must contain a valid JPEG image.`);
+    }
+    if (decoded.width !== expectedWidth || decoded.height !== expectedHeight) {
+        throw invalidParameter$1(`Parameter [${parameterName}] must contain a ${expectedWidth}x${expectedHeight} JPEG image.`);
+    }
+    const expectedLength = expectedWidth * expectedHeight * 4;
+    if (decoded.data.byteLength !== expectedLength) {
+        throw invalidParameter$1(`Decoded parameter [${parameterName}] must contain ${expectedLength} RGBA bytes.`);
+    }
+    return decoded;
+}
+
 const Log$4 = getLogger(exports.LoggerNames.Core);
 const MIN_FILE_CHUNK_SIZE = 64;
 const FILE_TRANSFER_RATE_WINDOW_MS = 1000;
@@ -54370,6 +54302,9 @@ function writeProtocolV2File(options) {
 
 const WALLPAPER_DIRECTORY = 'vol1:/wallpapers';
 const SAFE_FILE_NAME = /^[A-Za-z0-9_-]+(?:\.bin)?$/;
+const DEVICE_SETTINGS_SET_MESSAGE_TYPE = 60412;
+const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE$2 = 60805;
+const FILESYSTEM_DIR_MAKE_MESSAGE_TYPE = 60809;
 function normalizeFileName(fileName, data) {
     if (fileName !== undefined && (!fileName || !SAFE_FILE_NAME.test(fileName))) {
         throw invalidParameter$1('Parameter [fileName] may only contain letters, numbers, underscores, hyphens and an optional .bin suffix.');
@@ -54388,26 +54323,40 @@ class DeviceUploadWallpaper extends BaseMethod {
         return ['V2'];
     }
     init() {
-        const { width, height, rgba, fileName, chunkSize } = this.payload;
-        if (width !== PRO2_WALLPAPER_WIDTH || height !== PRO2_WALLPAPER_HEIGHT) {
-            throw invalidParameter$1(`Pro2 wallpaper dimensions must be ${PRO2_WALLPAPER_WIDTH}x${PRO2_WALLPAPER_HEIGHT}.`);
-        }
-        if (!(rgba instanceof ArrayBuffer) && !ArrayBuffer.isView(rgba)) {
-            throw invalidParameter$1('Parameter [rgba] must be an ArrayBuffer or Uint8Array.');
-        }
+        const { jpegBase64, fileName, chunkSize } = this.payload;
         if (chunkSize !== undefined && (!Number.isInteger(chunkSize) || chunkSize <= 0)) {
             throw invalidParameter$1('Parameter [chunkSize] must be a positive integer.');
         }
-        const rgbaBytes = rgba instanceof ArrayBuffer
-            ? rgba
-            : new Uint8Array(rgba.buffer, rgba.byteOffset, rgba.byteLength);
-        this.encoded = encodePro2Wallpaper({ width, height, rgba: rgbaBytes });
+        const decoded = decodeJpegBase64ToRgba({
+            jpegBase64,
+            parameterName: 'jpegBase64',
+            expectedWidth: PRO2_WALLPAPER_WIDTH,
+            expectedHeight: PRO2_WALLPAPER_HEIGHT,
+        });
+        this.encoded = encodePro2Wallpaper({
+            width: PRO2_WALLPAPER_WIDTH,
+            height: PRO2_WALLPAPER_HEIGHT,
+            rgba: decoded.data,
+        });
         this.path = `${WALLPAPER_DIRECTORY}/${normalizeFileName(fileName, this.encoded.data)}`;
-        this.params = { width, height, rgba: rgbaBytes, fileName, chunkSize };
+        this.params = { jpegBase64, fileName, chunkSize };
         this.unlockPolicy = 'none';
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
     }
+    assertCapabilities() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const protocolInfo = yield this.device.ensureProtocolV2RuntimeContext();
+            const requiredMessageTypes = [
+                DEVICE_SETTINGS_SET_MESSAGE_TYPE,
+                FILESYSTEM_FILE_WRITE_MESSAGE_TYPE$2,
+                FILESYSTEM_DIR_MAKE_MESSAGE_TYPE,
+            ];
+            if (requiredMessageTypes.some(messageType => !supportsProtocolV2Message(protocolInfo, messageType))) {
+                throw hdShared.createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
+            }
+        });
+    }
     ensureDirectory() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.directoryReady)
@@ -54457,6 +54406,7 @@ class DeviceUploadWallpaper extends BaseMethod {
             const { encoded } = this;
             if (!encoded)
                 throw invalidParameter$1('Wallpaper data has not been initialized.');
+            yield this.assertCapabilities();
             yield this.ensureDirectory();
             yield this.upload();
             const response = yield this.device.commands.typedCall('DeviceSettingsSet', 'Success', {
@@ -54481,7 +54431,7 @@ class DeviceUploadNft extends BaseMethod {
         return ['V2'];
     }
     init() {
-        const { image, thumbnail, title, subtitle, timestampMs = Date.now(), chunkSize = PRO2_NFT_DEFAULT_CHUNK_SIZE, paceMs = PRO2_NFT_DEFAULT_PACE_MS, timeoutMs = PRO2_NFT_DEFAULT_TIMEOUT_MS, } = this.payload;
+        const { imageJpegBase64, thumbnailJpegBase64, title, subtitle, timestampMs = Date.now(), chunkSize = PRO2_NFT_DEFAULT_CHUNK_SIZE, paceMs = PRO2_NFT_DEFAULT_PACE_MS, timeoutMs = PRO2_NFT_DEFAULT_TIMEOUT_MS, } = this.payload;
         if (!Number.isInteger(chunkSize) ||
             chunkSize < PRO2_NFT_MIN_CHUNK_SIZE ||
             chunkSize > PRO2_NFT_MAX_CHUNK_SIZE) {
@@ -54493,8 +54443,51 @@ class DeviceUploadNft extends BaseMethod {
         if (!Number.isInteger(timeoutMs) || timeoutMs <= 0) {
             throw invalidParameter$1('Parameter [timeoutMs] must be a positive integer.');
         }
-        this.bundle = buildPro2NftBundle({ image, thumbnail, title, subtitle, timestampMs });
-        this.params = { image, thumbnail, title, subtitle, timestampMs, chunkSize, paceMs, timeoutMs };
+        const encodedImage = (() => {
+            const decoded = decodeJpegBase64ToRgba({
+                jpegBase64: imageJpegBase64,
+                parameterName: 'imageJpegBase64',
+                expectedWidth: PRO2_NFT_IMAGE_WIDTH,
+                expectedHeight: PRO2_NFT_IMAGE_HEIGHT,
+            });
+            return encodePro2Image({
+                width: PRO2_NFT_IMAGE_WIDTH,
+                height: PRO2_NFT_IMAGE_HEIGHT,
+                rgba: decoded.data,
+                alphaMode: 'black-background',
+            }).data;
+        })();
+        const encodedThumbnail = (() => {
+            const decoded = decodeJpegBase64ToRgba({
+                jpegBase64: thumbnailJpegBase64,
+                parameterName: 'thumbnailJpegBase64',
+                expectedWidth: PRO2_NFT_THUMBNAIL_WIDTH,
+                expectedHeight: PRO2_NFT_THUMBNAIL_HEIGHT,
+            });
+            return encodePro2Image({
+                width: PRO2_NFT_THUMBNAIL_WIDTH,
+                height: PRO2_NFT_THUMBNAIL_HEIGHT,
+                rgba: decoded.data,
+                alphaMode: 'black-background',
+            }).data;
+        })();
+        this.bundle = buildPro2NftBundleFromEncodedImages({
+            image: encodedImage,
+            thumbnail: encodedThumbnail,
+            title,
+            subtitle,
+            timestampMs,
+        });
+        this.params = {
+            imageJpegBase64,
+            thumbnailJpegBase64,
+            title,
+            subtitle,
+            timestampMs,
+            chunkSize,
+            paceMs,
+            timeoutMs,
+        };
         this.unlockPolicy = 'none';
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
@@ -54637,11 +54630,17 @@ class FileWrite extends BaseMethod {
 
 const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.okpkg.pending';
 const PORTFOLIO_CHUNK_SIZE = 2048;
+const PORTFOLIO_PACKAGE_MAX_BYTES = 128 * 1024;
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
 const PORTFOLIO_UPDATE_MESSAGE_TYPE = 61400;
 class UploadPortfolio extends FileWrite {
     init() {
-        const { packageBytes, timeoutMs } = this.payload;
+        const { packageBase64, timeoutMs } = this.payload;
+        const packageBytes = decodeCanonicalBase64({
+            value: packageBase64,
+            parameterName: 'packageBase64',
+            maxBytes: PORTFOLIO_PACKAGE_MAX_BYTES,
+        });
         this.payload = Object.assign(Object.assign({}, this.payload), { path: PORTFOLIO_PENDING_PATH, offset: 0, data: packageBytes, chunkSize: PORTFOLIO_CHUNK_SIZE, overwrite: true, append: false, emitProgress: false, timeoutMs });
         super.init();
         this.unlockPolicy = 'none';
@@ -64541,15 +64540,13 @@ var ApiMethods = /*#__PURE__*/Object.freeze({
 
 const publicMethodRegistry = ApiMethods;
 function findMethod(message) {
-    const payload = decodeBridgeBinaryPayload(message.payload);
-    const normalizedMessage = payload === message.payload ? message : Object.assign(Object.assign({}, message), { payload });
-    const { method } = payload;
+    const { method } = message.payload;
     if (typeof method !== 'string') {
         throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, 'Method is not set');
     }
     const MethodConstructor = publicMethodRegistry[method];
     if (MethodConstructor) {
-        return new MethodConstructor(normalizedMessage);
+        return new MethodConstructor(message);
     }
     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.CallMethodInvalidParameter, `Method ${method} is not set`);
 }

package/dist/topLevelInject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"topLevelInject.d.ts","sourceRoot":"","sources":["../src/topLevelInject.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAG3C,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CACvB;AAID,eAAO,MAAM,cAAc,eAqD1B,CAAC"}
+{"version":3,"file":"topLevelInject.d.ts","sourceRoot":"","sources":["../src/topLevelInject.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAG3C,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CACvB;AAID,eAAO,MAAM,cAAc,eAoD1B,CAAC"}

package/dist/types/api/protocolV2.d.ts

@@ -24,7 +24,7 @@ export declare function deviceGetOnboardingStatus(connectId: string, params?: Co
 export declare function deviceUploadWallpaper(connectId: string, params: CommonParams & DeviceUploadWallpaperParams): Response<DeviceUploadWallpaperResponse>;
 export declare function deviceUploadNft(connectId: string, params: CommonParams & DeviceUploadNftParams): Response<DeviceUploadNftResponse>;
 export declare function uploadPortfolio(connectId: string, params: {
-    packageBytes: ArrayBuffer | Uint8Array | Blob;
+    packageBase64: string;
     timeoutMs?: number | string;
 }): Response<FileInfo & {
     portfolioUpdated: true;

package/dist/types/api/protocolV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocolV2.d.ts","sourceRoot":"","sources":["../../../src/types/api/protocolV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,KAAK,EACV,2BAA2B,EAC3B,6BAA6B,EAC9B,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EACV,qBAAqB,EACrB,uBAAuB,EACxB,MAAM,uCAAuC,CAAC;AAG/C,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACzF,YAAY,EACV,2BAA2B,EAC3B,6BAA6B,GAC9B,MAAM,6CAA6C,CAAC;AACrD,YAAY,EACV,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,uCAAuC,CAAC;AAI/C,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAIF,MAAM,MAAM,wBAAwB,GAAG,YAAY,GAAG;IAEpD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,wBAAwB,GAChC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,YAAY,CAClC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,kBAAkB,GACxC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAC/C,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,YAAY,GACpB,QAAQ,CAAC,gBAAgB,CAAC,CAAC;AAE9B,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAC3C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,2BAA2B,GACjD,QAAQ,CAAC,6BAA6B,CAAC,CAAC;AAE3C,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,qBAAqB,GAC3C,QAAQ,CAAC,uBAAuB,CAAC,CAAC;AAErC,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;IACN,YAAY,EAAE,WAAW,GAAG,UAAU,GAAG,IAAI,CAAC;IAC9C,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,GACA,QAAQ,CAAC,QAAQ,GAAG;IAAE,gBAAgB,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC"}
+{"version":3,"file":"protocolV2.d.ts","sourceRoot":"","sources":["../../../src/types/api/protocolV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,KAAK,EACV,2BAA2B,EAC3B,6BAA6B,EAC9B,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EACV,qBAAqB,EACrB,uBAAuB,EACxB,MAAM,uCAAuC,CAAC;AAG/C,YAAY,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACzF,YAAY,EACV,2BAA2B,EAC3B,6BAA6B,GAC9B,MAAM,6CAA6C,CAAC;AACrD,YAAY,EACV,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,uCAAuC,CAAC;AAI/C,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAIF,MAAM,MAAM,wBAAwB,GAAG,YAAY,GAAG;IAEpD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,wBAAwB,GAChC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,YAAY,CAClC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,kBAAkB,GACxC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAErB,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAC/C,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,YAAY,GACpB,QAAQ,CAAC,gBAAgB,CAAC,CAAC;AAE9B,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAC3C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,2BAA2B,GACjD,QAAQ,CAAC,6BAA6B,CAAC,CAAC;AAE3C,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,qBAAqB,GAC3C,QAAQ,CAAC,uBAAuB,CAAC,CAAC;AAErC,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE;IACN,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,GACA,QAAQ,CAAC,QAAQ,GAAG;IAAE,gBAAgB,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC"}

package/dist/utils/pro2Nft.d.ts

@@ -28,4 +28,11 @@ export declare function buildPro2NftBundle(options: {
     subtitle: string;
     timestampMs: number;
 }): Pro2NftBundle;
+export declare function buildPro2NftBundleFromEncodedImages(options: {
+    image: Uint8Array;
+    thumbnail: Uint8Array;
+    title: string;
+    subtitle: string;
+    timestampMs: number;
+}): Pro2NftBundle;
 //# sourceMappingURL=pro2Nft.d.ts.map

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.102",
+  "version": "1.2.0-alpha.103",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,11 +25,13 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.102",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.102",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.103",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.103",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
+    "buffer": "^6.0.3",
     "bytebuffer": "^5.0.1",
+    "jpeg-js": "^0.4.4",
     "jszip": "^3.10.1",
     "parse-uri": "^1.0.7",
     "semver": "^7.3.7"
@@ -44,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "49f939a3fa496be9bd6763737a98b3ade81a2a45"
+  "gitHead": "ba7c3866269200b25a514202b8286d0c9e9105d3"
 }

package/src/api/UploadPortfolio.ts

@@ -1,21 +1,28 @@
 import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
 
 import { supportsProtocolV2Message } from '../protocols/protocol-v2/features';
+import { decodeCanonicalBase64 } from './helpers/base64Data';
 import FileWrite from './FileWrite';
 
 export type UploadPortfolioParams = {
-  packageBytes: ArrayBuffer | Uint8Array | Blob;
+  packageBase64: string;
   timeoutMs?: number | string;
 };
 
 const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.okpkg.pending';
 const PORTFOLIO_CHUNK_SIZE = 2048;
+const PORTFOLIO_PACKAGE_MAX_BYTES = 128 * 1024;
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
 const PORTFOLIO_UPDATE_MESSAGE_TYPE = 61400;
 
 export default class UploadPortfolio extends FileWrite {
   init() {
-    const { packageBytes, timeoutMs } = this.payload as UploadPortfolioParams;
+    const { packageBase64, timeoutMs } = this.payload as UploadPortfolioParams;
+    const packageBytes = decodeCanonicalBase64({
+      value: packageBase64,
+      parameterName: 'packageBase64',
+      maxBytes: PORTFOLIO_PACKAGE_MAX_BYTES,
+    });
     this.payload = {
       ...this.payload,
       path: PORTFOLIO_PENDING_PATH,

package/src/api/helpers/base64Data.ts

@@ -0,0 +1,85 @@
+import { Buffer } from 'buffer';
+import { decode as decodeJpeg } from 'jpeg-js';
+
+import { invalidParameter } from './filesystemValidation';
+
+const BASE64_PATTERN = /^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
+const JPEG_CONTAINER_OVERHEAD_BYTES = 64 * 1024;
+const JPEG_MAX_MEMORY_USAGE_IN_MB = 32;
+const JPEG_MAX_RESOLUTION_IN_MP = 1;
+
+export function decodeCanonicalBase64({
+  value,
+  parameterName,
+  maxBytes,
+}: {
+  value: unknown;
+  parameterName: string;
+  maxBytes: number;
+}): Uint8Array {
+  if (typeof value !== 'string' || value.length === 0) {
+    throw invalidParameter(`Parameter [${parameterName}] must be a non-empty Base64 string.`);
+  }
+  if (value.length > Math.ceil(maxBytes / 3) * 4) {
+    throw invalidParameter(`Parameter [${parameterName}] exceeds the maximum supported size.`);
+  }
+  if (value.length % 4 !== 0 || !BASE64_PATTERN.test(value)) {
+    throw invalidParameter(`Parameter [${parameterName}] must use canonical Base64 encoding.`);
+  }
+
+  const decoded = Buffer.from(value, 'base64');
+  if (decoded.byteLength === 0 || decoded.byteLength > maxBytes) {
+    throw invalidParameter(`Parameter [${parameterName}] exceeds the maximum supported size.`);
+  }
+  if (decoded.toString('base64') !== value) {
+    throw invalidParameter(`Parameter [${parameterName}] must use canonical Base64 encoding.`);
+  }
+  return Uint8Array.from(decoded);
+}
+
+export function decodeJpegBase64ToRgba({
+  jpegBase64,
+  parameterName,
+  expectedWidth,
+  expectedHeight,
+}: {
+  jpegBase64: unknown;
+  parameterName: string;
+  expectedWidth: number;
+  expectedHeight: number;
+}): { width: number; height: number; data: Uint8Array } {
+  const jpegBytes = decodeCanonicalBase64({
+    value: jpegBase64,
+    parameterName,
+    maxBytes: expectedWidth * expectedHeight * 8 + JPEG_CONTAINER_OVERHEAD_BYTES,
+  });
+  if (jpegBytes[0] !== 0xff || jpegBytes[1] !== 0xd8) {
+    throw invalidParameter(`Parameter [${parameterName}] must contain a JPEG image.`);
+  }
+
+  let decoded: { width: number; height: number; data: Uint8Array };
+  try {
+    decoded = decodeJpeg(jpegBytes, {
+      useTArray: true,
+      formatAsRGBA: true,
+      tolerantDecoding: false,
+      maxResolutionInMP: JPEG_MAX_RESOLUTION_IN_MP,
+      maxMemoryUsageInMB: JPEG_MAX_MEMORY_USAGE_IN_MB,
+    });
+  } catch {
+    throw invalidParameter(`Parameter [${parameterName}] must contain a valid JPEG image.`);
+  }
+
+  if (decoded.width !== expectedWidth || decoded.height !== expectedHeight) {
+    throw invalidParameter(
+      `Parameter [${parameterName}] must contain a ${expectedWidth}x${expectedHeight} JPEG image.`
+    );
+  }
+  const expectedLength = expectedWidth * expectedHeight * 4;
+  if (decoded.data.byteLength !== expectedLength) {
+    throw invalidParameter(
+      `Decoded parameter [${parameterName}] must contain ${expectedLength} RGBA bytes.`
+    );
+  }
+  return decoded;
+}