@digital-alchemy/hass 24.11.4 → 25.2.1

package/src/services/events.service.mts

@@ -1,4 +1,4 @@
-import { is, TServiceParams } from "@digital-alchemy/core";
+import { TServiceParams } from "@digital-alchemy/core";
 
 import {
   AREA_REGISTRY_UPDATED,
@@ -11,31 +11,31 @@ import {
   ZONE_REGISTRY_UPDATED,
 } from "../helpers/index.mts";
 
-export function EventsService({ event }: TServiceParams): HassEventsService {
+export function EventsService({ event, internal }: TServiceParams): HassEventsService {
   return {
     onAreaRegistryUpdate: (callback: SimpleCallback) => {
       event.on(AREA_REGISTRY_UPDATED, callback);
-      return is.removeFn(() => event.removeListener(AREA_REGISTRY_UPDATED, callback));
+      return internal.removeFn(() => event.removeListener(AREA_REGISTRY_UPDATED, callback));
     },
     onDeviceRegistryUpdate: (callback: SimpleCallback) => {
       event.on(DEVICE_REGISTRY_UPDATED, callback);
-      return is.removeFn(() => event.removeListener(DEVICE_REGISTRY_UPDATED, callback));
+      return internal.removeFn(() => event.removeListener(DEVICE_REGISTRY_UPDATED, callback));
     },
     onEntityRegistryUpdate: (callback: SimpleCallback) => {
       event.on(ENTITY_REGISTRY_UPDATED, callback);
-      return is.removeFn(() => event.removeListener(ENTITY_REGISTRY_UPDATED, callback));
+      return internal.removeFn(() => event.removeListener(ENTITY_REGISTRY_UPDATED, callback));
     },
     onFloorRegistryUpdate: (callback: SimpleCallback) => {
       event.on(FLOOR_REGISTRY_UPDATED, callback);
-      return is.removeFn(() => event.removeListener(FLOOR_REGISTRY_UPDATED, callback));
+      return internal.removeFn(() => event.removeListener(FLOOR_REGISTRY_UPDATED, callback));
     },
     onLabelRegistryUpdate: (callback: SimpleCallback) => {
       event.on(LABEL_REGISTRY_UPDATED, callback);
-      return is.removeFn(() => event.removeListener(LABEL_REGISTRY_UPDATED, callback));
+      return internal.removeFn(() => event.removeListener(LABEL_REGISTRY_UPDATED, callback));
     },
     onZoneRegistryUpdate: (callback: SimpleCallback) => {
       event.on(ZONE_REGISTRY_UPDATED, callback);
-      return is.removeFn(() => event.removeListener(ZONE_REGISTRY_UPDATED, callback));
+      return internal.removeFn(() => event.removeListener(ZONE_REGISTRY_UPDATED, callback));
     },
   };
 }

package/src/services/fetch-api.service.mts

@@ -1,4 +1,4 @@
-import { DOWN, is, NO_CHANGE, SECOND, TServiceParams, UP } from "@digital-alchemy/core";
+import { DOWN, NO_CHANGE, SECOND, TServiceParams, UP } from "@digital-alchemy/core";
 import dayjs, { Dayjs } from "dayjs";
 import { lt } from "semver";
 
@@ -25,7 +25,16 @@ type SendBody<STATE extends string | number = string, ATTRIBUTES extends object
   state?: STATE;
 };
 
-export function FetchAPI({ logger, lifecycle, context, hass, config }: TServiceParams) {
+export function FetchAPI({
+  logger,
+  lifecycle,
+  context,
+  hass,
+  config,
+  internal: {
+    utils: { is },
+  },
+}: TServiceParams) {
   const fetcher = hass.internals({ context });
   const { download: downloader } = fetcher;
 

package/src/services/id-by.service.mts

@@ -1,4 +1,4 @@
-import { is, TServiceParams } from "@digital-alchemy/core";
+import { TServiceParams } from "@digital-alchemy/core";
 
 import {
   TAreaId,
@@ -22,14 +22,20 @@ import {
   PICK_FROM_PLATFORM,
 } from "../helpers/index.mts";
 
-const check = <RAW extends ANY_ENTITY>(raw: RAW[], domains: ALL_DOMAINS[]) => {
-  if (!is.empty(domains)) {
-    raw = raw.filter(entity => is.domain(entity, domains));
-  }
-  return raw;
-};
+export function IDByExtension({
+  hass,
+  logger,
+  internal: {
+    utils: { is },
+  },
+}: TServiceParams): IDByInterface {
+  const check = <RAW extends ANY_ENTITY>(raw: RAW[], domains: ALL_DOMAINS[]) => {
+    if (!is.empty(domains)) {
+      raw = raw.filter(entity => is.domain(entity, domains));
+    }
+    return raw;
+  };
 
-export function IDByExtension({ hass, logger }: TServiceParams): IDByInterface {
   // * byDomain
   function byDomain<DOMAIN extends ALL_DOMAINS>(domain: DOMAIN) {
     const MASTER_STATE = hass.entity._masterState();

package/src/services/internal.service.mts

@@ -1,4 +1,4 @@
-import { FIRST, InternalError, is, TServiceParams } from "@digital-alchemy/core";
+import { FIRST, InternalError, TServiceParams } from "@digital-alchemy/core";
 import { createWriteStream } from "fs";
 import { pipeline } from "stream";
 import { promisify } from "util";
@@ -10,13 +10,17 @@ import {
   FetcherOptions,
   FetchProcessTypes,
   FetchWith,
+  isDomain,
   MaybeHttpError,
   TFetchBody,
 } from "../helpers/index.mts";
 
 const streamPipeline = promisify(pipeline);
 
-export function FetchInternals({ logger, context: parentContext }: TServiceParams) {
+export function FetchInternals({ internal, logger, context: parentContext }: TServiceParams) {
+  const { is } = internal.utils;
+  is.domain = isDomain;
+
   return ({ headers: base_headers, baseUrl: base_url, context: logContext }: FetcherOptions) => {
     const capabilities: string[] = [];
 

package/src/services/reference.service.mts

@@ -1,4 +1,4 @@
-import { DOWN, is, NONE, sleep, TAnyFunction, TServiceParams, UP } from "@digital-alchemy/core";
+import { DOWN, NONE, sleep, TAnyFunction, TServiceParams, UP } from "@digital-alchemy/core";
 import dayjs, { Dayjs } from "dayjs";
 import { Get } from "type-fest";
 
@@ -86,6 +86,7 @@ export function ReferenceService({
   internal,
   event,
 }: TServiceParams): HassReferenceService {
+  const { is } = internal.utils;
   // #MARK:proxyGetLogic
   function proxyGetLogic<ENTITY extends ANY_ENTITY = ANY_ENTITY, PROPERTY extends string = string>(
     entity: ENTITY,

package/src/services/websocket-api.service.mts

@@ -1,6 +1,5 @@
 import {
   InternalError,
-  is,
   SECOND,
   sleep,
   START,
@@ -27,6 +26,14 @@ const CONNECTION_FAILED = 2;
 let messageCount = START;
 export const SOCKET_CONNECTED = "SOCKET_CONNECTED";
 
+type WaitingMap = Map<
+  number,
+  {
+    sent: unknown;
+    callback: (result: unknown) => TBlackHole;
+  }
+>;
+
 export function WebsocketAPI({
   context,
   event,
@@ -37,6 +44,8 @@ export function WebsocketAPI({
   logger,
   scheduler,
 }: TServiceParams): HassWebsocketAPI {
+  const { is } = internal.utils;
+
   /**
    * Local attachment points for socket events
    */
@@ -45,7 +54,7 @@ export function WebsocketAPI({
 
   let MESSAGE_TIMESTAMPS: number[] = [];
   let onSocketReady: () => void;
-  const waitingCallback = new Map<number, (result: unknown) => TBlackHole>();
+  const waitingCallback: WaitingMap = new Map();
   const isOld = (date: Dayjs) =>
     is.undefined(date) || date.diff(dayjs(), "s") >= config.hass.RETRY_INTERVAL;
 
@@ -248,7 +257,10 @@ export function WebsocketAPI({
       return undefined;
     }
     return await new Promise<RESPONSE_VALUE>(async done => {
-      waitingCallback.set(id, done as (result: unknown) => TBlackHole);
+      waitingCallback.set(id, {
+        callback: done as (result: unknown) => TBlackHole,
+        sent: data,
+      });
       await hass.socket.waitForReply(id, data, sentAt);
     });
   }
@@ -258,6 +270,7 @@ export function WebsocketAPI({
     if (!waitingCallback.has(id)) {
       return;
     }
+    const { sent } = waitingCallback.get(id);
     // this could happen around dropped connections, or a number of other reasons
     //
     // discard the promise so whatever flow is depending on this can get garbage collected
@@ -266,6 +279,7 @@ export function WebsocketAPI({
       {
         message: data,
         name: waitForReply,
+        sent,
         sentAt: internal.utils.relativeDate(sentAt),
       },
       `sent message, did not receive reply`,
@@ -464,21 +478,22 @@ export function WebsocketAPI({
       return;
     }
     if (waitingCallback.has(id)) {
-      const f = waitingCallback.get(id);
+      const { callback } = waitingCallback.get(id);
       waitingCallback.delete(id);
-      f(message.event.result);
+      callback(message.event.result);
     }
     socketEvents.emit(message.event.event_type, message.event);
   }
 
   function onMessageResult(id: number, message: SocketMessageDTO) {
     if (waitingCallback.has(id)) {
+      const { callback, sent } = waitingCallback.get(id);
+      waitingCallback.delete(id);
       if (message.error) {
-        logger.error({ message, name: onMessageResult });
+        logger.error({ message, name: "onMessageResult", sent }, "message result error");
+        return;
       }
-      const f = waitingCallback.get(id);
-      waitingCallback.delete(id);
-      f(message.result);
+      callback(message.result);
     }
   }
 

package/src/testing/fetch-api.spec.mts

@@ -9,7 +9,7 @@ describe("FetchAPI", () => {
   const TOKEN =
     // TODO: Replace hard coded token w/ faker when avail
     // https://github.com/faker-js/faker/pull/2936
-    // eslint-disable-next-line @cspell/spellchecker
+    // eslint-disable-next-line @cspell/spellchecker, sonarjs/no-hardcoded-secrets
     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ2aWRlbyI6Imh0dHBzOi8vd3d3LnlvdXR1YmUuY29tL3dhdGNoP3Y9ZFF3NHc5V2dYY1EifQ.gPIttZEaLZgov3VZziu3LovcgtDbj8H0-XfBg4f08Y0";
 
   hassTestRunner.configure({