@midwayjs/code-dye 3.11.10 → 3.11.12

package/dist/html.d.ts

@@ -1,3 +1,4 @@
 export declare const foreach: (info: any, start: any, pi: any, level: any) => string;
+export declare const callChain: (call: any) => string;
 export declare const toHTML: (info: any) => string;
 //# sourceMappingURL=html.d.ts.map

package/dist/html.js

@@ -1,8 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toHTML = exports.foreach = void 0;
+exports.toHTML = exports.callChain = exports.foreach = void 0;
+function getInfoResult(info) {
+    if (info.end) {
+        return `<div class="infoBtn">返回值<div class="infoCard"><pre>${JSON.stringify(info.end.result, null, 2)}</pre></div></div>`;
+    }
+    else {
+        return '<div class="infoBtn">未结束</div>';
+    }
+}
+function getInfoTimeUse(info) {
+    if (info.end) {
+        return info.end.time - info.start.time;
+    }
+    else {
+        return new Date().getTime() - info.start.time;
+    }
+}
 const foreach = (info, start, pi, level) => {
-    const timeUse = info.end.time - info.start.time;
+    const timeUse = getInfoTimeUse(info);
     const timeDiff = info.start.time - start;
     const paths = info.paths.filter(path => {
         return !path.startsWith('/');
@@ -13,13 +29,13 @@ const foreach = (info, start, pi, level) => {
         <div class="infoText">${paths.join(' / ')}</div>
         <div class="moreInfo">
           <div class="infoBtn">入参<div class="infoCard"><pre>${JSON.stringify(info.start.args, null, 2)}</pre></div></div>
-          <div class="infoBtn">返回值<div class="infoCard"><pre>${JSON.stringify(info.end.result, null, 2)}</pre></div></div>
+          ${getInfoResult(info)}
         </div>
       </div>
       <div class="timeContainer">
-        <div class="time" style="width:${timeUse / pi}px;left: ${timeDiff / pi}px"><div class="timeValue">${timeUse} ms</div></div>
+        <div class="time ${info.end ? 'end' : 'not-end'}" style="width:${timeUse / pi}px;left: ${timeDiff / pi}px"><div class="timeValue">${timeUse} ms</div></div>
       </div>
-      
+
     </div>
     <div class="child">
       <div class="childLine" style="left: ${(level - 1) * 24 + 12}px"></div>
@@ -32,13 +48,24 @@ const foreach = (info, start, pi, level) => {
   `;
 };
 exports.foreach = foreach;
-const toHTML = info => {
-    const timeDiff = info.end.time - info.start.time;
+const callChain = call => {
+    const timeDiff = call.end.time - call.start.time;
     let pi = timeDiff / 600;
     if (pi < 1) {
         pi = 1;
     }
     return `
+  <div>
+    <div>调用链路总耗时 ${timeDiff}ms<div>
+    <div>调用结果:<br /><pre>${JSON.stringify(call.end.result, null, 2)}</pre></div>
+    <hr />
+    <div style="padding: 12px;">${(0, exports.foreach)(call, call.start.time, pi, 1)}</div>
+  </div>
+  `;
+};
+exports.callChain = callChain;
+const toHTML = info => {
+    return `
   <title>Midway CodeDye</title>
   <meta charset="utf-8" />
   <style>
@@ -82,7 +109,10 @@ const toHTML = info => {
     background-color: #66c;
     border-radius: 3px;
   }
-  
+  .time.not-end {
+    background-color: #ddd;
+  }
+
   .timeValue {
     position: absolute;
     line-height: 16px;
@@ -124,11 +154,7 @@ const toHTML = info => {
   }
   </style>
   <h1>Midway CodeDye</h1><hr />
-  <div>调用链路总耗时 ${timeDiff}ms<div>
-  <div>调用结果:<br /><pre>${JSON.stringify(info.end.result, null, 2)}</pre></div>
-  <hr />
-  <div style="padding: 12px;">
-  ${(0, exports.foreach)(info, info.start.time, pi, 1)}</div>
+  ${info.map(call => (0, exports.callChain)(call)).join('')}
   <hr /><a href="https://www.midwayjs.org/">Powered by Midway.js</a>
   `;
 };

package/dist/middleware.js

@@ -62,7 +62,7 @@ let CodeDyeMW = class CodeDyeMW {
             }
             else if (outputType === 'html') {
                 response.set('Content-Type', 'text/html');
-                return (0, html_1.toHTML)(reqInfo.call[0]);
+                return (0, html_1.toHTML)(reqInfo.call);
             }
             else if (outputType === 'json') {
                 return reqInfoJSON;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/code-dye",
-  "version": "3.11.10",
+  "version": "3.11.12",
   "description": "Midway Code Dye Component",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -22,13 +22,13 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.11.6",
-    "@midwayjs/express": "^3.11.10",
-    "@midwayjs/faas": "^3.11.10",
-    "@midwayjs/koa": "^3.11.10",
-    "@midwayjs/mock": "^3.11.10",
-    "@midwayjs/serverless-app": "^3.11.10",
-    "@midwayjs/web": "^3.11.10"
+    "@midwayjs/core": "^3.11.11",
+    "@midwayjs/express": "^3.11.12",
+    "@midwayjs/faas": "^3.11.12",
+    "@midwayjs/koa": "^3.11.12",
+    "@midwayjs/mock": "^3.11.12",
+    "@midwayjs/serverless-app": "^3.11.12",
+    "@midwayjs/web": "^3.11.12"
   },
-  "gitHead": "521c42cc4af8850b77c5cf1f040b7430a74db041"
+  "gitHead": "7454a59cd57e693a04e4c887535c9193354e2980"
 }