@camstack/addon-advanced-notifier 1.1.14 → 1.1.15

package/dist/addon.js

@@ -21503,42 +21503,120 @@ object({
 	schemaVersion: literal(1)
 });
 //#endregion
-//#region src/rules/rule-store.ts
+//#region src/history/audit-log.ts
 var COLLECTION$1 = "addon-settings";
-var KEY = "advanced-notifier:rules";
-var RuleStore = class {
+var LOG_KEY = "notifier-history:log";
+var AuditLog = class {
 	api;
-	constructor(api) {
+	maxEntries;
+	constructor(api, maxEntries = 1e3) {
 		this.api = api;
+		this.maxEntries = maxEntries;
 	}
-	async getRules() {
+	async record(entry) {
+		const updated = [...await this.getAll(), entry];
+		const trimmed = updated.length > this.maxEntries ? updated.slice(updated.length - this.maxEntries) : updated;
+		await this.api.settingsStore.set.mutate({
+			collection: COLLECTION$1,
+			key: LOG_KEY,
+			value: trimmed
+		});
+	}
+	async getHistory(filter) {
+		let entries = await this.getAll();
+		if (filter?.ruleId) entries = entries.filter((e) => e.ruleId === filter.ruleId);
+		if (filter?.deviceId) {
+			const deviceId = filter.deviceId;
+			entries = entries.filter((e) => e.deviceId === deviceId);
+		}
+		if (filter?.from !== void 0) {
+			const from = filter.from;
+			entries = entries.filter((e) => e.timestamp >= from);
+		}
+		if (filter?.to !== void 0) {
+			const to = filter.to;
+			entries = entries.filter((e) => e.timestamp <= to);
+		}
+		if (filter?.limit) entries = entries.slice(-filter.limit);
+		return entries;
+	}
+	async getAll() {
 		const raw = await this.api.settingsStore.get.query({
 			collection: COLLECTION$1,
-			key: KEY
+			key: LOG_KEY
 		});
 		if (!raw || !Array.isArray(raw)) return [];
 		return raw;
 	}
-	async saveRules(rules) {
-		await this.api.settingsStore.set.mutate({
-			collection: COLLECTION$1,
-			key: KEY,
-			value: [...rules]
+};
+//#endregion
+//#region src/outputs/console.ts
+var ConsoleOutput = class {
+	id = "console";
+	name = "Console Log";
+	icon = "terminal";
+	logger;
+	constructor(logger) {
+		this.logger = logger;
+	}
+	async send(notification) {
+		this.logger.info(`[p${notification.priority}] ${notification.title ?? ""}: ${notification.body}`, notification.deviceId !== void 0 ? { tags: { deviceId: notification.deviceId } } : void 0);
+	}
+	async sendTest() {
+		await this.send({
+			title: "Test",
+			body: "Console output working",
+			format: "text",
+			priority: 3
 		});
+		return { success: true };
 	}
-	async upsertRule(rule) {
-		const rules = await this.getRules();
-		const idx = rules.findIndex((r) => r.id === rule.id);
-		if (idx >= 0) rules[idx] = rule;
-		else rules.push(rule);
-		await this.saveRules(rules);
+};
+//#endregion
+//#region src/rules/cooldown.ts
+var CooldownTracker = class {
+	lastFired = /* @__PURE__ */ new Map();
+	canFire(ruleId, cooldownSeconds) {
+		const last = this.lastFired.get(ruleId);
+		if (last === void 0) return true;
+		return (Date.now() - last) / 1e3 >= cooldownSeconds;
 	}
-	async deleteRule(ruleId) {
-		const rules = await this.getRules();
-		await this.saveRules(rules.filter((r) => r.id !== ruleId));
+	recordFire(ruleId) {
+		this.lastFired.set(ruleId, Date.now());
+	}
+	reset() {
+		this.lastFired.clear();
 	}
 };
 //#endregion
+//#region src/rules/recent-events.ts
+/**
+* Rehydrate serialized recent events into `SystemEvent`s and drop any that
+* fall before `since`. Order is preserved (the hub returns oldest → newest).
+*/
+function reconstructRecentEvents(serialized, since) {
+	const sinceMs = since.getTime();
+	const events = [];
+	for (const e of serialized) {
+		const timestamp = new Date(e.timestamp);
+		if (timestamp.getTime() < sinceMs) continue;
+		events.push({
+			id: e.id,
+			timestamp,
+			source: {
+				type: e.source.type,
+				id: e.source.id,
+				...e.source.nodeId !== void 0 ? { nodeId: e.source.nodeId } : {},
+				...e.source.addonId !== void 0 ? { addonId: e.source.addonId } : {},
+				...e.source.deviceId !== void 0 ? { deviceId: e.source.deviceId } : {}
+			},
+			category: e.category,
+			data: e.data
+		});
+	}
+	return events;
+}
+//#endregion
 //#region src/rules/rule-engine.ts
 var RuleEngine = class {
 	clip;
@@ -21611,19 +21689,39 @@ var RuleEngine = class {
 	}
 };
 //#endregion
-//#region src/rules/cooldown.ts
-var CooldownTracker = class {
-	lastFired = /* @__PURE__ */ new Map();
-	canFire(ruleId, cooldownSeconds) {
-		const last = this.lastFired.get(ruleId);
-		if (last === void 0) return true;
-		return (Date.now() - last) / 1e3 >= cooldownSeconds;
+//#region src/rules/rule-store.ts
+var COLLECTION = "addon-settings";
+var KEY = "advanced-notifier:rules";
+var RuleStore = class {
+	api;
+	constructor(api) {
+		this.api = api;
 	}
-	recordFire(ruleId) {
-		this.lastFired.set(ruleId, Date.now());
+	async getRules() {
+		const raw = await this.api.settingsStore.get.query({
+			collection: COLLECTION,
+			key: KEY
+		});
+		if (!raw || !Array.isArray(raw)) return [];
+		return raw;
 	}
-	reset() {
-		this.lastFired.clear();
+	async saveRules(rules) {
+		await this.api.settingsStore.set.mutate({
+			collection: COLLECTION,
+			key: KEY,
+			value: [...rules]
+		});
+	}
+	async upsertRule(rule) {
+		const rules = await this.getRules();
+		const idx = rules.findIndex((r) => r.id === rule.id);
+		if (idx >= 0) rules[idx] = rule;
+		else rules.push(rule);
+		await this.saveRules(rules);
+	}
+	async deleteRule(ruleId) {
+		const rules = await this.getRules();
+		await this.saveRules(rules.filter((r) => r.id !== ruleId));
 	}
 };
 //#endregion
@@ -21635,76 +21733,6 @@ function renderTemplate(template, variables) {
 	});
 }
 //#endregion
-//#region src/outputs/console.ts
-var ConsoleOutput = class {
-	id = "console";
-	name = "Console Log";
-	icon = "terminal";
-	logger;
-	constructor(logger) {
-		this.logger = logger;
-	}
-	async send(notification) {
-		this.logger.info(`[p${notification.priority}] ${notification.title ?? ""}: ${notification.body}`, notification.deviceId !== void 0 ? { tags: { deviceId: notification.deviceId } } : void 0);
-	}
-	async sendTest() {
-		await this.send({
-			title: "Test",
-			body: "Console output working",
-			format: "text",
-			priority: 3
-		});
-		return { success: true };
-	}
-};
-//#endregion
-//#region src/history/audit-log.ts
-var COLLECTION = "addon-settings";
-var LOG_KEY = "notifier-history:log";
-var AuditLog = class {
-	api;
-	maxEntries;
-	constructor(api, maxEntries = 1e3) {
-		this.api = api;
-		this.maxEntries = maxEntries;
-	}
-	async record(entry) {
-		const updated = [...await this.getAll(), entry];
-		const trimmed = updated.length > this.maxEntries ? updated.slice(updated.length - this.maxEntries) : updated;
-		await this.api.settingsStore.set.mutate({
-			collection: COLLECTION,
-			key: LOG_KEY,
-			value: trimmed
-		});
-	}
-	async getHistory(filter) {
-		let entries = await this.getAll();
-		if (filter?.ruleId) entries = entries.filter((e) => e.ruleId === filter.ruleId);
-		if (filter?.deviceId) {
-			const deviceId = filter.deviceId;
-			entries = entries.filter((e) => e.deviceId === deviceId);
-		}
-		if (filter?.from !== void 0) {
-			const from = filter.from;
-			entries = entries.filter((e) => e.timestamp >= from);
-		}
-		if (filter?.to !== void 0) {
-			const to = filter.to;
-			entries = entries.filter((e) => e.timestamp <= to);
-		}
-		if (filter?.limit) entries = entries.slice(-filter.limit);
-		return entries;
-	}
-	async getAll() {
-		const raw = await this.api.settingsStore.get.query({
-			collection: COLLECTION,
-			key: LOG_KEY
-		});
-		if (!raw || !Array.isArray(raw)) return [];
-		return raw;
-	}
-};
-//#endregion
 //#region src/addon.ts
 var EVENT_CATEGORIES = [
 	EventCategory.DetectionRaw,
@@ -21756,7 +21784,9 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 			const rule = this.cachedRules.find((r) => r.id === ruleId);
 			if (!rule) return { results: [] };
 			const since = /* @__PURE__ */ new Date(Date.now() - lookbackMinutes * 60 * 1e3);
-			return { results: this.ctx.eventBus.getRecent({ category: void 0 }, 1e3).filter((e) => e.timestamp >= since).map((event) => {
+			const api = this.ctx.api;
+			if (!api) return { results: [] };
+			return { results: reconstructRecentEvents(await api.eventBusProxy.getRecent.query({ limit: 1e3 }), since).map((event) => {
 				const matched = this.ruleEngine.evaluate(event, [rule]);
 				return {
 					ruleId,

package/dist/addon.mjs

@@ -21499,42 +21499,120 @@ object({
 	schemaVersion: literal(1)
 });
 //#endregion
-//#region src/rules/rule-store.ts
+//#region src/history/audit-log.ts
 var COLLECTION$1 = "addon-settings";
-var KEY = "advanced-notifier:rules";
-var RuleStore = class {
+var LOG_KEY = "notifier-history:log";
+var AuditLog = class {
 	api;
-	constructor(api) {
+	maxEntries;
+	constructor(api, maxEntries = 1e3) {
 		this.api = api;
+		this.maxEntries = maxEntries;
 	}
-	async getRules() {
+	async record(entry) {
+		const updated = [...await this.getAll(), entry];
+		const trimmed = updated.length > this.maxEntries ? updated.slice(updated.length - this.maxEntries) : updated;
+		await this.api.settingsStore.set.mutate({
+			collection: COLLECTION$1,
+			key: LOG_KEY,
+			value: trimmed
+		});
+	}
+	async getHistory(filter) {
+		let entries = await this.getAll();
+		if (filter?.ruleId) entries = entries.filter((e) => e.ruleId === filter.ruleId);
+		if (filter?.deviceId) {
+			const deviceId = filter.deviceId;
+			entries = entries.filter((e) => e.deviceId === deviceId);
+		}
+		if (filter?.from !== void 0) {
+			const from = filter.from;
+			entries = entries.filter((e) => e.timestamp >= from);
+		}
+		if (filter?.to !== void 0) {
+			const to = filter.to;
+			entries = entries.filter((e) => e.timestamp <= to);
+		}
+		if (filter?.limit) entries = entries.slice(-filter.limit);
+		return entries;
+	}
+	async getAll() {
 		const raw = await this.api.settingsStore.get.query({
 			collection: COLLECTION$1,
-			key: KEY
+			key: LOG_KEY
 		});
 		if (!raw || !Array.isArray(raw)) return [];
 		return raw;
 	}
-	async saveRules(rules) {
-		await this.api.settingsStore.set.mutate({
-			collection: COLLECTION$1,
-			key: KEY,
-			value: [...rules]
+};
+//#endregion
+//#region src/outputs/console.ts
+var ConsoleOutput = class {
+	id = "console";
+	name = "Console Log";
+	icon = "terminal";
+	logger;
+	constructor(logger) {
+		this.logger = logger;
+	}
+	async send(notification) {
+		this.logger.info(`[p${notification.priority}] ${notification.title ?? ""}: ${notification.body}`, notification.deviceId !== void 0 ? { tags: { deviceId: notification.deviceId } } : void 0);
+	}
+	async sendTest() {
+		await this.send({
+			title: "Test",
+			body: "Console output working",
+			format: "text",
+			priority: 3
 		});
+		return { success: true };
 	}
-	async upsertRule(rule) {
-		const rules = await this.getRules();
-		const idx = rules.findIndex((r) => r.id === rule.id);
-		if (idx >= 0) rules[idx] = rule;
-		else rules.push(rule);
-		await this.saveRules(rules);
+};
+//#endregion
+//#region src/rules/cooldown.ts
+var CooldownTracker = class {
+	lastFired = /* @__PURE__ */ new Map();
+	canFire(ruleId, cooldownSeconds) {
+		const last = this.lastFired.get(ruleId);
+		if (last === void 0) return true;
+		return (Date.now() - last) / 1e3 >= cooldownSeconds;
 	}
-	async deleteRule(ruleId) {
-		const rules = await this.getRules();
-		await this.saveRules(rules.filter((r) => r.id !== ruleId));
+	recordFire(ruleId) {
+		this.lastFired.set(ruleId, Date.now());
+	}
+	reset() {
+		this.lastFired.clear();
 	}
 };
 //#endregion
+//#region src/rules/recent-events.ts
+/**
+* Rehydrate serialized recent events into `SystemEvent`s and drop any that
+* fall before `since`. Order is preserved (the hub returns oldest → newest).
+*/
+function reconstructRecentEvents(serialized, since) {
+	const sinceMs = since.getTime();
+	const events = [];
+	for (const e of serialized) {
+		const timestamp = new Date(e.timestamp);
+		if (timestamp.getTime() < sinceMs) continue;
+		events.push({
+			id: e.id,
+			timestamp,
+			source: {
+				type: e.source.type,
+				id: e.source.id,
+				...e.source.nodeId !== void 0 ? { nodeId: e.source.nodeId } : {},
+				...e.source.addonId !== void 0 ? { addonId: e.source.addonId } : {},
+				...e.source.deviceId !== void 0 ? { deviceId: e.source.deviceId } : {}
+			},
+			category: e.category,
+			data: e.data
+		});
+	}
+	return events;
+}
+//#endregion
 //#region src/rules/rule-engine.ts
 var RuleEngine = class {
 	clip;
@@ -21607,19 +21685,39 @@ var RuleEngine = class {
 	}
 };
 //#endregion
-//#region src/rules/cooldown.ts
-var CooldownTracker = class {
-	lastFired = /* @__PURE__ */ new Map();
-	canFire(ruleId, cooldownSeconds) {
-		const last = this.lastFired.get(ruleId);
-		if (last === void 0) return true;
-		return (Date.now() - last) / 1e3 >= cooldownSeconds;
+//#region src/rules/rule-store.ts
+var COLLECTION = "addon-settings";
+var KEY = "advanced-notifier:rules";
+var RuleStore = class {
+	api;
+	constructor(api) {
+		this.api = api;
 	}
-	recordFire(ruleId) {
-		this.lastFired.set(ruleId, Date.now());
+	async getRules() {
+		const raw = await this.api.settingsStore.get.query({
+			collection: COLLECTION,
+			key: KEY
+		});
+		if (!raw || !Array.isArray(raw)) return [];
+		return raw;
 	}
-	reset() {
-		this.lastFired.clear();
+	async saveRules(rules) {
+		await this.api.settingsStore.set.mutate({
+			collection: COLLECTION,
+			key: KEY,
+			value: [...rules]
+		});
+	}
+	async upsertRule(rule) {
+		const rules = await this.getRules();
+		const idx = rules.findIndex((r) => r.id === rule.id);
+		if (idx >= 0) rules[idx] = rule;
+		else rules.push(rule);
+		await this.saveRules(rules);
+	}
+	async deleteRule(ruleId) {
+		const rules = await this.getRules();
+		await this.saveRules(rules.filter((r) => r.id !== ruleId));
 	}
 };
 //#endregion
@@ -21631,76 +21729,6 @@ function renderTemplate(template, variables) {
 	});
 }
 //#endregion
-//#region src/outputs/console.ts
-var ConsoleOutput = class {
-	id = "console";
-	name = "Console Log";
-	icon = "terminal";
-	logger;
-	constructor(logger) {
-		this.logger = logger;
-	}
-	async send(notification) {
-		this.logger.info(`[p${notification.priority}] ${notification.title ?? ""}: ${notification.body}`, notification.deviceId !== void 0 ? { tags: { deviceId: notification.deviceId } } : void 0);
-	}
-	async sendTest() {
-		await this.send({
-			title: "Test",
-			body: "Console output working",
-			format: "text",
-			priority: 3
-		});
-		return { success: true };
-	}
-};
-//#endregion
-//#region src/history/audit-log.ts
-var COLLECTION = "addon-settings";
-var LOG_KEY = "notifier-history:log";
-var AuditLog = class {
-	api;
-	maxEntries;
-	constructor(api, maxEntries = 1e3) {
-		this.api = api;
-		this.maxEntries = maxEntries;
-	}
-	async record(entry) {
-		const updated = [...await this.getAll(), entry];
-		const trimmed = updated.length > this.maxEntries ? updated.slice(updated.length - this.maxEntries) : updated;
-		await this.api.settingsStore.set.mutate({
-			collection: COLLECTION,
-			key: LOG_KEY,
-			value: trimmed
-		});
-	}
-	async getHistory(filter) {
-		let entries = await this.getAll();
-		if (filter?.ruleId) entries = entries.filter((e) => e.ruleId === filter.ruleId);
-		if (filter?.deviceId) {
-			const deviceId = filter.deviceId;
-			entries = entries.filter((e) => e.deviceId === deviceId);
-		}
-		if (filter?.from !== void 0) {
-			const from = filter.from;
-			entries = entries.filter((e) => e.timestamp >= from);
-		}
-		if (filter?.to !== void 0) {
-			const to = filter.to;
-			entries = entries.filter((e) => e.timestamp <= to);
-		}
-		if (filter?.limit) entries = entries.slice(-filter.limit);
-		return entries;
-	}
-	async getAll() {
-		const raw = await this.api.settingsStore.get.query({
-			collection: COLLECTION,
-			key: LOG_KEY
-		});
-		if (!raw || !Array.isArray(raw)) return [];
-		return raw;
-	}
-};
-//#endregion
 //#region src/addon.ts
 var EVENT_CATEGORIES = [
 	EventCategory.DetectionRaw,
@@ -21752,7 +21780,9 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 			const rule = this.cachedRules.find((r) => r.id === ruleId);
 			if (!rule) return { results: [] };
 			const since = /* @__PURE__ */ new Date(Date.now() - lookbackMinutes * 60 * 1e3);
-			return { results: this.ctx.eventBus.getRecent({ category: void 0 }, 1e3).filter((e) => e.timestamp >= since).map((event) => {
+			const api = this.ctx.api;
+			if (!api) return { results: [] };
+			return { results: reconstructRecentEvents(await api.eventBusProxy.getRecent.query({ limit: 1e3 }), since).map((event) => {
 				const matched = this.ruleEngine.evaluate(event, [rule]);
 				return {
 					ruleId,
@@ -21980,4 +22010,4 @@ var AdvancedNotifierAddon = class extends BaseAddon {
 	}
 };
 //#endregion
-export { AdvancedNotifierAddon, AdvancedNotifierAddon as default, RuleEngine as a, CooldownTracker as i, ConsoleOutput as n, RuleStore as o, renderTemplate as r, AuditLog as t };
+export { AdvancedNotifierAddon, AdvancedNotifierAddon as default, ConsoleOutput as a, CooldownTracker as i, RuleStore as n, AuditLog as o, RuleEngine as r, renderTemplate as t };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { AdvancedNotifierAddon, a as RuleEngine, i as CooldownTracker, n as ConsoleOutput, o as RuleStore, r as renderTemplate, t as AuditLog } from "./addon.mjs";
+import { AdvancedNotifierAddon, a as ConsoleOutput, i as CooldownTracker, n as RuleStore, o as AuditLog, r as RuleEngine, t as renderTemplate } from "./addon.mjs";
 //#region src/outputs/http.ts
 /**
 * Outbound HTTP helper for notification outputs.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-advanced-notifier",
-  "version": "1.1.14",
+  "version": "1.1.15",
   "description": "Rules-based notification engine for CamStack",
   "license": "MIT",
   "main": "./dist/index.js",