From 25446b295cd343b7f8db7b4973ee381f88d9dbcb Mon Sep 17 00:00:00 2001 From: MarSeventh <1193267292@qq.com> Date: Wed, 13 Aug 2025 16:33:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Opt:=E4=BC=98=E5=8C=96=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E4=BB=B6=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- functions/_middleware.js | 4 ++-- functions/api/_middleware.js | 3 +++ functions/file/_middleware.js | 3 +++ functions/upload/_middleware.js | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 functions/api/_middleware.js create mode 100644 functions/file/_middleware.js create mode 100644 functions/upload/_middleware.js diff --git a/functions/_middleware.js b/functions/_middleware.js index b7f8e65d..336fd963 100644 --- a/functions/_middleware.js +++ b/functions/_middleware.js @@ -1,3 +1,3 @@ -import { errorHandling, telemetryData, checkKVConfig } from './utils/middleware'; +import { checkKVConfig } from './utils/middleware'; -export const onRequest = [checkKVConfig, errorHandling, telemetryData]; \ No newline at end of file +export const onRequest = [checkKVConfig]; \ No newline at end of file diff --git a/functions/api/_middleware.js b/functions/api/_middleware.js new file mode 100644 index 00000000..40653994 --- /dev/null +++ b/functions/api/_middleware.js @@ -0,0 +1,3 @@ +import { checkKVConfig } from '../utils/middleware'; + +export const onRequest = [checkKVConfig]; \ No newline at end of file diff --git a/functions/file/_middleware.js b/functions/file/_middleware.js new file mode 100644 index 00000000..090c6661 --- /dev/null +++ b/functions/file/_middleware.js @@ -0,0 +1,3 @@ +import { errorHandling, telemetryData, checkKVConfig } from '../utils/middleware'; + +export const onRequest = [checkKVConfig, errorHandling, telemetryData]; \ No newline at end of file diff --git a/functions/upload/_middleware.js b/functions/upload/_middleware.js new file mode 100644 index 00000000..090c6661 --- /dev/null +++ b/functions/upload/_middleware.js @@ -0,0 +1,3 @@ +import { errorHandling, telemetryData, checkKVConfig } from '../utils/middleware'; + +export const onRequest = [checkKVConfig, errorHandling, telemetryData]; \ No newline at end of file From 96e370e6351b6ee07679b7643ecbbc617e6857e1 Mon Sep 17 00:00:00 2001 From: MarSeventh <1193267292@qq.com> Date: Wed, 13 Aug 2025 16:38:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Opt:=E4=BC=98=E5=8C=96=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E4=BB=B6=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- functions/_middleware.js | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 functions/_middleware.js diff --git a/functions/_middleware.js b/functions/_middleware.js deleted file mode 100644 index 336fd963..00000000 --- a/functions/_middleware.js +++ /dev/null @@ -1,3 +0,0 @@ -import { checkKVConfig } from './utils/middleware'; - -export const onRequest = [checkKVConfig]; \ No newline at end of file From db21671f9d049878a675690f846eeadc116f7faa Mon Sep 17 00:00:00 2001 From: MarSeventh <1193267292@qq.com> Date: Wed, 13 Aug 2025 17:00:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Opt:=E4=BC=98=E5=8C=96=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E4=BB=B6=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- functions/api/manage/_middleware.js | 10 +++++++++- functions/random/_middleware.js | 3 +++ functions/{random.js => random/index.js} | 4 ++-- functions/utils/middleware.js | 1 - 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 functions/random/_middleware.js rename functions/{random.js => random/index.js} (97%) diff --git a/functions/api/manage/_middleware.js b/functions/api/manage/_middleware.js index 68e1acf6..d01ffa1d 100644 --- a/functions/api/manage/_middleware.js +++ b/functions/api/manage/_middleware.js @@ -1,11 +1,19 @@ import { fetchSecurityConfig } from "../../utils/sysConfig"; -import { checkKVConfig, errorHandling } from "../../utils/middleware"; +import { checkKVConfig } from "../../utils/middleware"; import { validateApiToken } from "../../utils/tokenValidator"; let securityConfig = {} let basicUser = "" let basicPass = "" +async function errorHandling(context) { + try { + return await context.next(); + } catch (err) { + return new Response(`${err.message}\n${err.stack}`, { status: 500 }); + } +} + function basicAuthentication(request) { const Authorization = request.headers.get('Authorization'); diff --git a/functions/random/_middleware.js b/functions/random/_middleware.js new file mode 100644 index 00000000..40653994 --- /dev/null +++ b/functions/random/_middleware.js @@ -0,0 +1,3 @@ +import { checkKVConfig } from '../utils/middleware'; + +export const onRequest = [checkKVConfig]; \ No newline at end of file diff --git a/functions/random.js b/functions/random/index.js similarity index 97% rename from functions/random.js rename to functions/random/index.js index 1650cdab..29eef188 100644 --- a/functions/random.js +++ b/functions/random/index.js @@ -1,5 +1,5 @@ -import { fetchOthersConfig } from "./utils/sysConfig"; -import { readIndex } from "./utils/indexManager"; +import { fetchOthersConfig } from "../utils/sysConfig"; +import { readIndex } from "../utils/indexManager"; let othersConfig = {}; let allowRandom = false; diff --git a/functions/utils/middleware.js b/functions/utils/middleware.js index 6a744096..41173b4e 100644 --- a/functions/utils/middleware.js +++ b/functions/utils/middleware.js @@ -1,7 +1,6 @@ import sentryPlugin from "@cloudflare/pages-plugin-sentry"; import '@sentry/tracing'; import { fetchOthersConfig } from "./sysConfig"; -import { getIndexInfo, rebuildIndex } from "./indexManager"; let disableTelemetry = false; From 84e6aeb55883f8d262b63e172d5e8a417ff6ca28 Mon Sep 17 00:00:00 2001 From: MarSeventh <1193267292@qq.com> Date: Wed, 13 Aug 2025 19:26:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Opt:=E4=BC=98=E5=8C=96=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E4=BB=B6=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- functions/file/_middleware.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/file/_middleware.js b/functions/file/_middleware.js index 090c6661..40653994 100644 --- a/functions/file/_middleware.js +++ b/functions/file/_middleware.js @@ -1,3 +1,3 @@ -import { errorHandling, telemetryData, checkKVConfig } from '../utils/middleware'; +import { checkKVConfig } from '../utils/middleware'; -export const onRequest = [checkKVConfig, errorHandling, telemetryData]; \ No newline at end of file +export const onRequest = [checkKVConfig]; \ No newline at end of file