@shuvi/service 1.0.0 → 1.0.1

package/lib/server/middlewares/getAssetMiddleware.js

@@ -14,24 +14,29 @@ const constants_1 = require("../../constants");
 const utils_1 = require("../utils");
 const getAssetMiddleware = (context, isDev = false) => {
     return (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-        const fullUrl = new URL(req.url, `http://${req.headers.host}`);
-        let assetPath = fullUrl.pathname;
         const candidatePaths = [];
-        if (context.assetPublicPath.startsWith('/')) {
-            assetPath = assetPath.replace(context.assetPublicPath, '');
-            candidatePaths.push(context.resolveBuildFile(constants_1.CLIENT_OUTPUT_DIR, assetPath));
-        }
-        else {
-            fullUrl.search = '';
-            const urlWithoutQuery = fullUrl.toString();
-            // when assetPublicPath is http:localhost:3000/xx
-            if (urlWithoutQuery.startsWith(context.assetPublicPath)) {
-                assetPath = urlWithoutQuery.replace(context.assetPublicPath, '');
+        try {
+            const fullUrl = new URL(req.url, `http://${req.headers.host}`);
+            let assetPath = fullUrl.pathname;
+            if (context.assetPublicPath.startsWith('/')) {
+                assetPath = assetPath.replace(context.assetPublicPath, '');
                 candidatePaths.push(context.resolveBuildFile(constants_1.CLIENT_OUTPUT_DIR, assetPath));
             }
+            else {
+                fullUrl.search = '';
+                const urlWithoutQuery = fullUrl.toString();
+                // when assetPublicPath is http:localhost:3000/xx
+                if (urlWithoutQuery.startsWith(context.assetPublicPath)) {
+                    assetPath = urlWithoutQuery.replace(context.assetPublicPath, '');
+                    candidatePaths.push(context.resolveBuildFile(constants_1.CLIENT_OUTPUT_DIR, assetPath));
+                }
+            }
+            if (isDev) {
+                candidatePaths.push(context.resolvePublicFile(assetPath));
+            }
         }
-        if (isDev) {
-            candidatePaths.push(context.resolvePublicFile(assetPath));
+        catch (err) {
+            return next(err);
         }
         if (!candidatePaths.length) {
             return next();

package/lib/server/shuviServer.js

@@ -14,6 +14,7 @@ const string_1 = require("@shuvi/utils/lib/string");
 const serverMiddleware_1 = require("./serverMiddleware");
 const http_server_1 = require("./http-server");
 const plugin_1 = require("./plugin");
+const utils_1 = require("./utils");
 class ShuviServer {
     constructor(corePluginContext, options) {
         this._pluginManager = (0, plugin_1.getManager)();
@@ -28,6 +29,8 @@ class ShuviServer {
             const fullAssetPath = (0, string_1.joinPath)(this._serverContext.assetPublicPath, assetPath);
             return fullAssetPath;
         };
+        // Parsing of cookies
+        shuviReq.cookies = (0, utils_1.getCookieParser)(req);
     }
     _normalizeResp(_resp) {
         // do nothing

package/lib/server/shuviServerTypes.d.ts

@@ -4,12 +4,14 @@ import { ServerPluginInstance } from './plugin';
 import { IPlatformContent } from '../core';
 import { Bunlder } from '../bundler';
 import { IRequest, IResponse, IRequestHandlerWithNext } from '../server/http-server';
+import type { getCookieParser } from './utils';
 export interface CustomShuviRequest {
 }
 export interface CustomShuviResponse {
 }
 export interface ShuviRequest extends IRequest, CustomShuviRequest {
     getAssetUrl(assetPath: string): string;
+    cookies: ReturnType<typeof getCookieParser>;
 }
 export interface ShuviResponse extends IResponse, CustomShuviResponse {
 }

package/lib/server/utils.d.ts

@@ -2,4 +2,11 @@
 import { IncomingMessage, ServerResponse } from 'http';
 export declare function isStaticFileExist(path: string): Boolean;
 export declare function serveStatic(req: IncomingMessage, res: ServerResponse, path: string): Promise<void>;
+/**
+ * Parse cookies from `req` header
+ * @param req request object
+ */
+export declare function getCookieParser(req: IncomingMessage): {
+    [key: string]: string;
+};
 export declare function sendHTML(req: IncomingMessage, res: ServerResponse, html: string): void;

package/lib/server/utils.js

@@ -1,11 +1,35 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendHTML = exports.serveStatic = exports.isStaticFileExist = void 0;
+exports.sendHTML = exports.getCookieParser = exports.serveStatic = exports.isStaticFileExist = void 0;
 const fs_1 = require("fs");
 const send_1 = __importDefault(require("send"));
+const cookie = __importStar(require("cookie"));
 function isStaticFileExist(path) {
     if ((0, fs_1.existsSync)(path)) {
         return !(0, fs_1.statSync)(path).isDirectory() && (0, fs_1.statSync)(path).isFile();
@@ -31,6 +55,18 @@ function serveStatic(req, res, path) {
     });
 }
 exports.serveStatic = serveStatic;
+/**
+ * Parse cookies from `req` header
+ * @param req request object
+ */
+function getCookieParser(req) {
+    const header = req.headers.cookie;
+    if (!header) {
+        return {};
+    }
+    return cookie.parse(Array.isArray(header) ? header.join(';') : header);
+}
+exports.getCookieParser = getCookieParser;
 function sendHTML(req, res, html) {
     if (res.writableEnded || res.headersSent)
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/service",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -29,13 +29,13 @@
     "@babel/generator": "7.14.5",
     "@babel/parser": "7.14.7",
     "@babel/traverse": "7.14.7",
-    "@shuvi/hook": "1.0.0",
-    "@shuvi/router": "1.0.0",
-    "@shuvi/runtime": "1.0.0",
-    "@shuvi/shared": "1.0.0",
-    "@shuvi/toolpack": "1.0.0",
-    "@shuvi/utils": "1.0.0",
-    "@shuvi/error-overlay": "1.0.0",
+    "@shuvi/hook": "1.0.1",
+    "@shuvi/router": "1.0.1",
+    "@shuvi/runtime": "1.0.1",
+    "@shuvi/shared": "1.0.1",
+    "@shuvi/toolpack": "1.0.1",
+    "@shuvi/utils": "1.0.1",
+    "@shuvi/error-overlay": "1.0.1",
     "commander": "5.1.0",
     "comment-json": "4.2.2",
     "cross-spawn": "7.0.3",
@@ -43,6 +43,7 @@
     "fs-extra": "9.0.1",
     "http-proxy-middleware": "1.0.6",
     "rimraf": "3.0.2",
+    "cookie": "0.4.1",
     "send": "0.17.1",
     "ws": "8.2.3",
     "dotenv": "16.0.3",
@@ -55,6 +56,7 @@
     "@types/babel__traverse": "^7.14.2",
     "@types/cross-spawn": "6.0.1",
     "@types/detect-port": "1.3.0",
+    "@types/cookie": "^0.4.1",
     "@types/ejs": "3.0.4",
     "@types/ws": "8.2.0"
   }