@dbos-inc/dbos-sdk 4.28.14-preview → 5.0.2
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/CONTRIBUTING.md +38 -5
- package/README.md +9 -9
- package/dbos-config.schema.json +2 -49
- package/dist/dbos-config.schema.json +2 -49
- package/dist/schemas/system_db_schema.d.ts +0 -12
- package/dist/schemas/system_db_schema.d.ts.map +1 -1
- package/dist/schemas/system_db_schema.js.map +1 -1
- package/dist/src/cli/cli.d.ts +1 -3
- package/dist/src/cli/cli.d.ts.map +1 -1
- package/dist/src/cli/cli.js +9 -36
- package/dist/src/cli/cli.js.map +1 -1
- package/dist/src/client.d.ts +6 -88
- package/dist/src/client.d.ts.map +1 -1
- package/dist/src/client.js +10 -52
- package/dist/src/client.js.map +1 -1
- package/dist/src/conductor/conductor.d.ts +0 -1
- package/dist/src/conductor/conductor.d.ts.map +1 -1
- package/dist/src/conductor/conductor.js +3 -21
- package/dist/src/conductor/conductor.js.map +1 -1
- package/dist/src/conductor/protocol.d.ts +60 -135
- package/dist/src/conductor/protocol.d.ts.map +1 -1
- package/dist/src/conductor/protocol.js +1 -348
- package/dist/src/conductor/protocol.js.map +1 -1
- package/dist/src/config.d.ts +2 -11
- package/dist/src/config.d.ts.map +1 -1
- package/dist/src/config.js +17 -68
- package/dist/src/config.js.map +1 -1
- package/dist/src/context.d.ts +0 -5
- package/dist/src/context.d.ts.map +1 -1
- package/dist/src/context.js +0 -3
- package/dist/src/context.js.map +1 -1
- package/dist/src/datasource.d.ts +2 -4
- package/dist/src/datasource.d.ts.map +1 -1
- package/dist/src/datasource.js +11 -19
- package/dist/src/datasource.js.map +1 -1
- package/dist/src/dbos-executor.d.ts +9 -21
- package/dist/src/dbos-executor.d.ts.map +1 -1
- package/dist/src/dbos-executor.js +16 -37
- package/dist/src/dbos-executor.js.map +1 -1
- package/dist/src/dbos.d.ts +9 -20
- package/dist/src/dbos.d.ts.map +1 -1
- package/dist/src/dbos.js +58 -75
- package/dist/src/dbos.js.map +1 -1
- package/dist/src/debouncer.d.ts.map +1 -1
- package/dist/src/debouncer.js +11 -15
- package/dist/src/debouncer.js.map +1 -1
- package/dist/src/debugpoint.d.ts +0 -15
- package/dist/src/debugpoint.d.ts.map +1 -1
- package/dist/src/debugpoint.js +6 -38
- package/dist/src/debugpoint.js.map +1 -1
- package/dist/src/decorators.d.ts +3 -26
- package/dist/src/decorators.d.ts.map +1 -1
- package/dist/src/decorators.js +28 -72
- package/dist/src/decorators.js.map +1 -1
- package/dist/src/enqueue_options.d.ts +1 -1
- package/dist/src/enqueue_workflow.js +2 -2
- package/dist/src/enqueue_workflow.js.map +1 -1
- package/dist/src/index.d.ts +2 -2
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +1 -3
- package/dist/src/index.js.map +1 -1
- package/dist/src/scheduler/crontab.d.ts +0 -1
- package/dist/src/scheduler/crontab.d.ts.map +1 -1
- package/dist/src/scheduler/crontab.js +1 -2
- package/dist/src/scheduler/crontab.js.map +1 -1
- package/dist/src/serialization.d.ts.map +1 -1
- package/dist/src/serialization.js +0 -4
- package/dist/src/serialization.js.map +1 -1
- package/dist/src/sysdb_migrations/migration_runner.d.ts +1 -5
- package/dist/src/sysdb_migrations/migration_runner.d.ts.map +1 -1
- package/dist/src/sysdb_migrations/migration_runner.js +11 -30
- package/dist/src/sysdb_migrations/migration_runner.js.map +1 -1
- package/dist/src/system_database.d.ts +3 -13
- package/dist/src/system_database.d.ts.map +1 -1
- package/dist/src/system_database.js +3 -20
- package/dist/src/system_database.js.map +1 -1
- package/dist/src/telemetry/logs.d.ts +0 -1
- package/dist/src/telemetry/logs.d.ts.map +1 -1
- package/dist/src/telemetry/logs.js +0 -4
- package/dist/src/telemetry/logs.js.map +1 -1
- package/dist/src/telemetry/traces.d.ts +2 -3
- package/dist/src/telemetry/traces.d.ts.map +1 -1
- package/dist/src/telemetry/traces.js +3 -16
- package/dist/src/telemetry/traces.js.map +1 -1
- package/dist/src/utils.d.ts +0 -5
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +2 -17
- package/dist/src/utils.js.map +1 -1
- package/dist/src/workflow.d.ts +6 -21
- package/dist/src/workflow.d.ts.map +1 -1
- package/dist/src/workflow.js +11 -38
- package/dist/src/workflow.js.map +1 -1
- package/dist/src/workflow_management.d.ts.map +1 -1
- package/dist/src/workflow_management.js +5 -6
- package/dist/src/workflow_management.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -3
package/dist/src/config.js
CHANGED
|
@@ -3,10 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.overwriteConfigForDBOSCloud = exports.getRuntimeConfig = exports.translateDbosConfig = exports.getDbosConfig = exports.getSystemDatabaseUrl = exports.isValidDatabaseName = exports.
|
|
6
|
+
exports.overwriteConfigForDBOSCloud = exports.getRuntimeConfig = exports.translateDbosConfig = exports.getDbosConfig = exports.getSystemDatabaseUrl = exports.isValidDatabaseName = exports.readConfigFile = exports.substituteEnvVars = exports.dbosConfigFilePath = void 0;
|
|
7
7
|
const utils_1 = require("./utils");
|
|
8
8
|
const yaml_1 = __importDefault(require("yaml"));
|
|
9
|
-
const fs_1 = require("fs");
|
|
10
9
|
const path_1 = __importDefault(require("path"));
|
|
11
10
|
const assert_1 = __importDefault(require("assert"));
|
|
12
11
|
const database_utils_1 = require("./database_utils");
|
|
@@ -50,21 +49,6 @@ async function readConfigFile(dirPath) {
|
|
|
50
49
|
}
|
|
51
50
|
}
|
|
52
51
|
exports.readConfigFile = readConfigFile;
|
|
53
|
-
function writeConfigFile(configFile, configFilePath) {
|
|
54
|
-
try {
|
|
55
|
-
const configFileContent = yaml_1.default.stringify(configFile);
|
|
56
|
-
(0, fs_1.writeFileSync)(configFilePath, configFileContent);
|
|
57
|
-
}
|
|
58
|
-
catch (e) {
|
|
59
|
-
if (e instanceof Error) {
|
|
60
|
-
throw new Error(`Failed to write config to ${configFilePath}: ${e.message}`);
|
|
61
|
-
}
|
|
62
|
-
else {
|
|
63
|
-
throw e;
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
exports.writeConfigFile = writeConfigFile;
|
|
68
52
|
function isValidDatabaseName(dbName) {
|
|
69
53
|
if (dbName.length < 1 || dbName.length > 63) {
|
|
70
54
|
return false;
|
|
@@ -117,22 +101,19 @@ function getSystemDatabaseUrl(configFile) {
|
|
|
117
101
|
exports.getSystemDatabaseUrl = getSystemDatabaseUrl;
|
|
118
102
|
function getDbosConfig(config, options = {}) {
|
|
119
103
|
(0, assert_1.default)(config.language === undefined || config.language === 'node', `Config file specifies invalid language ${config.language}`);
|
|
120
|
-
|
|
104
|
+
let dbosConfig = {
|
|
121
105
|
name: config.name,
|
|
122
106
|
systemDatabaseUrl: config.system_database_url,
|
|
123
107
|
systemDatabaseSchemaName: config.system_database_schema_name,
|
|
124
108
|
logLevel: options.logLevel ?? config.telemetry?.logs?.logLevel,
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
109
|
+
};
|
|
110
|
+
if (utils_1.globalParams.dbosCloud) {
|
|
111
|
+
dbosConfig = overwriteConfigForDBOSCloud(dbosConfig);
|
|
112
|
+
}
|
|
113
|
+
return translateDbosConfig(dbosConfig);
|
|
130
114
|
}
|
|
131
115
|
exports.getDbosConfig = getDbosConfig;
|
|
132
|
-
function
|
|
133
|
-
return endpoint ? (Array.isArray(endpoint) ? endpoint : [endpoint]) : [];
|
|
134
|
-
}
|
|
135
|
-
function translateDbosConfig(options, forceConsole = false) {
|
|
116
|
+
function translateDbosConfig(options) {
|
|
136
117
|
if (options.maxConcurrentQueueDispatches !== undefined &&
|
|
137
118
|
(!Number.isInteger(options.maxConcurrentQueueDispatches) || options.maxConcurrentQueueDispatches <= 0)) {
|
|
138
119
|
throw new Error('maxConcurrentQueueDispatches must be a positive integer');
|
|
@@ -159,7 +140,6 @@ function translateDbosConfig(options, forceConsole = false) {
|
|
|
159
140
|
logs: {
|
|
160
141
|
logLevel: options.logLevel || 'info',
|
|
161
142
|
addContextMetadata: options.addContextMetadata,
|
|
162
|
-
forceConsole,
|
|
163
143
|
logger: options.logger,
|
|
164
144
|
},
|
|
165
145
|
OTLPExporter: {
|
|
@@ -180,54 +160,23 @@ exports.translateDbosConfig = translateDbosConfig;
|
|
|
180
160
|
function getRuntimeConfig(config) {
|
|
181
161
|
return {
|
|
182
162
|
start: config.runtimeConfig?.start ?? [],
|
|
183
|
-
setup: config.runtimeConfig?.setup ?? [],
|
|
184
163
|
};
|
|
185
164
|
}
|
|
186
165
|
exports.getRuntimeConfig = getRuntimeConfig;
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
// 1. Use the application name from the file. This is a defensive measure to ensure the application name is whatever it was registered with in the cloud
|
|
190
|
-
// 2. use the database URL from environment var
|
|
191
|
-
// 3. OTLP traces endpoints (add the config data to the provided config)
|
|
166
|
+
// DBOS Cloud supplies the registered app name, system database, and OTLP collector through environment variables.
|
|
167
|
+
function overwriteConfigForDBOSCloud(config) {
|
|
192
168
|
const systemDatabaseUrl = process.env.DBOS_SYSTEM_DATABASE_URL;
|
|
193
169
|
(0, assert_1.default)(systemDatabaseUrl, 'DBOS_SYSTEM_DATABASE_URL must be set in DBOS Cloud environment');
|
|
194
|
-
const appName = configFile.name ?? providedDBOSConfig.name;
|
|
195
|
-
const logsSet = new Set(providedDBOSConfig.telemetry.OTLPExporter?.logsEndpoint);
|
|
196
|
-
const logsEndpoint = configFile.telemetry?.OTLPExporter?.logsEndpoint;
|
|
197
|
-
if (logsEndpoint) {
|
|
198
|
-
if (Array.isArray(logsEndpoint)) {
|
|
199
|
-
logsEndpoint.forEach((endpoint) => logsSet.add(endpoint));
|
|
200
|
-
}
|
|
201
|
-
else {
|
|
202
|
-
logsSet.add(logsEndpoint);
|
|
203
|
-
}
|
|
204
|
-
}
|
|
205
|
-
const tracesSet = new Set(providedDBOSConfig.telemetry.OTLPExporter?.tracesEndpoint);
|
|
206
|
-
const tracesEndpoint = configFile.telemetry?.OTLPExporter?.tracesEndpoint;
|
|
207
|
-
if (tracesEndpoint) {
|
|
208
|
-
if (Array.isArray(tracesEndpoint)) {
|
|
209
|
-
tracesEndpoint.forEach((endpoint) => tracesSet.add(endpoint));
|
|
210
|
-
}
|
|
211
|
-
else {
|
|
212
|
-
tracesSet.add(tracesEndpoint);
|
|
213
|
-
}
|
|
214
|
-
}
|
|
215
170
|
return {
|
|
216
|
-
...
|
|
217
|
-
name:
|
|
171
|
+
...config,
|
|
172
|
+
name: process.env.DBOS_APP_NAME || config.name,
|
|
218
173
|
systemDatabaseUrl,
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
logs: {
|
|
222
|
-
...providedDBOSConfig.telemetry.logs,
|
|
223
|
-
},
|
|
224
|
-
OTLPExporter: {
|
|
225
|
-
logsEndpoint: Array.from(logsSet).filter((e) => !!e),
|
|
226
|
-
tracesEndpoint: Array.from(tracesSet).filter((e) => !!e),
|
|
227
|
-
},
|
|
228
|
-
otelAttributeFormat: providedDBOSConfig.telemetry.otelAttributeFormat,
|
|
229
|
-
},
|
|
174
|
+
otlpLogsEndpoints: withEndpoint(config.otlpLogsEndpoints, process.env.DBOS__OTLP_LOGS_ENDPOINT),
|
|
175
|
+
otlpTracesEndpoints: withEndpoint(config.otlpTracesEndpoints, process.env.DBOS__OTLP_TRACES_ENDPOINT),
|
|
230
176
|
};
|
|
231
177
|
}
|
|
232
178
|
exports.overwriteConfigForDBOSCloud = overwriteConfigForDBOSCloud;
|
|
179
|
+
function withEndpoint(endpoints, endpoint) {
|
|
180
|
+
return Array.from(new Set([...(endpoints ?? []), endpoint])).filter((e) => !!e);
|
|
181
|
+
}
|
|
233
182
|
//# sourceMappingURL=config.js.map
|
package/dist/src/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/src/context.d.ts
CHANGED
|
@@ -17,19 +17,14 @@ export interface DBOSContextOptions {
|
|
|
17
17
|
authenticatedUser?: string;
|
|
18
18
|
authenticatedRoles?: string[];
|
|
19
19
|
assumedRole?: string;
|
|
20
|
-
operationType?: string;
|
|
21
|
-
operationCaller?: string;
|
|
22
20
|
workflowTimeoutMS?: number | null;
|
|
23
21
|
serializationType?: WorkflowSerializationFormat;
|
|
24
22
|
}
|
|
25
23
|
export interface DBOSLocalCtx extends DBOSContextOptions {
|
|
26
|
-
parentCtx?: DBOSLocalCtx;
|
|
27
24
|
workflowId?: string;
|
|
28
25
|
curWFFunctionId?: number;
|
|
29
26
|
activeStreamReads?: number;
|
|
30
|
-
presetID?: boolean;
|
|
31
27
|
deadlineEpochMS?: number;
|
|
32
|
-
inRecovery?: boolean;
|
|
33
28
|
curStepFunctionId?: number;
|
|
34
29
|
stepStatus?: StepStatus;
|
|
35
30
|
curTxFunctionId?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAIxD,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,aAAa,CAAC,EAAE,WAAW,CAAC;CAC7B;AAED,MAAM,WAAW,kBAAkB;IACjC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAIxD,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AAEzD,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,aAAa,CAAC,EAAE,WAAW,CAAC;CAC7B;AAED,MAAM,WAAW,kBAAkB;IACjC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,iBAAiB,CAAC,EAAE,2BAA2B,CAAC;CACjD;AAED,MAAM,WAAW,YAAa,SAAQ,kBAAkB;IACtD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,YAAY,WAGpD;AAeD,wBAAgB,eAAe,CAAC,GAAG,EAAE,YAAY,WAKhD;AAID,wBAAgB,sBAAsB,IAAI,YAAY,GAAG,SAAS,CAEjE;AAED,wBAAgB,WAAW,CAAC,UAAU,CAAC,EAAE,MAAM,sBAW9C;AAED,wBAAgB,sBAAsB,IAAI,MAAM,CAI/C;AAGD,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAOvE;AAED,wBAAgB,aAAa,IAAI,MAAM,CAStC;AAED,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAEpG;AAED,wBAAsB,oBAAoB,CAAC,CAAC,EAC1C,IAAI,EAAE,YAAY,GAAG,SAAS,EAC9B,GAAG,EAAE,YAAY,EACjB,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACzB,OAAO,CAAC,CAAC,CAAC,CAQZ;AAED,wBAAsB,wBAAwB,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,cAW5F;AAED,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,IAAI,EAAE,YAAY,EAClB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,aAAa,EAAE,WAAW,GAAG,SAAS,EACtC,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,cAsB3B"}
|
package/dist/src/context.js
CHANGED
|
@@ -88,7 +88,6 @@ async function runWithParentContext(pctx, ctx, callback) {
|
|
|
88
88
|
return await asyncLocalCtx.run({
|
|
89
89
|
...pctx,
|
|
90
90
|
...ctx,
|
|
91
|
-
parentCtx: pctx,
|
|
92
91
|
}, callback);
|
|
93
92
|
}
|
|
94
93
|
exports.runWithParentContext = runWithParentContext;
|
|
@@ -98,7 +97,6 @@ async function runWithDataSourceContext(callnum, callback) {
|
|
|
98
97
|
return await asyncLocalCtx.run({
|
|
99
98
|
...pctx,
|
|
100
99
|
curTxFunctionId: callnum,
|
|
101
|
-
parentCtx: pctx,
|
|
102
100
|
logger: dbos_executor_1.DBOSExecutor.globalInstance.ctxLogger,
|
|
103
101
|
}, callback);
|
|
104
102
|
}
|
|
@@ -118,7 +116,6 @@ async function runInStepContext(pctx, stepID, maxAttempts, currentAttempt, timeo
|
|
|
118
116
|
return await runWithParentContext(pctx, {
|
|
119
117
|
stepStatus: stepStatus,
|
|
120
118
|
curStepFunctionId: stepID,
|
|
121
|
-
parentCtx: pctx,
|
|
122
119
|
logger: dbos_executor_1.DBOSExecutor.globalInstance.ctxLogger,
|
|
123
120
|
}, callback);
|
|
124
121
|
}
|
package/dist/src/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":";;;AACA,6CAAgD;AAChD,mCAA6D;AAC7D,mDAA+C;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/context.ts"],"names":[],"mappings":"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"}
|
package/dist/src/datasource.d.ts
CHANGED
|
@@ -6,7 +6,6 @@ import { DBOSError } from './error';
|
|
|
6
6
|
*/
|
|
7
7
|
export interface DataSourceTransactionHandler {
|
|
8
8
|
readonly name: string;
|
|
9
|
-
readonly dsType: string;
|
|
10
9
|
/**
|
|
11
10
|
* Will be called by DBOS during launch.
|
|
12
11
|
* This may be a no-op if the DS is initialized before telling DBOS about the DS at all.
|
|
@@ -66,8 +65,8 @@ export interface DBOSDataSource<Config extends {
|
|
|
66
65
|
* @param options - Data source name and configuration
|
|
67
66
|
* @returns the return from `callback`
|
|
68
67
|
*/
|
|
69
|
-
export declare function runTransaction<T>(callback: () => Promise<T>, funcName: string, options
|
|
70
|
-
dsName
|
|
68
|
+
export declare function runTransaction<T>(callback: () => Promise<T>, funcName: string, options: {
|
|
69
|
+
dsName: string;
|
|
71
70
|
config?: unknown;
|
|
72
71
|
}): Promise<T>;
|
|
73
72
|
export declare function registerTransaction<This, Args extends unknown[], Return, Config extends FunctionName>(dsName: string, func: (this: This, ...args: Args) => Promise<Return>, config?: Config): (this: This, ...args: Args) => Promise<Return>;
|
|
@@ -124,5 +123,4 @@ export declare function createTransactionCompletionSchemaPG(schemaName?: string)
|
|
|
124
123
|
export declare function createTransactionCompletionTablePG(schemaName?: string): string;
|
|
125
124
|
export declare function isPGRetriableTransactionError(error: unknown): boolean;
|
|
126
125
|
export declare function isPGKeyConflictError(error: unknown): boolean;
|
|
127
|
-
export declare function isPGFailedSqlTransactionError(error: unknown): boolean;
|
|
128
126
|
//# sourceMappingURL=datasource.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,YAAY,EAKb,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAsC,MAAM,SAAS,CAAC;AAIxE;;;GAGG;AACH,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"datasource.d.ts","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":"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"}
|
package/dist/src/datasource.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.isPGKeyConflictError = exports.isPGRetriableTransactionError = exports.createTransactionCompletionTablePG = exports.createTransactionCompletionSchemaPG = exports.checkSchemaInstallationPG = exports.replayRecordedStep = exports.DBOSStepAlreadyRecordedError = exports.DBOSError = exports.PGIsolationLevel = exports.registerDataSource = exports.registerTransaction = exports.runTransaction = void 0;
|
|
4
4
|
const context_1 = require("./context");
|
|
5
5
|
const dbos_1 = require("./dbos");
|
|
6
6
|
const dbos_executor_1 = require("./dbos-executor");
|
|
@@ -21,10 +21,9 @@ const superjson_1 = require("superjson");
|
|
|
21
21
|
* @param options - Data source name and configuration
|
|
22
22
|
* @returns the return from `callback`
|
|
23
23
|
*/
|
|
24
|
-
async function runTransaction(callback, funcName, options
|
|
24
|
+
async function runTransaction(callback, funcName, options) {
|
|
25
25
|
(0, decorators_1.ensureDBOSIsLaunched)('transactions');
|
|
26
|
-
const
|
|
27
|
-
const ds = (0, decorators_1.getTransactionalDataSource)(dsn);
|
|
26
|
+
const ds = (0, decorators_1.getTransactionalDataSource)(options.dsName);
|
|
28
27
|
if (!dbos_1.DBOS.isWithinWorkflow()) {
|
|
29
28
|
return await (0, context_1.runWithDataSourceContext)(0, async () => {
|
|
30
29
|
return await ds.invokeTransactionFunction(options.config ?? {}, undefined, callback);
|
|
@@ -39,10 +38,9 @@ async function runTransaction(callback, funcName, options = {}) {
|
|
|
39
38
|
operationUUID: dbos_1.DBOS.workflowID,
|
|
40
39
|
operationType: dbos_executor_1.OperationType.TRANSACTION,
|
|
41
40
|
operationName: funcName,
|
|
42
|
-
authenticatedUser: dbos_1.DBOS.authenticatedUser
|
|
43
|
-
assumedRole: dbos_1.DBOS.assumedRole
|
|
44
|
-
authenticatedRoles: dbos_1.DBOS.authenticatedRoles
|
|
45
|
-
// isolationLevel: txnInfo.config.isolationLevel, // TODO: Pluggable
|
|
41
|
+
authenticatedUser: dbos_1.DBOS.authenticatedUser,
|
|
42
|
+
assumedRole: dbos_1.DBOS.assumedRole,
|
|
43
|
+
authenticatedRoles: dbos_1.DBOS.authenticatedRoles,
|
|
46
44
|
}, dbos_1.DBOS.span);
|
|
47
45
|
try {
|
|
48
46
|
const res = await (0, traces_1.runWithTrace)(span, async () => {
|
|
@@ -51,7 +49,7 @@ async function runTransaction(callback, funcName, options = {}) {
|
|
|
51
49
|
return await ds.invokeTransactionFunction(options.config ?? {}, undefined, callback);
|
|
52
50
|
});
|
|
53
51
|
}, funcName,
|
|
54
|
-
//
|
|
52
|
+
// The isInWorkflow check above guarantees workflowID is set.
|
|
55
53
|
dbos_1.DBOS.workflowID, callnum);
|
|
56
54
|
});
|
|
57
55
|
span.setStatus({ code: traces_1.SpanStatusCode.OK });
|
|
@@ -68,12 +66,11 @@ async function runTransaction(callback, funcName, options = {}) {
|
|
|
68
66
|
exports.runTransaction = runTransaction;
|
|
69
67
|
// Transaction wrapper
|
|
70
68
|
function registerTransaction(dsName, func, config) {
|
|
71
|
-
const dsn = dsName ?? '<default>';
|
|
72
69
|
const funcName = config?.name ?? func.name;
|
|
73
70
|
const reg = (0, decorators_1.wrapDBOSFunctionAndRegister)(config?.ctorOrProto, config?.className, funcName, funcName, func);
|
|
74
71
|
const invokeWrapper = async function (...rawArgs) {
|
|
75
72
|
(0, decorators_1.ensureDBOSIsLaunched)('transactions');
|
|
76
|
-
const ds = (0, decorators_1.getTransactionalDataSource)(
|
|
73
|
+
const ds = (0, decorators_1.getTransactionalDataSource)(dsName);
|
|
77
74
|
const callFunc = reg.registeredFunction ?? reg.origFunction;
|
|
78
75
|
if (!dbos_1.DBOS.isWithinWorkflow()) {
|
|
79
76
|
return await (0, context_1.runWithDataSourceContext)(0, async () => {
|
|
@@ -88,10 +85,9 @@ function registerTransaction(dsName, func, config) {
|
|
|
88
85
|
operationUUID: dbos_1.DBOS.workflowID,
|
|
89
86
|
operationType: dbos_executor_1.OperationType.TRANSACTION,
|
|
90
87
|
operationName: funcName,
|
|
91
|
-
authenticatedUser: dbos_1.DBOS.authenticatedUser
|
|
92
|
-
assumedRole: dbos_1.DBOS.assumedRole
|
|
93
|
-
authenticatedRoles: dbos_1.DBOS.authenticatedRoles
|
|
94
|
-
// isolationLevel: txnInfo.config.isolationLevel, // TODO: Pluggable
|
|
88
|
+
authenticatedUser: dbos_1.DBOS.authenticatedUser,
|
|
89
|
+
assumedRole: dbos_1.DBOS.assumedRole,
|
|
90
|
+
authenticatedRoles: dbos_1.DBOS.authenticatedRoles,
|
|
95
91
|
}, dbos_1.DBOS.span);
|
|
96
92
|
const callnum = (0, context_1.functionIDGetIncrement)();
|
|
97
93
|
try {
|
|
@@ -219,8 +215,4 @@ function isPGKeyConflictError(error) {
|
|
|
219
215
|
return getPGErrorCode(error) === '23505';
|
|
220
216
|
}
|
|
221
217
|
exports.isPGKeyConflictError = isPGKeyConflictError;
|
|
222
|
-
function isPGFailedSqlTransactionError(error) {
|
|
223
|
-
return getPGErrorCode(error) === '25P02';
|
|
224
|
-
}
|
|
225
|
-
exports.isPGFailedSqlTransactionError = isPGFailedSqlTransactionError;
|
|
226
218
|
//# sourceMappingURL=datasource.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":";;;AAAA,uCAA6E;AAC7E,iCAA8B;AAC9B,mDAA8D;AAC9D,6CAOsB;AACtB,mCAAwE;
|
|
1
|
+
{"version":3,"file":"datasource.js","sourceRoot":"","sources":["../../src/datasource.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type WorkflowHandle, type WorkflowParams, type WorkflowStatus, type StepInfo, type ListWorkflowStepsOptions } from './workflow';
|
|
2
2
|
import { type StepConfig } from './step';
|
|
3
|
-
import {
|
|
3
|
+
import type { Conductor } from './conductor/conductor';
|
|
4
4
|
import { Tracer } from './telemetry/traces';
|
|
5
5
|
import { DBOSContextualLogger, DLogger, GlobalLogger } from './telemetry/logs';
|
|
6
6
|
import { SystemDatabase, type WorkflowStatusInternal, type SystemDatabaseStoredResult } from './system_database';
|
|
@@ -8,10 +8,11 @@ import { TypedAsyncFunction } from './decorators';
|
|
|
8
8
|
import { DBOSSerializer } from './serialization';
|
|
9
9
|
import { GetWorkflowsInput } from '.';
|
|
10
10
|
import { Pool } from 'pg';
|
|
11
|
-
export declare const DBOS_QUEUE_MIN_PRIORITY =
|
|
11
|
+
export declare const DBOS_QUEUE_MIN_PRIORITY = 0;
|
|
12
12
|
export declare const DBOS_QUEUE_MAX_PRIORITY: number;
|
|
13
13
|
export interface DBOSConfig {
|
|
14
|
-
name
|
|
14
|
+
/** Application name; scopes this app's workflows, queues, and schedules in the system database. */
|
|
15
|
+
name: string;
|
|
15
16
|
systemDatabaseUrl?: string;
|
|
16
17
|
systemDatabasePoolSize?: number;
|
|
17
18
|
/**
|
|
@@ -100,12 +101,11 @@ export interface DBOSConfig {
|
|
|
100
101
|
}
|
|
101
102
|
export interface DBOSRuntimeConfig {
|
|
102
103
|
start: string[];
|
|
103
|
-
setup: string[];
|
|
104
104
|
}
|
|
105
105
|
export interface TelemetryConfig {
|
|
106
|
-
logs
|
|
107
|
-
OTLPExporter
|
|
108
|
-
otelAttributeFormat
|
|
106
|
+
logs: LoggerConfig;
|
|
107
|
+
OTLPExporter: OTLPExporterConfig;
|
|
108
|
+
otelAttributeFormat: OtelAttributeFormat;
|
|
109
109
|
}
|
|
110
110
|
/**
|
|
111
111
|
* How DBOS span attribute names are emitted to OTLP.
|
|
@@ -124,9 +124,7 @@ export interface OTLPExporterConfig {
|
|
|
124
124
|
}
|
|
125
125
|
export interface LoggerConfig {
|
|
126
126
|
logLevel?: string;
|
|
127
|
-
silent?: boolean;
|
|
128
127
|
addContextMetadata?: boolean;
|
|
129
|
-
forceConsole?: boolean;
|
|
130
128
|
logger?: DLogger;
|
|
131
129
|
}
|
|
132
130
|
export type DBOSConfigInternal = {
|
|
@@ -144,11 +142,6 @@ export type DBOSConfigInternal = {
|
|
|
144
142
|
notificationCoalesceMs?: number;
|
|
145
143
|
observabilityQueryTimeoutMs?: number;
|
|
146
144
|
runMigrations: boolean;
|
|
147
|
-
http?: {
|
|
148
|
-
cors_middleware?: boolean;
|
|
149
|
-
credentials?: boolean;
|
|
150
|
-
allowed_origins?: string[];
|
|
151
|
-
};
|
|
152
145
|
};
|
|
153
146
|
export interface InternalWorkflowParams extends WorkflowParams {
|
|
154
147
|
/** Set only by queue dispatch: the claimed row this run was started from. */
|
|
@@ -168,29 +161,24 @@ export interface PrepareEnqueuedWorkflowOptions {
|
|
|
168
161
|
readonly queuePartitionKey?: string;
|
|
169
162
|
}
|
|
170
163
|
export declare const OperationType: {
|
|
171
|
-
readonly HANDLER: "handler";
|
|
172
164
|
readonly WORKFLOW: "workflow";
|
|
173
165
|
readonly TRANSACTION: "transaction";
|
|
174
166
|
readonly STEP: "step";
|
|
175
167
|
};
|
|
176
|
-
export interface DBOSExecutorOptions {
|
|
177
|
-
systemDatabase?: SystemDatabase;
|
|
178
|
-
}
|
|
179
168
|
export declare class DBOSExecutor {
|
|
180
169
|
#private;
|
|
181
170
|
readonly config: DBOSConfigInternal;
|
|
182
171
|
initialized: boolean;
|
|
172
|
+
conductor: Conductor | undefined;
|
|
183
173
|
readonly systemDatabase: SystemDatabase;
|
|
184
|
-
readonly telemetryCollector: TelemetryCollector;
|
|
185
174
|
static readonly defaultNotificationTimeoutSec = 60;
|
|
186
|
-
readonly systemDBSchemaName: string;
|
|
187
175
|
readonly logger: GlobalLogger;
|
|
188
176
|
readonly ctxLogger: DBOSContextualLogger;
|
|
189
177
|
readonly tracer: Tracer;
|
|
190
178
|
readonly serializer: DBOSSerializer;
|
|
191
179
|
readonly executorID: string;
|
|
192
180
|
static globalInstance: DBOSExecutor | undefined;
|
|
193
|
-
constructor(config: DBOSConfigInternal
|
|
181
|
+
constructor(config: DBOSConfigInternal);
|
|
194
182
|
get appName(): string | undefined;
|
|
195
183
|
init(): Promise<void>;
|
|
196
184
|
/** Wait up to `timeoutMS` for workflows running in this process to finish. Without a timeout, do not wait. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dbos-executor.d.ts","sourceRoot":"","sources":["../../src/dbos-executor.ts"],"names":[],"mappings":"AAcA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,cAAc,EAGnB,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,wBAAwB,EAG9B,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,UAAU,EAAsB,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dbos-executor.d.ts","sourceRoot":"","sources":["../../src/dbos-executor.ts"],"names":[],"mappings":"AAcA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,cAAc,EAGnB,KAAK,cAAc,EACnB,KAAK,QAAQ,EACb,KAAK,wBAAwB,EAG9B,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,KAAK,UAAU,EAAsB,MAAM,QAAQ,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAA+C,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE/E,OAAO,EAAE,cAAc,EAAE,KAAK,sBAAsB,EAAE,KAAK,0BAA0B,EAAE,MAAM,mBAAmB,CAAC;AAEjH,OAAO,EAIL,kBAAkB,EAOnB,MAAM,cAAc,CAAC;AAatB,OAAO,EAEL,cAAc,EAQf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,GAAG,CAAC;AAatC,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAM1B,eAAO,MAAM,uBAAuB,IAAI,CAAC;AACzC,eAAO,MAAM,uBAAuB,QAAc,CAAC;AAGnD,MAAM,WAAW,UAAU;IACzB,mGAAmG;IACnG,IAAI,EAAE,MAAM,CAAC;IAEb,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,IAAI,CAAC;IAC1B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC;;;;;;;;;OASG;IACH,gCAAgC,CAAC,EAAE,MAAM,CAAC;IAE1C,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;;;OAQG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAE1C,8DAA8D;IAC9D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8DAA8D;IAC9D,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,cAAc,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB;;;;;;;;;OASG;IACH,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,gJAAgJ;IAChJ,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC;;;OAGG;IACH,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,YAAY,CAAC;IACnB,YAAY,EAAE,kBAAkB,CAAC;IACjC,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,SAAS,CAAC;AAEvD,MAAM,WAAW,kBAAkB;IACjC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gCAAgC,CAAC,EAAE,MAAM,CAAC;IAC1C,kBAAkB,CAAC,EAAE,IAAI,CAAC;IAC1B,wBAAwB,EAAE,MAAM,CAAC;IACjC,UAAU,EAAE,cAAc,CAAC;IAE3B,SAAS,EAAE,eAAe,CAAC;IAE3B,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,eAAe,EAAE,OAAO,CAAC;IACzB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAC5D,6EAA6E;IAC7E,QAAQ,CAAC,cAAc,CAAC,EAAE,sBAAsB,CAAC;CAClD;AAED,6EAA6E;AAC7E,MAAM,WAAW,8BAA8B;IAC7C,yCAAyC;IACzC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,mGAAmG;IACnG,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,eAAO,MAAM,aAAa;;;;CAIhB,CAAC;AAEX,qBAAa,YAAY;;IAoBX,QAAQ,CAAC,MAAM,EAAE,kBAAkB;IAnB/C,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,SAAS,GAAG,SAAS,CAAa;IAE7C,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAExC,MAAM,CAAC,QAAQ,CAAC,6BAA6B,MAAM;IAEnD,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IAIpC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAA2B;IAEtD,MAAM,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAa;gBAGvC,MAAM,EAAE,kBAAkB;IA4B/C,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IAEK,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmD3B,8GAA8G;IACxG,qBAAqB,CAAC,SAAS,CAAC,EAAE,MAAM;IAIxC,OAAO;WAgBA,mBAAmB,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,0BAA0B,EAAE,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IAO9G,QAAQ,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,EACnC,EAAE,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,EAC5B,MAAM,EAAE,sBAAsB,EAC9B,GAAG,IAAI,EAAE,CAAC,GACT,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAI7B;;;;;;OAMG;IACG,uBAAuB,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,EAClD,EAAE,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,EAC5B,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,8BAA8B,GACtC,OAAO,CAAC,sBAAsB,CAAC;IAoD5B,gBAAgB,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,EAC3C,EAAE,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,EAC5B,MAAM,EAAE,sBAAsB,EAC9B,QAAQ,CAAC,EAAE,MAAM,EACjB,gBAAgB,CAAC,EAAE,MAAM,EACzB,GAAG,IAAI,EAAE,CAAC,GACT,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IA+Z7B;;;;OAIG;IACG,gBAAgB,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,EAC3C,MAAM,EAAE,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,EAChC,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,OAAO,EAAE,MAAM,GAAG,IAAI,EACtB,GAAG,IAAI,EAAE,CAAC,GACT,OAAO,CAAC,CAAC,CAAC;IAiMb;;OAEG;IACG,QAAQ,CAAC,CAAC,EACd,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,MAAM,EACX,cAAc,GAAE,MAAmD,EACnE,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAKpB;;;OAGG;IACH,YAAY,CACV,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE;QACP,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACzC,GACL,OAAO,CAAC,MAAM,CAAC;IAKlB;;OAEG;IACH,gBAAgB,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC;IAIpD,eAAe,CAAC,CAAC,EACrB,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC1B,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,CAAC,CAAC;IAgDP,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAM3G,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAIlE,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAIxE,iBAAiB,CACrB,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,OAAc,EAC1B,OAAO,CAAC,EAAE,wBAAwB,GACjC,OAAO,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC;IAKlC;;;OAGG;IACG,uBAAuB,CAAC,WAAW,GAAE,MAAM,EAAc,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;IAuB9F,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI;IAQhD,wBAAwB;IAqB9B,mGAAmG;IAC7F,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBrE;;;;;;OAMG;IACG,uBAAuB,CAAC,QAAQ,EAAE,sBAAsB,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAoEjG;;;;;;;OAOG;IACH,iBAAiB,IAAI,MAAM;CAc5B"}
|