@camstack/addon-provider-amcrest 0.1.3 → 0.1.4

package/dist/addon.js

@@ -26534,17 +26534,21 @@ var AmcrestCgiClient = class AmcrestCgiClient {
 		} catch {
 			return [];
 		}
-		const out = /* @__PURE__ */ new Map();
 		const ch = channel - 1;
+		const names = /* @__PURE__ */ new Map();
+		const enabled = /* @__PURE__ */ new Set();
 		for (const [key, value] of t) {
-			const m = new RegExp(`^PtzPreset\\[${ch}\\]\\[(\\d+)\\]\\.Name$`).exec(key);
-			if (!m) continue;
-			const idx = Number.parseInt(m[1], 10);
-			out.set(idx, value);
+			const nameMatch = new RegExp(`^PtzPreset\\[${ch}\\]\\[(\\d+)\\]\\.Name$`).exec(key);
+			if (nameMatch) {
+				names.set(Number.parseInt(nameMatch[1], 10), value);
+				continue;
+			}
+			const enableMatch = new RegExp(`^PtzPreset\\[${ch}\\]\\[(\\d+)\\]\\.Enable$`).exec(key);
+			if (enableMatch && value.trim().toLowerCase() === "true") enabled.add(Number.parseInt(enableMatch[1], 10));
 		}
-		return [...out.entries()].toSorted((a, b) => a[0] - b[0]).map(([id, name]) => ({
-			id,
-			name: name || `Preset ${id}`
+		return [...enabled].toSorted((a, b) => a - b).map((idx) => ({
+			id: idx + 1,
+			name: names.get(idx) || `Preset ${idx + 1}`
 		}));
 	}
 };
@@ -27178,9 +27182,12 @@ var AmcrestCamera = class AmcrestCamera extends BaseDevice {
 			},
 			savePreset: async ({ deviceId, presetId, name }) => {
 				if (deviceId !== this.id) return;
-				const id = Number.parseInt(presetId, 10);
-				if (!Number.isFinite(id)) return;
-				await this.ensureClient().ptzSetPreset(this.channel, id);
+				const client = this.ensureClient();
+				const requested = Number.parseInt(presetId, 10);
+				const used = new Set((await client.getPtzPresets(this.channel)).map((p) => p.id));
+				let slot = Number.isFinite(requested) && requested >= 1 && !used.has(requested) ? requested : 1;
+				while (used.has(slot)) slot += 1;
+				await client.ptzSetPreset(this.channel, slot);
 			},
 			deletePreset: async ({ deviceId, presetId }) => {
 				if (deviceId !== this.id) return;

package/dist/addon.mjs

@@ -26535,17 +26535,21 @@ var AmcrestCgiClient = class AmcrestCgiClient {
 		} catch {
 			return [];
 		}
-		const out = /* @__PURE__ */ new Map();
 		const ch = channel - 1;
+		const names = /* @__PURE__ */ new Map();
+		const enabled = /* @__PURE__ */ new Set();
 		for (const [key, value] of t) {
-			const m = new RegExp(`^PtzPreset\\[${ch}\\]\\[(\\d+)\\]\\.Name$`).exec(key);
-			if (!m) continue;
-			const idx = Number.parseInt(m[1], 10);
-			out.set(idx, value);
+			const nameMatch = new RegExp(`^PtzPreset\\[${ch}\\]\\[(\\d+)\\]\\.Name$`).exec(key);
+			if (nameMatch) {
+				names.set(Number.parseInt(nameMatch[1], 10), value);
+				continue;
+			}
+			const enableMatch = new RegExp(`^PtzPreset\\[${ch}\\]\\[(\\d+)\\]\\.Enable$`).exec(key);
+			if (enableMatch && value.trim().toLowerCase() === "true") enabled.add(Number.parseInt(enableMatch[1], 10));
 		}
-		return [...out.entries()].toSorted((a, b) => a[0] - b[0]).map(([id, name]) => ({
-			id,
-			name: name || `Preset ${id}`
+		return [...enabled].toSorted((a, b) => a - b).map((idx) => ({
+			id: idx + 1,
+			name: names.get(idx) || `Preset ${idx + 1}`
 		}));
 	}
 };
@@ -27179,9 +27183,12 @@ var AmcrestCamera = class AmcrestCamera extends BaseDevice {
 			},
 			savePreset: async ({ deviceId, presetId, name }) => {
 				if (deviceId !== this.id) return;
-				const id = Number.parseInt(presetId, 10);
-				if (!Number.isFinite(id)) return;
-				await this.ensureClient().ptzSetPreset(this.channel, id);
+				const client = this.ensureClient();
+				const requested = Number.parseInt(presetId, 10);
+				const used = new Set((await client.getPtzPresets(this.channel)).map((p) => p.id));
+				let slot = Number.isFinite(requested) && requested >= 1 && !used.has(requested) ? requested : 1;
+				while (used.has(slot)) slot += 1;
+				await client.ptzSetPreset(this.channel, slot);
 			},
 			deletePreset: async ({ deviceId, presetId }) => {
 				if (deviceId !== this.id) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-amcrest",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Amcrest/Dahua camera device provider addon for CamStack — Dahua CGI over HTTP(S) with digest auth (snapshot, RTSP catalog, PTZ, image/day-night config)",
   "keywords": [
     "camstack",