dt-common-device 1.0.16 → 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-common-device",
-  "version": "1.0.16",
+  "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;