* fix(webui): 合并 react/react-dom/scheduler 到 react-vendor chunk codemirror-core chunk 从 react-dom chunk 导入 forwardRef(r), 但 react-dom 被 manualChunks 单独拆块后未导出该绑定, forwardRef 为 undefined 导致 React 初始化崩溃、整页白屏。 将 react/react-dom/scheduler 合并为 react-vendor 块, 消除 React 19 下 chunk 间 forwardRef 跨块断裂。 * fix: Worker 改走 child_process.fork 并传 --no-sandbox(arm64/proot 下避免 UtilityProcess SIGSEGV) - process-api.ts: ProcessOptions 增加 execArgv 选项;isElectron 增加 NAPCAT_FORCE_NODE_PROCESS 环境变量判断,可强制走 Node 进程管理器 - napcat.ts: Node 进程路径下为 Worker 注入 execArgv: ['--no-sandbox'],规避 arm64/proot 环境 Electron UtilityProcess 崩溃(退出码 11) - 注:未包含原 commit 中 scripts/install.sh 的 Termux 特定补丁(该文件为 fork 私有,上游不存在)
192 lines
5.0 KiB
TypeScript
192 lines
5.0 KiB
TypeScript
import type { Readable } from 'stream';
|
|
import type { fork as forkType } from 'child_process';
|
|
|
|
// 扩展 Process 类型以支持 parentPort
|
|
declare global {
|
|
namespace NodeJS {
|
|
interface Process {
|
|
parentPort?: {
|
|
on (event: 'message', listener: (e: { data: unknown; }) => void): void;
|
|
postMessage (message: unknown): void;
|
|
};
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* 统一的进程接口
|
|
*/
|
|
export interface IWorkerProcess {
|
|
readonly pid: number | undefined;
|
|
readonly stdout: Readable | null;
|
|
readonly stderr: Readable | null;
|
|
|
|
postMessage (message: unknown): void;
|
|
kill (): boolean;
|
|
on (event: string, listener: (...args: unknown[]) => void): void;
|
|
once (event: string, listener: (...args: unknown[]) => void): void;
|
|
off (event: string, listener: (...args: unknown[]) => void): void;
|
|
}
|
|
|
|
/**
|
|
* 进程创建选项
|
|
*/
|
|
export interface ProcessOptions {
|
|
env: NodeJS.ProcessEnv;
|
|
stdio: 'pipe' | 'ignore' | 'inherit' | Array<'pipe' | 'ignore' | 'inherit' | 'ipc'>;
|
|
execArgv?: string[];
|
|
}
|
|
|
|
/**
|
|
* 进程管理器接口
|
|
*/
|
|
export interface IProcessManager {
|
|
createWorker (modulePath: string, args: string[], options: ProcessOptions): IWorkerProcess;
|
|
onParentMessage (handler: (message: unknown) => void): void;
|
|
sendToParent (message: unknown): boolean;
|
|
}
|
|
|
|
/**
|
|
* Electron utilityProcess 包装器
|
|
*/
|
|
class ElectronProcessManager implements IProcessManager {
|
|
private utilityProcess: {
|
|
fork (modulePath: string, args: string[], options: unknown): unknown;
|
|
};
|
|
|
|
constructor (utilityProcess: { fork (modulePath: string, args: string[], options: unknown): unknown; }) {
|
|
this.utilityProcess = utilityProcess;
|
|
}
|
|
|
|
createWorker (modulePath: string, args: string[], options: ProcessOptions): IWorkerProcess {
|
|
const child: any = this.utilityProcess.fork(modulePath, args, options);
|
|
|
|
return {
|
|
get pid () { return child.pid as number | undefined; },
|
|
stdout: child.stdout as Readable | null,
|
|
stderr: child.stderr as Readable | null,
|
|
|
|
postMessage (message: unknown): void {
|
|
child.postMessage(message);
|
|
},
|
|
|
|
kill (): boolean {
|
|
return child.kill() as boolean;
|
|
},
|
|
|
|
on (event: string, listener: (...args: unknown[]) => void): void {
|
|
child.on(event, listener);
|
|
},
|
|
|
|
once (event: string, listener: (...args: unknown[]) => void): void {
|
|
child.once(event, listener);
|
|
},
|
|
|
|
off (event: string, listener: (...args: unknown[]) => void): void {
|
|
child.off(event, listener);
|
|
},
|
|
};
|
|
}
|
|
|
|
onParentMessage (handler: (message: unknown) => void): void {
|
|
if (process.parentPort) {
|
|
process.parentPort.on('message', (e: { data: unknown; }) => {
|
|
handler(e.data);
|
|
});
|
|
}
|
|
}
|
|
|
|
sendToParent (message: unknown): boolean {
|
|
if (process.parentPort) {
|
|
process.parentPort.postMessage(message);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Node.js child_process 包装器
|
|
*/
|
|
class NodeProcessManager implements IProcessManager {
|
|
private forkFn: typeof forkType;
|
|
|
|
constructor (forkFn: typeof forkType) {
|
|
this.forkFn = forkFn;
|
|
}
|
|
|
|
createWorker (modulePath: string, args: string[], options: ProcessOptions): IWorkerProcess {
|
|
const child = this.forkFn(modulePath, args, options as any);
|
|
|
|
return {
|
|
get pid () { return child.pid; },
|
|
stdout: child.stdout,
|
|
stderr: child.stderr,
|
|
|
|
postMessage (message: unknown): void {
|
|
if (child.send) {
|
|
child.send(message as any);
|
|
}
|
|
},
|
|
|
|
kill (): boolean {
|
|
return child.kill();
|
|
},
|
|
|
|
on (event: string, listener: (...args: unknown[]) => void): void {
|
|
child.on(event, listener);
|
|
},
|
|
|
|
once (event: string, listener: (...args: unknown[]) => void): void {
|
|
child.once(event, listener);
|
|
},
|
|
|
|
off (event: string, listener: (...args: unknown[]) => void): void {
|
|
child.off(event, listener);
|
|
},
|
|
};
|
|
}
|
|
|
|
onParentMessage (handler: (message: unknown) => void): void {
|
|
process.on('message', (message: unknown) => {
|
|
handler(message);
|
|
});
|
|
}
|
|
|
|
sendToParent (message: unknown): boolean {
|
|
if (process.send) {
|
|
process.send(message as any);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* 检测运行环境并创建对应的进程管理器
|
|
*/
|
|
export async function createProcessManager (): Promise<{
|
|
manager: IProcessManager;
|
|
isElectron: boolean;
|
|
}> {
|
|
const isElectron = process.env['NAPCAT_FORCE_NODE_PROCESS'] !== '1' && typeof process.versions['electron'] !== 'undefined';
|
|
|
|
if (isElectron) {
|
|
// @ts-ignore - electron 运行时存在但类型声明可能缺失
|
|
const electron = await import('electron');
|
|
if (electron.app && !electron.app.isReady()) {
|
|
await electron.app.whenReady();
|
|
}
|
|
return {
|
|
manager: new ElectronProcessManager(electron.utilityProcess),
|
|
isElectron: true,
|
|
};
|
|
} else {
|
|
const { fork } = await import('child_process');
|
|
return {
|
|
manager: new NodeProcessManager(fork),
|
|
isElectron: false,
|
|
};
|
|
}
|
|
}
|