hicccc77/WeFlow
1
0
Fork 0
mirror of https://github.com/hicccc77/WeFlow.git synced 2026-03-25 07:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: wcdbCore 支持 macOS 平台

Browse Source
This commit is contained in:
hicccc77
2026-03-08 12:21:16 +08:00
parent 439259ec57
commit e1a23ac606
1 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
electron/services/wcdbCore.ts
View File

@@ -143,8 +143,13 @@ export class WcdbCore {
} }
} }
// 使用命名管道 IPC // 使用命名管道 IPC (仅 Windows)
startMonitor(callback: (type: string, json: string) => void): boolean { startMonitor(callback: (type: string, json: string) => void): boolean {
if (process.platform !== 'win32') {
console.warn('[wcdbCore] Monitor not supported on macOS')
return false
}
if (!this.wcdbStartMonitorPipe) { if (!this.wcdbStartMonitorPipe) {
return false return false
} }
@@ -251,9 +256,13 @@ export class WcdbCore {
/** /**
* 获取 DLL 路径 * 获取库文件路径（跨平台）
*/ */
private getDllPath(): string { private getDllPath(): string {
const isMac = process.platform === 'darwin'
const libName = isMac ? 'libwcdb_api.dylib' : 'wcdb_api.dll'
const subDir = isMac ? 'macos' : ''
const envDllPath = process.env.WCDB_DLL_PATH const envDllPath = process.env.WCDB_DLL_PATH
if (envDllPath && envDllPath.length > 0) { if (envDllPath && envDllPath.length > 0) {
return envDllPath return envDllPath
@@ -265,22 +274,22 @@ export class WcdbCore {
const candidates = [ const candidates = [
// 环境变量指定 resource 目录 // 环境变量指定 resource 目录
process.env.WCDB_RESOURCES_PATH ? join(process.env.WCDB_RESOURCES_PATH, 'wcdb_api.dll') : null, process.env.WCDB_RESOURCES_PATH ? join(process.env.WCDB_RESOURCES_PATH, subDir, libName) : null,
// 显式 setPaths 设置的路径 // 显式 setPaths 设置的路径
this.resourcesPath ? join(this.resourcesPath, 'wcdb_api.dll') : null, this.resourcesPath ? join(this.resourcesPath, subDir, libName) : null,
// text/resources/wcdb_api.dll (打包常见结构) // resources/macos/libwcdb_api.dylib 或 resources/wcdb_api.dll
join(resourcesPath, 'resources', 'wcdb_api.dll'), join(resourcesPath, 'resources', subDir, libName),
// items/resourcesPath/wcdb_api.dll (扁平结构) // resources/libwcdb_api.dylib 或 resources/wcdb_api.dll (扁平结构)
join(resourcesPath, 'wcdb_api.dll'), join(resourcesPath, subDir, libName),
// CWD fallback // CWD fallback
join(process.cwd(), 'resources', 'wcdb_api.dll') join(process.cwd(), 'resources', subDir, libName)
].filter(Boolean) as string[] ].filter(Boolean) as string[]
for (const path of candidates) { for (const path of candidates) {
if (existsSync(path)) return path if (existsSync(path)) return path
} }
return candidates[0] || 'wcdb_api.dll' return candidates[0] || libName
} }
private isLogEnabled(): boolean { private isLogEnabled(): boolean {
@@ -392,24 +401,40 @@ export class WcdbCore {
} }
const dllDir = dirname(dllPath) const dllDir = dirname(dllPath)
const wcdbCorePath = join(dllDir, 'WCDB.dll') const isMac = process.platform === 'darwin'
if (existsSync(wcdbCorePath)) {
try { // 预加载依赖库
this.koffi.load(wcdbCorePath) if (isMac) {
this.writeLog('预加载 WCDB.dll 成功') const wcdbCorePath = join(dllDir, 'libWCDB.dylib')
} catch (e) { if (existsSync(wcdbCorePath)) {
console.warn('预加载 WCDB.dll 失败(可能不是致命的):', e) try {
this.writeLog(`预加载 WCDB.dll 失败: ${String(e)}`) this.koffi.load(wcdbCorePath)
this.writeLog('预加载 libWCDB.dylib 成功')
} catch (e) {
console.warn('预加载 libWCDB.dylib 失败(可能不是致命的):', e)
this.writeLog(`预加载 libWCDB.dylib 失败: ${String(e)}`)
}
} }
} } else {
const sdl2Path = join(dllDir, 'SDL2.dll') const wcdbCorePath = join(dllDir, 'WCDB.dll')
if (existsSync(sdl2Path)) { if (existsSync(wcdbCorePath)) {
try { try {
this.koffi.load(sdl2Path) this.koffi.load(wcdbCorePath)
this.writeLog('预加载 SDL2.dll 成功') this.writeLog('预加载 WCDB.dll 成功')
} catch (e) { } catch (e) {
console.warn('预加载 SDL2.dll 失败(可能不是致命的):', e) console.warn('预加载 WCDB.dll 失败(可能不是致命的):', e)
this.writeLog(`预加载 SDL2.dll 失败: ${String(e)}`) this.writeLog(`预加载 WCDB.dll 失败: ${String(e)}`)
}
}
const sdl2Path = join(dllDir, 'SDL2.dll')
if (existsSync(sdl2Path)) {
try {
this.koffi.load(sdl2Path)
this.writeLog('预加载 SDL2.dll 成功')
} catch (e) {
console.warn('预加载 SDL2.dll 失败(可能不是致命的):', e)
this.writeLog(`预加载 SDL2.dll 失败: ${String(e)}`)
}
} }
} }