@rentlydev/rently-tuya 0.2.3 → 0.2.5

package/ios/tuya/Tuya.swift

@@ -16,6 +16,12 @@ class Tuya: NSObject, ObservableObject {
     var cameraType: ThingSmartCameraType?
     var messages: ThingSmartCameraMessage?
     
+    private var storedDeviceId: String?
+    private var storedHomeId: Int64?
+    private var isResyncing: Bool = false
+    private var resyncRetryCount: Int = 0
+    private let maxResyncRetries: Int = 2
+    
     @Published var isSettingApplied: Bool = false
     @Published var isConnected: Bool = false
     @Published var isPreviewing: Bool = false
@@ -157,6 +163,9 @@ class Tuya: NSObject, ObservableObject {
         homeId: Int64,
         completion: @escaping (Bool, String?, Error?) -> Void
     ) {
+        self.storedDeviceId = deviceId
+        self.storedHomeId = homeId
+        
         ThingSmartDevice.syncDeviceInfo(withDevId: deviceId, homeId: homeId) {
             
             print("Tuya: Device sync successful.")
@@ -190,14 +199,51 @@ class Tuya: NSObject, ObservableObject {
             return
         }
         
-        guard let p2pType = device.deviceModel.skills["p2pType"] else {
-            print("Tuya: Missing p2pType")
-            self.updateStatus(isConnected: false, previewLoader: false)
+        let deviceModel = device.deviceModel
+        guard let skills = deviceModel.skills,
+              let p2pType = skills["p2pType"] else {
+            print("Tuya: Device model missing required data, attempting to re-sync device (Retry: \(resyncRetryCount)/\(maxResyncRetries))")
+            
+            guard resyncRetryCount < maxResyncRetries,
+                  !isResyncing,
+                  let deviceId = storedDeviceId,
+                  let homeId = storedHomeId else {
+                if resyncRetryCount >= maxResyncRetries {
+                    print("Tuya: Max re-sync attempts reached. Resetting retry count.")
+                    resyncRetryCount = 0
+                } else {
+                    print("Tuya: Cannot re-sync - missing stored device info or already resyncing")
+                }
+                self.updateStatus(isConnected: false, previewLoader: false)
+                return
+            }
+            
+            isResyncing = true
+            resyncRetryCount += 1
+            previewLoader = true
+            
+            syncDevice(deviceId: deviceId, homeId: homeId) { success, message, error in
+                self.isResyncing = false
+                
+                if success {
+                    print("Tuya: Re-sync successful, attempting to connect again")
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                        self.connect()
+                    }
+                } else {
+                    print("Tuya: Re-sync failed: \(message ?? "Unknown error")")
+                    self.updateStatus(isConnected: false, previewLoader: false)
+                }
+            }
             return
         }
         
+        resyncRetryCount = 0
+        
         previewLoader = true
         
+        let deviceId = device.devId
+        
         device.awake {
             print("Tuya: Device wake success")
         } failure: { error in
@@ -205,7 +251,7 @@ class Tuya: NSObject, ObservableObject {
         }
         
         let request = ThingSmartRequest()
-        request.request(withApiName: "tuya.m.ipc.config.get", postData: ["devId": device.devId], version: "2.0") { result in
+        request.request(withApiName: "tuya.m.ipc.config.get", postData: ["devId": deviceId], version: "2.0") { result in
             guard let configData = result else {
                 print("Tuya: Config data missing")
                 self.updateStatus(isConnected: false, previewLoader: false)
@@ -222,14 +268,22 @@ class Tuya: NSObject, ObservableObject {
         }
     }
     
-    // Configure the camera
     private func configureCamera(p2pType: Any, configData: Any) {
+        guard let device = self.device else {
+            print("Tuya: Camera config creation failed - device is nil")
+            self.updateStatus(isConnected: false, previewLoader: false)
+            return
+        }
+        
+        let deviceModel = device.deviceModel
+        let localKey = deviceModel.localKey
+        
         guard let config = ThingSmartCameraFactory.ipcConfig(
             withUid: ThingSmartUser.sharedInstance().uid,
-            localKey: device.deviceModel.localKey,
+            localKey: localKey,
             configData: configData as? [AnyHashable: Any]
         ) else {
-            print("Tuya: Camera config creation failed")
+            print("Tuya: Camera config creation failed - config is nil")
             self.updateStatus(isConnected: false, previewLoader: false)
             return
         }
@@ -393,6 +447,8 @@ class Tuya: NSObject, ObservableObject {
                 isSdCardPopUpFormatClicked: false
             )
 
+            self.resyncRetryCount = 0
+            self.isResyncing = false
             self.resetFirmwareValues()
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rentlydev/rently-tuya",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "rently-tuya",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",