@digitraffic/common 2025.12.4-1 → 2025.12.15-2

package/dist/__test__/stack/dt-function.test.js

@@ -8,6 +8,8 @@ import { EnvKeys } from "../../aws/runtime/environment.js";
 import { TrafficType } from "../../types/traffictype.js";
 const TEST_ENV_VAR = "TEST_ENV_VAR";
 const TEST_ENV_VALUE = "testValue";
+// AWS::Lambda::Function Template Reference
+// https://docs.aws.amazon.com/AWSCloudFormation/latest/TemplateReference/aws-resource-lambda-function.html
 describe("FunctionBuilder test", () => {
     function createTemplate(tester, plain = false) {
         const app = new App();
@@ -91,7 +93,6 @@ describe("FunctionBuilder test", () => {
         const template = createTemplate((builder) => {
             builder.withDescription("Does something useful");
         });
-        console.debug("JSON:", template.toJSON());
         template.hasResourceProperties("AWS::Lambda::Function", {
             Description: "Does something useful",
         });

package/dist/aws/infra/stack/dt-function.d.ts

@@ -46,8 +46,9 @@ export declare class FunctionBuilder {
     withAssetCode(path?: string): this;
     withCode(code: Code): this;
     /**
-     * Use given handler(${name}.handler) to run the lambda.  Default value is lambdaname.
+     * Use given handler(${name}.handler) to run the lambda.  Default value is lambdaName.
      * @param name
+     * @param handlerFunctionName
      * @returns
      */
     withHandler(name: string, handlerFunctionName?: string): this;

package/dist/aws/infra/stack/dt-function.js

@@ -79,8 +79,9 @@ export class FunctionBuilder {
         return this;
     }
     /**
-     * Use given handler(${name}.handler) to run the lambda.  Default value is lambdaname.
+     * Use given handler(${name}.handler) to run the lambda.  Default value is lambdaName.
      * @param name
+     * @param handlerFunctionName
      * @returns
      */
     withHandler(name, handlerFunctionName = "handler") {

package/dist/database/database-singleton.d.ts

@@ -0,0 +1,13 @@
+import type { IDatabase, ITask } from "pg-promise";
+export declare enum DatabaseEnvironmentKeys {
+    DB_USER = "DB_USER",
+    DB_PASS = "DB_PASS",
+    DB_URI = "DB_URI",
+    DB_RO_URI = "DB_RO_URI",
+    DB_APPLICATION = "DB_APPLICATION"
+}
+export type DTDatabase = IDatabase<unknown>;
+export type DTTransaction = ITask<unknown>;
+export declare function inTransaction<T>(fn: (db: DTTransaction) => Promise<T>, convertNullsToUndefined?: boolean): Promise<T>;
+export declare function inDatabase<T>(fn: (db: DTDatabase) => Promise<T>, convertNullsToUndefined?: boolean): Promise<T>;
+export declare function inDatabaseReadonly<T>(fn: (db: DTDatabase) => Promise<T>, convertNullsToUndefined?: boolean): Promise<T>;

package/dist/database/database-singleton.js

@@ -0,0 +1,72 @@
+import { logger } from "../aws/runtime/dt-logger-default.js";
+import { logException } from "../utils/logging.js";
+import { getEnvVariable, getEnvVariableOrElse } from "../utils/utils.js";
+import { initDbConnection } from "./database.js";
+export var DatabaseEnvironmentKeys;
+(function (DatabaseEnvironmentKeys) {
+    DatabaseEnvironmentKeys["DB_USER"] = "DB_USER";
+    DatabaseEnvironmentKeys["DB_PASS"] = "DB_PASS";
+    DatabaseEnvironmentKeys["DB_URI"] = "DB_URI";
+    DatabaseEnvironmentKeys["DB_RO_URI"] = "DB_RO_URI";
+    DatabaseEnvironmentKeys["DB_APPLICATION"] = "DB_APPLICATION";
+})(DatabaseEnvironmentKeys || (DatabaseEnvironmentKeys = {}));
+const dbSingletons = new Map();
+function getDbSingleton(readonly, convertNullsToUndefined, options) {
+    const username = getEnvVariable(DatabaseEnvironmentKeys.DB_USER);
+    const password = getEnvVariable(DatabaseEnvironmentKeys.DB_PASS);
+    const dbUrl = readonly
+        ? getEnvVariable(DatabaseEnvironmentKeys.DB_RO_URI)
+        : getEnvVariable(DatabaseEnvironmentKeys.DB_URI);
+    const applicationName = getEnvVariableOrElse(DatabaseEnvironmentKeys.DB_APPLICATION, "unknown-cdk-application");
+    const key = JSON.stringify({
+        username,
+        password,
+        applicationName,
+        url: dbUrl,
+        convertNullsToUndefined,
+        options,
+    });
+    let db = dbSingletons.get(key);
+    if (!db) {
+        db = initDbConnection(username, password, applicationName, dbUrl, convertNullsToUndefined, options);
+        dbSingletons.set(key, db);
+    }
+    return db;
+}
+// noinspection JSUnusedGlobalSymbols
+export function inTransaction(fn, convertNullsToUndefined = false) {
+    return inDatabase((db) => db.tx((t) => fn(t)), convertNullsToUndefined);
+}
+export function inDatabase(fn, convertNullsToUndefined = false) {
+    return doInDatabase(false, fn, convertNullsToUndefined);
+}
+export function inDatabaseReadonly(fn, convertNullsToUndefined = false) {
+    return doInDatabase(true, fn, convertNullsToUndefined);
+}
+async function doInDatabase(readonly, fn, convertNullsToUndefined) {
+    const db = getDbSingleton(readonly, convertNullsToUndefined);
+    try {
+        // deallocate all prepared statements to allow for connection pooling
+        // DISCARD instead of DEALLOCATE as it didn't always clean all prepared statements
+        await db.none("DISCARD ALL");
+        return await fn(db);
+    }
+    catch (e) {
+        logException(logger, e);
+        throw e;
+    }
+    finally {
+        await db.$pool.end();
+    }
+}
+// function convertNullColumnsToUndefined(rows: Record<string, unknown>[]) {
+//   rows.forEach((row) => {
+//     for (const column in row) {
+//       const columnValue = row[column];
+//       if (columnValue === null) {
+//         row[column] = undefined;
+//       }
+//     }
+//   });
+// }
+//# sourceMappingURL=database-singleton.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitraffic/common",
-  "version": "2025.12.4-1",
+  "version": "2025.12.15-2",
   "private": false,
   "description": "",
   "repository": {
@@ -11,6 +11,7 @@
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
+    "./dist/database/database-singleton": "./dist/database/database-singleton.js",
     "./dist/database/database": "./dist/database/database.js",
     "./dist/database/cached": "./dist/database/cached.js",
     "./dist/database/models": "./dist/database/models.js",