starlight-server 1.6.5 → 1.6.7

package/dist/http/cors.js

@@ -30,4 +30,6 @@ export function handleCORS(request, response, rule) {
         nodeResponse.setHeader('Access-Control-Allow-Headers', rule.allowHeaders);
     if (!requestIsPreflight && rule.exposeHeaders !== undefined)
         nodeResponse.setHeader('Access-Control-Expose-Headers', rule.exposeHeaders);
+    if (requestIsPreflight)
+        nodeResponse.setHeader('Access-Control-Allow-Methods', getPreflightRequestMethod(request) ?? request.method ?? '');
 }

package/dist/http/response.d.ts

@@ -15,6 +15,7 @@ export declare class ResponseUtils {
     jsonReplacer?: ((key: string, value: unknown) => unknown) | undefined);
     header(name: string, value: string): void;
     headers(...items: [string, string][]): void;
+    headers(items: Record<string, string>): void;
     text(content: string | Buffer): void;
     /**
      * Output JSON

package/dist/http/response.js

@@ -19,7 +19,10 @@ export class ResponseUtils {
         this.nodeResponse.setHeader(name, value);
     }
     headers(...items) {
-        items.forEach(([name, value]) => this.header(name, value));
+        if (items.length === 1 && typeof items[0] === 'object') {
+            items = Object.entries(items[0]);
+        }
+        void items.forEach(([name, value]) => this.header(name, value));
     }
     text(content) {
         this.nodeResponse.end(content);

package/dist/router/index.js

@@ -95,6 +95,10 @@ export class Router {
             }
             throw new HTTPError(405); // 有路径匹配的路由，但是没有 method 匹配的
         }
+        else {
+            const corsRule = matched.route.cors ?? this.cors;
+            handleCORS(request, response, typeof corsRule === 'function' ? corsRule(request) : corsRule);
+        }
         const basicContext = {};
         const helpers = new Helpers(basicContext);
         Object.assign(basicContext, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starlight-server",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "description": "Simple But Powerful Node.js HTTP Server",
   "type": "module",
   "keywords": [

package/src/http/cors.ts

@@ -42,7 +42,7 @@ export type CORSRule =
 export function handleCORS(
   request: Request | NodeRequest,
   response: ResponseUtils | NodeResponse,
-  rule: CORSRule
+  rule: CORSRule,
 ) {
   // 不输出 CORS 相关 headers，浏览器会默认服务端不允许跨域请求
   if (rule === false) return
@@ -56,4 +56,9 @@ export function handleCORS(
     nodeResponse.setHeader('Access-Control-Allow-Headers', rule.allowHeaders)
   if (!requestIsPreflight && rule.exposeHeaders !== undefined)
     nodeResponse.setHeader('Access-Control-Expose-Headers', rule.exposeHeaders)
+  if (requestIsPreflight)
+    nodeResponse.setHeader(
+      'Access-Control-Allow-Methods',
+      getPreflightRequestMethod(request) ?? request.method ?? '',
+    )
 }

package/src/http/response.ts

@@ -18,8 +18,13 @@ export class ResponseUtils {
     this.nodeResponse.setHeader(name, value)
   }
 
-  headers(...items: [string, string][]) {
-    items.forEach(([name, value]) => this.header(name, value))
+  headers(...items: [string, string][]): void
+  headers(items: Record<string, string>): void
+  headers(...items: [string, string][] | [Record<string, string>]) {
+    if (items.length === 1 && typeof items[0] === 'object') {
+      items = Object.entries(items[0] as Record<string, string>)
+    }
+    void (items as [string, string][]).forEach(([name, value]) => this.header(name, value))
   }
 
   text(content: string | Buffer) {

package/src/router/index.ts

@@ -131,6 +131,9 @@ export class Router {
         return
       }
       throw new HTTPError(405) // 有路径匹配的路由，但是没有 method 匹配的
+    } else {
+      const corsRule = matched.route.cors ?? this.cors
+      handleCORS(request, response, typeof corsRule === 'function' ? corsRule(request) : corsRule)
     }
 
     const basicContext = {} as BasicContext