From 92f7f81802ba13f00d2cb2d49d74fecd9ee07a9a Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Fri, 5 Apr 2024 20:49:56 +0000 Subject: [PATCH 1/8] fix bootloader alisases resolution --- bin/boot.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/boot.js b/bin/boot.js index 5033040..8c6b4ac 100755 --- a/bin/boot.js +++ b/bin/boot.js @@ -26,11 +26,12 @@ global["aliases"] = { "src": global["__src"], // expose shared resources - "@db_models": path.resolve(__dirname, "db_models"), - "@shared-utils": path.resolve(__dirname, "utils"), - "@shared-classes": path.resolve(__dirname, "classes"), - "@shared-lib": path.resolve(__dirname, "lib"), - "@shared-middlewares": path.resolve(__dirname, "middlewares"), + "@db": path.resolve(process.cwd(), "db_models"), + "@db_models": path.resolve(process.cwd(), "db_models"), + "@shared-utils": path.resolve(process.cwd(), "utils"), + "@shared-classes": path.resolve(process.cwd(), "classes"), + "@shared-lib": path.resolve(process.cwd(), "lib"), + "@shared-middlewares": path.resolve(process.cwd(), "middlewares"), // expose internal resources "@lib": path.resolve(global["__src"], "lib"), From 16948133215fc4a326cc2aa82c57e3bd13646dbd Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Fri, 5 Apr 2024 20:50:08 +0000 Subject: [PATCH 2/8] handle `OPTIONS` method --- src/server/engines/hyper-express/index.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/server/engines/hyper-express/index.js b/src/server/engines/hyper-express/index.js index b08b0af..62ba1d8 100644 --- a/src/server/engines/hyper-express/index.js +++ b/src/server/engines/hyper-express/index.js @@ -26,8 +26,13 @@ export default class Engine { }) }) - // register body parser await this.app.use(async (req, res, next) => { + res.setHeader("Access-Control-Allow-Headers", "Origin, Content-Type, Authorization") + + if (req.method === "OPTIONS") { + return res.status(204).end() + } + if (req.headers["content-type"]) { if (!req.headers["content-type"].startsWith("multipart/form-data")) { req.body = await req.urlencoded() From 9f79d4f04e45276eff843f74ce449c2c8750a205 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Fri, 5 Apr 2024 20:50:12 +0000 Subject: [PATCH 3/8] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c499c2..9c3bc8c 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "linebridge", - "version": "0.19.1", + "version": "0.19.2", "description": "API Framework for RageStudio backends", "author": "RageStudio", "main": "./dist/client/index.js", From 77fe97602af910e7890656908aa562cb3fcf6d2e Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Fri, 5 Apr 2024 20:52:44 +0000 Subject: [PATCH 4/8] format --- package.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 9c3bc8c..5000f08 100755 --- a/package.json +++ b/package.json @@ -18,8 +18,7 @@ "files": [ "src/**/**", "dist/**/**", - "./package.json", - "boot" + "./package.json" ], "license": "MIT", "dependencies": { @@ -41,8 +40,8 @@ "morgan": "1.10.0", "socket.io": "^4.7.4", "socket.io-client": "4.5.4", - "uuid": "^9.0.1", - "sucrase": "^3.35.0" + "sucrase": "^3.35.0", + "uuid": "^9.0.1" }, "devDependencies": { "@ragestudio/hermes": "^0.1.0", From c046166834307f30068712012795200edd31a1d6 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Fri, 5 Apr 2024 20:54:46 +0000 Subject: [PATCH 5/8] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5000f08..e3baad3 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "linebridge", - "version": "0.19.2", + "version": "0.19.3", "description": "API Framework for RageStudio backends", "author": "RageStudio", "main": "./dist/client/index.js", From 0ee4b4ff4bcde8424f7bfe75c06b32945c1bcfe5 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Wed, 10 Apr 2024 17:47:10 +0000 Subject: [PATCH 6/8] set headers on options --- src/server/engines/hyper-express/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/engines/hyper-express/index.js b/src/server/engines/hyper-express/index.js index 62ba1d8..1239871 100644 --- a/src/server/engines/hyper-express/index.js +++ b/src/server/engines/hyper-express/index.js @@ -27,9 +27,10 @@ export default class Engine { }) await this.app.use(async (req, res, next) => { - res.setHeader("Access-Control-Allow-Headers", "Origin, Content-Type, Authorization") - if (req.method === "OPTIONS") { + res.setHeader("Access-Control-Allow-Origin", "*") + res.setHeader("Access-Control-Allow-Headers", "Origin, Content-Type, Authorization") + return res.status(204).end() } From 0740c6f656ccca56b5ca772056648aea29a59d05 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Wed, 10 Apr 2024 17:47:24 +0000 Subject: [PATCH 7/8] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3baad3..75a2fba 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "linebridge", - "version": "0.19.3", + "version": "0.19.4", "description": "API Framework for RageStudio backends", "author": "RageStudio", "main": "./dist/client/index.js", From 47b67a547c461b6eb12e776495d21726f9d1bb72 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Wed, 10 Apr 2024 22:10:00 +0200 Subject: [PATCH 8/8] set `Access-Control-Allow-Methods` to `*` --- src/server/engines/hyper-express/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/engines/hyper-express/index.js b/src/server/engines/hyper-express/index.js index 1239871..ad7bee5 100644 --- a/src/server/engines/hyper-express/index.js +++ b/src/server/engines/hyper-express/index.js @@ -28,8 +28,9 @@ export default class Engine { await this.app.use(async (req, res, next) => { if (req.method === "OPTIONS") { + res.setHeader("Access-Control-Allow-Methods", "*") res.setHeader("Access-Control-Allow-Origin", "*") - res.setHeader("Access-Control-Allow-Headers", "Origin, Content-Type, Authorization") + res.setHeader("Access-Control-Allow-Headers", "*") return res.status(204).end() }