@dbos-inc/dbos-sdk 3.0.11-preview.gc9233b8190 → 3.0.13-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/authdecorators.d.ts.map +1 -1
- package/dist/src/authdecorators.js +6 -1
- package/dist/src/authdecorators.js.map +1 -1
- package/dist/src/context.d.ts +2 -3
- package/dist/src/context.d.ts.map +1 -1
- package/dist/src/context.js +6 -23
- package/dist/src/context.js.map +1 -1
- package/dist/src/datasource.d.ts +1 -1
- package/dist/src/datasource.d.ts.map +1 -1
- package/dist/src/dbos.d.ts +5 -5
- package/dist/src/dbos.d.ts.map +1 -1
- package/dist/src/dbos.js +6 -9
- package/dist/src/dbos.js.map +1 -1
- package/dist/src/decorators.d.ts +3 -45
- package/dist/src/decorators.d.ts.map +1 -1
- package/dist/src/decorators.js +1 -93
- package/dist/src/decorators.js.map +1 -1
- package/dist/src/httpServer/handler.d.ts +1 -63
- package/dist/src/httpServer/handler.d.ts.map +1 -1
- package/dist/src/httpServer/handler.js +1 -182
- package/dist/src/httpServer/handler.js.map +1 -1
- package/dist/src/httpServer/middleware.d.ts +0 -5
- package/dist/src/httpServer/middleware.d.ts.map +1 -1
- package/dist/src/httpServer/middleware.js +1 -13
- package/dist/src/httpServer/middleware.js.map +1 -1
- package/dist/src/httpServer/server.d.ts.map +1 -1
- package/dist/src/httpServer/server.js +78 -42
- package/dist/src/httpServer/server.js.map +1 -1
- package/dist/src/index.d.ts +3 -13
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +1 -29
- package/dist/src/index.js.map +1 -1
- package/dist/src/scheduler/scheduler.d.ts +0 -3
- package/dist/src/scheduler/scheduler.d.ts.map +1 -1
- package/dist/src/scheduler/scheduler.js +1 -13
- package/dist/src/scheduler/scheduler.js.map +1 -1
- package/dist/src/telemetry/logs.d.ts +6 -3
- package/dist/src/telemetry/logs.d.ts.map +1 -1
- package/dist/src/telemetry/logs.js +1 -1
- package/dist/src/telemetry/logs.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/src/kafka/kafka.d.ts +0 -11
- package/dist/src/kafka/kafka.d.ts.map +0 -1
- package/dist/src/kafka/kafka.js +0 -23
- package/dist/src/kafka/kafka.js.map +0 -1
- package/dist/src/testing/testing_runtime.d.ts +0 -97
- package/dist/src/testing/testing_runtime.d.ts.map +0 -1
- package/dist/src/testing/testing_runtime.js +0 -247
- package/dist/src/testing/testing_runtime.js.map +0 -1
|
@@ -1,151 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ArgSource = exports.
|
|
3
|
+
exports.ArgSource = exports.HandlerParameter = void 0;
|
|
4
4
|
const decorators_1 = require("../decorators");
|
|
5
|
-
const dbos_executor_1 = require("../dbos-executor");
|
|
6
|
-
const context_1 = require("../context");
|
|
7
|
-
const core_1 = require("@opentelemetry/core");
|
|
8
|
-
const api_1 = require("@opentelemetry/api");
|
|
9
5
|
const handlerTypes_1 = require("./handlerTypes");
|
|
10
|
-
const middleware_1 = require("./middleware");
|
|
11
|
-
const paramdecorators_1 = require("../paramdecorators");
|
|
12
|
-
// TODO: this should be refactored to not take a koaContext in.
|
|
13
|
-
class HandlerContextImpl extends context_1.DBOSContextImpl {
|
|
14
|
-
koaContext;
|
|
15
|
-
#dbosExec;
|
|
16
|
-
W3CTraceContextPropagator;
|
|
17
|
-
constructor(dbosExec, koaContext) {
|
|
18
|
-
// Retrieve or generate the request ID
|
|
19
|
-
const requestID = (0, middleware_1.getOrGenerateRequestID)(koaContext.request.headers);
|
|
20
|
-
koaContext.set(middleware_1.RequestIDHeader, requestID);
|
|
21
|
-
// If present, retrieve the trace context from the request
|
|
22
|
-
const httpTracer = new core_1.W3CTraceContextPropagator();
|
|
23
|
-
const extractedSpanContext = api_1.trace.getSpanContext(httpTracer.extract(api_1.ROOT_CONTEXT, koaContext.request.headers, api_1.defaultTextMapGetter));
|
|
24
|
-
let span;
|
|
25
|
-
const spanAttributes = {
|
|
26
|
-
operationType: dbos_executor_1.OperationType.HANDLER,
|
|
27
|
-
requestID: requestID,
|
|
28
|
-
requestIP: koaContext.request.ip,
|
|
29
|
-
requestURL: koaContext.request.url,
|
|
30
|
-
requestMethod: koaContext.request.method,
|
|
31
|
-
};
|
|
32
|
-
if (extractedSpanContext === undefined) {
|
|
33
|
-
span = dbosExec.tracer.startSpan(koaContext.url, spanAttributes);
|
|
34
|
-
}
|
|
35
|
-
else {
|
|
36
|
-
extractedSpanContext.isRemote = true;
|
|
37
|
-
span = dbosExec.tracer.startSpanWithContext(extractedSpanContext, koaContext.url, spanAttributes);
|
|
38
|
-
}
|
|
39
|
-
super(koaContext.url, span, dbosExec.logger);
|
|
40
|
-
this.koaContext = koaContext;
|
|
41
|
-
// If running in DBOS Cloud, set the executor ID
|
|
42
|
-
if (process.env.DBOS__VMID) {
|
|
43
|
-
this.executorID = process.env.DBOS__VMID;
|
|
44
|
-
}
|
|
45
|
-
this.W3CTraceContextPropagator = httpTracer;
|
|
46
|
-
this.request = {
|
|
47
|
-
headers: koaContext.request.headers,
|
|
48
|
-
rawHeaders: koaContext.req.rawHeaders,
|
|
49
|
-
params: koaContext.params,
|
|
50
|
-
body: koaContext.request.body,
|
|
51
|
-
rawBody: koaContext.request.rawBody,
|
|
52
|
-
query: koaContext.request.query,
|
|
53
|
-
querystring: koaContext.request.querystring,
|
|
54
|
-
url: koaContext.request.url,
|
|
55
|
-
ip: koaContext.request.ip,
|
|
56
|
-
requestID: requestID,
|
|
57
|
-
};
|
|
58
|
-
this.applicationConfig = dbosExec.config.application;
|
|
59
|
-
this.#dbosExec = dbosExec;
|
|
60
|
-
}
|
|
61
|
-
///////////////////////
|
|
62
|
-
/* PUBLIC INTERFACE */
|
|
63
|
-
///////////////////////
|
|
64
|
-
async send(destinationUUID, message, topic, idempotencyKey) {
|
|
65
|
-
return this.#dbosExec.send(destinationUUID, message, topic, idempotencyKey);
|
|
66
|
-
}
|
|
67
|
-
async getEvent(workflowUUID, key, timeoutSeconds = dbos_executor_1.DBOSExecutor.defaultNotificationTimeoutSec) {
|
|
68
|
-
return this.#dbosExec.getEvent(workflowUUID, key, timeoutSeconds);
|
|
69
|
-
}
|
|
70
|
-
retrieveWorkflow(workflowUUID) {
|
|
71
|
-
return this.#dbosExec.retrieveWorkflow(workflowUUID);
|
|
72
|
-
}
|
|
73
|
-
/**
|
|
74
|
-
* Generate a proxy object for the provided class that wraps direct calls (i.e. OpClass.someMethod(param))
|
|
75
|
-
* to use WorkflowContext.Transaction(OpClass.someMethod, param);
|
|
76
|
-
*/
|
|
77
|
-
mainInvoke(object, workflowUUID, asyncWf, configuredInstance, queue) {
|
|
78
|
-
const ops = (0, decorators_1.getRegisteredOperations)(object);
|
|
79
|
-
const proxy = {};
|
|
80
|
-
const params = { workflowUUID: workflowUUID, parentCtx: this, configuredInstance, queueName: queue?.name };
|
|
81
|
-
for (const op of ops) {
|
|
82
|
-
if (asyncWf) {
|
|
83
|
-
proxy[op.name] = op.txnConfig
|
|
84
|
-
? (...args) => this.#transaction(op.registeredFunction, params, ...args)
|
|
85
|
-
: op.workflowConfig
|
|
86
|
-
? (...args) => this.#workflow(op.registeredFunction, params, ...args)
|
|
87
|
-
: op.stepConfig
|
|
88
|
-
? (...args) => this.#external(op.registeredFunction, params, ...args)
|
|
89
|
-
: op.procConfig
|
|
90
|
-
? (...args) => this.#procedure(op.registeredFunction, params, ...args)
|
|
91
|
-
: undefined;
|
|
92
|
-
}
|
|
93
|
-
else {
|
|
94
|
-
proxy[op.name] = op.workflowConfig
|
|
95
|
-
? (...args) => this.#workflow(op.registeredFunction, params, ...args).then((handle) => handle.getResult())
|
|
96
|
-
: undefined;
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
return proxy;
|
|
100
|
-
}
|
|
101
|
-
invoke(object, workflowUUID) {
|
|
102
|
-
if (typeof object === 'function') {
|
|
103
|
-
return this.mainInvoke(object, workflowUUID, true, null, undefined);
|
|
104
|
-
}
|
|
105
|
-
else {
|
|
106
|
-
const targetInst = object;
|
|
107
|
-
return this.mainInvoke(targetInst, workflowUUID, true, targetInst, undefined);
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
startWorkflow(object, workflowUUID, queue) {
|
|
111
|
-
if (typeof object === 'function') {
|
|
112
|
-
return this.mainInvoke(object, workflowUUID, true, null, queue);
|
|
113
|
-
}
|
|
114
|
-
else {
|
|
115
|
-
const targetInst = object;
|
|
116
|
-
return this.mainInvoke(targetInst, workflowUUID, true, targetInst, queue);
|
|
117
|
-
}
|
|
118
|
-
}
|
|
119
|
-
invokeWorkflow(object, workflowUUID) {
|
|
120
|
-
if (typeof object === 'function') {
|
|
121
|
-
return this.mainInvoke(object, workflowUUID, false, null, undefined);
|
|
122
|
-
}
|
|
123
|
-
else {
|
|
124
|
-
const targetInst = object;
|
|
125
|
-
return this.mainInvoke(targetInst, workflowUUID, false, targetInst, undefined);
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
async getWorkflows(input) {
|
|
129
|
-
const wfs = await this.#dbosExec.listWorkflows(input);
|
|
130
|
-
return { workflowUUIDs: wfs.map((wf) => wf.workflowID) };
|
|
131
|
-
}
|
|
132
|
-
//////////////////////
|
|
133
|
-
/* PRIVATE METHODS */
|
|
134
|
-
/////////////////////
|
|
135
|
-
async #workflow(wf, params, ...args) {
|
|
136
|
-
return this.#dbosExec.workflow(wf, params, ...args);
|
|
137
|
-
}
|
|
138
|
-
async #transaction(txn, params, ...args) {
|
|
139
|
-
return this.#dbosExec.transaction(txn, params, ...args);
|
|
140
|
-
}
|
|
141
|
-
async #external(stepFn, params, ...args) {
|
|
142
|
-
return this.#dbosExec.external(stepFn, params, ...args);
|
|
143
|
-
}
|
|
144
|
-
async #procedure(proc, params, ...args) {
|
|
145
|
-
return this.#dbosExec.procedure(proc, params, ...args);
|
|
146
|
-
}
|
|
147
|
-
}
|
|
148
|
-
exports.HandlerContextImpl = HandlerContextImpl;
|
|
149
6
|
class HandlerParameter extends decorators_1.MethodParameter {
|
|
150
7
|
argSource = handlerTypes_1.ArgSources.DEFAULT;
|
|
151
8
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
|
|
@@ -154,44 +11,6 @@ class HandlerParameter extends decorators_1.MethodParameter {
|
|
|
154
11
|
}
|
|
155
12
|
}
|
|
156
13
|
exports.HandlerParameter = HandlerParameter;
|
|
157
|
-
/////////////////////////
|
|
158
|
-
/* ENDPOINT DECORATORS */
|
|
159
|
-
/////////////////////////
|
|
160
|
-
function generateApiDec(verb, url) {
|
|
161
|
-
return function apidec(target, propertyKey, inDescriptor) {
|
|
162
|
-
const { descriptor, registration } = (0, decorators_1.registerAndWrapFunctionTakingContext)(target, propertyKey, inDescriptor);
|
|
163
|
-
const handlerRegistration = registration;
|
|
164
|
-
handlerRegistration.apiURL = url;
|
|
165
|
-
handlerRegistration.apiType = verb;
|
|
166
|
-
(0, paramdecorators_1.requestArgValidation)(registration);
|
|
167
|
-
return descriptor;
|
|
168
|
-
};
|
|
169
|
-
}
|
|
170
|
-
/** @deprecated Use `DBOS.getApi` */
|
|
171
|
-
function GetApi(url) {
|
|
172
|
-
return generateApiDec(handlerTypes_1.APITypes.GET, url);
|
|
173
|
-
}
|
|
174
|
-
exports.GetApi = GetApi;
|
|
175
|
-
/** @deprecated Use `DBOS.postApi` */
|
|
176
|
-
function PostApi(url) {
|
|
177
|
-
return generateApiDec(handlerTypes_1.APITypes.POST, url);
|
|
178
|
-
}
|
|
179
|
-
exports.PostApi = PostApi;
|
|
180
|
-
/** @deprecated Use `DBOS.putApi` */
|
|
181
|
-
function PutApi(url) {
|
|
182
|
-
return generateApiDec(handlerTypes_1.APITypes.PUT, url);
|
|
183
|
-
}
|
|
184
|
-
exports.PutApi = PutApi;
|
|
185
|
-
/** @deprecated Use `DBOS.patchApi` */
|
|
186
|
-
function PatchApi(url) {
|
|
187
|
-
return generateApiDec(handlerTypes_1.APITypes.PATCH, url);
|
|
188
|
-
}
|
|
189
|
-
exports.PatchApi = PatchApi;
|
|
190
|
-
/** @deprecated Use `DBOS.deleteApi` */
|
|
191
|
-
function DeleteApi(url) {
|
|
192
|
-
return generateApiDec(handlerTypes_1.APITypes.DELETE, url);
|
|
193
|
-
}
|
|
194
|
-
exports.DeleteApi = DeleteApi;
|
|
195
14
|
///////////////////////////////////
|
|
196
15
|
/* ENDPOINT PARAMETER DECORATORS */
|
|
197
16
|
///////////////////////////////////
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/httpServer/handler.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/httpServer/handler.ts"],"names":[],"mappings":";;;AAAA,8CAKuB;AAEvB,iDAAsD;AAsBtD,MAAa,gBAAiB,SAAQ,4BAAe;IACnD,SAAS,GAAe,yBAAU,CAAC,OAAO,CAAC;IAE3C,sEAAsE;IACtE,YAAY,GAAW,EAAE,EAAY;QACnC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACjB,CAAC;CACF;AAPD,4CAOC;AAED,mCAAmC;AACnC,mCAAmC;AACnC,mCAAmC;AAEnC,SAAgB,SAAS,CAAC,MAAkB;IAC1C,OAAO,UAAU,MAAc,EAAE,WAA4B,EAAE,cAAsB;QACnF,MAAM,kBAAkB,GAAG,IAAA,8CAAiC,EAAC,MAAM,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QAE7F,MAAM,QAAQ,GAAG,kBAAkB,CAAC,cAAc,CAAqB,CAAC;QACxE,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AAPD,8BAOC"}
|
|
@@ -68,11 +68,6 @@ export declare function KoaMiddleware(...koaMiddleware: Koa.Middleware[]): <T ex
|
|
|
68
68
|
* or requests that do not end up in DBOS handlers at all.
|
|
69
69
|
*/
|
|
70
70
|
export declare function KoaGlobalMiddleware(...koaMiddleware: Koa.Middleware[]): <T extends new (...args: unknown[]) => object>(ctor: T) => void;
|
|
71
|
-
/**
|
|
72
|
-
* @deprecated The `@OpenApiSecurityScheme` decorator function has moved to an extension package.
|
|
73
|
-
* Please install @dbos-inc/dbos-openapi, and update your import.
|
|
74
|
-
*/
|
|
75
|
-
export declare function OpenApiSecurityScheme(securityScheme: unknown): void;
|
|
76
71
|
export declare const RequestIDHeader = "X-Request-ID";
|
|
77
72
|
export declare function getOrGenerateRequestID(headers: IncomingHttpHeaders): string;
|
|
78
73
|
export declare function createHTTPSpan(request: HTTPRequest, httpTracer: W3CTraceContextPropagator): Span;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/httpServer/middleware.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/httpServer/middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.honoTracingMiddleware = exports.expressTracingMiddleware = exports.koaTracingMiddleware = exports.createHTTPSpan = exports.getOrGenerateRequestID = exports.RequestIDHeader = exports.
|
|
3
|
+
exports.honoTracingMiddleware = exports.expressTracingMiddleware = exports.koaTracingMiddleware = exports.createHTTPSpan = exports.getOrGenerateRequestID = exports.RequestIDHeader = exports.KoaGlobalMiddleware = exports.KoaMiddleware = exports.KoaCors = exports.KoaBodyParser = exports.Authentication = exports.MiddlewareClassRegistration = void 0;
|
|
4
4
|
const decorators_1 = require("../decorators");
|
|
5
5
|
const dbos_executor_1 = require("../dbos-executor");
|
|
6
6
|
const dbos_1 = require("../dbos");
|
|
@@ -92,18 +92,6 @@ function KoaGlobalMiddleware(...koaMiddleware) {
|
|
|
92
92
|
}
|
|
93
93
|
exports.KoaGlobalMiddleware = KoaGlobalMiddleware;
|
|
94
94
|
/////////////////////////////////
|
|
95
|
-
/* OPEN API DECORATORS (Moved) */
|
|
96
|
-
/////////////////////////////////
|
|
97
|
-
/**
|
|
98
|
-
* @deprecated The `@OpenApiSecurityScheme` decorator function has moved to an extension package.
|
|
99
|
-
* Please install @dbos-inc/dbos-openapi, and update your import.
|
|
100
|
-
*/
|
|
101
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
102
|
-
function OpenApiSecurityScheme(securityScheme) {
|
|
103
|
-
throw new Error('@OpenApiSecurityScheme has been moved to the @dbos-inc/dbos-openapi package as of v2.0');
|
|
104
|
-
}
|
|
105
|
-
exports.OpenApiSecurityScheme = OpenApiSecurityScheme;
|
|
106
|
-
/////////////////////////////////
|
|
107
95
|
/* HTTP APP TRACING MIDDLEWARES */
|
|
108
96
|
/////////////////////////////////
|
|
109
97
|
exports.RequestIDHeader = 'X-Request-ID';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/httpServer/middleware.ts"],"names":[],"mappings":";;;AAIA,8CAAsG;AAGtG,oDAAiD;AACjD,kCAA4C;AAK5C,8CAAgE;AAChE,4CAA+F;AAC/F,6CAAyC;AACzC,oCAAoC;AA2CpC,MAAa,2BAA4B,SAAQ,8BAAiB;IAChE,cAAc,CAA0B;IACxC,aAAa,CAAkB;IAC/B,OAAO,CAAkB;IACzB,cAAc,CAAoB;IAClC,oBAAoB,CAAoB;IAExC;QACE,KAAK,EAAE,CAAC;IACV,CAAC;CACF;AAVD,kEAUC;AAED,iCAAiC;AACjC,iCAAiC;AACjC,iCAAiC;AAEjC;;GAEG;AACH,SAAgB,cAAc,CAAC,cAAsC;IACnE,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,IAAI,SAAS,CAAC,0EAA0E,CAAC,CAAC;IAClG,CAAC;IACD,SAAS,MAAM,CAAiD,IAAO;QACrE,MAAM,MAAM,GAAG,IAAA,yCAA4B,EAAC,IAAI,CAAgC,CAAC;QACjF,MAAM,CAAC,cAAc,GAAG,cAAc,CAAC;IACzC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AATD,wCASC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,aAA6B;IACzD,SAAS,MAAM,CAAiD,IAAO;QACrE,MAAM,MAAM,GAAG,IAAA,yCAA4B,EAAC,IAAI,CAAgC,CAAC;QACjF,MAAM,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAND,sCAMC;AAED;;GAEG;AACH,SAAgB,OAAO,CAAC,OAAuB;IAC7C,SAAS,MAAM,CAAiD,IAAO;QACrE,MAAM,MAAM,GAAG,IAAA,yCAA4B,EAAC,IAAI,CAAgC,CAAC;QACjF,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAND,0BAMC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,GAAG,aAA+B;IAC9D,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC1B,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,SAAS,CAAC,yEAAyE,CAAC,CAAC;QACjG,CAAC;IACH,CAAC,CAAC,CAAC;IACH,SAAS,MAAM,CAAiD,IAAO;QACrE,MAAM,MAAM,GAAG,IAAA,yCAA4B,EAAC,IAAI,CAAgC,CAAC;QACjF,MAAM,CAAC,cAAc,GAAG,aAAa,CAAC;IACxC,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAXD,sCAWC;AAED;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,GAAG,aAA+B;IACpE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC1B,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,SAAS,CAAC,+EAA+E,CAAC,CAAC;QACvG,CAAC;IACH,CAAC,CAAC,CAAC;IACH,SAAS,MAAM,CAAiD,IAAO;QACrE,MAAM,MAAM,GAAG,IAAA,yCAA4B,EAAC,IAAI,CAAgC,CAAC;QACjF,MAAM,CAAC,oBAAoB,GAAG,aAAa,CAAC;IAC9C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAXD,kDAWC;AAED,iCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/httpServer/middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/httpServer/server.ts"],"names":[],"mappings":";;;AAAA,OAAO,GAAgB,MAAM,KAAK,CAAC;AACnC,OAAO,MAAM,MAAM,aAAa,CAAC;AAQjC,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/httpServer/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,9 +31,11 @@ const koa_1 = __importDefault(require("koa"));
|
|
|
31
31
|
const router_1 = __importDefault(require("@koa/router"));
|
|
32
32
|
const bodyparser_1 = require("@koa/bodyparser");
|
|
33
33
|
const cors_1 = __importDefault(require("@koa/cors"));
|
|
34
|
-
const handler_1 = require("./handler");
|
|
35
34
|
const handlerTypes_1 = require("./handlerTypes");
|
|
36
35
|
const error_1 = require("../error");
|
|
36
|
+
const dbos_executor_1 = require("../dbos-executor");
|
|
37
|
+
const logs_1 = require("../telemetry/logs");
|
|
38
|
+
const middleware_1 = require("./middleware");
|
|
37
39
|
const api_1 = require("@opentelemetry/api");
|
|
38
40
|
const net = __importStar(require("net"));
|
|
39
41
|
const perf_hooks_1 = require("perf_hooks");
|
|
@@ -42,6 +44,8 @@ const context_1 = require("../context");
|
|
|
42
44
|
const wfqueue_1 = require("../wfqueue");
|
|
43
45
|
const serialize_error_1 = require("serialize-error");
|
|
44
46
|
const workflow_management_1 = require("../dbos-runtime/workflow_management");
|
|
47
|
+
const core_1 = require("@opentelemetry/core");
|
|
48
|
+
const dbos_1 = require("../dbos");
|
|
45
49
|
/**
|
|
46
50
|
* Utility function to convert WorkflowStatus object to underscore format
|
|
47
51
|
* for HTTP API responses.
|
|
@@ -555,7 +559,42 @@ class DBOSHttpServer {
|
|
|
555
559
|
}
|
|
556
560
|
// Wrapper function that parses request and send response.
|
|
557
561
|
const wrappedHandler = async (koaCtxt, koaNext) => {
|
|
558
|
-
const
|
|
562
|
+
const requestID = (0, middleware_1.getOrGenerateRequestID)(koaCtxt.request.headers);
|
|
563
|
+
koaCtxt.set(middleware_1.RequestIDHeader, requestID);
|
|
564
|
+
const httpTracer = new core_1.W3CTraceContextPropagator();
|
|
565
|
+
const extractedSpanContext = api_1.trace.getSpanContext(httpTracer.extract(api_1.ROOT_CONTEXT, koaCtxt.request.headers, api_1.defaultTextMapGetter));
|
|
566
|
+
let span;
|
|
567
|
+
const spanAttributes = {
|
|
568
|
+
operationType: dbos_executor_1.OperationType.HANDLER,
|
|
569
|
+
requestID: requestID,
|
|
570
|
+
requestIP: koaCtxt.request.ip,
|
|
571
|
+
requestURL: koaCtxt.request.url,
|
|
572
|
+
requestMethod: koaCtxt.request.method,
|
|
573
|
+
};
|
|
574
|
+
if (extractedSpanContext === undefined) {
|
|
575
|
+
span = dbosExec.tracer.startSpan(koaCtxt.url, spanAttributes);
|
|
576
|
+
}
|
|
577
|
+
else {
|
|
578
|
+
extractedSpanContext.isRemote = true;
|
|
579
|
+
span = dbosExec.tracer.startSpanWithContext(extractedSpanContext, koaCtxt.url, spanAttributes);
|
|
580
|
+
}
|
|
581
|
+
const dctx = {
|
|
582
|
+
span,
|
|
583
|
+
request: {
|
|
584
|
+
headers: koaCtxt.request.headers,
|
|
585
|
+
rawHeaders: koaCtxt.req.rawHeaders,
|
|
586
|
+
params: koaCtxt.params,
|
|
587
|
+
body: koaCtxt.request.body,
|
|
588
|
+
rawBody: koaCtxt.request.rawBody,
|
|
589
|
+
query: koaCtxt.request.query,
|
|
590
|
+
querystring: koaCtxt.request.querystring,
|
|
591
|
+
url: koaCtxt.request.url,
|
|
592
|
+
ip: koaCtxt.request.ip,
|
|
593
|
+
requestID: requestID,
|
|
594
|
+
},
|
|
595
|
+
koaContext: koaCtxt,
|
|
596
|
+
operationType: dbos_executor_1.OperationType.HANDLER,
|
|
597
|
+
};
|
|
559
598
|
try {
|
|
560
599
|
// Check for auth first
|
|
561
600
|
if (defaults?.authMiddleware) {
|
|
@@ -563,18 +602,18 @@ class DBOSHttpServer {
|
|
|
563
602
|
name: ro.name,
|
|
564
603
|
requiredRole: ro.getRequiredRoles(),
|
|
565
604
|
koaContext: koaCtxt,
|
|
566
|
-
logger:
|
|
567
|
-
span
|
|
605
|
+
logger: new logs_1.Logger(dbosExec.logger, { span }),
|
|
606
|
+
span,
|
|
568
607
|
getConfig: (key, def) => {
|
|
569
|
-
return
|
|
608
|
+
return dbos_1.DBOS.getConfig(key, def);
|
|
570
609
|
},
|
|
571
610
|
query: (query, ...args) => {
|
|
572
611
|
return dbosExec.userDatabase.queryFunction(query, ...args);
|
|
573
612
|
},
|
|
574
613
|
});
|
|
575
614
|
if (res) {
|
|
576
|
-
|
|
577
|
-
|
|
615
|
+
dctx.authenticatedUser = res.authenticatedUser;
|
|
616
|
+
dctx.authenticatedRoles = res.authenticatedRoles;
|
|
578
617
|
}
|
|
579
618
|
}
|
|
580
619
|
// Parse the arguments.
|
|
@@ -624,9 +663,9 @@ class DBOSHttpServer {
|
|
|
624
663
|
}
|
|
625
664
|
//console.log(`found arg ${marg.name} ${idx} ${args[idx-1]}`);
|
|
626
665
|
});
|
|
627
|
-
// Extract workflow
|
|
628
|
-
// We pass in the specified workflow
|
|
629
|
-
|
|
666
|
+
// Extract workflow ID from headers (if any).
|
|
667
|
+
// We pass in the specified workflow ID to workflows and transactions, but doesn't restrict how handlers use it.
|
|
668
|
+
dctx.idAssignedForNextWorkflow = koaCtxt.get(exports.WorkflowUUIDHeader);
|
|
630
669
|
// Finally, invoke the transaction/workflow/plain function and properly set HTTP response.
|
|
631
670
|
// If functions return successfully and hasn't set the body, we set the body to the function return value. The status code will be automatically set to 200 or 204 (if the body is null/undefined).
|
|
632
671
|
// In case of an exception:
|
|
@@ -634,42 +673,39 @@ class DBOSHttpServer {
|
|
|
634
673
|
// - If an error contains a `status` field, we return the specified status code.
|
|
635
674
|
// - Otherwise, we return 500.
|
|
636
675
|
// configuredInstance is currently null; we don't allow configured handlers now.
|
|
637
|
-
const wfParams = {
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
}
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
676
|
+
const wfParams = {
|
|
677
|
+
workflowUUID: dctx.idAssignedForNextWorkflow,
|
|
678
|
+
configuredInstance: null,
|
|
679
|
+
};
|
|
680
|
+
await (0, context_1.runWithTopContext)(dctx, async () => {
|
|
681
|
+
if (ro.txnConfig) {
|
|
682
|
+
koaCtxt.body = await dbosExec.transaction(ro.registeredFunction, wfParams, ...args);
|
|
683
|
+
}
|
|
684
|
+
else if (ro.workflowConfig) {
|
|
685
|
+
koaCtxt.body = await (await dbosExec.workflow(ro.registeredFunction, wfParams, ...args)).getResult();
|
|
686
|
+
}
|
|
687
|
+
else if (ro.stepConfig) {
|
|
688
|
+
koaCtxt.body = await dbosExec.external(ro.registeredFunction, wfParams, ...args);
|
|
689
|
+
}
|
|
690
|
+
else {
|
|
691
|
+
// Directly invoke the handler code.
|
|
692
|
+
const cresult = await ro.invoke(undefined, [...args]);
|
|
693
|
+
const retValue = cresult;
|
|
694
|
+
// Set the body to the return value unless the body is already set by the handler.
|
|
695
|
+
if (koaCtxt.body === undefined) {
|
|
696
|
+
koaCtxt.body = retValue;
|
|
656
697
|
}
|
|
657
|
-
});
|
|
658
|
-
const retValue = cresult;
|
|
659
|
-
// Set the body to the return value unless the body is already set by the handler.
|
|
660
|
-
if (koaCtxt.body === undefined) {
|
|
661
|
-
koaCtxt.body = retValue;
|
|
662
698
|
}
|
|
663
|
-
}
|
|
664
|
-
|
|
699
|
+
});
|
|
700
|
+
dctx.span?.setStatus({ code: api_1.SpanStatusCode.OK });
|
|
665
701
|
}
|
|
666
702
|
catch (e) {
|
|
667
703
|
if (e instanceof Error) {
|
|
668
704
|
const annotated_e = e;
|
|
669
705
|
if (annotated_e.dbos_already_logged !== true) {
|
|
670
|
-
|
|
706
|
+
dbos_1.DBOS.logger.error(e);
|
|
671
707
|
}
|
|
672
|
-
|
|
708
|
+
dctx.span?.setStatus({ code: api_1.SpanStatusCode.ERROR, message: e.message });
|
|
673
709
|
let st = e?.status || 500;
|
|
674
710
|
if ((0, error_1.isDataValidationError)(e)) {
|
|
675
711
|
st = 400; // Set to 400: client-side error.
|
|
@@ -685,21 +721,21 @@ class DBOSHttpServer {
|
|
|
685
721
|
else {
|
|
686
722
|
// FIXME we should have a standard, user friendly message for errors that are not instances of Error.
|
|
687
723
|
// using stringify() will not produce a pretty output, because our format function uses stringify() too.
|
|
688
|
-
|
|
689
|
-
|
|
724
|
+
dbos_1.DBOS.logger.error(utils_1.DBOSJSON.stringify(e));
|
|
725
|
+
dctx.span?.setStatus({ code: api_1.SpanStatusCode.ERROR, message: utils_1.DBOSJSON.stringify(e) });
|
|
690
726
|
koaCtxt.body = e;
|
|
691
727
|
koaCtxt.status = 500;
|
|
692
728
|
}
|
|
693
729
|
}
|
|
694
730
|
finally {
|
|
695
|
-
|
|
731
|
+
httpTracer.inject(api_1.trace.setSpanContext(api_1.ROOT_CONTEXT, dctx.span.spanContext()), {
|
|
696
732
|
context: koaCtxt,
|
|
697
733
|
}, {
|
|
698
734
|
set: (carrier, key, value) => {
|
|
699
735
|
carrier.context.set(key, value);
|
|
700
736
|
},
|
|
701
737
|
});
|
|
702
|
-
dbosExec.tracer.endSpan(
|
|
738
|
+
dbosExec.tracer.endSpan(dctx.span);
|
|
703
739
|
await koaNext();
|
|
704
740
|
}
|
|
705
741
|
};
|