Merge branch 'main' of github.com:koush/scrypted

koush · Oct 20, 2024 · 3f4409e · 3f4409e
2 parents 63b7616 + 2905969
commit 3f4409e
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 20 deletions.
diff --git a/plugins/alexa/package-lock.json b/plugins/alexa/package-lock.json
diff --git a/plugins/alexa/package.json b/plugins/alexa/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/alexa",
-   "version": "0.3.3",
+   "version": "0.3.4",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
       "prescrypted-setup-project": "scrypted-package-json",

diff --git a/plugins/alexa/src/main.ts b/plugins/alexa/src/main.ts
@@ -53,6 +53,12 @@ class AlexaPlugin extends ScryptedDeviceBase implements HttpRequestHandler, Mixi
             title: "Pairing Key",
             description: "The pairing key used to validate requests from Alexa. Clear this key or delete the plugin to allow pairing with a different Alexa login.",
         },
+        disableAutoAdd: {
+            title: "Disable auto add",
+            description: "Disable automatic enablement of devices.",
+            type: 'boolean',
+            defaultValue: false,
+        },
     });
 
     accessToken: Promise<string>;
@@ -116,6 +122,10 @@ class AlexaPlugin extends ScryptedDeviceBase implements HttpRequestHandler, Mixi
         if (!supportedTypes.has(device.type))
             return DeviceMixinStatus.NotSupported;
 
+        if (this.storageSettings.values.disableAutoAdd) {
+            return DeviceMixinStatus.Skip;
+        }
+
         mixins.push(this.id);
 
         const plugins = await systemManager.getComponent('plugins');
@@ -671,7 +681,8 @@ class AlexaPlugin extends ScryptedDeviceBase implements HttpRequestHandler, Mixi
 enum DeviceMixinStatus {
     NotSupported = 0,
     Setup = 1,
-    AlreadySetup = 2
+    AlreadySetup = 2,
+    Skip = 3,
 }
 
 class HttpResponseLoggingImpl implements AlexaHttpResponse {

diff --git a/plugins/reolink/src/main.ts b/plugins/reolink/src/main.ts
@@ -52,6 +52,7 @@ class ReolinkCameraSiren extends ScryptedDeviceBase implements OnOff {
 
 class ReolinkCamera extends RtspSmartCamera implements Camera, DeviceProvider, Reboot, Intercom, ObjectDetector, PanTiltZoom {
     client: ReolinkCameraClient;
+    clientWithToken: ReolinkCameraClient;
     onvifClient: OnvifCameraAPI;
     onvifIntercom = new OnvifIntercom(this);
     videoStreamOptions: Promise<UrlMediaStreamOptions[]>;
@@ -341,6 +342,12 @@ class ReolinkCamera extends RtspSmartCamera implements Camera, DeviceProvider, R
         return this.client;
     }
 
+    getClientWithToken() {
+        if (!this.clientWithToken)
+            this.clientWithToken = new ReolinkCameraClient(this.getHttpAddress(), this.getUsername(), this.getPassword(), this.getRtspChannel(), this.console, true);
+        return this.clientWithToken;
+    }
+
     async getOnvifClient() {
         if (!this.onvifClient)
             this.onvifClient = await this.createOnvifClient();

diff --git a/plugins/reolink/src/probe.ts b/plugins/reolink/src/probe.ts
@@ -46,25 +46,27 @@ async function getDeviceInfo(host: string, username: string, password: string):
     return response.body?.[0]?.value?.DevInfo;
 }
 
-export async function getLoginParameters(host: string, username: string, password: string) {
-    try {
-        await getDeviceInfo(host, username, password);
-        return {
-            parameters: {
-                user: username,
-                password,
-            },
-            leaseTimeSeconds: Infinity,
+export async function getLoginParameters(host: string, username: string, password: string, forceToken?: boolean) {
+    if (!forceToken) {
+        try {
+            await getDeviceInfo(host, username, password);
+            return {
+                parameters: {
+                    user: username,
+                    password,
+                },
+                leaseTimeSeconds: Infinity,
+            }
+        }
+        catch (e) {
         }
-    }
-    catch (e) {
     }
 
     try {
         const url = new URL(`http://${host}/api.cgi`);
         const params = url.searchParams;
         params.set('cmd', 'Login');
-    
+
         const response = await httpFetch({
             url,
             method: 'POST',
@@ -83,7 +85,7 @@ export async function getLoginParameters(host: string, username: string, passwor
                 },
             ],
         });
-    
+
         const token = response.body?.[0]?.value?.Token?.name || response.body?.value?.Token?.name;
         if (!token)
             throw new Error('unable to login');

diff --git a/plugins/reolink/src/reolink-api.ts b/plugins/reolink/src/reolink-api.ts
@@ -49,7 +49,7 @@ export class ReolinkCameraClient {
     parameters: Record<string, string>;
     tokenLease: number;
 
-    constructor(public host: string, public username: string, public password: string, public channelId: number, public console: Console) {
+    constructor(public host: string, public username: string, public password: string, public channelId: number, public console: Console, public readonly forceToken?: boolean) {
         this.credential = {
             username,
             password,
@@ -80,7 +80,7 @@ export class ReolinkCameraClient {
 
         this.console.log(`token expired at ${this.tokenLease}, renewing...`);
 
-        const { parameters, leaseTimeSeconds } = await getLoginParameters(this.host, this.username, this.password);
+        const { parameters, leaseTimeSeconds } = await getLoginParameters(this.host, this.username, this.password, this.forceToken);
         this.parameters = parameters
         this.tokenLease = Date.now() + 1000 * leaseTimeSeconds;
     }