note-mcp-server 2.4.1 → 2.4.2

package/index.js

@@ -12,73 +12,101 @@ import {
 import axios from "axios";
 import FormData from "form-data";
 
+import fs from "node:fs";
+import { parse as parseEnv } from "dotenv";
+
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-// 優先載入專案目錄 (cwd) 的 .env，以支援不同專案自由切換
-loadEnv({ path: path.join(process.cwd(), ".env") });
-// 如果專案目錄沒有設定，則退回讀取全域的 .env
-loadEnv({ path: path.join(__dirname, ".env") });
 /**
  * MCP 須由 Cursor 依 mcp.json 啟動；勿在終端機手動跑本檔當成「掛載 MCP」。
  *
  * 設定優先序：
- * 1) NOTES_API_BASE — 完整 API base（含 /api/notes/{socialite}/{key}）
- * 2) notes_url + socialite + key（或 socialite_id，與 key 同義：加密路徑 token）
+ * 1) 專案目錄 (cwd) 的 .env 優先（支援不同專案自由切換）
+ * 2) 全域的 note-mcp-server/.env 作為預設退路
+ *
+ * 變數組合：
+ * A) NOTES_API_BASE — 完整 API base（含 /api/notes/{socialite}/{key}）
+ * B) notes_url + socialite + key（或 socialite_id，與 key 同義：加密路徑 token）
  *
  * 變數名支援常見大小寫（見 resolveNotesApiBase）。
  */
 
+const cwdEnvPath = path.join(process.cwd(), ".env");
+const cwdEnv = fs.existsSync(cwdEnvPath) ? parseEnv(fs.readFileSync(cwdEnvPath)) : {};
+
+const globalEnvPath = path.join(__dirname, ".env");
+const globalEnv = fs.existsSync(globalEnvPath) ? parseEnv(fs.readFileSync(globalEnvPath)) : {};
+
+// 將載入的變數注入 process.env (cwd 優先蓋過 global)
+for (const [k, v] of Object.entries(globalEnv)) {
+  if (process.env[k] === undefined) process.env[k] = v;
+}
+for (const [k, v] of Object.entries(cwdEnv)) {
+  process.env[k] = v; // cwd 總是能覆寫
+}
+
 function stripTrailingSlashes(value) {
   return value.replace(/\/+$/, "");
 }
 
-function firstEnv(...keys) {
-  for (const key of keys) {
-    const raw = process.env[key];
-    if (raw === undefined) {
-      continue;
-    }
-    const trimmed = String(raw).trim();
-    if (trimmed !== "") {
-      return trimmed;
+function extractBase(envObj) {
+  const get = (...keys) => {
+    for (const k of keys) {
+      if (envObj[k] !== undefined && String(envObj[k]).trim() !== "") {
+        return String(envObj[k]).trim();
+      }
     }
-  }
-  return "";
-}
+    return "";
+  };
 
-function resolveNotesApiBase() {
-  const direct = firstEnv("NOTES_API_BASE");
+  const direct = get("NOTES_API_BASE");
   if (direct) {
     return stripTrailingSlashes(direct);
   }
 
-  const notesUrl = stripTrailingSlashes(
-    firstEnv("notes_url", "NOTES_URL")
-  );
-  const socialite = firstEnv("socialite", "SOCIALITE");
-  const encryptedToken = firstEnv(
-    "key",
-    "KEY",
-    "socialite_id",
-    "SOCIALITE_ID"
-  );
+  const notesUrl = stripTrailingSlashes(get("notes_url", "NOTES_URL"));
+  const socialite = get("socialite", "SOCIALITE");
+  const encryptedToken = get("key", "KEY", "socialite_id", "SOCIALITE_ID");
 
   if (notesUrl && socialite && encryptedToken) {
     return `${notesUrl}/api/notes/${socialite}/${encryptedToken}`;
   }
 
+  return null;
+}
+
+function resolveNotesApiBase() {
+  let base = extractBase(cwdEnv);
+  if (base) return base;
+
+  base = extractBase(globalEnv);
+  if (base) return base;
+
+  base = extractBase(process.env);
+  if (base) return base;
+
   throw new Error(
     "note-mcp-server：請在專案目錄建立 .env，設定 notes_url、socialite、key（或 socialite_id），或設定 NOTES_API_BASE。詳見 .env.example。"
   );
 }
 
+function firstEnv(...keys) {
+  for (const key of keys) {
+    if (process.env[key] !== undefined) {
+      const trimmed = String(process.env[key]).trim();
+      if (trimmed !== "") return trimmed;
+    }
+  }
+  return "";
+}
+
 const BASE_URL = resolveNotesApiBase();
 const APP_NAME = firstEnv("app_name", "APP_NAME", "notes_app_name", "NOTES_APP_NAME") || "Personal Note Assistant";
 
 const server = new Server(
   {
     name: `note-mcp-server (${APP_NAME})`,
-    version: "2.4.1",
+    version: "2.4.2",
   },
   {
     capabilities: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "note-mcp-server",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "MCP (stdio) server for Notes API v2 — list/read/write notes, upload images, Web Push from Cursor and compatible clients.",
   "main": "index.js",
   "bin": {