dt-common-device 3.0.6 → 3.0.8

package/dist/config/config.d.ts

@@ -1,7 +1,8 @@
 import { InternalEventSubscription } from "../events";
-import { IConfig } from "./config.types";
+import { IConfig, ILogger } from "./config.types";
 export declare function initialize(cfg: IConfig): Promise<void>;
 export declare function getConfig(): IConfig;
+export declare function getLogger(): ILogger;
 export declare function getEventSubscription(): InternalEventSubscription | null;
 export declare function checkRequiredEnv(): void;
 export declare function ensureAuditInitialized(): void;

package/dist/config/config.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initialize = initialize;
 exports.getConfig = getConfig;
+exports.getLogger = getLogger;
 exports.getEventSubscription = getEventSubscription;
 exports.checkRequiredEnv = checkRequiredEnv;
 exports.ensureAuditInitialized = ensureAuditInitialized;
@@ -82,6 +83,10 @@ function getConfig() {
     }
     return config;
 }
+// Direct logger export for easier usage
+function getLogger() {
+    return getConfig().LOGGER;
+}
 function getEventSubscription() {
     return eventSubscription;
 }

package/dist/device/local/repository/Schedule.repository.d.ts

@@ -1,8 +1,10 @@
 import { ISchedule } from "../interfaces/ISchedule";
 export declare class ScheduleRepository {
     private readonly axiosInstance;
+    private readonly logger;
     constructor();
     getSchedule(scheduleId: string): Promise<any>;
     getScheduleByZone(zoneId: string): Promise<any>;
     setSchedule(scheduleId: string, schedule: ISchedule): Promise<any>;
+    deleteSchedule(scheduleId: string): Promise<any>;
 }

package/dist/device/local/repository/Schedule.repository.js

@@ -49,6 +49,7 @@ let ScheduleRepository = (() => {
     let _classThis;
     var ScheduleRepository = _classThis = class {
         constructor() {
+            this.logger = (0, config_1.getLogger)();
             this.axiosInstance = (0, http_utils_1.getDeviceServiceAxiosInstance)();
         }
         async getSchedule(scheduleId) {
@@ -57,7 +58,7 @@ let ScheduleRepository = (() => {
                 return response.data;
             }
             catch (error) {
-                (0, config_1.getConfig)().LOGGER.error(`Failed to get schedule ${scheduleId}:`, error);
+                this.logger.error(`Failed to get schedule ${scheduleId}:`, error);
                 const errorMessage = error.response?.data?.message || error.message || "Unknown error";
                 throw new Error(`Failed to get schedule: ${errorMessage}`);
             }
@@ -68,7 +69,7 @@ let ScheduleRepository = (() => {
                 return response.data;
             }
             catch (error) {
-                (0, config_1.getConfig)().LOGGER.error(`Failed to get schedule by zone ${zoneId}:`, error);
+                this.logger.error(`Failed to get schedule by zone ${zoneId}:`, error);
                 const errorMessage = error.response?.data?.message || error.message || "Unknown error";
                 throw new Error(`Failed to get schedule: ${errorMessage}`);
             }
@@ -79,11 +80,21 @@ let ScheduleRepository = (() => {
                 return response.data;
             }
             catch (error) {
-                (0, config_1.getConfig)().LOGGER.error(`Failed to update schedule ${scheduleId}:`, error);
+                this.logger.error(`Failed to update schedule ${scheduleId}:`, error);
                 const errorMessage = error.response?.data?.message || error.message || "Unknown error";
                 throw new Error(`Failed to update schedule: ${errorMessage}`);
             }
         }
+        async deleteSchedule(scheduleId) {
+            try {
+                const response = await this.axiosInstance.delete(`/devices/schedules/${scheduleId}`);
+                return response.data;
+            }
+            catch (error) {
+                this.logger.error(`Failed to delete schedule from DB ${scheduleId}:`, error);
+                throw new Error(`Failed to delete schedule from DB: ${error.message}`);
+            }
+        }
     };
     __setFunctionName(_classThis, "ScheduleRepository");
     (() => {

package/dist/device/local/services/Device.service.js

@@ -293,8 +293,8 @@ class LocalDeviceService {
         if (!query || Object.keys(query).length === 0) {
             throw new Error("Query is required");
         }
-        const count = await this.deviceRepository.queryDevices(query);
-        return count;
+        const res = await this.deviceRepository.queryDevices(query);
+        return res;
     }
 }
 exports.LocalDeviceService = LocalDeviceService;

package/dist/device/local/services/Schedule.service.d.ts

@@ -5,4 +5,5 @@ export declare class LocalScheduleService {
     getSchedule(scheduleId: string): Promise<any>;
     setSchedule(scheduleId: string, schedule: ISchedule): Promise<any>;
     getScheduleByZone(zoneId: string): Promise<any>;
+    deleteSchedule(scheduleId: string): Promise<any>;
 }

package/dist/device/local/services/Schedule.service.js

@@ -19,5 +19,8 @@ class LocalScheduleService {
     async getScheduleByZone(zoneId) {
         return await this.scheduleRepository.getScheduleByZone(zoneId);
     }
+    async deleteSchedule(scheduleId) {
+        return await this.scheduleRepository.deleteSchedule(scheduleId);
+    }
 }
 exports.LocalScheduleService = LocalScheduleService;

package/dist/queue/utils/queueUtils.js

@@ -30,17 +30,13 @@ class QueueUtils {
         // Simplified event handlers
         worker.on("completed", (job) => {
             (0, config_1.getConfig)().LOGGER.info(`HTTP request completed: ${job.id} [${queueKey}]`);
-            job.returnvalue
-                .then((result) => jobResults.set(job.id, {
+            // job.returnvalue is the actual result, not a Promise
+            const result = job.returnvalue;
+            jobResults.set(job.id, {
                 result,
                 resolved: true,
                 timestamp: Date.now(),
-            }))
-                .catch((error) => jobResults.set(job.id, {
-                error: error.message,
-                resolved: true,
-                timestamp: Date.now(),
-            }));
+            });
         });
         worker.on("failed", (job, err) => {
             (0, config_1.getConfig)().LOGGER.error(`HTTP request failed: ${job?.id} [${queueKey}], Error: ${err.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-common-device",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/src/config/config.ts

@@ -3,7 +3,7 @@ import { connectDatabase } from "../db/db";
 import dotenv from "dotenv";
 import { InternalEventSubscription } from "../events";
 import { validateServiceUrl } from "../utils/http.utils";
-import { IConfig } from "./config.types";
+import { IConfig, ILogger } from "./config.types";
 
 dotenv.config();
 
@@ -86,6 +86,11 @@ export function getConfig(): IConfig {
   return config;
 }
 
+// Direct logger export for easier usage
+export function getLogger(): ILogger {
+  return getConfig().LOGGER;
+}
+
 export function getEventSubscription(): InternalEventSubscription | null {
   return eventSubscription;
 }

package/src/device/local/repository/Schedule.repository.ts

@@ -1,11 +1,12 @@
 import { Service } from "typedi";
-import { getConfig } from "../../../config/config";
+import { getLogger } from "../../../config/config";
 import { ISchedule } from "../interfaces/ISchedule";
 import { getDeviceServiceAxiosInstance } from "../../../utils/http.utils";
 
 @Service()
 export class ScheduleRepository {
   private readonly axiosInstance;
+  private readonly logger = getLogger();
 
   constructor() {
     this.axiosInstance = getDeviceServiceAxiosInstance();
@@ -18,7 +19,7 @@ export class ScheduleRepository {
       );
       return response.data;
     } catch (error: any) {
-      getConfig().LOGGER.error(`Failed to get schedule ${scheduleId}:`, error);
+      this.logger.error(`Failed to get schedule ${scheduleId}:`, error);
       const errorMessage =
         error.response?.data?.message || error.message || "Unknown error";
       throw new Error(`Failed to get schedule: ${errorMessage}`);
@@ -32,10 +33,7 @@ export class ScheduleRepository {
       );
       return response.data;
     } catch (error: any) {
-      getConfig().LOGGER.error(
-        `Failed to get schedule by zone ${zoneId}:`,
-        error
-      );
+      this.logger.error(`Failed to get schedule by zone ${zoneId}:`, error);
       const errorMessage =
         error.response?.data?.message || error.message || "Unknown error";
       throw new Error(`Failed to get schedule: ${errorMessage}`);
@@ -50,13 +48,25 @@ export class ScheduleRepository {
       );
       return response.data;
     } catch (error: any) {
-      getConfig().LOGGER.error(
-        `Failed to update schedule ${scheduleId}:`,
-        error
-      );
+      this.logger.error(`Failed to update schedule ${scheduleId}:`, error);
       const errorMessage =
         error.response?.data?.message || error.message || "Unknown error";
       throw new Error(`Failed to update schedule: ${errorMessage}`);
     }
   }
+
+  async deleteSchedule(scheduleId: string) {
+    try {
+      const response = await this.axiosInstance.delete(
+        `/devices/schedules/${scheduleId}`
+      );
+      return response.data;
+    } catch (error: any) {
+      this.logger.error(
+        `Failed to delete schedule from DB ${scheduleId}:`,
+        error
+      );
+      throw new Error(`Failed to delete schedule from DB: ${error.message}`);
+    }
+  }
 }

package/src/device/local/services/Device.service.ts

@@ -430,7 +430,7 @@ export class LocalDeviceService {
     if (!query || Object.keys(query).length === 0) {
       throw new Error("Query is required");
     }
-    const count = await this.deviceRepository.queryDevices(query);
-    return count;
+    const res = await this.deviceRepository.queryDevices(query);
+    return res;
   }
 }

package/src/device/local/services/Schedule.service.ts

@@ -19,4 +19,8 @@ export class LocalScheduleService {
   async getScheduleByZone(zoneId: string) {
     return await this.scheduleRepository.getScheduleByZone(zoneId);
   }
+
+  async deleteSchedule(scheduleId: string) {
+    return await this.scheduleRepository.deleteSchedule(scheduleId);
+  }
 }

package/src/queue/utils/queueUtils.ts

@@ -47,21 +47,14 @@ export class QueueUtils {
       getConfig().LOGGER.info(
         `HTTP request completed: ${job.id} [${queueKey}]`
       );
-      job.returnvalue
-        .then((result: any) =>
-          jobResults.set(job.id!, {
-            result,
-            resolved: true,
-            timestamp: Date.now(),
-          })
-        )
-        .catch((error: any) =>
-          jobResults.set(job.id!, {
-            error: error.message,
-            resolved: true,
-            timestamp: Date.now(),
-          })
-        );
+
+      // job.returnvalue is the actual result, not a Promise
+      const result = job.returnvalue;
+      jobResults.set(job.id!, {
+        result,
+        resolved: true,
+        timestamp: Date.now(),
+      });
     });
 
     worker.on("failed", (job: any, err: any) => {