@dbos-inc/dbos-sdk 2.7.8-preview → 2.7.16-preview
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/schemas/system_db_schema.d.ts +4 -5
- package/dist/schemas/system_db_schema.d.ts.map +1 -1
- package/dist/src/client.d.ts +3 -3
- package/dist/src/client.d.ts.map +1 -1
- package/dist/src/client.js +6 -4
- package/dist/src/client.js.map +1 -1
- package/dist/src/conductor/conductor.d.ts +9 -0
- package/dist/src/conductor/conductor.d.ts.map +1 -1
- package/dist/src/conductor/conductor.js +72 -17
- package/dist/src/conductor/conductor.js.map +1 -1
- package/dist/src/dbos-executor.d.ts +4 -0
- package/dist/src/dbos-executor.d.ts.map +1 -1
- package/dist/src/dbos-executor.js +27 -3
- package/dist/src/dbos-executor.js.map +1 -1
- package/dist/src/dbos-runtime/config.d.ts.map +1 -1
- package/dist/src/dbos-runtime/config.js +2 -0
- package/dist/src/dbos-runtime/config.js.map +1 -1
- package/dist/src/dbos-runtime/workflow_management.d.ts +1 -1
- package/dist/src/dbos-runtime/workflow_management.d.ts.map +1 -1
- package/dist/src/httpServer/server.d.ts +6 -0
- package/dist/src/httpServer/server.d.ts.map +1 -1
- package/dist/src/httpServer/server.js +17 -0
- package/dist/src/httpServer/server.js.map +1 -1
- package/dist/src/system_database.d.ts +5 -5
- package/dist/src/system_database.d.ts.map +1 -1
- package/dist/src/system_database.js +7 -20
- package/dist/src/system_database.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -55,12 +55,11 @@ export interface workflow_queue {
|
|
|
55
55
|
started_at_epoch_ms?: number;
|
|
56
56
|
completed_at_epoch_ms?: number;
|
|
57
57
|
}
|
|
58
|
-
export interface
|
|
58
|
+
export interface step_info {
|
|
59
59
|
function_id: number;
|
|
60
60
|
function_name: string;
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
steps: step_function[];
|
|
61
|
+
output: string;
|
|
62
|
+
error: string;
|
|
63
|
+
child_workflow_id: string;
|
|
65
64
|
}
|
|
66
65
|
//# sourceMappingURL=system_db_schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system_db_schema.d.ts","sourceRoot":"","sources":["../../schemas/system_db_schema.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAEhC,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IAGZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"system_db_schema.d.ts","sourceRoot":"","sources":["../../schemas/system_db_schema.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAEhC,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,GAAG,EAAE,MAAM,CAAC;IAGZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,SAAS;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;CAC3B"}
|
package/dist/src/client.d.ts
CHANGED
|
@@ -4,14 +4,14 @@ interface EnqueueOptions {
|
|
|
4
4
|
workflowName: string;
|
|
5
5
|
workflowClassName: string;
|
|
6
6
|
workflowID?: string;
|
|
7
|
-
|
|
7
|
+
maxRecoveryAttempts?: number;
|
|
8
8
|
appVersion?: string;
|
|
9
9
|
}
|
|
10
10
|
export declare class DBOSClient {
|
|
11
11
|
private readonly logger;
|
|
12
12
|
private readonly systemDatabase;
|
|
13
|
-
constructor(
|
|
14
|
-
|
|
13
|
+
private constructor();
|
|
14
|
+
static create(databaseUrl: string, systemDatabase?: string): Promise<DBOSClient>;
|
|
15
15
|
destroy(): Promise<void>;
|
|
16
16
|
enqueue<T extends unknown[]>(options: EnqueueOptions, ...args: T): Promise<void>;
|
|
17
17
|
send<T>(destinationID: string, message: T, topic?: string, idempotencyKey?: string): Promise<void>;
|
package/dist/src/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,cAAc,EAAE,MAAM,YAAY,CAAC;AAG3E,UAAU,cAAc;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,cAAc,EAAE,MAAM,YAAY,CAAC;AAG3E,UAAU,cAAc;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAEhD,OAAO;WAmBM,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAMhF,OAAO;IAIP,OAAO,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BhF,IAAI,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBlG,QAAQ,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAI9F,gBAAgB,CAAC,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CAG9E"}
|
package/dist/src/client.js
CHANGED
|
@@ -24,8 +24,10 @@ class DBOSClient {
|
|
|
24
24
|
this.logger = new logs_1.GlobalLogger();
|
|
25
25
|
this.systemDatabase = new system_database_1.PostgresSystemDatabase(poolConfig, systemDatabase, this.logger);
|
|
26
26
|
}
|
|
27
|
-
async
|
|
28
|
-
|
|
27
|
+
static async create(databaseUrl, systemDatabase) {
|
|
28
|
+
const client = new DBOSClient(databaseUrl, systemDatabase);
|
|
29
|
+
await client.systemDatabase.init();
|
|
30
|
+
return client;
|
|
29
31
|
}
|
|
30
32
|
async destroy() {
|
|
31
33
|
await this.systemDatabase.destroy();
|
|
@@ -33,7 +35,7 @@ class DBOSClient {
|
|
|
33
35
|
async enqueue(options, ...args) {
|
|
34
36
|
const { workflowName, workflowClassName, queueName, appVersion } = options;
|
|
35
37
|
const workflowUUID = options.workflowID ?? (0, uuid_1.v4)();
|
|
36
|
-
const
|
|
38
|
+
const maxRecoveryAttempts = options.maxRecoveryAttempts ?? 50;
|
|
37
39
|
const internalStatus = {
|
|
38
40
|
workflowUUID: workflowUUID,
|
|
39
41
|
status: workflow_1.StatusString.ENQUEUED,
|
|
@@ -51,7 +53,7 @@ class DBOSClient {
|
|
|
51
53
|
applicationVersion: appVersion,
|
|
52
54
|
applicationID: '',
|
|
53
55
|
createdAt: Date.now(),
|
|
54
|
-
maxRetries:
|
|
56
|
+
maxRetries: maxRecoveryAttempts,
|
|
55
57
|
};
|
|
56
58
|
await this.systemDatabase.initWorkflowStatus(internalStatus, args);
|
|
57
59
|
await this.systemDatabase.enqueueWorkflow(workflowUUID, queueName);
|
package/dist/src/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":";;;AACA,uDAAmG;AACnG,2CAA0D;AAC1D,+BAAoC;AACpC,yCAA2E;AAC3E,kDAAsE;AAWtE,MAAa,UAAU;IACJ,MAAM,CAAS;IACf,cAAc,CAAiB;IAEhD,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
1
2
|
import { DBOSExecutor } from '../dbos-executor';
|
|
2
3
|
import WebSocket from 'ws';
|
|
3
4
|
export declare class Conductor {
|
|
@@ -8,7 +9,15 @@ export declare class Conductor {
|
|
|
8
9
|
websocket: WebSocket | undefined;
|
|
9
10
|
isShuttingDown: boolean;
|
|
10
11
|
isClosed: boolean;
|
|
12
|
+
pingPeriodMs: number;
|
|
13
|
+
pingTimeoutMs: number;
|
|
14
|
+
pingInterval: NodeJS.Timeout | undefined;
|
|
15
|
+
pingTimeout: NodeJS.Timeout | undefined;
|
|
16
|
+
reconnectDelayMs: number;
|
|
17
|
+
reconnectTimeout: NodeJS.Timeout | undefined;
|
|
11
18
|
constructor(dbosExec: DBOSExecutor, conductorKey: string, conductorURL: string);
|
|
19
|
+
resetWebsocket(): void;
|
|
20
|
+
setPingInterval(): void;
|
|
12
21
|
dispatchLoop(): void;
|
|
13
22
|
stop(): void;
|
|
14
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor.d.ts","sourceRoot":"","sources":["../../../src/conductor/conductor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,SAAS,MAAM,IAAI,CAAC;AAO3B,qBAAa,SAAS;
|
|
1
|
+
{"version":3,"file":"conductor.d.ts","sourceRoot":"","sources":["../../../src/conductor/conductor.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,SAAS,MAAM,IAAI,CAAC;AAO3B,qBAAa,SAAS;IAalB,QAAQ,CAAC,QAAQ,EAAE,YAAY;IAC/B,QAAQ,CAAC,YAAY,EAAE,MAAM;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM;IAd/B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,SAAS,GAAG,SAAS,CAAa;IAC7C,cAAc,UAAS;IACvB,QAAQ,UAAS;IACjB,YAAY,SAAS;IACrB,aAAa,SAAS;IACtB,YAAY,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAa;IACrD,WAAW,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAa;IACpD,gBAAgB,SAAQ;IACxB,gBAAgB,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAa;gBAG9C,QAAQ,EAAE,YAAY,EACtB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM;IAO/B,cAAc;IAwBd,eAAe;IAyBf,YAAY;IAoOZ,IAAI;CASL"}
|
|
@@ -38,8 +38,14 @@ class Conductor {
|
|
|
38
38
|
conductorURL;
|
|
39
39
|
url;
|
|
40
40
|
websocket = undefined;
|
|
41
|
-
isShuttingDown = false;
|
|
42
|
-
isClosed = false;
|
|
41
|
+
isShuttingDown = false; // Is in the process of shutting down the connection
|
|
42
|
+
isClosed = false; // Is closed after the connection has been terminated
|
|
43
|
+
pingPeriodMs = 20000; // Time in milliseconds to wait before sending a ping message to the conductor
|
|
44
|
+
pingTimeoutMs = 15000; // Time in milliseconds to wait for a response to a ping message before considering the connection dead
|
|
45
|
+
pingInterval = undefined; // Interval for sending ping messages to the conductor
|
|
46
|
+
pingTimeout = undefined; // Timeout for waiting for a response to a ping message
|
|
47
|
+
reconnectDelayMs = 1000;
|
|
48
|
+
reconnectTimeout = undefined;
|
|
43
49
|
constructor(dbosExec, conductorKey, conductorURL) {
|
|
44
50
|
this.dbosExec = dbosExec;
|
|
45
51
|
this.conductorKey = conductorKey;
|
|
@@ -48,17 +54,75 @@ class Conductor {
|
|
|
48
54
|
const cleanConductorURL = conductorURL.replace(/\/+$/, '');
|
|
49
55
|
this.url = `${cleanConductorURL}/websocket/${appName}/${conductorKey}`;
|
|
50
56
|
}
|
|
57
|
+
resetWebsocket() {
|
|
58
|
+
if (this.pingInterval) {
|
|
59
|
+
clearInterval(this.pingInterval);
|
|
60
|
+
this.pingInterval = undefined;
|
|
61
|
+
}
|
|
62
|
+
if (this.pingTimeout) {
|
|
63
|
+
clearTimeout(this.pingTimeout);
|
|
64
|
+
this.pingTimeout = undefined;
|
|
65
|
+
}
|
|
66
|
+
if (this.websocket) {
|
|
67
|
+
this.websocket.terminate(); // Terminate the existing connection
|
|
68
|
+
this.websocket = undefined; // Set the websocket to undefined to indicate it's closed
|
|
69
|
+
}
|
|
70
|
+
if (this.reconnectTimeout || this.isShuttingDown) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
this.dbosExec.logger.debug(`Reconnecting in ${this.reconnectDelayMs / 1000} second`);
|
|
74
|
+
this.reconnectTimeout = setTimeout(() => {
|
|
75
|
+
this.reconnectTimeout = undefined;
|
|
76
|
+
this.dispatchLoop();
|
|
77
|
+
}, this.reconnectDelayMs);
|
|
78
|
+
}
|
|
79
|
+
setPingInterval() {
|
|
80
|
+
// Clear any existing ping interval to avoid multiple intervals being set
|
|
81
|
+
if (this.pingInterval) {
|
|
82
|
+
clearInterval(this.pingInterval);
|
|
83
|
+
this.pingInterval = undefined;
|
|
84
|
+
}
|
|
85
|
+
this.pingInterval = setInterval(() => {
|
|
86
|
+
if (this.websocket?.readyState !== ws_1.default.OPEN) {
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
this.dbosExec.logger.debug('Sending ping to conductor');
|
|
90
|
+
this.websocket.ping();
|
|
91
|
+
// Set ping timeout.
|
|
92
|
+
this.pingTimeout = setTimeout(() => {
|
|
93
|
+
if (this.isShuttingDown) {
|
|
94
|
+
this.isClosed = true;
|
|
95
|
+
return;
|
|
96
|
+
}
|
|
97
|
+
// Otherwise, try to reconnect
|
|
98
|
+
this.dbosExec.logger.error('Connection to conductor lost. Reconnecting...');
|
|
99
|
+
this.resetWebsocket();
|
|
100
|
+
}, this.pingTimeoutMs);
|
|
101
|
+
}, this.pingPeriodMs);
|
|
102
|
+
}
|
|
51
103
|
dispatchLoop() {
|
|
52
104
|
if (this.websocket) {
|
|
53
105
|
this.dbosExec.logger.warn('Conductor websocket already exists');
|
|
54
106
|
return;
|
|
55
107
|
}
|
|
108
|
+
if (this.isShuttingDown) {
|
|
109
|
+
this.dbosExec.logger.debug('Not starting dispatch loop as conductor is shutting down');
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
56
112
|
try {
|
|
57
113
|
this.dbosExec.logger.debug(`Connecting to conductor at ${this.url}`);
|
|
58
114
|
// Start a new websocket connection
|
|
59
115
|
this.websocket = new ws_1.default(this.url, { handshakeTimeout: 5000 });
|
|
60
116
|
this.websocket.on('open', () => {
|
|
61
117
|
this.dbosExec.logger.debug('Opened connection to DBOS conductor');
|
|
118
|
+
this.setPingInterval();
|
|
119
|
+
});
|
|
120
|
+
this.websocket.on('pong', () => {
|
|
121
|
+
this.dbosExec.logger.debug('Received pong from conductor');
|
|
122
|
+
if (this.pingTimeout) {
|
|
123
|
+
clearTimeout(this.pingTimeout);
|
|
124
|
+
this.pingTimeout = undefined;
|
|
125
|
+
}
|
|
62
126
|
});
|
|
63
127
|
this.websocket.on('message', async (data) => {
|
|
64
128
|
this.dbosExec.logger.debug(`Received message from conductor: ${data}`);
|
|
@@ -232,35 +296,26 @@ class Conductor {
|
|
|
232
296
|
else {
|
|
233
297
|
// Try to reconnect
|
|
234
298
|
this.dbosExec.logger.error('Connection to conductor lost. Reconnecting.');
|
|
235
|
-
|
|
236
|
-
this.websocket?.terminate();
|
|
237
|
-
this.websocket = undefined;
|
|
238
|
-
this.dispatchLoop();
|
|
239
|
-
}, 1000);
|
|
299
|
+
this.resetWebsocket();
|
|
240
300
|
}
|
|
241
301
|
});
|
|
242
302
|
this.websocket.on('error', (err) => {
|
|
243
303
|
console.error(err);
|
|
244
304
|
// TODO: better error message, showing the detailed error.
|
|
245
305
|
this.dbosExec.logger.error(`Unexpected exception in connection to conductor. Reconnecting: ${err.message}`);
|
|
246
|
-
|
|
247
|
-
this.websocket?.terminate();
|
|
248
|
-
this.websocket = undefined;
|
|
249
|
-
this.dispatchLoop();
|
|
250
|
-
}, 1000);
|
|
306
|
+
this.resetWebsocket();
|
|
251
307
|
});
|
|
252
308
|
}
|
|
253
309
|
catch (e) {
|
|
254
310
|
this.dbosExec.logger.error(`Error in conductor loop. Reconnecting: ${e.message}`);
|
|
255
|
-
|
|
256
|
-
this.websocket?.terminate();
|
|
257
|
-
this.websocket = undefined;
|
|
258
|
-
this.dispatchLoop();
|
|
259
|
-
}, 1000);
|
|
311
|
+
this.resetWebsocket();
|
|
260
312
|
}
|
|
261
313
|
}
|
|
262
314
|
stop() {
|
|
263
315
|
this.isShuttingDown = true;
|
|
316
|
+
clearInterval(this.pingInterval);
|
|
317
|
+
clearTimeout(this.pingTimeout);
|
|
318
|
+
clearTimeout(this.reconnectTimeout);
|
|
264
319
|
if (this.websocket) {
|
|
265
320
|
this.websocket.close();
|
|
266
321
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor.js","sourceRoot":"","sources":["../../../src/conductor/conductor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"conductor.js","sourceRoot":"","sources":["../../../src/conductor/conductor.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { Pool, PoolClient, PoolConfig } from 'pg';
|
|
|
10
10
|
import { SystemDatabase } from './system_database';
|
|
11
11
|
import { UserDatabase, UserDatabaseName, UserDatabaseClient } from './user_database';
|
|
12
12
|
import { MethodRegistrationBase, ConfiguredInstance } from './decorators';
|
|
13
|
+
import { step_info } from '../schemas/system_db_schema';
|
|
13
14
|
import { StoredProcedure, StoredProcedureConfig } from './procedure';
|
|
14
15
|
import { DBOSEventReceiver, DBOSExecutorContext, GetWorkflowsInput, GetWorkflowsOutput } from '.';
|
|
15
16
|
import { DBOSScheduler } from './scheduler/scheduler';
|
|
@@ -21,7 +22,9 @@ export interface DBOSConfig {
|
|
|
21
22
|
name?: string;
|
|
22
23
|
readonly databaseUrl?: string;
|
|
23
24
|
readonly userDbclient?: UserDatabaseName;
|
|
25
|
+
readonly userDbPoolSize?: number;
|
|
24
26
|
readonly sysDbName?: string;
|
|
27
|
+
readonly sysDbPoolSize?: number;
|
|
25
28
|
readonly logLevel?: string;
|
|
26
29
|
readonly otlpTracesEndpoints?: string[];
|
|
27
30
|
readonly adminPort?: number;
|
|
@@ -194,6 +197,7 @@ export declare class DBOSExecutor implements DBOSExecutorContext {
|
|
|
194
197
|
queryEventDispatchState(query: DBOSEventReceiverQuery): Promise<DBOSEventReceiverState[]>;
|
|
195
198
|
upsertEventDispatchState(state: DBOSEventReceiverState): Promise<DBOSEventReceiverState>;
|
|
196
199
|
cancelWorkflow(workflowID: string): Promise<void>;
|
|
200
|
+
listWorkflowSteps(workflowID: string): Promise<step_info[]>;
|
|
197
201
|
resumeWorkflow(workflowID: string): Promise<WorkflowHandle<unknown>>;
|
|
198
202
|
/**
|
|
199
203
|
* Periodically flush the workflow output buffer to the system database.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbos-executor.d.ts","sourceRoot":"","sources":["../../src/dbos-executor.ts"],"names":[],"mappings":";AAaA,OAAO,EAEL,QAAQ,EACR,cAAc,EAEd,cAAc,EACd,cAAc,EAEd,mBAAmB,EACnB,cAAc,EAEd,cAAc,EAEd,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAkB,WAAW,EAAE,iBAAiB,EAA0B,MAAM,eAAe,CAAC;AACvG,OAAO,EAAE,UAAU,EAAmB,YAAY,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAkB,MAAM,IAAI,CAAC;AAClE,OAAO,EAAE,cAAc,EAAkD,MAAM,mBAAmB,CAAC;AAEnG,OAAO,EAGL,YAAY,EAEZ,gBAAgB,EAGhB,kBAAkB,EAGnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,sBAAsB,EAOtB,kBAAkB,EAEnB,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"dbos-executor.d.ts","sourceRoot":"","sources":["../../src/dbos-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -181,7 +181,7 @@ class DBOSExecutor {
|
|
|
181
181
|
}
|
|
182
182
|
else {
|
|
183
183
|
this.logger.debug('Using Postgres system database');
|
|
184
|
-
this.systemDatabase = new system_database_1.PostgresSystemDatabase(this.config.poolConfig, this.config.system_database, this.logger);
|
|
184
|
+
this.systemDatabase = new system_database_1.PostgresSystemDatabase(this.config.poolConfig, this.config.system_database, this.logger, this.config.sysDbPoolSize);
|
|
185
185
|
}
|
|
186
186
|
this.flushBufferID = setInterval(() => {
|
|
187
187
|
if (!this.isDebugging && !this.isFlushingBuffers) {
|
|
@@ -200,12 +200,24 @@ class DBOSExecutor {
|
|
|
200
200
|
// TODO: make Prisma work with debugger proxy.
|
|
201
201
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-require-imports
|
|
202
202
|
const { PrismaClient } = require(node_path_1.default.join(process.cwd(), 'node_modules', '@prisma', 'client')); // Find the prisma client in the node_modules of the current project
|
|
203
|
+
let dbUrl = `postgresql://${userDBConfig.user}:${userDBConfig.password}@${userDBConfig.host}:${userDBConfig.port}/${userDBConfig.database}`;
|
|
204
|
+
const queryParams = {};
|
|
205
|
+
if (userDBConfig.connectionTimeoutMillis) {
|
|
206
|
+
queryParams['connect_timeout'] = userDBConfig.connectionTimeoutMillis;
|
|
207
|
+
}
|
|
208
|
+
if (userDBConfig.max) {
|
|
209
|
+
queryParams['connection_limit'] = String(userDBConfig.max);
|
|
210
|
+
}
|
|
211
|
+
const queryString = new URLSearchParams(queryParams).toString();
|
|
212
|
+
if (queryString) {
|
|
213
|
+
dbUrl += `?${queryString}`;
|
|
214
|
+
}
|
|
203
215
|
this.userDatabase = new user_database_1.PrismaUserDatabase(
|
|
204
216
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call
|
|
205
217
|
new PrismaClient({
|
|
206
218
|
datasources: {
|
|
207
219
|
db: {
|
|
208
|
-
url:
|
|
220
|
+
url: dbUrl,
|
|
209
221
|
},
|
|
210
222
|
},
|
|
211
223
|
}));
|
|
@@ -226,6 +238,8 @@ class DBOSExecutor {
|
|
|
226
238
|
database: userDBConfig.database,
|
|
227
239
|
entities: this.typeormEntities,
|
|
228
240
|
ssl: userDBConfig.ssl,
|
|
241
|
+
poolSize: userDBConfig.max,
|
|
242
|
+
connectTimeoutMS: userDBConfig.connectionTimeoutMillis,
|
|
229
243
|
}));
|
|
230
244
|
}
|
|
231
245
|
catch (s) {
|
|
@@ -244,6 +258,11 @@ class DBOSExecutor {
|
|
|
244
258
|
password: userDBConfig.password,
|
|
245
259
|
database: userDBConfig.database,
|
|
246
260
|
ssl: userDBConfig.ssl,
|
|
261
|
+
connectTimeout: userDBConfig.connectionTimeoutMillis,
|
|
262
|
+
},
|
|
263
|
+
pool: {
|
|
264
|
+
min: 0,
|
|
265
|
+
max: userDBConfig.max,
|
|
247
266
|
},
|
|
248
267
|
};
|
|
249
268
|
this.userDatabase = new user_database_1.KnexUserDatabase((0, knex_1.default)(knexConfig));
|
|
@@ -604,9 +623,11 @@ class DBOSExecutor {
|
|
|
604
623
|
if (child_id !== null) {
|
|
605
624
|
return new workflow_1.RetrievedHandle(this.systemDatabase, child_id, callerUUID, callerFunctionID);
|
|
606
625
|
}
|
|
607
|
-
await this.systemDatabase.recordChildWorkflow(callerUUID, workflowUUID, callerFunctionID, wf.name);
|
|
608
626
|
}
|
|
609
627
|
const ires = await this.systemDatabase.initWorkflowStatus(internalStatus, args);
|
|
628
|
+
if (callerFunctionID !== undefined && callerUUID !== undefined) {
|
|
629
|
+
await this.systemDatabase.recordChildWorkflow(callerUUID, workflowUUID, callerFunctionID, wf.name);
|
|
630
|
+
}
|
|
610
631
|
args = ires.args;
|
|
611
632
|
status = ires.status;
|
|
612
633
|
await (0, debugpoint_1.debugTriggerPoint)(debugpoint_1.DEBUG_TRIGGER_WORKFLOW_ENQUEUE);
|
|
@@ -1701,6 +1722,9 @@ class DBOSExecutor {
|
|
|
1701
1722
|
this.logger.info(`Cancelling workflow ${workflowID}`);
|
|
1702
1723
|
this.workflowCancellationMap.set(workflowID, true);
|
|
1703
1724
|
}
|
|
1725
|
+
async listWorkflowSteps(workflowID) {
|
|
1726
|
+
return await this.systemDatabase.getWorkflowSteps(workflowID);
|
|
1727
|
+
}
|
|
1704
1728
|
async resumeWorkflow(workflowID) {
|
|
1705
1729
|
await this.systemDatabase.resumeWorkflow(workflowID);
|
|
1706
1730
|
this.workflowCancellationMap.delete(workflowID);
|