@yumerijs/core 2.0.12 → 2.0.14

package/dist/context.d.ts

@@ -9,6 +9,8 @@ interface Plugin {
     depend: Array<string>;
     provide: Array<string>;
 }
+export interface Components {
+}
 /**
  * 插件上下文对象
  * 每个插件一个 Context，用于管理插件注册的命令、路由、事件、组件和中间件
@@ -23,6 +25,7 @@ export declare class Context {
     private childContexts;
     private childPlugins;
     private i18ns;
+    component: Components;
     /** 插件名称 */
     pluginname: string;
     /**
@@ -30,7 +33,13 @@ export declare class Context {
      * @param core Core 实例
      * @param pluginname 插件名称
      */
-    constructor(core: Core, pluginname: string);
+    constructor(core: Core, pluginname: string, injections?: Record<string, any>);
+    /**
+     * 注入依赖
+     * @param name 依赖名称
+     * @param value 依赖值
+     */
+    inject(name: string, value: any): void;
     /**
      * 注册路由
      * @param path 路由路径
@@ -72,6 +81,7 @@ export declare class Context {
     emit(event: string, ...args: any[]): Promise<void>;
     /**
      * 获取组件实例
+     * @deprecated
      * @param name 组件名称
      */
     getComponent(name: string): any;

package/dist/context.js

@@ -16,6 +16,7 @@ class Context {
     childContexts = [];
     childPlugins = new Map();
     i18ns = [];
+    component;
     /** 插件名称 */
     pluginname;
     /**
@@ -23,10 +24,19 @@ class Context {
      * @param core Core 实例
      * @param pluginname 插件名称
      */
-    constructor(core, pluginname) {
+    constructor(core, pluginname, injections = {}) {
         this.core = core;
         this.pluginname = pluginname;
         this.childPlugins = new Map();
+        this.component = injections;
+    }
+    /**
+     * 注入依赖
+     * @param name 依赖名称
+     * @param value 依赖值
+     */
+    inject(name, value) {
+        this.component[name] = value;
     }
     /**
      * 注册路由
@@ -99,6 +109,7 @@ class Context {
     }
     /**
      * 获取组件实例
+     * @deprecated
      * @param name 组件名称
      */
     getComponent(name) {

package/dist/server.js

@@ -45,6 +45,9 @@ const path = __importStar(require("path"));
 const url_1 = require("url");
 const mime = __importStar(require("mime-types"));
 const logger = new logger_1.Logger('server');
+function isStream(value) {
+    return value && typeof value.pipe === "function";
+}
 class Server {
     core;
     port;
@@ -112,81 +115,60 @@ class Server {
             const session = this.createSession(ip, cookies, res, req, pathname, { protocol: 'http', header: req.headers });
             const route = this.core.getRoute(pathname);
             const rootroute = this.core.getRoute('root');
-            if (route && route.allowedMethods.includes(req.method ?? 'GET')) {
-                const matched = await this.core.executeRoute(pathname, session, queryParams);
+            const handleRoute = async (routePath) => {
+                const matched = await this.core.executeRoute(routePath, session, queryParams);
                 if (!matched) {
                     this.serveStaticFile(pathname, res);
+                    return;
                 }
-                else {
-                    if (!session.responseHandled) {
-                        let head = session.head;
-                        head['Set-Cookie'] = Object.entries(session.newCookie).map(([name, cookie]) => {
-                            let cookieString = `${name}=${cookie.value}`;
-                            if (cookie.options.expires) {
-                                cookieString += `; Expires=${cookie.options.expires.toUTCString()}`;
-                            }
-                            if (cookie.options.path) {
-                                cookieString += `; Path=${cookie.options.path}`;
-                            }
-                            if (cookie.options.domain) {
-                                cookieString += `; Domain=${cookie.options.domain}`;
-                            }
-                            if (cookie.options.secure) {
-                                cookieString += `; Secure`;
-                            }
-                            if (cookie.options.httpOnly) {
-                                cookieString += `; HttpOnly`;
-                            }
-                            if (cookie.options.sameSite) {
-                                cookieString += `; SameSite=${cookie.options.sameSite}`;
-                            }
-                            return cookieString;
-                        });
-                        if (this.enableCors) {
-                            head['Access-Control-Allow-Origin'] = '*';
-                        }
-                        res.writeHead(session.status ?? 200, head);
+                if (session.responseHandled)
+                    return;
+                const head = { ...session.head };
+                head['Set-Cookie'] = Object.entries(session.newCookie).map(([name, cookie]) => {
+                    let cookieString = `${name}=${cookie.value}`;
+                    if (cookie.options.expires)
+                        cookieString += `; Expires=${cookie.options.expires.toUTCString()}`;
+                    if (cookie.options.path)
+                        cookieString += `; Path=${cookie.options.path}`;
+                    if (cookie.options.domain)
+                        cookieString += `; Domain=${cookie.options.domain}`;
+                    if (cookie.options.secure)
+                        cookieString += `; Secure`;
+                    if (cookie.options.httpOnly)
+                        cookieString += `; HttpOnly`;
+                    if (cookie.options.sameSite)
+                        cookieString += `; SameSite=${cookie.options.sameSite}`;
+                    return cookieString;
+                });
+                if (this.enableCors) {
+                    head['Access-Control-Allow-Origin'] = '*';
+                }
+                res.writeHead(session.status ?? 200, head);
+                switch (session.restype) {
+                    case 'plain':
                         res.end(session.body);
-                    }
+                        break;
+                    case 'buffer':
+                        res.end(session.body);
+                        break;
+                    case 'json':
+                        res.end(JSON.stringify(session.body));
+                        break;
+                    case 'stream':
+                        if (isStream(session.body)) {
+                            const stream = session.body;
+                            stream.pipe(res);
+                        }
+                        break;
+                    default:
+                        res.end(session.body); // fallback
                 }
+            };
+            if (route && route.allowedMethods.includes(req.method ?? 'GET')) {
+                await handleRoute(pathname);
             }
             else if (rootroute && rootroute.allowedMethods.includes(req.method ?? 'GET')) {
-                const matched = await this.core.executeRoute('root', session, queryParams);
-                if (!matched) {
-                    this.serveStaticFile(pathname, res);
-                }
-                else {
-                    if (!session.responseHandled) {
-                        let head = session.head;
-                        head['Set-Cookie'] = Object.entries(session.newCookie).map(([name, cookie]) => {
-                            let cookieString = `${name}=${cookie.value}`;
-                            if (cookie.options.expires) {
-                                cookieString += `; Expires=${cookie.options.expires.toUTCString()}`;
-                            }
-                            if (cookie.options.path) {
-                                cookieString += `; Path=${cookie.options.path}`;
-                            }
-                            if (cookie.options.domain) {
-                                cookieString += `; Domain=${cookie.options.domain}`;
-                            }
-                            if (cookie.options.secure) {
-                                cookieString += `; Secure`;
-                            }
-                            if (cookie.options.httpOnly) {
-                                cookieString += `; HttpOnly`;
-                            }
-                            if (cookie.options.sameSite) {
-                                cookieString += `; SameSite=${cookie.options.sameSite}`;
-                            }
-                            return cookieString;
-                        });
-                        if (this.enableCors) {
-                            head['Access-Control-Allow-Origin'] = '*';
-                        }
-                        res.writeHead(session.status ?? 200, head);
-                        res.end(session.body);
-                    }
-                }
+                await handleRoute('root');
             }
             else {
                 this.serveStaticFile(pathname, res);

package/dist/session.d.ts

@@ -5,6 +5,7 @@
  **/
 import { Server } from './server';
 import { IncomingMessage, ServerResponse } from 'http';
+import { Stream } from "stream";
 type ParsedParams = Record<string, string | string[] | undefined>;
 export interface Client {
     req: IncomingMessage;
@@ -34,6 +35,13 @@ export interface StaticCacheOptions {
     smaxAge?: number;
     etagType?: 'md5' | 'sha1' | 'sha256' | 'sha512';
 }
+type ResType = "plain" | "json" | "stream" | "buffer";
+interface BodyMap {
+    plain: string;
+    json: Record<string, any>;
+    stream: Stream;
+    buffer: Buffer;
+}
 export declare class Session {
     ip: string;
     cookie: Record<string, string>;
@@ -46,7 +54,8 @@ export declare class Session {
     }>;
     head: Record<string, any>;
     status: number;
-    body: any;
+    private _restype;
+    private _body;
     properties?: Record<string, any>;
     client: Client;
     server: Server;
@@ -61,6 +70,10 @@ export declare class Session {
      * @param query 请求字符串
      */
     constructor(ip: string, cookie: Record<string, string>, server: Server, req?: IncomingMessage, res?: ServerResponse, pathname?: string, query?: Record<string, string>);
+    response<T extends ResType>(body: BodyMap[T], type?: T): void;
+    get restype(): ResType;
+    get body(): string;
+    set body(value: string);
     setCookie(name: string, value: string, options?: CookieOptions): void;
     /**
      * 解析 Accept-Language 字符串为排序后的语言数组
@@ -104,7 +117,24 @@ export declare class Session {
      * @param option 选项
      */
     setCache(option: CacheOptions): void;
+    /**
+     * 设置静态文件
+     * @param content 文件内容
+     * @param option 选项
+     */
     static(content: string, option: CacheOptions): void;
+    /**
+     * 发送静态文件
+     * @param path 文件路径
+     * @param option 缓存选项
+     * @returns void
+     */
     file(path: string, option: StaticCacheOptions): void;
+    /**
+     * 发送普通文件
+     * @param path 文件路径
+     * @param isStream 是否流式传输
+     */
+    sendFile(path: string, isStream?: boolean): void;
 }
 export {};

package/dist/session.js

@@ -54,7 +54,8 @@ class Session {
     newCookie = {};
     head = {};
     status = 200;
-    body;
+    _restype = "plain";
+    _body;
     properties = {};
     client = null;
     server;
@@ -108,6 +109,20 @@ class Session {
             this.setCookie('lang', this.languages.join(','));
         }
     }
+    response(body, type = 'text') {
+        this._restype = type;
+        this._body = body;
+    }
+    get restype() {
+        return this._restype;
+    }
+    get body() {
+        return this._body;
+    }
+    set body(value) {
+        this._body = value;
+        this._restype = "plain"; // 自动把 restype 设成 plain
+    }
     setCookie(name, value, options = {}) {
         if (options.path === undefined) {
             options.path = '/';
@@ -293,7 +308,7 @@ class Session {
      */
     setCache(option) {
         if (option.etag)
-            this.head['ETag'] = `"${option.etag}"`;
+            this.head['ETag'] = `${option.etag}`;
         if (option.modified)
             this.head['Last-Modified'] = option.modified.toUTCString();
         let control = [];
@@ -310,6 +325,11 @@ class Session {
         if (option.expires)
             this.head['Expires'] = option.expires.toUTCString();
     }
+    /**
+     * 设置静态文件
+     * @param content 文件内容
+     * @param option 选项
+     */
     static(content, option) {
         // 先查看用户是否在询问文件修改情况
         if (this.client.headers['If-Modified-Since']) {
@@ -326,8 +346,14 @@ class Session {
             }
         }
         this.setCache(option);
-        this.body = content;
+        this.response(content);
     }
+    /**
+     * 发送静态文件
+     * @param path 文件路径
+     * @param option 缓存选项
+     * @returns void
+     */
     file(path, option) {
         if (this.client.headers['If-Modified-Since']) {
             const modified = new Date(this.client.headers['If-Modified-Since']);
@@ -353,7 +379,21 @@ class Session {
             smaxAge: option.smaxAge,
             cacheControl: 'public'
         });
-        this.body = fs_1.default.readFileSync(path, 'utf-8');
+        this.response(fs_1.default.createReadStream(path), 'stream');
+    }
+    /**
+     * 发送普通文件
+     * @param path 文件路径
+     * @param isStream 是否流式传输
+     */
+    sendFile(path, isStream = false) {
+        if (isStream) {
+            this.setMime('application/octet-stream');
+            this.response(fs_1.default.createReadStream(path), 'stream');
+        }
+        else {
+            this.response(fs_1.default.readFileSync(path), 'buffer');
+        }
     }
 }
 exports.Session = Session;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yumerijs/core",
-  "version": "2.0.12",
+  "version": "2.0.14",
   "description": "Core module for yumeri",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",