dt-common-device 3.1.2 → 3.1.5

package/dist/config/config.js

@@ -37,9 +37,6 @@ async function initialize(cfg) {
     if (cfg.ENERGY_SERVICE && !(0, http_utils_1.validateServiceUrl)(cfg.ENERGY_SERVICE)) {
         throw new Error(`Invalid ENERGY_SERVICE URL: ${cfg.ENERGY_SERVICE}`);
     }
-    if (cfg.REMOTE_SERVICE && !(0, http_utils_1.validateServiceUrl)(cfg.REMOTE_SERVICE)) {
-        throw new Error(`Invalid REMOTE_SERVICE URL: ${cfg.REMOTE_SERVICE}`);
-    }
     // Initialize internal event subscription if handler is provided
     if (cfg.INTERNAL_EVENT_HANDLER) {
         try {
@@ -100,7 +97,6 @@ function checkRequiredEnv() {
         "REDIS_PORT",
         "POSTHOG_API_KEY",
         "POSTHOG_HOST",
-        "CLOUD_SERVICE_API_KEY",
     ];
     const missing = requiredEnv.filter((key) => !process.env[key]);
     if (missing.length > 0) {

package/dist/config/config.types.d.ts

@@ -15,7 +15,7 @@ export type IConfig = {
     REMOTE_SERVICE?: string;
     INTERNAL_EVENT_HANDLER: IInternalEvent;
     LOGGER: ILogger;
-    CLOUD_SERVICE_API_KEY: string;
+    CLOUD_SERVICE_API_KEY?: string;
     [key: string]: any;
 };
 export {};

package/dist/constants/ConnectionProviders.d.ts

@@ -1,6 +1,8 @@
 export declare const CONNECTION_PROVIDERS: {
     readonly DEVICETHREAD: "Devicethread";
     readonly CLOUDBEDS: "Cloudbeds";
+    readonly STAYNTOUCH: "Stayntouch";
+    readonly HOTELKEY: "Hotelkey";
     readonly SALTOKS: "SaltoKS";
     readonly SCHLAGE: "Schlage";
     readonly SENSIBO: "Sensibo";

package/dist/constants/ConnectionProviders.js

@@ -4,6 +4,8 @@ exports.CONNECTION_PROVIDERS = void 0;
 exports.CONNECTION_PROVIDERS = {
     DEVICETHREAD: "Devicethread",
     CLOUDBEDS: "Cloudbeds",
+    STAYNTOUCH: "Stayntouch",
+    HOTELKEY: "Hotelkey",
     SALTOKS: "SaltoKS",
     SCHLAGE: "Schlage",
     SENSIBO: "Sensibo",

package/dist/events/DeviceEventHandler.js

@@ -1,6 +1,74 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
+    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+    return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceEventHandler = void 0;
@@ -8,151 +76,167 @@ const constants_1 = require("../constants");
 const Event_1 = require("../constants/Event");
 const services_1 = require("../device/local/services");
 const BaseEventHandler_1 = require("./BaseEventHandler");
-const typedi_1 = __importDefault(require("typedi"));
-class DeviceEventHandler extends BaseEventHandler_1.BaseEventHandler {
-    constructor() {
-        super([
-            Event_1.DT_EVENT_TYPES.DEVICE.STATUS.ONLINE,
-            Event_1.DT_EVENT_TYPES.DEVICE.STATUS.OFFLINE,
-            Event_1.DT_EVENT_TYPES.DEVICE.STATUS.CHANGED,
-            Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.CRITICAL,
-            Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.LOW,
-            Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.CHANGED,
-        ], 100);
-        // Use dependency injection instead of creating new instance
-        this.localHubService = typedi_1.default.get(services_1.LocalHubService);
-    }
-    async onEvent(event) {
-        this.logger.info("[DT | CDL]:[DeviceEventHandler]: Processing event", {
-            eventName: event.eventName,
-        });
-        try {
-            const device = await this.localDeviceService.getDevice(event.deviceId);
-            if (!device?.deviceId) {
-                throw new Error("[DT | CDL]:[DeviceEventHandler]: deviceId does not exist");
-            }
-            await this.updateDeviceEventData(device, event);
-            // Update relevant tables based on event type
-            await this.updateTablesBasedOnEventType(event, device);
-            // Save event logs
-            await this.dumpToEventOperation(event, device);
+const typedi_1 = __importStar(require("typedi"));
+let DeviceEventHandler = (() => {
+    let _classDecorators = [(0, typedi_1.Service)()];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = BaseEventHandler_1.BaseEventHandler;
+    var DeviceEventHandler = _classThis = class extends _classSuper {
+        constructor() {
+            super([
+                Event_1.DT_EVENT_TYPES.DEVICE.STATUS.ONLINE,
+                Event_1.DT_EVENT_TYPES.DEVICE.STATUS.OFFLINE,
+                Event_1.DT_EVENT_TYPES.DEVICE.STATUS.CHANGED,
+                Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.CRITICAL,
+                Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.LOW,
+                Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.CHANGED,
+            ], 100);
+            // Use dependency injection instead of creating new instance
+            this.localHubService = typedi_1.default.get(services_1.LocalHubService);
         }
-        catch (error) {
-            this.logger.error("[DT | CDL]:[DeviceEventHandler]: Error processing event", error);
-            throw error;
+        async onEvent(event) {
+            this.logger.info("[DT | CDL]:[DeviceEventHandler]: Processing event", {
+                eventName: event.eventName,
+            });
+            try {
+                const device = await this.localDeviceService.getDevice(event.deviceId);
+                if (!device?.deviceId) {
+                    throw new Error("[DT | CDL]:[DeviceEventHandler]: deviceId does not exist");
+                }
+                await this.updateDeviceEventData(device, event);
+                // Update relevant tables based on event type
+                await this.updateTablesBasedOnEventType(event, device);
+                // Save event logs
+                await this.dumpToEventOperation(event, device);
+            }
+            catch (error) {
+                this.logger.error("[DT | CDL]:[DeviceEventHandler]: Error processing event", error);
+                throw error;
+            }
         }
-    }
-    async updateDeviceEventData(deviceData, event) {
-        switch (event.eventName) {
-            case Event_1.DT_EVENT_TYPES.DEVICE.STATUS.ONLINE:
-            case Event_1.DT_EVENT_TYPES.DEVICE.STATUS.OFFLINE:
-                await this.localDeviceService.setState(deviceData.deviceId, {
-                    status: {
-                        online: event.eventName === Event_1.DT_EVENT_TYPES.DEVICE.STATUS.ONLINE,
-                        lastUpdated: new Date().toISOString(),
-                        error: {
-                            type: event.eventName === Event_1.DT_EVENT_TYPES.DEVICE.STATUS.OFFLINE
-                                ? "offline"
-                                : "",
-                            message: event.eventName === Event_1.DT_EVENT_TYPES.DEVICE.STATUS.OFFLINE
-                                ? "Device is offline"
-                                : "",
-                            default: {},
+        async updateDeviceEventData(deviceData, event) {
+            switch (event.eventName) {
+                case Event_1.DT_EVENT_TYPES.DEVICE.STATUS.ONLINE:
+                case Event_1.DT_EVENT_TYPES.DEVICE.STATUS.OFFLINE:
+                    await this.localDeviceService.setState(deviceData.deviceId, {
+                        status: {
+                            online: event.eventName === Event_1.DT_EVENT_TYPES.DEVICE.STATUS.ONLINE,
+                            lastUpdated: new Date().toISOString(),
+                            error: {
+                                type: event.eventName === Event_1.DT_EVENT_TYPES.DEVICE.STATUS.OFFLINE
+                                    ? "offline"
+                                    : "",
+                                message: event.eventName === Event_1.DT_EVENT_TYPES.DEVICE.STATUS.OFFLINE
+                                    ? "Device is offline"
+                                    : "",
+                                default: {},
+                            },
                         },
-                    },
-                });
-                break;
-            case Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.CHANGED:
-                await this.localDeviceService.setBatteryLevel(deviceData.deviceId, event?.data?.batteryLevel ?? 0, constants_1.Source.CLOUD_EVENT);
-                break;
+                    });
+                    break;
+                case Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.CHANGED:
+                    await this.localDeviceService.setBatteryLevel(deviceData.deviceId, event?.data?.batteryLevel ?? 0, constants_1.Source.CLOUD_EVENT);
+                    break;
+            }
         }
-    }
-    async extractHubDetails(device) {
-        const hubIds = device?.hubId;
-        const hubDetails = [];
-        if (hubIds) {
-            for (const hubId of hubIds) {
-                const hubDetail = await this.localHubService.getHub(hubId);
-                hubDetails.push({
-                    id: hubDetail?.deviceId,
-                    name: hubDetail?.name,
-                    type: hubDetail?.deviceType?.type,
-                    brand: hubDetail?.specifications?.manufacturer,
-                    model: hubDetail?.specifications?.model,
-                    status: hubDetail?.status?.online ? "ONLINE" : "OFFLINE",
+        async extractHubDetails(device) {
+            const hubIds = device?.hubId;
+            const hubDetails = [];
+            if (hubIds) {
+                for (const hubId of hubIds) {
+                    const hubDetail = await this.localHubService.getHub(hubId);
+                    hubDetails.push({
+                        id: hubDetail?.deviceId,
+                        name: hubDetail?.name,
+                        type: hubDetail?.deviceType?.type,
+                        brand: hubDetail?.specifications?.manufacturer,
+                        model: hubDetail?.specifications?.model,
+                        status: hubDetail?.status?.online ? "ONLINE" : "OFFLINE",
+                    });
+                }
+            }
+            return hubDetails;
+        }
+        constructDeviceEventEntity(eventData, device, hubDetails, options = {}) {
+            return {
+                event: {
+                    eventId: options.eventId || eventData?.eventId || "",
+                    eventName: options.eventName || eventData?.eventName || "",
+                    status: options.status || eventData?.status || "",
+                    mode: options.mode || eventData?.data?.mode,
+                    userName: options.userName || eventData?.userName || "",
+                    userId: options.userId || eventData?.userId || "",
+                    userType: options.userType || eventData?.userType || "",
+                    raw_event: options.rawEvent || eventData?.rawData || {},
+                    batteryLevel: options.batteryLevel || eventData?.data?.batteryLevel || "",
+                    reason: options.reason || eventData?.data?.reason || "",
+                    eventDescription: options.eventDescription || eventData?.event || "",
+                },
+                device: {
+                    id: eventData?.deviceId || "",
+                    name: device?.name || "",
+                    type: device?.deviceType?.type || "",
+                    brand: device?.specifications?.manufacturer || "",
+                    model: device?.specifications?.model || "",
+                },
+                hub: hubDetails,
+                property: {
+                    id: eventData?.property?.id || "",
+                    name: eventData?.property?.name || "",
+                    location: eventData?.property?.apartment || "",
+                },
+            };
+        }
+        async dumpToEventOperation(data, device) {
+            try {
+                const hubDetails = await this.extractHubDetails(device);
+                const eventData = this.constructDeviceEventEntity(data, device, hubDetails, {
+                    status: data.eventName === "lock.unlock" ? "UNLOCKED" : "LOCKED",
+                    rawEvent: data.rawData,
                 });
+                this.logger.info("[DT | CDL]:[DeviceEventHandler]: Event data dumped to event operation", { eventData });
+            }
+            catch (error) {
+                this.logger.error("[DT | CDL]:[DeviceEventHandler]: Error dumping to event operation", error);
             }
         }
-        return hubDetails;
-    }
-    constructDeviceEventEntity(eventData, device, hubDetails, options = {}) {
-        return {
-            event: {
-                eventId: options.eventId || eventData?.eventId || "",
-                eventName: options.eventName || eventData?.eventName || "",
-                status: options.status || eventData?.status || "",
-                mode: options.mode || eventData?.data?.mode,
-                userName: options.userName || eventData?.userName || "",
-                userId: options.userId || eventData?.userId || "",
-                userType: options.userType || eventData?.userType || "",
-                raw_event: options.rawEvent || eventData?.rawData || {},
-                batteryLevel: options.batteryLevel || eventData?.data?.batteryLevel || "",
-                reason: options.reason || eventData?.data?.reason || "",
-                eventDescription: options.eventDescription || eventData?.event || "",
-            },
-            device: {
-                id: eventData?.deviceId || "",
-                name: device?.name || "",
-                type: device?.deviceType?.type || "",
-                brand: device?.specifications?.manufacturer || "",
-                model: device?.specifications?.model || "",
-            },
-            hub: hubDetails,
-            property: {
-                id: eventData?.property?.id || "",
-                name: eventData?.property?.name || "",
-                location: eventData?.property?.apartment || "",
-            },
-        };
-    }
-    async dumpToEventOperation(data, device) {
-        try {
-            const hubDetails = await this.extractHubDetails(device);
-            const eventData = this.constructDeviceEventEntity(data, device, hubDetails, {
-                status: data.eventName === "lock.unlock" ? "UNLOCKED" : "LOCKED",
-                rawEvent: data.rawData,
-            });
-            this.logger.info("[DT | CDL]:[DeviceEventHandler]: Event data dumped to event operation", { eventData });
+        async updateTablesBasedOnEventType(eventData, device) {
+            switch (eventData.eventName) {
+                case Event_1.DT_EVENT_TYPES.DEVICE.STATUS.ONLINE:
+                case Event_1.DT_EVENT_TYPES.DEVICE.STATUS.OFFLINE:
+                case Event_1.DT_EVENT_TYPES.DEVICE.STATUS.CHANGED:
+                    this.updateDeviceStatus(eventData, device);
+                    break;
+                case Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.CHANGED:
+                case Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.CRITICAL:
+                case Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.LOW:
+                    this.updateDeviceBattery(eventData, device);
+                    break;
+            }
         }
-        catch (error) {
-            this.logger.error("[DT | CDL]:[DeviceEventHandler]: Error dumping to event operation", error);
+        async updateDeviceStatus(data, device) {
+            this.logger.info("[DT | CDL]:[DeviceEventHandler]: Updating device status", {
+                data,
+                device,
+            });
         }
-    }
-    async updateTablesBasedOnEventType(eventData, device) {
-        switch (eventData.eventName) {
-            case Event_1.DT_EVENT_TYPES.DEVICE.STATUS.ONLINE:
-            case Event_1.DT_EVENT_TYPES.DEVICE.STATUS.OFFLINE:
-            case Event_1.DT_EVENT_TYPES.DEVICE.STATUS.CHANGED:
-                this.updateDeviceStatus(eventData, device);
-                break;
-            case Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.CHANGED:
-            case Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.CRITICAL:
-            case Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.LOW:
-                this.updateDeviceBattery(eventData, device);
-                break;
+        async updateDeviceBattery(data, device) {
+            this.logger.info("[DT | CDL]:[DeviceEventHandler]: Updating device battery", {
+                data,
+                device,
+            });
         }
-    }
-    async updateDeviceStatus(data, device) {
-        this.logger.info("[DT | CDL]:[DeviceEventHandler]: Updating device status", {
-            data,
-            device,
-        });
-    }
-    async updateDeviceBattery(data, device) {
-        this.logger.info("[DT | CDL]:[DeviceEventHandler]: Updating device battery", {
-            data,
-            device,
-        });
-    }
-}
+    };
+    __setFunctionName(_classThis, "DeviceEventHandler");
+    (() => {
+        const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+        __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+        DeviceEventHandler = _classThis = _classDescriptor.value;
+        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return DeviceEventHandler = _classThis;
+})();
 exports.DeviceEventHandler = DeviceEventHandler;

package/dist/queue/utils/rateLimit.utils.js

@@ -43,6 +43,16 @@ class RateLimitUtils {
             windowMs: 10000, // 10 seconds
             provider: constants_1.CONNECTION_PROVIDERS.CLOUDBEDS,
         });
+        configs.set(constants_1.CONNECTION_PROVIDERS.STAYNTOUCH, {
+            maxRequests: 10,
+            windowMs: 10000, // 10 seconds
+            provider: constants_1.CONNECTION_PROVIDERS.STAYNTOUCH,
+        });
+        configs.set(constants_1.CONNECTION_PROVIDERS.HOTELKEY, {
+            maxRequests: 10,
+            windowMs: 10000, // 10 seconds
+            provider: constants_1.CONNECTION_PROVIDERS.HOTELKEY,
+        });
         configs.set(constants_1.CONNECTION_PROVIDERS.TTLOCK, {
             maxRequests: 15,
             windowMs: 60000, // 1 minute

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-common-device",
-  "version": "3.1.2",
+  "version": "3.1.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -10,9 +10,9 @@
   ],
   "scripts": {
     "build": "tsc",
-    "patch": "npm version patch && npm run build && npm publish",
-    "minor": "npm version minor && npm run build && npm publish",
-    "major": "npm version major && npm run build && npm publish",
+    "patch": "npm version patch && npm run build && npm publish && git push",
+    "minor": "npm version minor && npm run build && npm publish && git push",
+    "major": "npm version major && npm run build && npm publish && git push",
     "security:audit": "npm audit --audit-level=moderate",
     "security:fix": "npm audit fix",
     "security:check": "npm audit && npm outdated",