Revert "feat: support blur resource (#550)" (#571)

This reverts commit 3c9d959.

Author: ByteZhang1024

packages/core/src/api/device/DeviceUploadResource.ts

@@ -9,20 +9,14 @@ import { DeviceModelToTypes, DeviceUploadResourceParams } from '../../types';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { hexToBytes } from '../helpers/hexUtils';
+import { createUiMessage, UI_REQUEST } from '../../events';
 import { getDeviceType, getDeviceFirmwareVersion } from '../../utils';
 import { PROTO } from '../../constants';
 
 export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
   paramsData = {
     data: new Uint8Array(),
     thumbnailData: new Uint8Array(),
-    blurData: new Uint8Array(),
-  };
-
-  private uploadProgress = {
-    totalBytes: 0,
-    uploadedBytes: 0,
-    currentFile: 'main' as 'main' | 'thumbnail' | 'blur',
   };
 
   getVersionRange() {
@@ -58,28 +52,20 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
       { name: 'suffix', type: 'string', required: true },
       { name: 'dataHex', type: 'string', required: true },
       { name: 'thumbnailDataHex', type: 'string', required: true },
-      { name: 'blurDataHex', type: 'hexString', required: true },
       { name: 'resType', type: 'number', required: true },
       { name: 'nftMetaData', type: 'string' },
       { name: 'fileNameNoExt', type: 'string' },
     ]);
 
-    const { suffix, dataHex, thumbnailDataHex, blurDataHex, resType, nftMetaData } = this
+    const { suffix, dataHex, thumbnailDataHex, resType, nftMetaData } = this
       .payload as DeviceUploadResourceParams;
 
     // init params
     this.paramsData = {
-      data: new Uint8Array(hexToBytes(dataHex)),
-      thumbnailData: new Uint8Array(hexToBytes(thumbnailDataHex)),
-      blurData: new Uint8Array(hexToBytes(blurDataHex)),
+      data: hexToBytes(dataHex),
+      thumbnailData: hexToBytes(thumbnailDataHex),
     };
 
-    this.uploadProgress.totalBytes =
-      this.paramsData.data.byteLength +
-      this.paramsData.thumbnailData.byteLength +
-      this.paramsData.blurData.byteLength;
-    this.uploadProgress.uploadedBytes = 0;
-
     const fileHash = bytesToHex(blake2s(this.payload.dataHex)).slice(0, 8);
     const file_name_no_ext = isEmpty(this.payload.fileNameNoExt)
       ? `${resType === 0 ? 'wp' : 'nft'}-${fileHash}-${Math.floor(Date.now() / 1000)}`
@@ -89,86 +75,48 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
       extension: suffix,
       data_length: this.paramsData.data.byteLength,
       zoom_data_length: this.paramsData.thumbnailData.byteLength,
-      blur_data_length: this.paramsData.blurData.byteLength,
       res_type: resType,
       nft_meta_data: nftMetaData,
       file_name_no_ext,
     };
   }
 
-  private getDataChunk(sourceData: Uint8Array, offset: number, length: number): Uint8Array {
-    const endOffset = Math.min(offset + length, sourceData.byteLength);
-
-    return sourceData.subarray(offset, endOffset);
-  }
-
-  private updateProgress(chunkSize: number, requestType: string) {
-    this.uploadProgress.uploadedBytes += chunkSize;
-
-    if (requestType === 'ResourceRequest') {
-      this.uploadProgress.currentFile = 'main';
-    } else if (requestType === 'ZoomRequest') {
-      this.uploadProgress.currentFile = 'thumbnail';
-    } else {
-      this.uploadProgress.currentFile = 'blur';
-    }
-
-    const progress = Math.round(
-      (this.uploadProgress.uploadedBytes / this.uploadProgress.totalBytes) * 100
-    );
-
-    if (process.env.NODE_ENV === 'development') {
-      console.log(`Upload progress: ${progress}% (${this.uploadProgress.currentFile})`);
-    }
-  }
-
   processResourceRequest = async (
     res:
       | TypedResponseMessage<'ResourceRequest'>
       | TypedResponseMessage<'ZoomRequest'>
-      | TypedResponseMessage<'BlurRequest'>
       | TypedResponseMessage<'Success'>
   ): Promise<Success> => {
     if (res.type === 'Success') {
       return res.message;
     }
 
     const { offset, data_length } = res.message;
-    const { data, thumbnailData, blurData } = this.paramsData;
+    const { data, thumbnailData } = this.paramsData;
 
     if (offset === undefined) {
       throw new Error('offset is undefined');
     }
 
-    let sourceData: Uint8Array;
-
-    switch (res.type) {
-      case 'ResourceRequest':
-        sourceData = data;
-        break;
-      case 'BlurRequest':
-        sourceData = blurData;
-        break;
-      case 'ZoomRequest':
-        sourceData = thumbnailData;
-        break;
-      default:
-        throw new Error('Invalid request type');
+    let payload: Uint8Array;
+    if (res.type === 'ResourceRequest') {
+      payload = new Uint8Array(data.slice(offset, Math.min(offset + data_length, data.byteLength)));
+    } else {
+      payload = new Uint8Array(
+        thumbnailData.slice(offset, Math.min(offset + data_length, thumbnailData.byteLength))
+      );
     }
 
-    const payload = this.getDataChunk(sourceData, offset, data_length);
     const digest = blake2s(payload);
 
-    this.updateProgress(payload.byteLength, res.type);
-
     const resourceAckParams = {
       data_chunk: bytesToHex(payload),
       hash: bytesToHex(digest),
     };
 
     const response = await this.device.commands.typedCall(
       'ResourceAck',
-      ['ResourceRequest', 'ZoomRequest', 'BlurRequest', 'Success'],
+      ['ResourceRequest', 'ZoomRequest', 'Success'],
       resourceAckParams
     );
     return this.processResourceRequest(response);
@@ -181,10 +129,12 @@ export default class DeviceUploadResource extends BaseMethod<ResourceUpload> {
 
     const res = await this.device.commands.typedCall(
       'ResourceUpload',
-      ['ResourceRequest', 'ZoomRequest', 'BlurRequest', 'Success'],
+      ['ResourceRequest', 'ZoomRequest', 'Success'],
       this.params
     );
 
+    this.postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_WINDOW));
+
     return this.processResourceRequest(res);
   }
 }

packages/core/src/data/messages/messages.json

@@ -7533,10 +7533,6 @@
         "file_name_no_ext": {
           "type": "string",
           "id": 6
-        },
-        "blur_data_length": {
-          "type": "uint32",
-          "id": 7
         }
       },
       "nested": {
@@ -7561,19 +7557,6 @@
         }
       }
     },
-    "BlurRequest": {
-      "fields": {
-        "offset": {
-          "type": "uint32",
-          "id": 1
-        },
-        "data_length": {
-          "rule": "required",
-          "type": "uint32",
-          "id": 2
-        }
-      }
-    },
     "ResourceRequest": {
       "fields": {
         "offset": {
@@ -12385,7 +12368,6 @@
         "MessageType_NFTWriteData": 10015,
         "MessageType_ResourceUpload": 10018,
         "MessageType_ZoomRequest": 10019,
-        "MessageType_BlurRequest": 10032,
         "MessageType_ResourceRequest": 10020,
         "MessageType_ResourceAck": 10021,
         "MessageType_ResourceUpdate": 10022,

packages/core/src/types/api/deviceUploadResource.ts

@@ -5,7 +5,6 @@ export type DeviceUploadResourceParams = {
   suffix: string;
   dataHex: string;
   thumbnailDataHex: string;
-  blurDataHex: string;
   resType: ResourceType;
   nftMetaData: string;
   fileNameNoExt?: string;

packages/hd-transport/src/types/messages.ts

@@ -2762,7 +2762,6 @@ export type ResourceUpload = {
   nft_meta_data?: string;
   zoom_data_length: number;
   file_name_no_ext?: string;
-  blur_data_length?: number;
 };
 
 // ZoomRequest
@@ -2771,12 +2770,6 @@ export type ZoomRequest = {
   data_length: number;
 };
 
-// BlurRequest
-export type BlurRequest = {
-  offset?: number;
-  data_length: number;
-};
-
 // ResourceRequest
 export type ResourceRequest = {
   offset?: number;
@@ -4643,7 +4636,6 @@ export type MessageType = {
   SEMessageSignature: SEMessageSignature;
   ResourceUpload: ResourceUpload;
   ZoomRequest: ZoomRequest;
-  BlurRequest: BlurRequest;
   ResourceRequest: ResourceRequest;
   ResourceAck: ResourceAck;
   ResourceUpdate: ResourceUpdate;