@dbos-inc/dbos-sdk 2.8.17-preview → 2.8.41-preview.gb44af319d0

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.
Files changed (41) hide show
  1. package/dbos-config.schema.json +0 -4
  2. package/dist/dbos-config.schema.json +0 -4
  3. package/dist/src/client.d.ts.map +1 -1
  4. package/dist/src/client.js +9 -13
  5. package/dist/src/client.js.map +1 -1
  6. package/dist/src/dbos-executor.d.ts +1 -3
  7. package/dist/src/dbos-executor.d.ts.map +1 -1
  8. package/dist/src/dbos-executor.js +32 -91
  9. package/dist/src/dbos-executor.js.map +1 -1
  10. package/dist/src/dbos-runtime/config.d.ts +24 -2
  11. package/dist/src/dbos-runtime/config.d.ts.map +1 -1
  12. package/dist/src/dbos-runtime/config.js +151 -56
  13. package/dist/src/dbos-runtime/config.js.map +1 -1
  14. package/dist/src/dbos-runtime/migrate.js +7 -4
  15. package/dist/src/dbos-runtime/migrate.js.map +1 -1
  16. package/dist/src/dbos-runtime/workflow_management.d.ts.map +1 -1
  17. package/dist/src/dbos-runtime/workflow_management.js +2 -1
  18. package/dist/src/dbos-runtime/workflow_management.js.map +1 -1
  19. package/dist/src/dbos.d.ts +8 -1
  20. package/dist/src/dbos.d.ts.map +1 -1
  21. package/dist/src/dbos.js +28 -8
  22. package/dist/src/dbos.js.map +1 -1
  23. package/dist/src/error.d.ts +11 -6
  24. package/dist/src/error.d.ts.map +1 -1
  25. package/dist/src/error.js +27 -16
  26. package/dist/src/error.js.map +1 -1
  27. package/dist/src/scheduler/scheduler.js +1 -1
  28. package/dist/src/scheduler/scheduler.js.map +1 -1
  29. package/dist/src/system_database.d.ts +48 -16
  30. package/dist/src/system_database.d.ts.map +1 -1
  31. package/dist/src/system_database.js +323 -105
  32. package/dist/src/system_database.js.map +1 -1
  33. package/dist/src/user_database.d.ts.map +1 -1
  34. package/dist/src/user_database.js +8 -2
  35. package/dist/src/user_database.js.map +1 -1
  36. package/dist/src/workflow.d.ts.map +1 -1
  37. package/dist/src/workflow.js +7 -38
  38. package/dist/src/workflow.js.map +1 -1
  39. package/dist/tsconfig.tsbuildinfo +1 -1
  40. package/migrations/20250415134400_triggers_wfstatus.js +43 -0
  41. package/package.json +1 -1
@@ -60,10 +60,6 @@
60
60
  "type": "string",
61
61
  "description": "If using SSL/TLS to securely connect to a database, path to an SSL root certificate file"
62
62
  },
63
- "local_suffix": {
64
- "type": "boolean",
65
- "description": "Whether to suffix app_db_name with '_local'. Set to true when doing local development using a DBOS Cloud database."
66
- },
67
63
  "app_db_client": {
68
64
  "type": "string",
69
65
  "description": "Specify the database client to use to connect to the application database",
@@ -60,10 +60,6 @@
60
60
  "type": "string",
61
61
  "description": "If using SSL/TLS to securely connect to a database, path to an SSL root certificate file"
62
62
  },
63
- "local_suffix": {
64
- "type": "boolean",
65
- "description": "Whether to suffix app_db_name with '_local'. Set to true when doing local development using a DBOS Cloud database."
66
- },
67
63
  "app_db_client": {
68
64
  "type": "string",
69
65
  "description": "Specify the database client to use to connect to the application database",
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,cAAc,EAAE,MAAM,YAAY,CAAC;AAI3E;;;GAGG;AACH,UAAU,cAAc;IACtB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAEhD,OAAO;IAmBP;;;;;OAKG;WACU,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAMtF;;;;OAIG;IACG,OAAO;IAIb;;;;;OAKG;IAEG,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,EACtD,OAAO,EAAE,cAAc,EACvB,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,GACrB,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IA6BlD;;;;;;;OAOG;IACG,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;IAuBxG;;;;;;OAMG;IACG,QAAQ,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAI9F;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CAG9E"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,cAAc,EAAE,MAAM,YAAY,CAAC;AAI3E;;;GAGG;AACH,UAAU,cAAc;IACtB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAEhD,OAAO;IAcP;;;;;OAKG;WACU,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAMtF;;;;OAIG;IACG,OAAO;IAIb;;;;;OAKG;IAEG,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,EACtD,OAAO,EAAE,cAAc,EACvB,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,GACrB,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IA6BlD;;;;;;;OAOG;IACG,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;IAuBxG;;;;;;OAMG;IACG,QAAQ,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAI9F;;;;OAIG;IACH,gBAAgB,CAAC,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CAG9E"}
@@ -14,17 +14,13 @@ class DBOSClient {
14
14
  logger;
15
15
  systemDatabase;
16
16
  constructor(databaseUrl, systemDatabase) {
17
- const dbConfig = (0, config_1.parseDbString)(databaseUrl);
18
- const poolConfig = {
19
- host: dbConfig.hostname,
20
- port: dbConfig.port,
21
- user: dbConfig.username,
22
- password: dbConfig.password,
23
- database: dbConfig.app_db_name,
24
- ssl: (0, config_1.parseSSLConfig)(dbConfig),
25
- connectionTimeoutMillis: dbConfig.connectionTimeoutMillis,
26
- };
27
- systemDatabase ??= `${dbConfig.app_db_name}_dbos_sys`;
17
+ const poolConfig = (0, config_1.constructPoolConfig)({
18
+ database: {},
19
+ database_url: databaseUrl,
20
+ application: {},
21
+ env: {},
22
+ });
23
+ systemDatabase ??= `${poolConfig.database}_dbos_sys`;
28
24
  this.logger = new logs_1.GlobalLogger();
29
25
  this.systemDatabase = new system_database_1.PostgresSystemDatabase(poolConfig, systemDatabase, this.logger);
30
26
  }
@@ -76,7 +72,7 @@ class DBOSClient {
76
72
  createdAt: Date.now(),
77
73
  maxRetries: 50,
78
74
  };
79
- await this.systemDatabase.initWorkflowStatus(internalStatus, args);
75
+ await this.systemDatabase.initWorkflowStatus(internalStatus, utils_1.DBOSJSON.stringify(args));
80
76
  await this.systemDatabase.enqueueWorkflow(workflowUUID, queueName);
81
77
  return new workflow_1.RetrievedHandle(this.systemDatabase, workflowUUID);
82
78
  }
@@ -107,7 +103,7 @@ class DBOSClient {
107
103
  createdAt: Date.now(),
108
104
  maxRetries: 50,
109
105
  };
110
- await this.systemDatabase.initWorkflowStatus(internalStatus, [destinationID, message, topic]);
106
+ await this.systemDatabase.initWorkflowStatus(internalStatus, utils_1.DBOSJSON.stringify([destinationID, message, topic]));
111
107
  await this.systemDatabase.send(internalStatus.workflowUUID, 0, destinationID, utils_1.DBOSJSON.stringify(message), topic);
112
108
  }
113
109
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":";;;AACA,uDAAmG;AACnG,2CAA0D;AAC1D,+BAAoC;AACpC,yCAA2E;AAC3E,kDAA4D;AAC5D,mCAAmC;AA+BnC;;GAEG;AACH,MAAa,UAAU;IACJ,MAAM,CAAS;IACf,cAAc,CAAiB;IAEhD,YAAoB,WAAmB,EAAE,cAAuB;QAC9D,MAAM,UAAU,GAAe,IAAA,4BAAmB,EAAC;YACjD,QAAQ,EAAE,EAAE;YACZ,YAAY,EAAE,WAAW;YACzB,WAAW,EAAE,EAAE;YACf,GAAG,EAAE,EAAE;SACR,CAAC,CAAC;QAEH,cAAc,KAAK,GAAG,UAAU,CAAC,QAAQ,WAAW,CAAC;QAErD,IAAI,CAAC,MAAM,GAAG,IAAI,mBAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,IAAI,wCAAsB,CAAC,UAAU,EAAE,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5F,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,WAAmB,EAAE,cAAuB;QAC9D,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;QAC3D,MAAM,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QACnC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IAED;;;;;OAKG;IACH,8DAA8D;IAC9D,KAAK,CAAC,OAAO,CACX,OAAuB,EACvB,GAAG,IAAmB;QAEtB,MAAM,EAAE,YAAY,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAC3E,MAAM,YAAY,GAAG,OAAO,CAAC,UAAU,IAAI,IAAA,SAAM,GAAE,CAAC;QAEpD,MAAM,cAAc,GAA2B;YAC7C,YAAY,EAAE,YAAY;YAC1B,MAAM,EAAE,uBAAY,CAAC,QAAQ;YAC7B,YAAY,EAAE,YAAY;YAC1B,iBAAiB,EAAE,iBAAiB;YACpC,kBAAkB,EAAE,EAAE;YACtB,SAAS,EAAE,SAAS;YACpB,iBAAiB,EAAE,EAAE;YACrB,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,IAAI;YACX,WAAW,EAAE,EAAE;YACf,kBAAkB,EAAE,EAAE;YACtB,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE;YACd,kBAAkB,EAAE,UAAU;YAC9B,aAAa,EAAE,EAAE;YACjB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,UAAU,EAAE,EAAE;SACf,CAAC;QAEF,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,cAAc,EAAE,gBAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACvF,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QACnE,OAAO,IAAI,0BAAe,CAAyB,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IACxF,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,IAAI,CAAI,aAAqB,EAAE,OAAU,EAAE,KAAc,EAAE,cAAuB;QACtF,cAAc,KAAK,IAAA,SAAM,GAAE,CAAC;QAC5B,MAAM,cAAc,GAA2B;YAC7C,YAAY,EAAE,GAAG,aAAa,IAAI,cAAc,EAAE;YAClD,MAAM,EAAE,uBAAY,CAAC,OAAO;YAC5B,YAAY,EAAE,2BAA2B;YACzC,iBAAiB,EAAE,EAAE;YACrB,kBAAkB,EAAE,EAAE;YACtB,iBAAiB,EAAE,EAAE;YACrB,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,IAAI;YACX,WAAW,EAAE,EAAE;YACf,kBAAkB,EAAE,EAAE;YACtB,OAAO,EAAE,EAAE;YACX,UAAU,EAAE,EAAE;YACd,aAAa,EAAE,EAAE;YACjB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,UAAU,EAAE,EAAE;SACf,CAAC;QACF,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,cAAc,EAAE,gBAAQ,CAAC,SAAS,CAAC,CAAC,aAAa,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QAClH,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC,EAAE,aAAa,EAAE,gBAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,CAAC;IACpH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,QAAQ,CAAI,UAAkB,EAAE,GAAW,EAAE,cAAuB;QACxE,OAAO,gBAAQ,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE,cAAc,IAAI,EAAE,CAAC,CAAM,CAAC;IACxG,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CAAc,UAAkB;QAC9C,OAAO,IAAI,0BAAe,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAC9D,CAAC;CACF;AAhID,gCAgIC"}
@@ -107,8 +107,6 @@ export declare class DBOSExecutor implements DBOSExecutorContext {
107
107
  readonly stepInfoMap: Map<string, StepRegInfo>;
108
108
  readonly procedureInfoMap: Map<string, ProcedureRegInfo>;
109
109
  readonly registeredOperations: Array<MethodRegistrationBase>;
110
- readonly pendingWorkflowMap: Map<string, Promise<unknown>>;
111
- readonly workflowCancellationMap: Map<string, boolean>;
112
110
  readonly telemetryCollector: TelemetryCollector;
113
111
  static readonly defaultNotificationTimeoutSec = 60;
114
112
  readonly debugMode: DebugMode;
@@ -178,7 +176,7 @@ export declare class DBOSExecutor implements DBOSExecutorContext {
178
176
  * Retrieve a handle for a workflow UUID.
179
177
  */
180
178
  retrieveWorkflow<R>(workflowID: string): WorkflowHandle<R>;
181
- runAsStep<T>(callback: () => Promise<T>, functionName: string, workflowID?: string, functionID?: number): Promise<T>;
179
+ runAsStep<T>(callback: () => Promise<T>, functionName: string, workflowID?: string, functionID?: number, childWfId?: string): Promise<T>;
182
180
  getWorkflowStatus(workflowID: string, callerID?: string, callerFN?: number): Promise<WorkflowStatus | null>;
183
181
  getWorkflows(input: GetWorkflowsInput): Promise<GetWorkflowsOutput>;
184
182
  getWorkflowQueue(input: GetWorkflowQueueInput): Promise<GetWorkflowQueueOutput>;
@@ -1 +1 @@
1
- {"version":3,"file":"dbos-executor.d.ts","sourceRoot":"","sources":["../../src/dbos-executor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dbos-executor.d.ts","sourceRoot":"","sources":["../../src/dbos-executor.ts"],"names":[],"mappings":"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"}
@@ -113,8 +113,6 @@ class DBOSExecutor {
113
113
  stepInfoMap = new Map();
114
114
  procedureInfoMap = new Map();
115
115
  registeredOperations = [];
116
- pendingWorkflowMap = new Map(); // Map from workflowUUID to workflow promise
117
- workflowCancellationMap = new Map(); // Map from workflowUUID to its cancellation status.
118
116
  telemetryCollector;
119
117
  static defaultNotificationTimeoutSec = 60;
120
118
  debugMode;
@@ -190,24 +188,12 @@ class DBOSExecutor {
190
188
  // TODO: make Prisma work with debugger proxy.
191
189
  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-require-imports
192
190
  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
193
- let dbUrl = `postgresql://${userDBConfig.user}:${userDBConfig.password}@${userDBConfig.host}:${userDBConfig.port}/${userDBConfig.database}`;
194
- const queryParams = {};
195
- if (userDBConfig.connectionTimeoutMillis) {
196
- queryParams['connect_timeout'] = userDBConfig.connectionTimeoutMillis;
197
- }
198
- if (userDBConfig.max) {
199
- queryParams['connection_limit'] = String(userDBConfig.max);
200
- }
201
- const queryString = new URLSearchParams(queryParams).toString();
202
- if (queryString) {
203
- dbUrl += `?${queryString}`;
204
- }
205
191
  this.userDatabase = new user_database_1.PrismaUserDatabase(
206
192
  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call
207
193
  new PrismaClient({
208
194
  datasources: {
209
195
  db: {
210
- url: dbUrl,
196
+ url: userDBConfig.connectionString,
211
197
  },
212
198
  },
213
199
  }));
@@ -220,16 +206,11 @@ class DBOSExecutor {
220
206
  this.userDatabase = new user_database_1.TypeORMDatabase(
221
207
  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
222
208
  new DataSourceExports.DataSource({
223
- type: 'postgres', // perhaps should move to config file
224
- host: userDBConfig.host,
225
- port: userDBConfig.port,
226
- username: userDBConfig.user,
227
- password: userDBConfig.password,
228
- database: userDBConfig.database,
209
+ type: 'postgres',
210
+ url: userDBConfig.connectionString,
211
+ connectTimeoutMS: userDBConfig.connectionTimeoutMillis,
229
212
  entities: this.typeormEntities,
230
- ssl: userDBConfig.ssl,
231
213
  poolSize: userDBConfig.max,
232
- connectTimeoutMS: userDBConfig.connectionTimeoutMillis,
233
214
  }));
234
215
  }
235
216
  catch (s) {
@@ -242,13 +223,8 @@ class DBOSExecutor {
242
223
  const knexConfig = {
243
224
  client: 'postgres',
244
225
  connection: {
245
- host: userDBConfig.host,
246
- port: userDBConfig.port,
247
- user: userDBConfig.user,
248
- password: userDBConfig.password,
249
- database: userDBConfig.database,
250
- ssl: userDBConfig.ssl,
251
- connectTimeout: userDBConfig.connectionTimeoutMillis,
226
+ connectionString: userDBConfig.connectionString,
227
+ connectionTimeoutMillis: userDBConfig.connectionTimeoutMillis,
252
228
  },
253
229
  pool: {
254
230
  min: 0,
@@ -419,10 +395,7 @@ class DBOSExecutor {
419
395
  }
420
396
  async destroy() {
421
397
  try {
422
- if (this.pendingWorkflowMap.size > 0) {
423
- this.logger.info('Waiting for pending workflows to finish.');
424
- await Promise.allSettled(this.pendingWorkflowMap.values());
425
- }
398
+ await this.systemDatabase.awaitRunningWorkflows();
426
399
  await this.systemDatabase.destroy();
427
400
  if (this.userDatabase) {
428
401
  await this.userDatabase.destroy();
@@ -597,8 +570,8 @@ class DBOSExecutor {
597
570
  throw new error_1.DBOSDebuggerError(`Failed to find inputs for workflow UUID ${workflowID}`);
598
571
  }
599
572
  // Make sure we use the same input.
600
- if (utils_1.DBOSJSON.stringify(args) !== utils_1.DBOSJSON.stringify(wfInputs)) {
601
- throw new error_1.DBOSDebuggerError(`Detected different inputs for workflow UUID ${workflowID}.\n Received: ${utils_1.DBOSJSON.stringify(args)}\n Original: ${utils_1.DBOSJSON.stringify(wfInputs)}`);
573
+ if (utils_1.DBOSJSON.stringify(args) !== wfInputs) {
574
+ throw new error_1.DBOSDebuggerError(`Detected different inputs for workflow UUID ${workflowID}.\n Received: ${utils_1.DBOSJSON.stringify(args)}\n Original: ${wfInputs}`);
602
575
  }
603
576
  status = wfStatus.status;
604
577
  }
@@ -610,14 +583,14 @@ class DBOSExecutor {
610
583
  return new workflow_1.RetrievedHandle(this.systemDatabase, cr.res.child, callerID, callerFunctionID);
611
584
  }
612
585
  }
613
- const ires = await this.systemDatabase.initWorkflowStatus(internalStatus, args);
586
+ const ires = await this.systemDatabase.initWorkflowStatus(internalStatus, utils_1.DBOSJSON.stringify(args));
614
587
  if (callerFunctionID !== undefined && callerID !== undefined) {
615
588
  await this.systemDatabase.recordOperationResult(callerID, callerFunctionID, {
616
589
  childWfId: workflowID,
617
590
  functionName: internalStatus.workflowName,
618
591
  }, true);
619
592
  }
620
- args = ires.args;
593
+ args = utils_1.DBOSJSON.parse(ires.serializedInputs);
621
594
  status = ires.status;
622
595
  await (0, debugpoint_1.debugTriggerPoint)(debugpoint_1.DEBUG_TRIGGER_WORKFLOW_ENQUEUE);
623
596
  }
@@ -658,7 +631,7 @@ class DBOSExecutor {
658
631
  wCtxt.span.setStatus({ code: api_1.SpanStatusCode.OK });
659
632
  }
660
633
  catch (err) {
661
- if (err instanceof error_1.DBOSWorkflowConflictUUIDError) {
634
+ if (err instanceof error_1.DBOSWorkflowConflictError) {
662
635
  // Retrieve the handle and wait for the result.
663
636
  const retrievedHandle = this.retrieveWorkflow(workflowID);
664
637
  result = await retrievedHandle.getResult();
@@ -704,16 +677,7 @@ class DBOSExecutor {
704
677
  if (this.isDebugging ||
705
678
  (status !== 'SUCCESS' && status !== 'ERROR' && (params.queueName === undefined || params.executeWorkflow))) {
706
679
  const workflowPromise = runWorkflow();
707
- // Need to await for the workflow and capture errors.
708
- const awaitWorkflowPromise = workflowPromise
709
- .catch((error) => {
710
- this.logger.debug('Captured error in awaitWorkflowPromise: ' + error);
711
- })
712
- .finally(() => {
713
- // Remove itself from pending workflow map.
714
- this.pendingWorkflowMap.delete(workflowID);
715
- });
716
- this.pendingWorkflowMap.set(workflowID, awaitWorkflowPromise);
680
+ this.systemDatabase.registerRunningWorkflow(workflowID, workflowPromise);
717
681
  // Return the normal handle that doesn't capture errors.
718
682
  return new workflow_1.InvokedHandle(this.systemDatabase, workflowPromise, workflowID, wf.name, callerID, callerFunctionID);
719
683
  }
@@ -790,7 +754,7 @@ class DBOSExecutor {
790
754
  catch (error) {
791
755
  if (isKeyConflict(error)) {
792
756
  // Serialization and primary key conflict (Postgres).
793
- throw new error_1.DBOSWorkflowConflictUUIDError(workflowUUID);
757
+ throw new error_1.DBOSWorkflowConflictError(workflowUUID);
794
758
  }
795
759
  else {
796
760
  throw error;
@@ -811,7 +775,7 @@ class DBOSExecutor {
811
775
  catch (error) {
812
776
  if (isKeyConflict(error)) {
813
777
  // Serialization and primary key conflict (Postgres).
814
- throw new error_1.DBOSWorkflowConflictUUIDError(workflowUUID);
778
+ throw new error_1.DBOSWorkflowConflictError(workflowUUID);
815
779
  }
816
780
  else {
817
781
  throw error;
@@ -847,9 +811,7 @@ class DBOSExecutor {
847
811
  if (txnInfo === undefined) {
848
812
  throw new error_1.DBOSNotRegisteredError(txn.name);
849
813
  }
850
- if (this.workflowCancellationMap.get(wfCtx.workflowUUID) === true) {
851
- throw new error_1.DBOSWorkflowCancelledError(wfCtx.workflowUUID);
852
- }
814
+ await this.systemDatabase.checkIfCanceled(wfCtx.workflowUUID);
853
815
  let retryWaitMillis = 1;
854
816
  const backoffFactor = 1.5;
855
817
  const maxRetryWaitMs = 2000; // Maximum wait 2 seconds.
@@ -863,9 +825,7 @@ class DBOSExecutor {
863
825
  isolationLevel: txnInfo.config.isolationLevel,
864
826
  }, wfCtx.span);
865
827
  while (true) {
866
- if (this.workflowCancellationMap.get(wfCtx.workflowUUID) === true) {
867
- throw new error_1.DBOSWorkflowCancelledError(wfCtx.workflowUUID);
868
- }
828
+ await this.systemDatabase.checkIfCanceled(wfCtx.workflowUUID);
869
829
  let txn_snapshot = 'invalid';
870
830
  const workflowUUID = wfCtx.workflowUUID;
871
831
  const wrappedTransaction = async (client) => {
@@ -999,9 +959,7 @@ class DBOSExecutor {
999
959
  if (procInfo === undefined) {
1000
960
  throw new error_1.DBOSNotRegisteredError(proc.name);
1001
961
  }
1002
- if (this.workflowCancellationMap.get(wfCtx.workflowUUID) === true) {
1003
- throw new error_1.DBOSWorkflowCancelledError(wfCtx.workflowUUID);
1004
- }
962
+ await this.systemDatabase.checkIfCanceled(wfCtx.workflowUUID);
1005
963
  const executeLocally = this.isDebugging || (procInfo.config.executeLocally ?? false);
1006
964
  const funcId = wfCtx.functionIDGetIncrement();
1007
965
  const span = this.tracer.startSpan(proc.name, {
@@ -1034,9 +992,7 @@ class DBOSExecutor {
1034
992
  const backoffFactor = 1.5;
1035
993
  const maxRetryWaitMs = 2000; // Maximum wait 2 seconds.
1036
994
  while (true) {
1037
- if (this.workflowCancellationMap.get(wfCtx.workflowUUID) === true) {
1038
- throw new error_1.DBOSWorkflowCancelledError(wfCtx.workflowUUID);
1039
- }
995
+ await this.systemDatabase.checkIfCanceled(wfCtx.workflowUUID);
1040
996
  let txn_snapshot = 'invalid';
1041
997
  const wrappedProcedure = async (client) => {
1042
998
  const ctxt = new procedure_1.StoredProcedureContextImpl(client, wfCtx, span, this.logger, funcId, proc.name);
@@ -1145,9 +1101,7 @@ class DBOSExecutor {
1145
1101
  if (this.isDebugging) {
1146
1102
  throw new error_1.DBOSDebuggerError("Can't invoke stored procedure in debug mode.");
1147
1103
  }
1148
- if (this.workflowCancellationMap.get(wfCtx.workflowUUID) === true) {
1149
- throw new error_1.DBOSWorkflowCancelledError(wfCtx.workflowUUID);
1150
- }
1104
+ await this.systemDatabase.checkIfCanceled(wfCtx.workflowUUID);
1151
1105
  const $jsonCtx = {
1152
1106
  request: wfCtx.request,
1153
1107
  authenticatedUser: wfCtx.authenticatedUser,
@@ -1238,9 +1192,7 @@ class DBOSExecutor {
1238
1192
  if (commInfo === undefined) {
1239
1193
  throw new error_1.DBOSNotRegisteredError(stepFn.name);
1240
1194
  }
1241
- if (this.workflowCancellationMap.get(wfCtx.workflowUUID) === true) {
1242
- throw new error_1.DBOSWorkflowCancelledError(wfCtx.workflowUUID);
1243
- }
1195
+ await this.systemDatabase.checkIfCanceled(wfCtx.workflowUUID);
1244
1196
  const funcID = wfCtx.functionIDGetIncrement();
1245
1197
  const maxRetryIntervalSec = 3600; // Maximum retry interval: 1 hour
1246
1198
  const span = this.tracer.startSpan(stepFn.name, {
@@ -1283,9 +1235,7 @@ class DBOSExecutor {
1283
1235
  }
1284
1236
  while (result === exports.dbosNull && numAttempts++ < ctxt.maxAttempts) {
1285
1237
  try {
1286
- if (this.workflowCancellationMap.get(wfCtx.workflowUUID) === true) {
1287
- throw new error_1.DBOSWorkflowCancelledError(wfCtx.workflowUUID);
1288
- }
1238
+ await this.systemDatabase.checkIfCanceled(wfCtx.workflowUUID);
1289
1239
  let cresult;
1290
1240
  if (commInfo.registration.passContext) {
1291
1241
  await (0, context_1.runWithStepContext)(ctxt, numAttempts, async () => {
@@ -1382,7 +1332,7 @@ class DBOSExecutor {
1382
1332
  retrieveWorkflow(workflowID) {
1383
1333
  return new workflow_1.RetrievedHandle(this.systemDatabase, workflowID);
1384
1334
  }
1385
- async runAsStep(callback, functionName, workflowID, functionID) {
1335
+ async runAsStep(callback, functionName, workflowID, functionID, childWfId) {
1386
1336
  if (workflowID !== undefined && functionID !== undefined) {
1387
1337
  const res = await this.systemDatabase.getOperationResult(workflowID, functionID);
1388
1338
  if (res.res !== undefined) {
@@ -1395,13 +1345,13 @@ class DBOSExecutor {
1395
1345
  try {
1396
1346
  const output = await callback();
1397
1347
  if (workflowID !== undefined && functionID !== undefined) {
1398
- await this.systemDatabase.recordOperationResult(workflowID, functionID, { serialOutput: utils_1.DBOSJSON.stringify(output), functionName }, true);
1348
+ await this.systemDatabase.recordOperationResult(workflowID, functionID, { serialOutput: utils_1.DBOSJSON.stringify(output), functionName, childWfId }, true);
1399
1349
  }
1400
1350
  return output;
1401
1351
  }
1402
1352
  catch (e) {
1403
1353
  if (workflowID !== undefined && functionID !== undefined) {
1404
- await this.systemDatabase.recordOperationResult(workflowID, functionID, { serialError: utils_1.DBOSJSON.stringify((0, serialize_error_1.serializeError)(e)), functionName }, false);
1354
+ await this.systemDatabase.recordOperationResult(workflowID, functionID, { serialError: utils_1.DBOSJSON.stringify((0, serialize_error_1.serializeError)(e)), functionName, childWfId }, false);
1405
1355
  }
1406
1356
  throw e;
1407
1357
  }
@@ -1526,11 +1476,12 @@ class DBOSExecutor {
1526
1476
  }
1527
1477
  async executeWorkflowUUID(workflowID, startNewWorkflow = false) {
1528
1478
  const wfStatus = await this.systemDatabase.getWorkflowStatus(workflowID);
1529
- const inputs = await this.systemDatabase.getWorkflowInputs(workflowID);
1530
- if (!inputs || !wfStatus) {
1479
+ const sInputs = await this.systemDatabase.getWorkflowInputs(workflowID);
1480
+ if (!sInputs || !wfStatus) {
1531
1481
  this.logger.error(`Failed to find inputs for workflowUUID: ${workflowID}`);
1532
1482
  throw new error_1.DBOSError(`Failed to find inputs for workflow UUID: ${workflowID}`);
1533
1483
  }
1484
+ const inputs = utils_1.DBOSJSON.parse(sInputs);
1534
1485
  const parentCtx = this.#getRecoveryContext(workflowID, wfStatus);
1535
1486
  const { wfInfo, configuredInst } = this.getWorkflowInfoByStatus(wfStatus);
1536
1487
  // If starting a new workflow, assign a new UUID. Otherwise, use the workflow's original UUID.
@@ -1542,9 +1493,7 @@ class DBOSExecutor {
1542
1493
  configuredInstance: configuredInst,
1543
1494
  queueName: wfStatus.queueName,
1544
1495
  executeWorkflow: true,
1545
- },
1546
- // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
1547
- ...inputs);
1496
+ }, ...inputs);
1548
1497
  }
1549
1498
  // Should be temporary workflows. Parse the name of the workflow.
1550
1499
  const wfName = wfStatus.workflowName;
@@ -1566,9 +1515,7 @@ class DBOSExecutor {
1566
1515
  configuredInstance: clsInst,
1567
1516
  queueName: wfStatus.queueName,
1568
1517
  executeWorkflow: true,
1569
- }, undefined, undefined,
1570
- // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
1571
- ...inputs);
1518
+ }, undefined, undefined, ...inputs);
1572
1519
  }
1573
1520
  else if (nameArr[1] === exports.TempWorkflowType.step) {
1574
1521
  const { commInfo, clsInst } = this.getStepInfoByNames(wfStatus.workflowClassName, nameArr[2], wfStatus.workflowConfigName);
@@ -1582,9 +1529,7 @@ class DBOSExecutor {
1582
1529
  configuredInstance: clsInst,
1583
1530
  queueName: wfStatus.queueName, // Probably null
1584
1531
  executeWorkflow: true,
1585
- }, undefined, undefined,
1586
- // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
1587
- ...inputs);
1532
+ }, undefined, undefined, ...inputs);
1588
1533
  }
1589
1534
  else if (nameArr[1] === exports.TempWorkflowType.send) {
1590
1535
  temp_workflow = async (ctxt, ...args) => {
@@ -1596,9 +1541,7 @@ class DBOSExecutor {
1596
1541
  tempWfType: exports.TempWorkflowType.send,
1597
1542
  queueName: wfStatus.queueName,
1598
1543
  executeWorkflow: true,
1599
- },
1600
- // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
1601
- ...inputs);
1544
+ }, ...inputs);
1602
1545
  }
1603
1546
  else {
1604
1547
  this.logger.error(`Unrecognized temporary workflow! UUID ${workflowID}, name ${wfName}`);
@@ -1624,7 +1567,6 @@ class DBOSExecutor {
1624
1567
  async cancelWorkflow(workflowID) {
1625
1568
  await this.systemDatabase.cancelWorkflow(workflowID);
1626
1569
  this.logger.info(`Cancelling workflow ${workflowID}`);
1627
- this.workflowCancellationMap.set(workflowID, true);
1628
1570
  }
1629
1571
  async getWorkflowSteps(workflowID) {
1630
1572
  const outputs = await this.systemDatabase.getAllOperationResults(workflowID);
@@ -1647,7 +1589,6 @@ class DBOSExecutor {
1647
1589
  }
1648
1590
  async resumeWorkflow(workflowID) {
1649
1591
  await this.systemDatabase.resumeWorkflow(workflowID);
1650
- this.workflowCancellationMap.delete(workflowID);
1651
1592
  return await this.executeWorkflowUUID(workflowID, false);
1652
1593
  }
1653
1594
  logRegisteredHTTPUrls() {