admin/DeskClaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: add fsPath prefix for Windows Unicode paths in config-sync plugin copy (#612)

Browse Source
This commit is contained in:
paisley
2026-03-21 21:16:50 +08:00
committed by GitHub
Unverified
parent 56701d823c
commit f16e8062e1
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
electron/gateway/config-sync.ts
View File

@@ -3,6 +3,18 @@ import path from 'path';
import { existsSync, readFileSync, cpSync, mkdirSync, rmSync } from 'fs'; import { existsSync, readFileSync, cpSync, mkdirSync, rmSync } from 'fs';
import { homedir } from 'os'; import { homedir } from 'os';
import { join } from 'path'; import { join } from 'path';
function fsPath(filePath: string): string {
if (process.platform !== 'win32') return filePath;
if (!filePath) return filePath;
if (filePath.startsWith('\\\\?\\')) return filePath;
const windowsPath = filePath.replace(/\//g, '\\');
if (!path.win32.isAbsolute(windowsPath)) return windowsPath;
if (windowsPath.startsWith('\\\\')) {
return `\\\\?\\UNC\\${windowsPath.slice(2)}`;
}
return `\\\\?\\${windowsPath}`;
}
import { getAllSettings } from '../utils/store'; import { getAllSettings } from '../utils/store';
import { getApiKey, getDefaultProvider, getProvider } from '../utils/secure-storage'; import { getApiKey, getDefaultProvider, getProvider } from '../utils/secure-storage';
import { getProviderEnvVar, getKeyableProviderTypes } from '../utils/provider-registry'; import { getProviderEnvVar, getKeyableProviderTypes } from '../utils/provider-registry';
@@ -40,7 +52,7 @@ const CHANNEL_PLUGIN_MAP: Record<string, { dirName: string; npmName: string }> =
function readPluginVersion(pkgJsonPath: string): string | null { function readPluginVersion(pkgJsonPath: string): string | null {
try { try {
const raw = readFileSync(pkgJsonPath, 'utf-8'); const raw = readFileSync(fsPath(pkgJsonPath), 'utf-8');
const parsed = JSON.parse(raw) as { version?: string }; const parsed = JSON.parse(raw) as { version?: string };
return parsed.version ?? null; return parsed.version ?? null;
} catch { } catch {
@@ -74,12 +86,12 @@ function ensureConfiguredPluginsUpgraded(configuredChannels: string[]): void {
const targetDir = join(homedir(), '.openclaw', 'extensions', dirName); const targetDir = join(homedir(), '.openclaw', 'extensions', dirName);
const targetManifest = join(targetDir, 'openclaw.plugin.json'); const targetManifest = join(targetDir, 'openclaw.plugin.json');
const isInstalled = existsSync(targetManifest); const isInstalled = existsSync(fsPath(targetManifest));
const installedVersion = isInstalled ? readPluginVersion(join(targetDir, 'package.json')) : null; const installedVersion = isInstalled ? readPluginVersion(join(targetDir, 'package.json')) : null;
// Try bundled sources first (packaged mode or if bundle-plugins was run) // Try bundled sources first (packaged mode or if bundle-plugins was run)
const bundledSources = buildBundledPluginSources(dirName); const bundledSources = buildBundledPluginSources(dirName);
const bundledDir = bundledSources.find((dir) => existsSync(join(dir, 'openclaw.plugin.json'))); const bundledDir = bundledSources.find((dir) => existsSync(fsPath(join(dir, 'openclaw.plugin.json'))));
if (bundledDir) { if (bundledDir) {
const sourceVersion = readPluginVersion(join(bundledDir, 'package.json')); const sourceVersion = readPluginVersion(join(bundledDir, 'package.json'));
@@ -87,9 +99,9 @@ function ensureConfiguredPluginsUpgraded(configuredChannels: string[]): void {
if (!isInstalled || (sourceVersion && installedVersion && sourceVersion !== installedVersion)) { if (!isInstalled || (sourceVersion && installedVersion && sourceVersion !== installedVersion)) {
logger.info(`[plugin] ${isInstalled ? 'Auto-upgrading' : 'Installing'} ${channelType} plugin${isInstalled ? `: ${installedVersion} → ${sourceVersion}` : `: ${sourceVersion}`} (bundled)`); logger.info(`[plugin] ${isInstalled ? 'Auto-upgrading' : 'Installing'} ${channelType} plugin${isInstalled ? `: ${installedVersion} → ${sourceVersion}` : `: ${sourceVersion}`} (bundled)`);
try { try {
mkdirSync(join(homedir(), '.openclaw', 'extensions'), { recursive: true }); mkdirSync(fsPath(join(homedir(), '.openclaw', 'extensions')), { recursive: true });
rmSync(targetDir, { recursive: true, force: true }); rmSync(fsPath(targetDir), { recursive: true, force: true });
cpSync(bundledDir, targetDir, { recursive: true, dereference: true }); cpSync(fsPath(bundledDir), fsPath(targetDir), { recursive: true, dereference: true });
fixupPluginManifest(targetDir); fixupPluginManifest(targetDir);
} catch (err) { } catch (err) {
logger.warn(`[plugin] Failed to ${isInstalled ? 'auto-upgrade' : 'install'} ${channelType} plugin:`, err); logger.warn(`[plugin] Failed to ${isInstalled ? 'auto-upgrade' : 'install'} ${channelType} plugin:`, err);
@@ -101,7 +113,7 @@ function ensureConfiguredPluginsUpgraded(configuredChannels: string[]): void {
// Dev mode fallback: copy from node_modules/ with pnpm dep resolution // Dev mode fallback: copy from node_modules/ with pnpm dep resolution
if (!app.isPackaged) { if (!app.isPackaged) {
const npmPkgPath = join(process.cwd(), 'node_modules', ...npmName.split('/')); const npmPkgPath = join(process.cwd(), 'node_modules', ...npmName.split('/'));
if (!existsSync(join(npmPkgPath, 'openclaw.plugin.json'))) continue; if (!existsSync(fsPath(join(npmPkgPath, 'openclaw.plugin.json')))) continue;
const sourceVersion = readPluginVersion(join(npmPkgPath, 'package.json')); const sourceVersion = readPluginVersion(join(npmPkgPath, 'package.json'));
if (!sourceVersion) continue; if (!sourceVersion) continue;
// Skip only if installed AND same version // Skip only if installed AND same version
@@ -109,7 +121,7 @@ function ensureConfiguredPluginsUpgraded(configuredChannels: string[]): void {
logger.info(`[plugin] ${isInstalled ? 'Auto-upgrading' : 'Installing'} ${channelType} plugin${isInstalled ? `: ${installedVersion} → ${sourceVersion}` : `: ${sourceVersion}`} (dev/node_modules)`); logger.info(`[plugin] ${isInstalled ? 'Auto-upgrading' : 'Installing'} ${channelType} plugin${isInstalled ? `: ${installedVersion} → ${sourceVersion}` : `: ${sourceVersion}`} (dev/node_modules)`);
try { try {
mkdirSync(join(homedir(), '.openclaw', 'extensions'), { recursive: true }); mkdirSync(fsPath(join(homedir(), '.openclaw', 'extensions')), { recursive: true });
copyPluginFromNodeModules(npmPkgPath, targetDir, npmName); copyPluginFromNodeModules(npmPkgPath, targetDir, npmName);
fixupPluginManifest(targetDir); fixupPluginManifest(targetDir);
} catch (err) { } catch (err) {