chore: updated cors logic and added preflight support

Author: ilyhalight

bun.lock

@@ -12,6 +12,7 @@
         "pino-loki": "^2.4.0",
       },
       "devDependencies": {
+        "@elysiajs/cors": "^1.2.0",
         "@sinclair/typebox": "^0.34.13",
         "bun-types": "^1.1.41",
         "eslint": "^9.17.0",
@@ -29,6 +30,8 @@
   "packages": {
     "@bufbuild/protobuf": ["@bufbuild/protobuf@2.2.3", "", {}, "sha512-tFQoXHJdkEOSwj5tRIZSPNUuXK3RaR7T1nUrPgbYX1pUbvqqaaZAsfo+NXBPsz5rZMSKVFrgK1WL8Q/MSLvprg=="],
 
+    "@elysiajs/cors": ["@elysiajs/cors@1.2.0", "", { "peerDependencies": { "elysia": ">= 1.2.0" } }, "sha512-qsJwDAg6WfdQRMfj6uSMcDPSpXvm/zQFeAX1uuJXhIgazH8itSfcDxcH9pMuXVRX1yQNi2pPwNQLJmAcw5mzvw=="],
+
     "@elysiajs/swagger": ["@elysiajs/swagger@1.2.0", "", { "dependencies": { "@scalar/themes": "^0.9.52", "@scalar/types": "^0.0.12", "openapi-types": "^12.1.3", "pathe": "^1.1.2" }, "peerDependencies": { "elysia": ">= 1.2.0" } }, "sha512-OPx93DP6rM2VHjA3D44Xiz5MYm9AYlO2NGWPsnSsdyvaOCiL9wJj529583h7arX4iIEYE5LiLB0/A45unqbopw=="],
 
     "@eslint-community/eslint-utils": ["@eslint-community/eslint-utils@4.4.1", "", { "dependencies": { "eslint-visitor-keys": "^3.4.3" }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA=="],

changelog.md

@@ -1,3 +1,8 @@
+# 2.0.3
+
+- Добавлена обработка Preflight CORS запросов
+- Изменена логика добавления CORS
+
 # 2.0.2
 
 - Добавлена проверка на значение logToFile перед созданием папки logs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "summarize-backend",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "author": "Toil",
   "repository": {
     "type": "git",
@@ -21,6 +21,7 @@
     "pino-loki": "^2.4.0"
   },
   "devDependencies": {
+    "@elysiajs/cors": "^1.2.0",
     "@sinclair/typebox": "^0.34.13",
     "bun-types": "^1.1.41",
     "eslint": "^9.17.0",

src/config.ts

@@ -14,12 +14,7 @@ export default Value.Parse(ConfigSchema, {
     desc: Bun.env.APP_DESC,
     contact_email: Bun.env.APP_CONTACT_EMAIL,
   },
-  cors: {
-    "Access-Control-Allow-Origin": "*",
-    "Access-Control-Allow-Headers": "*",
-    "Access-Control-Allow-Methods": "GET, POST, OPTIONS",
-    "Access-Control-Max-Age": "86400",
-  },
+  cors: {},
   logging: {
     level: Bun.env.NODE_ENV === "production" ? "info" : "debug",
     logPath: path.join(__dirname, "..", "logs"),

src/index.ts

@@ -2,6 +2,7 @@ import fs from "node:fs/promises";
 
 import { Elysia } from "elysia";
 import { swagger } from "@elysiajs/swagger";
+import { cors } from "@elysiajs/cors";
 import { HttpStatusCode } from "elysia-http-status-code";
 
 import config from "./config";
@@ -47,11 +48,7 @@ const app = new Elysia({
     }),
   )
   .use(HttpStatusCode())
-  .onRequest(({ set }) => {
-    for (const [key, val] of Object.entries(config.cors)) {
-      set.headers[key] = val;
-    }
-  })
+  .use(cors(config.cors))
   .error({
     SHARING_URL_NOT_FOUND: SharingUrlNotFoundError,
     SHARING_API_TOKEN_NOT_FOUND: SharingAPITokenNotFoundError,

src/schemas/config.ts

@@ -39,10 +39,10 @@ export const ConfigSchema = t.Object({
     scalarCDN: t.Literal(scalarCDN, { readOnly: true, default: scalarCDN }),
   }),
   cors: t.Object({
-    "Access-Control-Allow-Origin": t.String({ default: "*" }),
-    "Access-Control-Allow-Headers": t.String({ default: "*" }),
-    "Access-Control-Allow-Methods": t.String({ default: "POST, GET, OPTIONS" }),
-    "Access-Control-Max-Age": t.String({ default: "86400" }),
+    allowedHeaders: t.String({ default: "*" }),
+    origin: t.String({ default: "*" }),
+    methods: t.String({ default: "GET, POST, OPTIONS" }),
+    maxAge: t.Number({ default: 86400 }),
   }),
   logging: t.Object({
     level: LoggingLevel,