@midwayjs/express 4.0.0-beta.11 → 4.0.0-beta.12
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/framework.js +65 -1
- package/package.json +5 -5
package/dist/framework.js
CHANGED
|
@@ -32,7 +32,71 @@ let MidwayExpressFramework = class MidwayExpressFramework extends core_1.BaseFra
|
|
|
32
32
|
req.requestContext = ctx.requestContext;
|
|
33
33
|
ctx.requestContext.registerObject('req', req);
|
|
34
34
|
ctx.requestContext.registerObject('res', res);
|
|
35
|
-
|
|
35
|
+
const traceService = this.applicationContext.get(core_1.MidwayTraceService);
|
|
36
|
+
const spanName = `${req.method} ${req.path || req.url || '/'}`;
|
|
37
|
+
const traceMetaResolver = this.configurationOptions?.tracing
|
|
38
|
+
?.meta;
|
|
39
|
+
const traceEnabled = this.configurationOptions?.tracing?.enable !== false;
|
|
40
|
+
const traceExtractor = this.configurationOptions?.tracing
|
|
41
|
+
?.extractor;
|
|
42
|
+
const traceInjector = this.configurationOptions?.tracing
|
|
43
|
+
?.injector;
|
|
44
|
+
const requestCarrier = typeof traceExtractor === 'function'
|
|
45
|
+
? traceExtractor({ ctx, request: req, response: res })
|
|
46
|
+
: req.headers;
|
|
47
|
+
const responseCarrier = typeof traceInjector === 'function'
|
|
48
|
+
? traceInjector({ ctx, request: req, response: res })
|
|
49
|
+
: res;
|
|
50
|
+
traceService
|
|
51
|
+
.runWithEntrySpan(spanName, {
|
|
52
|
+
enable: traceEnabled,
|
|
53
|
+
carrier: requestCarrier,
|
|
54
|
+
responseCarrier,
|
|
55
|
+
attributes: {
|
|
56
|
+
'midway.protocol': 'http',
|
|
57
|
+
},
|
|
58
|
+
meta: traceMetaResolver,
|
|
59
|
+
metaArgs: {
|
|
60
|
+
ctx,
|
|
61
|
+
carrier: requestCarrier,
|
|
62
|
+
request: req,
|
|
63
|
+
response: res,
|
|
64
|
+
},
|
|
65
|
+
}, async () => {
|
|
66
|
+
await new Promise((resolve, reject) => {
|
|
67
|
+
let settled = false;
|
|
68
|
+
const done = (err) => {
|
|
69
|
+
if (settled) {
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
settled = true;
|
|
73
|
+
res.removeListener('finish', onFinish);
|
|
74
|
+
res.removeListener('close', onClose);
|
|
75
|
+
res.removeListener('error', onError);
|
|
76
|
+
if (err) {
|
|
77
|
+
reject(err);
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
resolve();
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
const onFinish = () => done();
|
|
84
|
+
const onClose = () => done();
|
|
85
|
+
const onError = (err) => done(err);
|
|
86
|
+
res.on('finish', onFinish);
|
|
87
|
+
res.on('close', onClose);
|
|
88
|
+
res.on('error', onError);
|
|
89
|
+
try {
|
|
90
|
+
next();
|
|
91
|
+
}
|
|
92
|
+
catch (err) {
|
|
93
|
+
done(err);
|
|
94
|
+
}
|
|
95
|
+
});
|
|
96
|
+
})
|
|
97
|
+
.catch(err => {
|
|
98
|
+
next(err);
|
|
99
|
+
});
|
|
36
100
|
});
|
|
37
101
|
// 版本控制配置
|
|
38
102
|
const versioningConfig = this.configurationOptions.versioning;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@midwayjs/express",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.12",
|
|
4
4
|
"description": "Midway Web Framework for Express",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "index.d.ts",
|
|
@@ -24,14 +24,14 @@
|
|
|
24
24
|
],
|
|
25
25
|
"license": "MIT",
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@midwayjs/core": "^4.0.0-beta.
|
|
28
|
-
"@midwayjs/mock": "^4.0.0-beta.
|
|
27
|
+
"@midwayjs/core": "^4.0.0-beta.12",
|
|
28
|
+
"@midwayjs/mock": "^4.0.0-beta.12",
|
|
29
29
|
"@types/body-parser": "1.19.6",
|
|
30
30
|
"@types/express": "4.17.25",
|
|
31
31
|
"fs-extra": "11.3.3"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@midwayjs/express-session": "^4.0.0-beta.
|
|
34
|
+
"@midwayjs/express-session": "^4.0.0-beta.12",
|
|
35
35
|
"body-parser": "2.2.2",
|
|
36
36
|
"cookie-parser": "^1.4.6",
|
|
37
37
|
"express": "4.22.1"
|
|
@@ -44,5 +44,5 @@
|
|
|
44
44
|
"engines": {
|
|
45
45
|
"node": ">=20"
|
|
46
46
|
},
|
|
47
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "1c48179b7c827ba8ec9351e9b6c36ec1726d3e11"
|
|
48
48
|
}
|