1.10.0

dist/fastify.js

@@ -29,7 +29,7 @@ export class BaseService {
         };
     }
     getErrorResult(errorMessage, error) {
-        logWarning(errorMessage);
+        logWarning(errorMessage, error);
         return {
             result: errorMessage,
             successful: false,

dist/homeassistant.d.ts

@@ -10,9 +10,9 @@ export type HomeAssistantEntity = {
         [key: string]: unknown;
     };
     last_changed: string;
-    last_reported: string;
-    last_updated: string;
-    context: {
+    last_reported?: string;
+    last_updated?: string;
+    context?: {
         id: string;
         parent_id: string | null;
         user_id: string | null;
@@ -28,4 +28,16 @@ export type API_HA_DeskPosition = {
     last_changed: string;
     last_changed_seconds: number;
 };
+export type HA_Update = {
+    entity_id: string;
+    state: string;
+    attributes: {
+        state_class?: string;
+        unit_of_measurement?: string;
+        icon?: string;
+        friendly_name?: string;
+        [key: string]: unknown;
+    };
+    timestamp: string;
+};
 //# 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;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,YAAY,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,MAAM,mBAAmB,GAAG;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAC7B,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,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE;QACT,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,YAAY,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,MAAM,mBAAmB,GAAG;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACvB,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,SAAS,EAAE,MAAM,CAAC;CAClB,CAAC"}

dist/homepage.d.ts

@@ -1,14 +1,11 @@
 import type { GristRecord_PersonalGoals } from "./grist";
 import type { API_HA_DeskPosition } from "./homeassistant";
+import type { StatsComponentName } from "./stats";
 import type { TidalGetCurrent } from "./tidal";
-export type FullInformation = {
+export type FullInformation = Record<StatsComponentName, unknown> & {
     ha_desk_position: API_HA_DeskPosition | null;
     ha_temp: string | null;
     tidal_current: TidalGetCurrent | null;
     grist_personal_goals: GristRecord_PersonalGoals | null;
 };
-export type ComponentUpdate = {
-    component: string;
-    data: unknown;
-};
 //# sourceMappingURL=homepage.d.ts.map

dist/homepage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"homepage.d.ts","sourceRoot":"","sources":["../src/homepage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,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;IACtC,oBAAoB,EAAE,yBAAyB,GAAG,IAAI,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;CACd,CAAC"}
+{"version":3,"file":"homepage.d.ts","sourceRoot":"","sources":["../src/homepage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,kBAAkB,EAAE,OAAO,CAAC,GAAG;IACnE,gBAAgB,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAC7C,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,aAAa,EAAE,eAAe,GAAG,IAAI,CAAC;IACtC,oBAAoB,EAAE,yBAAyB,GAAG,IAAI,CAAC;CACvD,CAAC"}

dist/index.d.ts

@@ -3,6 +3,7 @@ export * from "./grist.js";
 export * from "./homeassistant.js";
 export * from "./homepage.js";
 export * from "./logger.js";
+export * from "./stats.js";
 export * from "./tidal.js";
 export * from "./timehelper.js";
 export * from "./ws.js";

dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,SAAS,CAAC"}

dist/index.js

@@ -3,6 +3,7 @@ export * from "./grist.js";
 export * from "./homeassistant.js";
 export * from "./homepage.js";
 export * from "./logger.js";
+export * from "./stats.js";
 export * from "./tidal.js";
 export * from "./timehelper.js";
 export * from "./ws.js";

dist/stats.d.ts

@@ -0,0 +1,20 @@
+export declare const StatsComponent: {
+    readonly HA_DESK_POSITION: "ha_desk_position";
+    readonly HA_TEMP: "ha_temp";
+    readonly TIDAL_CURRENT: "tidal_current";
+    readonly GRIST_PERSONAL_GOALS: "grist_personal_goals";
+};
+export type StatsComponentName = (typeof StatsComponent)[keyof typeof StatsComponent];
+export type ComponentUpdate = {
+    component: StatsComponentName;
+    data: unknown;
+};
+export type StepRow = {
+    year: string;
+    steps: number;
+};
+export declare function createComponentUpdate(component: StatsComponentName, data: unknown): {
+    component: StatsComponentName;
+    data: unknown;
+};
+//# sourceMappingURL=stats.d.ts.map

dist/stats.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../src/stats.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc;;;;;CAKjB,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAC7B,CAAC,OAAO,cAAc,CAAC,CAAC,MAAM,OAAO,cAAc,CAAC,CAAC;AAEtD,MAAM,MAAM,eAAe,GAAG;IAC7B,SAAS,EAAE,kBAAkB,CAAC;IAC9B,IAAI,EAAE,OAAO,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,wBAAgB,qBAAqB,CACpC,SAAS,EAAE,kBAAkB,EAC7B,IAAI,EAAE,OAAO;;;EAMb"}

dist/stats.js

@@ -0,0 +1,12 @@
+export const StatsComponent = {
+    HA_DESK_POSITION: "ha_desk_position",
+    HA_TEMP: "ha_temp",
+    TIDAL_CURRENT: "tidal_current",
+    GRIST_PERSONAL_GOALS: "grist_personal_goals",
+};
+export function createComponentUpdate(component, data) {
+    return {
+        component: component,
+        data: data,
+    };
+}

dist/ws.d.ts

@@ -6,9 +6,6 @@ export type WsEvent = {
 export type WsClientChangeCallback = (clients: number) => void;
 export declare class WsService {
     private clients;
-    private listeners;
-    onClientChange(callback: WsClientChangeCallback): () => void;
-    private emitClientChange;
     addClient(ws: WebSocket): void;
     removeClient(ws: WebSocket): void;
     broadcast(message: WsEvent): void;

dist/ws.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../src/ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAGpC,MAAM,MAAM,OAAO,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAE/D,qBAAa,SAAS;IACrB,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,SAAS,CAAgC;IAEjD,cAAc,CAAC,QAAQ,EAAE,sBAAsB,GAAG,MAAM,IAAI;IAO5D,OAAO,CAAC,gBAAgB;IAMxB,SAAS,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAM9B,YAAY,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAMjC,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAMjC,cAAc,IAAI,MAAM;CAGxB"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../src/ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAGpC,MAAM,MAAM,OAAO,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAE/D,qBAAa,SAAS;IACrB,OAAO,CAAC,OAAO,CAA6B;IAE5C,SAAS,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAK9B,YAAY,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAKjC,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAMjC,cAAc,IAAI,MAAM;CAGxB"}

dist/ws.js

@@ -1,27 +1,13 @@
 import { logInfo } from "./logger.js";
 export class WsService {
     clients = new Set();
-    listeners = [];
-    onClientChange(callback) {
-        this.listeners.push(callback);
-        return () => {
-            this.listeners = this.listeners.filter((cb) => cb !== callback);
-        };
-    }
-    emitClientChange() {
-        for (const callback of this.listeners) {
-            callback(this.clients.size);
-        }
-    }
     addClient(ws) {
         this.clients.add(ws);
         logInfo(`Socket connected. Total clients: ${this.clients.size}`);
-        this.emitClientChange();
     }
     removeClient(ws) {
         this.clients.delete(ws);
         logInfo(`Socket disconnected. Total clients: ${this.clients.size}`);
-        this.emitClientChange();
     }
     broadcast(message) {
         this.clients.forEach((socket) => {

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@dpu/shared",
-  "version": "1.9.3",
+  "version": "1.10.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@dpu/shared",
-      "version": "1.9.3",
+      "version": "1.10.0",
       "dependencies": {
         "@types/ws": "^8.18.1",
         "axios": "^1.7.9",

package.json

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

src/fastify.ts

@@ -41,7 +41,7 @@ export abstract class BaseService<T> {
 	}
 
 	getErrorResult(errorMessage: string, error?: unknown): ServiceResult<string> {
-		logWarning(errorMessage);
+		logWarning(errorMessage, error);
 		return {
 			result: errorMessage,
 			successful: false,

src/homeassistant.ts

@@ -11,9 +11,9 @@ export type HomeAssistantEntity = {
 		[key: string]: unknown;
 	};
 	last_changed: string; // datetime string
-	last_reported: string; // datetime string
-	last_updated: string; // datetime string
-	context: {
+	last_reported?: string; // datetime string
+	last_updated?: string; // datetime string
+	context?: {
 		id: string;
 		parent_id: string | null;
 		user_id: string | null;
@@ -31,3 +31,16 @@ export type API_HA_DeskPosition = {
 	last_changed: string;
 	last_changed_seconds: number;
 };
+
+export type HA_Update = {
+	entity_id: string;
+	state: string;
+	attributes: {
+		state_class?: string;
+		unit_of_measurement?: string;
+		icon?: string;
+		friendly_name?: string;
+		[key: string]: unknown;
+	};
+	timestamp: string; // datetime string
+};

src/homepage.ts

@@ -1,15 +1,11 @@
 import type { GristRecord_PersonalGoals } from "./grist";
 import type { API_HA_DeskPosition } from "./homeassistant";
+import type { StatsComponentName } from "./stats";
 import type { TidalGetCurrent } from "./tidal";
 
-export type FullInformation = {
+export type FullInformation = Record<StatsComponentName, unknown> & {
 	ha_desk_position: API_HA_DeskPosition | null;
 	ha_temp: string | null;
 	tidal_current: TidalGetCurrent | null;
 	grist_personal_goals: GristRecord_PersonalGoals | null;
 };
-
-export type ComponentUpdate = {
-	component: string;
-	data: unknown;
-};

src/index.ts

@@ -3,6 +3,7 @@ export * from "./grist.js";
 export * from "./homeassistant.js";
 export * from "./homepage.js";
 export * from "./logger.js";
+export * from "./stats.js";
 export * from "./tidal.js";
 export * from "./timehelper.js";
 export * from "./ws.js";

src/stats.ts

@@ -0,0 +1,29 @@
+export const StatsComponent = {
+	HA_DESK_POSITION: "ha_desk_position",
+	HA_TEMP: "ha_temp",
+	TIDAL_CURRENT: "tidal_current",
+	GRIST_PERSONAL_GOALS: "grist_personal_goals",
+} as const;
+
+export type StatsComponentName =
+	(typeof StatsComponent)[keyof typeof StatsComponent];
+
+export type ComponentUpdate = {
+	component: StatsComponentName;
+	data: unknown;
+};
+
+export type StepRow = {
+	year: string;
+	steps: number;
+};
+
+export function createComponentUpdate(
+	component: StatsComponentName,
+	data: unknown,
+) {
+	return {
+		component: component,
+		data: data,
+	};
+}

src/ws.ts

@@ -10,31 +10,15 @@ export type WsClientChangeCallback = (clients: number) => void;
 
 export class WsService {
 	private clients: Set<WebSocket> = new Set();
-	private listeners: WsClientChangeCallback[] = [];
-
-	onClientChange(callback: WsClientChangeCallback): () => void {
-		this.listeners.push(callback);
-		return () => {
-			this.listeners = this.listeners.filter((cb) => cb !== callback);
-		};
-	}
-
-	private emitClientChange(): void {
-		for (const callback of this.listeners) {
-			callback(this.clients.size);
-		}
-	}
 
 	addClient(ws: WebSocket): void {
 		this.clients.add(ws);
 		logInfo(`Socket connected. Total clients: ${this.clients.size}`);
-		this.emitClientChange();
 	}
 
 	removeClient(ws: WebSocket): void {
 		this.clients.delete(ws);
 		logInfo(`Socket disconnected. Total clients: ${this.clients.size}`);
-		this.emitClientChange();
 	}
 
 	broadcast(message: WsEvent): void {