poi-plugin-kai-planner 1.0.2 → 1.0.4

package/README.md

@@ -22,7 +22,9 @@
 
 ## 本地数据
 
-- 用户计划优先写入：`runtime_data/userPlans/plans.v1.json`
+- 用户计划优先写入：
+  - 若 Electron 可提供 `userData` 目录，则写入 `<userData>/poi-plugin-kai-planner/userPlans/plans.v1.json`
+  - 若无法获取稳定用户目录，则回退到 `<plugin_root>/runtime_data/userPlans/plans.v1.json`
 - 文件存储不可用时回退 `localStorage`：`kai_planner_user_plans_v1`
 - 远端静态数据缓存：
   - `runtime_data/static_data/meta.json`
@@ -43,4 +45,4 @@
 - Wishlist 状态字段：[docs/WISHLIST_STATE_FIELDS.md](docs/WISHLIST_STATE_FIELDS.md)
 - npm/POI 发布流程：[docs/RELEASE_POI_NPM.md](docs/RELEASE_POI_NPM.md)
 - 私有仓库更新流程：[docs/PRIVATE_REPO_UPDATE.md](docs/PRIVATE_REPO_UPDATE.md)
-- 远端静态数据更新流程：[docs/REMOTE_DATA_UPDATE.md](docs/REMOTE_DATA_UPDATE.md)
+- 远端静态数据更新流程：[docs/REMOTE_DATA_UPDATE.md](docs/REMOTE_DATA_UPDATE.md)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-kai-planner",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "index.js",
   "author": "aulu",
   "contributors": ["aulu"],

package/src/storage/userPlans/fileStore.js

@@ -15,60 +15,113 @@ function getNodeModule(name) {
   }
 }
 
-const fs = getNodeModule("fs");
-const path = getNodeModule("path");
+const fsMod = getNodeModule("fs");
+const pathMod = getNodeModule("path");
+
+function getEnvValue(name) {
+  try {
+    if (typeof process !== "undefined" && process && process.env && process.env[name]) {
+      return String(process.env[name]);
+    }
+  } catch {}
+  return null;
+}
 
 function isAvailable() {
-  return !!(fs && path);
+  return !!(fsMod && pathMod);
+}
+
+function getElectronApp() {
+  const electron = getNodeModule("electron");
+  if (!electron) return null;
+  if (electron.app && typeof electron.app.getPath === "function") return electron.app;
+  if (electron.remote && electron.remote.app && typeof electron.remote.app.getPath === "function") {
+    return electron.remote.app;
+  }
+  return null;
 }
 
-function getPluginRoot() {
+function getStableBaseDir() {
+  const envDir = getEnvValue("KAI_PLANNER_USER_DATA_DIR");
+  if (envDir) return envDir;
   if (!isAvailable()) return null;
-  // current file: src/storage/userPlans/fileStore.js
-  return path.resolve(__dirname, "../../../");
+
+  const app = getElectronApp();
+  if (!app) return null;
+  try {
+    const dir = app.getPath("userData");
+    return dir ? String(dir) : null;
+  } catch {
+    return null;
+  }
+}
+
+function hasStableStoreSupport() {
+  return !!getStableBaseDir();
+}
+
+function getStableStoreDir() {
+  const base = getStableBaseDir();
+  if (!base || !pathMod) return null;
+  return pathMod.join(base, "poi-plugin-kai-planner", "userPlans");
+}
+
+function getStableStoreFilePath() {
+  const dir = getStableStoreDir();
+  if (!dir || !pathMod) return null;
+  return pathMod.join(dir, "plans.v1.json");
+}
+
+function getLegacyPluginRoot() {
+  const envRoot = getEnvValue("KAI_PLANNER_PLUGIN_ROOT");
+  if (envRoot) return envRoot;
+  if (!isAvailable()) return null;
+  return pathMod.resolve(__dirname, "../../../");
+}
+
+function getLegacyStoreDir() {
+  const root = getLegacyPluginRoot();
+  if (!root || !pathMod) return null;
+  return pathMod.join(root, "runtime_data", "userPlans");
+}
+
+function getLegacyStoreFilePath() {
+  const dir = getLegacyStoreDir();
+  if (!dir || !pathMod) return null;
+  return pathMod.join(dir, "plans.v1.json");
 }
 
 function getStoreDir() {
-  const root = getPluginRoot();
-  if (!root) return null;
-  return path.join(root, "runtime_data", "userPlans");
+  return getStableStoreDir() || getLegacyStoreDir();
 }
 
 function getStoreFilePath() {
-  const dir = getStoreDir();
-  if (!dir) return null;
-  return path.join(dir, "plans.v1.json");
+  return getStableStoreFilePath() || getLegacyStoreFilePath();
 }
 
-function ensureStoreDir() {
-  if (!isAvailable()) return false;
-  const dir = getStoreDir();
-  if (!dir) return false;
+function ensureDir(dir) {
+  if (!isAvailable() || !dir) return false;
   try {
-    fs.mkdirSync(dir, { recursive: true });
+    fsMod.mkdirSync(dir, { recursive: true });
     return true;
   } catch {
     return false;
   }
 }
 
-function exists() {
-  if (!isAvailable()) return false;
-  const fp = getStoreFilePath();
-  if (!fp) return false;
+function fileExists(fp) {
+  if (!isAvailable() || !fp) return false;
   try {
-    return fs.existsSync(fp);
+    return fsMod.existsSync(fp);
   } catch {
     return false;
   }
 }
 
-function readRaw() {
-  if (!isAvailable()) return null;
-  const fp = getStoreFilePath();
-  if (!fp || !exists()) return null;
+function readJsonFile(fp) {
+  if (!isAvailable() || !fp || !fileExists(fp)) return null;
   try {
-    const s = fs.readFileSync(fp, "utf8");
+    const s = fsMod.readFileSync(fp, "utf8");
     if (!s) return null;
     return JSON.parse(s);
   } catch {
@@ -76,31 +129,82 @@ function readRaw() {
   }
 }
 
-function writeRaw(payload) {
-  if (!isAvailable()) return false;
-  if (!ensureStoreDir()) return false;
-
-  const fp = getStoreFilePath();
-  if (!fp) return false;
+function writeJsonFile(fp, payload) {
+  if (!isAvailable() || !fp || !pathMod) return false;
+  if (!ensureDir(pathMod.dirname(fp))) return false;
   const tmp = `${fp}.tmp`;
-
   try {
-    fs.writeFileSync(tmp, JSON.stringify(payload, null, 2), "utf8");
-    fs.renameSync(tmp, fp);
+    fsMod.writeFileSync(tmp, JSON.stringify(payload, null, 2), "utf8");
+    fsMod.renameSync(tmp, fp);
     return true;
   } catch {
     try {
-      if (fs.existsSync(tmp)) fs.unlinkSync(tmp);
+      if (fsMod.existsSync(tmp)) fsMod.unlinkSync(tmp);
     } catch {}
     return false;
   }
 }
 
+function stableExists() {
+  return fileExists(getStableStoreFilePath());
+}
+
+function legacyExists() {
+  return fileExists(getLegacyStoreFilePath());
+}
+
+function exists() {
+  if (hasStableStoreSupport()) return stableExists() || legacyExists();
+  return legacyExists();
+}
+
+function readStableRaw() {
+  return readJsonFile(getStableStoreFilePath());
+}
+
+function readLegacyRaw() {
+  return readJsonFile(getLegacyStoreFilePath());
+}
+
+function readRaw() {
+  if (hasStableStoreSupport()) {
+    const stable = readStableRaw();
+    if (stable != null) return stable;
+  }
+  return readLegacyRaw();
+}
+
+function writeStableRaw(payload) {
+  return writeJsonFile(getStableStoreFilePath(), payload);
+}
+
+function writeLegacyRaw(payload) {
+  return writeJsonFile(getLegacyStoreFilePath(), payload);
+}
+
+function writeRaw(payload) {
+  if (hasStableStoreSupport() && writeStableRaw(payload)) return true;
+  return writeLegacyRaw(payload);
+}
+
 module.exports = {
   isAvailable,
+  hasStableStoreSupport,
+  getStableBaseDir,
+  getStableStoreDir,
+  getStableStoreFilePath,
+  getLegacyPluginRoot,
+  getLegacyStoreDir,
+  getLegacyStoreFilePath,
   getStoreDir,
   getStoreFilePath,
   exists,
+  stableExists,
+  legacyExists,
   readRaw,
+  readStableRaw,
+  readLegacyRaw,
   writeRaw,
-};
+  writeStableRaw,
+  writeLegacyRaw,
+};

package/src/storage/userPlans/storeAdapter.js

@@ -24,22 +24,28 @@ function writeToPreferredBackend(payload) {
   return localStorageStore.writeRaw(payload);
 }
 
+function migrateFrom(readRaw, writeRaw) {
+  const raw = readRaw();
+  if (!raw) return false;
+  const migrated = migrateStore(raw || emptyStore());
+  return !!writeRaw(migrated);
+}
+
 function initMigrationIfNeeded() {
   if (initialized) return;
   initialized = true;
 
-  // one-time migration: localStorage -> fileStore
   if (!fileStore.isAvailable()) return;
-  if (fileStore.exists()) return;
 
-  const oldRaw = localStorageStore.readRaw();
-  if (!oldRaw) return;
-
-  const migrated = migrateStore(oldRaw || emptyStore());
-  const ok = fileStore.writeRaw(migrated);
-  if (ok) {
-    localStorageStore.clear();
+  if (fileStore.hasStableStoreSupport()) {
+    if (fileStore.stableExists()) return;
+    if (migrateFrom(() => fileStore.readLegacyRaw(), (payload) => fileStore.writeStableRaw(payload))) return;
+    migrateFrom(() => localStorageStore.readRaw(), (payload) => fileStore.writeStableRaw(payload));
+    return;
   }
+
+  if (fileStore.exists()) return;
+  migrateFrom(() => localStorageStore.readRaw(), (payload) => fileStore.writeRaw(payload));
 }
 
 function readStore() {
@@ -74,4 +80,4 @@ module.exports = {
   readStore,
   writeStore,
   getStorageInfo,
-};
+};