@onekeyfe/react-native-cloud-kit-module 1.1.13 → 1.1.14

package/android/src/main/java/com/margelo/nitro/cloudkitmodule/CloudKitModule.kt

@@ -1,6 +1,7 @@
 package com.margelo.nitro.cloudkitmodule
 
 import com.facebook.proguard.annotations.DoNotStrip
+import com.margelo.nitro.core.NullType
 import com.margelo.nitro.core.Promise
 
 @DoNotStrip
@@ -29,8 +30,8 @@ class CloudKitModule : HybridCloudKitModuleSpec() {
     )
   }
 
-  override fun fetchRecord(params: FetchRecordParams): Promise<RecordResult?> {
-    return Promise.resolved(null)
+  override fun fetchRecord(params: FetchRecordParams): Promise<Variant_NullType_RecordResult> {
+      return Promise.resolved(Variant_NullType_RecordResult.First(NullType.NULL))
   }
 
   override fun deleteRecord(params: DeleteRecordParams): Promise<Unit> {

package/ios/CloudKitModule.swift

@@ -3,12 +3,13 @@ import CloudKit
 import NitroModules
 
 class CloudKitModule: HybridCloudKitModuleSpec {
+
   // MARK: - Properties
   private let container = CKContainer.default()
   private lazy var database = container.privateCloudDatabase
 
   // MARK: - Check Availability
-  
+
   public func isAvailable() throws -> Promise<Bool> {
     return Promise.async {
       let status = try await self.container.accountStatus()
@@ -17,7 +18,7 @@ class CloudKitModule: HybridCloudKitModuleSpec {
   }
 
   // MARK: - Get Account Info
-  
+
   public func getAccountInfo() throws -> Promise<AccountInfoResult> {
     return Promise.async {
       let status = try await self.container.accountStatus()
@@ -47,7 +48,7 @@ class CloudKitModule: HybridCloudKitModuleSpec {
   }
 
   // MARK: - Save Record
-  
+
   public func saveRecord(params: SaveRecordParams) throws -> Promise<SaveRecordResult> {
     return Promise.async {
       let ckRecordID = CKRecord.ID(recordName: params.recordID)
@@ -74,40 +75,41 @@ class CloudKitModule: HybridCloudKitModuleSpec {
   }
 
   // MARK: - Fetch Record
-  
-  public func fetchRecord(params: FetchRecordParams) throws -> Promise<RecordResult?> {
+
+  public func fetchRecord(params: FetchRecordParams) throws -> NitroModules.Promise<Variant_NullType_RecordResult> {
     return Promise.async {
       let ckRecordID = CKRecord.ID(recordName: params.recordID)
-      
+
       do {
         let record = try await self.database.record(for: ckRecordID)
-        
+
         let data = record[CloudKitConstants.recordDataField] as? String ?? ""
         let meta = record[CloudKitConstants.recordMetaField] as? String ?? ""
         let createdAt = Int64((record.creationDate?.timeIntervalSince1970 ?? 0) * 1000)
         let modifiedAt = Int64((record.modificationDate?.timeIntervalSince1970 ?? 0) * 1000)
-        
-        let result = RecordResult(
-          recordID: record.recordID.recordName,
-          recordType: record.recordType,
-          data: data,
-          meta: meta,
-          createdAt: Double(createdAt),
-          modifiedAt: Double(modifiedAt)
+
+      let result = Variant_NullType_RecordResult.second(
+        RecordResult(
+            recordID: record.recordID.recordName,
+            recordType: record.recordType,
+            data: data,
+            meta: meta,
+            createdAt: Double(createdAt),
+            modifiedAt: Double(modifiedAt))
         )
         return result
       } catch let error as CKError where error.code == .unknownItem {
-        return nil
+          return Variant_NullType_RecordResult.first(NullType.null)
       }
     }
   }
 
   // MARK: - Delete Record
-  
+
   public func deleteRecord(params: DeleteRecordParams) throws -> Promise<Void> {
     return Promise.async {
       let ckRecordID = CKRecord.ID(recordName: params.recordID)
-      
+
       do {
         _ = try await self.database.deleteRecord(withID: ckRecordID)
         return Void()
@@ -119,11 +121,11 @@ class CloudKitModule: HybridCloudKitModuleSpec {
   }
 
   // MARK: - Record Exists
-  
+
   public func recordExists(params: RecordExistsParams) throws -> Promise<Bool> {
     return Promise.async {
       let ckRecordID = CKRecord.ID(recordName: params.recordID)
-      
+
       do {
         _ = try await self.database.record(for: ckRecordID)
         return true
@@ -134,7 +136,7 @@ class CloudKitModule: HybridCloudKitModuleSpec {
   }
 
   // MARK: - Query Records
-  
+
   public func queryRecords(params: QueryRecordsParams) throws -> Promise<QueryRecordsResult> {
     return Promise.async {
       let predicate = NSPredicate(value: true)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-cloud-kit-module",
-  "version": "1.1.13",
+  "version": "1.1.14",
   "description": "react-native-cloud-kit-module",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",