Compare commits

...

4 Commits

Author SHA1 Message Date
Darius
9b852dc40c 1.6.0 2026-02-05 22:05:43 +01:00
Darius
a6d837f953 make clients of sse service observable 2026-02-05 22:05:35 +01:00
Darius
921882054d 1.5.5 2026-02-05 04:32:04 +01:00
Darius
cdd2fcb59e set => map 2026-02-05 04:31:54 +01:00
9 changed files with 104 additions and 43 deletions

4
dist/homepage.d.ts vendored
View File

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

View File

@@ -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"}

14
dist/sse.d.ts vendored
View File

@@ -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;
}

2
dist/sse.d.ts.map vendored
View File

@@ -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"}

35
dist/sse.js vendored
View File

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

4
package-lock.json generated
View File

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

View File

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

View File

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

View File

@@ -1,40 +1,72 @@
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[] = [];
onClientChange(callback: SseClientChangeCallback): () => void {
this.clientChangeCallbacks.push(callback);
return () => {
this.clientChangeCallbacks = this.clientChangeCallbacks.filter(
(cb) => cb !== callback,
);
};
}
private emitClientChange(event: SseClientChangeEvent): void {
for (const callback of this.clientChangeCallbacks) {
callback(event);
}
}
addClient(client: SseClient): void {
this.clients.add(client);
this.clients.set(client.id, client);
logInfo(
`SSE client connected: ${client.id}. Total clients: ${this.clients.size}`,
);
this.emitClientChange({
type: "add",
clientId: client.id,
clientCount: this.clients.size,
});
}
removeClient(clientId: number): void {
const client = [...this.clients].find((c) => c.id === clientId);
if (client) {
this.clients.delete(client);
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 {
this.clients.forEach((client) => {
for (const client of this.clients.values()) {
client.send(event);
});
}
}
getClientCount(): number {