@dbos-inc/dbos-sdk 3.6.3-preview → 3.6.5-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.
Files changed (119) hide show
  1. package/README.md +1 -1
  2. package/dist/src/{httpServer/server.d.ts → adminserver.d.ts} +6 -15
  3. package/dist/src/adminserver.d.ts.map +1 -0
  4. package/dist/src/{httpServer/server.js → adminserver.js} +28 -311
  5. package/dist/src/adminserver.js.map +1 -0
  6. package/dist/src/{dbos-runtime → cli}/cli.d.ts +1 -1
  7. package/dist/src/cli/cli.d.ts.map +1 -0
  8. package/dist/src/{dbos-runtime → cli}/cli.js +3 -12
  9. package/dist/src/cli/cli.js.map +1 -0
  10. package/dist/src/cli/commands.d.ts.map +1 -0
  11. package/dist/src/cli/commands.js.map +1 -0
  12. package/dist/src/cli/docker_pg_helper.d.ts.map +1 -0
  13. package/dist/src/cli/docker_pg_helper.js.map +1 -0
  14. package/dist/src/cli/migrate.d.ts +3 -0
  15. package/dist/src/cli/migrate.d.ts.map +1 -0
  16. package/dist/src/{dbos-runtime → cli}/migrate.js +1 -29
  17. package/dist/src/cli/migrate.js.map +1 -0
  18. package/dist/src/client.d.ts +2 -4
  19. package/dist/src/client.d.ts.map +1 -1
  20. package/dist/src/client.js +6 -19
  21. package/dist/src/client.js.map +1 -1
  22. package/dist/src/conductor/conductor.js +1 -1
  23. package/dist/src/conductor/conductor.js.map +1 -1
  24. package/dist/src/{dbos-runtime/config.d.ts → config.d.ts} +2 -8
  25. package/dist/src/config.d.ts.map +1 -0
  26. package/dist/src/{dbos-runtime/config.js → config.js} +11 -69
  27. package/dist/src/config.js.map +1 -0
  28. package/dist/src/context.d.ts +0 -3
  29. package/dist/src/context.d.ts.map +1 -1
  30. package/dist/src/context.js.map +1 -1
  31. package/dist/src/datasource.js +1 -1
  32. package/dist/src/datasource.js.map +1 -1
  33. package/dist/src/dbos-executor.d.ts +2 -27
  34. package/dist/src/dbos-executor.d.ts.map +1 -1
  35. package/dist/src/dbos-executor.js +14 -765
  36. package/dist/src/dbos-executor.js.map +1 -1
  37. package/dist/src/dbos.d.ts +3 -176
  38. package/dist/src/dbos.d.ts.map +1 -1
  39. package/dist/src/dbos.js +12 -378
  40. package/dist/src/dbos.js.map +1 -1
  41. package/dist/src/decorators.d.ts +3 -21
  42. package/dist/src/decorators.d.ts.map +1 -1
  43. package/dist/src/decorators.js +12 -46
  44. package/dist/src/decorators.js.map +1 -1
  45. package/dist/src/error.d.ts +0 -11
  46. package/dist/src/error.d.ts.map +1 -1
  47. package/dist/src/error.js +1 -21
  48. package/dist/src/error.js.map +1 -1
  49. package/dist/src/index.d.ts +4 -12
  50. package/dist/src/index.d.ts.map +1 -1
  51. package/dist/src/index.js +6 -43
  52. package/dist/src/index.js.map +1 -1
  53. package/dist/src/utils.d.ts +0 -1
  54. package/dist/src/utils.d.ts.map +1 -1
  55. package/dist/src/utils.js +18 -20
  56. package/dist/src/utils.js.map +1 -1
  57. package/dist/src/wfqueue.d.ts +0 -2
  58. package/dist/src/wfqueue.d.ts.map +1 -1
  59. package/dist/src/wfqueue.js.map +1 -1
  60. package/dist/src/workflow.d.ts +0 -8
  61. package/dist/src/workflow.d.ts.map +1 -1
  62. package/dist/src/workflow.js.map +1 -1
  63. package/dist/src/{dbos-runtime/workflow_management.d.ts → workflow_management.d.ts} +4 -6
  64. package/dist/src/workflow_management.d.ts.map +1 -0
  65. package/dist/src/{dbos-runtime/workflow_management.js → workflow_management.js} +5 -26
  66. package/dist/src/workflow_management.js.map +1 -0
  67. package/dist/tsconfig.tsbuildinfo +1 -1
  68. package/package.json +4 -11
  69. package/dist/schemas/user_db_schema.d.ts +0 -15
  70. package/dist/schemas/user_db_schema.d.ts.map +0 -1
  71. package/dist/schemas/user_db_schema.js +0 -33
  72. package/dist/schemas/user_db_schema.js.map +0 -1
  73. package/dist/src/dbos-runtime/cli.d.ts.map +0 -1
  74. package/dist/src/dbos-runtime/cli.js.map +0 -1
  75. package/dist/src/dbos-runtime/commands.d.ts.map +0 -1
  76. package/dist/src/dbos-runtime/commands.js.map +0 -1
  77. package/dist/src/dbos-runtime/config.d.ts.map +0 -1
  78. package/dist/src/dbos-runtime/config.js.map +0 -1
  79. package/dist/src/dbos-runtime/docker_pg_helper.d.ts.map +0 -1
  80. package/dist/src/dbos-runtime/docker_pg_helper.js.map +0 -1
  81. package/dist/src/dbos-runtime/migrate.d.ts +0 -3
  82. package/dist/src/dbos-runtime/migrate.d.ts.map +0 -1
  83. package/dist/src/dbos-runtime/migrate.js.map +0 -1
  84. package/dist/src/dbos-runtime/workflow_management.d.ts.map +0 -1
  85. package/dist/src/dbos-runtime/workflow_management.js.map +0 -1
  86. package/dist/src/httpServer/handler.d.ts +0 -13
  87. package/dist/src/httpServer/handler.d.ts.map +0 -1
  88. package/dist/src/httpServer/handler.js +0 -25
  89. package/dist/src/httpServer/handler.js.map +0 -1
  90. package/dist/src/httpServer/handlerTypes.d.ts +0 -14
  91. package/dist/src/httpServer/handlerTypes.d.ts.map +0 -1
  92. package/dist/src/httpServer/handlerTypes.js +0 -22
  93. package/dist/src/httpServer/handlerTypes.js.map +0 -1
  94. package/dist/src/httpServer/middleware.d.ts +0 -74
  95. package/dist/src/httpServer/middleware.d.ts.map +0 -1
  96. package/dist/src/httpServer/middleware.js +0 -108
  97. package/dist/src/httpServer/middleware.js.map +0 -1
  98. package/dist/src/httpServer/server.d.ts.map +0 -1
  99. package/dist/src/httpServer/server.js.map +0 -1
  100. package/dist/src/paramdecorators.d.ts +0 -39
  101. package/dist/src/paramdecorators.d.ts.map +0 -1
  102. package/dist/src/paramdecorators.js +0 -365
  103. package/dist/src/paramdecorators.js.map +0 -1
  104. package/dist/src/procedure.d.ts +0 -18
  105. package/dist/src/procedure.d.ts.map +0 -1
  106. package/dist/src/procedure.js +0 -3
  107. package/dist/src/procedure.js.map +0 -1
  108. package/dist/src/transaction.d.ts +0 -19
  109. package/dist/src/transaction.d.ts.map +0 -1
  110. package/dist/src/transaction.js +0 -11
  111. package/dist/src/transaction.js.map +0 -1
  112. package/dist/src/user_database.d.ts +0 -176
  113. package/dist/src/user_database.d.ts.map +0 -1
  114. package/dist/src/user_database.js +0 -540
  115. package/dist/src/user_database.js.map +0 -1
  116. /package/dist/src/{dbos-runtime → cli}/commands.d.ts +0 -0
  117. /package/dist/src/{dbos-runtime → cli}/commands.js +0 -0
  118. /package/dist/src/{dbos-runtime → cli}/docker_pg_helper.d.ts +0 -0
  119. /package/dist/src/{dbos-runtime → cli}/docker_pg_helper.js +0 -0
package/README.md CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  [![GitHub Actions](https://img.shields.io/github/actions/workflow/status/dbos-inc/dbos-transact-ts/on_push.yml?query=branch%3Amain)](https://github.com/dbos-inc/dbos-transact-ts/actions/workflows/on_push.yml)
4
4
  [![NPM Version](https://img.shields.io/npm/v/%40dbos-inc%2Fdbos-sdk)](https://www.npmjs.com/package/@dbos-inc/dbos-sdk)
5
- [![Node Current](https://img.shields.io/node/v/dbos)](https://www.npmjs.com/package/@dbos-inc/dbos-sdk)
5
+ [![Node Current](https://img.shields.io/node/v/%40dbos-inc%2Fdbos-sdk)](https://www.npmjs.com/package/@dbos-inc/dbos-sdk)
6
6
  [![License (MIT)](https://img.shields.io/github/license/dbos-inc/dbos-transact-ts.svg?v)](LICENSE)
7
7
  [![Join Discord](https://img.shields.io/badge/Discord-Join%20Chat-5865F2?logo=discord&logoColor=white)](https://discord.com/invite/jsmC6pXGgX)
8
8
 
@@ -1,11 +1,9 @@
1
1
  /// <reference types="koa__router" />
2
- /// <reference types="node" />
3
- /// <reference types="node/http" />
4
2
  import Koa from 'koa';
5
3
  import Router from '@koa/router';
6
- import { DBOSExecutor } from '../dbos-executor';
7
- import { GlobalLogger } from '../telemetry/logs';
8
- import { QueueParameters } from '../wfqueue';
4
+ import { DBOSExecutor } from './dbos-executor';
5
+ import { GlobalLogger } from './telemetry/logs';
6
+ import { QueueParameters } from './wfqueue';
9
7
  export type QueueMetadataResponse = QueueParameters & {
10
8
  name: string;
11
9
  };
@@ -15,14 +13,12 @@ export declare const HealthUrl = "/dbos-healthz";
15
13
  export declare const PerfUrl = "/dbos-perf";
16
14
  export declare const DeactivateUrl = "/deactivate";
17
15
  export declare const WorkflowQueuesMetadataUrl = "/dbos-workflow-queues-metadata";
18
- export declare class DBOSHttpServer {
16
+ export declare class DBOSAdminServer {
19
17
  readonly dbosExec: DBOSExecutor;
20
- readonly app: Koa;
21
18
  readonly adminApp: Koa;
22
- readonly applicationRouter: Router;
23
19
  readonly logger: GlobalLogger;
24
20
  static nRegisteredEndpoints: number;
25
- static instance?: DBOSHttpServer;
21
+ static instance?: DBOSAdminServer;
26
22
  /**
27
23
  * Create a Koa app.
28
24
  * @param dbosExec User pass in an DBOS workflow executor instance.
@@ -30,7 +26,6 @@ export declare class DBOSHttpServer {
30
26
  */
31
27
  constructor(dbosExec: DBOSExecutor);
32
28
  static setupAdminApp(dbosExec: DBOSExecutor): Koa;
33
- appListen(port: number): Promise<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | undefined>;
34
29
  static checkPortAvailabilityIPv4Ipv6(port: number, logger: GlobalLogger): Promise<void>;
35
30
  static checkPortAvailability(port: number, host: string): Promise<void>;
36
31
  /**
@@ -108,9 +103,5 @@ export declare class DBOSHttpServer {
108
103
  * Get detailed information about a specific workflow by ID.
109
104
  */
110
105
  static registerGetWorkflowEndpoint(dbosExec: DBOSExecutor, router: Router): void;
111
- /**
112
- * Register decorated functions as HTTP endpoints.
113
- */
114
- static registerDecoratedEndpoints(dbosExec: DBOSExecutor, router: Router, app: Koa): void;
115
106
  }
116
- //# sourceMappingURL=server.d.ts.map
107
+ //# sourceMappingURL=adminserver.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"adminserver.d.ts","sourceRoot":"","sources":["../../src/adminserver.ts"],"names":[],"mappings":";AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,MAAM,MAAM,aAAa,CAAC;AAKjC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIhD,OAAO,EAAE,eAAe,EAAiB,MAAM,WAAW,CAAC;AAK3D,MAAM,MAAM,qBAAqB,GAAG,eAAe,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvE,eAAO,MAAM,kBAAkB,yBAAyB,CAAC;AACzD,eAAO,MAAM,mBAAmB,4BAA4B,CAAC;AAC7D,eAAO,MAAM,SAAS,kBAAkB,CAAC;AACzC,eAAO,MAAM,OAAO,eAAe,CAAC;AACpC,eAAO,MAAM,aAAa,gBAAgB,CAAC;AAC3C,eAAO,MAAM,yBAAyB,mCAAmC,CAAC;AAE1E,qBAAa,eAAe;IAWd,QAAQ,CAAC,QAAQ,EAAE,YAAY;IAV3C,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAK;IACxC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAa;IAE9C;;;;OAIG;gBACkB,QAAQ,EAAE,YAAY;IAM3C,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,YAAY,GAAG,GAAG;WA0BpC,6BAA6B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY;WAkChE,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB7E;;OAEG;IACH,MAAM,CAAC,sBAAsB,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAUpE;;OAEG;IACH,MAAM,CAAC,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAoB3E;;;OAGG;IACH,MAAM,CAAC,wBAAwB,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAkBtE;;;OAGG;IACH,MAAM,CAAC,oBAAoB,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAalE;;;;OAIG;IACH,MAAM,CAAC,aAAa,UAAS;IAC7B,MAAM,CAAC,0BAA0B,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAgBxE,MAAM,CAAC,8BAA8B,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAa5E,MAAM,CAAC,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAY3E;;;;OAIG;IAEH,MAAM,CAAC,8BAA8B,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAW5E;;;;OAIG;IAEH,MAAM,CAAC,8BAA8B,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IA2B5E;;;;OAIG;IAEH,MAAM,CAAC,+BAA+B,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAe7E;;;;OAIG;IAEH,MAAM,CAAC,4BAA4B,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IA6C1E;;;;OAIG;IAEH,MAAM,CAAC,iCAAiC,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAkB/E;;;;OAIG;IACH,MAAM,CAAC,6BAA6B,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IA8C3E;;;;OAIG;IACH,MAAM,CAAC,mCAAmC,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;IAsCjF;;;;OAIG;IACH,MAAM,CAAC,2BAA2B,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM;CAgB1E"}
@@ -26,39 +26,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.DBOSHttpServer = exports.WorkflowQueuesMetadataUrl = exports.DeactivateUrl = exports.PerfUrl = exports.HealthUrl = exports.WorkflowRecoveryUrl = exports.WorkflowUUIDHeader = void 0;
29
+ exports.DBOSAdminServer = exports.WorkflowQueuesMetadataUrl = exports.DeactivateUrl = exports.PerfUrl = exports.HealthUrl = exports.WorkflowRecoveryUrl = exports.WorkflowUUIDHeader = void 0;
30
30
  const koa_1 = __importDefault(require("koa"));
31
31
  const router_1 = __importDefault(require("@koa/router"));
32
32
  const bodyparser_1 = require("@koa/bodyparser");
33
33
  const cors_1 = __importDefault(require("@koa/cors"));
34
- const handlerTypes_1 = require("./handlerTypes");
35
- const error_1 = require("../error");
36
- const dbos_executor_1 = require("../dbos-executor");
37
- const middleware_1 = require("./middleware");
38
- const api_1 = require("@opentelemetry/api");
34
+ const error_1 = require("./error");
39
35
  const net = __importStar(require("net"));
40
36
  const perf_hooks_1 = require("perf_hooks");
41
- const utils_1 = require("../utils");
42
- const context_1 = require("../context");
43
- const wfqueue_1 = require("../wfqueue");
37
+ const utils_1 = require("./utils");
38
+ const wfqueue_1 = require("./wfqueue");
44
39
  const serialize_error_1 = require("serialize-error");
45
- const workflow_management_1 = require("../dbos-runtime/workflow_management");
46
- const core_1 = require("@opentelemetry/core");
47
- const dbos_1 = require("../dbos");
48
- const protocol = __importStar(require("../conductor/protocol"));
49
- const decorators_1 = require("../decorators");
40
+ const workflow_management_1 = require("./workflow_management");
41
+ const protocol = __importStar(require("./conductor/protocol"));
50
42
  exports.WorkflowUUIDHeader = 'dbos-idempotency-key';
51
43
  exports.WorkflowRecoveryUrl = '/dbos-workflow-recovery';
52
44
  exports.HealthUrl = '/dbos-healthz';
53
45
  exports.PerfUrl = '/dbos-perf';
54
- // FIXME this should be /dbos-deactivate to be consistent with other endpoints.
55
46
  exports.DeactivateUrl = '/deactivate';
56
47
  exports.WorkflowQueuesMetadataUrl = '/dbos-workflow-queues-metadata';
57
- class DBOSHttpServer {
48
+ class DBOSAdminServer {
58
49
  dbosExec;
59
- app;
60
50
  adminApp;
61
- applicationRouter;
62
51
  logger;
63
52
  static nRegisteredEndpoints = 0;
64
53
  static instance = undefined;
@@ -69,13 +58,9 @@ class DBOSHttpServer {
69
58
  */
70
59
  constructor(dbosExec) {
71
60
  this.dbosExec = dbosExec;
72
- this.applicationRouter = new router_1.default();
73
61
  this.logger = dbosExec.logger;
74
- this.app = new koa_1.default();
75
- this.adminApp = DBOSHttpServer.setupAdminApp(this.dbosExec);
76
- DBOSHttpServer.registerDecoratedEndpoints(this.dbosExec, this.applicationRouter, this.app);
77
- this.app.use(this.applicationRouter.routes()).use(this.applicationRouter.allowedMethods());
78
- DBOSHttpServer.instance = this;
62
+ this.adminApp = DBOSAdminServer.setupAdminApp(this.dbosExec);
63
+ DBOSAdminServer.instance = this;
79
64
  }
80
65
  static setupAdminApp(dbosExec) {
81
66
  const adminRouter = new router_1.default();
@@ -83,33 +68,24 @@ class DBOSHttpServer {
83
68
  adminApp.use((0, bodyparser_1.bodyParser)());
84
69
  adminApp.use((0, cors_1.default)());
85
70
  // Register HTTP endpoints.
86
- DBOSHttpServer.registerHealthEndpoint(dbosExec, adminRouter);
87
- DBOSHttpServer.registerRecoveryEndpoint(dbosExec, adminRouter);
88
- DBOSHttpServer.registerPerfEndpoint(dbosExec, adminRouter);
89
- DBOSHttpServer.registerDeactivateEndpoint(dbosExec, adminRouter);
90
- DBOSHttpServer.registerCancelWorkflowEndpoint(dbosExec, adminRouter);
91
- DBOSHttpServer.registerResumeWorkflowEndpoint(dbosExec, adminRouter);
92
- DBOSHttpServer.registerRestartWorkflowEndpoint(dbosExec, adminRouter);
93
- DBOSHttpServer.registerQueueMetadataEndpoint(dbosExec, adminRouter);
94
- DBOSHttpServer.registerListWorkflowStepsEndpoint(dbosExec, adminRouter);
95
- DBOSHttpServer.registerListWorkflowsEndpoint(dbosExec, adminRouter);
96
- DBOSHttpServer.registerListQueuedWorkflowsEndpoint(dbosExec, adminRouter);
97
- DBOSHttpServer.registerGetWorkflowEndpoint(dbosExec, adminRouter);
98
- DBOSHttpServer.registerForkWorkflowEndpoint(dbosExec, adminRouter);
99
- DBOSHttpServer.registerGarbageCollectEndpoint(dbosExec, adminRouter);
100
- DBOSHttpServer.registerGlobalTimeoutEndpoint(dbosExec, adminRouter);
71
+ DBOSAdminServer.registerHealthEndpoint(dbosExec, adminRouter);
72
+ DBOSAdminServer.registerRecoveryEndpoint(dbosExec, adminRouter);
73
+ DBOSAdminServer.registerPerfEndpoint(dbosExec, adminRouter);
74
+ DBOSAdminServer.registerDeactivateEndpoint(dbosExec, adminRouter);
75
+ DBOSAdminServer.registerCancelWorkflowEndpoint(dbosExec, adminRouter);
76
+ DBOSAdminServer.registerResumeWorkflowEndpoint(dbosExec, adminRouter);
77
+ DBOSAdminServer.registerRestartWorkflowEndpoint(dbosExec, adminRouter);
78
+ DBOSAdminServer.registerQueueMetadataEndpoint(dbosExec, adminRouter);
79
+ DBOSAdminServer.registerListWorkflowStepsEndpoint(dbosExec, adminRouter);
80
+ DBOSAdminServer.registerListWorkflowsEndpoint(dbosExec, adminRouter);
81
+ DBOSAdminServer.registerListQueuedWorkflowsEndpoint(dbosExec, adminRouter);
82
+ DBOSAdminServer.registerGetWorkflowEndpoint(dbosExec, adminRouter);
83
+ DBOSAdminServer.registerForkWorkflowEndpoint(dbosExec, adminRouter);
84
+ DBOSAdminServer.registerGarbageCollectEndpoint(dbosExec, adminRouter);
85
+ DBOSAdminServer.registerGlobalTimeoutEndpoint(dbosExec, adminRouter);
101
86
  adminApp.use(adminRouter.routes()).use(adminRouter.allowedMethods());
102
87
  return adminApp;
103
88
  }
104
- async appListen(port) {
105
- await DBOSHttpServer.checkPortAvailabilityIPv4Ipv6(port, this.logger);
106
- const appServer = DBOSHttpServer.nRegisteredEndpoints === 0
107
- ? undefined
108
- : this.app.listen(port, () => {
109
- this.logger.info(`DBOS Server is running at http://localhost:${port}`);
110
- });
111
- return appServer;
112
- }
113
89
  static async checkPortAvailabilityIPv4Ipv6(port, logger) {
114
90
  try {
115
91
  await this.checkPortAvailability(port, '127.0.0.1');
@@ -226,9 +202,9 @@ class DBOSHttpServer {
226
202
  static isDeactivated = false;
227
203
  static registerDeactivateEndpoint(dbosExec, router) {
228
204
  const deactivateHandler = async (koaCtxt, koaNext) => {
229
- if (!DBOSHttpServer.isDeactivated) {
205
+ if (!DBOSAdminServer.isDeactivated) {
230
206
  dbosExec.logger.info(`Deactivating DBOS executor ${utils_1.globalParams.executorID} with version ${utils_1.globalParams.appVersion}. This executor will complete existing workflows but will not create new workflows.`);
231
- DBOSHttpServer.isDeactivated = true;
207
+ DBOSAdminServer.isDeactivated = true;
232
208
  }
233
209
  await dbosExec.deactivateEventReceivers(false);
234
210
  koaCtxt.body = 'Deactivated';
@@ -473,265 +449,6 @@ class DBOSHttpServer {
473
449
  router.get(getWorkflowUrl, getWorkflowHandler);
474
450
  dbosExec.logger.debug(`DBOS Server Registered Get Workflow GET ${getWorkflowUrl}`);
475
451
  }
476
- /**
477
- * Register decorated functions as HTTP endpoints.
478
- */
479
- static registerDecoratedEndpoints(dbosExec, router, app) {
480
- const globalMiddlewares = new Set();
481
- // Register user declared endpoints, wrap around the endpoint with request parsing and response.
482
- DBOSHttpServer.nRegisteredEndpoints = 0;
483
- (0, decorators_1.getAllRegisteredFunctions)().forEach((registeredOperation) => {
484
- const ro = registeredOperation;
485
- if (!ro.apiURL)
486
- return;
487
- if (ro.isInstance) {
488
- dbosExec.logger.warn(`Operation ${ro.className}/${ro.name} is registered with an endpoint (${ro.apiURL}) but cannot be invoked.`);
489
- return;
490
- }
491
- ++DBOSHttpServer.nRegisteredEndpoints;
492
- const defaults = ro.defaults;
493
- // Check if we need to apply a custom CORS
494
- if (defaults.koaCors) {
495
- router.all(ro.apiURL, defaults.koaCors); // Use router.all to register with all methods including preflight requests
496
- }
497
- else {
498
- if (dbosExec.config.http?.cors_middleware ?? true) {
499
- router.all(ro.apiURL, (0, cors_1.default)({
500
- credentials: dbosExec.config.http?.credentials ?? true,
501
- origin: (o) => {
502
- const whitelist = dbosExec.config.http?.allowed_origins;
503
- const origin = o.request.header.origin ?? '*';
504
- if (whitelist && whitelist.length > 0) {
505
- return whitelist.includes(origin) ? origin : '';
506
- }
507
- return o.request.header.origin || '*';
508
- },
509
- allowMethods: 'GET,HEAD,PUT,POST,DELETE,PATCH,OPTIONS',
510
- allowHeaders: ['Origin', 'X-Requested-With', 'Content-Type', 'Accept', 'Authorization'],
511
- }));
512
- }
513
- }
514
- // Check if we need to apply any Koa global middleware.
515
- if (defaults?.koaGlobalMiddlewares) {
516
- defaults.koaGlobalMiddlewares.forEach((koaMiddleware) => {
517
- if (globalMiddlewares.has(koaMiddleware)) {
518
- return;
519
- }
520
- dbosExec.logger.debug(`DBOS Server applying middleware ${koaMiddleware.name} globally`);
521
- globalMiddlewares.add(koaMiddleware);
522
- app.use(koaMiddleware);
523
- });
524
- }
525
- // Wrapper function that parses request and send response.
526
- const wrappedHandler = async (koaCtxt, koaNext) => {
527
- const requestID = (0, middleware_1.getOrGenerateRequestID)(koaCtxt.request.headers);
528
- koaCtxt.set(middleware_1.RequestIDHeader, requestID);
529
- const httpTracer = new core_1.W3CTraceContextPropagator();
530
- const extractedSpanContext = api_1.trace.getSpanContext(httpTracer.extract(api_1.ROOT_CONTEXT, koaCtxt.request.headers, api_1.defaultTextMapGetter));
531
- let span;
532
- const spanAttributes = {
533
- operationType: dbos_executor_1.OperationType.HANDLER,
534
- requestID: requestID,
535
- requestIP: koaCtxt.request.ip,
536
- requestURL: koaCtxt.request.url,
537
- requestMethod: koaCtxt.request.method,
538
- };
539
- if (extractedSpanContext === undefined) {
540
- span = dbosExec.tracer.startSpan(koaCtxt.url, spanAttributes);
541
- }
542
- else {
543
- extractedSpanContext.isRemote = true;
544
- span = dbosExec.tracer.startSpanWithContext(extractedSpanContext, koaCtxt.url, spanAttributes);
545
- }
546
- const dctx = {
547
- request: {
548
- headers: koaCtxt.request.headers,
549
- rawHeaders: koaCtxt.req.rawHeaders,
550
- params: koaCtxt.params,
551
- body: koaCtxt.request.body,
552
- rawBody: koaCtxt.request.rawBody,
553
- query: koaCtxt.request.query,
554
- querystring: koaCtxt.request.querystring,
555
- url: koaCtxt.request.url,
556
- ip: koaCtxt.request.ip,
557
- requestID: requestID,
558
- },
559
- koaContext: koaCtxt,
560
- operationType: dbos_executor_1.OperationType.HANDLER,
561
- };
562
- try {
563
- // Check for auth first
564
- if (defaults?.authMiddleware) {
565
- await api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), async () => {
566
- await (0, context_1.runWithTopContext)(dctx, async () => {
567
- const res = await defaults.authMiddleware({
568
- name: ro.name,
569
- requiredRole: ro.getRequiredRoles(),
570
- koaContext: koaCtxt,
571
- logger: dbosExec.ctxLogger,
572
- span,
573
- query: (query, ...args) => {
574
- return dbosExec.queryUserDbFunction(query, ...args);
575
- },
576
- });
577
- if (res) {
578
- dctx.authenticatedUser = res.authenticatedUser;
579
- dctx.authenticatedRoles = res.authenticatedRoles;
580
- }
581
- });
582
- });
583
- }
584
- // Parse the arguments.
585
- const args = [];
586
- ro.args.forEach((marg) => {
587
- marg.argSource = marg.argSource ?? handlerTypes_1.ArgSources.DEFAULT; // Assign a default value.
588
- let foundArg = undefined;
589
- const isQueryMethod = ro.apiType === handlerTypes_1.APITypes.GET || ro.apiType === handlerTypes_1.APITypes.DELETE;
590
- const isBodyMethod = ro.apiType === handlerTypes_1.APITypes.POST || ro.apiType === handlerTypes_1.APITypes.PUT || ro.apiType === handlerTypes_1.APITypes.PATCH;
591
- if ((isQueryMethod && marg.argSource === handlerTypes_1.ArgSources.DEFAULT) || marg.argSource === handlerTypes_1.ArgSources.QUERY) {
592
- foundArg = koaCtxt.request.query[marg.name];
593
- if (foundArg !== undefined) {
594
- args.push(foundArg);
595
- }
596
- else {
597
- if (marg.argSource === handlerTypes_1.ArgSources.DEFAULT && koaCtxt.request.body) {
598
- // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
599
- foundArg = koaCtxt.request.body[marg.name];
600
- if (foundArg !== undefined) {
601
- args.push(foundArg);
602
- }
603
- }
604
- }
605
- }
606
- else if ((isBodyMethod && marg.argSource === handlerTypes_1.ArgSources.DEFAULT) || marg.argSource === handlerTypes_1.ArgSources.BODY) {
607
- if (koaCtxt.request.body) {
608
- // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
609
- foundArg = koaCtxt.request.body[marg.name];
610
- if (foundArg !== undefined) {
611
- args.push(foundArg);
612
- }
613
- }
614
- if (!foundArg && marg.argSource === handlerTypes_1.ArgSources.DEFAULT) {
615
- foundArg = koaCtxt.request.query[marg.name];
616
- if (foundArg !== undefined) {
617
- args.push(foundArg);
618
- }
619
- }
620
- }
621
- // Try to parse the argument from the URL if nothing found.
622
- if (foundArg === undefined) {
623
- // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
624
- args.push(koaCtxt.params[marg.name]);
625
- }
626
- //console.log(`found arg ${marg.name} ${idx} ${args[idx-1]}`);
627
- });
628
- // Extract workflow ID from headers (if any).
629
- // We pass in the specified workflow ID to workflows and transactions, but doesn't restrict how handlers use it.
630
- dctx.idAssignedForNextWorkflow = koaCtxt.get(exports.WorkflowUUIDHeader);
631
- // Finally, invoke the transaction/workflow/plain function and properly set HTTP response.
632
- // If functions return successfully and hasn't set the body, we set the body to the function return value. The status code will be automatically set to 200 or 204 (if the body is null/undefined).
633
- // In case of an exception:
634
- // - If a client-side error is thrown, we return 400.
635
- // - If an error contains a `status` field, we return the specified status code.
636
- // - Otherwise, we return 500.
637
- // configuredInstance is currently null; we don't allow configured handlers now.
638
- const wfParams = {
639
- workflowUUID: dctx.idAssignedForNextWorkflow,
640
- configuredInstance: null,
641
- };
642
- await api_1.context.with(api_1.trace.setSpan(api_1.context.active(), span), async () => {
643
- await (0, context_1.runWithTopContext)(dctx, async () => {
644
- if (ro.txnConfig) {
645
- koaCtxt.body = await dbosExec.runTransactionTempWF(ro.registeredFunction, wfParams, ...args);
646
- }
647
- else if (ro.workflowConfig) {
648
- koaCtxt.body = await (await dbosExec.workflow(ro.registeredFunction, wfParams, ...args)).getResult();
649
- }
650
- else if (ro.stepConfig) {
651
- koaCtxt.body = await dbosExec.runStepTempWF(ro.registeredFunction, wfParams, ...args);
652
- }
653
- else {
654
- // Directly invoke the handler code.
655
- const cresult = await ro.invoke(undefined, [...args]);
656
- const retValue = cresult;
657
- // Set the body to the return value unless the body is already set by the handler.
658
- if (koaCtxt.body === undefined) {
659
- koaCtxt.body = retValue;
660
- }
661
- }
662
- });
663
- });
664
- span?.setStatus({ code: api_1.SpanStatusCode.OK });
665
- }
666
- catch (e) {
667
- if (e instanceof Error) {
668
- const annotated_e = e;
669
- if (annotated_e.dbos_already_logged !== true) {
670
- dbos_1.DBOS.logger.error(e);
671
- }
672
- span?.setStatus({ code: api_1.SpanStatusCode.ERROR, message: e.message });
673
- let st = e?.status || 500;
674
- if ((0, error_1.isDataValidationError)(e)) {
675
- st = 400; // Set to 400: client-side error.
676
- }
677
- koaCtxt.status = st;
678
- koaCtxt.message = e.message;
679
- koaCtxt.body = {
680
- status: st,
681
- message: e.message,
682
- details: e,
683
- };
684
- }
685
- else {
686
- // FIXME we should have a standard, user friendly message for errors that are not instances of Error.
687
- // using stringify() will not produce a pretty output, because our format function uses stringify() too.
688
- dbos_1.DBOS.logger.error(utils_1.DBOSJSON.stringify(e));
689
- span?.setStatus({ code: api_1.SpanStatusCode.ERROR, message: utils_1.DBOSJSON.stringify(e) });
690
- koaCtxt.body = e;
691
- koaCtxt.status = 500;
692
- }
693
- }
694
- finally {
695
- httpTracer.inject(api_1.trace.setSpanContext(api_1.ROOT_CONTEXT, span.spanContext()), {
696
- context: koaCtxt,
697
- }, {
698
- set: (carrier, key, value) => {
699
- carrier.context.set(key, value);
700
- },
701
- });
702
- dbosExec.tracer.endSpan(span);
703
- await koaNext();
704
- }
705
- };
706
- // Actually register the endpoint.
707
- // Middleware functions are applied directly to router verb methods to prevent duplicate calls.
708
- const routeMiddlewares = [defaults.koaBodyParser ?? (0, bodyparser_1.bodyParser)()].concat(defaults.koaMiddlewares ?? []);
709
- switch (ro.apiType) {
710
- case handlerTypes_1.APITypes.GET:
711
- router.get(ro.apiURL, ...routeMiddlewares, wrappedHandler);
712
- dbosExec.logger.debug(`DBOS Server Registered GET ${ro.apiURL}`);
713
- break;
714
- case handlerTypes_1.APITypes.POST:
715
- router.post(ro.apiURL, ...routeMiddlewares, wrappedHandler);
716
- dbosExec.logger.debug(`DBOS Server Registered POST ${ro.apiURL}`);
717
- break;
718
- case handlerTypes_1.APITypes.PUT:
719
- router.put(ro.apiURL, ...routeMiddlewares, wrappedHandler);
720
- dbosExec.logger.debug(`DBOS Server Registered PUT ${ro.apiURL}`);
721
- break;
722
- case handlerTypes_1.APITypes.PATCH:
723
- router.patch(ro.apiURL, ...routeMiddlewares, wrappedHandler);
724
- dbosExec.logger.debug(`DBOS Server Registered PATCH ${ro.apiURL}`);
725
- break;
726
- case handlerTypes_1.APITypes.DELETE:
727
- router.delete(ro.apiURL, ...routeMiddlewares, wrappedHandler);
728
- dbosExec.logger.debug(`DBOS Server Registered DELETE ${ro.apiURL}`);
729
- break;
730
- default:
731
- (0, utils_1.exhaustiveCheckGuard)(ro.apiType);
732
- }
733
- });
734
- }
735
452
  }
736
- exports.DBOSHttpServer = DBOSHttpServer;
737
- //# sourceMappingURL=server.js.map
453
+ exports.DBOSAdminServer = DBOSAdminServer;
454
+ //# sourceMappingURL=adminserver.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"adminserver.js","sourceRoot":"","sources":["../../src/adminserver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAsB;AACtB,yDAAiC;AACjC,gDAA6C;AAC7C,qDAA6B;AAE7B,mCAA6D;AAG7D,yCAA2B;AAC3B,2CAAyC;AACzC,mCAAiD;AACjD,uCAA2D;AAC3D,qDAAiD;AACjD,+DAAsD;AACtD,+DAAiD;AAIpC,QAAA,kBAAkB,GAAG,sBAAsB,CAAC;AAC5C,QAAA,mBAAmB,GAAG,yBAAyB,CAAC;AAChD,QAAA,SAAS,GAAG,eAAe,CAAC;AAC5B,QAAA,OAAO,GAAG,YAAY,CAAC;AACvB,QAAA,aAAa,GAAG,aAAa,CAAC;AAC9B,QAAA,yBAAyB,GAAG,gCAAgC,CAAC;AAE1E,MAAa,eAAe;IAWL;IAVZ,QAAQ,CAAM;IACd,MAAM,CAAe;IAC9B,MAAM,CAAC,oBAAoB,GAAW,CAAC,CAAC;IACxC,MAAM,CAAC,QAAQ,GAAqB,SAAS,CAAC;IAE9C;;;;OAIG;IACH,YAAqB,QAAsB;QAAtB,aAAQ,GAAR,QAAQ,CAAc;QACzC,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC7D,eAAe,CAAC,QAAQ,GAAG,IAAI,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,QAAsB;QACzC,MAAM,WAAW,GAAG,IAAI,gBAAM,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAI,aAAG,EAAE,CAAC;QAC3B,QAAQ,CAAC,GAAG,CAAC,IAAA,uBAAU,GAAE,CAAC,CAAC;QAC3B,QAAQ,CAAC,GAAG,CAAC,IAAA,cAAI,GAAE,CAAC,CAAC;QAErB,2BAA2B;QAC3B,eAAe,CAAC,sBAAsB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC9D,eAAe,CAAC,wBAAwB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAChE,eAAe,CAAC,oBAAoB,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC5D,eAAe,CAAC,0BAA0B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAClE,eAAe,CAAC,8BAA8B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACtE,eAAe,CAAC,8BAA8B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACtE,eAAe,CAAC,+BAA+B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACvE,eAAe,CAAC,6BAA6B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACrE,eAAe,CAAC,iCAAiC,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACzE,eAAe,CAAC,6BAA6B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACrE,eAAe,CAAC,mCAAmC,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC3E,eAAe,CAAC,2BAA2B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACnE,eAAe,CAAC,4BAA4B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACpE,eAAe,CAAC,8BAA8B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACtE,eAAe,CAAC,6BAA6B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACrE,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;QACrE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,IAAY,EAAE,MAAoB;QAC3E,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,KAA8B,CAAC;YAC3C,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC9B,MAAM,CAAC,IAAI,CACT,QAAQ,IAAI,oGAAoG,GAAG,CAAC,OAAO,EAAE,CAC9H,CAAC;gBACF,MAAM,KAAK,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CACT,kFAAkF,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,EAAE,CAC7G,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,KAA8B,CAAC;YAC3C,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC9B,MAAM,CAAC,IAAI,CACT,QAAQ,IAAI,8FAA8F,GAAG,CAAC,OAAO,EAAE,CACxH,CAAC;gBACF,MAAM,KAAK,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CACT,4EAA4E,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,EAAE,CACvG,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,IAAY,EAAE,IAAY;QAC3D,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YAChC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAA4B,EAAE,EAAE;gBAClD,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;gBAC1B,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE;gBAC7C,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,sBAAsB,CAAC,QAAsB,EAAE,MAAc;QAClE,qDAAqD;QACrD,MAAM,aAAa,GAAG,KAAK,EAAE,OAAoB,EAAE,OAAiB,EAAE,EAAE;YACtE,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;YACzB,MAAM,OAAO,EAAE,CAAC;QAClB,CAAC,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,iBAAS,EAAE,aAAa,CAAC,CAAC;QACrC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,iBAAS,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,6BAA6B,CAAC,QAAsB,EAAE,MAAc;QACzE,MAAM,oBAAoB,GAAG,KAAK,EAAE,OAAoB,EAAE,OAAiB,EAAE,EAAE;YAC7E,MAAM,iBAAiB,GAA4B,EAAE,CAAC;YACtD,uBAAa,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;gBAC7C,iBAAiB,CAAC,IAAI,CAAC;oBACrB,IAAI,EAAE,EAAE;oBACR,WAAW,EAAE,CAAC,CAAC,WAAW;oBAC1B,iBAAiB,EAAE,CAAC,CAAC,iBAAiB;oBACtC,SAAS,EAAE,CAAC,CAAC,SAAS;iBACvB,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAC;YAEjC,MAAM,OAAO,EAAE,CAAC;QAClB,CAAC,CAAC;QAEF,MAAM,CAAC,GAAG,CAAC,iCAAyB,EAAE,oBAAoB,CAAC,CAAC;QAC5D,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,iCAAyB,EAAE,CAAC,CAAC;IAClG,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,wBAAwB,CAAC,QAAsB,EAAE,MAAc;QACpE,qDAAqD;QACrD,MAAM,eAAe,GAAG,KAAK,EAAE,OAAoB,EAAE,OAAiB,EAAE,EAAE;YACxE,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,IAAgB,CAAC;YACrD,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;YACtF,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;YAE3E,kDAAkD;YAClD,OAAO,CAAC,IAAI,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAChG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAqC,CAAC,KAAK,CAAC,CACzG,CAAC;YACF,MAAM,OAAO,EAAE,CAAC;QAClB,CAAC,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,2BAAmB,EAAE,eAAe,CAAC,CAAC;QAClD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,2BAAmB,EAAE,CAAC,CAAC;IACvF,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,oBAAoB,CAAC,QAAsB,EAAE,MAAc;QAChE,IAAI,OAAO,GAAG,wBAAW,CAAC,oBAAoB,EAAE,CAAC;QACjD,MAAM,WAAW,GAAG,KAAK,EAAE,OAAoB,EAAE,OAAiB,EAAE,EAAE;YACpE,MAAM,OAAO,GAAG,wBAAW,CAAC,oBAAoB,EAAE,CAAC;YACnD,MAAM,GAAG,GAAG,wBAAW,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC/D,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC;YACnB,OAAO,GAAG,OAAO,CAAC;YAClB,MAAM,OAAO,EAAE,CAAC;QAClB,CAAC,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,eAAO,EAAE,WAAW,CAAC,CAAC;QACjC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,eAAO,EAAE,CAAC,CAAC;IACtE,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,MAAM,CAAC,0BAA0B,CAAC,QAAsB,EAAE,MAAc;QACtE,MAAM,iBAAiB,GAAG,KAAK,EAAE,OAAoB,EAAE,OAAiB,EAAE,EAAE;YAC1E,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC;gBACnC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAClB,8BAA8B,oBAAY,CAAC,UAAU,iBAAiB,oBAAY,CAAC,UAAU,qFAAqF,CACnL,CAAC;gBACF,eAAe,CAAC,aAAa,GAAG,IAAI,CAAC;YACvC,CAAC;YACD,MAAM,QAAQ,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;YAC/C,OAAO,CAAC,IAAI,GAAG,aAAa,CAAC;YAC7B,MAAM,OAAO,EAAE,CAAC;QAClB,CAAC,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,qBAAa,EAAE,iBAAiB,CAAC,CAAC;QAC7C,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,qBAAa,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,CAAC,8BAA8B,CAAC,QAAsB,EAAE,MAAc;QAC1E,MAAM,GAAG,GAAG,uBAAuB,CAAC;QACpC,MAAM,OAAO,GAAG,KAAK,EAAE,OAAoB,EAAE,EAAE;YAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAG5B,CAAC;YACF,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,yBAAyB,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAClG,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED,MAAM,CAAC,6BAA6B,CAAC,QAAsB,EAAE,MAAc;QACzE,MAAM,GAAG,GAAG,sBAAsB,CAAC;QACnC,MAAM,OAAO,GAAG,KAAK,EAAE,OAAoB,EAAE,EAAE;YAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAE5B,CAAC;YACF,MAAM,IAAA,mCAAa,EAAC,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAC;YAC7E,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IAEH,MAAM,CAAC,8BAA8B,CAAC,QAAsB,EAAE,MAAc;QAC1E,MAAM,iBAAiB,GAAG,gCAAgC,CAAC;QAC3D,MAAM,qBAAqB,GAAG,KAAK,EAAE,OAAoB,EAAE,EAAE;YAC3D,MAAM,UAAU,GAAI,OAAO,CAAC,MAAkC,CAAC,WAAW,CAAC;YAC3E,MAAM,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YAC1C,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;QACtD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,iBAAiB,EAAE,CAAC,CAAC;IAC5F,CAAC;IAED;;;;OAIG;IAEH,MAAM,CAAC,8BAA8B,CAAC,QAAsB,EAAE,MAAc;QAC1E,MAAM,iBAAiB,GAAG,gCAAgC,CAAC;QAC3D,MAAM,qBAAqB,GAAG,KAAK,EAAE,OAAoB,EAAE,EAAE;YAC3D,MAAM,UAAU,GAAI,OAAO,CAAC,MAAkC,CAAC,WAAW,CAAC;YAC3E,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,UAAU,EAAE,CAAC,CAAC;YACjE,IAAI,CAAC;gBACH,MAAM,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,YAAY,GAAG,EAAE,CAAC;gBACtB,IAAI,CAAC,YAAY,iBAAS,EAAE,CAAC;oBAC3B,YAAY,GAAG,CAAC,CAAC,OAAO,CAAC;gBAC3B,CAAC;qBAAM,CAAC;oBACN,YAAY,GAAG,eAAe,CAAC;gBACjC,CAAC;gBACD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,UAAU,KAAK,YAAY,EAAE,CAAC,CAAC;gBAChF,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;gBACrB,OAAO,CAAC,IAAI,GAAG;oBACb,KAAK,EAAE,2BAA2B,UAAU,KAAK,YAAY,EAAE;iBAChE,CAAC;gBACF,OAAO;YACT,CAAC;YACD,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;QACtD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,iBAAiB,EAAE,CAAC,CAAC;IAC5F,CAAC;IAED;;;;OAIG;IAEH,MAAM,CAAC,+BAA+B,CAAC,QAAsB,EAAE,MAAc;QAC3E,MAAM,iBAAiB,GAAG,iCAAiC,CAAC;QAC5D,MAAM,sBAAsB,GAAG,KAAK,EAAE,OAAoB,EAAE,EAAE;YAC5D,MAAM,UAAU,GAAI,OAAO,CAAC,MAAkC,CAAC,WAAW,CAAC;YAC3E,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,UAAU,gBAAgB,CAAC,CAAC;YACzE,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;YAC9D,OAAO,CAAC,IAAI,GAAG;gBACb,WAAW,EAAE,UAAU;aACxB,CAAC;YACF,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,sBAAsB,CAAC,CAAC;QACvD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,iBAAiB,EAAE,CAAC,CAAC;IAC5F,CAAC;IAED;;;;OAIG;IAEH,MAAM,CAAC,4BAA4B,CAAC,QAAsB,EAAE,MAAc;QACxE,MAAM,iBAAiB,GAAG,8BAA8B,CAAC;QACzD,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAAoB,EAAE,EAAE;YACzD,MAAM,UAAU,GAAI,OAAO,CAAC,MAAkC,CAAC,WAAW,CAAC;YAC3E,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAK5B,CAAC;YACF,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;gBAClC,MAAM,IAAI,+BAAuB,CAAC,oCAAoC,CAAC,CAAC;YAC1E,CAAC;YAED,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,UAAU,cAAc,IAAI,CAAC,UAAU,gBAAgB,CAAC,CAAC;YACnG,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE;oBAC1E,aAAa,EAAE,IAAI,CAAC,eAAe;oBACnC,kBAAkB,EAAE,IAAI,CAAC,mBAAmB;oBAC5C,SAAS,EAAE,IAAI,CAAC,UAAU;iBAC3B,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,GAAG;oBACb,WAAW,EAAE,UAAU;iBACxB,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,YAAY,GAAG,EAAE,CAAC;gBACtB,IAAI,CAAC,YAAY,iBAAS,EAAE,CAAC;oBAC3B,YAAY,GAAG,CAAC,CAAC,OAAO,CAAC;gBAC3B,CAAC;qBAAM,CAAC;oBACN,YAAY,GAAG,eAAe,CAAC;gBACjC,CAAC;gBACD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,UAAU,KAAK,YAAY,EAAE,CAAC,CAAC;gBAC/E,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;gBACrB,OAAO,CAAC,IAAI,GAAG;oBACb,KAAK,EAAE,0BAA0B,UAAU,KAAK,YAAY,EAAE;iBAC/D,CAAC;gBACF,OAAO;YACT,CAAC;YACD,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,UAAU,gBAAgB,CAAC,CAAC;YACrE,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;QACpD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,iBAAiB,EAAE,CAAC,CAAC;IAC5F,CAAC;IAED;;;;OAIG;IAEH,MAAM,CAAC,iCAAiC,CAAC,QAAsB,EAAE,MAAc;QAC7E,MAAM,gBAAgB,GAAG,+BAA+B,CAAC;QACzD,MAAM,oBAAoB,GAAG,KAAK,EAAE,OAAoB,EAAE,EAAE;YAC1D,MAAM,UAAU,GAAI,OAAO,CAAC,MAAkC,CAAC,WAAW,CAAC;YAC3E,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;YAC3D,OAAO,CAAC,IAAI,GAAG,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACnC,aAAa,EAAE,IAAI,CAAC,IAAI;gBACxB,WAAW,EAAE,IAAI,CAAC,UAAU;gBAC5B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;gBACjE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,gBAAQ,CAAC,SAAS,CAAC,IAAA,gCAAc,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;gBAC9E,iBAAiB,EAAE,IAAI,CAAC,eAAe;aACxC,CAAC,CAAC,CAAC;YACJ,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;QACnD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,kDAAkD,gBAAgB,EAAE,CAAC,CAAC;IAC9F,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,6BAA6B,CAAC,QAAsB,EAAE,MAAc;QACzE,MAAM,gBAAgB,GAAG,YAAY,CAAC;QACtC,MAAM,oBAAoB,GAAG,KAAK,EAAE,OAAoB,EAAE,EAAE;YAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAc5B,CAAC;YAEF,wDAAwD;YACxD,MAAM,KAAK,GAAsB;gBAC/B,WAAW,EAAE,IAAI,CAAC,cAAc;gBAChC,YAAY,EAAE,IAAI,CAAC,aAAa;gBAChC,iBAAiB,EAAE,IAAI,CAAC,kBAAkB;gBAC1C,SAAS,EAAE,IAAI,CAAC,UAAU;gBAC1B,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,kBAAkB,EAAE,IAAI,CAAC,mBAAmB;gBAC5C,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gBAC3C,SAAS,EAAE,IAAI,CAAC,UAAU,IAAI,KAAK,EAAE,mBAAmB;gBACxD,UAAU,EAAE,IAAI,CAAC,WAAW,IAAI,KAAK,EAAE,mBAAmB;aAC3D,CAAC;YAEF,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAEtD,uCAAuC;YACvC,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC;YACvE,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;QACpD,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,8CAA8C,gBAAgB,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,mCAAmC,CAAC,QAAsB,EAAE,MAAc;QAC/E,MAAM,sBAAsB,GAAG,SAAS,CAAC;QACzC,MAAM,0BAA0B,GAAG,KAAK,EAAE,OAAoB,EAAE,EAAE;YAChE,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,IAU5B,CAAC;YAEF,8DAA8D;YAC9D,MAAM,KAAK,GAA4B;gBACrC,YAAY,EAAE,IAAI,CAAC,aAAa;gBAChC,SAAS,EAAE,IAAI,CAAC,UAAU;gBAC1B,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,SAAS,EAAE,IAAI,CAAC,UAAU;gBAC1B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,QAAQ,EAAE,IAAI,CAAC,SAAS;gBACxB,SAAS,EAAE,IAAI,CAAC,UAAU,IAAI,KAAK,EAAE,mBAAmB;aACzD,CAAC;YAEF,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAE5D,uCAAuC;YACvC,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC;YACvE,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;QACvB,CAAC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,0BAA0B,CAAC,CAAC;QAChE,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,qDAAqD,sBAAsB,EAAE,CAAC,CAAC;IACvG,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,2BAA2B,CAAC,QAAsB,EAAE,MAAc;QACvE,MAAM,cAAc,GAAG,yBAAyB,CAAC;QACjD,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAAoB,EAAE,EAAE;YACxD,MAAM,UAAU,GAAI,OAAO,CAAC,MAAkC,CAAC,WAAW,CAAC;YAC3E,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;YAC9D,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,CAAC,IAAI,GAAG,IAAI,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACtD,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC;gBACrB,OAAO,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,YAAY,UAAU,YAAY,EAAE,CAAC;YAC/D,CAAC;QACH,CAAC,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAC/C,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,cAAc,EAAE,CAAC,CAAC;IACrF,CAAC;;AA7dH,0CA8dC"}
@@ -1,5 +1,5 @@
1
1
  #!/usr/bin/env node
2
2
  import { DBOSConfigInternal } from '../dbos-executor';
3
3
  import { GlobalLogger } from '../telemetry/logs';
4
- export declare function runAndLog(migrationCommands: string[], config: DBOSConfigInternal, action: (migrationCommands: string[], databaseUrl: string, systemDatabaseUrl: string, logger: GlobalLogger) => Promise<number> | number): Promise<void>;
4
+ export declare function runAndLog(migrationCommands: string[], config: DBOSConfigInternal, action: (migrationCommands: string[], systemDatabaseUrl: string, logger: GlobalLogger) => Promise<number> | number): Promise<void>;
5
5
  //# sourceMappingURL=cli.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../src/cli/cli.ts"],"names":[],"mappings":";AAUA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAiajD,wBAAsB,SAAS,CAC7B,iBAAiB,EAAE,MAAM,EAAE,EAC3B,MAAM,EAAE,kBAAkB,EAC1B,MAAM,EAAE,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,iBAAiB,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,iBA+BnH"}
@@ -2,7 +2,7 @@
2
2
  "use strict";
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
4
  exports.runAndLog = void 0;
5
- const config_1 = require("./config");
5
+ const config_1 = require("../config");
6
6
  const commander_1 = require("commander");
7
7
  const migrate_1 = require("./migrate");
8
8
  const logs_1 = require("../telemetry/logs");
@@ -181,7 +181,6 @@ workflowCommands
181
181
  };
182
182
  const urls = getDatabaseURLs(options.sysDbUrl);
183
183
  const client = await __1.DBOSClient.create({
184
- databaseUrl: urls.applicationDatabaseURL,
185
184
  systemDatabaseUrl: urls.systemDatabaseURL,
186
185
  });
187
186
  try {
@@ -200,7 +199,6 @@ workflowCommands
200
199
  .action(async (workflowID, options) => {
201
200
  const urls = getDatabaseURLs(options.sysDbUrl);
202
201
  const client = await __1.DBOSClient.create({
203
- databaseUrl: urls.applicationDatabaseURL,
204
202
  systemDatabaseUrl: urls.systemDatabaseURL,
205
203
  });
206
204
  try {
@@ -219,7 +217,6 @@ workflowCommands
219
217
  .action(async (workflowID, options) => {
220
218
  const urls = getDatabaseURLs(options.sysDbUrl);
221
219
  const client = await __1.DBOSClient.create({
222
- databaseUrl: urls.applicationDatabaseURL,
223
220
  systemDatabaseUrl: urls.systemDatabaseURL,
224
221
  });
225
222
  try {
@@ -238,7 +235,6 @@ workflowCommands
238
235
  .action(async (workflowID, options) => {
239
236
  const urls = getDatabaseURLs(options.sysDbUrl);
240
237
  const client = await __1.DBOSClient.create({
241
- databaseUrl: urls.applicationDatabaseURL,
242
238
  systemDatabaseUrl: urls.systemDatabaseURL,
243
239
  });
244
240
  try {
@@ -256,7 +252,6 @@ workflowCommands
256
252
  .action(async (workflowID, options) => {
257
253
  const urls = getDatabaseURLs(options.sysDbUrl);
258
254
  const client = await __1.DBOSClient.create({
259
- databaseUrl: urls.applicationDatabaseURL,
260
255
  systemDatabaseUrl: urls.systemDatabaseURL,
261
256
  });
262
257
  try {
@@ -277,7 +272,6 @@ workflowCommands
277
272
  .action(async (workflowID, options) => {
278
273
  const urls = getDatabaseURLs(options.sysDbUrl);
279
274
  const client = await __1.DBOSClient.create({
280
- databaseUrl: urls.applicationDatabaseURL,
281
275
  systemDatabaseUrl: urls.systemDatabaseURL,
282
276
  });
283
277
  try {
@@ -317,7 +311,6 @@ queueCommands
317
311
  };
318
312
  const urls = getDatabaseURLs(options.sysDbUrl);
319
313
  const client = await __1.DBOSClient.create({
320
- databaseUrl: urls.applicationDatabaseURL,
321
314
  systemDatabaseUrl: urls.systemDatabaseURL,
322
315
  });
323
316
  try {
@@ -340,17 +333,15 @@ if (!process.argv.slice(2).length) {
340
333
  function getDatabaseURLs(systemDatabaseURL) {
341
334
  if (process.env.DBOS__CLOUD === 'true') {
342
335
  return {
343
- applicationDatabaseURL: process.env.DBOS_DATABASE_URL,
344
336
  systemDatabaseURL: process.env.DBOS_SYSTEM_DATABASE_URL,
345
337
  };
346
338
  }
347
339
  if (systemDatabaseURL) {
348
- return { applicationDatabaseURL: undefined, systemDatabaseURL: systemDatabaseURL };
340
+ return { systemDatabaseURL: systemDatabaseURL };
349
341
  }
350
342
  if ((0, node_fs_1.existsSync)(config_1.dbosConfigFilePath)) {
351
343
  const config = (0, config_1.readConfigFile)();
352
344
  return {
353
- applicationDatabaseURL: config.database_url,
354
345
  systemDatabaseURL: (0, config_1.getSystemDatabaseUrl)(config),
355
346
  };
356
347
  }
@@ -383,7 +374,7 @@ async function runAndLog(migrationCommands, config, action) {
383
374
  }
384
375
  let returnCode = 1;
385
376
  try {
386
- returnCode = await action(migrationCommands, config.databaseUrl, config.systemDatabaseUrl, logger);
377
+ returnCode = await action(migrationCommands, config.systemDatabaseUrl, logger);
387
378
  }
388
379
  catch (e) {
389
380
  logger.error(e);
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/cli/cli.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../../src/cli/commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CA0CjF"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../src/cli/commands.ts"],"names":[],"mappings":";;;AAAA,iDAAsC;AAGtC,sEAAsE;AACtE,SAAgB,UAAU,CAAC,OAAe,EAAE,MAAoB;IAC9D,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,0DAA0D;QAC1D,MAAM,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEjD,wBAAwB;QACxB,MAAM,KAAK,GAAG,IAAA,qBAAK,EAAC,UAAU,EAAE,IAAI,EAAE;YACpC,KAAK,EAAE,SAAS,EAAE,gCAAgC;YAClD,KAAK,EAAE,IAAI,EAAE,yCAAyC;SACvD,CAAC,CAAC;QAEH,6CAA6C;QAC7C,MAAM,YAAY,GAAG,CAAC,MAAsB,EAAE,EAAE;YAC9C,MAAM,CAAC,KAAK,CAAC,YAAY,MAAM,6BAA6B,CAAC,CAAC;YAC9D,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;gBACd,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;QACrD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEnD,2BAA2B;QAC3B,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YAChC,IAAI,IAAI,KAAK,CAAC,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC9D,MAAM,CAAC,IAAI,CAAC,yCAAyC,IAAI,IAAI,SAAS,cAAc,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC;gBAC3G,OAAO,CAAC,CAAC,CAAC,CAAC;YACb,CAAC;iBAAM,CAAC;gBACN,MAAM,QAAQ,GAAG,4BAA4B,IAAI,IAAI,SAAS,cAAc,MAAM,IAAI,SAAS,EAAE,CAAC;gBAClG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACvB,2EAA2E;gBAC3E,MAAM,CAAC,IAAI,CAAC,CAAC;YACf,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,+BAA+B;QAC/B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC1B,MAAM,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1D,2EAA2E;YAC3E,MAAM,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA1CD,gCA0CC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"docker_pg_helper.d.ts","sourceRoot":"","sources":["../../../src/cli/docker_pg_helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAsB,MAAM,SAAS,CAAC;AAM3D,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AAExD,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAUtD;AAED;;;;;;;;;;;GAWG;AAEH,wBAAsB,aAAa,kBAuBlC;AAqED;;;;;GAKG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,CA+BrD"}