@shuvi/platform-web 1.0.32 → 1.0.34

package/esm/shared/appTypes.d.ts

@@ -1,7 +1,6 @@
 import { IPageRouteRecord, IAppData, IAppState, Application as _Application } from '@shuvi/platform-shared/shared';
 import { ApplicationImpl as _ApplicationImpl } from '@shuvi/platform-shared/shuvi-app/application';
 import type { ShuviRequest } from '@shuvi/service';
-import { Span } from '@shuvi/service/lib/trace';
 export interface AppConfig {
     ssr: boolean;
 }
@@ -11,7 +10,6 @@ export interface CreateAppServer {
     (options: {
         req: ShuviRequest;
         ssr: boolean;
-        serverCreateAppTrace: Span;
     }): InternalApplication;
 }
 export interface CreateAppClient {

package/esm/shared/renderTypes.d.ts

@@ -2,7 +2,6 @@ import type { ShuviRequest } from '@shuvi/service';
 import { Response, IAppData } from '@shuvi/platform-shared/shared';
 import { IManifest } from '../shared';
 import { Application } from './appTypes';
-import { Span } from '@shuvi/service/lib/trace';
 export declare type IRenderViewOptions = {
     app: Application;
 };
@@ -39,7 +38,6 @@ export interface IClientRendererOptions<ExtraAppData = {}> extends IRenderOption
 export interface IServerRendererOptions extends IRenderOptions {
     req: ShuviRequest;
     manifest: IManifest;
-    serverRequestTrace: Span;
 }
 export interface IViewClient<ExtraAppData = {}> extends IView<IClientRendererOptions<ExtraAppData>> {
 }

package/esm/shuvi-app/app/server.js

@@ -17,7 +17,7 @@ import logger from '@shuvi/utils/logger';
 import { serializeServerError } from '../helper/serializeServerError';
 const { SHUVI_SERVER_RUN_LOADERS } = SERVER_CREATE_APP.events;
 export const createApp = options => {
-    const { req, ssr, serverCreateAppTrace } = options;
+    const { req, ssr } = options;
     const history = createMemoryHistory({
         initialEntries: [(req && req.url) || '/'],
         initialIndex: 0
@@ -29,7 +29,8 @@ export const createApp = options => {
     let app;
     if (ssr) {
         router.beforeResolve((to, from, next) => __awaiter(void 0, void 0, void 0, function* () {
-            const runLoadersTrace = serverCreateAppTrace.traceChild(SHUVI_SERVER_RUN_LOADERS.name);
+            const { serverCreateAppTrace } = req._traces;
+            const runLoadersTrace = serverCreateAppTrace.traceChild(SHUVI_SERVER_RUN_LOADERS.name, { [SHUVI_SERVER_RUN_LOADERS.attrs.requestId]: req._requestId });
             const pageLoaders = yield app.getLoaders();
             const matches = getRouteMatchesWithInvalidLoader(to, from, pageLoaders);
             try {

package/esm/shuvi-app/react/view/ReactView.server.jsx

@@ -22,7 +22,7 @@ import isThirdSite from '../../helper/isThirdSite';
 const { SHUVI_SERVER_RENDER_TO_STRING } = SERVER_REQUEST.events;
 export class ReactServerView {
     constructor() {
-        this.renderApp = ({ req, app, manifest, serverRequestTrace }) => __awaiter(this, void 0, void 0, function* () {
+        this.renderApp = ({ req, app, manifest }) => __awaiter(this, void 0, void 0, function* () {
             yield Loadable.preloadAll();
             const { router, appComponent: AppComponent, setError: setAppError } = app;
             yield router.ready;
@@ -54,7 +54,8 @@ export class ReactServerView {
           </LoadableContext.Provider>
         </AppContainer>
       </Router>);
-            const renderToStringTrace = serverRequestTrace.traceChild(SHUVI_SERVER_RENDER_TO_STRING.name);
+            const { serverRequestTrace } = req._traces;
+            const renderToStringTrace = serverRequestTrace.traceChild(SHUVI_SERVER_RENDER_TO_STRING.name, { [SHUVI_SERVER_RENDER_TO_STRING.attrs.requestId]: req._requestId });
             try {
                 htmlContent = renderToString(RootApp);
                 renderToStringTrace.setAttribute(SHUVI_SERVER_RENDER_TO_STRING.attrs.error.name, false);

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 } = req._traces;
+                const runApiMiddlewareTrace = serverRequestTrace.traceChild(SHUVI_SERVER_RUN_API_MIDDLEWARE.name, { [SHUVI_SERVER_RUN_API_MIDDLEWARE.attrs.requestId]: req._requestId });
                 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) {
     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 { serverCreateAppTrace } = req._traces;
+            const middlewareRoutesTrace = serverCreateAppTrace.traceChild(SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES.name, { [SHUVI_SERVER_RUN_MIDDLEWARE_ROUTES.attrs.requestId]: req._requestId });
+            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/features/html-render/lib/getPageMiddleware.js

@@ -16,9 +16,9 @@ const trace_1 = require("@shuvi/shared/constants/trace");
 const renderToHTML_1 = require("./renderToHTML");
 const { SHUVI_SERVER_SEND_HTML_ORIGINAL, SHUVI_SERVER_SEND_HTML_HOOK, SHUVI_SERVER_RENDER_TO_HTML, SHUVI_SERVER_RUN_PAGE_MIDDLEWARE } = trace_1.SERVER_REQUEST.events;
 function createPageHandler(serverPluginContext) {
-    const { traces: { serverRequestTrace } } = serverPluginContext;
     const wrappedSendHtml = (html, { req, res }) => __awaiter(this, void 0, void 0, function* () {
-        const sendHtmlOriginalTrace = serverRequestTrace.traceChild(SHUVI_SERVER_SEND_HTML_ORIGINAL.name);
+        const { serverRequestTrace } = req._traces;
+        const sendHtmlOriginalTrace = serverRequestTrace.traceChild(SHUVI_SERVER_SEND_HTML_ORIGINAL.name, { [SHUVI_SERVER_SEND_HTML_ORIGINAL.attrs.requestId]: req._requestId });
         (0, utils_1.sendHTML)(req, res, html);
         sendHtmlOriginalTrace.stop();
     });
@@ -26,8 +26,11 @@ function createPageHandler(serverPluginContext) {
     let pendingSendHtml;
     return function (req, res) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { serverRequestTrace } = req._traces;
             const result = yield serverRequestTrace
-                .traceChild(SHUVI_SERVER_RENDER_TO_HTML.name)
+                .traceChild(SHUVI_SERVER_RENDER_TO_HTML.name, {
+                [SHUVI_SERVER_RENDER_TO_HTML.attrs.requestId]: req._requestId
+            })
                 .traceAsyncFn(() => (0, renderToHTML_1.renderToHTML)({
                 req: req,
                 serverPluginContext
@@ -49,8 +52,7 @@ function createPageHandler(serverPluginContext) {
                     }
                     sendHtml = yield pendingSendHtml;
                 }
-                const { traces: { serverRequestTrace } } = serverPluginContext;
-                const sendHtmlHookTrace = serverRequestTrace.traceChild(SHUVI_SERVER_SEND_HTML_HOOK.name);
+                const sendHtmlHookTrace = serverRequestTrace.traceChild(SHUVI_SERVER_SEND_HTML_HOOK.name, { [SHUVI_SERVER_SEND_HTML_HOOK.attrs.requestId]: req._requestId });
                 yield sendHtml(textResp.data, { req, res });
                 sendHtmlHookTrace.stop();
             }
@@ -68,8 +70,8 @@ function getPageMiddleware(api) {
         let pendingPageHandler;
         return function (req, res, next) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { traces: { serverRequestTrace } } = api;
-                const runPageMiddlewareTrace = serverRequestTrace.traceChild(SHUVI_SERVER_RUN_PAGE_MIDDLEWARE.name);
+                const { serverRequestTrace } = req._traces;
+                const runPageMiddlewareTrace = serverRequestTrace.traceChild(SHUVI_SERVER_RUN_PAGE_MIDDLEWARE.name, { [SHUVI_SERVER_RUN_PAGE_MIDDLEWARE.attrs.requestId]: req._requestId });
                 if (!pageHandler) {
                     if (!pendingPageHandler) {
                         pendingPageHandler =

package/lib/node/features/html-render/lib/renderToHTML.js

@@ -20,18 +20,21 @@ function renderToHTML({ req, serverPluginContext }) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
         const renderer = new renderer_1.Renderer({ serverPluginContext });
-        const { traces: { serverCreateAppTrace } } = serverPluginContext;
+        const { serverCreateAppTrace } = req._traces;
         const { application } = resources_1.default.server;
         const app = serverCreateAppTrace
-            .traceChild(trace_1.SERVER_CREATE_APP.events.SHUVI_SERVER_CREATE_APP.name)
+            .traceChild(trace_1.SERVER_CREATE_APP.events.SHUVI_SERVER_CREATE_APP.name, {
+            [trace_1.SERVER_CREATE_APP.events.SHUVI_SERVER_CREATE_APP.attrs.requestId]: req._requestId
+        })
             .traceFn(() => application.createApp({
             req,
-            ssr: serverPluginContext.config.ssr,
-            serverCreateAppTrace
+            ssr: serverPluginContext.config.ssr
         }));
         try {
             yield serverCreateAppTrace
-                .traceChild(trace_1.SERVER_CREATE_APP.events.SHUVI_SERVER_APP_INIT.name)
+                .traceChild(trace_1.SERVER_CREATE_APP.events.SHUVI_SERVER_APP_INIT.name, {
+                [trace_1.SERVER_CREATE_APP.events.SHUVI_SERVER_APP_INIT.attrs.requestId]: req._requestId
+            })
                 .traceAsyncFn(() => app.init());
             result = yield renderer.renderView({
                 req,

package/lib/node/features/html-render/lib/renderer/ssr.js

@@ -22,7 +22,6 @@ class SsrRenderer extends base_1.BaseRenderer {
         return __awaiter(this, void 0, void 0, function* () {
             const { store, router, context } = app;
             const serverPluginContext = this._serverPluginContext;
-            const { traces: { serverRequestTrace } } = serverPluginContext;
             const { view } = resources_1.default.server;
             if (!router) {
                 throw new Error('router is null');
@@ -30,8 +29,7 @@ class SsrRenderer extends base_1.BaseRenderer {
             const result = yield view.renderApp({
                 app,
                 req,
-                manifest: resources_1.default.clientManifest,
-                serverRequestTrace
+                manifest: resources_1.default.clientManifest
             });
             if ((0, shared_1.isResponse)(result)) {
                 return result;

package/lib/node/features/html-render/serverHooks.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { IncomingMessage, ServerResponse } from 'http';
+import { ServerResponse } from 'http';
 import { ShuviRequest } from '@shuvi/service';
 import { IAppContext } from '@shuvi/platform-shared/shared';
 import { IHtmlDocument } from '../html-render';
@@ -7,9 +7,9 @@ export interface ModifyHtmlContext {
     req: ShuviRequest;
     appContext: IAppContext;
 }
-export declare type IHandlePageRequest = (req: IncomingMessage, res: ServerResponse) => Promise<void>;
+export declare type IHandlePageRequest = (req: ShuviRequest, res: ServerResponse) => Promise<void>;
 export declare type RequestContext = {
-    req: IncomingMessage;
+    req: ShuviRequest;
     res: ServerResponse;
 };
 export declare type ISendHtml = (html: string, requestContext: RequestContext) => Promise<void>;

package/lib/shared/appTypes.d.ts

@@ -1,7 +1,6 @@
 import { IPageRouteRecord, IAppData, IAppState, Application as _Application } from '@shuvi/platform-shared/shared';
 import { ApplicationImpl as _ApplicationImpl } from '@shuvi/platform-shared/shuvi-app/application';
 import type { ShuviRequest } from '@shuvi/service';
-import { Span } from '@shuvi/service/lib/trace';
 export interface AppConfig {
     ssr: boolean;
 }
@@ -11,7 +10,6 @@ export interface CreateAppServer {
     (options: {
         req: ShuviRequest;
         ssr: boolean;
-        serverCreateAppTrace: Span;
     }): InternalApplication;
 }
 export interface CreateAppClient {

package/lib/shared/renderTypes.d.ts

@@ -2,7 +2,6 @@ import type { ShuviRequest } from '@shuvi/service';
 import { Response, IAppData } from '@shuvi/platform-shared/shared';
 import { IManifest } from '../shared';
 import { Application } from './appTypes';
-import { Span } from '@shuvi/service/lib/trace';
 export declare type IRenderViewOptions = {
     app: Application;
 };
@@ -39,7 +38,6 @@ export interface IClientRendererOptions<ExtraAppData = {}> extends IRenderOption
 export interface IServerRendererOptions extends IRenderOptions {
     req: ShuviRequest;
     manifest: IManifest;
-    serverRequestTrace: Span;
 }
 export interface IViewClient<ExtraAppData = {}> extends IView<IClientRendererOptions<ExtraAppData>> {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/platform-web",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "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.32",
-    "@shuvi/hook": "1.0.32",
-    "@shuvi/platform-shared": "1.0.32",
-    "@shuvi/router": "1.0.32",
-    "@shuvi/router-react": "1.0.32",
-    "@shuvi/runtime": "1.0.32",
-    "@shuvi/shared": "1.0.32",
-    "@shuvi/toolpack": "1.0.32",
-    "@shuvi/utils": "1.0.32",
+    "@shuvi/error-overlay": "1.0.34",
+    "@shuvi/hook": "1.0.34",
+    "@shuvi/platform-shared": "1.0.34",
+    "@shuvi/router": "1.0.34",
+    "@shuvi/router-react": "1.0.34",
+    "@shuvi/runtime": "1.0.34",
+    "@shuvi/shared": "1.0.34",
+    "@shuvi/toolpack": "1.0.34",
+    "@shuvi/utils": "1.0.34",
     "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.32"
+    "@shuvi/service": "1.0.34"
   },
   "devDependencies": {
     "@shuvi/service": "workspace:*",