Skip to content

fix: self-heal node-pty spawn-helper permissions at runtime #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
samwei12 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: self-heal node-pty spawn-helper permissions at runtime #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 39 additions & 9 deletions src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,12 @@ interface WsMessage {

// ── Module finder ─────────────────────────────────────────────────────────────

function findModule(name: string): any {
try { return require(name); } catch { /* continue */ }
function findModuleRoot(name: string): string {
try {
return path.dirname(require.resolve(`${name}/package.json`));
} catch {
/* continue */
}

const roots = [
path.join('/opt', 'claudecodeui', 'node_modules', name),
Expand All @@ -55,23 +59,28 @@ function findModule(name: string): any {
];

for (const p of roots) {
if (fs.existsSync(p)) {
try { return require(p); } catch { /* continue */ }
}
if (fs.existsSync(p)) return p;
}

let dir = __dirname;
for (let i = 0; i < 10; i++) {
const candidate = path.join(dir, 'node_modules', name);
if (fs.existsSync(candidate)) {
try { return require(candidate); } catch { /* continue */ }
}
if (fs.existsSync(candidate)) return candidate;
const parent = path.dirname(dir);
if (parent === dir) break;
dir = parent;
}

throw new Error(`[web-terminal] Cannot find module '${name}' - run npm install in ${__dirname}`);
throw new Error(`[web-terminal] Cannot find module root for '${name}' - run npm install in ${__dirname}`);
}

function findModule(name: string): any {
const moduleRoot = findModuleRoot(name);
try {
return require(moduleRoot);
} catch {
throw new Error(`[web-terminal] Cannot load module '${name}' from ${moduleRoot}`);
}
}

// ── Dependencies ──────────────────────────────────────────────────────────────
Expand All @@ -84,6 +93,26 @@ const { WebSocketServer, WebSocket } = findModule('ws') as WsModule;
const sessions = new Map<string, SessionEntry>();
let sessionCounter = 0;

function ensureSpawnHelperExecutable(): void {
if (process.platform !== 'darwin') return;

try {
const archDir = process.arch === 'arm64' ? 'darwin-arm64' : process.arch === 'x64' ? 'darwin-x64' : null;
if (!archDir) return;

const nodePtyRoot = findModuleRoot('node-pty');
const spawnHelperPath = path.join(nodePtyRoot, 'prebuilds', archDir, 'spawn-helper');
if (!fs.existsSync(spawnHelperPath)) return;

const mode = fs.statSync(spawnHelperPath).mode & 0o777;
if ((mode & 0o100) === 0) {
fs.chmodSync(spawnHelperPath, mode | 0o100);
}
} catch (err) {
console.warn('[web-terminal] Failed to ensure spawn-helper permissions:', (err as Error).message);
}
}

function getShell(): string {
if (process.platform === 'win32') return 'powershell.exe';
return process.env.SHELL || '/bin/bash';
Expand Down Expand Up @@ -122,6 +151,7 @@ wss.on('connection', (ws: any) => {

let ptyProc: PtyProcess;
try {
ensureSpawnHelperExecutable();
ptyProc = pty.spawn(shell, [], {
name: 'xterm-256color',
cols: 80,
Expand Down