@react-native-ohos/clipboard 1.16.3-rc.2 → 1.16.4-beta.1

package/harmony/clipboard/oh-package.json5

@@ -3,7 +3,7 @@
   "types": "",
   "devDependencies": {},
   "name": "@react-native-ohos/clipboard",
-  "version": "1.16.3-rc.2",
+  "version": "1.16.4-beta.1",
   "description": "",
   "main": "index.ets",
   "dependencies": {

package/harmony/clipboard/src/main/ets/RNCClipboardTurboModule.ts

@@ -33,6 +33,8 @@ import url from '@ohos.url';
 const TAG = "RNCClipboardTurboModule"
 const prefixPNG = "data:image/png;base64,"
 const prefixJPG = "data:image/jpg;base64,"
+const imageMimePrefix = "image/"
+const defaultImageMimeType = "image/png"
 const PERMISSIONS: Array<Permissions> = [
   'ohos.permission.READ_PASTEBOARD'
 ]
@@ -181,7 +183,14 @@ export class RNCClipboardTurboModule extends TurboModule {
 
           systemPasteboard.getData().then((pasteData) => {
             let pixMap = pasteData.getPrimaryPixelMap();
-            //packer方式
+            if (!pixMap) {
+              logger.error(TAG, "[RNOH]:RNCClipboardTurboModule call getImagePNG,pixMap is null or undefined");
+              reject({
+                code: 1,
+                message: "Clipboard does not contain an image"
+              });
+              return;
+            }
             const imagePackerApi = image.createImagePacker();
             let packOpt: image.PackingOption = {
               format: "image/png",
@@ -196,11 +205,12 @@ export class RNCClipboardTurboModule extends TurboModule {
             }).catch((err) => {
               logger.error(TAG, "[RNOH]:RNCClipboardTurboModule call getImagePNG,failed to packing");
               reject(err)
-            })
-            imagePackerApi.release().then(() => {
-              logger.debug(TAG, "[RNOH]:RNCClipboardTurboModule call getImagePNG, releasing image packaging");
-            }).catch((error: BusinessError) => {
-              logger.error(TAG, "[RNOH]:RNCClipboardTurboModule call getImagePNG, releasing image packaging error");
+            }).finally(() => {
+              imagePackerApi.release().then(() => {
+                logger.debug(TAG, "[RNOH]:RNCClipboardTurboModule call getImagePNG, releasing image packaging");
+              }).catch((error: BusinessError) => {
+                logger.error(TAG, "[RNOH]:RNCClipboardTurboModule call getImagePNG, releasing image packaging error");
+              })
             })
 
           }).catch((err) => {
@@ -213,6 +223,12 @@ export class RNCClipboardTurboModule extends TurboModule {
             message: "User refuses authorization"
           })
         }
+      }).catch((err) => {
+        logger.error(TAG, "[RNOH]:RNCClipboardTurboModule call getImagePNG,failed to request permission");
+        reject({
+          code: 2,
+          message: "Failed to request permission"
+        })
       });
     });
   }
@@ -227,8 +243,14 @@ export class RNCClipboardTurboModule extends TurboModule {
 
           systemPasteboard.getData().then((pasteData) => {
             let pixMap = pasteData.getPrimaryPixelMap();
-
-            //packer方式
+            if (!pixMap) {
+              logger.error(TAG, "[RNOH]:RNCClipboardTurboModule call getImageJPG,pixMap is null or undefined");
+              reject({
+                code: 1,
+                message: "Clipboard does not contain an image"
+              });
+              return;
+            }
             const imagePackerApi = image.createImagePacker();
             let packOpt: image.PackingOption = {
               format: "image/jpeg",
@@ -243,11 +265,12 @@ export class RNCClipboardTurboModule extends TurboModule {
             }).catch((err) => {
               logger.error(TAG, "[RNOH]:RNCClipboardTurboModule call getImageJPG,failed to packing");
               reject(err)
-            })
-            imagePackerApi.release().then(() => {
-              logger.debug(TAG, "[RNOH]:RNCClipboardTurboModule call getImageJPG, releasing image packaging");
-            }).catch((error: BusinessError) => {
-              logger.error(TAG, "[RNOH]:RNCClipboardTurboModule call getImageJPG, releasing image packaging error");
+            }).finally(() => {
+              imagePackerApi.release().then(() => {
+                logger.debug(TAG, "[RNOH]:RNCClipboardTurboModule call getImageJPG, releasing image packaging");
+              }).catch((error: BusinessError) => {
+                logger.error(TAG, "[RNOH]:RNCClipboardTurboModule call getImageJPG, releasing image packaging error");
+              })
             })
 
           }).catch((err) => {
@@ -260,6 +283,12 @@ export class RNCClipboardTurboModule extends TurboModule {
             message: "User refuses authorization"
           })
         }
+      }).catch((err) => {
+        logger.error(TAG, "[RNOH]:RNCClipboardTurboModule call getImageJPG,failed to request permission");
+        reject({
+          code: 2,
+          message: "Failed to request permission"
+        })
       });
     });
   }
@@ -274,6 +303,10 @@ export class RNCClipboardTurboModule extends TurboModule {
     let imageSource: image.ImageSource = image.createImageSource(arrayBuffer);
     logger.debug(TAG, "[RNOH]:RNCClipboardTurboModule call setImage100");
 
+    // 获取图片格式信息
+    let imageFormat = this.getImageFormatFromArrayBuffer(arrayBuffer);
+    logger.debug(TAG, `[RNOH]:RNCClipboardTurboModule call setImage, detected format: ${imageFormat}`);
+
     imageSource.getImageInfo().then(value => {
       let hValue = Math.round(value.size.height);
       let wValue = Math.round(value.size.width);
@@ -293,11 +326,17 @@ export class RNCClipboardTurboModule extends TurboModule {
 
         let systemPasteboard = pasteboard.getSystemPasteboard();
         systemPasteboard.getData().then((pasteData) => {
+          // 使用 MIMETYPE_PIXELMAP 创建记录，确保兼容性
           let record = pasteboard.createRecord(pasteboard.MIMETYPE_PIXELMAP, iconPixelMap)
+          // 在 record 的 data 中保存原始格式信息，供 getImage 读取
+          if (!record.data) {
+            record.data = {};
+          }
+          record.data[imageFormat] = arrayBuffer;
           pasteData.addRecord(record)
 
           systemPasteboard.setData(pasteData).then((data: void) => {
-            logger.debug(TAG, "[RNOH]:RNCClipboardTurboModule call setImage305,successed in setting pasteData");
+            logger.debug(TAG, `[RNOH]:RNCClipboardTurboModule call setImage305,successed in setting pasteData with format: ${imageFormat}`);
           }).catch((err) => {
             logger.error(TAG, "[RNOH]:RNCClipboardTurboModule call setImage305,failed in setting pasteData");
           })
@@ -309,13 +348,252 @@ export class RNCClipboardTurboModule extends TurboModule {
 
   }
 
+  // 从 ArrayBuffer 中检测图片格式
+  private getImageFormatFromArrayBuffer(buffer: ArrayBuffer): string {
+    let uint8Array = new Uint8Array(buffer);
+
+    // 检查 JPEG (FF D8 FF)
+    if (uint8Array.length >= 3 &&
+      uint8Array[0] === 0xFF &&
+      uint8Array[1] === 0xD8 &&
+      uint8Array[2] === 0xFF) {
+      return "image/jpeg";
+    }
+
+    // 检查 PNG (89 50 4E 47 0D 0A 1A 0A)
+    if (uint8Array.length >= 8 &&
+      uint8Array[0] === 0x89 &&
+      uint8Array[1] === 0x50 &&
+      uint8Array[2] === 0x4E &&
+      uint8Array[3] === 0x47 &&
+      uint8Array[4] === 0x0D &&
+      uint8Array[5] === 0x0A &&
+      uint8Array[6] === 0x1A &&
+      uint8Array[7] === 0x0A) {
+      return "image/png";
+    }
+
+    // 检查 WEBP (52 49 46 46 ... 57 45 42 50)
+    if (uint8Array.length >= 12 &&
+      uint8Array[0] === 0x52 &&
+      uint8Array[1] === 0x49 &&
+      uint8Array[2] === 0x46 &&
+      uint8Array[3] === 0x46 &&
+      uint8Array[8] === 0x57 &&
+      uint8Array[9] === 0x45 &&
+      uint8Array[10] === 0x42 &&
+      uint8Array[11] === 0x50) {
+      return "image/webp";
+    }
+
+    // 检查 GIF (47 49 46 38)
+    if (uint8Array.length >= 4 &&
+      uint8Array[0] === 0x47 &&
+      uint8Array[1] === 0x49 &&
+      uint8Array[2] === 0x46 &&
+      uint8Array[3] === 0x38) {
+      return "image/gif";
+    }
+
+    // 检查 BMP (42 4D)
+    if (uint8Array.length >= 2 &&
+      uint8Array[0] === 0x42 &&
+      uint8Array[1] === 0x4D) {
+      return "image/bmp";
+    }
+
+    // 默认返回 PNG
+    logger.debug(TAG, "[RNOH]:RNCClipboardTurboModule getImageFormatFromArrayBuffer, unknown format, defaulting to image/png");
+    return "image/png";
+  }
+
   getImage(): Promise<string> {
     return new Promise<string>((resolve, reject) => {
       logger.debug(TAG, "[RNOH]:RNCClipboardTurboModule call getImage");
-      resolve("demo-todo")
+      this.requestPermission().then(async res => {
+        if (!res) {
+          reject({
+            code: 0,
+            message: "User refuses authorization"
+          })
+          return
+        }
+
+        try {
+          let systemPasteboard = pasteboard.getSystemPasteboard();
+          let pasteData = await systemPasteboard.getData();
+
+          // 检查剪贴板中是否有 JPEG 或 PNG 格式的数据
+          // 如果有，使用与 getImageJPG/getImagePNG 相同的逻辑：通过 getPrimaryPixelMap 重新打包
+          let imageFormat = this.getImageFormatFromPasteData(pasteData);
+          if (imageFormat) {
+            logger.debug(TAG, `[RNOH]:RNCClipboardTurboModule getImage, detected format: ${imageFormat}, using getImageJPG/getImagePNG logic`);
+            let pixelMapObj = pasteData.getPrimaryPixelMap();
+            if (pixelMapObj) {
+              // 使用与 getImageJPG/getImagePNG 相同的参数重新打包
+              let imageDataUri = await this.packPixelMapAsDataUri(pixelMapObj, imageFormat);
+              resolve(imageDataUri);
+              return;
+            }
+          }
+
+          let imageDataUri = await this.getImageDataUriFromPasteData(pasteData);
+          resolve(imageDataUri)
+        } catch (err) {
+          logger.error(TAG, `[RNOH]:RNCClipboardTurboModule call getImage,failed to get image. Cause:${err.message}`);
+          reject(err)
+        }
+      }).catch((err) => {
+        logger.error(TAG, `[RNOH]:RNCClipboardTurboModule call getImage,failed to request permission. Cause:${err.message}`);
+        reject(err)
+      })
     });
   }
 
+  // 从剪贴板数据中检测图片格式
+  private getImageFormatFromPasteData(pasteData: pasteboard.PasteData): string | null {
+    let count = pasteData.getRecordCount();
+    for (let index = 0; index < count; index++) {
+      let record = pasteData.getRecord(index);
+      // 检查 record.mimeType
+      let mimeType = record.mimeType?.toLowerCase() || "";
+      if (mimeType === "image/jpeg" || mimeType === "image/jpg") {
+        return "image/jpeg";
+      }
+      if (mimeType === "image/png") {
+        return "image/png";
+      }
+      // 检查 record.data 中的 mimeType
+      if (record.data) {
+        for (let mt of Object.keys(record.data)) {
+          let lowerMt = mt.toLowerCase();
+          if (lowerMt === "image/jpeg" || lowerMt === "image/jpg") {
+            return "image/jpeg";
+          }
+          if (lowerMt === "image/png") {
+            return "image/png";
+          }
+        }
+      }
+    }
+    return null;
+  }
+
+  private async getImageDataUriFromPasteData(pasteData: pasteboard.PasteData): Promise<string> {
+    let count = pasteData.getRecordCount();
+    for (let index = 0; index < count; index++) {
+      let record = pasteData.getRecord(index);
+      let dataUri = await this.getImageDataUriFromRecord(record);
+      if (dataUri.length > 0) {
+        return dataUri
+      }
+    }
+
+    try {
+      let pixelMapObj = pasteData.getPrimaryPixelMap();
+      if (pixelMapObj) {
+        return await this.packPixelMapAsDataUri(pixelMapObj, defaultImageMimeType)
+      }
+    } catch (err) {
+      logger.debug(TAG, `[RNOH]:RNCClipboardTurboModule getImage,no primary PixelMap. Cause:${err.message}`);
+    }
+
+    return ""
+  }
+
+  private async getImageDataUriFromRecord(record: pasteboard.PasteDataRecord): Promise<string> {
+    if (this.isImageMimeType(record.mimeType)) {
+      let dataUri = await this.getImageDataUriByMimeType(record, record.mimeType);
+      if (dataUri.length > 0) {
+        return dataUri
+      }
+    }
+
+    if (record.data) {
+      let customMimeTypes = Object.keys(record.data);
+      for (let index = 0; index < customMimeTypes.length; index++) {
+        let mimeType = customMimeTypes[index];
+        if (this.isImageMimeType(mimeType)) {
+          return this.createDataUri(mimeType, record.data[mimeType])
+        }
+      }
+    }
+
+    if (record.pixelMap) {
+      let mimeType = this.isImageMimeType(record.mimeType) ? record.mimeType : defaultImageMimeType;
+      return await this.packPixelMapAsDataUri(record.pixelMap, mimeType)
+    }
+
+    return ""
+  }
+
+  private async getImageDataUriByMimeType(record: pasteboard.PasteDataRecord, mimeType: string): Promise<string> {
+    if (record.data && record.data[mimeType]) {
+      return this.createDataUri(mimeType, record.data[mimeType])
+    }
+
+    try {
+      let value = await record.getData(mimeType);
+      if (value instanceof ArrayBuffer) {
+        return this.createDataUri(mimeType, value)
+      }
+
+      if (this.isPixelMap(value)) {
+        return await this.packPixelMapAsDataUri(value as image.PixelMap, mimeType)
+      }
+    } catch (err) {
+      logger.debug(TAG, `[RNOH]:RNCClipboardTurboModule getImage,failed to read mimeType:${mimeType}. Cause:${err.message}`);
+    }
+
+    return ""
+  }
+
+  private async packPixelMapAsDataUri(pixelMapObj: image.PixelMap, mimeType: string): Promise<string> {
+    const imagePackerApi = image.createImagePacker();
+    let packingMimeType = this.getPackingMimeType(mimeType);
+    let packOpt: image.PackingOption = {
+      format: packingMimeType,
+      quality: 96
+    }
+
+    try {
+      let data = await imagePackerApi.packing(pixelMapObj, packOpt);
+      return this.createDataUri(packingMimeType, data)
+    } finally {
+      imagePackerApi.release().then(() => {
+        logger.debug(TAG, "[RNOH]:RNCClipboardTurboModule call getImage, releasing image packaging");
+      }).catch((error: BusinessError) => {
+        logger.error(TAG, `[RNOH]:RNCClipboardTurboModule call getImage, releasing image packaging error. Cause:${error.message}`);
+      })
+    }
+  }
+
+  private createDataUri(mimeType: string, data: ArrayBuffer): string {
+    let uint8Array = new Uint8Array(data);
+    let base64Helper = new util.Base64Helper();
+    let base64Str = base64Helper.encodeToStringSync(uint8Array, util.Type.BASIC);
+    return `data:${mimeType};base64,${base64Str}`
+  }
+
+  private getPackingMimeType(mimeType: string): string {
+    let normalizedMimeType = mimeType.toLowerCase();
+    if (normalizedMimeType == "image/jpeg" || normalizedMimeType == "image/jpg") {
+      return "image/jpeg"
+    }
+    if (normalizedMimeType == "image/webp") {
+      return "image/webp"
+    }
+    return defaultImageMimeType
+  }
+
+  private isImageMimeType(mimeType: string): boolean {
+    return mimeType != undefined && mimeType.length > 0 && mimeType.toLowerCase().indexOf(imageMimePrefix) == 0
+  }
+
+  private isPixelMap(value: pasteboard.ValueType): boolean {
+    return value != undefined && typeof value == "object" && "getImageInfo" in value
+  }
+
   setStrings(content: string[]) {
     logger.debug(TAG, "[RNOH]:RNCClipboardTurboModule call setStrings fun");
     let systemPasteboard = pasteboard.getSystemPasteboard();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/clipboard",
-  "version": "1.16.3-rc.2",
+  "version": "1.16.4-beta.1",
   "description": "React Native Clipboard API",
   "harmony": {
     "alias": "@react-native-clipboard/clipboard"