1.9.2

dist/fastify.js

@@ -1,4 +1,4 @@
-import { logWarning } from "./logger";
+import { logWarning } from "./logger.js";
 export class API_Error {
     error;
     constructor(error) {

dist/homeassistant.d.ts

@@ -21,11 +21,9 @@ export type HomeAssistantEntity = {
 export interface HomeAssistantDeskPositionResult {
     raw: HomeAssistantEntity;
     as_boolean: boolean;
-    as_text: () => string;
     last_changed: TimeBetween;
 }
 export type API_HA_DeskPosition = {
-    position: string;
     is_standing: boolean;
     last_changed: string;
     last_changed_seconds: number;

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,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"}
+{"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"}

dist/homepage.d.ts

@@ -7,4 +7,8 @@ export type FullInformation = {
     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"}
+{"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"}

dist/timehelper.d.ts

@@ -11,5 +11,6 @@ export interface TimeBetween {
     toReadable: (roundToMinutes?: boolean) => string;
 }
 export declare function calculateSecondsBetween(start: number, end: number): TimeBetween;
-export declare function secondsToReadable(secs: number, roundToMinutes?: boolean): string;
+export declare function formatSecondsToDHMS(secs: number, roundToMinutes?: boolean): string;
+export declare function formatSecondsToMS(s: number): string;
 //# sourceMappingURL=timehelper.d.ts.map

dist/timehelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timehelper.d.ts","sourceRoot":"","sources":["../src/timehelper.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAQ;IACpB,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,GAAG,CAAqC;IAChD,OAAO,CAAC,QAAQ,CAAC;gBAEL,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAOjD,OAAO,CAAC,SAAS;IAKjB,QAAQ,CAAC,SAAS,GAAE,MAAmB,GAAG,OAAO;CAqBjD;AAED,MAAM,WAAW,WAAW;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,cAAc,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;CACjD;AAED,wBAAgB,uBAAuB,CACtC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,GACT,WAAW,CAOb;AAED,wBAAgB,iBAAiB,CAChC,IAAI,EAAE,MAAM,EACZ,cAAc,GAAE,OAAe,GAC7B,MAAM,CAmBR"}
+{"version":3,"file":"timehelper.d.ts","sourceRoot":"","sources":["../src/timehelper.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAQ;IACpB,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,GAAG,CAAqC;IAChD,OAAO,CAAC,QAAQ,CAAC;gBAEL,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAOjD,OAAO,CAAC,SAAS;IAKjB,QAAQ,CAAC,SAAS,GAAE,MAAmB,GAAG,OAAO;CAqBjD;AAED,MAAM,WAAW,WAAW;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,cAAc,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;CACjD;AAED,wBAAgB,uBAAuB,CACtC,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,GACT,WAAW,CAOb;AAED,wBAAgB,mBAAmB,CAClC,IAAI,EAAE,MAAM,EACZ,cAAc,GAAE,OAAe,GAC7B,MAAM,CAmBR;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAInD"}

dist/timehelper.js

@@ -36,18 +36,23 @@ export function calculateSecondsBetween(start, end) {
     const seconds = Math.max(60, (end - start) / 1000);
     return {
         seconds,
-        toReadable: (roundToMinutes) => secondsToReadable(seconds, roundToMinutes),
+        toReadable: (roundToMinutes) => formatSecondsToDHMS(seconds, roundToMinutes),
     };
 }
-export function secondsToReadable(secs, roundToMinutes = false) {
+export function formatSecondsToDHMS(secs, roundToMinutes = false) {
     const totalSeconds = roundToMinutes ? Math.round(secs / 60) * 60 : secs;
-    var days = Math.floor(totalSeconds / (3600 * 24));
+    const days = Math.floor(totalSeconds / (3600 * 24));
-    var hours = Math.floor((totalSeconds % (3600 * 24)) / 3600);
+    const hours = Math.floor((totalSeconds % (3600 * 24)) / 3600);
-    var minutes = Math.floor((totalSeconds % 3600) / 60);
+    const minutes = Math.floor((totalSeconds % 3600) / 60);
-    var seconds = Math.floor(totalSeconds % 60);
+    const seconds = Math.floor(totalSeconds % 60);
-    var dayDisplay = days > 0 ? days + (days === 1 ? " day, " : " days, ") : "";
+    const dayDisplay = days > 0 ? days + (days === 1 ? " day, " : " days, ") : "";
-    var hourDisplay = hours > 0 ? hours + (hours === 1 ? " hour, " : " hours, ") : "";
+    const hourDisplay = hours > 0 ? hours + (hours === 1 ? " hour, " : " hours, ") : "";
-    var minuteDisplay = minutes > 0 ? minutes + (minutes === 1 ? " minute, " : " minutes, ") : "";
+    const minuteDisplay = minutes > 0 ? minutes + (minutes === 1 ? " minute, " : " minutes, ") : "";
-    var secondDisplay = seconds > 0 ? seconds + (seconds === 1 ? " second" : " seconds") : "";
+    const secondDisplay = seconds > 0 ? seconds + (seconds === 1 ? " second" : " seconds") : "";
     return (dayDisplay + hourDisplay + minuteDisplay + secondDisplay).replace(/,\s*$/, "");
 }
+export function formatSecondsToMS(s) {
+    const mins = Math.floor(s / 60);
+    const secs = s % 60;
+    return `${mins}:${secs < 10 ? "0" : ""}${secs}`;
+}

package-lock.json

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

package.json

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

src/fastify.ts

@@ -1,5 +1,5 @@
 import type { AxiosInstance } from "axios";
-import { logWarning } from "./logger";
+import { logWarning } from "./logger.js";
 
 export type ServiceResult<T = unknown> = {
 	result: T;

src/homeassistant.ts

@@ -23,12 +23,10 @@ export type HomeAssistantEntity = {
 export interface HomeAssistantDeskPositionResult {
 	raw: HomeAssistantEntity;
 	as_boolean: boolean;
-	as_text: () => string;
 	last_changed: TimeBetween;
 }
 
 export type API_HA_DeskPosition = {
-	position: string;
 	is_standing: boolean;
 	last_changed: string;
 	last_changed_seconds: number;

src/homepage.ts

@@ -8,3 +8,8 @@ export type FullInformation = {
 	tidal_current: TidalGetCurrent | null;
 	grist_personal_goals: GristRecord_PersonalGoals | null;
 };
+
+export type ComponentUpdate = {
+	component: string;
+	data: unknown;
+};

src/timehelper.ts

@@ -51,30 +51,36 @@ export function calculateSecondsBetween(
 	return {
 		seconds,
 		toReadable: (roundToMinutes?: boolean) =>
-			secondsToReadable(seconds, roundToMinutes),
+			formatSecondsToDHMS(seconds, roundToMinutes),
 	};
 }
 
-export function secondsToReadable(
+export function formatSecondsToDHMS(
 	secs: number,
 	roundToMinutes: boolean = false,
 ): string {
 	const totalSeconds = roundToMinutes ? Math.round(secs / 60) * 60 : secs;
 
-	var days = Math.floor(totalSeconds / (3600 * 24));
+	const days = Math.floor(totalSeconds / (3600 * 24));
-	var hours = Math.floor((totalSeconds % (3600 * 24)) / 3600);
+	const hours = Math.floor((totalSeconds % (3600 * 24)) / 3600);
-	var minutes = Math.floor((totalSeconds % 3600) / 60);
+	const minutes = Math.floor((totalSeconds % 3600) / 60);
-	var seconds = Math.floor(totalSeconds % 60);
+	const seconds = Math.floor(totalSeconds % 60);
 
-	var dayDisplay = days > 0 ? days + (days === 1 ? " day, " : " days, ") : "";
+	const dayDisplay = days > 0 ? days + (days === 1 ? " day, " : " days, ") : "";
-	var hourDisplay =
+	const hourDisplay =
 		hours > 0 ? hours + (hours === 1 ? " hour, " : " hours, ") : "";
-	var minuteDisplay =
+	const minuteDisplay =
 		minutes > 0 ? minutes + (minutes === 1 ? " minute, " : " minutes, ") : "";
-	var secondDisplay =
+	const secondDisplay =
 		seconds > 0 ? seconds + (seconds === 1 ? " second" : " seconds") : "";
 	return (dayDisplay + hourDisplay + minuteDisplay + secondDisplay).replace(
 		/,\s*$/,
 		"",
 	);
 }
+
+export function formatSecondsToMS(s: number): string {
+	const mins = Math.floor(s / 60);
+	const secs = s % 60;
+	return `${mins}:${secs < 10 ? "0" : ""}${secs}`;
+}