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

koush · Jun 21, 2023 · 9f73b92 · 9f73b92
2 parents 381892f + a28df23
commit 9f73b92
Show file tree

Hide file tree

Showing 3 changed files with 148 additions and 36 deletions.
diff --git a/plugins/snapshot/package-lock.json b/plugins/snapshot/package-lock.json
diff --git a/plugins/snapshot/package.json b/plugins/snapshot/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/snapshot",
-   "version": "0.0.55",
+   "version": "0.0.56",
    "description": "Snapshot Plugin for Scrypted",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
@@ -33,14 +33,14 @@
    },
    "dependencies": {
       "@koush/axios-digest-auth": "^0.8.5",
-      "@types/node": "^16.6.1",
-      "axios": "^0.24.0",
+      "@types/node": "^18.16.18",
+      "axios": "^1.4.0",
       "whatwg-mimetype": "^3.0.0"
    },
    "devDependencies": {
       "@scrypted/common": "file:../../common",
       "@scrypted/sdk": "file:../../sdk",
       "@types/sharp": "^0.31.1",
-      "@types/whatwg-mimetype": "^2.1.1"
+      "@types/whatwg-mimetype": "^3.0.0"
    }
 }
diff --git a/plugins/snapshot/src/main.ts b/plugins/snapshot/src/main.ts
@@ -213,6 +213,7 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera {
                     method: "GET",
                     responseType: 'arraybuffer',
                     url: this.storageSettings.values.snapshotUrl,
+                    timeout: 60000,
                 }).then(async (response: { data: any; }) => response.data);
             }
             else if (this.mixinDeviceInterfaces.includes(ScryptedInterface.Camera)) {