fixed env read

Author: MarkShawn2020

.env.sample

@@ -1,17 +1,25 @@
-# When adding additional environment variables, the schema in "/src/env.js"
-# should be updated accordingly.
-
-# Prisma, ref: https://www.prisma.io/docs/reference/database-reference/connection-urls#env
-# 可前可后，服务端应设置公网地址
+########################################
+# =
 DATABASE_URL=
 #DATABASE_URL=
 
+NEXT_PUBLIC_SOCKET_URL=
+#NEXT_PUBLIC_SOCKET_URL=
+
+NEXT_PUBLIC_BACKEND_URL=
+#NEXT_PUBLIC_BACKEND_URL=
+
+PROXY=
+#PROXY=
+########################################
+
+
 # nginx 打过来，本地和网址一样
 NEXT_PUBLIC_APP_URL=
+
 # 可前可后，服务端应设置公网地址
-NEXT_PUBLIC_SOCKET_URL=
+
 # 可前可后，服务端应设置公网地址
-NEXT_PUBLIC_BACKEND_URL=
 
 # Next Auth
 # You can generate a new secret on the command line with:
@@ -58,3 +66,4 @@ DASHSCOPE_API_KEY=
 VERCEL_GITHUB_COMMIT_SHA=
 NEXT_PUBLIC_PINO_LOGFLARE_API_KEY=
 NEXT_PUBLIC_PINO_LOGFLARE_SOURCE_TOKEN=
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cs-magic",
-  "version": "V0.7.177 (α)",
+  "version": "V0.7.178 (α)",
   "repository": "[email protected]:MarkShawn2020/p01.git",
   "author": "markshawn2020 <[email protected]>",
   "license": "MIT",
@@ -20,6 +20,7 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
+    "dotenv": "^16.4.5",
     "jest": "^29.7.0",
     "pino-pretty": "^11.0.0",
     "ts-jest": "^29.1.2",

packages/common-api-client/backend-api.ts

@@ -1,9 +1,6 @@
+import { env } from "../common-env"
 import { createHttpInstance } from "./core"
 
-// 因为这个api主要用于客户端使用，但是环境变量的读取需要用fs，所以就单独拆一下
-const baseURL = process.env.NEXT_PUBLIC_BACKEND_URL
-if (!baseURL) throw new Error("no NEXT_PUBLIC_BACKEND_URL env")
-
 export const backendApi = createHttpInstance({
-  baseURL,
+  baseURL: env.NEXT_PUBLIC_BACKEND_URL,
 })

packages/common-env/utils/load-env.ts

@@ -3,6 +3,7 @@ import { Path } from "../../common-path"
 import { getEnv } from "../index"
 
 /**
+ * @deprecated 不建议使用，推荐在package.json 里使用 source .env
  * 加载并返回环境变量
  * 返回的原因是因为不能在 browser 端使用
  */

packages/common-llm/safe-call-llm.ts

@@ -5,13 +5,17 @@ import { HttpsProxyAgent } from "https-proxy-agent"
 import OpenAI from "openai/index"
 import { v4 } from "uuid"
 import { env } from "../common-env"
+import { logEnv } from "../common-env/utils/log-env"
 import { callLlm } from "./call-llm"
 import { model2provider } from "./model2provider"
 import { ICallLlmOptions, ICallLlmResponse } from "./schema/llm"
 
 export const safeCallLLM = async (
   options: ICallLlmOptions,
 ): Promise<ICallLlmResponse> => {
+  logEnv("api_key")
+  console.log({ env })
+
   const llmModelType = options.model
   const llmProviderType = model2provider(llmModelType)
 

services/api/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "build": "tsc",
     "start": "node dist/server.js",
-    "dev-watch": "tsx watch src/server.ts",
+    "dev-watch": "tsx atch src/server.ts",
     "dev": "tsx src/server.ts"
   },
   "dependencies": {
@@ -15,11 +15,13 @@
     "@cs-magic/wechaty": "0.1.0",
     "@fastify/websocket": "^10.0.1",
     "@types/lodash": "^4.14.202",
+    "dotenv": "^16.4.5",
     "fastify": "^4.26.2",
     "fastify-websocket": "^4.3.0",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
+    "@types/dotenv": "^8.2.0",
     "@types/ws": "^8.5.10",
     "typescript": "^5.4.5"
   }

services/api/src/server.ts

@@ -1,18 +1,18 @@
-// load for api and so on
 import { genId } from "@cs-magic/common/utils/gen-id"
 import { logger } from "@cs-magic/log/logger"
 import { createWechatyBot } from "@cs-magic/wechaty/create-wechaty-bot"
 import fw from "@fastify/websocket"
+import dotenv from "dotenv"
+
 import Fastify from "fastify"
 import remove from "lodash/remove"
-import * as process from "process"
-import { loadEnv } from "../../../packages/common-env/utils/load-env"
+import { Path } from "../../../packages/common-path"
 import { IContext } from "./schema/context"
 import { handleMessage } from "./utils/handle-message"
 import { syncClients } from "./utils/sync-clients"
 import { transferMessage } from "./utils/transfer-message"
 
-loadEnv()
+dotenv.config({ path: Path.envFile })
 
 logger.info("fastify initializing...")
 const fastify = Fastify({

services/wechaty/create-wechaty-bot.ts

@@ -1,15 +1,17 @@
 import { logger } from "@cs-magic/log/logger"
+import dotenv from "dotenv"
 import qrcodeTerminal from "qrcode-terminal"
 import { type Wechaty, WechatyBuilder } from "wechaty"
 import { PuppetPadlocal } from "wechaty-puppet-padlocal"
-import { loadEnv } from "../../packages/common-env/utils/load-env"
+import { env } from "../../packages/common-env"
 import { logEnv } from "../../packages/common-env/utils/log-env"
+import { Path } from "../../packages/common-path"
 import { handleMessage } from "./handle-messages/handle-message"
 import { SenderQueue } from "./handle-messages/sender-queue"
 import { initBotStaticContext } from "./utils/bot-context"
 import { getBotWxid } from "./utils/bot-wxid"
 
-const env = loadEnv()
+dotenv.config({ path: Path.envFile })
 logEnv("wechaty")
 
 export const createWechatyBot = ({ name }: { name?: string }) => {