@onekeyfe/hd-core 1.1.16-alpha.2 → 1.1.16-alpha.4

package/dist/api/device/DeviceUploadResource.d.ts

@@ -9,7 +9,6 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
         blurData: Uint8Array;
     };
     private uploadProgress;
-    private requestedResources;
     getVersionRange(): {
         model_touch: {
             min: string;

package/dist/api/device/DeviceUploadResource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeviceUploadResource.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUploadResource.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAGL,4BAA4B,EAC7B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAM3C,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,cAAc,CAAC;IAC1E,UAAU;;;;MAIR;IAEF,OAAO,CAAC,cAAc,CAIpB;IAEF,OAAO,CAAC,kBAAkB,CAIxB;IAEF,eAAe;;;;;IAQf,qBAAqB;IAgBrB,IAAI;IA+CJ,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,cAAc;IAoBtB,sBAAsB,QAEhB,qBAAqB,iBAAiB,CAAC,GACvC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,SAAS,CAAC,KAClC,QAAQ,4BAA4B,CAAC,CA8DtC;IAEI,GAAG;CAaV"}
+{"version":3,"file":"DeviceUploadResource.d.ts","sourceRoot":"","sources":["../../../src/api/device/DeviceUploadResource.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAGL,4BAA4B,EAC7B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAM3C,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,UAAU,CAAC,cAAc,CAAC;IAC1E,UAAU;;;;MAIR;IAEF,OAAO,CAAC,cAAc,CAIpB;IAEF,eAAe;;;;;IAQf,qBAAqB;IAgBrB,IAAI;IA+CJ,OAAO,CAAC,YAAY;IAMpB,OAAO,CAAC,cAAc;IAoBtB,sBAAsB,QAEhB,qBAAqB,iBAAiB,CAAC,GACvC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,aAAa,CAAC,GACnC,qBAAqB,SAAS,CAAC,KAClC,QAAQ,4BAA4B,CAAC,CAuDtC;IAEI,GAAG;CAaV"}

package/dist/index.d.ts

@@ -444,9 +444,7 @@ type DeviceUploadResourceParams = {
     fileNameNoExt?: string;
 };
 type DeviceUploadResourceResponse = Success$1 & {
-    resourceUpload?: boolean;
-    zoomUpload?: boolean;
-    blurUpload?: boolean;
+    applyScreen?: boolean;
 };
 declare function deviceUploadResource(connectId: string, params: CommonParams & DeviceUploadResourceParams): Response<DeviceUploadResourceResponse>;
 

package/dist/index.js

@@ -28340,24 +28340,16 @@ class DeviceUploadResource extends BaseMethod {
             uploadedBytes: 0,
             currentFile: 'main',
         };
-        this.requestedResources = {
-            resourceUpload: false,
-            zoomUpload: false,
-            blurUpload: false,
-        };
         this.processResourceRequest = (res) => __awaiter(this, void 0, void 0, function* () {
             if (res.type === 'Success') {
                 const response = {
                     message: res.message.message,
                 };
-                if (this.requestedResources.resourceUpload) {
-                    response.resourceUpload = true;
-                }
-                if (this.requestedResources.zoomUpload) {
-                    response.zoomUpload = true;
-                }
-                if (this.requestedResources.blurUpload) {
-                    response.blurUpload = true;
+                response.applyScreen = true;
+                const firmwareVersion = getDeviceFirmwareVersion(this.device.features).join('.');
+                const deviceType = getDeviceType(this.device.features);
+                if (deviceType === hdShared.EDeviceType.Pro && semver__default["default"].gte(firmwareVersion, '4.17.0')) {
+                    response.applyScreen = false;
                 }
                 return response;
             }
@@ -28370,15 +28362,12 @@ class DeviceUploadResource extends BaseMethod {
             switch (res.type) {
                 case 'ResourceRequest':
                     sourceData = data;
-                    this.requestedResources.resourceUpload = true;
                     break;
                 case 'BlurRequest':
                     sourceData = blurData;
-                    this.requestedResources.blurUpload = true;
                     break;
                 case 'ZoomRequest':
                     sourceData = thumbnailData;
-                    this.requestedResources.zoomUpload = true;
                     break;
                 default:
                     throw new Error('Invalid request type');

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

@@ -10,9 +10,7 @@ export type DeviceUploadResourceParams = {
     fileNameNoExt?: string;
 };
 export type DeviceUploadResourceResponse = Success & {
-    resourceUpload?: boolean;
-    zoomUpload?: boolean;
-    blurUpload?: boolean;
+    applyScreen?: boolean;
 };
 export declare function deviceUploadResource(connectId: string, params: CommonParams & DeviceUploadResourceParams): Response<DeviceUploadResourceResponse>;
 //# sourceMappingURL=deviceUploadResource.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deviceUploadResource.d.ts","sourceRoot":"","sources":["../../../src/types/api/deviceUploadResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,OAAO,GAAG;IACnD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,4BAA4B,CAAC,CAAC"}
+{"version":3,"file":"deviceUploadResource.d.ts","sourceRoot":"","sources":["../../../src/types/api/deviceUploadResource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,OAAO,GAAG;IACnD,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,0BAA0B,GAChD,QAAQ,CAAC,4BAA4B,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.16-alpha.2",
+  "version": "1.1.16-alpha.4",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.1.16-alpha.2",
-    "@onekeyfe/hd-transport": "1.1.16-alpha.2",
+    "@onekeyfe/hd-shared": "1.1.16-alpha.4",
+    "@onekeyfe/hd-transport": "1.1.16-alpha.4",
     "axios": "1.12.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
     "@types/web-bluetooth": "^0.0.21",
     "ripple-keypairs": "^1.3.1"
   },
-  "gitHead": "2a8f1e7ecc71dad2be8e6d8cc9489d0c0334fffc"
+  "gitHead": "afb34e7032a88bcaad3be96473d5aa4be81ba2ad"
 }

package/src/api/device/DeviceUploadResource.ts

@@ -1,5 +1,5 @@
 import semver from 'semver';
-import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
+import { EDeviceType, ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import { bytesToHex } from '@noble/hashes/utils';
 import { ResourceUpload } from '@onekeyfe/hd-transport';
 import { blake2s } from '@noble/hashes/blake2s';
@@ -29,12 +29,6 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
     currentFile: 'main' as 'main' | 'thumbnail' | 'blur',
   };
 
-  private requestedResources = {
-    resourceUpload: false,
-    zoomUpload: false,
-    blurUpload: false,
-  };
-
   getVersionRange() {
     return {
       model_touch: {
@@ -143,16 +137,12 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
       const response: DeviceUploadResourceResponse = {
         message: res.message.message,
       };
+      response.applyScreen = true;
 
-      // 只返回设备实际请求的资源类型标志
-      if (this.requestedResources.resourceUpload) {
-        response.resourceUpload = true;
-      }
-      if (this.requestedResources.zoomUpload) {
-        response.zoomUpload = true;
-      }
-      if (this.requestedResources.blurUpload) {
-        response.blurUpload = true;
+      const firmwareVersion = getDeviceFirmwareVersion(this.device.features).join('.');
+      const deviceType = getDeviceType(this.device.features);
+      if (deviceType === EDeviceType.Pro && semver.gte(firmwareVersion, '4.17.0')) {
+        response.applyScreen = false;
       }
 
       return response;
@@ -170,15 +160,12 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
     switch (res.type) {
       case 'ResourceRequest':
         sourceData = data;
-        this.requestedResources.resourceUpload = true;
         break;
       case 'BlurRequest':
         sourceData = blurData;
-        this.requestedResources.blurUpload = true;
         break;
       case 'ZoomRequest':
         sourceData = thumbnailData;
-        this.requestedResources.zoomUpload = true;
         break;
       default:
         throw new Error('Invalid request type');

package/src/types/api/deviceUploadResource.ts

@@ -12,9 +12,7 @@ export type DeviceUploadResourceParams = {
 };
 
 export type DeviceUploadResourceResponse = Success & {
-  resourceUpload?: boolean;
-  zoomUpload?: boolean;
-  blurUpload?: boolean;
+  applyScreen?: boolean;
 };
 
 export declare function deviceUploadResource(