Merge pull request #290 from TBXark/dev

fix: 配置中bool类型判断错误BUG

package.json

@@ -1,7 +1,7 @@
 {
     "name": "chatgpt-telegram-workers",
     "type": "module",
-    "version": "1.9.3",
+    "version": "1.9.4",
     "description": "The easiest and quickest way to deploy your own ChatGPT Telegram bot is to use a single file and simply copy and paste it. There is no need for any dependencies, local development environment configuration, domain names, or servers.",
     "author": "tbxark <[email protected]>",
     "license": "MIT",
@@ -35,26 +35,27 @@
         "start:local": "CONFIG_PATH=./config.json TOML_PATH=./wrangler.toml tsx src/adapter/local/index.ts",
         "start:debug": "wrangler dev --local",
         "prepare:vercel": "tsx ./scripts/plugins/vercel/setenv.ts",
-        "wrangler": "wrangler"
+        "wrangler": "wrangler",
+        "test": "tsx ./src/config/env.test.ts"
     },
     "dependencies": {
         "cloudflare-worker-adapter": "^1.3.3"
     },
     "devDependencies": {
-        "@antfu/eslint-config": "^3.0.0",
+        "@antfu/eslint-config": "^3.6.2",
         "@rollup/plugin-node-resolve": "^15.2.3",
-        "@types/node": "^22.5.3",
-        "@vercel/node": "^3.2.11",
-        "eslint": "^9.8.0",
+        "@types/node": "^22.5.5",
+        "@vercel/node": "^3.2.14",
+        "eslint": "^9.10.0",
         "eslint-plugin-format": "^0.1.2",
         "rollup-plugin-cleanup": "^3.2.1",
         "rollup-plugin-node-externals": "^7.1.3",
         "telegram-bot-api-types": "^7.9.12",
-        "tsx": "^4.19.0",
-        "typescript": "^5.5.4",
+        "tsx": "^4.19.1",
+        "typescript": "^5.6.2",
         "vite": "^5.4.3",
-        "vite-plugin-checker": "^0.7.2",
-        "vite-plugin-dts": "^4.1.0",
-        "wrangler": "^3.74.0"
+        "vite-plugin-checker": "^0.8.0",
+        "vite-plugin-dts": "^4.2.1",
+        "wrangler": "^3.78.5"
     }
 }

src/config/env.test.ts

@@ -3,11 +3,11 @@ import { parse } from 'toml';
 import { ENV } from './env';
 
 {
-    const toml = readFileSync('../../wrangler.toml', 'utf8');
+    const toml = readFileSync('./wrangler.toml', 'utf8');
     const config = parse(toml);
     ENV.merge({
         ...config.vars,
         DATABASE: {},
     });
-    // console.log(JSON.stringify(ENV, null, 2));
+    console.log(JSON.stringify(ENV, null, 2));
 }

src/config/merger.ts

@@ -42,7 +42,7 @@ export class ConfigMerger {
                 continue;
             }
             // 默认为字符串类型
-            const t = target[key] ? typeof target[key] : 'string';
+            const t = (target[key] !== null && target[key] !== undefined) ? typeof target[key] : 'string';
             // 不是字符串直接赋值
             if (typeof source[key] !== 'string') {
                 target[key] = source[key];