@dbos-inc/dbos-sdk 2.7.17-preview → 2.7.22-preview
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/client.d.ts +65 -0
- package/dist/src/client.d.ts.map +1 -1
- package/dist/src/client.js +40 -0
- package/dist/src/client.js.map +1 -1
- package/dist/src/dbos-executor.d.ts +2 -1
- package/dist/src/dbos-executor.d.ts.map +1 -1
- package/dist/src/dbos-executor.js +2 -2
- package/dist/src/dbos-executor.js.map +1 -1
- package/dist/src/dbos-runtime/cli.d.ts +2 -1
- package/dist/src/dbos-runtime/cli.d.ts.map +1 -1
- package/dist/src/dbos-runtime/cli.js +5 -5
- package/dist/src/dbos-runtime/cli.js.map +1 -1
- package/dist/src/dbos-runtime/config.d.ts +1 -1
- package/dist/src/dbos-runtime/config.d.ts.map +1 -1
- package/dist/src/dbos-runtime/config.js +12 -6
- package/dist/src/dbos-runtime/config.js.map +1 -1
- package/dist/src/dbos-runtime/migrate.d.ts +3 -2
- package/dist/src/dbos-runtime/migrate.d.ts.map +1 -1
- package/dist/src/dbos-runtime/migrate.js +6 -8
- 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 +6 -8
- package/dist/src/dbos-runtime/reset.js.map +1 -1
- package/dist/src/dbos.d.ts.map +1 -1
- package/dist/src/dbos.js +17 -5
- package/dist/src/dbos.js.map +1 -1
- package/dist/src/httpServer/server.d.ts.map +1 -1
- package/dist/src/httpServer/server.js +4 -5
- package/dist/src/httpServer/server.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -102,9 +102,8 @@ program
|
|
|
102
102
|
.option('-y, --yes', 'Skip confirmation prompt', false)
|
|
103
103
|
.action(async (options) => {
|
|
104
104
|
const logger = new logs_1.GlobalLogger();
|
|
105
|
-
const
|
|
106
|
-
|
|
107
|
-
await (0, reset_1.reset)(configFile, logger, options.yes);
|
|
105
|
+
const [config] = (0, config_1.parseConfigFile)();
|
|
106
|
+
await (0, reset_1.reset)(config, logger, options.yes);
|
|
108
107
|
});
|
|
109
108
|
program.command('rollback').action(async () => {
|
|
110
109
|
await runAndLog(migrate_1.rollbackMigration);
|
|
@@ -245,7 +244,8 @@ if (!process.argv.slice(2).length) {
|
|
|
245
244
|
//Finally, terminates the program with the exit code.
|
|
246
245
|
async function runAndLog(action) {
|
|
247
246
|
let logger = new logs_1.GlobalLogger();
|
|
248
|
-
const
|
|
247
|
+
const [config] = (0, config_1.parseConfigFile)();
|
|
248
|
+
const configFile = (0, config_1.loadConfigFile)(config_1.dbosConfigFilePath); // pass the raw config file for CLI arguments
|
|
249
249
|
let terminate = undefined;
|
|
250
250
|
if (configFile.telemetry?.OTLPExporter) {
|
|
251
251
|
logger = new logs_1.GlobalLogger(new collector_1.TelemetryCollector(new exporters_1.TelemetryExporter(configFile.telemetry.OTLPExporter)), configFile.telemetry?.logs);
|
|
@@ -262,7 +262,7 @@ async function runAndLog(action) {
|
|
|
262
262
|
}
|
|
263
263
|
let returnCode = 1;
|
|
264
264
|
try {
|
|
265
|
-
returnCode = await action(configFile, logger);
|
|
265
|
+
returnCode = await action(config, configFile, logger);
|
|
266
266
|
}
|
|
267
267
|
catch (e) {
|
|
268
268
|
logger.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/dbos-runtime/cli.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/dbos-runtime/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,5 +68,5 @@ export interface ParseOptions {
|
|
|
68
68
|
export declare function parseConfigFile(cliOptions?: ParseOptions): [DBOSConfigInternal, DBOSRuntimeConfig];
|
|
69
69
|
export declare function translatePublicDBOSconfig(config: DBOSConfig, isDebugging?: boolean): [DBOSConfigInternal, DBOSRuntimeConfig];
|
|
70
70
|
export declare function parseDbString(dbString: string): DBConfig;
|
|
71
|
-
export declare function overwrite_config(providedDBOSConfig:
|
|
71
|
+
export declare function overwrite_config(providedDBOSConfig: DBOSConfigInternal, providedRuntimeConfig: DBOSRuntimeConfig): [DBOSConfig, DBOSRuntimeConfig];
|
|
72
72
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAqB,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -136,7 +136,7 @@ function constructPoolConfig(configFile, cliOptions) {
|
|
|
136
136
|
utils_1.globalParams.appName = appName;
|
|
137
137
|
}
|
|
138
138
|
if (databaseName === undefined) {
|
|
139
|
-
databaseName = appName.toLowerCase().replaceAll('-', '_');
|
|
139
|
+
databaseName = appName.toLowerCase().replaceAll('-', '_').replaceAll(' ', '_');
|
|
140
140
|
if (databaseName.match(/^\d/)) {
|
|
141
141
|
databaseName = '_' + databaseName; // Append an underscore if the name starts with a digit
|
|
142
142
|
}
|
|
@@ -218,7 +218,7 @@ function parseConfigFile(cliOptions) {
|
|
|
218
218
|
}
|
|
219
219
|
const poolConfig = constructPoolConfig(configFile, cliOptions);
|
|
220
220
|
if (!isValidDBname(poolConfig.database)) {
|
|
221
|
-
throw new error_1.DBOSInitializationError(`${configFilePath} specifies invalid app_db_name ${
|
|
221
|
+
throw new error_1.DBOSInitializationError(`${configFilePath} specifies invalid app_db_name ${poolConfig.database}. Must be between 3 and 31 characters long and contain only lowercase letters, underscores, and digits (cannot begin with a digit).`);
|
|
222
222
|
}
|
|
223
223
|
/***************************/
|
|
224
224
|
/* Handle telemetry config */
|
|
@@ -243,7 +243,7 @@ function parseConfigFile(cliOptions) {
|
|
|
243
243
|
const dbosConfig = {
|
|
244
244
|
poolConfig: poolConfig,
|
|
245
245
|
userDbclient: configFile.database.app_db_client || user_database_1.UserDatabaseName.KNEX,
|
|
246
|
-
telemetry: configFile.telemetry ||
|
|
246
|
+
telemetry: configFile.telemetry || { logs: { logLevel: 'info' } },
|
|
247
247
|
system_database: configFile.database.sys_db_name ?? `${poolConfig.database}_dbos_sys`,
|
|
248
248
|
application: configFile.application || undefined,
|
|
249
249
|
env: configFile.env || {},
|
|
@@ -376,7 +376,7 @@ function parseDbString(dbString) {
|
|
|
376
376
|
username: parsed.user || undefined,
|
|
377
377
|
password: parsed.password || undefined,
|
|
378
378
|
app_db_name: parsed.database || undefined,
|
|
379
|
-
ssl: 'sslmode' in parsed && parsed.sslmode === 'require',
|
|
379
|
+
ssl: 'sslmode' in parsed && (parsed.sslmode === 'require' || parsed.sslmode === 'verify-full'),
|
|
380
380
|
ssl_ca: queryParams['sslrootcert'] || undefined,
|
|
381
381
|
connectionTimeoutMillis: queryParams['connect_timeout']
|
|
382
382
|
? parseInt(queryParams['connect_timeout'], 10) * 1000
|
|
@@ -404,11 +404,17 @@ function overwrite_config(providedDBOSConfig, providedRuntimeConfig) {
|
|
|
404
404
|
}
|
|
405
405
|
const appName = configFile.name || providedDBOSConfig.name;
|
|
406
406
|
const poolConfig = constructPoolConfig(configFile);
|
|
407
|
-
|
|
407
|
+
if (!providedDBOSConfig.telemetry.OTLPExporter) {
|
|
408
|
+
providedDBOSConfig.telemetry.OTLPExporter = {};
|
|
409
|
+
}
|
|
408
410
|
if (configFile.telemetry?.OTLPExporter?.tracesEndpoint) {
|
|
409
|
-
|
|
411
|
+
providedDBOSConfig.telemetry.OTLPExporter.tracesEndpoint = configFile.telemetry.OTLPExporter.tracesEndpoint;
|
|
412
|
+
}
|
|
413
|
+
if (configFile.telemetry?.OTLPExporter?.logsEndpoint) {
|
|
414
|
+
providedDBOSConfig.telemetry.OTLPExporter.logsEndpoint = configFile.telemetry.OTLPExporter.logsEndpoint;
|
|
410
415
|
}
|
|
411
416
|
const overwritenDBOSConfig = {
|
|
417
|
+
...providedDBOSConfig,
|
|
412
418
|
name: appName,
|
|
413
419
|
poolConfig: poolConfig,
|
|
414
420
|
telemetry: providedDBOSConfig.telemetry,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dbos-runtime/config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/dbos-runtime/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { GlobalLogger } from '../telemetry/logs';
|
|
2
2
|
import { ConfigFile } from './config';
|
|
3
|
-
|
|
4
|
-
export declare function
|
|
3
|
+
import { DBOSConfigInternal } from '../dbos-executor';
|
|
4
|
+
export declare function migrate(config: DBOSConfigInternal, configFile: ConfigFile, logger: GlobalLogger): Promise<1 | 0>;
|
|
5
|
+
export declare function rollbackMigration(_config: DBOSConfigInternal, configFile: ConfigFile, logger: GlobalLogger): 1 | 0;
|
|
5
6
|
//# sourceMappingURL=migrate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/migrate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/migrate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAYtD,wBAAsB,OAAO,CAAC,MAAM,EAAE,kBAAkB,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,kBAgCrG;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,SAqB1G"}
|
|
@@ -3,15 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.rollbackMigration = exports.migrate = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
const logs_1 = require("../telemetry/logs");
|
|
6
|
-
const config_1 = require("./config");
|
|
7
6
|
const pg_1 = require("pg");
|
|
8
7
|
const user_db_schema_1 = require("../../schemas/user_db_schema");
|
|
9
8
|
const system_database_1 = require("../system_database");
|
|
10
9
|
const user_database_1 = require("../user_database");
|
|
11
10
|
const db_wizard_1 = require("./db_wizard");
|
|
12
|
-
async function migrate(configFile, logger) {
|
|
13
|
-
|
|
14
|
-
poolConfig = await (0, db_wizard_1.db_wizard)(poolConfig);
|
|
11
|
+
async function migrate(config, configFile, logger) {
|
|
12
|
+
const poolConfig = await (0, db_wizard_1.db_wizard)(config.poolConfig);
|
|
15
13
|
logger.info(`Starting migration: creating database ${poolConfig.database} if it does not exist`);
|
|
16
14
|
await (0, user_database_1.createDBIfDoesNotExist)(poolConfig, logger);
|
|
17
15
|
const migrationCommands = configFile.database.migrate;
|
|
@@ -28,7 +26,7 @@ async function migrate(configFile, logger) {
|
|
|
28
26
|
}
|
|
29
27
|
logger.info('Creating DBOS tables and system database.');
|
|
30
28
|
try {
|
|
31
|
-
await createDBOSTables(
|
|
29
|
+
await createDBOSTables(config.system_database, poolConfig);
|
|
32
30
|
}
|
|
33
31
|
catch (e) {
|
|
34
32
|
if (e instanceof Error) {
|
|
@@ -43,7 +41,7 @@ async function migrate(configFile, logger) {
|
|
|
43
41
|
return 0;
|
|
44
42
|
}
|
|
45
43
|
exports.migrate = migrate;
|
|
46
|
-
function rollbackMigration(configFile, logger) {
|
|
44
|
+
function rollbackMigration(_config, configFile, logger) {
|
|
47
45
|
logger.info('Starting Migration Rollback');
|
|
48
46
|
let dbType = configFile.database.app_db_client;
|
|
49
47
|
if (dbType === undefined) {
|
|
@@ -65,10 +63,10 @@ function rollbackMigration(configFile, logger) {
|
|
|
65
63
|
}
|
|
66
64
|
exports.rollbackMigration = rollbackMigration;
|
|
67
65
|
// Create DBOS system DB and tables.
|
|
68
|
-
async function createDBOSTables(
|
|
66
|
+
async function createDBOSTables(systemDbName, userPoolConfig) {
|
|
69
67
|
const logger = new logs_1.GlobalLogger();
|
|
70
68
|
const systemPoolConfig = { ...userPoolConfig };
|
|
71
|
-
systemPoolConfig.database =
|
|
69
|
+
systemPoolConfig.database = systemDbName;
|
|
72
70
|
const pgUserClient = new pg_1.Client(userPoolConfig);
|
|
73
71
|
await pgUserClient.connect();
|
|
74
72
|
// Create DBOS table/schema in user DB.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/dbos-runtime/migrate.ts"],"names":[],"mappings":";;;AAAA,iDAA2D;AAC3D,4CAAiD;
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/dbos-runtime/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { GlobalLogger } from '../telemetry/logs';
|
|
2
|
-
import {
|
|
3
|
-
export declare function reset(
|
|
2
|
+
import { DBOSConfigInternal } from '../dbos-executor';
|
|
3
|
+
export declare function reset(config: DBOSConfigInternal, logger: GlobalLogger, cnf: boolean): Promise<number>;
|
|
4
4
|
//# sourceMappingURL=reset.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/reset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"reset.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/reset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,wBAAsB,KAAK,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,OAAO,mBA2CzF"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.reset = void 0;
|
|
4
|
-
const config_1 = require("./config");
|
|
5
4
|
const pg_1 = require("pg");
|
|
6
5
|
const prompts_1 = require("@inquirer/prompts");
|
|
7
|
-
async function reset(
|
|
6
|
+
async function reset(config, logger, cnf) {
|
|
8
7
|
if (cnf) {
|
|
9
8
|
const userConfirmed = await (0, prompts_1.confirm)({
|
|
10
9
|
message: 'This command resets your DBOS system database, deleting metadata about past workflows and steps. Are you sure you want to proceed?',
|
|
@@ -15,15 +14,14 @@ async function reset(configFile, logger, cnf) {
|
|
|
15
14
|
process.exit(0); // Exit the process if the user cancels
|
|
16
15
|
}
|
|
17
16
|
}
|
|
18
|
-
const
|
|
19
|
-
const sysDbName = configFile.database.sys_db_name ?? `${userPoolConfig.database}_dbos_sys`;
|
|
17
|
+
const sysDbName = config.system_database;
|
|
20
18
|
logger.info(`Resetting ${sysDbName} if it exists`);
|
|
21
19
|
const pgClient = new pg_1.Client({
|
|
22
|
-
user:
|
|
23
|
-
host:
|
|
20
|
+
user: config.poolConfig.user,
|
|
21
|
+
host: config.poolConfig.host,
|
|
24
22
|
database: 'postgres', // Connect to the default PostgreSQL database
|
|
25
|
-
password:
|
|
26
|
-
port:
|
|
23
|
+
password: config.poolConfig.password,
|
|
24
|
+
port: config.poolConfig.port,
|
|
27
25
|
});
|
|
28
26
|
await pgClient.connect();
|
|
29
27
|
console.log('Terminating connections to system database');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/dbos-runtime/reset.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/dbos-runtime/reset.ts"],"names":[],"mappings":";;;AACA,2BAA4B;AAC5B,+CAA4C;AAGrC,KAAK,UAAU,KAAK,CAAC,MAA0B,EAAE,MAAoB,EAAE,GAAY;IACxF,IAAI,GAAG,EAAE,CAAC;QACR,MAAM,aAAa,GAAG,MAAM,IAAA,iBAAO,EAAC;YAClC,OAAO,EACL,oIAAoI;YACtI,OAAO,EAAE,KAAK,EAAE,iCAAiC;SAClD,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,uCAAuC;QAC1D,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,eAAe,CAAC;IAEzC,MAAM,CAAC,IAAI,CAAC,aAAa,SAAS,eAAe,CAAC,CAAC;IAEnD,MAAM,QAAQ,GAAG,IAAI,WAAM,CAAC;QAC1B,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI;QAC5B,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI;QAC5B,QAAQ,EAAE,UAAU,EAAE,6CAA6C;QACnE,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ;QACpC,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI;KAC7B,CAAC,CAAC;IAEH,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;IAEzB,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC;IAE1D,MAAM,QAAQ,CAAC,KAAK,CAClB;;;4CAGwC,EACxC,CAAC,SAAS,CAAC,CACZ,CAAC;IAEF,MAAM,QAAQ,CAAC,KAAK,CAAC,2BAA2B,SAAS,GAAG,CAAC,CAAC;IAE9D,MAAM,QAAQ,CAAC,GAAG,EAAE,CAAC;IAErB,OAAO,CAAC,CAAC;AACX,CAAC;AA3CD,sBA2CC"}
|
package/dist/src/dbos.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbos.d.ts","sourceRoot":"","sources":["../../src/dbos.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"dbos.d.ts","sourceRoot":"","sources":["../../src/dbos.ts"],"names":[],"mappings":"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"}
|
package/dist/src/dbos.js
CHANGED
|
@@ -131,7 +131,7 @@ class DBOS {
|
|
|
131
131
|
DBOS.runtimeConfig = runtimeConfig;
|
|
132
132
|
}
|
|
133
133
|
else if (!(0, dbos_executor_1.isDeprecatedDBOSConfig)(DBOS.dbosConfig)) {
|
|
134
|
-
DBOS.translateConfig();
|
|
134
|
+
DBOS.translateConfig(); // This is a defensive measure for users who'd do DBOS.config = X instead of using DBOS.setConfig()
|
|
135
135
|
if (!isDebugging) {
|
|
136
136
|
DBOS.dbosConfig.poolConfig = await (0, db_wizard_1.db_wizard)(DBOS.dbosConfig.poolConfig);
|
|
137
137
|
}
|
|
@@ -168,10 +168,22 @@ class DBOS {
|
|
|
168
168
|
const logger = DBOS.logger;
|
|
169
169
|
if (DBOS.runtimeConfig && DBOS.runtimeConfig.runAdminServer) {
|
|
170
170
|
const adminApp = server_1.DBOSHttpServer.setupAdminApp(executor);
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
171
|
+
try {
|
|
172
|
+
await server_1.DBOSHttpServer.checkPortAvailabilityIPv4Ipv6(DBOS.runtimeConfig.admin_port, logger);
|
|
173
|
+
// Wrap the listen call in a promise to properly catch errors
|
|
174
|
+
DBOS.adminServer = await new Promise((resolve, reject) => {
|
|
175
|
+
const server = adminApp.listen(DBOS.runtimeConfig?.admin_port, () => {
|
|
176
|
+
DBOS.logger.info(`DBOS Admin Server is running at http://localhost:${DBOS.runtimeConfig?.admin_port}`);
|
|
177
|
+
resolve(server);
|
|
178
|
+
});
|
|
179
|
+
server.on('error', (err) => {
|
|
180
|
+
reject(err);
|
|
181
|
+
});
|
|
182
|
+
});
|
|
183
|
+
}
|
|
184
|
+
catch (e) {
|
|
185
|
+
logger.warn(`Unable to start DBOS admin server on port ${DBOS.runtimeConfig.admin_port}`);
|
|
186
|
+
}
|
|
175
187
|
}
|
|
176
188
|
if (options?.koaApp) {
|
|
177
189
|
DBOS.logger.info('Setting up Koa tracing middleware');
|