@apocaliss92/scrypted-reolink-native 0.1.30 → 0.1.32

package/package.json

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

package/src/baichuan-base.ts

@@ -58,10 +58,6 @@ export class BaichuanLogger implements Console {
         }
     }
 
-    isDebugEnabled(): boolean {
-        return this.isDebugEnabledCallback();
-    }
-
     // Console interface implementation - delegate to baseLogger
     assert(condition?: boolean, ...data: any[]): void {
         this.baseLogger.assert(condition, ...data);

package/src/camera-battery.ts

@@ -13,8 +13,6 @@ import { ReolinkNativeNvrDevice } from "./nvr";
 import { ReolinkNativeMultiFocalDevice } from "./multiFocal";
 
 export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
-    private lastPicture: { mo: MediaObject; atMs: number } | undefined;
-    private takePictureInFlight: Promise<MediaObject> | undefined;
     doorbellBinaryTimeout?: NodeJS.Timeout;
     motionDetected: boolean = false;
     motionTimeout: NodeJS.Timeout | undefined;
@@ -22,17 +20,11 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
     private sleepCheckTimer: NodeJS.Timeout | undefined;
     private batteryUpdateTimer: NodeJS.Timeout | undefined;
     private lastBatteryLevel: number | undefined;
-    private forceNewSnapshot: boolean = false;
     private batteryUpdateInProgress: boolean = false;
 
-    private isBatteryInfoLoggingEnabled(): boolean {
-        const debugLogs = this.storageSettings.values.debugLogs || [];
-        return debugLogs.includes(DebugLogOption.BatteryInfo);
-    }
-
     constructor(
-        nativeId: string, 
-        public plugin: ReolinkNativePlugin, 
+        nativeId: string,
+        public plugin: ReolinkNativePlugin,
         nvrDevice?: ReolinkNativeNvrDevice,
         multiFocalDevice?: ReolinkNativeMultiFocalDevice
     ) {
@@ -43,53 +35,6 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
         });
     }
 
-    async takePicture(options?: RequestPictureOptions): Promise<MediaObject> {
-        const logger = this.getBaichuanLogger();
-        // Allow new snapshot if:
-        // 1. forceNewSnapshot is true, OR
-        // 2. Camera is awake AND last snapshot was taken at least 10 seconds ago
-        // const minSnapshotIntervalMs = 10_000; // 10 seconds
-        // const now = Date.now();
-        const shouldTakeNewSnapshot = this.forceNewSnapshot;
-        // const now = Date.now();
-        // const shouldTakeNewSnapshot = this.forceNewSnapshot || 
-        //     (!this.sleeping && this.lastPicture && (now - this.lastPicture.atMs >= minSnapshotIntervalMs));
-
-        if (!shouldTakeNewSnapshot && this.lastPicture) {
-            logger.debug(`Returning cached snapshot, taken at ${new Date(this.lastPicture.atMs).toLocaleString()}`);
-            return this.lastPicture.mo;
-        }
-
-        if (this.takePictureInFlight) {
-            return await this.takePictureInFlight;
-        }
-
-        logger.log(`Taking new snapshot from camera (forceNewSnapshot: ${this.forceNewSnapshot})`);
-        this.forceNewSnapshot = false;
-
-        this.takePictureInFlight = (async () => {
-            const channel = this.storageSettings.values.rtspChannel;
-            const snapshotBuffer = await this.withBaichuanClient(async (api) => {
-                return await api.getSnapshot(channel);
-            });
-            const mo = await sdk.mediaManager.createMediaObject(snapshotBuffer, 'image/jpeg');
-            this.lastPicture = { mo, atMs: Date.now() };
-            logger.log(`Snapshot taken at ${new Date(this.lastPicture.atMs).toLocaleString()}`);
-            return mo;
-        })();
-
-        try {
-            return await this.takePictureInFlight;
-        }
-        finally {
-            this.takePictureInFlight = undefined;
-        }
-    }
-
-    async getPictureOptions(): Promise<ResponsePictureOptions[]> {
-        return [];
-    }
-
     async init(): Promise<void> {
         this.startPeriodicTasks();
         await this.alignAuxDevicesState();
@@ -154,7 +99,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
 
     async updateSleepingState(sleepStatus: SleepStatus): Promise<void> {
         try {
-            if (this.isBatteryInfoLoggingEnabled()) {
+            if (this.isDebugEnabled()) {
                 this.getBaichuanLogger().debug('getSleepStatus result:', JSON.stringify(sleepStatus));
             }
 
@@ -212,7 +157,7 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
         const channel = this.storageSettings.values.rtspChannel;
 
         const batteryInfo = await api.getBatteryInfo(channel);
-        if (this.isBatteryInfoLoggingEnabled()) {
+        if (this.isDebugEnabled()) {
             this.getBaichuanLogger().debug('getBatteryInfo result:', JSON.stringify(batteryInfo));
         }
 
@@ -379,7 +324,4 @@ export class ReolinkNativeBatteryCamera extends CommonCameraMixin {
         return fn(client);
     }
 
-    async createStreamClient(): Promise<ReolinkBaichuanApi> {
-        return await this.ensureClient();
-    }
 }

package/src/camera.ts

@@ -74,28 +74,6 @@ export class ReolinkNativeCamera extends CommonCameraMixin {
     }
 
 
-    async createStreamClient(): Promise<ReolinkBaichuanApi> {
-        const { ipAddress, username, password } = this.storageSettings.values;
-        const logger = this.getBaichuanLogger();
-
-        const debugOptions = this.getBaichuanDebugOptions();
-        const api = await createBaichuanApi(
-            {
-                inputs: {
-                    host: ipAddress,
-                    username: username,
-                    password: password,
-                    logger,
-                    debugOptions
-                },
-                transport: 'tcp',
-            },
-        );
-        await api.login();
-
-        return api;
-    }
-
     private passiveRefreshTimer: ReturnType<typeof setTimeout> | undefined;
 
     async release() {
@@ -175,21 +153,6 @@ export class ReolinkNativeCamera extends CommonCameraMixin {
         return fn(client);
     }
 
-    async takePicture(options?: RequestPictureOptions) {
-        try {
-            return this.withBaichuanRetry(async () => {
-                const client = await this.ensureClient();
-                const snapshotBuffer = await client.getSnapshot(this.storageSettings.values.rtspChannel);
-                const mo = await this.createMediaObject(snapshotBuffer, 'image/jpeg');
-
-                return mo;
-            });
-        } catch (e) {
-            this.getBaichuanLogger().error('Error taking snapshot', e);
-            throw e;
-        }
-    }
-
     async getPictureOptions(): Promise<ResponsePictureOptions[]> {
         return [];
     }