@yumerijs/core 2.0.3 → 2.0.5

package/dist/core.js

@@ -107,15 +107,24 @@ class Core {
             const route = this.routes[routePath];
             const result = route.match(pathname);
             if (result) {
-                const middlewares = [...Object.values(this.globalMiddlewares), ...(route.middlewares || [])];
-                let index = 0;
-                const runner = async () => {
-                    if (index < middlewares.length)
-                        await middlewares[index++](session, runner);
-                    else
-                        await route.executeHandler(session, queryParams, result.pathParams);
-                };
-                await runner();
+                try {
+                    const middlewares = [...Object.values(this.globalMiddlewares), ...(route.middlewares || [])];
+                    let index = 0;
+                    const runner = async () => {
+                        if (index < middlewares.length)
+                            await middlewares[index++](session, runner);
+                        else
+                            await route.executeHandler(session, queryParams, result.pathParams);
+                    };
+                    await runner();
+                }
+                catch (error) {
+                    this.logger.error(`Unhandled error in route execution for path "${pathname}":`, error);
+                    if (session && session.client.res && !session.client.res.writableEnded) {
+                        session.client.res.statusCode = 500;
+                        session.client.res.end('Internal Server Error');
+                    }
+                }
                 return true;
             }
         }

package/dist/server.js

@@ -119,7 +119,28 @@ class Server {
                 }
                 else {
                     let head = session.head;
-                    head['Set-Cookie'] = Object.entries(session.newCookie).map(([k, v]) => `${k}=${v}`);
+                    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'] = '*';
                     }
@@ -134,7 +155,28 @@ class Server {
                 }
                 else {
                     let head = session.head;
-                    head['Set-Cookie'] = Object.entries(session.newCookie).map(([k, v]) => `${k}=${v}`);
+                    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'] = '*';
                     }

package/dist/session.d.ts

@@ -11,13 +11,24 @@ export interface Client {
     res: ServerResponse;
     headers?: Record<string, string>;
 }
+export interface CookieOptions {
+    expires?: Date;
+    path?: string;
+    domain?: string;
+    secure?: boolean;
+    httpOnly?: boolean;
+    sameSite?: 'Strict' | 'Lax' | 'None';
+}
 export declare class Session {
     ip: string;
     cookie: Record<string, string>;
     query: Record<string, string> | undefined;
     sessionid: string;
     data: Record<string, any>;
-    newCookie: Record<string, string>;
+    newCookie: Record<string, {
+        value: string;
+        options: CookieOptions;
+    }>;
     head: Record<string, any>;
     status: number;
     body: any;
@@ -34,6 +45,7 @@ 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>);
+    setCookie(name: string, value: string, options?: CookieOptions): void;
     /**
      * 解析 Accept-Language 字符串为排序后的语言数组
      * @param header Accept-Language 头，比如 "zh-CN,zh-TW;q=0.8,en-US;q=0.6"

package/dist/session.js

@@ -82,16 +82,22 @@ class Session {
         }
         else {
             this.sessionid = this.generateId(this.ip);
-            this.newCookie.sessionid = this.sessionid;
+            this.setCookie('sessionid', this.sessionid);
         }
         if (cookie.lang) {
             this.languages = cookie.lang.split(',');
         }
         else if (req.headers['accept-language']) {
             this.languages = this.parseAcceptLanguages(req.headers['accept-language']);
-            this.newCookie.lang = this.languages.join(',');
+            this.setCookie('lang', this.languages.join(','));
         }
     }
+    setCookie(name, value, options = {}) {
+        if (options.path === undefined) {
+            options.path = '/';
+        }
+        this.newCookie[name] = { value, options };
+    }
     /**
      * 解析 Accept-Language 字符串为排序后的语言数组
      * @param header Accept-Language 头，比如 "zh-CN,zh-TW;q=0.8,en-US;q=0.6"

package/package.json

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