dt-common-device 1.0.15 → 1.0.17

package/dist/config/config.d.ts

@@ -7,7 +7,11 @@ export declare function ensureAuditInitialized(): void;
  * Returns the PostgreSQL DB URI from environment variables.
  * Throws an error if not set.
  */
-export declare function getPostgresDbUri(): string;
+export declare function getPostgresDbUri(): {
+    baseUri: string;
+    dbName: string;
+    params: string;
+};
 /**
  * Returns the Redis DB Host and port from environment variables.
  * Throws an error if not set.

package/dist/config/config.js

@@ -62,11 +62,15 @@ function ensureAuditInitialized() {
  * Throws an error if not set.
  */
 function getPostgresDbUri() {
-    const uri = process.env.DATABASE_URL;
-    if (!uri) {
+    const fullUri = process.env.DATABASE_URL;
+    if (!fullUri) {
         throw new Error("dt-common-device: POSTGRESQL_DB_URI must be set in environment variables or .env file");
     }
-    return uri;
+    const url = new URL(fullUri);
+    const baseUri = `${url.protocol}//${url.username}:${url.password}@${url.hostname}${url.port ? `:${url.port}` : ""}/`;
+    const dbName = url.pathname.replace(/^\//, "").split("?")[0];
+    const params = url.search || "";
+    return { baseUri, dbName, params };
 }
 /**
  * Returns the Redis DB Host and port from environment variables.

package/dist/db/db.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPostgresClient = getPostgresClient;
 const pg_1 = require("pg");
 const config_1 = require("../config/config");
-const dbUri = (0, config_1.getPostgresDbUri)();
+const { baseUri, dbName, params } = (0, config_1.getPostgresDbUri)();
 let pool = null;
 function getPostgresClient() {
     if (!pool) {
         pool = new pg_1.Pool({
-            connectionString: dbUri,
+            connectionString: `${baseUri}${dbName}${params}`,
         });
     }
     return pool;

package/dist/device/cloud/types.d.ts

@@ -39,13 +39,13 @@ export interface IConnectionConnectParams {
     propertyId?: string;
     [key: string]: unknown;
 }
-export interface ConnectionProvider {
-    DEVICETHREAD: "Devicethread";
-    SMARTTHINGS: "Smartthings";
-    SALTOKS: "SaltoKS";
-    TUYA: "Tuya";
-    TTLOCK: "TTLock";
-    SCHLAGE: "Schlage";
-    YALEWIFI: "YaleWifi";
-    SENSIBO: "Sensibo";
+export declare enum ConnectionProvider {
+    Smartthings = "Smartthings",
+    SaltoKS = "SaltoKS",
+    TTLock = "TTLock",
+    Tuya = "Tuya",
+    Schlage = "Schlage",
+    YaleWifi = "YaleWifi",
+    Sensibo = "Sensibo",
+    Devicethread = "Devicethread"
 }

package/dist/device/cloud/types.js

@@ -1,3 +1,15 @@
 "use strict";
 // Device Cloud Type Interfaces for DeviceThread Common Library
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConnectionProvider = void 0;
+var ConnectionProvider;
+(function (ConnectionProvider) {
+    ConnectionProvider["Smartthings"] = "Smartthings";
+    ConnectionProvider["SaltoKS"] = "SaltoKS";
+    ConnectionProvider["TTLock"] = "TTLock";
+    ConnectionProvider["Tuya"] = "Tuya";
+    ConnectionProvider["Schlage"] = "Schlage";
+    ConnectionProvider["YaleWifi"] = "YaleWifi";
+    ConnectionProvider["Sensibo"] = "Sensibo";
+    ConnectionProvider["Devicethread"] = "Devicethread";
+})(ConnectionProvider || (exports.ConnectionProvider = ConnectionProvider = {}));

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

@@ -1,5 +1,6 @@
+import { IConnection } from "../interfaces/IConnection";
 export declare class LocalConnectionService {
     private readonly pool;
     constructor();
-    getConnection(connectionId: string): Promise<any>;
+    getConnection(connectionId: string): Promise<IConnection>;
 }

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

@@ -153,7 +153,7 @@ class LocalDeviceService {
     async getDevicesByAccessGroup(accessGroupId) {
         try {
             // Fetch from Postgres if not in cache
-            const result = await this.postgres.query("SELECT * FROM access_groups WHERE id = $1", [accessGroupId]);
+            const result = await this.postgres.query("SELECT * FROM dt_group WHERE id = $1", [accessGroupId]);
             if (result.rows.length > 0) {
                 return result.rows[0];
             }

package/package.json

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

package/src/config/config.ts

@@ -68,14 +68,24 @@ export function ensureAuditInitialized() {
  * Returns the PostgreSQL DB URI from environment variables.
  * Throws an error if not set.
  */
-export function getPostgresDbUri(): string {
-  const uri = process.env.DATABASE_URL;
-  if (!uri) {
+export function getPostgresDbUri(): {
+  baseUri: string;
+  dbName: string;
+  params: string;
+} {
+  const fullUri = process.env.DATABASE_URL;
+  if (!fullUri) {
     throw new Error(
       "dt-common-device: POSTGRESQL_DB_URI must be set in environment variables or .env file"
     );
   }
-  return uri;
+  const url = new URL(fullUri);
+  const baseUri = `${url.protocol}//${url.username}:${url.password}@${
+    url.hostname
+  }${url.port ? `:${url.port}` : ""}/`;
+  const dbName = url.pathname.replace(/^\//, "").split("?")[0];
+  const params = url.search || "";
+  return { baseUri, dbName, params };
 }
 
 /**

package/src/db/db.ts

@@ -1,14 +1,14 @@
 import { Pool } from "pg";
 import { getPostgresDbUri } from "../config/config";
 
-const dbUri = getPostgresDbUri();
+const { baseUri, dbName, params } = getPostgresDbUri();
 
 let pool: Pool | null = null;
 
 export function getPostgresClient() {
   if (!pool) {
     pool = new Pool({
-      connectionString: dbUri,
+      connectionString: `${baseUri}${dbName}${params}`,
     });
   }
   return pool;

package/src/device/cloud/types.ts

@@ -45,13 +45,13 @@ export interface IConnectionConnectParams {
   [key: string]: unknown;
 }
 
-export interface ConnectionProvider {
-  DEVICETHREAD: "Devicethread";
-  SMARTTHINGS: "Smartthings";
-  SALTOKS: "SaltoKS";
-  TUYA: "Tuya";
-  TTLOCK: "TTLock";
-  SCHLAGE: "Schlage";
-  YALEWIFI: "YaleWifi";
-  SENSIBO: "Sensibo";
-}
+export enum ConnectionProvider {
+  Smartthings = "Smartthings",
+  SaltoKS = "SaltoKS",
+  TTLock = "TTLock",
+  Tuya = "Tuya",
+  Schlage = "Schlage",
+  YaleWifi = "YaleWifi",
+  Sensibo = "Sensibo",
+  Devicethread = "Devicethread",
+}

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

@@ -1,11 +1,12 @@
 import { getPostgresClient } from "../../../db";
+import { IConnection } from "../interfaces/IConnection";
 export class LocalConnectionService {
   private readonly pool;
   constructor() {
     this.pool = getPostgresClient();
   }
 
-  async getConnection(connectionId: string) {
+  async getConnection(connectionId: string): Promise<IConnection> {
     const result = await this.pool.query(
       "SELECT * FROM dt_connections WHERE id = $1",
       [connectionId]

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

@@ -203,7 +203,7 @@ export class LocalDeviceService {
     try {
       // Fetch from Postgres if not in cache
       const result = await this.postgres.query(
-        "SELECT * FROM access_groups WHERE id = $1",
+        "SELECT * FROM dt_group WHERE id = $1",
         [accessGroupId]
       );
       if (result.rows.length > 0) {