@dbos-inc/dbos-sdk 1.29.84-preview.gd5bdeb6a8d → 1.30.6-preview
Sign up to get free protection for your applications and to get access to all the features.
- package/dbos-config.schema.json +14 -0
- package/dist/src/context.d.ts +2 -2
- package/dist/src/context.d.ts.map +1 -1
- package/dist/src/context.js +1 -1
- package/dist/src/context.js.map +1 -1
- package/dist/src/dbos-executor.d.ts.map +1 -1
- package/dist/src/dbos-executor.js +1 -22
- package/dist/src/dbos-executor.js.map +1 -1
- package/dist/src/dbos-runtime/cli.d.ts +2 -2
- package/dist/src/dbos-runtime/cli.d.ts.map +1 -1
- package/dist/src/dbos-runtime/cli.js +30 -5
- package/dist/src/dbos-runtime/cli.js.map +1 -1
- package/dist/src/dbos-runtime/commands.d.ts +3 -0
- package/dist/src/dbos-runtime/commands.d.ts.map +1 -0
- package/dist/src/dbos-runtime/commands.js +47 -0
- package/dist/src/dbos-runtime/commands.js.map +1 -0
- package/dist/src/dbos-runtime/config.d.ts.map +1 -1
- package/dist/src/dbos-runtime/config.js +4 -2
- package/dist/src/dbos-runtime/config.js.map +1 -1
- package/dist/src/dbos-runtime/runtime.d.ts +2 -0
- package/dist/src/dbos-runtime/runtime.d.ts.map +1 -1
- package/dist/src/dbos-runtime/runtime.js +1 -1
- package/dist/src/dbos-runtime/runtime.js.map +1 -1
- package/dist/src/dbos.d.ts +21 -5
- package/dist/src/dbos.d.ts.map +1 -1
- package/dist/src/dbos.js +120 -15
- package/dist/src/dbos.js.map +1 -1
- package/dist/src/httpServer/middleware.js +2 -2
- package/dist/src/httpServer/middleware.js.map +1 -1
- package/dist/src/httpServer/server.d.ts +6 -3
- package/dist/src/httpServer/server.d.ts.map +1 -1
- package/dist/src/httpServer/server.js +24 -9
- package/dist/src/httpServer/server.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
@@ -89,7 +89,7 @@ function constructPoolConfig(configFile) {
|
|
89
89
|
let databaseName = configFile.database.app_db_name;
|
90
90
|
if (databaseName === undefined) {
|
91
91
|
const appName = retrieveApplicationName(configFile);
|
92
|
-
databaseName = appName.toLowerCase().replaceAll(
|
92
|
+
databaseName = appName.toLowerCase().replaceAll("-", "_");
|
93
93
|
if (databaseName.match(/^\d/)) {
|
94
94
|
databaseName = "_" + databaseName; // Append an underscore if the name starts with a digit
|
95
95
|
}
|
@@ -101,7 +101,7 @@ function constructPoolConfig(configFile) {
|
|
101
101
|
user: configFile.database.username,
|
102
102
|
password: configFile.database.password,
|
103
103
|
connectionTimeoutMillis: configFile.database.connectionTimeoutMillis || 3000,
|
104
|
-
database: databaseName
|
104
|
+
database: databaseName,
|
105
105
|
};
|
106
106
|
if (!poolConfig.database) {
|
107
107
|
throw new error_1.DBOSInitializationError(`DBOS configuration (${exports.dbosConfigFilePath}) does not contain application database name`);
|
@@ -230,6 +230,8 @@ function parseConfigFile(cliOptions, useProxy = false) {
|
|
230
230
|
entrypoints: [...entrypoints],
|
231
231
|
port: appPort,
|
232
232
|
admin_port: Number(configFile.runtimeConfig?.admin_port) || appPort + 1,
|
233
|
+
start: configFile.runtimeConfig?.start || [],
|
234
|
+
setup: configFile.runtimeConfig?.setup || [],
|
233
235
|
};
|
234
236
|
return [dbosConfig, runtimeConfig];
|
235
237
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dbos-runtime/config.ts"],"names":[],"mappings":";;;;;;AAAA,oCAAmD;AACnD,oCAAmE;AAGnE,gDAAwB;AACxB,uCAAiE;AACjE,oDAAoD;AAEpD,2BAAmC;AACnC,8CAA4C;AAC5C,gDAAwB;AACxB,0DAAkC;AAClC,4CAAoB;AAIP,QAAA,kBAAkB,GAAG,kBAAkB,CAAC;AACrD,MAAM,oBAAoB,GAAG,cAAI,CAAC,IAAI,CAAC,IAAA,uBAAe,EAAC,SAAS,CAAC,EAAE,yBAAyB,CAAC,CAAC;AAC9F,MAAM,gBAAgB,GAAG,gBAAQ,CAAC,KAAK,CAAC,IAAA,oBAAY,EAAC,oBAAoB,CAAC,CAAW,CAAC;AACtF,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;AA+BtD;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,gDAAgD;IAC9E,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAU,EAAE,EAAE;QAC9C,OAAO,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,0DAA0D;IAC5F,CAAC,CAAC,CAAC;AACL,CAAC;AALD,8CAKC;AAED;;;;GAIG;AACH,SAAgB,cAAc,CAAC,cAAsB;IACnD,IAAI,CAAC;QACH,MAAM,iBAAiB,GAAG,IAAA,oBAAY,EAAC,cAAc,CAAC,CAAC;QACvD,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,cAAI,CAAC,KAAK,CAAC,kBAAkB,CAAe,CAAC;QAChE,OAAO,UAAU,CAAC;IACpB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;YACvB,MAAM,IAAI,+BAAuB,CAAC,8BAA8B,cAAc,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAClG,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;AACH,CAAC;AAbD,wCAaC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAC,UAAyB,EAAE,cAAsB;IAC/E,IAAI,CAAC;QACH,MAAM,iBAAiB,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC;QAChD,IAAA,kBAAa,EAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;IACnD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;YACvB,MAAM,IAAI,+BAAuB,CAAC,6BAA6B,cAAc,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACjG,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;AACH,CAAC;AAXD,0CAWC;AAED,SAAgB,uBAAuB,CAAC,UAAsB;IAC5D,IAAI,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC;IAC9B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,OAAO,
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dbos-runtime/config.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAiB5D,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAiB5D,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AACD,eAAO,MAAM,iBAAiB,uBAAuB,CAAC;AAEtD,qBAAa,WAAW;IAOc,OAAO,CAAC,QAAQ,CAAC,aAAa;IANlE,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,OAAO,CAA0D;IACzE,OAAO,CAAC,SAAS,CAAC,CAA4B;IAC9C,OAAO,CAAC,aAAa,CAAC,CAA4B;gBAEtC,UAAU,EAAE,UAAU,EAAmB,aAAa,EAAE,iBAAiB;IAMrF;;OAEG;IACG,YAAY;IAsClB;;OAEG;WACU,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAyBlE,SAAS,IAAI,IAAI;IAOjB;;OAEG;IACG,OAAO;CAkBd"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/dbos-runtime/runtime.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4D;AAC5D,iDAAsD;AACtD,uCAAyB;AACzB,mCAAkC;AAClC,oCAAuD;AACvD,0DAA6B;AAE7B,6BAAoC;AACpC,sDAAuD;AACvD,wCAA2C;AAC3C,kCAA+B;
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/dbos-runtime/runtime.ts"],"names":[],"mappings":"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"}
|
package/dist/src/dbos.d.ts
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
/// <reference types="node" />
|
2
|
+
/// <reference types="node" />
|
2
3
|
/// <reference types="node/http" />
|
3
4
|
import { Span } from "@opentelemetry/sdk-trace-base";
|
4
5
|
import { HTTPRequest } from "./context";
|
@@ -44,12 +45,18 @@ type InvokeFuncs<T> = T extends ConfiguredInstance ? never : {
|
|
44
45
|
type InvokeFuncsInst<T> = T extends ConfiguredInstance ? {
|
45
46
|
[P in keyof T as T[P] extends TxFunc | StepFunc ? P : never]: T[P] extends TxFunc | StepFunc ? (...args: TailParameters<T[P]>) => ReturnType<T[P]> : never;
|
46
47
|
} : never;
|
48
|
+
export interface StartWorkflowParams {
|
49
|
+
workflowID?: string;
|
50
|
+
queueName?: string;
|
51
|
+
}
|
47
52
|
export declare class DBOS {
|
48
53
|
static adminServer: Server | undefined;
|
54
|
+
static appServer: Server | undefined;
|
49
55
|
static setConfig(config: DBOSConfig, runtimeConfig?: DBOSRuntimeConfig): void;
|
50
56
|
static launch(httpApps?: DBOSHttpApps): Promise<void>;
|
51
57
|
static shutdown(): Promise<void>;
|
52
58
|
static get executor(): DBOSExecutorContext;
|
59
|
+
static getHTTPHandlersCallback(): ((req: import("http").IncomingMessage | import("http2").Http2ServerRequest, res: import("http2").Http2ServerResponse | import("http").ServerResponse<import("http").IncomingMessage>) => Promise<void>) | undefined;
|
53
60
|
static globalLogger?: DLogger;
|
54
61
|
static dbosConfig?: DBOSConfig;
|
55
62
|
static runtimeConfig?: DBOSRuntimeConfig;
|
@@ -57,6 +64,7 @@ export declare class DBOS {
|
|
57
64
|
static get logger(): DLogger;
|
58
65
|
static get span(): Span | undefined;
|
59
66
|
static get request(): HTTPRequest | undefined;
|
67
|
+
static get koaContext(): Koa.Context | undefined;
|
60
68
|
static get workflowID(): string | undefined;
|
61
69
|
static get authenticatedUser(): string;
|
62
70
|
static get authenticatedRoles(): string[];
|
@@ -78,14 +86,16 @@ export declare class DBOS {
|
|
78
86
|
static getWorkflows(input: GetWorkflowsInput): Promise<GetWorkflowsOutput>;
|
79
87
|
static getWorkflowQueue(input: GetWorkflowQueueInput): Promise<GetWorkflowQueueOutput>;
|
80
88
|
static sleepms(durationMS: number): Promise<void>;
|
81
|
-
static
|
89
|
+
static sleepSeconds(durationSec: number): Promise<void>;
|
90
|
+
static sleep(durationMS: number): Promise<void>;
|
82
91
|
static withNextWorkflowID<R>(wfid: string, callback: () => Promise<R>): Promise<R>;
|
83
|
-
static withTracedContext<R>(span: Span, request: HTTPRequest, callback: () => Promise<R>): Promise<R>;
|
92
|
+
static withTracedContext<R>(callerName: string, span: Span, request: HTTPRequest, callback: () => Promise<R>): Promise<R>;
|
84
93
|
static withAuthedContext<R>(authedUser: string, authedRoles: string[], callback: () => Promise<R>): Promise<R>;
|
94
|
+
static withNamedContext<R>(callerName: string, callback: () => Promise<R>): Promise<R>;
|
85
95
|
static withWorkflowQueue<R>(wfq: string, callback: () => Promise<R>): Promise<R>;
|
86
|
-
static startWorkflow<T extends ConfiguredInstance>(targetClass: T): InvokeFunctionsAsyncInst<T>;
|
87
|
-
static startWorkflow<T extends object>(targetClass: T): InvokeFunctionsAsync<T>;
|
88
|
-
static proxyInvokeWF<T extends object>(object: T, configuredInstance: ConfiguredInstance | null): InvokeFunctionsAsync<T>;
|
96
|
+
static startWorkflow<T extends ConfiguredInstance>(targetClass: T, params?: StartWorkflowParams): InvokeFunctionsAsyncInst<T>;
|
97
|
+
static startWorkflow<T extends object>(targetClass: T, params?: StartWorkflowParams): InvokeFunctionsAsync<T>;
|
98
|
+
static proxyInvokeWF<T extends object>(object: T, configuredInstance: ConfiguredInstance | null, inParams?: StartWorkflowParams): InvokeFunctionsAsync<T>;
|
89
99
|
static invoke<T extends ConfiguredInstance>(targetCfg: T): InvokeFuncsInst<T>;
|
90
100
|
static invoke<T extends object>(targetClass: T): InvokeFuncs<T>;
|
91
101
|
static send<T>(destinationID: string, message: T, topic?: string): Promise<void>;
|
@@ -96,8 +106,14 @@ export declare class DBOS {
|
|
96
106
|
static workflow(config?: WorkflowConfig): <This, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
|
97
107
|
static transaction(config?: TransactionConfig): <This, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
|
98
108
|
static step(config?: StepConfig): <This, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
|
109
|
+
static getApi(url: string): <This, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
|
110
|
+
static postApi(url: string): <This, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
|
111
|
+
static putApi(url: string): <This, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
|
112
|
+
static patchApi(url: string): <This, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
|
113
|
+
static deleteApi(url: string): <This, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
|
99
114
|
static defaultRequiredRole(anyOf: string[]): <T extends new (...args: any[]) => object>(ctor: T) => void;
|
100
115
|
static requiredRole(anyOf: string[]): <This, Args extends unknown[], Return>(target: object, propertyKey: string, inDescriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) => TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
|
116
|
+
static configureInstance<R extends ConfiguredInstance, T extends unknown[]>(cls: new (name: string, ...args: T) => R, name: string, ...args: T): R;
|
101
117
|
static registerAndWrapContextFreeFunction<This, Args extends unknown[], Return>(target: object, propertyKey: string, descriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>): {
|
102
118
|
descriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>;
|
103
119
|
registration: MethodRegistration<This, Args, Return>;
|
package/dist/src/dbos.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"dbos.d.ts","sourceRoot":"","sources":["../../src/dbos.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"dbos.d.ts","sourceRoot":"","sources":["../../src/dbos.ts"],"names":[],"mappings":"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"}
|
package/dist/src/dbos.js
CHANGED
@@ -12,11 +12,22 @@ const utils_1 = require("./utils");
|
|
12
12
|
const server_1 = require("./httpServer/server");
|
13
13
|
const middleware_1 = require("./httpServer/middleware");
|
14
14
|
const wfqueue_1 = require("./wfqueue");
|
15
|
+
const handlerTypes_1 = require("./httpServer/handlerTypes");
|
16
|
+
function httpApiDec(verb, url) {
|
17
|
+
return function apidec(target, propertyKey, inDescriptor) {
|
18
|
+
const { descriptor, registration } = (0, decorators_1.registerAndWrapContextFreeFunction)(target, propertyKey, inDescriptor);
|
19
|
+
const handlerRegistration = registration;
|
20
|
+
handlerRegistration.apiURL = url;
|
21
|
+
handlerRegistration.apiType = verb;
|
22
|
+
return descriptor;
|
23
|
+
};
|
24
|
+
}
|
15
25
|
class DBOS {
|
16
26
|
///////
|
17
27
|
// Lifecycle
|
18
28
|
///////
|
19
29
|
static adminServer = undefined;
|
30
|
+
static appServer = undefined;
|
20
31
|
static setConfig(config, runtimeConfig) {
|
21
32
|
DBOS.dbosConfig = config;
|
22
33
|
DBOS.runtimeConfig = runtimeConfig;
|
@@ -73,6 +84,11 @@ class DBOS {
|
|
73
84
|
}
|
74
85
|
}
|
75
86
|
static async shutdown() {
|
87
|
+
// Stop the app server
|
88
|
+
if (DBOS.appServer) {
|
89
|
+
DBOS.appServer.close();
|
90
|
+
DBOS.appServer = undefined;
|
91
|
+
}
|
76
92
|
// Stop the admin server
|
77
93
|
if (DBOS.adminServer) {
|
78
94
|
DBOS.adminServer.close();
|
@@ -91,6 +107,15 @@ class DBOS {
|
|
91
107
|
}
|
92
108
|
return dbos_executor_1.DBOSExecutor.globalInstance;
|
93
109
|
}
|
110
|
+
// This retrieves the HTTP handlers callback for DBOS HTTP.
|
111
|
+
// (This is the one that handles the @DBOS.getApi, etc., methods.)
|
112
|
+
// Useful for testing purposes, or to combine the DBOS service with routes.
|
113
|
+
// If you are using your own HTTP server, this won't return anything.
|
114
|
+
static getHTTPHandlersCallback() {
|
115
|
+
if (!server_1.DBOSHttpServer.instance)
|
116
|
+
return undefined;
|
117
|
+
return server_1.DBOSHttpServer.instance.app.callback();
|
118
|
+
}
|
94
119
|
//////
|
95
120
|
// Globals
|
96
121
|
//////
|
@@ -119,6 +144,9 @@ class DBOS {
|
|
119
144
|
static get request() {
|
120
145
|
return (0, context_1.getCurrentDBOSContext)()?.request;
|
121
146
|
}
|
147
|
+
static get koaContext() {
|
148
|
+
return (0, context_1.getCurrentDBOSContext)()?.koaContext;
|
149
|
+
}
|
122
150
|
static get workflowID() {
|
123
151
|
return (0, context_1.getCurrentDBOSContext)()?.workflowUUID;
|
124
152
|
}
|
@@ -210,9 +238,12 @@ class DBOS {
|
|
210
238
|
}
|
211
239
|
await (0, utils_1.sleepms)(durationMS);
|
212
240
|
}
|
213
|
-
static async
|
241
|
+
static async sleepSeconds(durationSec) {
|
214
242
|
return this.sleepms(durationSec * 1000);
|
215
243
|
}
|
244
|
+
static async sleep(durationMS) {
|
245
|
+
return this.sleepms(durationMS);
|
246
|
+
}
|
216
247
|
static async withNextWorkflowID(wfid, callback) {
|
217
248
|
const pctx = (0, context_1.getCurrentContextStore)();
|
218
249
|
if (pctx) {
|
@@ -229,9 +260,10 @@ class DBOS {
|
|
229
260
|
return (0, context_1.runWithTopContext)({ idAssignedForNextWorkflow: wfid }, callback);
|
230
261
|
}
|
231
262
|
}
|
232
|
-
static async withTracedContext(span, request, callback) {
|
263
|
+
static async withTracedContext(callerName, span, request, callback) {
|
233
264
|
const pctx = (0, context_1.getCurrentContextStore)();
|
234
265
|
if (pctx) {
|
266
|
+
pctx.operationCaller = callerName;
|
235
267
|
pctx.span = span;
|
236
268
|
pctx.request = request;
|
237
269
|
return callback();
|
@@ -251,6 +283,17 @@ class DBOS {
|
|
251
283
|
return (0, context_1.runWithTopContext)({ authenticatedUser: authedUser, authenticatedRoles: authedRoles }, callback);
|
252
284
|
}
|
253
285
|
}
|
286
|
+
// This generic setter helps users calling DBOS operation to pass a name, later used in seeding a parent OTel span for the operation.
|
287
|
+
static async withNamedContext(callerName, callback) {
|
288
|
+
const pctx = (0, context_1.getCurrentContextStore)();
|
289
|
+
if (pctx) {
|
290
|
+
pctx.operationCaller = callerName;
|
291
|
+
return callback();
|
292
|
+
}
|
293
|
+
else {
|
294
|
+
return (0, context_1.runWithTopContext)({ operationCaller: callerName }, callback);
|
295
|
+
}
|
296
|
+
}
|
254
297
|
static async withWorkflowQueue(wfq, callback) {
|
255
298
|
const pctx = (0, context_1.getCurrentContextStore)();
|
256
299
|
if (pctx) {
|
@@ -267,42 +310,64 @@ class DBOS {
|
|
267
310
|
return (0, context_1.runWithTopContext)({ queueAssignedForWorkflows: wfq }, callback);
|
268
311
|
}
|
269
312
|
}
|
270
|
-
static startWorkflow(target) {
|
313
|
+
static startWorkflow(target, params) {
|
271
314
|
if (typeof target === 'function') {
|
272
|
-
return DBOS.proxyInvokeWF(target, null);
|
315
|
+
return DBOS.proxyInvokeWF(target, null, params);
|
273
316
|
}
|
274
317
|
else {
|
275
|
-
return DBOS.proxyInvokeWF(target, target);
|
318
|
+
return DBOS.proxyInvokeWF(target, target, params);
|
276
319
|
}
|
277
320
|
}
|
278
|
-
static proxyInvokeWF(object, configuredInstance) {
|
321
|
+
static proxyInvokeWF(object, configuredInstance, inParams) {
|
279
322
|
const ops = (0, decorators_1.getRegisteredOperations)(object);
|
280
323
|
const proxy = {};
|
281
324
|
const pctx = (0, context_1.getCurrentContextStore)();
|
282
|
-
let wfId = pctx?.idAssignedForNextWorkflow;
|
325
|
+
let wfId = inParams?.workflowID ?? pctx?.idAssignedForNextWorkflow;
|
283
326
|
// If this is called from within a workflow, this is a child workflow,
|
284
327
|
// For OAOO, we will need a consistent ID formed from the parent WF and call number
|
285
328
|
if (DBOS.isWithinWorkflow()) {
|
286
329
|
const wfctx = (0, context_1.assertCurrentWorkflowContext)();
|
287
330
|
const funcId = wfctx.functionIDGetIncrement();
|
288
331
|
wfId = wfId || (wfctx.workflowUUID + "-" + funcId);
|
289
|
-
const
|
332
|
+
const wfParams = {
|
290
333
|
workflowUUID: wfId,
|
291
334
|
parentCtx: wfctx,
|
292
335
|
configuredInstance,
|
293
|
-
queueName: pctx?.queueAssignedForWorkflows
|
336
|
+
queueName: inParams?.queueName ?? pctx?.queueAssignedForWorkflows
|
294
337
|
};
|
295
338
|
for (const op of ops) {
|
296
339
|
proxy[op.name] = op.workflowConfig
|
297
|
-
? (...args) => dbos_executor_1.DBOSExecutor.globalInstance.internalWorkflow(op.registeredFunction,
|
340
|
+
? (...args) => dbos_executor_1.DBOSExecutor.globalInstance.internalWorkflow(op.registeredFunction, wfParams, wfctx.workflowUUID, funcId, ...args)
|
298
341
|
: undefined;
|
299
342
|
}
|
300
343
|
return proxy;
|
301
344
|
}
|
345
|
+
// Else, we setup a parent context that includes all the potential metadata the application could have set in DBOSLocalCtx
|
346
|
+
let parentCtx = undefined;
|
347
|
+
if (pctx) {
|
348
|
+
// If pctx has no span, e.g., has not been setup through `withTracedContext`, set up a parent span for the workflow here.
|
349
|
+
let span = pctx.span;
|
350
|
+
if (!span) {
|
351
|
+
span = DBOS.executor.tracer.startSpan(pctx.operationCaller || "startWorkflow", {
|
352
|
+
operationUUID: wfId,
|
353
|
+
operationType: pctx.operationType,
|
354
|
+
authenticatedUser: pctx.authenticatedUser,
|
355
|
+
assumedRole: pctx.assumedRole,
|
356
|
+
authenticatedRoles: pctx.authenticatedRoles,
|
357
|
+
});
|
358
|
+
}
|
359
|
+
parentCtx = new context_1.DBOSContextImpl(pctx.operationCaller || "startWorkflow", span, DBOS.logger);
|
360
|
+
parentCtx.request = pctx.request || {};
|
361
|
+
parentCtx.authenticatedUser = pctx.authenticatedUser || "";
|
362
|
+
parentCtx.assumedRole = pctx.assumedRole || "";
|
363
|
+
parentCtx.authenticatedRoles = pctx.authenticatedRoles || [];
|
364
|
+
parentCtx.workflowUUID = wfId || "";
|
365
|
+
}
|
302
366
|
const wfParams = {
|
303
367
|
workflowUUID: wfId,
|
304
|
-
queueName: pctx?.queueAssignedForWorkflows,
|
368
|
+
queueName: inParams?.queueName ?? pctx?.queueAssignedForWorkflows,
|
305
369
|
configuredInstance,
|
370
|
+
parentCtx,
|
306
371
|
};
|
307
372
|
for (const op of ops) {
|
308
373
|
proxy[op.name] = op.workflowConfig
|
@@ -398,7 +463,7 @@ class DBOS {
|
|
398
463
|
const pctx = (0, context_1.getCurrentContextStore)();
|
399
464
|
let inst = undefined;
|
400
465
|
if (typeof this === 'function') {
|
401
|
-
// This is static
|
466
|
+
// This is static
|
402
467
|
}
|
403
468
|
else {
|
404
469
|
inst = this;
|
@@ -422,10 +487,32 @@ class DBOS {
|
|
422
487
|
const cwfh = await dbos_executor_1.DBOSExecutor.globalInstance.internalWorkflow(registration.registeredFunction, params, wfctx.workflowUUID, funcId, ...rawArgs);
|
423
488
|
return await cwfh.getResult();
|
424
489
|
}
|
490
|
+
// Else, we setup a parent context that includes all the potential metadata the application could have set in DBOSLocalCtx
|
491
|
+
let parentCtx = undefined;
|
492
|
+
if (pctx) {
|
493
|
+
// If pctx has no span, e.g., has not been setup through `withTracedContext`, set up a parent span for the workflow here.
|
494
|
+
let span = pctx.span;
|
495
|
+
if (!span) {
|
496
|
+
span = DBOS.executor.tracer.startSpan(pctx.operationCaller || "workflowCaller", {
|
497
|
+
operationUUID: wfId,
|
498
|
+
operationType: pctx.operationType,
|
499
|
+
authenticatedUser: pctx.authenticatedUser,
|
500
|
+
assumedRole: pctx.assumedRole,
|
501
|
+
authenticatedRoles: pctx.authenticatedRoles,
|
502
|
+
});
|
503
|
+
}
|
504
|
+
parentCtx = new context_1.DBOSContextImpl(pctx.operationCaller || "workflowCaller", span, DBOS.logger);
|
505
|
+
parentCtx.request = pctx.request || {};
|
506
|
+
parentCtx.authenticatedUser = pctx.authenticatedUser || "";
|
507
|
+
parentCtx.assumedRole = pctx.assumedRole || "";
|
508
|
+
parentCtx.authenticatedRoles = pctx.authenticatedRoles || [];
|
509
|
+
parentCtx.workflowUUID = wfId || "";
|
510
|
+
}
|
425
511
|
const wfParams = {
|
426
512
|
workflowUUID: wfId,
|
427
513
|
queueName: pctx?.queueAssignedForWorkflows,
|
428
|
-
configuredInstance: inst
|
514
|
+
configuredInstance: inst,
|
515
|
+
parentCtx,
|
429
516
|
};
|
430
517
|
if (pctx) {
|
431
518
|
pctx.idAssignedForNextWorkflow = undefined;
|
@@ -452,7 +539,7 @@ class DBOS {
|
|
452
539
|
const invokeWrapper = async function (...rawArgs) {
|
453
540
|
let inst = undefined;
|
454
541
|
if (typeof this === 'function') {
|
455
|
-
// This is static
|
542
|
+
// This is static
|
456
543
|
}
|
457
544
|
else {
|
458
545
|
inst = this;
|
@@ -485,7 +572,7 @@ class DBOS {
|
|
485
572
|
const invokeWrapper = async function (...rawArgs) {
|
486
573
|
let inst = undefined;
|
487
574
|
if (typeof this === 'function') {
|
488
|
-
// This is static
|
575
|
+
// This is static
|
489
576
|
}
|
490
577
|
else {
|
491
578
|
inst = this;
|
@@ -511,6 +598,21 @@ class DBOS {
|
|
511
598
|
}
|
512
599
|
return decorator;
|
513
600
|
}
|
601
|
+
static getApi(url) {
|
602
|
+
return httpApiDec(handlerTypes_1.APITypes.GET, url);
|
603
|
+
}
|
604
|
+
static postApi(url) {
|
605
|
+
return httpApiDec(handlerTypes_1.APITypes.POST, url);
|
606
|
+
}
|
607
|
+
static putApi(url) {
|
608
|
+
return httpApiDec(handlerTypes_1.APITypes.PUT, url);
|
609
|
+
}
|
610
|
+
static patchApi(url) {
|
611
|
+
return httpApiDec(handlerTypes_1.APITypes.PATCH, url);
|
612
|
+
}
|
613
|
+
static deleteApi(url) {
|
614
|
+
return httpApiDec(handlerTypes_1.APITypes.DELETE, url);
|
615
|
+
}
|
514
616
|
static defaultRequiredRole(anyOf) {
|
515
617
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
516
618
|
function clsdec(ctor) {
|
@@ -530,6 +632,9 @@ class DBOS {
|
|
530
632
|
/////
|
531
633
|
// Registration, etc
|
532
634
|
/////
|
635
|
+
static configureInstance(cls, name, ...args) {
|
636
|
+
return (0, decorators_1.configureInstance)(cls, name, ...args);
|
637
|
+
}
|
533
638
|
// Function registration
|
534
639
|
static registerAndWrapContextFreeFunction(target, propertyKey, descriptor) {
|
535
640
|
return (0, decorators_1.registerAndWrapContextFreeFunction)(target, propertyKey, descriptor);
|
package/dist/src/dbos.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"dbos.js","sourceRoot":"","sources":["../../src/dbos.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"dbos.js","sourceRoot":"","sources":["../../src/dbos.ts"],"names":[],"mappings":"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"}
|
@@ -157,7 +157,7 @@ async function koaTracingMiddleware(ctx, next) {
|
|
157
157
|
};
|
158
158
|
const httpTracer = new core_1.W3CTraceContextPropagator();
|
159
159
|
const span = createHTTPSpan(request, httpTracer);
|
160
|
-
await dbos_1.DBOS.withTracedContext(span, request, next);
|
160
|
+
await dbos_1.DBOS.withTracedContext(request.url, span, request, next);
|
161
161
|
httpTracer.inject(api_1.trace.setSpanContext(api_1.ROOT_CONTEXT, span.spanContext()), {
|
162
162
|
context: ctx,
|
163
163
|
}, {
|
@@ -188,7 +188,7 @@ async function expressTracingMiddleware(req, res, next) {
|
|
188
188
|
};
|
189
189
|
const httpTracer = new core_1.W3CTraceContextPropagator();
|
190
190
|
const span = createHTTPSpan(request, httpTracer);
|
191
|
-
await dbos_1.DBOS.withTracedContext(span, request, next);
|
191
|
+
await dbos_1.DBOS.withTracedContext(request.url, span, request, next);
|
192
192
|
// We could probably define a context type and type the parameters in the set closure (see Koa middleware above)
|
193
193
|
httpTracer.inject(api_1.trace.setSpanContext(api_1.ROOT_CONTEXT, span.spanContext()), res, {
|
194
194
|
set: (_, header, value) => res.setHeader(header, value),
|