1.6.4

dist/homeassistant.d.ts

@@ -28,5 +28,6 @@ export type API_HA_DeskPosition = {
     position: string;
     is_standing: boolean;
     last_changed: string;
+    last_changed_seconds: number;
 };
 //# sourceMappingURL=homeassistant.d.ts.map

dist/homeassistant.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"homeassistant.d.ts","sourceRoot":"","sources":["../src/homeassistant.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,mBAAmB,GAAG;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE;QACV,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE;QACP,EAAE,EAAE,MAAM,CAAC;QACX,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;KACxB,CAAC;CACH,CAAC;AAEF,MAAM,WAAW,+BAA+B;IAC9C,GAAG,EAAE,mBAAmB,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,MAAM,MAAM,CAAC;IACtB,YAAY,EAAE,WAAW,CAAC;CAC3B;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC"}
+{"version":3,"file":"homeassistant.d.ts","sourceRoot":"","sources":["../src/homeassistant.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,mBAAmB,GAAG;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE;QACX,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACvB,CAAC;IACF,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE;QACR,EAAE,EAAE,MAAM,CAAC;QACX,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;KACvB,CAAC;CACF,CAAC;AAEF,MAAM,WAAW,+BAA+B;IAC/C,GAAG,EAAE,mBAAmB,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,MAAM,MAAM,CAAC;IACtB,YAAY,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,MAAM,mBAAmB,GAAG;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAC7B,CAAC"}

dist/homepage.d.ts

@@ -1,5 +1,5 @@
-import { API_HA_DeskPosition } from "./homeassistant";
+import { type API_HA_DeskPosition } from "./homeassistant";
-import { TidalGetCurrent } from "./tidal";
+import { type TidalGetCurrent } from "./tidal";
 export type FullInformation = {
     ha_desk_position: API_HA_DeskPosition | null;
     ha_temp: string | null;

dist/homepage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"homepage.d.ts","sourceRoot":"","sources":["../src/homepage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,MAAM,MAAM,eAAe,GAAG;IAC7B,gBAAgB,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC7C,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,aAAa,EAAE,eAAe,GAAG,IAAI,CAAC;CACtC,CAAA"}
+{"version":3,"file":"homepage.d.ts","sourceRoot":"","sources":["../src/homepage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,MAAM,MAAM,eAAe,GAAG;IAC7B,gBAAgB,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC7C,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,aAAa,EAAE,eAAe,GAAG,IAAI,CAAC;CACtC,CAAC"}

dist/sse.d.ts

@@ -1,5 +1,6 @@
+import { UUID } from "crypto";
 export type SseClient = {
-    id: number;
+    id: UUID;
     send: (data: SseEvent) => void;
 };
 export type SseEvent = {
@@ -7,10 +8,19 @@ export type SseEvent = {
     data?: unknown;
     message?: string;
 };
+export type SseClientChangeEvent = {
+    type: "add" | "remove";
+    clientId: string;
+    clientCount: number;
+};
+export type SseClientChangeCallback = (event: SseClientChangeEvent) => void;
 export declare class SseService {
     private clients;
+    private clientChangeCallbacks;
+    onClientChange(callback: SseClientChangeCallback): () => void;
+    private emitClientChange;
     addClient(client: SseClient): void;
-    removeClient(clientId: number): void;
+    removeClient(clientId: string): void;
     notifyClients(event: SseEvent): void;
     getClientCount(): number;
 }

dist/sse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../src/sse.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,SAAS,GAAG;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;CAC/B,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB,CAAA;AAED,qBAAa,UAAU;IACtB,OAAO,CAAC,OAAO,CAAwB;IAEvC,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAOlC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAUpC,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAMpC,cAAc,IAAI,MAAM;CAGxB"}
+{"version":3,"file":"sse.d.ts","sourceRoot":"","sources":["../src/sse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAG9B,MAAM,MAAM,SAAS,GAAG;IACvB,EAAE,EAAE,IAAI,CAAC;IACT,IAAI,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAClC,IAAI,EAAE,KAAK,GAAG,QAAQ,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAE5E,qBAAa,UAAU;IACtB,OAAO,CAAC,OAAO,CAAqC;IACpD,OAAO,CAAC,qBAAqB,CAAiC;IAE9D,cAAc,CAAC,QAAQ,EAAE,uBAAuB,GAAG,MAAM,IAAI;IAS7D,OAAO,CAAC,gBAAgB;IAMxB,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IAYlC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAYpC,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAMpC,cAAc,IAAI,MAAM;CAGxB"}

dist/sse.js

@@ -1,22 +1,41 @@
-import { logInfo } from "./logger";
+import { logInfo } from "./logger.js";
 export class SseService {
-    clients = new Set();
+    clients = new Map();
-    addClient(client) {
+    clientChangeCallbacks = [];
-        this.clients.add(client);
+    onClientChange(callback) {
-        logInfo(`SSE client connected: ${client.id}. Total clients: ${this.clients.size}`);
+        this.clientChangeCallbacks.push(callback);
+        return () => {
+            this.clientChangeCallbacks = this.clientChangeCallbacks.filter((cb) => cb !== callback);
+        };
     }
-    removeClient(clientId) {
+    emitClientChange(event) {
-        const client = [...this.clients].find((c) => c.id === clientId);
+        for (const callback of this.clientChangeCallbacks) {
-        if (client) {
+            callback(event);
-            this.clients.delete(client);
-            logInfo(`SSE client disconnected: ${clientId}. Total clients: ${this.clients.size}`);
         }
     }
-    notifyClients(event) {
+    addClient(client) {
-        this.clients.forEach((client) => {
+        this.clients.set(client.id, client);
-            client.send(event);
+        logInfo(`SSE client connected: ${client.id}. Total clients: ${this.clients.size}`);
+        this.emitClientChange({
+            type: "add",
+            clientId: client.id,
+            clientCount: this.clients.size,
         });
     }
+    removeClient(clientId) {
+        this.clients.delete(clientId);
+        logInfo(`SSE client disconnected: ${clientId}. Total clients: ${this.clients.size}`);
+        this.emitClientChange({
+            type: "remove",
+            clientId,
+            clientCount: this.clients.size,
+        });
+    }
+    notifyClients(event) {
+        for (const client of this.clients.values()) {
+            client.send(event);
+        }
+    }
     getClientCount() {
         return this.clients.size;
     }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@dpu/shared",
-  "version": "1.5.3",
+  "version": "1.6.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@dpu/shared",
-      "version": "1.5.3",
+      "version": "1.6.4",
       "dependencies": {
         "axios": "^1.7.9",
         "chalk": "^5.6.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dpu/shared",
-  "version": "1.5.3",
+  "version": "1.6.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/homeassistant.ts

@@ -1,34 +1,35 @@
 import type { TimeBetween } from "./timehelper";
 
 export type HomeAssistantEntity = {
-  entity_id: string;
+	entity_id: string;
-  state: string;
+	state: string;
-  attributes: {
+	attributes: {
-    state_class?: string;
+		state_class?: string;
-    unit_of_measurement?: string;
+		unit_of_measurement?: string;
-    icon?: string;
+		icon?: string;
-    friendly_name?: string;
+		friendly_name?: string;
-    [key: string]: unknown;
+		[key: string]: unknown;
-  };
+	};
-  last_changed: string; // datetime string
+	last_changed: string; // datetime string
-  last_reported: string; // datetime string
+	last_reported: string; // datetime string
-  last_updated: string; // datetime string
+	last_updated: string; // datetime string
-  context: {
+	context: {
-    id: string;
+		id: string;
-    parent_id: string | null;
+		parent_id: string | null;
-    user_id: string | null;
+		user_id: string | null;
-  };
+	};
 };
 
 export interface HomeAssistantDeskPositionResult {
-  raw: HomeAssistantEntity;
+	raw: HomeAssistantEntity;
-  as_boolean: boolean;
+	as_boolean: boolean;
-  as_text: () => string;
+	as_text: () => string;
-  last_changed: TimeBetween;
+	last_changed: TimeBetween;
 }
 
 export type API_HA_DeskPosition = {
-  position: string;
+	position: string;
-  is_standing: boolean;
+	is_standing: boolean;
-  last_changed: string;
+	last_changed: string;
+	last_changed_seconds: number;
 };

src/homepage.ts

@@ -1,8 +1,8 @@
-import { API_HA_DeskPosition } from "./homeassistant";
+import { type API_HA_DeskPosition } from "./homeassistant";
-import { TidalGetCurrent } from "./tidal";
+import { type TidalGetCurrent } from "./tidal";
 
 export type FullInformation = {
 	ha_desk_position: API_HA_DeskPosition | null;
 	ha_temp: string | null;
 	tidal_current: TidalGetCurrent | null;
-}
+};

src/sse.ts

@@ -1,42 +1,74 @@
-import { logInfo } from "./logger";
+import { UUID } from "crypto";
+import { logInfo } from "./logger.js";
 
 export type SseClient = {
-	id: number;
+	id: UUID;
 	send: (data: SseEvent) => void;
-}
+};
 
 export type SseEvent = {
 	type: string;
 	data?: unknown;
 	message?: string;
-}
+};
+
+export type SseClientChangeEvent = {
+	type: "add" | "remove";
+	clientId: string;
+	clientCount: number;
+};
+
+export type SseClientChangeCallback = (event: SseClientChangeEvent) => void;
 
 export class SseService {
-	private clients = new Set<SseClient>();
+	private clients: Map<string, SseClient> = new Map();
+	private clientChangeCallbacks: SseClientChangeCallback[] = [];
 
-	addClient(client: SseClient): void {
+	onClientChange(callback: SseClientChangeCallback): () => void {
-		this.clients.add(client);
+		this.clientChangeCallbacks.push(callback);
-		logInfo(
+		return () => {
-			`SSE client connected: ${client.id}. Total clients: ${this.clients.size}`,
+			this.clientChangeCallbacks = this.clientChangeCallbacks.filter(
-		);
+				(cb) => cb !== callback,
+			);
+		};
 	}
 
-	removeClient(clientId: number): void {
+	private emitClientChange(event: SseClientChangeEvent): void {
-		const client = [...this.clients].find((c) => c.id === clientId);
+		for (const callback of this.clientChangeCallbacks) {
-		if (client) {
+			callback(event);
-			this.clients.delete(client);
-			logInfo(
-				`SSE client disconnected: ${clientId}. Total clients: ${this.clients.size}`,
-			);
 		}
 	}
 
-	notifyClients(event: SseEvent): void {
+	addClient(client: SseClient): void {
-		this.clients.forEach((client) => {
+		this.clients.set(client.id, client);
-			client.send(event);
+		logInfo(
+			`SSE client connected: ${client.id}. Total clients: ${this.clients.size}`,
+		);
+		this.emitClientChange({
+			type: "add",
+			clientId: client.id,
+			clientCount: this.clients.size,
 		});
 	}
 
+	removeClient(clientId: string): void {
+		this.clients.delete(clientId);
+		logInfo(
+			`SSE client disconnected: ${clientId}. Total clients: ${this.clients.size}`,
+		);
+		this.emitClientChange({
+			type: "remove",
+			clientId,
+			clientCount: this.clients.size,
+		});
+	}
+
+	notifyClients(event: SseEvent): void {
+		for (const client of this.clients.values()) {
+			client.send(event);
+		}
+	}
+
 	getClientCount(): number {
 		return this.clients.size;
 	}