npm - @uns-kit/database - Versions diffs - 2.0.64 → 2.0.66 - Mend

@uns-kit/database 2.0.64 → 2.0.66

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/LICENSE CHANGED Viewed

@@ -1,21 +1,21 @@
-MIT License
-Copyright (c) 2023 Aljoša Vister
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+Copyright (c) 2023 Aljoša Vister
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/client.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ import type { DatabaseConnectionConfig } from "./schema.js";
 import type { DatabaseClient } from "./types.js";
 export declare function createDatabaseClient(config: DatabaseConnectionConfig, options?: {
     name?: string;
+    onClose?: () => void;
 }): Promise<DatabaseClient>;
 export declare class DatabaseManager {
     private readonly configs;

package/dist/client.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAG5D,OAAO,KAAK,EAEV,cAAc,EAIf,MAAM,YAAY,CAAC;~~AAyDpB~~,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,wBAAwB,EAChC,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAO,~~GAC9B~~,OAAO,CAAC,cAAc,CAAC,CAmBzB;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+C;IACvE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8C;IAEtE,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,wBAAwB,GAAG,IAAI;IAgB9D,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B,QAAQ,IAAI,MAAM,EAAE;IAId,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;~~IAsB1C~~,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAOhC;AAID,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,wBAAwB,GAAG,eAAe,CAEhG;AAED,wBAAgB,kBAAkB,IAAI,eAAe,CAEpD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAEjE"}
1	+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAG5D,OAAO,KAAK,EAEV,cAAc,EAIf,MAAM,YAAY,CAAC;AAqEpB,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,wBAAwB,EAChC,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAA;CAAO,GACpD,OAAO,CAAC,cAAc,CAAC,CAmBzB;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+C;IACvE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8C;IAEtE,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,wBAAwB,GAAG,IAAI;IAgB9D,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B,QAAQ,IAAI,MAAM,EAAE;IAId,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IA6B1C,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAOhC;AAID,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,wBAAwB,GAAG,eAAe,CAEhG;AAED,wBAAgB,kBAAkB,IAAI,eAAe,CAEpD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAEjE"}

package/dist/client.js CHANGED Viewed

@@ -7,11 +7,14 @@ import { createSqliteAdapter } from "./drivers/sqlite.js";
 import { createOracleAdapter } from "./drivers/oracle.js";
 class DatabaseClientImpl {
     adapter;
+    onClose;
     dialect;
     name;
     sqlDir;
-    constructor(adapter, name, sqlDir) {
+    closePromise = null;
+    constructor(adapter, onClose, name, sqlDir) {
         this.adapter = adapter;
+        this.onClose = onClose;
         this.dialect = adapter.dialect;
         this.name = name;
         this.sqlDir = sqlDir;
@@ -33,7 +36,17 @@ class DatabaseClientImpl {
         return this.execute(sqlText, params);
     }
     async close() {
-        await this.adapter.close();
+        if (!this.closePromise) {
+            this.closePromise = (async () => {
+                try {
+                    await this.adapter.close();
+                }
+                finally {
+                    this.onClose?.();
+                }
+            })();
+        }
+        await this.closePromise;
     }
 }
 export async function createDatabaseClient(config, options = {}) {
@@ -43,11 +56,11 @@ export async function createDatabaseClient(config, options = {}) {
     logger.info(`uns-database - Creating database client: ${options.name ?? "unnamed"} (${config.dialect}, pool=${config.dialect === "sqlite" ? "n/a" : config.usePool !== false})`);
     switch (config.dialect) {
         case "pg":
-            return new DatabaseClientImpl(await createPgAdapter(config), options.name, sqlDir);
+            return new DatabaseClientImpl(await createPgAdapter(config), options.onClose, options.name, sqlDir);
         case "sqlite":
-            return new DatabaseClientImpl(await createSqliteAdapter(config), options.name, sqlDir);
+            return new DatabaseClientImpl(await createSqliteAdapter(config), options.onClose, options.name, sqlDir);
         case "oracle":
-            return new DatabaseClientImpl(await createOracleAdapter(config), options.name, sqlDir);
+            return new DatabaseClientImpl(await createOracleAdapter(config), options.onClose, options.name, sqlDir);
     }
     throw new Error(`Unsupported database dialect: ${String(config.dialect)}`);
 }
@@ -80,7 +93,14 @@ export class DatabaseManager {
         if (!config) {
             throw new Error(`Database connection '${name}' is not configured.`);
         }
-        const clientPromise = createDatabaseClient(config, { name }).catch((error) => {
+        const clientPromise = createDatabaseClient(config, {
+            name,
+            onClose: () => {
+                if (this.clients.get(name) === clientPromise) {
+                    this.clients.delete(name);
+                }
+            },
+        }).catch((error) => {
             this.clients.delete(name);
             logger.error(`uns-database - Database client initialization failed: ${name}`, error);
             throw error;

package/dist/client.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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","sourcesContent":["import path from \"node:path\";\nimport logger from \"@uns-kit/core/logger.js\";\nimport type { DatabaseConnectionConfig } from \"./schema.js\";\nimport { compileNamedParams } from \"./params.js\";\nimport { loadSqlFile } from \"./sql.js\";\nimport type {\n DatabaseAdapter,\n DatabaseClient,\n DatabaseExecuteResult,\n DatabaseQueryResult,\n SqlParams,\n} from \"./types.js\";\nimport { createPgAdapter } from \"./drivers/pg.js\";\nimport { createSqliteAdapter } from \"./drivers/sqlite.js\";\nimport { createOracleAdapter } from \"./drivers/oracle.js\";\n\nclass DatabaseClientImpl implements DatabaseClient {\n readonly dialect;\n readonly name?;\n readonly sqlDir?;\n\n constructor(\n private readonly adapter: DatabaseAdapter,\n name?: string,\n sqlDir?: string\n ) {\n this.dialect = adapter.dialect;\n this.name = name;\n this.sqlDir = sqlDir;\n }\n\n async query<T = Record<string, unknown>>(\n sqlText: string,\n params: SqlParams = {}\n ): Promise<DatabaseQueryResult<T>> {\n const statement = compileNamedParams(this.dialect, sqlText, params);\n return this.adapter.query<T>(statement);\n }\n\n async execute(\n sqlText: string,\n params: SqlParams = {}\n ): Promise<DatabaseExecuteResult> {\n const statement = compileNamedParams(this.dialect, sqlText, params);\n return this.adapter.execute(statement);\n }\n\n async queryFile<T = Record<string, unknown>>(\n filePath: string,\n params: SqlParams = {}\n ): Promise<DatabaseQueryResult<T>> {\n const sqlText = await loadSqlFile(filePath, { baseDir: this.sqlDir });\n return this.query<T>(sqlText, params);\n }\n\n async executeFile(\n filePath: string,\n params: SqlParams = {}\n ): Promise<DatabaseExecuteResult> {\n const sqlText = await loadSqlFile(filePath, { baseDir: this.sqlDir });\n return this.execute(sqlText, params);\n }\n\n async close(): Promise<void> {\n await this.adapter.close();\n }\n}\n\nexport async function createDatabaseClient(\n config: DatabaseConnectionConfig,\n options: { name?: string } = {}\n): Promise<DatabaseClient> {\n const sqlDir = config.sqlDir\n ? path.resolve(process.cwd(), config.sqlDir)\n : undefined;\n\n logger.info(\n `uns-database - Creating database client: ${options.name ?? \"unnamed\"} (${config.dialect}, pool=${config.dialect === \"sqlite\" ? \"n/a\" : config.usePool !== false})`\n );\n\n switch (config.dialect) {\n case \"pg\":\n return new DatabaseClientImpl(await createPgAdapter(config), options.name, sqlDir);\n case \"sqlite\":\n return new DatabaseClientImpl(await createSqliteAdapter(config), options.name, sqlDir);\n case \"oracle\":\n return new DatabaseClientImpl(await createOracleAdapter(config), options.name, sqlDir);\n }\n\n throw new Error(`Unsupported database dialect: ${String((config as { dialect?: string }).dialect)}`);\n}\n\nexport class DatabaseManager {\n private readonly configs = new Map<string, DatabaseConnectionConfig>();\n private readonly clients = new Map<string, Promise<DatabaseClient>>();\n\n register(name: string, config: DatabaseConnectionConfig): this {\n const hadExistingConfig = this.configs.has(name);\n const hadExistingClient = this.clients.has(name);\n\n this.configs.set(name, config);\n this.clients.delete(name);\n\n logger.info(\n hadExistingConfig\n ? `uns-database - Re-registered database: ${name} (${config.dialect}, pool=${config.dialect === \"sqlite\" ? \"n/a\" : config.usePool !== false}, replacedClient=${hadExistingClient})`\n : `uns-database - Registered database: ${name} (${config.dialect}, pool=${config.dialect === \"sqlite\" ? \"n/a\" : config.usePool !== false})`\n );\n\n return this;\n }\n\n has(name: string): boolean {\n return this.configs.has(name);\n }\n\n getNames(): string[] {\n return Array.from(this.configs.keys());\n }\n\n async get(name: string): Promise<DatabaseClient> {\n const existing = this.clients.get(name);\n if (existing) {\n logger.info(`uns-database - Reusing cached database client: ${name}`);\n return existing;\n }\n\n const config = this.configs.get(name);\n if (!config) {\n throw new Error(`Database connection '${name}' is not configured.`);\n }\n\n const clientPromise = createDatabaseClient(config, { name }).catch((error) => {\n this.clients.delete(name);\n logger.error(`uns-database - Database client initialization failed: ${name}`, error);\n throw error;\n });\n this.clients.set(name, clientPromise);\n logger.info(`uns-database - Initialized database client cache entry: ${name} (${config.dialect})`);\n return clientPromise;\n }\n\n async close(name: string): Promise<void> {\n const client = this.clients.get(name);\n if (!client) {\n logger.info(`uns-database - Close requested for database without active client: ${name}`);\n return;\n }\n\n this.clients.delete(name);\n await (await client).close();\n logger.info(`uns-database - Closed database client: ${name}`);\n }\n\n async closeAll(): Promise<void> {\n const pendingClients = Array.from(this.clients.values());\n const count = pendingClients.length;\n this.clients.clear();\n await Promise.all(pendingClients.map(async client => (await client).close()));\n logger.info(`uns-database - Closed all database clients (${count})`);\n }\n}\n\nconst defaultDatabaseManager = new DatabaseManager();\n\nexport function registerDatabase(name: string, config: DatabaseConnectionConfig): DatabaseManager {\n return defaultDatabaseManager.register(name, config);\n}\n\nexport function getDatabaseManager(): DatabaseManager {\n return defaultDatabaseManager;\n}\n\nexport function getDatabase(name: string): Promise<DatabaseClient> {\n return defaultDatabaseManager.get(name);\n}\n"]}
1	+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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","sourcesContent":["import path from \"node:path\";\nimport logger from \"@uns-kit/core/logger.js\";\nimport type { DatabaseConnectionConfig } from \"./schema.js\";\nimport { compileNamedParams } from \"./params.js\";\nimport { loadSqlFile } from \"./sql.js\";\nimport type {\n DatabaseAdapter,\n DatabaseClient,\n DatabaseExecuteResult,\n DatabaseQueryResult,\n SqlParams,\n} from \"./types.js\";\nimport { createPgAdapter } from \"./drivers/pg.js\";\nimport { createSqliteAdapter } from \"./drivers/sqlite.js\";\nimport { createOracleAdapter } from \"./drivers/oracle.js\";\n\nclass DatabaseClientImpl implements DatabaseClient {\n readonly dialect;\n readonly name?;\n readonly sqlDir?;\n private closePromise: Promise<void> \| null = null;\n\n constructor(\n private readonly adapter: DatabaseAdapter,\n private readonly onClose?: () => void,\n name?: string,\n sqlDir?: string\n ) {\n this.dialect = adapter.dialect;\n this.name = name;\n this.sqlDir = sqlDir;\n }\n\n async query<T = Record<string, unknown>>(\n sqlText: string,\n params: SqlParams = {}\n ): Promise<DatabaseQueryResult<T>> {\n const statement = compileNamedParams(this.dialect, sqlText, params);\n return this.adapter.query<T>(statement);\n }\n\n async execute(\n sqlText: string,\n params: SqlParams = {}\n ): Promise<DatabaseExecuteResult> {\n const statement = compileNamedParams(this.dialect, sqlText, params);\n return this.adapter.execute(statement);\n }\n\n async queryFile<T = Record<string, unknown>>(\n filePath: string,\n params: SqlParams = {}\n ): Promise<DatabaseQueryResult<T>> {\n const sqlText = await loadSqlFile(filePath, { baseDir: this.sqlDir });\n return this.query<T>(sqlText, params);\n }\n\n async executeFile(\n filePath: string,\n params: SqlParams = {}\n ): Promise<DatabaseExecuteResult> {\n const sqlText = await loadSqlFile(filePath, { baseDir: this.sqlDir });\n return this.execute(sqlText, params);\n }\n\n async close(): Promise<void> {\n if (!this.closePromise) {\n this.closePromise = (async () => {\n try {\n await this.adapter.close();\n } finally {\n this.onClose?.();\n }\n })();\n }\n\n await this.closePromise;\n }\n}\n\nexport async function createDatabaseClient(\n config: DatabaseConnectionConfig,\n options: { name?: string; onClose?: () => void } = {}\n): Promise<DatabaseClient> {\n const sqlDir = config.sqlDir\n ? path.resolve(process.cwd(), config.sqlDir)\n : undefined;\n\n logger.info(\n `uns-database - Creating database client: ${options.name ?? \"unnamed\"} (${config.dialect}, pool=${config.dialect === \"sqlite\" ? \"n/a\" : config.usePool !== false})`\n );\n\n switch (config.dialect) {\n case \"pg\":\n return new DatabaseClientImpl(await createPgAdapter(config), options.onClose, options.name, sqlDir);\n case \"sqlite\":\n return new DatabaseClientImpl(await createSqliteAdapter(config), options.onClose, options.name, sqlDir);\n case \"oracle\":\n return new DatabaseClientImpl(await createOracleAdapter(config), options.onClose, options.name, sqlDir);\n }\n\n throw new Error(`Unsupported database dialect: ${String((config as { dialect?: string }).dialect)}`);\n}\n\nexport class DatabaseManager {\n private readonly configs = new Map<string, DatabaseConnectionConfig>();\n private readonly clients = new Map<string, Promise<DatabaseClient>>();\n\n register(name: string, config: DatabaseConnectionConfig): this {\n const hadExistingConfig = this.configs.has(name);\n const hadExistingClient = this.clients.has(name);\n\n this.configs.set(name, config);\n this.clients.delete(name);\n\n logger.info(\n hadExistingConfig\n ? `uns-database - Re-registered database: ${name} (${config.dialect}, pool=${config.dialect === \"sqlite\" ? \"n/a\" : config.usePool !== false}, replacedClient=${hadExistingClient})`\n : `uns-database - Registered database: ${name} (${config.dialect}, pool=${config.dialect === \"sqlite\" ? \"n/a\" : config.usePool !== false})`\n );\n\n return this;\n }\n\n has(name: string): boolean {\n return this.configs.has(name);\n }\n\n getNames(): string[] {\n return Array.from(this.configs.keys());\n }\n\n async get(name: string): Promise<DatabaseClient> {\n const existing = this.clients.get(name);\n if (existing) {\n logger.info(`uns-database - Reusing cached database client: ${name}`);\n return existing;\n }\n\n const config = this.configs.get(name);\n if (!config) {\n throw new Error(`Database connection '${name}' is not configured.`);\n }\n\n const clientPromise = createDatabaseClient(config, {\n name,\n onClose: () => {\n if (this.clients.get(name) === clientPromise) {\n this.clients.delete(name);\n }\n },\n }).catch((error) => {\n this.clients.delete(name);\n logger.error(`uns-database - Database client initialization failed: ${name}`, error);\n throw error;\n });\n this.clients.set(name, clientPromise);\n logger.info(`uns-database - Initialized database client cache entry: ${name} (${config.dialect})`);\n return clientPromise;\n }\n\n async close(name: string): Promise<void> {\n const client = this.clients.get(name);\n if (!client) {\n logger.info(`uns-database - Close requested for database without active client: ${name}`);\n return;\n }\n\n this.clients.delete(name);\n await (await client).close();\n logger.info(`uns-database - Closed database client: ${name}`);\n }\n\n async closeAll(): Promise<void> {\n const pendingClients = Array.from(this.clients.values());\n const count = pendingClients.length;\n this.clients.clear();\n await Promise.all(pendingClients.map(async client => (await client).close()));\n logger.info(`uns-database - Closed all database clients (${count})`);\n }\n}\n\nconst defaultDatabaseManager = new DatabaseManager();\n\nexport function registerDatabase(name: string, config: DatabaseConnectionConfig): DatabaseManager {\n return defaultDatabaseManager.register(name, config);\n}\n\nexport function getDatabaseManager(): DatabaseManager {\n return defaultDatabaseManager;\n}\n\nexport function getDatabase(name: string): Promise<DatabaseClient> {\n return defaultDatabaseManager.get(name);\n}\n"]}

package/dist/drivers/pg.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../src/drivers/pg.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,KAAK,EAAE,eAAe,EAAuB,MAAM,aAAa,CAAC;AAExE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;~~AAqC3D~~,wBAAsB,eAAe,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,~~CA8E9F~~"}
1	+ {"version":3,"file":"pg.d.ts","sourceRoot":"","sources":["../../src/drivers/pg.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAuB,MAAM,aAAa,CAAC;AAExE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAuC3D,wBAAsB,eAAe,CAAC,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CA2J9F"}

package/dist/drivers/pg.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import logger from "@uns-kit/core/logger.js";
 function buildPgSsl(config) {
     if (config.ssl === undefined) {
         return undefined;
@@ -39,6 +40,9 @@ export async function createPgAdapter(config) {
     };
     if (config.usePool !== false) {
         const pool = new pgModule.Pool(connectionOptions);
+        pool.on("error", (error) => {
+            logger.error("uns-database - PostgreSQL pool idle client error", error);
+        });
         return {
             dialect: "pg",
             async query(statement) {
@@ -59,25 +63,86 @@ export async function createPgAdapter(config) {
             },
         };
     }
-    const client = new pgModule.Client(connectionOptions);
-    await client.connect();
+    let client = null;
+    let clientPromise = null;
+    const detachCachedClient = (activeClient) => {
+        if (client !== activeClient) {
+            return false;
+        }
+        client = null;
+        return true;
+    };
+    const handleClientConnectionError = (activeClient, error) => {
+        if (!detachCachedClient(activeClient)) {
+            return;
+        }
+        logger.error("uns-database - PostgreSQL client connection error", error);
+        void activeClient.end().catch(() => undefined);
+    };
+    const handleClientConnectionEnd = (activeClient) => {
+        if (!detachCachedClient(activeClient)) {
+            return;
+        }
+        logger.warn("uns-database - PostgreSQL client connection ended");
+    };
+    const attachClientListeners = (activeClient) => {
+        activeClient.on("error", (error) => {
+            handleClientConnectionError(activeClient, error);
+        });
+        activeClient.on("end", () => {
+            handleClientConnectionEnd(activeClient);
+        });
+    };
+    const getClient = async () => {
+        if (client) {
+            return client;
+        }
+        if (!clientPromise) {
+            clientPromise = (async () => {
+                const nextClient = new pgModule.Client(connectionOptions);
+                attachClientListeners(nextClient);
+                await nextClient.connect();
+                client = nextClient;
+                return nextClient;
+            })().finally(() => {
+                clientPromise = null;
+            });
+        }
+        return clientPromise;
+    };
     return {
         dialect: "pg",
         async query(statement) {
-            const result = await client.query(statement.text, statement.values);
+            const activeClient = await getClient();
+            const result = await activeClient.query(statement.text, statement.values);
             return {
                 rows: result.rows,
                 rowCount: result.rowCount ?? result.rows.length,
             };
         },
         async execute(statement) {
-            const result = await client.query(statement.text, statement.values);
+            const activeClient = await getClient();
+            const result = await activeClient.query(statement.text, statement.values);
             return {
                 rowCount: result.rowCount ?? 0,
             };
         },
-        close() {
-            return client.end();
+        async close() {
+            const activeClient = client;
+            const pendingClientPromise = clientPromise;
+            client = null;
+            clientPromise = null;
+            if (activeClient) {
+                await activeClient.end();
+                return;
+            }
+            if (!pendingClientPromise) {
+                return;
+            }
+            const pendingClient = await pendingClientPromise.catch(() => null);
+            if (pendingClient) {
+                await pendingClient.end();
+            }
         },
     };
 }

package/dist/drivers/pg.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pg.js","sourceRoot":"","sources":["../../src/drivers/pg.ts"],"names":[],"mappings":"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","sourcesContent":["import type { DatabaseAdapter, DatabaseQueryResult } from \"../types.js\";\nimport type { CompiledSqlStatement } from \"../types.js\";\nimport type { PostgresDatabaseConfig } from \"../schema.js\";\n\ntype PgPool = {\n query<T = Record<string, unknown>>(text: string, values?: unknown[]): Promise<{\n rows: T[];\n rowCount?: number \| null;\n }>;\n end(): Promise<void>;\n};\n\ntype PgClient = {\n connect(): Promise<void>;\n query<T = Record<string, unknown>>(text: string, values?: unknown[]): Promise<{\n rows: T[];\n rowCount?: number \| null;\n }>;\n end(): Promise<void>;\n};\n\nfunction buildPgSsl(config: PostgresDatabaseConfig): unknown {\n if (config.ssl === undefined) {\n return undefined;\n }\n\n if (typeof config.ssl === \"boolean\") {\n return config.ssl;\n }\n\n return {\n rejectUnauthorized: config.ssl.rejectUnauthorized,\n ca: config.ssl.ca,\n cert: config.ssl.cert,\n key: config.ssl.key,\n servername: config.ssl.servername,\n };\n}\n\nexport async function createPgAdapter(config: PostgresDatabaseConfig): Promise<DatabaseAdapter> {\n let pgModule: {\n Pool: new (options: Record<string, unknown>) => PgPool;\n Client: new (options: Record<string, unknown>) => PgClient;\n };\n\n try {\n const importedModule = await import(\"pg\");\n pgModule = ((importedModule as { default?: typeof importedModule }).default ??\n importedModule) as typeof pgModule;\n } catch (error) {\n throw new Error(\n \"The 'pg' package is required for dialect 'pg'. Install it with `pnpm add pg`.\",\n { cause: error as Error }\n );\n }\n\n const connectionOptions = {\n host: config.host,\n port: config.port,\n database: config.database,\n user: config.user,\n password: config.password,\n ssl: buildPgSsl(config),\n application_name: config.applicationName,\n statement_timeout: config.statementTimeoutMs,\n connectionTimeoutMillis: config.connectionTimeoutMs,\n idleTimeoutMillis: config.idleTimeoutMs,\n max: config.maxPoolSize,\n min: config.minPoolSize,\n };\n\n if (config.usePool !== false) {\n const pool = new pgModule.Pool(connectionOptions);\n\n return {\n dialect: \"pg\",\n async query<T = Record<string, unknown>>(statement: CompiledSqlStatement): Promise<DatabaseQueryResult<T>> {\n const result = await pool.query<T>(statement.text, statement.values as unknown[]);\n return {\n rows: result.rows,\n rowCount: result.rowCount ?? result.rows.length,\n };\n },\n async execute(statement: CompiledSqlStatement) {\n const result = await pool.query(statement.text, statement.values as unknown[]);\n return {\n rowCount: result.rowCount ?? 0,\n };\n },\n close() {\n return pool.end();\n },\n };\n }\n\n const client = new pgModule.Client(connectionOptions);\n await client.connect();\n\n return {\n dialect: \"pg\",\n async query<T = Record<string, unknown>>(statement: CompiledSqlStatement): Promise<DatabaseQueryResult<T>> {\n const result = await client.query<T>(statement.text, statement.values as unknown[]);\n return {\n rows: result.rows,\n rowCount: result.rowCount ?? result.rows.length,\n };\n },\n async execute(statement: CompiledSqlStatement) {\n const result = await client.query(statement.text, statement.values as unknown[]);\n return {\n rowCount: result.rowCount ?? 0,\n };\n },\n close() {\n return client.end();\n },\n };\n}\n"]}
1	+ {"version":3,"file":"pg.js","sourceRoot":"","sources":["../../src/drivers/pg.ts"],"names":[],"mappings":"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","sourcesContent":["import logger from \"@uns-kit/core/logger.js\";\r\nimport type { DatabaseAdapter, DatabaseQueryResult } from \"../types.js\";\r\nimport type { CompiledSqlStatement } from \"../types.js\";\r\nimport type { PostgresDatabaseConfig } from \"../schema.js\";\r\n\r\ntype PgPool = {\r\n query<T = Record<string, unknown>>(text: string, values?: unknown[]): Promise<{\r\n rows: T[];\r\n rowCount?: number \| null;\r\n }>;\r\n end(): Promise<void>;\r\n on(event: \"error\", listener: (error: Error) => void): void;\r\n};\r\n\r\ntype PgClient = {\r\n connect(): Promise<void>;\r\n query<T = Record<string, unknown>>(text: string, values?: unknown[]): Promise<{\r\n rows: T[];\r\n rowCount?: number \| null;\r\n }>;\r\n end(): Promise<void>;\r\n on(event: \"error\" \| \"end\", listener: (error?: Error) => void): void;\r\n};\r\n\r\nfunction buildPgSsl(config: PostgresDatabaseConfig): unknown {\r\n if (config.ssl === undefined) {\r\n return undefined;\r\n }\r\n\r\n if (typeof config.ssl === \"boolean\") {\r\n return config.ssl;\r\n }\r\n\r\n return {\r\n rejectUnauthorized: config.ssl.rejectUnauthorized,\r\n ca: config.ssl.ca,\r\n cert: config.ssl.cert,\r\n key: config.ssl.key,\r\n servername: config.ssl.servername,\r\n };\r\n}\r\n\r\nexport async function createPgAdapter(config: PostgresDatabaseConfig): Promise<DatabaseAdapter> {\r\n let pgModule: {\r\n Pool: new (options: Record<string, unknown>) => PgPool;\r\n Client: new (options: Record<string, unknown>) => PgClient;\r\n };\r\n\r\n try {\r\n const importedModule = await import(\"pg\");\r\n pgModule = ((importedModule as { default?: typeof importedModule }).default ??\r\n importedModule) as typeof pgModule;\r\n } catch (error) {\r\n throw new Error(\r\n \"The 'pg' package is required for dialect 'pg'. Install it with `pnpm add pg`.\",\r\n { cause: error as Error }\r\n );\r\n }\r\n\r\n const connectionOptions = {\r\n host: config.host,\r\n port: config.port,\r\n database: config.database,\r\n user: config.user,\r\n password: config.password,\r\n ssl: buildPgSsl(config),\r\n application_name: config.applicationName,\r\n statement_timeout: config.statementTimeoutMs,\r\n connectionTimeoutMillis: config.connectionTimeoutMs,\r\n idleTimeoutMillis: config.idleTimeoutMs,\r\n max: config.maxPoolSize,\r\n min: config.minPoolSize,\r\n };\r\n\r\n if (config.usePool !== false) {\r\n const pool = new pgModule.Pool(connectionOptions);\r\n pool.on(\"error\", (error) => {\r\n logger.error(\"uns-database - PostgreSQL pool idle client error\", error);\r\n });\r\n\r\n return {\r\n dialect: \"pg\",\r\n async query<T = Record<string, unknown>>(statement: CompiledSqlStatement): Promise<DatabaseQueryResult<T>> {\r\n const result = await pool.query<T>(statement.text, statement.values as unknown[]);\r\n return {\r\n rows: result.rows,\r\n rowCount: result.rowCount ?? result.rows.length,\r\n };\r\n },\r\n async execute(statement: CompiledSqlStatement) {\r\n const result = await pool.query(statement.text, statement.values as unknown[]);\r\n return {\r\n rowCount: result.rowCount ?? 0,\r\n };\r\n },\r\n close() {\r\n return pool.end();\r\n },\r\n };\r\n }\r\n\r\n let client: PgClient \| null = null;\r\n let clientPromise: Promise<PgClient> \| null = null;\r\n\r\n const detachCachedClient = (activeClient: PgClient) => {\r\n if (client !== activeClient) {\r\n return false;\r\n }\r\n\r\n client = null;\r\n return true;\r\n };\r\n\r\n const handleClientConnectionError = (activeClient: PgClient, error: unknown) => {\r\n if (!detachCachedClient(activeClient)) {\r\n return;\r\n }\r\n\r\n logger.error(\"uns-database - PostgreSQL client connection error\", error);\r\n void activeClient.end().catch((): undefined => undefined);\r\n };\r\n\r\n const handleClientConnectionEnd = (activeClient: PgClient) => {\r\n if (!detachCachedClient(activeClient)) {\r\n return;\r\n }\r\n\r\n logger.warn(\"uns-database - PostgreSQL client connection ended\");\r\n };\r\n\r\n const attachClientListeners = (activeClient: PgClient) => {\r\n activeClient.on(\"error\", (error) => {\r\n handleClientConnectionError(activeClient, error);\r\n });\r\n activeClient.on(\"end\", () => {\r\n handleClientConnectionEnd(activeClient);\r\n });\r\n };\r\n\r\n const getClient = async () => {\r\n if (client) {\r\n return client;\r\n }\r\n\r\n if (!clientPromise) {\r\n clientPromise = (async () => {\r\n const nextClient = new pgModule.Client(connectionOptions);\r\n attachClientListeners(nextClient);\r\n await nextClient.connect();\r\n client = nextClient;\r\n return nextClient;\r\n })().finally(() => {\r\n clientPromise = null;\r\n });\r\n }\r\n\r\n return clientPromise;\r\n };\r\n\r\n return {\r\n dialect: \"pg\",\r\n async query<T = Record<string, unknown>>(statement: CompiledSqlStatement): Promise<DatabaseQueryResult<T>> {\r\n const activeClient = await getClient();\r\n const result = await activeClient.query<T>(statement.text, statement.values as unknown[]);\r\n return {\r\n rows: result.rows,\r\n rowCount: result.rowCount ?? result.rows.length,\r\n };\r\n },\r\n async execute(statement: CompiledSqlStatement) {\r\n const activeClient = await getClient();\r\n const result = await activeClient.query(statement.text, statement.values as unknown[]);\r\n return {\r\n rowCount: result.rowCount ?? 0,\r\n };\r\n },\r\n async close() {\r\n const activeClient = client;\r\n const pendingClientPromise = clientPromise;\r\n client = null;\r\n clientPromise = null;\r\n\r\n if (activeClient) {\r\n await activeClient.end();\r\n return;\r\n }\r\n\r\n if (!pendingClientPromise) {\r\n return;\r\n }\r\n\r\n const pendingClient = await pendingClientPromise.catch((): null => null);\r\n if (pendingClient) {\r\n await pendingClient.end();\r\n }\r\n },\r\n };\r\n}\r\n"]}

package/dist/sql-modes.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import type { SqlParams } from "./types.js";
+export declare function mapSqlPlusParamsToOracleBinds(sqlText: string, params: SqlParams): string;
+//# sourceMappingURL=sql-modes.d.ts.map

package/dist/sql-modes.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"sql-modes.d.ts","sourceRoot":"","sources":["../src/sql-modes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,MAAM,CAQxF"}

package/dist/sql-modes.js ADDED Viewed

@@ -0,0 +1,10 @@
+export function mapSqlPlusParamsToOracleBinds(sqlText, params) {
+    return sqlText
+        .replace(/&([a-zA-Z_][a-zA-Z0-9_]*)/g, (match, paramName) => {
+        return Object.prototype.hasOwnProperty.call(params, paramName) ? `:${paramName}` : match;
+    })
+        .replace(/':([a-zA-Z_][a-zA-Z0-9_]*)'/g, (match, paramName) => {
+        return Object.prototype.hasOwnProperty.call(params, paramName) ? `:${paramName}` : match;
+    });
+}
+//# sourceMappingURL=sql-modes.js.map

package/dist/sql-modes.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"sql-modes.js","sourceRoot":"","sources":["../src/sql-modes.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,6BAA6B,CAAC,OAAe,EAAE,MAAiB;IAC9E,OAAO,OAAO;SACX,OAAO,CAAC,4BAA4B,EAAE,CAAC,KAAK,EAAE,SAAiB,EAAE,EAAE;QAClE,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3F,CAAC,CAAC;SACD,OAAO,CAAC,8BAA8B,EAAE,CAAC,KAAK,EAAE,SAAiB,EAAE,EAAE;QACpE,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3F,CAAC,CAAC,CAAC;AACP,CAAC","sourcesContent":["import type { SqlParams } from \"./types.js\";\n\nexport function mapSqlPlusParamsToOracleBinds(sqlText: string, params: SqlParams): string {\n return sqlText\n .replace(/&([a-zA-Z_][a-zA-Z0-9_]*)/g, (match, paramName: string) => {\n return Object.prototype.hasOwnProperty.call(params, paramName) ? `:${paramName}` : match;\n })\n .replace(/':([a-zA-Z_][a-zA-Z0-9_]*)'/g, (match, paramName: string) => {\n return Object.prototype.hasOwnProperty.call(params, paramName) ? `:${paramName}` : match;\n });\n}\n"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@uns-kit/database",
-  "version": "2.0.64",
+  "version": "2.0.66",
   "description": "Database helpers for UNS services with config-driven connections, SQL file loading, and portable named-parameter compilation.",
   "type": "module",
   "license": "MIT",
@@ -32,7 +32,7 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "zod": "^3",
-    "@uns-kit/core": "2.0.64"
+    "@uns-kit/core": "2.0.66"
   },
   "peerDependencies": {
     "better-sqlite3": "^11.0.0",