velocious 1.0.462 → 1.0.463

package/src/configuration.js

@@ -2440,10 +2440,26 @@ export default class VelociousConfiguration {
      * @type {{[key: string]: import("./database/drivers/base.js").default}} */
     const dbs = {}
 
+    return await this.withDatabaseIdentifierConnections({
+      callback: actualWithConnectionsCallback,
+      dbs,
+      identifiers: this.getDatabaseIdentifiers(),
+      name,
+      stackLabel: "withConnections"
+    })
+  }
+
+  /**
+   * Runs callback with database connections for the requested identifiers.
+   * @template T
+   * @param {{callback: WithConnectionsCallbackType<T>, dbs: Record<string, import("./database/drivers/base.js").default>, identifiers: string[], name: string, stackLabel: string}} args - Connection scope details.
+   * @returns {Promise<T>} - Resolves with the callback result.
+   */
+  async withDatabaseIdentifierConnections({callback, dbs, identifiers, name, stackLabel}) {
     const stack = Error().stack
     const actualCallback = async () => {
-      return await withTrackedStack(stack || "withConnections", async () => {
-        return await actualWithConnectionsCallback(dbs)
+      return await withTrackedStack(stack || stackLabel, async () => {
+        return await callback(dbs)
       })
     }
 
@@ -2452,7 +2468,7 @@ export default class VelociousConfiguration {
      * @type {() => Promise<T>} */
     let runRequest = actualCallback
 
-    for (const identifier of this.getDatabaseIdentifiers()) {
+    for (const identifier of identifiers) {
       let actualRunRequest = runRequest
 
       const nextRunRequest = async () => {
@@ -2545,14 +2561,23 @@ export default class VelociousConfiguration {
     if (!actualWithConnectionsCallback) throw new Error("ensureConnections requires a callback")
 
     const dbs = this.getCurrentConnections()
-    const identifiers = this.getDatabaseIdentifiers()
-    const hasAllConnections = identifiers.every((identifier) => dbs[identifier])
+    const missingIdentifiers = this.getDatabaseIdentifiers().filter((identifier) => {
+      if (!dbs[identifier]) return true
+
+      return !this.getDatabasePool(identifier).hasCurrentConnectionContext()
+    })
 
-    if (hasAllConnections) {
+    if (missingIdentifiers.length === 0) {
       return await actualWithConnectionsCallback(dbs)
-    } else {
-      return await this.withConnections({name}, actualWithConnectionsCallback)
     }
+
+    return await this.withDatabaseIdentifierConnections({
+      callback: actualWithConnectionsCallback,
+      dbs,
+      identifiers: missingIdentifiers,
+      name,
+      stackLabel: "ensureConnections"
+    })
   }
 
   /**

package/src/database/pool/async-tracked-multi-connection.js

@@ -523,8 +523,65 @@ export default class VelociousDatabasePoolAsyncTrackedMultiConnection extends Ba
    */
   pendingCheckoutTimeoutError(checkout) {
     const checkoutName = checkout.options.name ? ` Checkout name: ${JSON.stringify(checkout.options.name)}.` : ""
+    const diagnostics = this.pendingCheckoutTimeoutDiagnostics(checkout)
 
-    return new Error(`Timed out after ${checkout.timeoutMillis}ms waiting for database connection checkout from pool "${this.identifier}".${checkoutName}`)
+    return new Error(`Timed out after ${checkout.timeoutMillis}ms waiting for database connection checkout from pool "${this.identifier}".${checkoutName} ${diagnostics}`)
+  }
+
+  /**
+   * Builds sanitized diagnostics for a checkout timeout.
+   * @param {PendingCheckout} checkout - Timed-out checkout.
+   * @returns {string} - Pool state summary.
+   */
+  pendingCheckoutTimeoutDiagnostics(checkout) {
+    const snapshot = this.getDebugSnapshot()
+    const connectionSummaries = snapshot.connections
+      .map((connection) => this.pendingCheckoutTimeoutConnectionSummary(connection))
+      .join(", ")
+    const pendingSummaries = (snapshot.pendingCheckouts || [])
+      .map((pendingCheckout) => this.pendingCheckoutTimeoutPendingSummary(pendingCheckout))
+      .join(", ")
+    const waitedForMs = Math.max(0, Date.now() - checkout.enqueuedAt)
+
+    return `Pool state: max=${this.maxConnections() ?? "unbounded"}, inUse=${snapshot.inUseCount}, idle=${snapshot.idleCount}, pending=${snapshot.pendingCheckoutCount}, spawning=${snapshot.connectionsBeingSpawned}, timedOutWaitingForMs=${waitedForMs}, holders=[${connectionSummaries}], waiting=[${pendingSummaries}].`
+  }
+
+  /**
+   * Builds a sanitized connection summary for checkout timeout diagnostics.
+   * @param {Record<string, ?>} connection - Connection debug snapshot.
+   * @returns {string} - Sanitized connection state.
+   */
+  pendingCheckoutTimeoutConnectionSummary(connection) {
+    const parts = [`state=${connection.state}`]
+
+    if (connection.checkoutName) parts.push(`checkout=${JSON.stringify(connection.checkoutName)}`)
+    if (typeof connection.checkedOutForMs === "number") parts.push(`checkedOutForMs=${connection.checkedOutForMs}`)
+    if (typeof connection.idleForMs === "number") parts.push(`idleForMs=${connection.idleForMs}`)
+    if (typeof connection.openTransactions === "number") parts.push(`openTransactions=${connection.openTransactions}`)
+
+    const activeQuery = connection.activeQuery
+
+    if (activeQuery && typeof activeQuery === "object" && !Array.isArray(activeQuery)) {
+      const runningMs = (/** @type {Record<string, ?>} */ (activeQuery)).runningMs
+
+      if (typeof runningMs === "number") parts.push(`activeQueryMs=${runningMs}`)
+    }
+
+    return `{${parts.join(" ")}}`
+  }
+
+  /**
+   * Builds a sanitized pending checkout summary for checkout timeout diagnostics.
+   * @param {import("./base.js").DatabasePoolPendingCheckoutDebugSnapshot} pendingCheckout - Waiting checkout snapshot.
+   * @returns {string} - Sanitized pending checkout state.
+   */
+  pendingCheckoutTimeoutPendingSummary(pendingCheckout) {
+    const parts = [`index=${pendingCheckout.index}`, `waitingForMs=${pendingCheckout.waitingForMs}`]
+
+    if (pendingCheckout.checkoutName) parts.push(`checkout=${JSON.stringify(pendingCheckout.checkoutName)}`)
+    if (pendingCheckout.remainingTimeoutMs !== null) parts.push(`remainingTimeoutMs=${pendingCheckout.remainingTimeoutMs}`)
+
+    return `{${parts.join(" ")}}`
   }
 
   /**
@@ -763,6 +820,14 @@ export default class VelociousDatabasePoolAsyncTrackedMultiConnection extends Ba
     return this.getCurrentConnection()
   }
 
+  /**
+   * Returns whether this pool has a real async context for the current connection.
+   * @returns {boolean} - Whether nested code can reuse the current connection context.
+   */
+  hasCurrentConnectionContext() {
+    return this.asyncLocalStorage.getStore() !== undefined
+  }
+
   /**
    * Runs get debug snapshot.
    * @returns {import("./base.js").DatabasePoolDebugSnapshot} - Diagnostic snapshot for this pool.

package/src/database/pool/base.js

@@ -144,6 +144,14 @@ class VelociousDatabasePoolBase {
     return this.getCurrentConnection()
   }
 
+  /**
+   * Returns whether the current connection is pinned to an execution context.
+   * @returns {boolean} - Whether the current connection can be reused by nested code.
+   */
+  hasCurrentConnectionContext() {
+    return true
+  }
+
   /**
    * Runs without current connection context.
    * @template T

package/src/http-server/client/index.js

@@ -4,8 +4,8 @@ import crypto from "crypto"
 import fs from "node:fs/promises"
 import {createReadStream} from "node:fs"
 import {digg} from "diggerize"
+import {ensureError} from "typanic"
 import EventEmitter from "../../utils/event-emitter.js"
-import ensureError from "../../utils/ensure-error.js"
 import Logger from "../../logger.js"
 import Request from "./request.js"
 import RequestRunner from "./request-runner.js"

package/src/http-server/client/request-runner.js

@@ -1,7 +1,7 @@
 // @ts-check
 
+import {ensureError} from "typanic"
 import BacktraceCleaner from "../../utils/backtrace-cleaner-node.js"
-import ensureError from "../../utils/ensure-error.js"
 import EventEmitter from "../../utils/event-emitter.js"
 import Logger from "../../logger.js"
 import RequestTiming from "./request-timing.js"

package/src/http-server/worker-handler/index.js

@@ -1,8 +1,8 @@
 // @ts-check
 
+import {ensureError} from "typanic"
 import Logger from "../../logger.js"
 import {Worker} from "worker_threads"
-import ensureError from "../../utils/ensure-error.js"
 import websocketEventsHost from "../websocket-events-host.js"
 
 /**
@@ -109,7 +109,8 @@ export default class VelociousHttpServerWorker {
   onWorkerError = (error) => {
     this.logger.error(`Velocious worker ${this.workerCount} error`, error)
     void this._closeAllClients()
-    throw ensureError(error) // Throws original error with backtrace and everything into the console
+    // Preserve Error instances for the original backtrace while wrapping non-Error throwables.
+    throw ensureError(error)
   }
 
   /**

package/src/routes/resolver.js

@@ -4,9 +4,9 @@ import {dirname} from "path"
 import {fileURLToPath} from "url"
 import fs from "fs/promises"
 import * as inflection from "inflection"
+import {ensureError} from "typanic"
 import Logger from "../logger.js"
 import UploadedFile from "../http-server/client/uploaded-file/uploaded-file.js"
-import ensureError from "../utils/ensure-error.js"
 import toImportSpecifier from "../utils/to-import-specifier.js"
 
 /**

package/build/src/utils/ensure-error.d.ts

@@ -1,7 +0,0 @@
-/**
- * Runs ensure error.
- * @param {?} error - Error instance.
- * @returns {Error} - The error.
- */
-export default function ensureError(error: unknown): Error;
-//# sourceMappingURL=ensure-error.d.ts.map

package/build/src/utils/ensure-error.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ensure-error.d.ts","sourceRoot":"","sources":["../../../src/utils/ensure-error.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,2CAHW,OAAC,GACC,KAAK,CAQjB"}

package/build/src/utils/ensure-error.js

@@ -1,15 +0,0 @@
-// @ts-check
-/**
- * Runs ensure error.
- * @param {?} error - Error instance.
- * @returns {Error} - The error.
- */
-export default function ensureError(error) {
-    if (error instanceof Error) {
-        return error;
-    }
-    else {
-        return new Error(`Unknown error type ${typeof error}: ${error}`);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW5zdXJlLWVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWxzL2Vuc3VyZS1lcnJvci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxZQUFZO0FBRVo7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxPQUFPLFVBQVUsV0FBVyxDQUFDLEtBQUs7SUFDdkMsSUFBSSxLQUFLLFlBQVksS0FBSyxFQUFFLENBQUM7UUFDM0IsT0FBTyxLQUFLLENBQUE7SUFDZCxDQUFDO1NBQU0sQ0FBQztRQUNOLE9BQU8sSUFBSSxLQUFLLENBQUMsc0JBQXNCLE9BQU8sS0FBSyxLQUFLLEtBQUssRUFBRSxDQUFDLENBQUE7SUFDbEUsQ0FBQztBQUNILENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBAdHMtY2hlY2tcblxuLyoqXG4gKiBSdW5zIGVuc3VyZSBlcnJvci5cbiAqIEBwYXJhbSB7P30gZXJyb3IgLSBFcnJvciBpbnN0YW5jZS5cbiAqIEByZXR1cm5zIHtFcnJvcn0gLSBUaGUgZXJyb3IuXG4gKi9cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIGVuc3VyZUVycm9yKGVycm9yKSB7XG4gIGlmIChlcnJvciBpbnN0YW5jZW9mIEVycm9yKSB7XG4gICAgcmV0dXJuIGVycm9yXG4gIH0gZWxzZSB7XG4gICAgcmV0dXJuIG5ldyBFcnJvcihgVW5rbm93biBlcnJvciB0eXBlICR7dHlwZW9mIGVycm9yfTogJHtlcnJvcn1gKVxuICB9XG59XG5cbiJdfQ==

package/build/utils/ensure-error.js

@@ -1,15 +0,0 @@
-// @ts-check
-
-/**
- * Runs ensure error.
- * @param {?} error - Error instance.
- * @returns {Error} - The error.
- */
-export default function ensureError(error) {
-  if (error instanceof Error) {
-    return error
-  } else {
-    return new Error(`Unknown error type ${typeof error}: ${error}`)
-  }
-}
-

package/src/utils/ensure-error.js

@@ -1,15 +0,0 @@
-// @ts-check
-
-/**
- * Runs ensure error.
- * @param {?} error - Error instance.
- * @returns {Error} - The error.
- */
-export default function ensureError(error) {
-  if (error instanceof Error) {
-    return error
-  } else {
-    return new Error(`Unknown error type ${typeof error}: ${error}`)
-  }
-}
-