@dbos-inc/dbos-sdk 3.0.23-preview → 3.0.37-preview.gfd7eaf193c

package/dist/src/authdecorators.d.ts

@@ -1,9 +1,2 @@
-import { DBOSContext } from './context';
 export declare function registerAuthChecker(): void;
-/** @deprecated Use `DBOS.defaultRequiredRole` */
-export declare function DefaultRequiredRole(anyOf: string[]): <T extends new (...args: any[]) => object>(ctor: T) => void;
-/**
- * @deprecated - use `DBOS.requiredRole`
- */
-export declare function RequiredRole(anyOf: string[]): <This, Ctx extends DBOSContext, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ctx: Ctx, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ctx: Ctx, ...args: Args) => Promise<Return>>;
 //# sourceMappingURL=authdecorators.d.ts.map

package/dist/src/authdecorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authdecorators.d.ts","sourceRoot":"","sources":["../../src/authdecorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkE,MAAM,WAAW,CAAC;AA2DxG,wBAAgB,mBAAmB,SAElC;AAED,iDAAiD;AACjD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,4BAEP,GAAG,EAAE,KAAG,MAAM,QAAU,CAAC,UAMpE;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,2EAEhC,MAAM,eACD,MAAM,gBACL,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,QAAQ,MAAM,CAAC,CAAC,oCAAlD,IAAI,OAAO,GAAG,WAAW,IAAI,KAAK,QAAQ,MAAM,CAAC,EAajG"}
+{"version":3,"file":"authdecorators.d.ts","sourceRoot":"","sources":["../../src/authdecorators.ts"],"names":[],"mappings":"AAsDA,wBAAgB,mBAAmB,SAElC"}

package/dist/src/authdecorators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequiredRole = exports.DefaultRequiredRole = exports.registerAuthChecker = void 0;
+exports.registerAuthChecker = void 0;
 const context_1 = require("./context");
 const dbos_1 = require("./dbos");
 const decorators_1 = require("./decorators");
@@ -16,9 +16,6 @@ function checkMethodAuth(methReg, args) {
         for (const role of requiredRoles) {
             if (set.has(role)) {
                 authorized = true;
-                if ((0, context_1.getCurrentDBOSContext)()) {
-                    (0, context_1.getCurrentDBOSContext)().assumedRole = role;
-                }
                 if ((0, context_1.getCurrentContextStore)()) {
                     (0, context_1.getCurrentContextStore)().assumedRole = role;
                 }
@@ -48,29 +45,4 @@ function registerAuthChecker() {
     (0, decorators_1.registerMiddlewareInstaller)(authChecker);
 }
 exports.registerAuthChecker = registerAuthChecker;
-/** @deprecated Use `DBOS.defaultRequiredRole` */
-function DefaultRequiredRole(anyOf) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    function clsdec(ctor) {
-        const clsreg = (0, decorators_1.associateClassWithExternal)(decorators_1.DBOS_AUTH, ctor);
-        clsreg.requiredRole = anyOf;
-        registerAuthChecker();
-    }
-    return clsdec;
-}
-exports.DefaultRequiredRole = DefaultRequiredRole;
-/**
- * @deprecated - use `DBOS.requiredRole`
- */
-function RequiredRole(anyOf) {
-    function apidec(target, propertyKey, inDescriptor) {
-        const rr = (0, decorators_1.associateMethodWithExternal)(decorators_1.DBOS_AUTH, target, undefined, propertyKey.toString(), inDescriptor.value);
-        rr.regInfo.requiredRole = anyOf;
-        inDescriptor.value = rr.registration.wrappedFunction ?? rr.registration.registeredFunction;
-        registerAuthChecker();
-        return inDescriptor;
-    }
-    return apidec;
-}
-exports.RequiredRole = RequiredRole;
 //# sourceMappingURL=authdecorators.js.map

package/dist/src/authdecorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"authdecorators.js","sourceRoot":"","sources":["../../src/authdecorators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"authdecorators.js","sourceRoot":"","sources":["../../src/authdecorators.ts"],"names":[],"mappings":";;;AAAA,uCAAmD;AACnD,iCAA8B;AAC9B,6CAOsB;AACtB,mCAAiD;AAEjD,SAAS,eAAe,CAAC,OAA+B,EAAE,IAAe;IACvE,+DAA+D;IAC/D,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IACjD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,WAAI,CAAC,IAAI,EAAE,YAAY,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,WAAI,CAAC,kBAAkB,CAAC;QACzC,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9B,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClB,UAAU,GAAG,IAAI,CAAC;gBAClB,IAAI,IAAA,gCAAsB,GAAE,EAAE,CAAC;oBAC7B,IAAA,gCAAsB,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC;gBAC/C,CAAC;gBACD,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,IAAI,8BAAsB,CAAC,qDAAqD,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;YACjH,WAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YACxE,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,WAAW;IACf,iBAAiB,CAAC,OAA+B;QAC/C,MAAM,SAAS,GAAG,OAAO,EAAE,QAAQ,EAAE,iBAAiB,CAAC,sBAAS,CAAsB,CAAC;QACvF,MAAM,UAAU,GAAG,OAAO,EAAE,iBAAiB,CAAC,sBAAS,CAAe,CAAC;QAEvE,MAAM,WAAW,GAAG,SAAS,EAAE,YAAY,KAAK,SAAS,IAAI,UAAU,EAAE,YAAY,KAAK,SAAS,CAAC;QAEpG,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,CAAC,mBAAmB,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;CACF;AAED,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAEtC,SAAgB,mBAAmB;IACjC,IAAA,wCAA2B,EAAC,WAAW,CAAC,CAAC;AAC3C,CAAC;AAFD,kDAEC"}

package/dist/src/context.d.ts

@@ -3,15 +3,11 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
 import { Span } from '@opentelemetry/sdk-trace-base';
-import { GlobalLogger as Logger, Logger as DBOSLogger } from './telemetry/logs';
+import { Logger as DBOSLogger } from './telemetry/logs';
 import { IncomingHttpHeaders } from 'http';
 import { ParsedUrlQuery } from 'querystring';
 import { UserDatabaseClient } from './user_database';
 import { AsyncLocalStorage } from 'async_hooks';
-import { WorkflowContext, WorkflowContextImpl } from './workflow';
-import { TransactionContextImpl } from './transaction';
-import { StepContextImpl } from './step';
-import { StoredProcedureContextImpl } from './procedure';
 import Koa from 'koa';
 export interface StepStatus {
     stepID: number;
@@ -22,6 +18,7 @@ export interface DBOSContextOptions {
     idAssignedForNextWorkflow?: string;
     queueAssignedForWorkflows?: string;
     span?: Span;
+    logger?: DBOSLogger;
     authenticatedUser?: string;
     authenticatedRoles?: string[];
     assumedRole?: string;
@@ -31,9 +28,12 @@ export interface DBOSContextOptions {
     workflowTimeoutMS?: number | null;
 }
 export interface DBOSLocalCtx extends DBOSContextOptions {
-    ctx?: DBOSContext;
     parentCtx?: DBOSLocalCtx;
     workflowId?: string;
+    curWFFunctionId?: number;
+    presetID?: boolean;
+    timeoutMS?: number | null;
+    deadlineEpochMS?: number;
     inRecovery?: boolean;
     curStepFunctionId?: number;
     stepStatus?: StepStatus;
@@ -48,16 +48,12 @@ export declare function isInTxnCtx(ctx: DBOSLocalCtx): boolean;
 export declare function isInWorkflowCtx(ctx: DBOSLocalCtx): boolean;
 export declare const asyncLocalCtx: AsyncLocalStorage<DBOSLocalCtx>;
 export declare function getCurrentContextStore(): DBOSLocalCtx | undefined;
-export declare function getCurrentDBOSContext(): DBOSContext | undefined;
-export declare function assertCurrentDBOSContext(): DBOSContext;
-export declare function assertCurrentWorkflowContext(): WorkflowContextImpl;
 export declare function getNextWFID(assignedID?: string): string | undefined;
+export declare function functionIDGetIncrement(): number;
 export declare function runWithTopContext<R>(ctx: DBOSLocalCtx, callback: () => Promise<R>): Promise<R>;
-export declare function runWithTransactionContext<Client extends UserDatabaseClient, R>(ctx: TransactionContextImpl<Client>, callback: () => Promise<R>): Promise<R>;
-export declare function runWithStoredProcContext<R>(ctx: StoredProcedureContextImpl, callback: () => Promise<R>): Promise<R>;
+export declare function runWithParentContext<R>(pctx: DBOSLocalCtx | undefined, ctx: DBOSLocalCtx, callback: () => Promise<R>): Promise<R>;
 export declare function runWithDataSourceContext<R>(callnum: number, callback: () => Promise<R>): Promise<R>;
-export declare function runWithStepContext<R>(ctx: StepContextImpl, currentAttempt: number | undefined, callback: () => Promise<R>): Promise<R>;
-export declare function runWithWorkflowContext<R>(ctx: WorkflowContext, callback: () => Promise<R>): Promise<R>;
+export declare function runInStepContext<R>(pctx: DBOSLocalCtx, stepID: number, maxAttempts: number | undefined, currentAttempt: number | undefined, callback: () => Promise<R>): Promise<R>;
 /**
  * HTTPRequest includes useful information from http.IncomingMessage and parsed body,
  *   URL parameters, and parsed query string.
@@ -76,34 +72,4 @@ export interface HTTPRequest {
     readonly ip?: string;
     readonly requestID?: string;
 }
-/**
- * @deprecated Use `DBOS.workflow`, `DBOS.step`, `DBOS.transaction`, and other decorators that do not pass contexts around.
- */
-export interface DBOSContext {
-    readonly request: object;
-    readonly workflowUUID: string;
-    readonly authenticatedUser: string;
-    readonly authenticatedRoles: string[];
-    readonly assumedRole: string;
-    readonly logger: DBOSLogger;
-    readonly span: Span;
-    getConfig<T>(key: string): T | undefined;
-    getConfig<T>(key: string, defaultValue: T): T;
-}
-export declare class DBOSContextImpl implements DBOSContext {
-    readonly operationName: string;
-    readonly span: Span;
-    request: object;
-    authenticatedUser: string;
-    authenticatedRoles: string[];
-    assumedRole: string;
-    workflowUUID: string;
-    executorID: string;
-    applicationID: string;
-    readonly logger: DBOSLogger;
-    constructor(operationName: string, span: Span, logger: Logger, parentCtx?: DBOSContextImpl);
-    applicationConfig?: object;
-    getConfig<T>(key: string): T | undefined;
-    getConfig<T>(key: string, defaultValue: T): T;
-}
 //# sourceMappingURL=context.d.ts.map

package/dist/src/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"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"}

package/dist/src/context.js

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DBOSContextImpl = exports.runWithWorkflowContext = exports.runWithStepContext = exports.runWithDataSourceContext = exports.runWithStoredProcContext = exports.runWithTransactionContext = exports.runWithTopContext = exports.getNextWFID = exports.assertCurrentWorkflowContext = exports.assertCurrentDBOSContext = exports.getCurrentDBOSContext = exports.getCurrentContextStore = exports.asyncLocalCtx = exports.isInWorkflowCtx = exports.isInTxnCtx = exports.isInStepCtx = exports.isWithinWorkflowCtx = void 0;
-const logs_1 = require("./telemetry/logs");
-const lodash_1 = require("lodash");
-const error_1 = require("./error");
+exports.runInStepContext = exports.runWithDataSourceContext = exports.runWithParentContext = exports.runWithTopContext = exports.functionIDGetIncrement = exports.getNextWFID = exports.getCurrentContextStore = exports.asyncLocalCtx = exports.isInWorkflowCtx = exports.isInTxnCtx = exports.isInStepCtx = exports.isWithinWorkflowCtx = void 0;
 const async_hooks_1 = require("async_hooks");
-const error_2 = require("./error");
-const utils_1 = require("./utils");
+const error_1 = require("./error");
 function isWithinWorkflowCtx(ctx) {
     if (ctx.workflowId === undefined)
         return false;
@@ -44,26 +40,6 @@ function getCurrentContextStore() {
     return exports.asyncLocalCtx.getStore();
 }
 exports.getCurrentContextStore = getCurrentContextStore;
-function getCurrentDBOSContext() {
-    return exports.asyncLocalCtx.getStore()?.ctx;
-}
-exports.getCurrentDBOSContext = getCurrentDBOSContext;
-function assertCurrentDBOSContext() {
-    const ctx = exports.asyncLocalCtx.getStore()?.ctx;
-    if (!ctx)
-        throw new error_2.DBOSInvalidWorkflowTransitionError('No current DBOS Context');
-    return ctx;
-}
-exports.assertCurrentDBOSContext = assertCurrentDBOSContext;
-function assertCurrentWorkflowContext() {
-    const ctxs = getCurrentContextStore();
-    if (!ctxs || !isInWorkflowCtx(ctxs)) {
-        throw new error_2.DBOSInvalidWorkflowTransitionError();
-    }
-    const ctx = assertCurrentDBOSContext();
-    return ctx;
-}
-exports.assertCurrentWorkflowContext = assertCurrentWorkflowContext;
 function getNextWFID(assignedID) {
     let wfId = assignedID;
     if (!wfId) {
@@ -77,117 +53,56 @@ function getNextWFID(assignedID) {
     return wfId;
 }
 exports.getNextWFID = getNextWFID;
-async function runWithTopContext(ctx, callback) {
-    return await exports.asyncLocalCtx.run(ctx, callback);
-}
-exports.runWithTopContext = runWithTopContext;
-async function runWithTransactionContext(ctx, callback) {
-    // Check we are in a workflow context and not in a step / transaction already
+function functionIDGetIncrement() {
     const pctx = getCurrentContextStore();
     if (!pctx)
-        throw new error_2.DBOSInvalidWorkflowTransitionError();
+        throw new error_1.DBOSInvalidWorkflowTransitionError(`Attempt to get a call ID number outside of a workflow`);
     if (!isInWorkflowCtx(pctx))
-        throw new error_2.DBOSInvalidWorkflowTransitionError();
-    return await exports.asyncLocalCtx.run({
-        ctx,
-        workflowId: ctx.workflowUUID,
-        curTxFunctionId: ctx.functionID,
-        parentCtx: pctx,
-    }, callback);
+        throw new error_1.DBOSInvalidWorkflowTransitionError(`Attempt to get a call ID number in a workflow that is already in a call`);
+    if (pctx.curWFFunctionId === undefined)
+        pctx.curWFFunctionId = 0;
+    return pctx.curWFFunctionId++;
 }
-exports.runWithTransactionContext = runWithTransactionContext;
-async function runWithStoredProcContext(ctx, callback) {
-    // Check we are in a workflow context and not in a step / transaction already
-    const pctx = getCurrentContextStore();
-    if (!pctx)
-        throw new error_2.DBOSInvalidWorkflowTransitionError();
-    if (!isInWorkflowCtx(pctx))
-        throw new error_2.DBOSInvalidWorkflowTransitionError();
+exports.functionIDGetIncrement = functionIDGetIncrement;
+async function runWithTopContext(ctx, callback) {
+    return await exports.asyncLocalCtx.run(ctx, callback);
+}
+exports.runWithTopContext = runWithTopContext;
+async function runWithParentContext(pctx, ctx, callback) {
     return await exports.asyncLocalCtx.run({
-        ctx,
-        workflowId: ctx.workflowUUID,
-        curTxFunctionId: ctx.functionID,
+        ...pctx,
+        workflowTimeoutMS: undefined, // Becomes deadline
         parentCtx: pctx,
-        isInStoredProc: true,
+        ...ctx,
     }, callback);
 }
-exports.runWithStoredProcContext = runWithStoredProcContext;
+exports.runWithParentContext = runWithParentContext;
 async function runWithDataSourceContext(callnum, callback) {
     // Check we are in a workflow context and not in a step / transaction already
-    const pctx = getCurrentContextStore();
+    const pctx = getCurrentContextStore() ?? {};
     return await exports.asyncLocalCtx.run({
-        workflowId: pctx?.workflowId,
+        ...pctx,
         curTxFunctionId: callnum,
         parentCtx: pctx,
     }, callback);
 }
 exports.runWithDataSourceContext = runWithDataSourceContext;
-async function runWithStepContext(ctx, currentAttempt, callback) {
+async function runInStepContext(pctx, stepID, maxAttempts, currentAttempt, callback) {
     // Check we are in a workflow context and not in a step / transaction already
-    const pctx = getCurrentContextStore();
     if (!pctx)
-        throw new error_2.DBOSInvalidWorkflowTransitionError();
+        throw new error_1.DBOSInvalidWorkflowTransitionError();
     if (!isInWorkflowCtx(pctx))
-        throw new error_2.DBOSInvalidWorkflowTransitionError();
+        throw new error_1.DBOSInvalidWorkflowTransitionError();
     const stepStatus = {
-        stepID: ctx.functionID,
+        stepID: stepID,
         currentAttempt: currentAttempt,
-        maxAttempts: currentAttempt ? ctx.maxAttempts : undefined,
+        maxAttempts: currentAttempt ? maxAttempts : undefined,
     };
-    return await exports.asyncLocalCtx.run({
-        ctx,
+    return await runWithParentContext(pctx, {
         stepStatus: stepStatus,
-        workflowId: ctx.workflowUUID,
-        curStepFunctionId: ctx.functionID,
+        curStepFunctionId: stepID,
         parentCtx: pctx,
     }, callback);
 }
-exports.runWithStepContext = runWithStepContext;
-async function runWithWorkflowContext(ctx, callback) {
-    // TODO: Check context, this could be a child workflow?
-    return await exports.asyncLocalCtx.run({
-        ctx,
-        workflowId: ctx.workflowUUID,
-    }, callback);
-}
-exports.runWithWorkflowContext = runWithWorkflowContext;
-class DBOSContextImpl {
-    operationName;
-    span;
-    request = {}; // Raw incoming HTTP request.
-    authenticatedUser = ''; // The user that has been authenticated
-    authenticatedRoles = []; // All roles the user has according to authentication
-    assumedRole = ''; // Role in use - that user has and provided authorization to current function
-    workflowUUID = ''; // Workflow UUID. Empty for HandlerContexts.
-    executorID = utils_1.globalParams.executorID; // Executor ID. Gathered from the environment and "local" otherwise
-    applicationID = utils_1.globalParams.appID; // Application ID. Gathered from the environment and empty otherwise
-    logger; // Wrapper around the global logger for this context.
-    constructor(operationName, span, logger, parentCtx) {
-        this.operationName = operationName;
-        this.span = span;
-        if (parentCtx) {
-            this.request = parentCtx.request;
-            this.authenticatedUser = parentCtx.authenticatedUser;
-            this.authenticatedRoles = parentCtx.authenticatedRoles;
-            this.assumedRole = parentCtx.assumedRole;
-            this.workflowUUID = parentCtx.workflowUUID;
-        }
-        else {
-            this.authenticatedUser = getCurrentContextStore()?.authenticatedUser ?? '';
-            this.authenticatedRoles = getCurrentContextStore()?.authenticatedRoles ?? [];
-            this.assumedRole = getCurrentContextStore()?.assumedRole ?? '';
-        }
-        this.logger = new logs_1.Logger(logger, this);
-    }
-    applicationConfig;
-    getConfig(key, defaultValue) {
-        const value = (0, lodash_1.get)(this.applicationConfig, key, defaultValue);
-        // If the key is found and the default value is provided, check whether the value is of the same type.
-        if (value && defaultValue && typeof value !== typeof defaultValue) {
-            throw new error_1.DBOSConfigKeyTypeError(key, typeof defaultValue, typeof value);
-        }
-        return value;
-    }
-}
-exports.DBOSContextImpl = DBOSContextImpl;
+exports.runInStepContext = runInStepContext;
 //# sourceMappingURL=context.js.map

package/dist/src/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"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"}

package/dist/src/datasource.d.ts

@@ -1,3 +1,4 @@
+import type { Notification } from 'pg';
 /**
  * This interface is to be used for implementers of transactional data sources
  *   This is what gets registered for the transaction control framework
@@ -42,11 +43,14 @@ export interface DBOSDataSource<Config extends {
      * Providing a static version of this functionality is optional.
      *
      * @param func - Function to wrap
-     * @param name - Name of function
-     * @param config - Transaction settings
+     * @param config - Transaction settings, including function `name`
+     * @param target - Class name, or class ctor/prototype
      * @returns Wrapped function, to be called instead of `func`
      */
-    registerTransaction<This, Args extends unknown[], Return>(func: (this: This, ...args: Args) => Promise<Return>, config?: Config): (this: This, ...args: Args) => Promise<Return>;
+    registerTransaction<This, Args extends unknown[], Return>(func: (this: This, ...args: Args) => Promise<Return>, config?: Config, target?: {
+        ctorOrProto?: object;
+        className?: string;
+    }): (this: This, ...args: Args) => Promise<Return>;
     /**
      * Produce a Stage 2 method decorator
      * @param config - Configuration to apply to the decorated method
@@ -69,6 +73,8 @@ export declare function runTransaction<T>(callback: () => Promise<T>, funcName:
     config?: unknown;
 }): Promise<T>;
 export declare function registerTransaction<This, Args extends unknown[], Return>(dsName: string, func: (this: This, ...args: Args) => Promise<Return>, options: {
+    ctorOrProto?: object;
+    className?: string;
     name: string;
 }, config?: unknown): (this: This, ...args: Args) => Promise<Return>;
 /**
@@ -102,5 +108,10 @@ export declare function getPGErrorCode(error: unknown): string | undefined;
 export declare function isPGRetriableTransactionError(error: unknown): boolean;
 export declare function isPGKeyConflictError(error: unknown): boolean;
 export declare function isPGFailedSqlTransactionError(error: unknown): boolean;
+export type PGDBNotification = Notification;
+export type PGDBNotificationCallback = (n: PGDBNotification) => void;
+export interface PGDBNotificationListener {
+    close(): Promise<void>;
+}
 export {};
 //# sourceMappingURL=datasource.d.ts.map

package/dist/src/datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":"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"}

package/dist/src/datasource.js

@@ -33,16 +33,15 @@ async function runTransaction(callback, funcName, options = {}) {
     if (!dbos_1.DBOS.isInWorkflow()) {
         throw new error_1.DBOSInvalidWorkflowTransitionError(`Invalid call to \`${funcName}\` inside a \`step\`, \`transaction\`, or \`procedure\``);
     }
-    const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-    const callnum = wfctx.functionIDGetIncrement();
+    const callnum = (0, context_1.functionIDGetIncrement)();
     const span = dbos_executor_1.DBOSExecutor.globalInstance.tracer.startSpan(funcName, {
-        operationUUID: wfctx.workflowUUID,
+        operationUUID: dbos_1.DBOS.workflowID,
         operationType: dbos_executor_1.OperationType.TRANSACTION,
-        authenticatedUser: wfctx.authenticatedUser,
-        assumedRole: wfctx.assumedRole,
-        authenticatedRoles: wfctx.authenticatedRoles,
+        authenticatedUser: dbos_1.DBOS.authenticatedUser,
+        assumedRole: dbos_1.DBOS.assumedRole,
+        authenticatedRoles: dbos_1.DBOS.authenticatedRoles,
         // isolationLevel: txnInfo.config.isolationLevel, // TODO: Pluggable
-    }, wfctx.span);
+    }, dbos_1.DBOS.span);
     try {
         const res = await dbos_executor_1.DBOSExecutor.globalInstance.runInternalStep(async () => {
             return await (0, context_1.runWithDataSourceContext)(callnum, async () => {
@@ -66,27 +65,29 @@ exports.runTransaction = runTransaction;
 // Transaction wrapper
 function registerTransaction(dsName, func, options, config) {
     const dsn = dsName ?? '<default>';
+    const reg = (0, decorators_1.registerAndWrapDBOSFunctionByName)(options?.ctorOrProto, options.className, options.name || func.name, func);
     const invokeWrapper = async function (...rawArgs) {
         const ds = (0, decorators_1.getTransactionalDataSource)(dsn);
+        const callFunc = reg.registration.registeredFunction ?? reg.registration.origFunction;
         if (!dbos_1.DBOS.isWithinWorkflow()) {
             if ((0, context_1.getNextWFID)(undefined)) {
                 throw new error_1.DBOSInvalidWorkflowTransitionError(`Call to transaction '${options.name}' made without starting workflow`);
             }
             return await (0, context_1.runWithDataSourceContext)(0, async () => {
-                return await ds.invokeTransactionFunction(config, this, func, ...rawArgs);
+                return await ds.invokeTransactionFunction(config, this, callFunc, ...rawArgs);
             });
         }
         if (dbos_1.DBOS.isInTransaction() || dbos_1.DBOS.isInStep()) {
             throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to a `trasaction` function from within a `step` or `transaction`');
         }
-        const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-        const callnum = wfctx.functionIDGetIncrement();
+        const callnum = (0, context_1.functionIDGetIncrement)();
         return dbos_executor_1.DBOSExecutor.globalInstance.runInternalStep(async () => {
             return await (0, context_1.runWithDataSourceContext)(callnum, async () => {
-                return await ds.invokeTransactionFunction(config, this, func, ...rawArgs);
+                return await ds.invokeTransactionFunction(config, this, callFunc, ...rawArgs);
             });
         }, options.name, dbos_1.DBOS.workflowID, callnum);
     };
+    (0, decorators_1.registerFunctionWrapper)(invokeWrapper, reg.registration);
     Object.defineProperty(invokeWrapper, 'name', {
         value: options.name,
     });

package/dist/src/datasource.js.map

@@ -1 +1 @@
-{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":";;;AAAA,4CAAoD;AAEpD,uCAAgG;AAChG,iCAA8B;AAC9B,mDAA8D;AAC9D,6CAA2F;AAC3F,mCAA6D;AAyF7D,qBAAqB;AAErB;;;;;;;;;;GAUG;AACI,KAAK,UAAU,cAAc,CAClC,QAA0B,EAC1B,QAAgB,EAChB,UAAiD,EAAE;IAEnD,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,WAAW,CAAC;IAC1C,MAAM,EAAE,GAAG,IAAA,uCAA0B,EAAC,GAAG,CAAC,CAAC;IAE3C,IAAI,CAAC,WAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QAC7B,IAAI,IAAA,qBAAW,EAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,0CAAkC,CAC1C,gCAAgC,QAAQ,8DAA8D,CACvG,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,IAAA,kCAAwB,EAAC,CAAC,EAAE,KAAK,IAAI,EAAE;YAClD,OAAO,MAAM,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QACvF,CAAC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,CAAC,WAAI,CAAC,YAAY,EAAE,EAAE,CAAC;QACzB,MAAM,IAAI,0CAAkC,CAC1C,qBAAqB,QAAQ,yDAAyD,CACvF,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,sCAA4B,GAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,KAAK,CAAC,sBAAsB,EAAE,CAAC;IAE/C,MAAM,IAAI,GAAS,4BAAY,CAAC,cAAe,CAAC,MAAM,CAAC,SAAS,CAC9D,QAAQ,EACR;QACE,aAAa,EAAE,KAAK,CAAC,YAAY;QACjC,aAAa,EAAE,6BAAa,CAAC,WAAW;QACxC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAC1C,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;QAC5C,oEAAoE;KACrE,EACD,KAAK,CAAC,IAAI,CACX,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,4BAAY,CAAC,cAAe,CAAC,eAAe,CAC5D,KAAK,IAAI,EAAE;YACT,OAAO,MAAM,IAAA,kCAAwB,EAAC,OAAO,EAAE,KAAK,IAAI,EAAE;gBACxD,OAAO,MAAM,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;YACvF,CAAC,CAAC,CAAC;QACL,CAAC,EACD,QAAQ;QACR,4FAA4F;QAC5F,WAAI,CAAC,UAAW,EAChB,OAAO,CACR,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,EAAE,EAAE,CAAC,CAAC;QAC5C,4BAAY,CAAC,cAAe,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,OAAO,GAAG,CAAC;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,GAAG,GAAY,CAAC;QACvB,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACnE,4BAAY,CAAC,cAAe,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AA9DD,wCA8DC;AAED,sBAAsB;AACtB,SAAgB,mBAAmB,CACjC,MAAc,EACd,IAAoD,EACpD,OAEC,EACD,MAAgB;IAEhB,MAAM,GAAG,GAAG,MAAM,IAAI,WAAW,CAAC;IAElC,MAAM,aAAa,GAAG,KAAK,WAAuB,GAAG,OAAa;QAChE,MAAM,EAAE,GAAG,IAAA,uCAA0B,EAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;YAC7B,IAAI,IAAA,qBAAW,EAAC,SAAS,CAAC,EAAE,CAAC;gBAC3B,MAAM,IAAI,0CAAkC,CAC1C,wBAAwB,OAAO,CAAC,IAAI,kCAAkC,CACvE,CAAC;YACJ,CAAC;YAED,OAAO,MAAM,IAAA,kCAAwB,EAAC,CAAC,EAAE,KAAK,IAAI,EAAE;gBAClD,OAAO,MAAM,EAAE,CAAC,yBAAyB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,CAAC;YAC5E,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,WAAI,CAAC,eAAe,EAAE,IAAI,WAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC9C,MAAM,IAAI,0CAAkC,CAC1C,+EAA+E,CAChF,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,GAAG,IAAA,sCAA4B,GAAE,CAAC;QAC7C,MAAM,OAAO,GAAG,KAAK,CAAC,sBAAsB,EAAE,CAAC;QAC/C,OAAO,4BAAY,CAAC,cAAe,CAAC,eAAe,CACjD,KAAK,IAAI,EAAE;YACT,OAAO,MAAM,IAAA,kCAAwB,EAAC,OAAO,EAAE,KAAK,IAAI,EAAE;gBACxD,OAAO,MAAM,EAAE,CAAC,yBAAyB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,CAAC;YAC5E,CAAC,CAAC,CAAC;QACL,CAAC,EACD,OAAO,CAAC,IAAI,EACZ,WAAI,CAAC,UAAW,EAChB,OAAO,CACR,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE;QAC3C,KAAK,EAAE,OAAO,CAAC,IAAI;KACpB,CAAC,CAAC;IACH,OAAO,aAAa,CAAC;AACvB,CAAC;AAhDD,kDAgDC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,EAAgC;IACjE,IAAA,4CAA+B,EAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAC/C,CAAC;AAFD,gDAEC;AAED,4BAA4B;AAE5B,6DAA6D;AAChD,QAAA,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,eAAe,EAAE,kBAAkB;IACnC,aAAa,EAAE,gBAAgB;IAC/B,cAAc,EAAE,iBAAiB;IACjC,YAAY,EAAE,cAAc;CACpB,CAAC,CAAC;AAeC,QAAA,mCAAmC,GAAG,mCAAmC,CAAC;AAE1E,QAAA,kCAAkC,GAAG;;;;;;;;;CASjD,CAAC;AAEF,SAAgB,cAAc,CAAC,KAAc;IAC3C,OAAO,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,CAAC,CAAC,CAAE,KAAK,CAAC,IAAe,CAAC,CAAC,CAAC,SAAS,CAAC;AACpG,CAAC;AAFD,wCAEC;AAED,SAAgB,6BAA6B,CAAC,KAAc;IAC1D,OAAO,cAAc,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC;AAC3C,CAAC;AAFD,sEAEC;AAED,SAAgB,oBAAoB,CAAC,KAAc;IACjD,OAAO,cAAc,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC;AAC3C,CAAC;AAFD,oDAEC;AAED,SAAgB,6BAA6B,CAAC,KAAc;IAC1D,OAAO,cAAc,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC;AAC3C,CAAC;AAFD,sEAEC"}
+{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":"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"}