@kubun/db-postgres 0.11.0 → 0.12.0

package/lib/index.d.ts

@@ -4,6 +4,8 @@ import { type Options, type PostgresType } from 'postgres';
 export type AdapterParams = {
     url: string;
     options?: Options<Record<string, PostgresType>>;
+    /** @see CLOSE_TIMEOUT_SECONDS */
+    closeTimeoutSeconds?: number;
 };
 export declare class PostgresAdapter extends AbstractPostgresAdapter {
     #private;

package/lib/index.js

@@ -1,6 +1,42 @@
 import { AbstractPostgresAdapter } from '@kubun/db-adapter';
 import { PostgresJSDialect } from 'kysely-postgres-js';
 import postgres from 'postgres';
+/**
+ * How long `close()` gives in-flight queries before terminating the connections
+ * out from under them.
+ *
+ * A timeout is not a nicety here. kysely-postgres-js acquires EVERY query
+ * through `postgres.reserve()`, and postgres.js `end()` waits on a reserved
+ * connection for a resolver only `terminate()` ever calls — releasing the
+ * reservation afterwards returns the connection to the pool without ending it.
+ * So a single query overlapping the close wedges the close PERMANENTLY, and any
+ * unawaited background query hangs a process that is shutting down cleanly.
+ * Shutdown has to be able to finish; a component with work worth finishing
+ * drains it before closing the database, and does not rely on this.
+ */ const CLOSE_TIMEOUT_SECONDS = 5;
+class ClosingPostgresJSDialect {
+    #dialect;
+    #end;
+    constructor(params){
+        this.#dialect = params.dialect;
+        this.#end = params.end;
+    }
+    createAdapter() {
+        return this.#dialect.createAdapter();
+    }
+    createDriver() {
+        const driver = this.#dialect.createDriver();
+        // Shadows the prototype's `destroy`, which calls `end()` with no deadline.
+        driver.destroy = this.#end;
+        return driver;
+    }
+    createIntrospector(db) {
+        return this.#dialect.createIntrospector(db);
+    }
+    createQueryCompiler() {
+        return this.#dialect.createQueryCompiler();
+    }
+}
 export class PostgresAdapter extends AbstractPostgresAdapter {
     #dialect;
     constructor(params){
@@ -29,8 +65,17 @@ export class PostgresAdapter extends AbstractPostgresAdapter {
                 ...params.options?.types
             }
         };
-        this.#dialect = new PostgresJSDialect({
-            postgres: postgres(params.url, options)
+        const client = postgres(params.url, options);
+        const timeout = params.closeTimeoutSeconds ?? CLOSE_TIMEOUT_SECONDS;
+        this.#dialect = new ClosingPostgresJSDialect({
+            dialect: new PostgresJSDialect({
+                postgres: client
+            }),
+            end: async ()=>{
+                await client.end({
+                    timeout
+                });
+            }
         });
     }
     get dialect() {

package/package.json

@@ -1,33 +1,33 @@
 {
   "name": "@kubun/db-postgres",
-  "version": "0.11.0",
-  "license": "see LICENSE.md",
+  "version": "0.12.0",
   "keywords": [],
+  "license": "see LICENSE.md",
+  "sideEffects": false,
   "type": "module",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
   "exports": {
     ".": "./lib/index.js"
   },
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "files": [
     "lib/*",
     "LICENSE.md"
   ],
-  "sideEffects": false,
   "dependencies": {
-    "kysely": "^0.29.2",
+    "kysely": "^0.29.4",
     "kysely-postgres-js": "^3.0.0",
     "postgres": "^3.4.8",
-    "@kubun/db-adapter": "^0.11.0"
+    "@kubun/db-adapter": "^0.12.0"
   },
   "scripts": {
+    "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:types",
     "build:clean": "del lib",
     "build:js": "swc src -d ./lib --config-file ../../node_modules/@kigu/dev/swc.json --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --skipLibCheck",
     "build:types:ci": "tsc --emitDeclarationOnly --declarationMap false",
-    "build": "pnpm run build:clean && pnpm run build:js && pnpm run build:types",
+    "test": "pnpm run test:types && pnpm run test:unit",
     "test:types": "tsc --noEmit",
-    "test:unit": "vitest run",
-    "test": "pnpm run test:types && pnpm run test:unit"
+    "test:unit": "vitest run"
   }
 }