@apocaliss92/scrypted-reolink-native 0.1.21 → 0.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@apocaliss92/scrypted-reolink-native",
-   "version": "0.1.21",
+   "version": "0.1.22",
    "description": "Use any reolink camera with Scrypted, even older/unsupported models without HTTP protocol support",
    "author": "@apocaliss92",
    "license": "Apache",

package/src/multifocal.ts

@@ -61,6 +61,8 @@ export class ReolinkNativeMultiFocalDevice extends BaseBaichuanClass implements
     cameraNativeMap = new Map<string, ReolinkNativeCamera | ReolinkNativeBatteryCamera>();
     private channelToNativeIdMap = new Map<number, string>();
     processing = false;
+    private syncInProgress = false;
+    private syncPromise: Promise<void> | undefined;
     private initReinitTimeout: NodeJS.Timeout | undefined;
 
     constructor(nativeId: string, plugin: ReolinkNativePlugin, transport: BaichuanTransport = 'tcp') {
@@ -197,10 +199,21 @@ export class ReolinkNativeMultiFocalDevice extends BaseBaichuanClass implements
     }
 
     async syncEntitiesFromRemote() {
-        const api = await this.ensureBaichuanClient();
-        const logger = this.getBaichuanLogger();
+        // If sync is already in progress, wait for it to complete
+        if (this.syncInProgress && this.syncPromise) {
+            const logger = this.getBaichuanLogger();
+            logger.debug('Sync already in progress, waiting for completion...');
+            await this.syncPromise;
+            return;
+        }
 
-        try {
+        // Start new sync
+        this.syncInProgress = true;
+        this.syncPromise = (async () => {
+            const api = await this.ensureBaichuanClient();
+            const logger = this.getBaichuanLogger();
+
+            try {
             // const channelsInfo = await api.getNvrChannelsInfo();
             // const deviceInfo = await api.getInfo();
             const { support } = await api.getDeviceCapabilities();
@@ -266,16 +279,22 @@ export class ReolinkNativeMultiFocalDevice extends BaseBaichuanClass implements
             }
 
             // logger.log(`Channel discovery completed. ${JSON.stringify({ devicesData, channels })}`);
-        } catch (e) {
-            logger.error('Failed to sync entities from remote', e);
-            if (e instanceof Error) {
-                logger.error(`Error in syncEntitiesFromRemote: ${e.message}`);
-                logger.error(`Stack: ${e.stack}`);
-            } else {
-                logger.error(`Error details: ${JSON.stringify(e)}`);
+            } catch (e) {
+                logger.error('Failed to sync entities from remote', e);
+                if (e instanceof Error) {
+                    logger.error(`Error in syncEntitiesFromRemote: ${e.message}`);
+                    logger.error(`Stack: ${e.stack}`);
+                } else {
+                    logger.error(`Error details: ${JSON.stringify(e)}`);
+                }
+                throw e;
+            } finally {
+                this.syncInProgress = false;
+                this.syncPromise = undefined;
             }
-            throw e;
-        }
+        })();
+
+        await this.syncPromise;
     }
 
     async discoverDevices(scan?: boolean): Promise<DiscoveredDevice[]> {