@midwayjs/koa 4.0.0-beta.11 → 4.0.0-beta.12

package/dist/framework.js

@@ -157,13 +157,48 @@ let MidwayKoaFramework = class MidwayKoaFramework extends core_1.BaseFramework {
         // root middleware
         const midwayRootMiddleware = async (ctx, next) => {
             this.app.createAnonymousContext(ctx);
-            await (await this.applyMiddleware(applyMiddlewares))(ctx, next);
-            if (ctx.body === undefined &&
-                !ctx.response._explicitStatus &&
-                ctx._matchedRoute) {
-                // 如果进了路由，重新赋值，防止 404
-                ctx.body = undefined;
-            }
+            const traceService = this.applicationContext.get(core_1.MidwayTraceService);
+            const spanName = `${ctx.method} ${ctx.path || '/'}`;
+            const traceMetaResolver = this.configurationOptions?.tracing
+                ?.meta;
+            const traceEnabled = this.configurationOptions?.tracing?.enable !== false;
+            const traceExtractor = this.configurationOptions?.tracing
+                ?.extractor;
+            const traceInjector = this.configurationOptions?.tracing
+                ?.injector;
+            const requestCarrier = typeof traceExtractor === 'function'
+                ? traceExtractor({
+                    ctx,
+                    request: ctx.request,
+                    response: ctx.response,
+                })
+                : ctx.headers;
+            const responseCarrier = typeof traceInjector === 'function'
+                ? traceInjector({ ctx, request: ctx.request, response: ctx.response })
+                : ctx.response.res;
+            await traceService.runWithEntrySpan(spanName, {
+                enable: traceEnabled,
+                carrier: requestCarrier,
+                responseCarrier,
+                attributes: {
+                    'midway.protocol': 'http',
+                },
+                meta: traceMetaResolver,
+                metaArgs: {
+                    ctx,
+                    carrier: requestCarrier,
+                    request: ctx.request,
+                    response: ctx.response,
+                },
+            }, async () => {
+                await (await this.applyMiddleware(applyMiddlewares))(ctx, next);
+                if (ctx.body === undefined &&
+                    !ctx.response._explicitStatus &&
+                    ctx._matchedRoute) {
+                    // 如果进了路由，重新赋值，防止 404
+                    ctx.body = undefined;
+                }
+            });
         };
         this.app.use(midwayRootMiddleware);
         this.webRouterService = await this.applicationContext.getAsync(core_1.MidwayWebRouterService, [

package/dist/onerror.js

@@ -156,7 +156,7 @@ function setupOnError(app, config, logger) {
         }
         this.status = err.status;
         this.set(err.headers);
-        let type = 'text';
+        let type;
         if (errorOptions.accepts) {
             type = errorOptions.accepts.call(this, 'html', 'text', 'json');
         }

package/dist/utils.js

@@ -37,7 +37,9 @@ function sendToWormhole(stream) {
             return resolve();
         }
         // unpipe it
-        stream.unpipe && stream.unpipe();
+        if (stream.unpipe) {
+            stream.unpipe();
+        }
         // enable resume first
         stream.resume();
         if (stream._readableState && stream._readableState.ended) {
@@ -125,7 +127,7 @@ function escapeHtml(string) {
     }
     let escape;
     let html = '';
-    let index = 0;
+    let index;
     let lastIndex = 0;
     for (index = match.index; index < str.length; index++) {
         switch (str.charCodeAt(index)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/koa",
-  "version": "4.0.0-beta.11",
+  "version": "4.0.0-beta.12",
   "description": "Midway Web Framework for KOA",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -24,8 +24,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^4.0.0-beta.11",
-    "@midwayjs/mock": "^4.0.0-beta.11",
+    "@midwayjs/core": "^4.0.0-beta.12",
+    "@midwayjs/mock": "^4.0.0-beta.12",
     "@types/koa-router": "7.4.9",
     "axios": "1.12.0",
     "fs-extra": "11.3.3"
@@ -33,12 +33,12 @@
   "dependencies": {
     "@koa/router": "^12.0.0",
     "@midwayjs/cookies": "^1.3.0",
-    "@midwayjs/session": "^4.0.0-beta.11",
+    "@midwayjs/session": "^4.0.0-beta.12",
     "@types/koa": "3.0.0",
-    "@types/qs": "6.9.18",
+    "@types/qs": "6.14.0",
     "koa": "3.0.3",
     "koa-bodyparser": "4.4.1",
-    "qs": "6.14.1"
+    "qs": "6.14.2"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -48,5 +48,5 @@
   "engines": {
     "node": ">=20"
   },
-  "gitHead": "6ef05719ca6e900f1ec34aff7a5c5a9614358c50"
+  "gitHead": "1c48179b7c827ba8ec9351e9b6c36ec1726d3e11"
 }