@onekeyfe/react-native-cloud-kit-module 1.1.19 → 1.1.21

package/CloudKitModule.podspec

@@ -21,6 +21,7 @@ Pod::Spec.new do |s|
 
   s.dependency 'React-jsi'
   s.dependency 'React-callinvoker'
+  s.dependency 'ReactNativeNativeLogger'
 
   load 'nitrogen/generated/ios/CloudKitModule+autolinking.rb'
   add_nitrogen_files(s)

package/ios/CloudKitModule.swift

@@ -1,6 +1,7 @@
 import Foundation
 import CloudKit
 import NitroModules
+import ReactNativeNativeLogger
 
 class CloudKitModule: HybridCloudKitModuleSpec {
 
@@ -8,11 +9,31 @@ class CloudKitModule: HybridCloudKitModuleSpec {
   private let container = CKContainer.default()
   private lazy var database = container.privateCloudDatabase
 
+  // MARK: - Input Validation
+
+  private static let recordIDMaxLength = 255
+  private static let recordTypePattern = try! NSRegularExpression(pattern: "^[a-zA-Z][a-zA-Z0-9_]{0,254}$")
+  private static let queryResultsLimit = 200
+
+  private func validateRecordID(_ recordID: String) throws {
+    guard !recordID.isEmpty, recordID.count <= Self.recordIDMaxLength else {
+      throw NSError(domain: "CloudKitModule", code: -1, userInfo: [NSLocalizedDescriptionKey: "Invalid record ID"])
+    }
+  }
+
+  private func validateRecordType(_ recordType: String) throws {
+    let range = NSRange(recordType.startIndex..., in: recordType)
+    guard Self.recordTypePattern.firstMatch(in: recordType, range: range) != nil else {
+      throw NSError(domain: "CloudKitModule", code: -1, userInfo: [NSLocalizedDescriptionKey: "Invalid record type"])
+    }
+  }
+
   // MARK: - Check Availability
 
   public func isAvailable() throws -> Promise<Bool> {
     return Promise.async {
       let status = try await self.container.accountStatus()
+      OneKeyLog.info("CloudKit", "Account status: \(status.rawValue), available: \(status == .available)")
       return status == .available
     }
   }
@@ -28,6 +49,7 @@ class CloudKitModule: HybridCloudKitModuleSpec {
           let userRecordID = try await self.container.userRecordID()
           userId = userRecordID.recordName
         } catch {
+          OneKeyLog.warn("CloudKit", "Failed to get user record ID: \(error.localizedDescription)")
           userId = nil
         }
       }
@@ -50,7 +72,10 @@ class CloudKitModule: HybridCloudKitModuleSpec {
   // MARK: - Save Record
 
   public func saveRecord(params: SaveRecordParams) throws -> Promise<SaveRecordResult> {
+    try validateRecordID(params.recordID)
+    try validateRecordType(params.recordType)
     return Promise.async {
+      OneKeyLog.debug("CloudKit", "Saving record: \(params.recordID), type: \(params.recordType)")
       let ckRecordID = CKRecord.ID(recordName: params.recordID)
       let recordToSave: CKRecord
       do {
@@ -65,6 +90,7 @@ class CloudKitModule: HybridCloudKitModuleSpec {
       recordToSave[CloudKitConstants.recordDataField] = params.data as CKRecordValue
       recordToSave[CloudKitConstants.recordMetaField] = params.meta as CKRecordValue
       let savedRecord = try await self.database.save(recordToSave)
+      OneKeyLog.debug("CloudKit", "Record saved: \(savedRecord.recordID.recordName)")
       let createdAt = Int64((savedRecord.creationDate?.timeIntervalSince1970 ?? 0) * 1000)
       let result = SaveRecordResult(
         recordID: savedRecord.recordID.recordName,
@@ -77,11 +103,13 @@ class CloudKitModule: HybridCloudKitModuleSpec {
   // MARK: - Fetch Record
 
   public func fetchRecord(params: FetchRecordParams) throws -> Promise<Variant_NullType_RecordResult> {
+    try validateRecordID(params.recordID)
     return Promise.async {
       let ckRecordID = CKRecord.ID(recordName: params.recordID)
 
       do {
         let record = try await self.database.record(for: ckRecordID)
+        OneKeyLog.debug("CloudKit", "Record fetched: \(params.recordID)")
 
         let data = record[CloudKitConstants.recordDataField] as? String ?? ""
         let meta = record[CloudKitConstants.recordMetaField] as? String ?? ""
@@ -97,6 +125,7 @@ class CloudKitModule: HybridCloudKitModuleSpec {
           modifiedAt: Double(modifiedAt)
         ))
       } catch let error as CKError where error.code == .unknownItem {
+        OneKeyLog.debug("CloudKit", "Record not found: \(params.recordID)")
         return Variant_NullType_RecordResult.first(NullType.null)
       }
     }
@@ -105,14 +134,16 @@ class CloudKitModule: HybridCloudKitModuleSpec {
   // MARK: - Delete Record
 
   public func deleteRecord(params: DeleteRecordParams) throws -> Promise<Void> {
+    try validateRecordID(params.recordID)
     return Promise.async {
       let ckRecordID = CKRecord.ID(recordName: params.recordID)
 
       do {
         _ = try await self.database.deleteRecord(withID: ckRecordID)
+        OneKeyLog.debug("CloudKit", "Record deleted: \(params.recordID)")
         return Void()
       } catch let error as CKError where error.code == .unknownItem {
-        // Item not found is considered success for delete
+        OneKeyLog.debug("CloudKit", "Record not found for delete (OK): \(params.recordID)")
         return Void()
       }
     }
@@ -121,6 +152,7 @@ class CloudKitModule: HybridCloudKitModuleSpec {
   // MARK: - Record Exists
 
   public func recordExists(params: RecordExistsParams) throws -> Promise<Bool> {
+    try validateRecordID(params.recordID)
     return Promise.async {
       let ckRecordID = CKRecord.ID(recordName: params.recordID)
 
@@ -136,6 +168,7 @@ class CloudKitModule: HybridCloudKitModuleSpec {
   // MARK: - Query Records
 
   public func queryRecords(params: QueryRecordsParams) throws -> Promise<QueryRecordsResult> {
+    try validateRecordType(params.recordType)
     return Promise.async {
       let predicate = NSPredicate(value: true)
       let query = CKQuery(recordType: params.recordType, predicate: predicate)
@@ -145,7 +178,7 @@ class CloudKitModule: HybridCloudKitModuleSpec {
         var results: [RecordResult] = []
         let operation = CKQueryOperation(query: query)
         operation.desiredKeys = [CloudKitConstants.recordMetaField]
-        // operation.resultsLimit = 500 // Optional: tune as needed
+        operation.resultsLimit = Self.queryResultsLimit
 
         operation.recordMatchedBlock = { _, result in
           switch result {
@@ -172,9 +205,11 @@ class CloudKitModule: HybridCloudKitModuleSpec {
           case .success:
             // Sort by modification time descending to return latest first
             let sorted = results.sorted { $0.modifiedAt > $1.modifiedAt }
+            OneKeyLog.info("CloudKit", "Query returned \(sorted.count) records for type: \(params.recordType)")
             let queryResult = QueryRecordsResult(records: sorted)
             continuation.resume(returning: queryResult)
           case .failure(let error):
+            OneKeyLog.error("CloudKit", "Query failed for type \(params.recordType): \(error.localizedDescription)")
             continuation.resume(throwing: error)
           }
         }

package/package.json

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