@dbos-inc/dbos-sdk 3.0.43-preview → 3.0.45-preview.g34e483ff45
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/dbos-config.schema.json +50 -15
- package/dist/dbos-config.schema.json +50 -15
- package/dist/src/client.d.ts.map +1 -1
- package/dist/src/client.js +5 -11
- package/dist/src/client.js.map +1 -1
- package/dist/src/dbos-executor.d.ts +10 -10
- package/dist/src/dbos-executor.d.ts.map +1 -1
- package/dist/src/dbos-executor.js +8 -9
- package/dist/src/dbos-executor.js.map +1 -1
- package/dist/src/dbos-runtime/cli.d.ts +1 -15
- package/dist/src/dbos-runtime/cli.d.ts.map +1 -1
- package/dist/src/dbos-runtime/cli.js +74 -106
- package/dist/src/dbos-runtime/cli.js.map +1 -1
- package/dist/src/dbos-runtime/config.d.ts +29 -74
- package/dist/src/dbos-runtime/config.d.ts.map +1 -1
- package/dist/src/dbos-runtime/config.js +163 -462
- package/dist/src/dbos-runtime/config.js.map +1 -1
- package/dist/src/dbos-runtime/debug.d.ts.map +1 -1
- package/dist/src/dbos-runtime/debug.js +2 -1
- package/dist/src/dbos-runtime/debug.js.map +1 -1
- package/dist/src/dbos-runtime/migrate.d.ts +1 -3
- package/dist/src/dbos-runtime/migrate.d.ts.map +1 -1
- package/dist/src/dbos-runtime/migrate.js +16 -36
- package/dist/src/dbos-runtime/migrate.js.map +1 -1
- package/dist/src/dbos-runtime/reset.d.ts +2 -2
- package/dist/src/dbos-runtime/reset.d.ts.map +1 -1
- package/dist/src/dbos-runtime/reset.js +5 -2
- package/dist/src/dbos-runtime/reset.js.map +1 -1
- package/dist/src/dbos-runtime/runtime.js +1 -1
- package/dist/src/dbos-runtime/runtime.js.map +1 -1
- package/dist/src/dbos.d.ts +1 -7
- package/dist/src/dbos.d.ts.map +1 -1
- package/dist/src/dbos.js +17 -39
- package/dist/src/dbos.js.map +1 -1
- package/dist/src/index.d.ts +1 -1
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +3 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/system_database.d.ts +5 -6
- package/dist/src/system_database.d.ts.map +1 -1
- package/dist/src/system_database.js +24 -25
- package/dist/src/system_database.js.map +1 -1
- package/dist/src/telemetry/exporters.d.ts +2 -2
- package/dist/src/telemetry/exporters.d.ts.map +1 -1
- package/dist/src/telemetry/exporters.js +12 -15
- package/dist/src/telemetry/exporters.js.map +1 -1
- package/dist/src/user_database.d.ts +1 -1
- package/dist/src/user_database.d.ts.map +1 -1
- package/dist/src/user_database.js +11 -14
- package/dist/src/user_database.js.map +1 -1
- package/dist/src/utils.d.ts +2 -1
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +20 -4
- package/dist/src/utils.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/dist/src/dbos-runtime/configure.d.ts +0 -2
- package/dist/src/dbos-runtime/configure.d.ts.map +0 -1
- package/dist/src/dbos-runtime/configure.js +0 -42
- package/dist/src/dbos-runtime/configure.js.map +0 -1
package/dbos-config.schema.json
CHANGED
|
@@ -14,25 +14,29 @@
|
|
|
14
14
|
"enum": ["node", "python"]
|
|
15
15
|
},
|
|
16
16
|
"database_url": {
|
|
17
|
-
"type":
|
|
17
|
+
"type": "string",
|
|
18
18
|
"description": "The URL of the application database"
|
|
19
19
|
},
|
|
20
|
+
"system_database_url": {
|
|
21
|
+
"type": "string",
|
|
22
|
+
"description": "The URL of the system database"
|
|
23
|
+
},
|
|
20
24
|
"database": {
|
|
21
25
|
"type": "object",
|
|
22
26
|
"additionalProperties": false,
|
|
23
27
|
"properties": {
|
|
24
28
|
"hostname": {
|
|
25
|
-
"type":
|
|
29
|
+
"type": "string",
|
|
26
30
|
"description": "The hostname or IP address of the application database. DEPRECATED: Use database_url instead",
|
|
27
31
|
"deprecated": true
|
|
28
32
|
},
|
|
29
33
|
"port": {
|
|
30
|
-
"type": ["number", "
|
|
34
|
+
"type": ["number", "string"],
|
|
31
35
|
"description": "The port number of the application database. DEPRECATED: Use database_url instead",
|
|
32
36
|
"deprecated": true
|
|
33
37
|
},
|
|
34
38
|
"username": {
|
|
35
|
-
"type":
|
|
39
|
+
"type": "string",
|
|
36
40
|
"description": "The username to use when connecting to the application database. DEPRECATED: Use database_url instead",
|
|
37
41
|
"not": {
|
|
38
42
|
"enum": ["dbos"]
|
|
@@ -40,31 +44,32 @@
|
|
|
40
44
|
"deprecated": true
|
|
41
45
|
},
|
|
42
46
|
"password": {
|
|
43
|
-
"type":
|
|
47
|
+
"type": "string",
|
|
44
48
|
"description": "The password to use when connecting to the application database. Developers are strongly encouraged to use environment variable substitution to avoid storing secrets in source. DEPRECATED: Use database_url instead",
|
|
45
49
|
"deprecated": true
|
|
46
50
|
},
|
|
47
51
|
"connectionTimeoutMillis": {
|
|
48
|
-
"type": ["number", "
|
|
52
|
+
"type": ["number", "string"],
|
|
49
53
|
"description": "The number of milliseconds the system waits before timing out when connecting to the application database. DEPRECATED: Use database_url instead",
|
|
50
54
|
"deprecated": true
|
|
51
55
|
},
|
|
52
56
|
"app_db_name": {
|
|
53
|
-
"type":
|
|
57
|
+
"type": "string",
|
|
54
58
|
"description": "The name of the application database. DEPRECATED: Use database_url instead",
|
|
55
59
|
"deprecated": true
|
|
56
60
|
},
|
|
57
61
|
"sys_db_name": {
|
|
58
62
|
"type": "string",
|
|
59
|
-
"description": "The name of the system database"
|
|
63
|
+
"description": "The name of the system database",
|
|
64
|
+
"deprecated": true
|
|
60
65
|
},
|
|
61
66
|
"ssl": {
|
|
62
|
-
"type": ["boolean", "
|
|
67
|
+
"type": ["boolean", "string"],
|
|
63
68
|
"description": "Use SSL/TLS to securely connect to the database (default: true). DEPRECATED: Use database_url instead",
|
|
64
69
|
"deprecated": true
|
|
65
70
|
},
|
|
66
71
|
"ssl_ca": {
|
|
67
|
-
"type":
|
|
72
|
+
"type": "string",
|
|
68
73
|
"description": "If using SSL/TLS to securely connect to a database, path to an SSL root certificate file. DEPRECATED: Use database_url instead",
|
|
69
74
|
"deprecated": true
|
|
70
75
|
},
|
|
@@ -75,10 +80,16 @@
|
|
|
75
80
|
},
|
|
76
81
|
"migrate": {
|
|
77
82
|
"type": "array",
|
|
83
|
+
"items": {
|
|
84
|
+
"type": "string"
|
|
85
|
+
},
|
|
78
86
|
"description": "Specify a list of user DB migration commands to run"
|
|
79
87
|
},
|
|
80
88
|
"rollback": {
|
|
81
|
-
"type":
|
|
89
|
+
"type": "array",
|
|
90
|
+
"items": {
|
|
91
|
+
"type": "string"
|
|
92
|
+
},
|
|
82
93
|
"description": "Specify a list of user DB rollback commands to run. DEPRECATED: use your migration tool directly",
|
|
83
94
|
"deprecated": true
|
|
84
95
|
}
|
|
@@ -111,11 +122,31 @@
|
|
|
111
122
|
"additionalProperties": false,
|
|
112
123
|
"properties": {
|
|
113
124
|
"logsEndpoint": {
|
|
114
|
-
"
|
|
125
|
+
"anyOf": [
|
|
126
|
+
{
|
|
127
|
+
"type": "string"
|
|
128
|
+
},
|
|
129
|
+
{
|
|
130
|
+
"type": "array",
|
|
131
|
+
"items": {
|
|
132
|
+
"type": "string"
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
],
|
|
115
136
|
"description": "The URL of an OTLP collector to which to export logs"
|
|
116
137
|
},
|
|
117
138
|
"tracesEndpoint": {
|
|
118
|
-
"
|
|
139
|
+
"anyOf": [
|
|
140
|
+
{
|
|
141
|
+
"type": "string"
|
|
142
|
+
},
|
|
143
|
+
{
|
|
144
|
+
"type": "array",
|
|
145
|
+
"items": {
|
|
146
|
+
"type": "string"
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
],
|
|
119
150
|
"description": "The URL of an OTLP collector to which to export traces"
|
|
120
151
|
}
|
|
121
152
|
}
|
|
@@ -174,8 +205,12 @@
|
|
|
174
205
|
}
|
|
175
206
|
}
|
|
176
207
|
},
|
|
177
|
-
"application": {
|
|
178
|
-
|
|
208
|
+
"application": {
|
|
209
|
+
"deprecated": true
|
|
210
|
+
},
|
|
211
|
+
"env": {
|
|
212
|
+
"deprecated": true
|
|
213
|
+
},
|
|
179
214
|
"version": {
|
|
180
215
|
"type": "string",
|
|
181
216
|
"deprecated": true
|
|
@@ -14,25 +14,29 @@
|
|
|
14
14
|
"enum": ["node", "python"]
|
|
15
15
|
},
|
|
16
16
|
"database_url": {
|
|
17
|
-
"type":
|
|
17
|
+
"type": "string",
|
|
18
18
|
"description": "The URL of the application database"
|
|
19
19
|
},
|
|
20
|
+
"system_database_url": {
|
|
21
|
+
"type": "string",
|
|
22
|
+
"description": "The URL of the system database"
|
|
23
|
+
},
|
|
20
24
|
"database": {
|
|
21
25
|
"type": "object",
|
|
22
26
|
"additionalProperties": false,
|
|
23
27
|
"properties": {
|
|
24
28
|
"hostname": {
|
|
25
|
-
"type":
|
|
29
|
+
"type": "string",
|
|
26
30
|
"description": "The hostname or IP address of the application database. DEPRECATED: Use database_url instead",
|
|
27
31
|
"deprecated": true
|
|
28
32
|
},
|
|
29
33
|
"port": {
|
|
30
|
-
"type": ["number", "
|
|
34
|
+
"type": ["number", "string"],
|
|
31
35
|
"description": "The port number of the application database. DEPRECATED: Use database_url instead",
|
|
32
36
|
"deprecated": true
|
|
33
37
|
},
|
|
34
38
|
"username": {
|
|
35
|
-
"type":
|
|
39
|
+
"type": "string",
|
|
36
40
|
"description": "The username to use when connecting to the application database. DEPRECATED: Use database_url instead",
|
|
37
41
|
"not": {
|
|
38
42
|
"enum": ["dbos"]
|
|
@@ -40,31 +44,32 @@
|
|
|
40
44
|
"deprecated": true
|
|
41
45
|
},
|
|
42
46
|
"password": {
|
|
43
|
-
"type":
|
|
47
|
+
"type": "string",
|
|
44
48
|
"description": "The password to use when connecting to the application database. Developers are strongly encouraged to use environment variable substitution to avoid storing secrets in source. DEPRECATED: Use database_url instead",
|
|
45
49
|
"deprecated": true
|
|
46
50
|
},
|
|
47
51
|
"connectionTimeoutMillis": {
|
|
48
|
-
"type": ["number", "
|
|
52
|
+
"type": ["number", "string"],
|
|
49
53
|
"description": "The number of milliseconds the system waits before timing out when connecting to the application database. DEPRECATED: Use database_url instead",
|
|
50
54
|
"deprecated": true
|
|
51
55
|
},
|
|
52
56
|
"app_db_name": {
|
|
53
|
-
"type":
|
|
57
|
+
"type": "string",
|
|
54
58
|
"description": "The name of the application database. DEPRECATED: Use database_url instead",
|
|
55
59
|
"deprecated": true
|
|
56
60
|
},
|
|
57
61
|
"sys_db_name": {
|
|
58
62
|
"type": "string",
|
|
59
|
-
"description": "The name of the system database"
|
|
63
|
+
"description": "The name of the system database",
|
|
64
|
+
"deprecated": true
|
|
60
65
|
},
|
|
61
66
|
"ssl": {
|
|
62
|
-
"type": ["boolean", "
|
|
67
|
+
"type": ["boolean", "string"],
|
|
63
68
|
"description": "Use SSL/TLS to securely connect to the database (default: true). DEPRECATED: Use database_url instead",
|
|
64
69
|
"deprecated": true
|
|
65
70
|
},
|
|
66
71
|
"ssl_ca": {
|
|
67
|
-
"type":
|
|
72
|
+
"type": "string",
|
|
68
73
|
"description": "If using SSL/TLS to securely connect to a database, path to an SSL root certificate file. DEPRECATED: Use database_url instead",
|
|
69
74
|
"deprecated": true
|
|
70
75
|
},
|
|
@@ -75,10 +80,16 @@
|
|
|
75
80
|
},
|
|
76
81
|
"migrate": {
|
|
77
82
|
"type": "array",
|
|
83
|
+
"items": {
|
|
84
|
+
"type": "string"
|
|
85
|
+
},
|
|
78
86
|
"description": "Specify a list of user DB migration commands to run"
|
|
79
87
|
},
|
|
80
88
|
"rollback": {
|
|
81
|
-
"type":
|
|
89
|
+
"type": "array",
|
|
90
|
+
"items": {
|
|
91
|
+
"type": "string"
|
|
92
|
+
},
|
|
82
93
|
"description": "Specify a list of user DB rollback commands to run. DEPRECATED: use your migration tool directly",
|
|
83
94
|
"deprecated": true
|
|
84
95
|
}
|
|
@@ -111,11 +122,31 @@
|
|
|
111
122
|
"additionalProperties": false,
|
|
112
123
|
"properties": {
|
|
113
124
|
"logsEndpoint": {
|
|
114
|
-
"
|
|
125
|
+
"anyOf": [
|
|
126
|
+
{
|
|
127
|
+
"type": "string"
|
|
128
|
+
},
|
|
129
|
+
{
|
|
130
|
+
"type": "array",
|
|
131
|
+
"items": {
|
|
132
|
+
"type": "string"
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
],
|
|
115
136
|
"description": "The URL of an OTLP collector to which to export logs"
|
|
116
137
|
},
|
|
117
138
|
"tracesEndpoint": {
|
|
118
|
-
"
|
|
139
|
+
"anyOf": [
|
|
140
|
+
{
|
|
141
|
+
"type": "string"
|
|
142
|
+
},
|
|
143
|
+
{
|
|
144
|
+
"type": "array",
|
|
145
|
+
"items": {
|
|
146
|
+
"type": "string"
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
],
|
|
119
150
|
"description": "The URL of an OTLP collector to which to export traces"
|
|
120
151
|
}
|
|
121
152
|
}
|
|
@@ -174,8 +205,12 @@
|
|
|
174
205
|
}
|
|
175
206
|
}
|
|
176
207
|
},
|
|
177
|
-
"application": {
|
|
178
|
-
|
|
208
|
+
"application": {
|
|
209
|
+
"deprecated": true
|
|
210
|
+
},
|
|
211
|
+
"env": {
|
|
212
|
+
"deprecated": true
|
|
213
|
+
},
|
|
179
214
|
"version": {
|
|
180
215
|
"type": "string",
|
|
181
216
|
"deprecated": true
|
package/dist/src/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/src/client.js
CHANGED
|
@@ -5,10 +5,10 @@ const system_database_1 = require("./system_database");
|
|
|
5
5
|
const logs_1 = require("./telemetry/logs");
|
|
6
6
|
const node_crypto_1 = require("node:crypto");
|
|
7
7
|
const workflow_1 = require("./workflow");
|
|
8
|
-
const config_1 = require("./dbos-runtime/config");
|
|
9
8
|
const utils_1 = require("./utils");
|
|
10
9
|
const workflow_management_1 = require("./dbos-runtime/workflow_management");
|
|
11
10
|
const user_database_1 = require("./user_database");
|
|
11
|
+
const config_1 = require("./dbos-runtime/config");
|
|
12
12
|
/**
|
|
13
13
|
* DBOSClient is the main entry point for interacting with the DBOS system.
|
|
14
14
|
*/
|
|
@@ -16,17 +16,11 @@ class DBOSClient {
|
|
|
16
16
|
logger;
|
|
17
17
|
systemDatabase;
|
|
18
18
|
userDatabase;
|
|
19
|
-
constructor(databaseUrl,
|
|
20
|
-
|
|
21
|
-
database: {},
|
|
22
|
-
database_url: databaseUrl,
|
|
23
|
-
application: {},
|
|
24
|
-
env: {},
|
|
25
|
-
});
|
|
26
|
-
systemDatabase ??= `${poolConfig.database}_dbos_sys`;
|
|
19
|
+
constructor(databaseUrl, systemDatabaseUrl) {
|
|
20
|
+
systemDatabaseUrl ??= (0, config_1.getSystemDatabaseUrl)(databaseUrl);
|
|
27
21
|
this.logger = new logs_1.GlobalLogger();
|
|
28
|
-
this.systemDatabase = new system_database_1.PostgresSystemDatabase(
|
|
29
|
-
this.userDatabase = new user_database_1.PGNodeUserDatabase(
|
|
22
|
+
this.systemDatabase = new system_database_1.PostgresSystemDatabase(systemDatabaseUrl, this.logger);
|
|
23
|
+
this.userDatabase = new user_database_1.PGNodeUserDatabase((0, utils_1.getClientConfig)(databaseUrl));
|
|
30
24
|
}
|
|
31
25
|
/**
|
|
32
26
|
* Creates a new instance of the DBOSClient.
|
package/dist/src/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { TelemetryCollector } from './telemetry/collector';
|
|
|
5
5
|
import { Tracer } from './telemetry/traces';
|
|
6
6
|
import { DBOSContextualLogger, GlobalLogger } from './telemetry/logs';
|
|
7
7
|
import type { TelemetryConfig } from './telemetry';
|
|
8
|
-
import { Pool, type PoolClient
|
|
8
|
+
import { Pool, type PoolClient } from 'pg';
|
|
9
9
|
import { type SystemDatabase, type SystemDatabaseStoredResult } from './system_database';
|
|
10
10
|
import { type UserDatabase, UserDatabaseName } from './user_database';
|
|
11
11
|
import { ConfiguredInstance, TypedAsyncFunction } from './decorators';
|
|
@@ -21,10 +21,10 @@ export declare const DBOS_QUEUE_MAX_PRIORITY: number;
|
|
|
21
21
|
export interface DBOSConfig {
|
|
22
22
|
name?: string;
|
|
23
23
|
databaseUrl?: string;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
24
|
+
userDatabaseClient?: UserDatabaseName;
|
|
25
|
+
userDatabasePoolSize?: number;
|
|
26
|
+
systemDatabaseUrl?: string;
|
|
27
|
+
systemDatabasePoolSize?: number;
|
|
28
28
|
logLevel?: string;
|
|
29
29
|
addContextMetadata?: boolean;
|
|
30
30
|
otlpTracesEndpoints?: string[];
|
|
@@ -33,13 +33,13 @@ export interface DBOSConfig {
|
|
|
33
33
|
runAdminServer?: boolean;
|
|
34
34
|
}
|
|
35
35
|
export type DBOSConfigInternal = {
|
|
36
|
-
poolConfig: PoolConfig;
|
|
37
|
-
system_database: string;
|
|
38
|
-
telemetry: TelemetryConfig;
|
|
39
36
|
name?: string;
|
|
40
|
-
databaseUrl
|
|
41
|
-
|
|
37
|
+
databaseUrl: string;
|
|
38
|
+
userDbPoolSize?: number;
|
|
39
|
+
userDbClient?: UserDatabaseName;
|
|
40
|
+
systemDatabaseUrl: string;
|
|
42
41
|
sysDbPoolSize?: number;
|
|
42
|
+
telemetry: TelemetryConfig;
|
|
43
43
|
http?: {
|
|
44
44
|
cors_middleware?: boolean;
|
|
45
45
|
credentials?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbos-executor.d.ts","sourceRoot":"","sources":["../../src/dbos-executor.ts"],"names":[],"mappings":"AAgBA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,cAAc,EAGnB,KAAK,cAAc,EACnB,KAAK,uBAAuB,EAC5B,KAAK,QAAQ,EAGd,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAkB,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,KAAK,UAAU,
|
|
1
|
+
{"version":3,"file":"dbos-executor.d.ts","sourceRoot":"","sources":["../../src/dbos-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,6 +51,7 @@ const debugpoint_1 = require("./debugpoint");
|
|
|
51
51
|
const scheduler_1 = require("./scheduler/scheduler");
|
|
52
52
|
const crypto = __importStar(require("crypto"));
|
|
53
53
|
const workflow_management_1 = require("./dbos-runtime/workflow_management");
|
|
54
|
+
const utils_2 = require("./utils");
|
|
54
55
|
exports.dbosNull = {};
|
|
55
56
|
exports.DBOS_QUEUE_MIN_PRIORITY = 1;
|
|
56
57
|
exports.DBOS_QUEUE_MAX_PRIORITY = 2 ** 31 - 1; // 2,147,483,647
|
|
@@ -109,21 +110,22 @@ class DBOSExecutor {
|
|
|
109
110
|
if (this.debugMode) {
|
|
110
111
|
this.logger.info('Running in debug mode!');
|
|
111
112
|
}
|
|
112
|
-
this.procedurePool = new pg_1.Pool(this.config.
|
|
113
|
+
this.procedurePool = new pg_1.Pool((0, utils_2.getClientConfig)(this.config.databaseUrl));
|
|
113
114
|
if (systemDatabase) {
|
|
114
115
|
this.logger.debug('Using provided system database'); // XXX print the name or something
|
|
115
116
|
this.systemDatabase = systemDatabase;
|
|
116
117
|
}
|
|
117
118
|
else {
|
|
118
119
|
this.logger.debug('Using Postgres system database');
|
|
119
|
-
this.systemDatabase = new system_database_1.PostgresSystemDatabase(this.config.
|
|
120
|
+
this.systemDatabase = new system_database_1.PostgresSystemDatabase(this.config.systemDatabaseUrl, this.logger, this.config.sysDbPoolSize);
|
|
120
121
|
}
|
|
121
122
|
this.initialized = false;
|
|
122
123
|
DBOSExecutor.globalInstance = this;
|
|
123
124
|
}
|
|
124
125
|
configureDbClient() {
|
|
125
|
-
const userDbClient = this.config.
|
|
126
|
-
const userDBConfig = this.config.
|
|
126
|
+
const userDbClient = this.config.userDbClient;
|
|
127
|
+
const userDBConfig = (0, utils_2.getClientConfig)(this.config.databaseUrl);
|
|
128
|
+
userDBConfig.max = this.config.userDbPoolSize ?? 20;
|
|
127
129
|
if (userDbClient === user_database_1.UserDatabaseName.PRISMA) {
|
|
128
130
|
// TODO: make Prisma work with debugger proxy.
|
|
129
131
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-require-imports
|
|
@@ -162,10 +164,7 @@ class DBOSExecutor {
|
|
|
162
164
|
else if (userDbClient === user_database_1.UserDatabaseName.KNEX) {
|
|
163
165
|
const knexConfig = {
|
|
164
166
|
client: 'postgres',
|
|
165
|
-
connection:
|
|
166
|
-
connectionString: userDBConfig.connectionString,
|
|
167
|
-
connectionTimeoutMillis: userDBConfig.connectionTimeoutMillis,
|
|
168
|
-
},
|
|
167
|
+
connection: (0, utils_2.getClientConfig)(this.config.databaseUrl),
|
|
169
168
|
pool: {
|
|
170
169
|
min: 0,
|
|
171
170
|
max: userDBConfig.max,
|
|
@@ -222,7 +221,7 @@ class DBOSExecutor {
|
|
|
222
221
|
this.logger.debug(`Loaded ${length} ORM entities`);
|
|
223
222
|
}
|
|
224
223
|
if (!this.debugMode) {
|
|
225
|
-
await (0, user_database_1.createDBIfDoesNotExist)(this.config.
|
|
224
|
+
await (0, user_database_1.createDBIfDoesNotExist)(this.config.databaseUrl, this.logger);
|
|
226
225
|
}
|
|
227
226
|
this.configureDbClient();
|
|
228
227
|
if (!this.userDatabase) {
|