@dbos-inc/dbos-sdk 1.31.17-preview → 1.31.20-preview
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/src/dbos-executor.d.ts +1 -1
- package/dist/src/dbos-executor.d.ts.map +1 -1
- package/dist/src/dbos-runtime/cloudutils/authentication.d.ts +7 -0
- package/dist/src/dbos-runtime/cloudutils/authentication.d.ts.map +1 -0
- package/dist/src/dbos-runtime/cloudutils/authentication.js +101 -0
- package/dist/src/dbos-runtime/cloudutils/authentication.js.map +1 -0
- package/dist/src/dbos-runtime/cloudutils/cloudutils.d.ts +49 -0
- package/dist/src/dbos-runtime/cloudutils/cloudutils.d.ts.map +1 -0
- package/dist/src/dbos-runtime/cloudutils/cloudutils.js +271 -0
- package/dist/src/dbos-runtime/cloudutils/cloudutils.js.map +1 -0
- package/dist/src/dbos-runtime/cloudutils/databases.d.ts +21 -0
- package/dist/src/dbos-runtime/cloudutils/databases.d.ts.map +1 -0
- package/dist/src/dbos-runtime/cloudutils/databases.js +186 -0
- package/dist/src/dbos-runtime/cloudutils/databases.js.map +1 -0
- package/dist/src/dbos-runtime/db_wizard.d.ts +3 -0
- package/dist/src/dbos-runtime/db_wizard.d.ts.map +1 -0
- package/dist/src/dbos-runtime/db_wizard.js +168 -0
- package/dist/src/dbos-runtime/db_wizard.js.map +1 -0
- package/dist/src/dbos-runtime/migrate.d.ts +2 -1
- package/dist/src/dbos-runtime/migrate.d.ts.map +1 -1
- package/dist/src/dbos-runtime/migrate.js +9 -10
- package/dist/src/dbos-runtime/migrate.js.map +1 -1
- package/dist/src/dbos-runtime/runtime.d.ts.map +1 -1
- package/dist/src/dbos-runtime/runtime.js +6 -1
- package/dist/src/dbos-runtime/runtime.js.map +1 -1
- package/dist/src/dbos.d.ts.map +1 -1
- package/dist/src/dbos.js +2 -0
- package/dist/src/dbos.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +5 -1
- package/src/dbos-runtime/cloudutils/README.md +1 -0
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getUserDBCredentials = exports.createUserRole = exports.chooseAppDBServer = exports.getUserDBInfo = exports.createUserDb = void 0;
|
|
7
|
+
const axios_1 = __importDefault(require("axios"));
|
|
8
|
+
const cloudutils_1 = require("./cloudutils");
|
|
9
|
+
const prompts_1 = require("@inquirer/prompts");
|
|
10
|
+
function isValidPassword(logger, password) {
|
|
11
|
+
if (password.length < 8 || password.length > 128) {
|
|
12
|
+
logger.error("Invalid database password. Passwords must be between 8 and 128 characters long");
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
if (password.includes("/") || password.includes('"') || password.includes("@") || password.includes(" ") || password.includes("'")) {
|
|
16
|
+
logger.error("Password contains invalid character. Passwords can contain any ASCII character except @, /, \\, \", ', and spaces");
|
|
17
|
+
return false;
|
|
18
|
+
}
|
|
19
|
+
return true;
|
|
20
|
+
}
|
|
21
|
+
async function createUserDb(host, dbName, appDBUsername, appDBPassword, sync, userCredentials) {
|
|
22
|
+
const logger = (0, cloudutils_1.getLogger)();
|
|
23
|
+
if (!userCredentials) {
|
|
24
|
+
userCredentials = await (0, cloudutils_1.getCloudCredentials)(host, logger);
|
|
25
|
+
}
|
|
26
|
+
const bearerToken = "Bearer " + userCredentials.token;
|
|
27
|
+
if (!isValidPassword(logger, appDBPassword)) {
|
|
28
|
+
return 1;
|
|
29
|
+
}
|
|
30
|
+
try {
|
|
31
|
+
await axios_1.default.post(`https://${host}/v1alpha1/${userCredentials.organization}/databases/userdb`, { Name: dbName, AdminName: appDBUsername, AdminPassword: appDBPassword }, {
|
|
32
|
+
headers: {
|
|
33
|
+
"Content-Type": "application/json",
|
|
34
|
+
Authorization: bearerToken,
|
|
35
|
+
},
|
|
36
|
+
});
|
|
37
|
+
logger.info(`Successfully started provisioning database: ${dbName}`);
|
|
38
|
+
if (sync) {
|
|
39
|
+
let status = "";
|
|
40
|
+
while (status !== "available" && status !== "backing-up") {
|
|
41
|
+
if (status === "") {
|
|
42
|
+
await (0, cloudutils_1.sleepms)(5000); // First time sleep 5 sec
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
await (0, cloudutils_1.sleepms)(30000); // Otherwise, sleep 30 sec
|
|
46
|
+
}
|
|
47
|
+
const userDBInfo = await getUserDBInfo(host, dbName, userCredentials);
|
|
48
|
+
logger.info(userDBInfo);
|
|
49
|
+
status = userDBInfo.Status;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
logger.info(`Database successfully provisioned!`);
|
|
53
|
+
return 0;
|
|
54
|
+
}
|
|
55
|
+
catch (e) {
|
|
56
|
+
const errorLabel = `Failed to create database ${dbName}`;
|
|
57
|
+
const axiosError = e;
|
|
58
|
+
if ((0, cloudutils_1.isCloudAPIErrorResponse)(axiosError.response?.data)) {
|
|
59
|
+
(0, cloudutils_1.handleAPIErrors)(errorLabel, axiosError);
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
logger.error(`${errorLabel}: ${e.message}`);
|
|
63
|
+
}
|
|
64
|
+
return 1;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
exports.createUserDb = createUserDb;
|
|
68
|
+
async function getUserDBInfo(host, dbName, userCredentials) {
|
|
69
|
+
const logger = (0, cloudutils_1.getLogger)();
|
|
70
|
+
if (!userCredentials) {
|
|
71
|
+
userCredentials = await (0, cloudutils_1.getCloudCredentials)(host, logger);
|
|
72
|
+
}
|
|
73
|
+
const bearerToken = "Bearer " + userCredentials.token;
|
|
74
|
+
const res = await axios_1.default.get(`https://${host}/v1alpha1/${userCredentials.organization}/databases/userdb/info/${dbName}`, {
|
|
75
|
+
headers: {
|
|
76
|
+
"Content-Type": "application/json",
|
|
77
|
+
Authorization: bearerToken,
|
|
78
|
+
},
|
|
79
|
+
});
|
|
80
|
+
return res.data;
|
|
81
|
+
}
|
|
82
|
+
exports.getUserDBInfo = getUserDBInfo;
|
|
83
|
+
async function chooseAppDBServer(logger, host, userCredentials) {
|
|
84
|
+
// List existing database instances.
|
|
85
|
+
let userDBs = [];
|
|
86
|
+
const bearerToken = "Bearer " + userCredentials.token;
|
|
87
|
+
try {
|
|
88
|
+
const res = await axios_1.default.get(`https://${host}/v1alpha1/${userCredentials.organization}/databases`, {
|
|
89
|
+
headers: {
|
|
90
|
+
"Content-Type": "application/json",
|
|
91
|
+
Authorization: bearerToken,
|
|
92
|
+
},
|
|
93
|
+
});
|
|
94
|
+
userDBs = res.data;
|
|
95
|
+
}
|
|
96
|
+
catch (e) {
|
|
97
|
+
const errorLabel = `Failed to list databases`;
|
|
98
|
+
const axiosError = e;
|
|
99
|
+
if ((0, cloudutils_1.isCloudAPIErrorResponse)(axiosError.response?.data)) {
|
|
100
|
+
(0, cloudutils_1.handleAPIErrors)(errorLabel, axiosError);
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
logger.error(`${errorLabel}: ${e.message}`);
|
|
104
|
+
}
|
|
105
|
+
process.exit(1);
|
|
106
|
+
}
|
|
107
|
+
let userDBName = "";
|
|
108
|
+
if (userDBs.length === 0) {
|
|
109
|
+
// If not, prompt the user to provision one.
|
|
110
|
+
logger.info("Provisioning a cloud Postgres database server");
|
|
111
|
+
userDBName = `${userCredentials.userName}-db-server`;
|
|
112
|
+
// Use a default user name and auto generated password.
|
|
113
|
+
const appDBUserName = "dbos_user";
|
|
114
|
+
const appDBPassword = Buffer.from(Math.random().toString()).toString("base64");
|
|
115
|
+
const res = await createUserDb(host, userDBName, appDBUserName, appDBPassword, true);
|
|
116
|
+
if (res !== 0) {
|
|
117
|
+
process.exit(1);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
else if (userDBs.length > 1) {
|
|
121
|
+
// If there is more than one database instances, prompt the user to select one.
|
|
122
|
+
userDBName = await (0, prompts_1.select)({
|
|
123
|
+
message: "Choose a database instance for this app:",
|
|
124
|
+
choices: userDBs.map((db) => ({
|
|
125
|
+
name: db.PostgresInstanceName,
|
|
126
|
+
value: db.PostgresInstanceName,
|
|
127
|
+
})),
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
else {
|
|
131
|
+
// Use the only available database server.
|
|
132
|
+
userDBName = userDBs[0].PostgresInstanceName;
|
|
133
|
+
logger.info(`Using database instance: ${userDBName}`);
|
|
134
|
+
}
|
|
135
|
+
return userDBName;
|
|
136
|
+
}
|
|
137
|
+
exports.chooseAppDBServer = chooseAppDBServer;
|
|
138
|
+
async function createUserRole(logger, host, userCredentials, dbName) {
|
|
139
|
+
const bearerToken = "Bearer " + userCredentials.token;
|
|
140
|
+
try {
|
|
141
|
+
await axios_1.default.post(`https://${host}/v1alpha1/${userCredentials.organization}/databases/userdb/${dbName}/createuserdbrole`, {}, {
|
|
142
|
+
headers: {
|
|
143
|
+
"Content-Type": "application/json",
|
|
144
|
+
Authorization: bearerToken,
|
|
145
|
+
},
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
catch (e) {
|
|
149
|
+
const errorLabel = `Failed to create the user role`;
|
|
150
|
+
const axiosError = e;
|
|
151
|
+
if ((0, cloudutils_1.isCloudAPIErrorResponse)(axiosError.response?.data)) {
|
|
152
|
+
(0, cloudutils_1.handleAPIErrors)(errorLabel, axiosError);
|
|
153
|
+
}
|
|
154
|
+
else {
|
|
155
|
+
logger.error(`${errorLabel}: ${e.message}`);
|
|
156
|
+
}
|
|
157
|
+
process.exit(1);
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
exports.createUserRole = createUserRole;
|
|
161
|
+
async function getUserDBCredentials(logger, host, userCredentials, dbName) {
|
|
162
|
+
// List existing database instances.
|
|
163
|
+
const bearerToken = "Bearer " + userCredentials.token;
|
|
164
|
+
try {
|
|
165
|
+
const res = await axios_1.default.get(`https://${host}/v1alpha1/${userCredentials.organization}/databases/userdb/${dbName}/credentials`, {
|
|
166
|
+
headers: {
|
|
167
|
+
"Content-Type": "application/json",
|
|
168
|
+
Authorization: bearerToken,
|
|
169
|
+
},
|
|
170
|
+
});
|
|
171
|
+
return res.data;
|
|
172
|
+
}
|
|
173
|
+
catch (e) {
|
|
174
|
+
const errorLabel = `Failed to list databases`;
|
|
175
|
+
const axiosError = e;
|
|
176
|
+
if ((0, cloudutils_1.isCloudAPIErrorResponse)(axiosError.response?.data)) {
|
|
177
|
+
(0, cloudutils_1.handleAPIErrors)(errorLabel, axiosError);
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
logger.error(`${errorLabel}: ${e.message}`);
|
|
181
|
+
}
|
|
182
|
+
process.exit(1);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
exports.getUserDBCredentials = getUserDBCredentials;
|
|
186
|
+
//# sourceMappingURL=databases.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"databases.js","sourceRoot":"","sources":["../../../../src/dbos-runtime/cloudutils/databases.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0C;AAC1C,6CAAuI;AAEvI,+CAA2C;AAkB3C,SAAS,eAAe,CAAC,MAAc,EAAE,QAAgB;IACrD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;QAC/C,MAAM,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAC;QAC/F,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACjI,MAAM,CAAC,KAAK,CAAC,mHAAmH,CAAC,CAAC;QAClI,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAEM,KAAK,UAAU,YAAY,CAAC,IAAY,EAAE,MAAc,EAAE,aAAqB,EAAE,aAAqB,EAAE,IAAa,EAAE,eAAsC;IAChK,MAAM,MAAM,GAAG,IAAA,sBAAS,GAAE,CAAC;IAC3B,IAAI,CAAC,eAAe,EAAE,CAAC;QACnB,eAAe,GAAG,MAAM,IAAA,gCAAmB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,WAAW,GAAG,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC;IAEtD,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC;QAC1C,OAAO,CAAC,CAAC;IACb,CAAC;IAED,IAAI,CAAC;QACD,MAAM,eAAK,CAAC,IAAI,CACZ,WAAW,IAAI,aAAa,eAAe,CAAC,YAAY,mBAAmB,EAC3E,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,EACxE;YACI,OAAO,EAAE;gBACL,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,WAAW;aAC7B;SACJ,CACJ,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,+CAA+C,MAAM,EAAE,CAAC,CAAC;QAErE,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,KAAK,YAAY,EAAE,CAAC;gBACvD,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;oBAChB,MAAM,IAAA,oBAAO,EAAC,IAAI,CAAC,CAAC,CAAC,yBAAyB;gBAClD,CAAC;qBAAM,CAAC;oBACJ,MAAM,IAAA,oBAAO,EAAC,KAAK,CAAC,CAAC,CAAC,0BAA0B;gBACpD,CAAC;gBACD,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;gBACtE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACxB,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YAC/B,CAAC;QACL,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;QAClD,OAAO,CAAC,CAAC;IACb,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,UAAU,GAAG,6BAA6B,MAAM,EAAE,CAAC;QACzD,MAAM,UAAU,GAAG,CAAe,CAAC;QACnC,IAAI,IAAA,oCAAuB,EAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;YACrD,IAAA,4BAAe,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,GAAG,UAAU,KAAM,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,CAAC,CAAC;IACb,CAAC;AACL,CAAC;AAlDD,oCAkDC;AAEM,KAAK,UAAU,aAAa,CAAC,IAAY,EAAE,MAAc,EAAE,eAAsC;IACpG,MAAM,MAAM,GAAG,IAAA,sBAAS,GAAE,CAAC;IAC3B,IAAI,CAAC,eAAe,EAAE,CAAC;QACnB,eAAe,GAAG,MAAM,IAAA,gCAAmB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,WAAW,GAAG,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC;IAEtD,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,WAAW,IAAI,aAAa,eAAe,CAAC,YAAY,0BAA0B,MAAM,EAAE,EAAE;QACpH,OAAO,EAAE;YACL,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,WAAW;SAC7B;KACJ,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC,IAAsB,CAAC;AACtC,CAAC;AAfD,sCAeC;AAEM,KAAK,UAAU,iBAAiB,CAAC,MAAc,EAAE,IAAY,EAAE,eAAqC;IACvG,oCAAoC;IACpC,IAAI,OAAO,GAAqB,EAAE,CAAC;IACnC,MAAM,WAAW,GAAG,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC;IACtD,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,WAAW,IAAI,aAAa,eAAe,CAAC,YAAY,YAAY,EAAE;YAC9F,OAAO,EAAE;gBACL,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,WAAW;aAC7B;SACJ,CAAC,CAAC;QACH,OAAO,GAAG,GAAG,CAAC,IAAwB,CAAC;IAC3C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,UAAU,GAAG,0BAA0B,CAAC;QAC9C,MAAM,UAAU,GAAG,CAAe,CAAC;QACnC,IAAI,IAAA,oCAAuB,EAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;YACrD,IAAA,4BAAe,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,GAAG,UAAU,KAAM,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IAED,IAAI,UAAU,GAAG,EAAE,CAAC;IAEpB,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,4CAA4C;QAC5C,MAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;QAC7D,UAAU,GAAG,GAAG,eAAe,CAAC,QAAQ,YAAY,CAAC;QACrD,uDAAuD;QACvD,MAAM,aAAa,GAAG,WAAW,CAAC;QAClC,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC/E,MAAM,GAAG,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;QACrF,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;IACL,CAAC;SAAM,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,+EAA+E;QAC/E,UAAU,GAAG,MAAM,IAAA,gBAAM,EAAC;YACtB,OAAO,EAAE,0CAA0C;YACnD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC1B,IAAI,EAAE,EAAE,CAAC,oBAAoB;gBAC7B,KAAK,EAAE,EAAE,CAAC,oBAAoB;aACjC,CAAC,CAAC;SACN,CAAC,CAAC;IACP,CAAC;SAAM,CAAC;QACJ,0CAA0C;QAC1C,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC;QAC7C,MAAM,CAAC,IAAI,CAAC,4BAA4B,UAAU,EAAE,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,UAAU,CAAC;AACtB,CAAC;AAnDD,8CAmDC;AAGM,KAAK,UAAU,cAAc,CAAC,MAAc,EAAE,IAAY,EAAE,eAAqC,EAAE,MAAc;IACpH,MAAM,WAAW,GAAG,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC;IACtD,IAAI,CAAC;QACD,MAAM,eAAK,CAAC,IAAI,CAAC,WAAW,IAAI,aAAa,eAAe,CAAC,YAAY,qBAAqB,MAAM,mBAAmB,EAAE,EAAE,EAAE;YACzH,OAAO,EAAE;gBACL,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,WAAW;aAC7B;SACJ,CAAC,CAAC;IACP,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,UAAU,GAAG,gCAAgC,CAAC;QACpD,MAAM,UAAU,GAAG,CAAe,CAAC;QACnC,IAAI,IAAA,oCAAuB,EAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;YACrD,IAAA,4BAAe,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,GAAG,UAAU,KAAM,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC;AACL,CAAC;AAnBD,wCAmBC;AAEM,KAAK,UAAU,oBAAoB,CAAC,MAAc,EAAE,IAAY,EAAE,eAAqC,EAAE,MAAc;IAC1H,oCAAoC;IACpC,MAAM,WAAW,GAAG,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC;IACtD,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,WAAW,IAAI,aAAa,eAAe,CAAC,YAAY,qBAAqB,MAAM,cAAc,EAAE;YAC3H,OAAO,EAAE;gBACL,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,WAAW;aAC7B;SACJ,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,IAAyB,CAAC;IACzC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,MAAM,UAAU,GAAG,0BAA0B,CAAC;QAC9C,MAAM,UAAU,GAAG,CAAe,CAAC;QACnC,IAAI,IAAA,oCAAuB,EAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;YACrD,IAAA,4BAAe,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC5C,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,GAAG,UAAU,KAAM,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACL,CAAC;AArBD,oDAqBC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"db_wizard.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/db_wizard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,UAAU,EAAE,MAAM,IAAI,CAAC;AAWtC,wBAAsB,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAiF3E"}
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.db_wizard = void 0;
|
|
7
|
+
const pg_1 = require("pg");
|
|
8
|
+
const error_1 = require("../error");
|
|
9
|
+
const dockerode_1 = __importDefault(require("dockerode"));
|
|
10
|
+
const utils_1 = require("../utils");
|
|
11
|
+
const config_1 = require("./config");
|
|
12
|
+
const yaml_1 = __importDefault(require("yaml"));
|
|
13
|
+
const cloudutils_1 = require("./cloudutils/cloudutils");
|
|
14
|
+
const databases_1 = require("./cloudutils/databases");
|
|
15
|
+
const prompt_sync_1 = __importDefault(require("prompt-sync"));
|
|
16
|
+
async function db_wizard(poolConfig) {
|
|
17
|
+
const logger = (0, cloudutils_1.getLogger)();
|
|
18
|
+
// 1. Check the connectivity to the database. Return if successful. If cannot connect, continue to the following steps.
|
|
19
|
+
const dbConnectionError = await checkDbConnectivity(poolConfig);
|
|
20
|
+
if (dbConnectionError === null) {
|
|
21
|
+
return poolConfig;
|
|
22
|
+
}
|
|
23
|
+
// 2. If the error is due to password authentication or the configuration is non-default, surface the error and exit.
|
|
24
|
+
const errorStr = dbConnectionError.toString();
|
|
25
|
+
if (errorStr.includes('password authentication failed') || errorStr.includes('28P01')) {
|
|
26
|
+
throw new error_1.DBOSInitializationError(`Could not connect to Postgres: password authentication failed: ${errorStr}`);
|
|
27
|
+
}
|
|
28
|
+
if (poolConfig.host !== 'localhost' || poolConfig.port !== 5432 || poolConfig.user !== 'postgres') {
|
|
29
|
+
throw new error_1.DBOSInitializationError(`Could not connect to the database. Exception: ${errorStr}`);
|
|
30
|
+
}
|
|
31
|
+
logger.warn('Postgres not detected locally');
|
|
32
|
+
// 3. If the database config is the default one, check if the user has Docker properly installed.
|
|
33
|
+
logger.info("Attempting to start Postgres via Docker");
|
|
34
|
+
const hasDocker = await checkDockerInstalled();
|
|
35
|
+
// 4. If Docker is installed, prompt the user to start a local Docker based Postgres, and then set the PGPASSWORD to 'dbos' and try to connect to the database.
|
|
36
|
+
let dockerStarted = false;
|
|
37
|
+
if (hasDocker) {
|
|
38
|
+
dockerStarted = await startDockerPostgres(logger, poolConfig);
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
logger.warn("Docker not detected locally");
|
|
42
|
+
}
|
|
43
|
+
// 5. If no Docker, then prompt the user to log in to DBOS Cloud and provision a DB there. Wait for the remote DB to be ready, and then create a copy of the original config file, and then load the remote connection string to the local config file.
|
|
44
|
+
let localSuffix = false;
|
|
45
|
+
if (!dockerStarted) {
|
|
46
|
+
logger.info("Attempting to connect to Postgres via DBOS Cloud");
|
|
47
|
+
const cred = await (0, cloudutils_1.getCloudCredentials)(cloudutils_1.DBOSCloudHost, logger);
|
|
48
|
+
const dbName = await (0, databases_1.chooseAppDBServer)(logger, cloudutils_1.DBOSCloudHost, cred);
|
|
49
|
+
const db = await (0, databases_1.getUserDBInfo)(cloudutils_1.DBOSCloudHost, dbName, cred);
|
|
50
|
+
if (!db.IsLinked) {
|
|
51
|
+
await (0, databases_1.createUserRole)(logger, cloudutils_1.DBOSCloudHost, cred, db.PostgresInstanceName);
|
|
52
|
+
}
|
|
53
|
+
poolConfig.host = db.HostName;
|
|
54
|
+
poolConfig.port = db.Port;
|
|
55
|
+
if (db.SupabaseReference) {
|
|
56
|
+
poolConfig.user = `postgres.${db.SupabaseReference}`;
|
|
57
|
+
const prompt = (0, prompt_sync_1.default)({ sigint: true });
|
|
58
|
+
poolConfig.password = prompt("Enter your Supabase database password: ", { echo: "*" });
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
const dbCredentials = await (0, databases_1.getUserDBCredentials)(logger, cloudutils_1.DBOSCloudHost, cred, db.PostgresInstanceName);
|
|
62
|
+
poolConfig.user = db.DatabaseUsername;
|
|
63
|
+
poolConfig.password = dbCredentials.Password;
|
|
64
|
+
}
|
|
65
|
+
poolConfig.database = `${poolConfig.database}_local`;
|
|
66
|
+
poolConfig.ssl = { rejectUnauthorized: false };
|
|
67
|
+
localSuffix = true;
|
|
68
|
+
const checkError = await checkDbConnectivity(poolConfig);
|
|
69
|
+
if (checkError !== null) {
|
|
70
|
+
throw new error_1.DBOSInitializationError(`Could not connect to the database. Exception: ${checkError.toString()}`);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
// 6. Save the config to the config file and return the updated config.
|
|
74
|
+
const configFileContent = (0, utils_1.readFileSync)(config_1.dbosConfigFilePath);
|
|
75
|
+
const config = yaml_1.default.parseDocument(configFileContent);
|
|
76
|
+
config.setIn(['database', 'hostname'], poolConfig.host);
|
|
77
|
+
config.setIn(['database', 'port'], poolConfig.port);
|
|
78
|
+
config.setIn(['database', 'username'], poolConfig.user);
|
|
79
|
+
config.setIn(['database', 'password'], poolConfig.password);
|
|
80
|
+
config.setIn(['database', 'local_suffix'], localSuffix);
|
|
81
|
+
(0, config_1.writeConfigFile)(config, config_1.dbosConfigFilePath);
|
|
82
|
+
return poolConfig;
|
|
83
|
+
}
|
|
84
|
+
exports.db_wizard = db_wizard;
|
|
85
|
+
async function checkDbConnectivity(config) {
|
|
86
|
+
// Add a default connection timeout if not specified
|
|
87
|
+
const configWithTimeout = {
|
|
88
|
+
...config,
|
|
89
|
+
connectionTimeoutMillis: config.connectionTimeoutMillis ?? 2000, // 2 second timeout
|
|
90
|
+
database: "postgres"
|
|
91
|
+
};
|
|
92
|
+
const pool = new pg_1.Pool(configWithTimeout);
|
|
93
|
+
try {
|
|
94
|
+
const client = await pool.connect();
|
|
95
|
+
try {
|
|
96
|
+
await client.query('SELECT 1;');
|
|
97
|
+
return null;
|
|
98
|
+
}
|
|
99
|
+
catch (error) {
|
|
100
|
+
return error instanceof Error ? error : new Error('Unknown database error');
|
|
101
|
+
}
|
|
102
|
+
finally {
|
|
103
|
+
client.release();
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
catch (error) {
|
|
107
|
+
return error instanceof Error ? error : new Error('Failed to connect to database');
|
|
108
|
+
}
|
|
109
|
+
finally {
|
|
110
|
+
// End the pool
|
|
111
|
+
await pool.end();
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
async function startDockerPostgres(logger, poolConfig) {
|
|
115
|
+
logger.info("Starting a Postgres Docker container...");
|
|
116
|
+
const docker = new dockerode_1.default();
|
|
117
|
+
poolConfig.password = "dbos";
|
|
118
|
+
const containerName = "dbos-db";
|
|
119
|
+
const pgData = "/var/lib/postgresql/data";
|
|
120
|
+
try {
|
|
121
|
+
// Create and start the container
|
|
122
|
+
const container = await docker.createContainer({
|
|
123
|
+
Image: "pgvector/pgvector:pg16",
|
|
124
|
+
name: containerName,
|
|
125
|
+
Env: [
|
|
126
|
+
`POSTGRES_PASSWORD=${poolConfig.password}`,
|
|
127
|
+
`PGDATA=${pgData}`
|
|
128
|
+
],
|
|
129
|
+
HostConfig: {
|
|
130
|
+
PortBindings: {
|
|
131
|
+
"5432/tcp": [{ HostPort: poolConfig.port.toString() }]
|
|
132
|
+
},
|
|
133
|
+
Binds: [`${pgData}:${pgData}:rw`],
|
|
134
|
+
AutoRemove: true
|
|
135
|
+
}
|
|
136
|
+
});
|
|
137
|
+
await container.start();
|
|
138
|
+
// Wait for PostgreSQL to be ready
|
|
139
|
+
let attempts = 30;
|
|
140
|
+
while (attempts > 0) {
|
|
141
|
+
if (attempts % 5 === 0) {
|
|
142
|
+
logger.info("Waiting for Postgres Docker container to start...");
|
|
143
|
+
}
|
|
144
|
+
if (await checkDbConnectivity(poolConfig) === null) {
|
|
145
|
+
return true;
|
|
146
|
+
}
|
|
147
|
+
attempts--;
|
|
148
|
+
await (0, utils_1.sleepms)(1000);
|
|
149
|
+
}
|
|
150
|
+
logger.error("Failed to start Postgres Docker container.");
|
|
151
|
+
return false;
|
|
152
|
+
}
|
|
153
|
+
catch (error) {
|
|
154
|
+
logger.error("Error starting container:", error);
|
|
155
|
+
return false;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
async function checkDockerInstalled() {
|
|
159
|
+
try {
|
|
160
|
+
const docker = new dockerode_1.default();
|
|
161
|
+
await docker.ping();
|
|
162
|
+
return true;
|
|
163
|
+
}
|
|
164
|
+
catch (error) {
|
|
165
|
+
return false;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
//# sourceMappingURL=db_wizard.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"db_wizard.js","sourceRoot":"","sources":["../../../src/dbos-runtime/db_wizard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { GlobalLogger } from "../telemetry/logs";
|
|
2
2
|
import { ConfigFile } from "./config";
|
|
3
|
+
import { PoolConfig } from "pg";
|
|
3
4
|
export declare function migrate(configFile: ConfigFile, logger: GlobalLogger): Promise<0 | 1>;
|
|
4
|
-
export declare function checkDatabaseExists(
|
|
5
|
+
export declare function checkDatabaseExists(pgUserConfig: PoolConfig, logger: GlobalLogger): Promise<boolean>;
|
|
5
6
|
export declare function rollbackMigration(configFile: ConfigFile, logger: GlobalLogger): 0 | 1;
|
|
6
7
|
//# 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,EAAuB,MAAM,UAAU,CAAC;
|
|
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,EAAuB,MAAM,UAAU,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAU,MAAM,IAAI,CAAC;AAMxC,wBAAsB,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,kBA0DzE;AAED,wBAAsB,mBAAmB,CAAC,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,oBAYvF;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,SAqB7E"}
|
|
@@ -8,13 +8,15 @@ const pg_1 = require("pg");
|
|
|
8
8
|
const user_db_schema_1 = require("../../schemas/user_db_schema");
|
|
9
9
|
const system_database_1 = require("../system_database");
|
|
10
10
|
const user_database_1 = require("../user_database");
|
|
11
|
+
const db_wizard_1 = require("./db_wizard");
|
|
11
12
|
async function migrate(configFile, logger) {
|
|
12
13
|
const userDBName = configFile.database.app_db_name;
|
|
13
14
|
logger.info(`Starting migration: creating database ${userDBName} if it does not exist`);
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
let poolConfig = (0, config_1.constructPoolConfig)(configFile);
|
|
16
|
+
poolConfig = await (0, db_wizard_1.db_wizard)(poolConfig);
|
|
17
|
+
if (!(await checkDatabaseExists(poolConfig, logger))) {
|
|
18
|
+
const app_database = poolConfig.database;
|
|
19
|
+
const postgresConfig = { ...poolConfig, database: "postgres" };
|
|
18
20
|
const postgresClient = new pg_1.Client(postgresConfig);
|
|
19
21
|
let connection_failed = true;
|
|
20
22
|
try {
|
|
@@ -54,7 +56,7 @@ async function migrate(configFile, logger) {
|
|
|
54
56
|
}
|
|
55
57
|
logger.info("Creating DBOS tables and system database.");
|
|
56
58
|
try {
|
|
57
|
-
await createDBOSTables(configFile);
|
|
59
|
+
await createDBOSTables(configFile, poolConfig);
|
|
58
60
|
}
|
|
59
61
|
catch (e) {
|
|
60
62
|
if (e instanceof Error) {
|
|
@@ -69,8 +71,7 @@ async function migrate(configFile, logger) {
|
|
|
69
71
|
return 0;
|
|
70
72
|
}
|
|
71
73
|
exports.migrate = migrate;
|
|
72
|
-
async function checkDatabaseExists(
|
|
73
|
-
const pgUserConfig = (0, config_1.constructPoolConfig)(configFile);
|
|
74
|
+
async function checkDatabaseExists(pgUserConfig, logger) {
|
|
74
75
|
const pgUserClient = new pg_1.Client(pgUserConfig);
|
|
75
76
|
try {
|
|
76
77
|
await pgUserClient.connect(); // Try to establish a connection
|
|
@@ -106,10 +107,8 @@ function rollbackMigration(configFile, logger) {
|
|
|
106
107
|
}
|
|
107
108
|
exports.rollbackMigration = rollbackMigration;
|
|
108
109
|
// Create DBOS system DB and tables.
|
|
109
|
-
|
|
110
|
-
async function createDBOSTables(configFile) {
|
|
110
|
+
async function createDBOSTables(configFile, userPoolConfig) {
|
|
111
111
|
const logger = new logs_1.GlobalLogger();
|
|
112
|
-
const userPoolConfig = (0, config_1.constructPoolConfig)(configFile);
|
|
113
112
|
const systemPoolConfig = { ...userPoolConfig };
|
|
114
113
|
systemPoolConfig.database = configFile.database.sys_db_name ?? `${userPoolConfig.database}_dbos_sys`;
|
|
115
114
|
const pgUserClient = new pg_1.Client(userPoolConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/dbos-runtime/migrate.ts"],"names":[],"mappings":";;;AAAA,iDAA2D;AAC3D,4CAAiD;AACjD,qCAA2D;AAC3D,2BAAwC;AACxC,iEAA6F;AAC7F,wDAA2E;AAC3E,oDAA2G;
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/dbos-runtime/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/dbos-runtime/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAkB5D,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AACD,eAAO,MAAM,iBAAiB,uBAAuB,CAAC;AAEtD,qBAAa,WAAW;IAOc,OAAO,CAAC,QAAQ,CAAC,aAAa;IANlE,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,OAAO,CAA0D;IACzE,OAAO,CAAC,SAAS,CAAC,CAA4B;IAC9C,OAAO,CAAC,aAAa,CAAC,CAA4B;gBAEtC,UAAU,EAAE,UAAU,EAAmB,aAAa,EAAE,iBAAiB;IAMrF;;OAEG;IACG,YAAY;IA0ClB;;OAEG;WACU,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAyBlE,SAAS,IAAI,IAAI;IAOjB;;OAEG;IACG,OAAO;CAkBd"}
|
|
@@ -37,6 +37,7 @@ const url_1 = require("url");
|
|
|
37
37
|
const scheduler_1 = require("../scheduler/scheduler");
|
|
38
38
|
const wfqueue_1 = require("../wfqueue");
|
|
39
39
|
const dbos_1 = require("../dbos");
|
|
40
|
+
const db_wizard_1 = require("./db_wizard");
|
|
40
41
|
exports.defaultEntryPoint = "dist/operations.js";
|
|
41
42
|
class DBOSRuntime {
|
|
42
43
|
runtimeConfig;
|
|
@@ -56,6 +57,7 @@ class DBOSRuntime {
|
|
|
56
57
|
*/
|
|
57
58
|
async initAndStart() {
|
|
58
59
|
try {
|
|
60
|
+
this.dbosConfig.poolConfig = await (0, db_wizard_1.db_wizard)(this.dbosConfig.poolConfig);
|
|
59
61
|
this.dbosExec = new dbos_executor_1.DBOSExecutor(this.dbosConfig);
|
|
60
62
|
dbos_1.DBOS.globalLogger = this.dbosExec.logger;
|
|
61
63
|
this.dbosExec.logger.debug(`Loading classes from entrypoints ${JSON.stringify(this.runtimeConfig.entrypoints)}`);
|
|
@@ -77,7 +79,10 @@ class DBOSRuntime {
|
|
|
77
79
|
}
|
|
78
80
|
}
|
|
79
81
|
catch (error) {
|
|
80
|
-
this.dbosExec
|
|
82
|
+
if (!this.dbosExec) {
|
|
83
|
+
throw error;
|
|
84
|
+
}
|
|
85
|
+
this.dbosExec.logger.error(error);
|
|
81
86
|
if (error instanceof error_1.DBOSFailLoadOperationsError) {
|
|
82
87
|
console.error('\x1b[31m%s\x1b[0m', "Did you compile this application? Hint: run `npm run build` and try again");
|
|
83
88
|
process.exit(1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/dbos-runtime/runtime.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4D;AAC5D,iDAAsD;AACtD,uCAAyB;AACzB,mCAAkC;AAClC,oCAAuD;AACvD,0DAA6B;AAE7B,6BAAoC;AACpC,sDAAuD;AACvD,wCAA2C;AAC3C,kCAA+B;
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../src/dbos-runtime/runtime.ts"],"names":[],"mappings":"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"}
|
package/dist/src/dbos.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbos.d.ts","sourceRoot":"","sources":["../../src/dbos.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAC;AACrD,OAAO,EAKL,WAAW,EAIZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,UAAU,EAAwC,MAAM,iBAAiB,CAAC;AACnF,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EAGf,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAgB,MAAM,kBAAkB,CAAC;AAGzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAiB,aAAa,EAAE,eAAe,EAA6B,MAAM,uBAAuB,CAAC;AACjH,OAAO,EAA4E,kBAAkB,EAAwD,MAAM,cAAc,CAAC;AAIlL,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACxG,OAAO,EAAE,iBAAiB,EAA+C,MAAM,eAAe,CAAC;AAE/F,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,WAAW,IAAI,UAAU,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAG1C,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAgB,MAAM,QAAQ,CAAC;AAElD,OAAO,EAEL,WAAW,EACX,sBAAsB,EACtB,kBAAkB,EAElB,cAAc,EACf,MAAM,GAAG,CAAC;AACX,OAAO,EAAE,kBAAkB,EAAE,MAAM,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"dbos.d.ts","sourceRoot":"","sources":["../../src/dbos.ts"],"names":[],"mappings":"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"}
|
package/dist/src/dbos.js
CHANGED
|
@@ -14,6 +14,7 @@ const middleware_1 = require("./httpServer/middleware");
|
|
|
14
14
|
const wfqueue_1 = require("./wfqueue");
|
|
15
15
|
const handlerTypes_1 = require("./httpServer/handlerTypes");
|
|
16
16
|
const lodash_1 = require("lodash");
|
|
17
|
+
const db_wizard_1 = require("./dbos-runtime/db_wizard");
|
|
17
18
|
function httpApiDec(verb, url) {
|
|
18
19
|
return function apidec(target, propertyKey, inDescriptor) {
|
|
19
20
|
const { descriptor, registration } = (0, decorators_1.registerAndWrapDBOSFunction)(target, propertyKey, inDescriptor);
|
|
@@ -47,6 +48,7 @@ class DBOS {
|
|
|
47
48
|
// Initialize the DBOS executor
|
|
48
49
|
if (!DBOS.dbosConfig) {
|
|
49
50
|
const [dbosConfig, runtimeConfig] = (0, config_1.parseConfigFile)();
|
|
51
|
+
dbosConfig.poolConfig = await (0, db_wizard_1.db_wizard)(dbosConfig.poolConfig);
|
|
50
52
|
DBOS.dbosConfig = dbosConfig;
|
|
51
53
|
DBOS.runtimeConfig = runtimeConfig;
|
|
52
54
|
}
|