Merged PR 5508: update api

Busch-Jaeger · Jun 4, 2024 · 22932c6 · 22932c6
2 parents b381611 + 48479c4
commit 22932c6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@busch-jaeger/free-at-home",
-  "version": "0.34.13",
+  "version": "0.34.14",
   "description": "Library for free@home local device api",
   "repository": {
     "type": "git",

diff --git a/specs/fhapi.yaml b/specs/fhapi.yaml
@@ -1130,9 +1130,7 @@ components:
             additionalProperties:
               type: string
           devices:
-            type: object
-            additionalProperties:
-              $ref: "#/components/schemas/Devices"
+            $ref: "#/components/schemas/Devices"
           devicesAdded:
             type: array
             items:

diff --git a/src/fhapi/models/Device.ts b/src/fhapi/models/Device.ts
@@ -13,6 +13,9 @@ export type Device = {
     deviceId?: string;
     interface?: string;
     nativeId?: string;
+    unresponsive?: boolean;
+    unresponsiveCounter?: number;
+    defect?: boolean;
     channels?: Record<string, Channel>;
     parameters?: Record<string, string>;
 };

diff --git a/src/fhapi/models/SysapSection.ts b/src/fhapi/models/SysapSection.ts
@@ -10,7 +10,7 @@ export type SysapSection = {
     version: string;
     sunRiseTimes: Array<number>;
     sunSetTimes: Array<number>;
-    locale?: string;
+    locale?: 'en' | 'es' | 'fr' | 'it' | 'nl' | 'de' | 'zh' | 'da' | 'fi' | 'nb' | 'pl' | 'pt' | 'ru' | 'sv' | 'el' | 'cs' | 'tr';
     location?: {
         latitude: number;
         longitude: number;

diff --git a/src/fhapi/models/WebsocketMessage.ts b/src/fhapi/models/WebsocketMessage.ts
@@ -8,7 +8,7 @@ import type { ScenesTriggered } from './ScenesTriggered';
 
 export type WebsocketMessage = Record<string, {
     datapoints: Record<string, string>;
-    devices: Record<string, Devices>;
+    devices: Devices;
     devicesAdded: Array<string>;
     devicesRemoved: Array<string>;
     scenesTriggered: ScenesTriggered;

diff --git a/src/freeAtHomeApi.ts b/src/freeAtHomeApi.ts
@@ -322,6 +322,7 @@ export class FreeAtHomeApi extends (EventEmitter as { new(): Emitter }) {
                 throw new Error("device not found in response");
             }
         } catch (e) {
+            handleRequestError(e, this.enableLogging);
             return await devicePromiseWithTimeout.promise;
             // throw new Error("Could not read device from ata model error code: " + res.status);
         }