coding-tool-x 3.5.6 → 3.5.8

package/src/server/services/mcp-service.js

@@ -6,29 +6,24 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const toml = require('@iarna/toml');
 const { spawn } = require('child_process');
 const http = require('http');
 const https = require('https');
 const { McpClient, buildMissingCommandMessage, createMissingCommandHint } = require('./mcp-client');
-const { NATIVE_PATHS, PATHS } = require('../../config/paths');
-const { resolvePreferredHomeDir } = require('../../utils/home-dir');
-
-const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
+const { NATIVE_PATHS, PATHS, HOME_DIR, getNativePathDir, joinNativeBasePath } = require('../../config/paths');
 
 // MCP 配置文件路径
 const MCP_SERVERS_FILE = PATHS.mcpServers;
 
 // 各平台配置文件路径
-const CLAUDE_CONFIG_PATH = path.join(HOME_DIR, '.claude.json');
+const CLAUDE_CONFIG_PATH = joinNativeBasePath(HOME_DIR, '.claude.json');
 const CODEX_CONFIG_PATH = NATIVE_PATHS.codex.config;
-const GEMINI_CONFIG_PATH = path.join(path.dirname(NATIVE_PATHS.gemini.env), 'settings.json');
-const OPENCODE_CONFIG_DIR = NATIVE_PATHS.opencode.config;
+const GEMINI_CONFIG_PATH = NATIVE_PATHS.gemini.settings;
 const OPENCODE_CONFIG_PATHS = {
-  jsonc: path.join(OPENCODE_CONFIG_DIR, 'opencode.jsonc'),
-  json: path.join(OPENCODE_CONFIG_DIR, 'opencode.json'),
-  legacy: path.join(OPENCODE_CONFIG_DIR, 'config.json')
+  jsonc: NATIVE_PATHS.opencode.configJsonc,
+  json: NATIVE_PATHS.opencode.configJson,
+  legacy: NATIVE_PATHS.opencode.configLegacy
 };
 
 // MCP 客户端连接池
@@ -279,7 +274,7 @@ function readJsonFile(filePath, defaultValue = {}) {
  * 安全写入 JSON 文件（原子写入）
  */
 function writeJsonFile(filePath, data) {
-  ensureDir(path.dirname(filePath));
+  ensureDir(getNativePathDir(filePath));
   const tempPath = filePath + '.tmp';
   fs.writeFileSync(tempPath, JSON.stringify(data, null, 2), 'utf-8');
   fs.renameSync(tempPath, filePath);
@@ -305,7 +300,7 @@ function readTomlFile(filePath, defaultValue = {}) {
  * 安全写入 TOML 文件（原子写入）
  */
 function writeTomlFile(filePath, data) {
-  ensureDir(path.dirname(filePath));
+  ensureDir(getNativePathDir(filePath));
   const tempPath = filePath + '.tmp';
   fs.writeFileSync(tempPath, toml.stringify(data), 'utf-8');
   fs.renameSync(tempPath, filePath);
@@ -412,7 +407,7 @@ function readOpenCodeConfig() {
  * 写入 OpenCode 配置（保持 JSON 格式）
  */
 function writeOpenCodeConfig(filePath, data) {
-  ensureDir(path.dirname(filePath));
+  ensureDir(getNativePathDir(filePath));
   const tempPath = filePath + '.tmp';
   fs.writeFileSync(tempPath, JSON.stringify(data, null, 2), 'utf-8');
   fs.renameSync(tempPath, filePath);

package/src/server/services/native-oauth-adapters.js

@@ -4,7 +4,7 @@ const os = require('os');
 const crypto = require('crypto');
 const toml = require('toml');
 const tomlStringify = require('@iarna/toml').stringify;
-const { NATIVE_PATHS, PATHS } = require('../../config/paths');
+const { NATIVE_PATHS, PATHS, getNativePathDir } = require('../../config/paths');
 const claudeSettingsManager = require('./settings-manager');
 const codexSettingsManager = require('./codex-settings-manager');
 const geminiSettingsManager = require('./gemini-settings-manager');
@@ -35,7 +35,7 @@ function ensureFileMode(filePath, mode = 0o600) {
 }
 
 function writeJsonFile(filePath, value) {
-  ensureDir(path.dirname(filePath));
+  ensureDir(getNativePathDir(filePath));
   fs.writeFileSync(filePath, JSON.stringify(value, null, 2), 'utf8');
   ensureFileMode(filePath);
 }
@@ -562,7 +562,7 @@ function applyGeminiOAuth(credential) {
     }
   };
 
-  ensureDir(path.dirname(NATIVE_PATHS.gemini.oauthCredentialsEncrypted));
+  ensureDir(getNativePathDir(NATIVE_PATHS.gemini.oauthCredentialsEncrypted));
   fs.writeFileSync(
     NATIVE_PATHS.gemini.oauthCredentialsEncrypted,
     encryptGeminiPayload(JSON.stringify(payload, null, 2)),

package/src/server/services/network-access.js

@@ -16,6 +16,21 @@ function isLoopbackAddress(address) {
   return false;
 }
 
+function hasTrustedProxySocket(req) {
+  if (!req) return false;
+  return isLoopbackAddress(req.socket && req.socket.remoteAddress);
+}
+
+function getForwardedHeaderValue(req, headerName) {
+  if (!hasTrustedProxySocket(req) || !req.headers) {
+    return '';
+  }
+
+  const rawValue = req.headers[headerName];
+  const value = Array.isArray(rawValue) ? rawValue[0] : rawValue;
+  return String(value || '').split(',')[0].trim();
+}
+
 function isLoopbackRequest(req) {
   if (!req) return false;
   const socketAddress = req.socket && req.socket.remoteAddress;
@@ -30,6 +45,34 @@ function isLoopbackRequest(req) {
   return true;
 }
 
+function getRequestProtocol(req) {
+  const forwardedProto = getForwardedHeaderValue(req, 'x-forwarded-proto').toLowerCase();
+  if (forwardedProto === 'https' || forwardedProto === 'https:') {
+    return 'https:';
+  }
+  if (forwardedProto === 'http' || forwardedProto === 'http:') {
+    return 'http:';
+  }
+  return req && req.socket && req.socket.encrypted ? 'https:' : 'http:';
+}
+
+function getRequestHost(req) {
+  const forwardedHost = getForwardedHeaderValue(req, 'x-forwarded-host');
+  if (forwardedHost) {
+    return forwardedHost;
+  }
+
+  if (!req || !req.headers) {
+    return '';
+  }
+
+  const host = req.headers.host;
+  if (Array.isArray(host)) {
+    return String(host[0] || '').trim();
+  }
+  return String(host || '').trim();
+}
+
 function isSameOriginRequest(req) {
   if (!req) return false;
   const origin = req.headers && req.headers.origin;
@@ -37,14 +80,14 @@ function isSameOriginRequest(req) {
     return true;
   }
 
-  const host = req.headers && req.headers.host;
+  const host = getRequestHost(req);
   if (!host) {
     return false;
   }
 
   try {
     const originUrl = new URL(origin);
-    return originUrl.host === host;
+    return originUrl.host.toLowerCase() === host.toLowerCase();
   } catch (error) {
     return false;
   }
@@ -124,6 +167,8 @@ module.exports = {
   normalizeAddress,
   isLoopbackAddress,
   isLoopbackRequest,
+  getRequestProtocol,
+  getRequestHost,
   isSameOriginRequest,
   isRemoteMutationAllowed,
   createRemoteMutationGuard,

package/src/server/services/notification-hooks.js

@@ -4,11 +4,12 @@ const os = require('os');
 const http = require('http');
 const https = require('https');
 const { execSync, execFileSync } = require('child_process');
-const { PATHS, NATIVE_PATHS } = require('../../config/paths');
+const { PATHS, NATIVE_PATHS, getNativePathDir, joinNativeBasePath } = require('../../config/paths');
 const { loadConfig } = require('../../config/loader');
 const { loadUIConfig, saveUIConfig } = require('./ui-config');
 const codexSettingsManager = require('./codex-settings-manager');
 const geminiSettingsManager = require('./gemini-settings-manager');
+const { getWebUiProtocol } = require('./web-ui-runtime');
 
 const MANAGED_HOOK_NAME = 'coding-tool-notify';
 const MANAGED_OPENCODE_PLUGIN_FILE = 'coding-tool-notify.js';
@@ -18,7 +19,7 @@ function normalizeType(type) {
 }
 
 function ensureParentDir(filePath) {
-  const dir = path.dirname(filePath);
+  const dir = getNativePathDir(filePath);
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
@@ -169,9 +170,10 @@ function buildBrowserNotificationEndpoint() {
     const config = loadConfig();
     const port = Number(config?.ports?.webUI);
     const resolvedPort = Number.isFinite(port) && port > 0 ? port : 19999;
-    return `http://127.0.0.1:${resolvedPort}/api/hooks/browser-event`;
+    const protocol = getWebUiProtocol();
+    return `${protocol}://127.0.0.1:${resolvedPort}/api/hooks/browser-event`;
   } catch (error) {
-    return 'http://127.0.0.1:19999/api/hooks/browser-event';
+    return `${getWebUiProtocol()}://127.0.0.1:19999/api/hooks/browser-event`;
   }
 }
 
@@ -267,7 +269,7 @@ function buildGeminiCommand(type) {
 }
 
 function getOpenCodeManagedPluginPath() {
-  return path.join(NATIVE_PATHS.opencode.config, 'plugins', MANAGED_OPENCODE_PLUGIN_FILE);
+  return joinNativeBasePath(NATIVE_PATHS.opencode.plugins, MANAGED_OPENCODE_PLUGIN_FILE);
 }
 
 function buildOpenCodePluginContent(type) {
@@ -746,6 +748,10 @@ function sendBrowserNotification(payload) {
         timeout: 5000
       }
 
+      if (urlObj.protocol === 'https:' && ['127.0.0.1', 'localhost', '::1'].includes(urlObj.hostname)) {
+        options.rejectUnauthorized = false
+      }
+
       const requestModule = urlObj.protocol === 'https:' ? https : http
       const request = requestModule.request(options, () => resolve())
       request.on('error', () => resolve())

package/src/server/services/opencode-sessions.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
 const { execFileSync } = require('child_process');
-const { NATIVE_PATHS, PATHS } = require('../../config/paths');
+const { NATIVE_PATHS, PATHS, joinNativeBasePath } = require('../../config/paths');
 
 /**
  * OpenCode 会话服务
@@ -11,7 +11,7 @@ const { NATIVE_PATHS, PATHS } = require('../../config/paths');
 
 const PROJECT_ORDER_FILE = PATHS.opencodeProjectOrder;
 const SESSION_ORDER_FILE = PATHS.opencodeSessionOrder;
-const OPENCODE_DB_PATH = path.join(NATIVE_PATHS.opencode.data, 'opencode.db');
+const OPENCODE_DB_PATH = joinNativeBasePath(NATIVE_PATHS.opencode.data, 'opencode.db');
 const COUNTS_CACHE_TTL_MS = 30 * 1000;
 const EMPTY_COUNTS = Object.freeze({ projectCount: 0, sessionCount: 0 });
 
@@ -234,12 +234,12 @@ function getOpenCodeDataDir() {
 
 // 兼容导出：保留旧路径函数
 function getSessionsDir() {
-  return path.join(getOpenCodeDataDir(), 'storage', 'session');
+  return NATIVE_PATHS?.opencode?.sessions || joinNativeBasePath(getOpenCodeDataDir(), 'storage', 'session');
 }
 
 // 兼容导出：保留旧路径函数
 function getProjectsDir() {
-  return path.join(getOpenCodeDataDir(), 'storage', 'project');
+  return NATIVE_PATHS?.opencode?.projects || joinNativeBasePath(getOpenCodeDataDir(), 'storage', 'project');
 }
 
 function getProjectOrder() {

package/src/server/services/opencode-settings-manager.js

@@ -23,9 +23,9 @@ function resolveModelCost(modelId) {
 
 const CONFIG_DIR = NATIVE_PATHS.opencode.config;
 const CONFIG_PATHS = {
-  config: path.join(CONFIG_DIR, 'config.json'),
-  opencode: path.join(CONFIG_DIR, 'opencode.json'),
-  opencodec: path.join(CONFIG_DIR, 'opencode.jsonc')
+  config: NATIVE_PATHS.opencode.configLegacy,
+  opencode: NATIVE_PATHS.opencode.configJson,
+  opencodec: NATIVE_PATHS.opencode.configJsonc
 };
 const BACKUP_SUFFIX = '.cc-tool-backup';
 const EMPTY_SENTINEL = '__CC_TOOL_NO_FILE__';