vona-module-a-executor 5.1.14 → 5.1.15
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/index.js +36 -19
- package/dist/index.js.map +1 -1
- package/dist/service/executor.d.ts.map +1 -1
- package/package.json +5 -3
- package/src/service/executor.ts +68 -53
package/dist/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BeanInfo, BeanBase,
|
|
1
|
+
import { BeanInfo, BeanBase, deepExtend, cast, BeanScopeBase } from 'vona';
|
|
2
2
|
import { __decorate, __metadata } from 'tslib';
|
|
3
3
|
import { isNil, combineParamsAndQuery } from '@cabloy/utils';
|
|
4
4
|
import { Bean, Service, Scope } from 'vona-module-a-bean';
|
|
@@ -172,8 +172,14 @@ let ServiceExecutor = class ServiceExecutor extends BeanBase {
|
|
|
172
172
|
async performActionInner(method, url, options) {
|
|
173
173
|
// app
|
|
174
174
|
const app = this.app;
|
|
175
|
-
|
|
176
|
-
|
|
175
|
+
const telemetry = this.$scope.telemetry.service.telemetry;
|
|
176
|
+
const span = telemetry.enabled ? telemetry.startSpan(`vona.action ${method.toUpperCase()}`, {
|
|
177
|
+
attributes: {
|
|
178
|
+
'vona.action.internal': true,
|
|
179
|
+
'http.request.method': method.toUpperCase()
|
|
180
|
+
}
|
|
181
|
+
}) : undefined;
|
|
182
|
+
const execute = () => this.bean.executor.newCtx(async () => {
|
|
177
183
|
const ctx = this.ctx;
|
|
178
184
|
// default status code
|
|
179
185
|
ctx.res.statusCode = 404;
|
|
@@ -193,12 +199,8 @@ let ServiceExecutor = class ServiceExecutor extends BeanBase {
|
|
|
193
199
|
if (options?.authToken) {
|
|
194
200
|
ctx.req.headers.authorization = `Bearer ${options?.authToken}`;
|
|
195
201
|
}
|
|
196
|
-
// // query
|
|
197
|
-
// if (options?.query !== undefined) {
|
|
198
|
-
// cast(ctx.req).query = cast(ctx.request).query = options?.query;
|
|
199
|
-
// }
|
|
200
202
|
// body
|
|
201
|
-
cast(ctx.req).body = ctx.request.body = options?.body ?? {};
|
|
203
|
+
cast(ctx.req).body = ctx.request.body = options?.body ?? {};
|
|
202
204
|
// onion
|
|
203
205
|
ctx.onionsDynamic = options?.onions;
|
|
204
206
|
// invoke middleware
|
|
@@ -206,27 +208,42 @@ let ServiceExecutor = class ServiceExecutor extends BeanBase {
|
|
|
206
208
|
// check result
|
|
207
209
|
if (ctx.status === 200) {
|
|
208
210
|
if (!ctx.body || ctx.body.code === undefined) {
|
|
209
|
-
// not check code, e.g. text/xml
|
|
210
211
|
return ctx.body;
|
|
211
212
|
}
|
|
212
213
|
if (ctx.body.code === 0) {
|
|
213
214
|
return ctx.body.data;
|
|
214
215
|
}
|
|
215
216
|
throw app.util.createError(ctx.body);
|
|
216
|
-
} else {
|
|
217
|
-
if (ctx.body && typeof ctx.body === 'object') {
|
|
218
|
-
throw app.util.createError(ctx.body);
|
|
219
|
-
} else {
|
|
220
|
-
throw app.util.createError({
|
|
221
|
-
code: ctx.status,
|
|
222
|
-
message: ctx.message
|
|
223
|
-
});
|
|
224
|
-
}
|
|
225
217
|
}
|
|
218
|
+
if (ctx.body && typeof ctx.body === 'object') {
|
|
219
|
+
throw app.util.createError(ctx.body);
|
|
220
|
+
}
|
|
221
|
+
throw app.util.createError({
|
|
222
|
+
code: ctx.status,
|
|
223
|
+
message: ctx.message
|
|
224
|
+
});
|
|
226
225
|
}, {
|
|
227
226
|
innerAccess: options?.innerAccess,
|
|
228
|
-
extraData:
|
|
227
|
+
extraData: {
|
|
228
|
+
...options?.extraData,
|
|
229
|
+
state: {
|
|
230
|
+
...options?.extraData?.state,
|
|
231
|
+
telemetry: span ? {
|
|
232
|
+
context: telemetry.createContext(span),
|
|
233
|
+
span,
|
|
234
|
+
internalAction: true
|
|
235
|
+
} : undefined
|
|
236
|
+
}
|
|
237
|
+
}
|
|
229
238
|
});
|
|
239
|
+
try {
|
|
240
|
+
return await (span ? telemetry.withSpan(span, execute) : execute());
|
|
241
|
+
} catch (err) {
|
|
242
|
+
if (span) telemetry.recordException(span, err);
|
|
243
|
+
throw err;
|
|
244
|
+
} finally {
|
|
245
|
+
span?.end();
|
|
246
|
+
}
|
|
230
247
|
}
|
|
231
248
|
prepareGeneralInfo(options) {
|
|
232
249
|
const current = this.bean.database.current;
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../src/lib/utils.ts","../src/bean/bean.executor.ts","../src/types/executor.ts","../src/service/executor.ts","../src/.metadata/index.ts"],"sourcesContent":[null,null,null,null,null],"names":["__delegateProperties","ctx","ctxCaller","property","__delegateProperty","request","BeanExecutor","BeanBase","performAction","method","path","options","url","app","util","combineApiPath","scope","service","executor","performActionInner","runInBackground","fn","bean","database","switchDbIsolate","newCtx","newCtxIsolate","Object","assign","instanceName","undefined","locale","tz","mockCtx","dbInfo","isNil","level","instance","_newCtxInnerStep1","_newCtxInnerStep2","switchDb","innerAccess","isolate","createAnonymousContext","req","res","ctxStorage","run","extraData","meta","appReady","Error","get","$scope","checkAppReadyInstance","transaction","current","begin","transactionOptions","commitsDone","__decorate","Bean","__z_BeanInfo","module","SymbolRouterMiddleware","Symbol","ServiceExecutor","statusCode","toUpperCase","combineParamsAndQuery","params","query","headers","accept","authToken","authorization","cast","body","onionsDynamic","onions","status","code","data","createError","message","prepareGeneralInfo","clientName","deepExtend","key","startsWith","value","Aspect","aopMethod","__metadata","_a","METHOD","String","prototype","Service","ScopeModuleAExecutor","BeanScopeBase","Scope"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../src/lib/utils.ts","../src/bean/bean.executor.ts","../src/types/executor.ts","../src/service/executor.ts","../src/.metadata/index.ts"],"sourcesContent":[null,null,null,null,null],"names":["__delegateProperties","ctx","ctxCaller","property","__delegateProperty","request","BeanExecutor","BeanBase","performAction","method","path","options","url","app","util","combineApiPath","scope","service","executor","performActionInner","runInBackground","fn","bean","database","switchDbIsolate","newCtx","newCtxIsolate","Object","assign","instanceName","undefined","locale","tz","mockCtx","dbInfo","isNil","level","instance","_newCtxInnerStep1","_newCtxInnerStep2","switchDb","innerAccess","isolate","createAnonymousContext","req","res","ctxStorage","run","extraData","meta","appReady","Error","get","$scope","checkAppReadyInstance","transaction","current","begin","transactionOptions","commitsDone","__decorate","Bean","__z_BeanInfo","module","SymbolRouterMiddleware","Symbol","ServiceExecutor","telemetry","span","enabled","startSpan","toUpperCase","attributes","execute","statusCode","combineParamsAndQuery","params","query","headers","accept","authToken","authorization","cast","body","onionsDynamic","onions","status","code","data","createError","message","state","context","createContext","internalAction","withSpan","err","recordException","end","prepareGeneralInfo","clientName","deepExtend","key","startsWith","value","Aspect","aopMethod","__metadata","_a","METHOD","String","prototype","Service","ScopeModuleAExecutor","BeanScopeBase","Scope"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/service/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAGjE,OAAO,EAAE,QAAQ,EAAoB,MAAM,MAAM,CAAC;AAIlD,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAIvF,qBACa,eAAgB,SAAQ,QAAQ;IAErC,kBAAkB,CAAC,MAAM,SAAS,MAAM,uBAAuB,EACnE,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/service/executor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAGjE,OAAO,EAAE,QAAQ,EAAoB,MAAM,MAAM,CAAC;AAIlD,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAIvF,qBACa,eAAgB,SAAQ,QAAQ;IAErC,kBAAkB,CAAC,MAAM,SAAS,MAAM,uBAAuB,EACnE,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,GAAG,CAAC;IA8Ef,kBAAkB,CAAC,OAAO,CAAC,EAAE,mBAAmB,GAAG,mBAAmB;CA6BvE"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vona-module-a-executor",
|
|
3
|
-
"version": "5.1.
|
|
4
|
-
"gitHead": "
|
|
3
|
+
"version": "5.1.15",
|
|
4
|
+
"gitHead": "fac7768bb7db22ff0180dc59d711efba5b853ae7",
|
|
5
5
|
"description": "",
|
|
6
6
|
"keywords": [
|
|
7
7
|
"Vona Module"
|
|
@@ -39,6 +39,8 @@
|
|
|
39
39
|
},
|
|
40
40
|
"title": "a-executor",
|
|
41
41
|
"vonaModule": {
|
|
42
|
-
"dependencies": {
|
|
42
|
+
"dependencies": {
|
|
43
|
+
"a-telemetry": "5.0.0"
|
|
44
|
+
}
|
|
43
45
|
}
|
|
44
46
|
}
|
package/src/service/executor.ts
CHANGED
|
@@ -19,64 +19,79 @@ export class ServiceExecutor extends BeanBase {
|
|
|
19
19
|
): Promise<any> {
|
|
20
20
|
// app
|
|
21
21
|
const app = this.app;
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
cast(ctx.req).body = ctx.request.body = options?.body ?? {}; // body should set {} if undefined/null
|
|
50
|
-
// onion
|
|
51
|
-
ctx.onionsDynamic = options?.onions;
|
|
52
|
-
// invoke middleware
|
|
53
|
-
await app[SymbolRouterMiddleware](ctx);
|
|
54
|
-
// check result
|
|
55
|
-
if (ctx.status === 200) {
|
|
56
|
-
if (!ctx.body || (ctx.body as any).code === undefined) {
|
|
57
|
-
// not check code, e.g. text/xml
|
|
58
|
-
return ctx.body;
|
|
22
|
+
const telemetry = this.$scope.telemetry.service.telemetry;
|
|
23
|
+
const span = telemetry.enabled
|
|
24
|
+
? telemetry.startSpan(`vona.action ${method.toUpperCase()}`, {
|
|
25
|
+
attributes: { 'vona.action.internal': true, 'http.request.method': method.toUpperCase() },
|
|
26
|
+
})
|
|
27
|
+
: undefined;
|
|
28
|
+
const execute = () =>
|
|
29
|
+
this.bean.executor.newCtx(
|
|
30
|
+
async () => {
|
|
31
|
+
const ctx = this.ctx;
|
|
32
|
+
// default status code
|
|
33
|
+
ctx.res.statusCode = 404;
|
|
34
|
+
ctx.req.method = method.toUpperCase();
|
|
35
|
+
// url
|
|
36
|
+
ctx.req.url = combineParamsAndQuery(url, {
|
|
37
|
+
params: options?.params,
|
|
38
|
+
query: options?.query,
|
|
39
|
+
});
|
|
40
|
+
// headers
|
|
41
|
+
ctx.req.headers = Object.assign({}, ctx.req.headers, options?.headers);
|
|
42
|
+
// json
|
|
43
|
+
if (!ctx.req.headers.accept) {
|
|
44
|
+
ctx.req.headers.accept = 'application/json';
|
|
45
|
+
}
|
|
46
|
+
// authToken
|
|
47
|
+
if (options?.authToken) {
|
|
48
|
+
ctx.req.headers.authorization = `Bearer ${options?.authToken}`;
|
|
59
49
|
}
|
|
60
|
-
|
|
61
|
-
|
|
50
|
+
// body
|
|
51
|
+
cast(ctx.req).body = ctx.request.body = options?.body ?? {};
|
|
52
|
+
// onion
|
|
53
|
+
ctx.onionsDynamic = options?.onions;
|
|
54
|
+
// invoke middleware
|
|
55
|
+
await app[SymbolRouterMiddleware](ctx);
|
|
56
|
+
// check result
|
|
57
|
+
if (ctx.status === 200) {
|
|
58
|
+
if (!ctx.body || (ctx.body as any).code === undefined) {
|
|
59
|
+
return ctx.body;
|
|
60
|
+
}
|
|
61
|
+
if ((ctx.body as any).code === 0) {
|
|
62
|
+
return (ctx.body as any).data;
|
|
63
|
+
}
|
|
64
|
+
throw app.util.createError(ctx.body);
|
|
62
65
|
}
|
|
63
|
-
throw app.util.createError(ctx.body);
|
|
64
|
-
} else {
|
|
65
66
|
if (ctx.body && typeof ctx.body === 'object') {
|
|
66
67
|
throw app.util.createError(ctx.body);
|
|
67
|
-
} else {
|
|
68
|
-
throw app.util.createError({
|
|
69
|
-
code: ctx.status,
|
|
70
|
-
message: ctx.message,
|
|
71
|
-
});
|
|
72
68
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
69
|
+
throw app.util.createError({
|
|
70
|
+
code: ctx.status,
|
|
71
|
+
message: ctx.message,
|
|
72
|
+
});
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
innerAccess: options?.innerAccess,
|
|
76
|
+
extraData: {
|
|
77
|
+
...options?.extraData,
|
|
78
|
+
state: {
|
|
79
|
+
...options?.extraData?.state,
|
|
80
|
+
telemetry: span
|
|
81
|
+
? { context: telemetry.createContext(span), span, internalAction: true }
|
|
82
|
+
: undefined,
|
|
83
|
+
},
|
|
84
|
+
},
|
|
85
|
+
},
|
|
86
|
+
);
|
|
87
|
+
try {
|
|
88
|
+
return await (span ? telemetry.withSpan(span, execute) : execute());
|
|
89
|
+
} catch (err) {
|
|
90
|
+
if (span) telemetry.recordException(span, err);
|
|
91
|
+
throw err;
|
|
92
|
+
} finally {
|
|
93
|
+
span?.end();
|
|
94
|
+
}
|
|
80
95
|
}
|
|
81
96
|
|
|
82
97
|
prepareGeneralInfo(options?: IGeneralInfoOptions): IGeneralInfoOptions {
|