@shuvi/platform-web 1.0.31 → 1.0.33

package/lib/node/features/filesystem-routes/api/middleware.js

@@ -15,7 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.middleware = void 0;
 const router_1 = require("@shuvi/router");
 const resources_1 = __importDefault(require("@shuvi/service/lib/resources"));
+const trace_1 = require("@shuvi/shared/constants/trace");
 const apiRouteHandler_1 = require("./apiRouteHandler");
+const { SHUVI_SERVER_RUN_API_MIDDLEWARE } = trace_1.SERVER_REQUEST.events;
 function middleware(_ctx) {
     return function (req, res, next) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -30,13 +32,24 @@ function middleware(_ctx) {
                 }
             }
             if (tempApiModule) {
+                const { serverRequestTrace } = _ctx.traces;
+                const runApiMiddlewareTrace = serverRequestTrace.traceChild(SHUVI_SERVER_RUN_API_MIDDLEWARE.name);
                 try {
                     const { config, default: resolver } = tempApiModule;
                     yield (0, apiRouteHandler_1.apiRouteHandler)(req, res, resolver, (config === null || config === void 0 ? void 0 : config.api) || { bodyParser: true });
                 }
                 catch (error) {
+                    runApiMiddlewareTrace.setAttributes({
+                        [SHUVI_SERVER_RUN_API_MIDDLEWARE.attrs.error.name]: true,
+                        [SHUVI_SERVER_RUN_API_MIDDLEWARE.attrs.statusCode.name]: res.statusCode
+                    });
                     next(error);
                 }
+                runApiMiddlewareTrace.setAttributes({
+                    [SHUVI_SERVER_RUN_API_MIDDLEWARE.attrs.error.name]: false,
+                    [SHUVI_SERVER_RUN_API_MIDDLEWARE.attrs.statusCode.name]: res.statusCode
+                });
+                runApiMiddlewareTrace.stop();
             }
             else {
                 next();

package/lib/node/features/filesystem-routes/middleware/middleware.js

@@ -15,30 +15,65 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.middleware = void 0;
 const router_1 = require("@shuvi/router");
 const resources_1 = __importDefault(require("@shuvi/service/lib/resources"));
+const trace_1 = require("@shuvi/shared/constants/trace");
+const { SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES } = trace_1.SERVER_REQUEST.events;
 function middleware(_api) {
+    const { serverCreateAppTrace } = _api.traces;
     return function (req, res, next) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { middlewareRoutes = [] } = resources_1.default.server;
-            // match path for get middlewares
-            let middlewares = [];
-            for (let i = 0; i < middlewareRoutes.length; i++) {
-                const middlewareRoute = middlewareRoutes[i];
-                const match = (0, router_1.matchPathname)(middlewareRoute.path, req.pathname);
-                if (match) {
-                    req.params = match.params;
-                    middlewares.push(middlewareRoutes[i].middleware.default);
+            const middlewareRoutesTrace = serverCreateAppTrace.traceChild(SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES.name);
+            try {
+                const { middlewareRoutes = [] } = resources_1.default.server;
+                // match path for get middlewares
+                let middlewares = [];
+                for (let i = 0; i < middlewareRoutes.length; i++) {
+                    const middlewareRoute = middlewareRoutes[i];
+                    const match = (0, router_1.matchPathname)(middlewareRoute.path, req.pathname);
+                    if (match) {
+                        req.params = match.params;
+                        middlewares.push(middlewareRoutes[i].middleware.default);
+                    }
                 }
+                // run middlewares
+                let i = 0;
+                const runNext = () => runMiddleware(middlewares[++i]);
+                const runMiddleware = (middleware) => __awaiter(this, void 0, void 0, function* () {
+                    if (i === middlewares.length) {
+                        /** Most request should end here */
+                        middlewareRoutesTrace.setAttributes({
+                            [SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES.attrs.error.name]: false,
+                            [SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES.attrs.statusCode.name]: res.statusCode,
+                            [SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES.attrs.headersSent.name]: res.headersSent
+                        });
+                        middlewareRoutesTrace.stop();
+                        return next();
+                    }
+                    try {
+                        yield middleware(req, res, runNext);
+                    }
+                    catch (err) {
+                        /** Catch error from single middleware */
+                        middlewareRoutesTrace.setAttributes({
+                            [SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES.attrs.error.name]: true,
+                            [SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES.attrs.statusCode.name]: 500,
+                            [SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES.attrs.headersSent.name]: res.headersSent
+                        });
+                        middlewareRoutesTrace.stop();
+                        return next(err);
+                    }
+                });
+                return yield runMiddleware(middlewares[i]);
+            }
+            catch (err) {
+                /** Catch error from the whole function */
+                middlewareRoutesTrace.setAttributes({
+                    [SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES.attrs.error.name]: true,
+                    [SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES.attrs.statusCode.name]: 500,
+                    [SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES.attrs.headersSent.name]: res.headersSent
+                });
+                middlewareRoutesTrace.stop();
+                return next(err);
             }
-            // run middlewares
-            let i = 0;
-            const runNext = () => runMiddleware(middlewares[++i]);
-            const runMiddleware = (middleware) => __awaiter(this, void 0, void 0, function* () {
-                if (i === middlewares.length) {
-                    return next();
-                }
-                yield middleware(req, res, runNext);
-            });
-            return yield runMiddleware(middlewares[i]);
         });
     };
 }

package/lib/node/index.js

@@ -22,13 +22,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_1 = require("@shuvi/platform-shared/node");
-const trace_1 = __importDefault(require("./trace"));
-const external_internal_libs_1 = __importDefault(require("./external-internal-libs"));
 const features_1 = require("./features");
 const paths_1 = require("./paths");
 __exportStar(require("../shared"), exports);
@@ -43,8 +38,6 @@ const platform = ({ framework = 'react' } = {}) => (platformContext) => __awaite
             (0, paths_1.resolvePkgFile)('shuvi-image.d.ts')
         ],
         plugins: [
-            external_internal_libs_1.default,
-            trace_1.default,
             ...node_1.SharedPlugins,
             ...(0, features_1.getPlugins)(platformContext),
             ...platformFrameworkContent.plugins

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -72,15 +72,15 @@
   },
   "dependencies": {
     "@next/react-refresh-utils": "12.1.6",
-    "@shuvi/error-overlay": "1.0.31",
-    "@shuvi/hook": "1.0.31",
-    "@shuvi/platform-shared": "1.0.31",
-    "@shuvi/router": "1.0.31",
-    "@shuvi/router-react": "1.0.31",
-    "@shuvi/runtime": "1.0.31",
-    "@shuvi/shared": "1.0.31",
-    "@shuvi/toolpack": "1.0.31",
-    "@shuvi/utils": "1.0.31",
+    "@shuvi/error-overlay": "1.0.33",
+    "@shuvi/hook": "1.0.33",
+    "@shuvi/platform-shared": "1.0.33",
+    "@shuvi/router": "1.0.33",
+    "@shuvi/router-react": "1.0.33",
+    "@shuvi/runtime": "1.0.33",
+    "@shuvi/shared": "1.0.33",
+    "@shuvi/toolpack": "1.0.33",
+    "@shuvi/utils": "1.0.33",
     "content-type": "1.0.4",
     "core-js": "3.6.5",
     "doura": "0.0.11",
@@ -98,7 +98,7 @@
     "whatwg-fetch": "3.0.0"
   },
   "peerDependencies": {
-    "@shuvi/service": "1.0.31"
+    "@shuvi/service": "1.0.33"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",

package/lib/node/external-internal-libs.d.ts

@@ -1,4 +0,0 @@
-declare const _default: {
-    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
-};
-export default _default;

package/lib/node/external-internal-libs.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const service_1 = require("@shuvi/service");
-const shared_1 = require("../shared");
-const paths_1 = require("./paths");
-const configWebpack = (config, { name, helpers }) => {
-    if (name === shared_1.BUNDLER_TARGET_SERVER) {
-        helpers.addExternals(config, ({ request }, next) => {
-            if (/@shuvi[/\\](hook$|router$|utils)/.test(request)) {
-                return next(null, (0, paths_1.resolveDep)(request));
-            }
-            else {
-                return next(null, 'next');
-            }
-        });
-    }
-    return config;
-};
-exports.default = {
-    core: (0, service_1.createPlugin)({
-        configWebpack
-    })
-};

package/lib/node/trace.d.ts

@@ -1,4 +0,0 @@
-declare const _default: {
-    core: import("@shuvi/hook").IPluginInstance<import("@shuvi/service/lib/core/plugin").PluginHooks, import("@shuvi/service").IPluginContext>;
-};
-export default _default;

package/lib/node/trace.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const service_1 = require("@shuvi/service");
-const shared_1 = require("../shared");
-const paths_1 = require("./paths");
-const configWebpack = (config, { name, helpers }) => {
-    if (name === shared_1.BUNDLER_TARGET_SERVER) {
-        const tracePath = (0, paths_1.resolveLocal)('@shuvi/service', 'lib/trace');
-        helpers.addExternals(config, ({ request }, next) => {
-            switch (request) {
-                // trace is a singleton, so we don't want to bundle it
-                case '@shuvi/service/lib/trace': {
-                    next(null, `commonjs ${tracePath}`);
-                    break;
-                }
-                default: {
-                    next(null, 'next');
-                }
-            }
-        });
-    }
-    return config;
-};
-exports.default = {
-    core: (0, service_1.createPlugin)({
-        configWebpack
-    })
-};