@kohost/api-client 3.0.0-beta.22 → 3.0.0-beta.25

package/dist/cjs/AMQPClient.js

@@ -185,9 +185,11 @@ var amqp = require("amqplib");
 var crypto = require("crypto");
 var isFatalError = require("amqplib/lib/connection").isFatalError;
 var debug = require("debug")("kohost:amqp-client");
-var HEADER_KEY_ORGANIZATION_ID = "organization-id";
-var HEADER_KEY_PROPERTY_ID = "property-id";
-var HEADER_KEY_DRIVER = "driver";
+var HEADER_KEY_ORGANIZATION_ID = "X-Organization-Id";
+var HEADER_KEY_PROPERTY_ID = "X-Property-Id";
+var HEADER_KEY_DRIVER = "X-Driver";
+var HEADER_KEY_COMMAND_NAME = "X-Command-Name";
+var HEADER_KEY_EVENT_NAME = "X-Event-Name";
 var exchanges = {
   // routes commands based on `command-name` header and in many cases `property-id` header
   Commands: {
@@ -272,21 +274,19 @@ var KohostAMQPClient = class {
     debug("parseMessage input %o", message);
     let error = null;
     let data = {};
-    let params = {};
     let query = {};
     let context = {};
     let headers = {};
     const isCommand = ((_a = message == null ? void 0 : message.properties) == null ? void 0 : _a.type) === "Command";
     const isEvent = ((_b = message == null ? void 0 : message.properties) == null ? void 0 : _b.type) === "Event";
     const messageHeaders = ((_c = message == null ? void 0 : message.properties) == null ? void 0 : _c.headers) || {};
-    const commandName = messageHeaders["command-name"] || null;
-    const eventName = messageHeaders["event-name"] || null;
+    const commandName = messageHeaders[HEADER_KEY_COMMAND_NAME] || null;
+    const eventName = messageHeaders[HEADER_KEY_EVENT_NAME] || null;
     if (message.content) {
       try {
         const payload = ((_d = message.properties) == null ? void 0 : _d.contentType) === "application/json" ? JSON.parse(message.content.toString()) : message.content.toString();
         data = (payload == null ? void 0 : payload.data) || {};
         error = payload == null ? void 0 : payload.error;
-        params = (payload == null ? void 0 : payload.params) || {};
         query = (payload == null ? void 0 : payload.query) || {};
         context = (payload == null ? void 0 : payload.context) || {};
       } catch (error2) {
@@ -314,7 +314,6 @@ var KohostAMQPClient = class {
     if (error)
       parsed.error = this.parseError(error);
     parsed.data = data;
-    parsed.params = params;
     parsed.query = query;
     parsed.context = context;
     parsed.headers = headers;

package/dist/cjs/Client.js

@@ -5100,6 +5100,7 @@ var KohostApiClient = class extends EventEmitter {
       throw new Error("options.property is required");
     this.options = options;
     this.isBrowser = typeof window !== "undefined";
+    this.isRefreshingToken = false;
     const config = {
       baseURL: options.url,
       responseType: "json",
@@ -5163,19 +5164,22 @@ var KohostApiClient = class extends EventEmitter {
         return Promise.reject(error);
       }
       if (expectedError && newTokensNeeded) {
-        return this.RefreshToken().then(() => {
-          return this._http(originalReq);
-        });
+        while (!this.isRefreshingToken) {
+          this.isRefreshingToken = true;
+          return this.RefreshToken().then(() => {
+            this.isRefreshingToken = false;
+            return this._http(originalReq);
+          }).catch((err) => {
+            this.isRefreshingToken = false;
+            return Promise.reject(err);
+          });
+        }
       }
     } catch (error2) {
       console.log(error2);
     }
     return Promise.reject(error);
   }
-  /* 
-  @param {String} token - The token to set
-  @returns undefined
-  */
   _onLoginRequired() {
     this.emit("LoginRequired");
   }

package/dist/cjs/Events.js

@@ -225,11 +225,11 @@ var require_SystemWindowCoveringUpdatedEvent = __commonJS({
   }
 });
 
-// src/Events/SystemSourceUpdatedEvent.js
-var require_SystemSourceUpdatedEvent = __commonJS({
-  "src/Events/SystemSourceUpdatedEvent.js"(exports2, module2) {
+// src/Events/SystemMediaSourceUpdatedEvent.js
+var require_SystemMediaSourceUpdatedEvent = __commonJS({
+  "src/Events/SystemMediaSourceUpdatedEvent.js"(exports2, module2) {
     var Event = require_Event();
-    var SystemMediaSourceUpdatedEvent = class extends Event {
+    var SystemMediaSourceUpdatedEvent2 = class extends Event {
       constructor(mediaSource) {
         super(mediaSource);
       }
@@ -240,8 +240,8 @@ var require_SystemSourceUpdatedEvent = __commonJS({
         return `mediaSource.${this.keyId}.updated`;
       }
     };
-    __name(SystemMediaSourceUpdatedEvent, "SystemMediaSourceUpdatedEvent");
-    module2.exports = SystemMediaSourceUpdatedEvent;
+    __name(SystemMediaSourceUpdatedEvent2, "SystemMediaSourceUpdatedEvent");
+    module2.exports = SystemMediaSourceUpdatedEvent2;
   }
 });
 
@@ -265,6 +265,26 @@ var require_SystemCourtesyUpdatedEvent = __commonJS({
   }
 });
 
+// src/Events/SystemMotionSensorUpdatedEvent.js
+var require_SystemMotionSensorUpdatedEvent = __commonJS({
+  "src/Events/SystemMotionSensorUpdatedEvent.js"(exports2, module2) {
+    var Event = require_Event();
+    var SystemMotionSensorUpdatedEvent2 = class extends Event {
+      constructor(mediaSource) {
+        super(mediaSource);
+      }
+      get name() {
+        return "SystemMotionSensorUpdated";
+      }
+      get routingKey() {
+        return `mediaSource.${this.keyId}.updated`;
+      }
+    };
+    __name(SystemMotionSensorUpdatedEvent2, "SystemMotionSensorUpdatedEvent");
+    module2.exports = SystemMotionSensorUpdatedEvent2;
+  }
+});
+
 // src/Events/SystemUserUpdatedEvent.js
 var require_SystemUserUpdatedEvent = __commonJS({
   "src/Events/SystemUserUpdatedEvent.js"(exports2, module2) {
@@ -425,6 +445,46 @@ var require_ShortLinkCreatedEvent = __commonJS({
   }
 });
 
+// src/Events/ApplicationInUseEvent.js
+var require_ApplicationInUseEvent = __commonJS({
+  "src/Events/ApplicationInUseEvent.js"(exports2, module2) {
+    var Event = require_Event();
+    var ApplicationInUseEvent2 = class extends Event {
+      constructor({ propertyId }) {
+        super({ propertyId });
+      }
+      get name() {
+        return "ApplicationInUse";
+      }
+      get routingKey() {
+        return `app.${this.data[0].propertyId}.inUse`;
+      }
+    };
+    __name(ApplicationInUseEvent2, "ApplicationInUseEvent");
+    module2.exports = ApplicationInUseEvent2;
+  }
+});
+
+// src/Events/ApplicationOutOfUseEvent.js
+var require_ApplicationOutOfUseEvent = __commonJS({
+  "src/Events/ApplicationOutOfUseEvent.js"(exports2, module2) {
+    var Event = require_Event();
+    var ApplicationOutOfUseEvent2 = class extends Event {
+      constructor({ propertyId }) {
+        super({ propertyId });
+      }
+      get name() {
+        return "ApplicationOutOfUse";
+      }
+      get routingKey() {
+        return `app.${this.data[0].propertyId}.notInUse`;
+      }
+    };
+    __name(ApplicationOutOfUseEvent2, "ApplicationOutOfUseEvent");
+    module2.exports = ApplicationOutOfUseEvent2;
+  }
+});
+
 // src/Events/index.js
 var SystemGatewayUpdatedEvent = require_SystemGatewayUpdatedEvent();
 var SystemThermostatUpdatedEvent = require_SystemThermostatUpdatedEvent();
@@ -434,8 +494,9 @@ var SystemLockUpdatedEvent = require_SystemLockUpdatedEvent();
 var SystemCameraUpdatedEvent = require_SystemCameraUpdatedEvent();
 var SystemSceneControllerUpdatedEvent = require_SystemSceneControllerUpdatedEvent();
 var SystemWindowCoveringUpdatedEvent = require_SystemWindowCoveringUpdatedEvent();
-var SystemSourceUpdatedEvent = require_SystemSourceUpdatedEvent();
+var SystemMediaSourceUpdatedEvent = require_SystemMediaSourceUpdatedEvent();
 var SystemCourtesyUpdatedEvent = require_SystemCourtesyUpdatedEvent();
+var SystemMotionSensorUpdatedEvent = require_SystemMotionSensorUpdatedEvent();
 var SystemUserUpdatedEvent = require_SystemUserUpdatedEvent();
 var SystemSpaceUpdatedEvent = require_SystemSpaceUpdatedEvent();
 var SystemSpaceTypeUpdatedEvent = require_SystemSpaceTypeUpdatedEvent();
@@ -444,6 +505,8 @@ var SystemReservationUpdatedEvent = require_SystemReservationUpdatedEvent();
 var SMSSentEvent = require_SMSSentEvent();
 var EmailSentEvent = require_EmailSentEvent();
 var ShortLinkCreatedEvent = require_ShortLinkCreatedEvent();
+var ApplicationInUseEvent = require_ApplicationInUseEvent();
+var ApplicationOutOfUseEvent = require_ApplicationOutOfUseEvent();
 module.exports = {
   SystemGatewayUpdatedEvent,
   SystemThermostatUpdatedEvent,
@@ -453,7 +516,8 @@ module.exports = {
   SystemCameraUpdatedEvent,
   SystemSceneControllerUpdatedEvent,
   SystemWindowCoveringUpdatedEvent,
-  SystemSourceUpdatedEvent,
+  SystemMediaSourceUpdatedEvent,
+  SystemMotionSensorUpdatedEvent,
   SystemCourtesyUpdatedEvent,
   SystemUserUpdatedEvent,
   SystemSpaceUpdatedEvent,
@@ -462,5 +526,7 @@ module.exports = {
   SystemReservationUpdatedEvent,
   SMSSentEvent,
   EmailSentEvent,
-  ShortLinkCreatedEvent
+  ShortLinkCreatedEvent,
+  ApplicationInUseEvent,
+  ApplicationOutOfUseEvent
 };

package/dist/cjs/Models.js

@@ -1907,17 +1907,12 @@ var require_mediaSource = __commonJS({
       title: "Media Source",
       description: "Any media source",
       type: "object",
+      required: ["id", "type", "systemData", "audio", "video", "driver"],
       properties: {
         id: {
           $ref: "https://api.kohost.io/schemas/v3/definitions/device.json#/definitions/id"
         },
         type: {
-          $ref: "https://api.kohost.io/schemas/v3/definitions/device.json#/definitions/type"
-        },
-        driver: {
-          $ref: "https://api.kohost.io/schemas/v3/definitions/common.json#/definitions/driver"
-        },
-        subType: {
           type: "string",
           enum: [
             "tv",
@@ -1928,6 +1923,9 @@ var require_mediaSource = __commonJS({
             "uncontrolledDevice"
           ]
         },
+        driver: {
+          $ref: "https://api.kohost.io/schemas/v3/definitions/common.json#/definitions/driver"
+        },
         audio: {
           type: "boolean"
         },
@@ -1940,6 +1938,27 @@ var require_mediaSource = __commonJS({
         volumeFeedback: {
           type: "boolean"
         },
+        muted: {
+          type: "boolean"
+        },
+        volume: {
+          type: "number",
+          minimum: 0,
+          maximum: 100
+        },
+        power: {
+          type: "string",
+          enum: ["on", "off"]
+        },
+        input: {
+          type: "string"
+        },
+        supportedInputs: {
+          type: "array",
+          items: {
+            type: "string"
+          }
+        },
         command: {
           type: ["string", "null"],
           enum: [
@@ -1983,6 +2002,7 @@ var require_mediaSource = __commonJS({
             "input",
             "power",
             "enterChannel",
+            "enterVolume",
             "number10",
             "number11",
             "number12",
@@ -2039,7 +2059,12 @@ var require_mediaSource = __commonJS({
             "hdmi2",
             "hdmi3",
             "cecDeviceList",
-            "mtsSap"
+            "mtsSap",
+            "red",
+            "green",
+            "yellow",
+            "blue",
+            "alert"
           ]
         },
         supportedNotifications: {
@@ -2049,11 +2074,10 @@ var require_mediaSource = __commonJS({
           $ref: "https://api.kohost.io/schemas/v3/definitions/device.json#/definitions/notification"
         },
         systemData: {
-          $ref: "https://api.kohost.io/schemas/v3/definitions/device.json#/definitions/systemData"
+          $ref: "https://api.kohost.app/schemas/v3/definitions/device.json#/definitions/systemData"
         }
       },
-      additionalProperties: false,
-      required: ["id", "type", "systemData", "audio", "video", "driver"]
+      additionalProperties: false
     };
   }
 });
@@ -3624,7 +3648,7 @@ var require_property = __commonJS({
         },
         organization: {
           type: "string",
-          description: "Reference to the organization that owns this property"
+          description: "Reference (id) to the organization that owns this property"
         },
         address: {
           type: "object",
@@ -3793,7 +3817,7 @@ var require_property = __commonJS({
                         type: "string",
                         pattern: "^(?!#ffffff)(#[0-9a-fA-F]{6})$"
                       },
-                      minItems: 3,
+                      minItems: 2,
                       maxItems: 3
                     }
                   }

package/dist/cjs/defs.js

@@ -62,6 +62,7 @@ var require_Client = __commonJS({
           throw new Error("options.property is required");
         this.options = options;
         this.isBrowser = typeof window !== "undefined";
+        this.isRefreshingToken = false;
         const config = {
           baseURL: options.url,
           responseType: "json",
@@ -125,19 +126,22 @@ var require_Client = __commonJS({
             return Promise.reject(error);
           }
           if (expectedError && newTokensNeeded) {
-            return this.RefreshToken().then(() => {
-              return this._http(originalReq);
-            });
+            while (!this.isRefreshingToken) {
+              this.isRefreshingToken = true;
+              return this.RefreshToken().then(() => {
+                this.isRefreshingToken = false;
+                return this._http(originalReq);
+              }).catch((err) => {
+                this.isRefreshingToken = false;
+                return Promise.reject(err);
+              });
+            }
           }
         } catch (error2) {
           console.log(error2);
         }
         return Promise.reject(error);
       }
-      /* 
-      @param {String} token - The token to set
-      @returns undefined
-      */
       _onLoginRequired() {
         this.emit("LoginRequired");
       }

package/dist/cjs/utils.js

@@ -441,33 +441,12 @@ var require_Errors = __commonJS({
 var require_errorFactory = __commonJS({
   "src/utils/errorFactory.js"(exports2, module2) {
     var Errors = require_Errors();
-    module2.exports = /* @__PURE__ */ __name(function errorFactory2(err) {
-      switch (err.type) {
-        case "AppError":
-          return new Errors.AppError(err.message);
-        case "AuthenticationError":
-          return new Errors.AuthenticationError(err.message);
-        case "AuthorizationError":
-          return new Errors.AuthorizationError(err.message);
-        case "DeviceCommError":
-          return new Errors.DeviceCommError(err.message);
-        case "LoginError":
-          return new Errors.LoginError(err.message);
-        case "NotFoundError":
-          return new Errors.NotFoundError(err.message);
-        case "RequestError":
-          return new Errors.RequestError(err.message);
-        case "SystemCommError":
-          return new Errors.SystemCommError(err.message);
-        case "TokenExpiredError":
-          return new Errors.TokenExpiredError(err.message);
-        case "UnprocessableRequestError":
-          return new Errors.UnprocessableRequestError(err.message);
-        case "ValidationError":
-          return new Errors.ValidationError(err.message);
-        default:
-          return new Error(err.message);
-      }
+    module2.exports = /* @__PURE__ */ __name(function errorFactory2(errName) {
+      const AllErrors = Object.values(Errors);
+      const TheError = AllErrors.find((E) => E.prototype.name === errName);
+      if (!TheError)
+        return new Error("Invalid error name: " + errName);
+      return TheError;
     }, "errorFactory");
   }
 });

package/dist/esm/Client.js

@@ -7555,6 +7555,7 @@ var require_Client = __commonJS({
           throw new Error("options.property is required");
         this.options = options;
         this.isBrowser = typeof window !== "undefined";
+        this.isRefreshingToken = false;
         const config = {
           baseURL: options.url,
           responseType: "json",
@@ -7616,19 +7617,22 @@ var require_Client = __commonJS({
             return Promise.reject(error);
           }
           if (expectedError && newTokensNeeded) {
-            return this.RefreshToken().then(() => {
-              return this._http(originalReq);
-            });
+            while (!this.isRefreshingToken) {
+              this.isRefreshingToken = true;
+              return this.RefreshToken().then(() => {
+                this.isRefreshingToken = false;
+                return this._http(originalReq);
+              }).catch((err) => {
+                this.isRefreshingToken = false;
+                return Promise.reject(err);
+              });
+            }
           }
         } catch (error2) {
           console.log(error2);
         }
         return Promise.reject(error);
       }
-      /* 
-      @param {String} token - The token to set
-      @returns undefined
-      */
       _onLoginRequired() {
         this.emit("LoginRequired");
       }