nterminal 1.2.0

package/dist/server/update/gitUpdate.js

@@ -0,0 +1,241 @@
+import { spawn, spawnSync } from 'node:child_process';
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import path from 'node:path';
+const updateLockStaleMs = 10 * 60 * 1000;
+const packageUpdateTimeoutMs = 5 * 60 * 1000;
+function appDir() {
+    return process.env.NTERMINAL_APP_DIR ? path.resolve(process.env.NTERMINAL_APP_DIR) : process.cwd();
+}
+function git(args, cwd) {
+    const result = spawnSync('git', args, { cwd, encoding: 'utf8', timeout: 60_000 });
+    return {
+        ok: result.status === 0,
+        stdout: (result.stdout ?? '').trim(),
+        stderr: (result.stderr ?? '').trim()
+    };
+}
+function npm(args, cwd, timeout = 60_000) {
+    const result = spawnSync(process.env.NTERMINAL_NPM_BIN || 'npm', args, { cwd, encoding: 'utf8', timeout });
+    return {
+        ok: result.status === 0,
+        stdout: (result.stdout ?? '').trim(),
+        stderr: (result.stderr ?? '').trim()
+    };
+}
+function isGitRepo(cwd) {
+    // Authoritative check — an empty/partial `.git` dir alone shouldn't count as a repo.
+    const result = git(['rev-parse', '--is-inside-work-tree'], cwd);
+    return result.ok && result.stdout === 'true';
+}
+function readPackageName(cwd) {
+    try {
+        const pkg = JSON.parse(readFileSync(path.join(cwd, 'package.json'), 'utf8'));
+        return typeof pkg.name === 'string' && pkg.name.trim() ? pkg.name.trim() : 'nterminal';
+    }
+    catch {
+        return 'nterminal';
+    }
+}
+function readPackageVersion(cwd) {
+    try {
+        const pkg = JSON.parse(readFileSync(path.join(cwd, 'package.json'), 'utf8'));
+        return typeof pkg.version === 'string' ? pkg.version : 'unknown';
+    }
+    catch {
+        return 'unknown';
+    }
+}
+function readCommit(cwd) {
+    if (!isGitRepo(cwd)) {
+        return null;
+    }
+    const commit = git(['rev-parse', 'HEAD'], cwd);
+    return commit.ok ? commit.stdout : null;
+}
+// Frozen at process start. It only changes once a deploy has actually rebuilt and
+// restarted the server — so the UI can tell a real restart apart from a bare `git pull`.
+const startupVersion = readPackageVersion(appDir());
+const startupCommit = readCommit(appDir());
+// Cross-process guard (lockfile) so repeated clicks, multiple tabs, or a still-running deploy
+// don't spawn overlapping deploys. Auto-expires so a crashed/hung deploy doesn't wedge updates.
+function resolveRuntimePath(cwd, value) {
+    return path.isAbsolute(value) ? value : path.resolve(cwd, value);
+}
+function runtimeStateDir(cwd) {
+    const configured = process.env.NTERMINAL_STATE_PATH?.trim();
+    return configured ? path.dirname(resolveRuntimePath(cwd, configured)) : path.join(cwd, '.nterminal');
+}
+function lockPath(cwd) {
+    return path.join(runtimeStateDir(cwd), 'update.lock');
+}
+function updateLocked(cwd) {
+    const file = lockPath(cwd);
+    if (!existsSync(file)) {
+        return false;
+    }
+    try {
+        const stamped = Number(readFileSync(file, 'utf8').trim());
+        return Number.isFinite(stamped) && Date.now() - stamped < updateLockStaleMs;
+    }
+    catch {
+        return false;
+    }
+}
+function acquireUpdateLock(cwd) {
+    mkdirSync(runtimeStateDir(cwd), { recursive: true });
+    writeFileSync(lockPath(cwd), String(Date.now()));
+}
+function releaseUpdateLock(cwd) {
+    rmSync(lockPath(cwd), { force: true });
+}
+export function getVersionInfo(cwd = appDir()) {
+    const version = readPackageVersion(cwd);
+    if (!isGitRepo(cwd)) {
+        return {
+            version,
+            runningVersion: startupVersion,
+            commit: null,
+            runningCommit: startupCommit,
+            branch: null,
+            dirty: false,
+            isGit: false,
+            installMode: 'package'
+        };
+    }
+    const commit = git(['rev-parse', 'HEAD'], cwd);
+    const branch = git(['rev-parse', '--abbrev-ref', 'HEAD'], cwd);
+    const status = git(['status', '--porcelain'], cwd);
+    return {
+        version,
+        runningVersion: startupVersion,
+        commit: commit.ok ? commit.stdout : null,
+        runningCommit: startupCommit,
+        branch: branch.ok ? branch.stdout : null,
+        dirty: status.ok ? status.stdout.length > 0 : false,
+        isGit: true,
+        installMode: 'git'
+    };
+}
+export function checkBehind(cwd = appDir()) {
+    if (!isGitRepo(cwd)) {
+        return checkPackageUpdate(cwd);
+    }
+    return checkGitBehind(cwd);
+}
+function checkGitBehind(cwd) {
+    const commit = git(['rev-parse', 'HEAD'], cwd);
+    const upstream = git(['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'], cwd);
+    if (!upstream.ok) {
+        return { behind: null, commit: commit.ok ? commit.stdout : null, error: 'no_upstream' };
+    }
+    const fetched = git(['fetch'], cwd);
+    if (!fetched.ok) {
+        return { behind: null, commit: commit.ok ? commit.stdout : null, error: fetched.stderr || 'fetch_failed' };
+    }
+    const count = git(['rev-list', '--count', 'HEAD..@{u}'], cwd);
+    if (!count.ok) {
+        return { behind: null, commit: commit.ok ? commit.stdout : null, error: count.stderr || 'rev_list_failed' };
+    }
+    return { behind: Number(count.stdout) || 0, commit: commit.ok ? commit.stdout : null };
+}
+function checkPackageUpdate(cwd) {
+    const currentVersion = readPackageVersion(cwd);
+    const packageName = readPackageName(cwd);
+    const latest = npm(['view', `${packageName}@latest`, 'version'], cwd);
+    if (!latest.ok) {
+        return {
+            behind: null,
+            commit: null,
+            currentVersion,
+            latestVersion: null,
+            updateAvailable: null,
+            error: latest.stderr || latest.stdout || 'npm_view_failed'
+        };
+    }
+    const latestVersion = latest.stdout.split(/\r?\n/).at(-1)?.trim() || null;
+    return {
+        behind: null,
+        commit: null,
+        currentVersion,
+        latestVersion,
+        updateAvailable: latestVersion ? latestVersion !== currentVersion : null
+    };
+}
+export function runUpdate(cwd = appDir()) {
+    if (!isGitRepo(cwd)) {
+        return runPackageUpdate(cwd);
+    }
+    return runGitUpdate(cwd);
+}
+function runGitUpdate(cwd) {
+    if (updateLocked(cwd)) {
+        return { ok: false, changed: false, message: 'An update is already in progress on this server.', restarting: false };
+    }
+    // Refuse on any local modifications — ff-only alone only blocks *conflicting* changes,
+    // which would otherwise leave a dirty tree mixed with newly pulled code.
+    const status = git(['status', '--porcelain'], cwd);
+    if (status.ok && status.stdout.length > 0) {
+        return { ok: false, changed: false, message: 'Working tree has local changes — commit or discard them before updating.', restarting: false };
+    }
+    const pull = git(['pull', '--ff-only'], cwd);
+    if (!pull.ok) {
+        return {
+            ok: false,
+            changed: false,
+            message: pull.stderr || pull.stdout || 'git pull --ff-only failed',
+            restarting: false
+        };
+    }
+    const changed = !/Already up to date/i.test(pull.stdout);
+    if (!changed) {
+        return { ok: true, changed: false, message: 'Already up to date.', restarting: false };
+    }
+    // Build + restart in a detached process so it survives this server restarting itself.
+    acquireUpdateLock(cwd);
+    const deploy = spawn('bash', [path.join(cwd, 'scripts/nterminalctl'), 'deploy'], {
+        cwd,
+        detached: true,
+        env: { ...process.env, NTERMINAL_UPDATE_LOCK_PATH: lockPath(cwd) },
+        stdio: 'ignore'
+    });
+    deploy.unref();
+    return { ok: true, changed: true, message: pull.stdout || 'Updated; rebuilding and restarting.', restarting: true };
+}
+function runPackageUpdate(cwd) {
+    if (updateLocked(cwd)) {
+        return { ok: false, changed: false, message: 'An update is already in progress on this server.', restarting: false };
+    }
+    const check = checkPackageUpdate(cwd);
+    if (check.error) {
+        return { ok: false, changed: false, message: check.error, restarting: false };
+    }
+    if (!check.updateAvailable) {
+        return { ok: true, changed: false, message: 'Already up to date.', restarting: false };
+    }
+    acquireUpdateLock(cwd);
+    const packageName = readPackageName(cwd);
+    const install = npm(['install', '-g', `${packageName}@latest`], cwd, packageUpdateTimeoutMs);
+    if (!install.ok) {
+        releaseUpdateLock(cwd);
+        return {
+            ok: false,
+            changed: false,
+            message: install.stderr || install.stdout || 'npm install -g failed',
+            restarting: false
+        };
+    }
+    const restart = spawn('sh', ['-c', 'sleep 0.2; exec bash "$1" restart', 'nterminal-restart', path.join(cwd, 'scripts/nterminalctl')], {
+        cwd,
+        detached: true,
+        env: { ...process.env, NTERMINAL_UPDATE_LOCK_PATH: lockPath(cwd) },
+        stdio: 'ignore'
+    });
+    restart.unref();
+    return {
+        ok: true,
+        changed: true,
+        message: `Updated ${packageName} ${check.currentVersion ?? ''} -> ${check.latestVersion ?? 'latest'}; restarting.`,
+        restarting: true
+    };
+}
+//# sourceMappingURL=gitUpdate.js.map

package/dist/server/update/gitUpdate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitUpdate.js","sourceRoot":"","sources":["../../../src/server/update/gitUpdate.ts"],"names":[],"mappings":"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"}

package/dist/server/uploads/uploadPaths.d.ts

@@ -0,0 +1,18 @@
+import type { UploadManifestEntry } from '../../shared/protocol.js';
+export interface UploadPathFailure {
+    fieldName: string;
+    relativePath: string;
+    error: 'unsafe_relative_path';
+}
+export interface UploadTarget {
+    fieldName: string;
+    relativePath: string;
+    savedRelativePath: string;
+    absolutePath: string;
+    size: number;
+}
+export interface UploadTargetPlan {
+    targets: UploadTarget[];
+    failures: UploadPathFailure[];
+}
+export declare function planUploadTargets(destinationCwd: string, entries: UploadManifestEntry[]): Promise<UploadTargetPlan>;

package/dist/server/uploads/uploadPaths.js

@@ -0,0 +1,116 @@
+import { access } from 'node:fs/promises';
+import path from 'node:path';
+export async function planUploadTargets(destinationCwd, entries) {
+    const root = path.resolve(destinationCwd);
+    const reserved = new Set();
+    const topLevelFolders = new Map();
+    const targets = [];
+    const failures = [];
+    for (const entry of entries) {
+        const safe = safeEntry(entry);
+        if (!safe) {
+            failures.push({ fieldName: entry.fieldName, relativePath: entry.relativePath, error: 'unsafe_relative_path' });
+            continue;
+        }
+        if (safe.segments.length === 1) {
+            const savedRelativePath = await allocateFileRelativePath(root, [], safe.segments[0], reserved);
+            targets.push(targetFor(root, safe, savedRelativePath));
+            continue;
+        }
+        const originalTopLevel = safe.segments[0];
+        let savedTopLevel = topLevelFolders.get(originalTopLevel);
+        if (!savedTopLevel) {
+            savedTopLevel = await allocateFolderName(root, originalTopLevel, reserved);
+            topLevelFolders.set(originalTopLevel, savedTopLevel);
+        }
+        const parentSegments = [savedTopLevel, ...safe.segments.slice(1, -1)];
+        const fileName = safe.segments.at(-1);
+        const savedRelativePath = await allocateFileRelativePath(root, parentSegments, fileName, reserved);
+        targets.push(targetFor(root, safe, savedRelativePath));
+    }
+    return { targets, failures };
+}
+function safeEntry(entry) {
+    const segments = safeRelativeSegments(entry.relativePath);
+    if (!segments || !isFiniteNonNegativeInteger(entry.size) || !entry.fieldName.trim()) {
+        return null;
+    }
+    return { entry, segments };
+}
+function safeRelativeSegments(relativePath) {
+    if (typeof relativePath !== 'string' || relativePath.length === 0 || relativePath.includes('\0') || relativePath.includes('\\')) {
+        return null;
+    }
+    if (path.posix.isAbsolute(relativePath) || /^[A-Za-z]:/.test(relativePath)) {
+        return null;
+    }
+    const segments = relativePath.split('/');
+    if (segments.some((segment) => segment === '' || segment === '.' || segment === '..')) {
+        return null;
+    }
+    return segments;
+}
+async function allocateFolderName(root, name, reserved) {
+    let index = 1;
+    while (true) {
+        const candidate = index === 1 ? name : `${name} ${index}`;
+        const absolutePath = resolveContained(root, [candidate]);
+        if (!reserved.has(absolutePath) && !(await exists(absolutePath))) {
+            reserved.add(absolutePath);
+            return candidate;
+        }
+        index += 1;
+    }
+}
+async function allocateFileRelativePath(root, parentSegments, fileName, reserved) {
+    let index = 1;
+    while (true) {
+        const candidateName = index === 1 ? fileName : suffixedFileName(fileName, index);
+        const candidateSegments = [...parentSegments, candidateName];
+        const absolutePath = resolveContained(root, candidateSegments);
+        if (!reserved.has(absolutePath) && !(await exists(absolutePath))) {
+            reserved.add(absolutePath);
+            return candidateSegments.join('/');
+        }
+        index += 1;
+    }
+}
+function targetFor(root, safe, savedRelativePath) {
+    const absolutePath = resolveContained(root, savedRelativePath.split('/'));
+    return {
+        fieldName: safe.entry.fieldName,
+        relativePath: safe.entry.relativePath,
+        savedRelativePath,
+        absolutePath,
+        size: safe.entry.size
+    };
+}
+function resolveContained(root, segments) {
+    const resolved = path.resolve(root, ...segments);
+    const relative = path.relative(root, resolved);
+    if (relative === '' || relative.startsWith('..') || path.isAbsolute(relative)) {
+        throw new Error('unsafe_relative_path');
+    }
+    return resolved;
+}
+function suffixedFileName(fileName, index) {
+    if (fileName.startsWith('.') && fileName.indexOf('.', 1) === -1) {
+        return `${fileName} ${index}`;
+    }
+    const extension = path.extname(fileName);
+    const base = extension ? fileName.slice(0, -extension.length) : fileName;
+    return `${base} ${index}${extension}`;
+}
+async function exists(filePath) {
+    try {
+        await access(filePath);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function isFiniteNonNegativeInteger(value) {
+    return Number.isSafeInteger(value) && value >= 0;
+}
+//# sourceMappingURL=uploadPaths.js.map

package/dist/server/uploads/uploadPaths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uploadPaths.js","sourceRoot":"","sources":["../../../src/server/uploads/uploadPaths.ts"],"names":[],"mappings":"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"}

package/dist/server/uploads/uploadService.d.ts

@@ -0,0 +1,21 @@
+import { type Readable } from 'node:stream';
+import type { AppConfig } from '../config.js';
+import type { UploadManifest, UploadResponse } from '../../shared/protocol.js';
+export type UploadLimits = Pick<AppConfig, 'uploadMaxFiles' | 'uploadMaxFileBytes' | 'uploadMaxBatchBytes'>;
+export interface CreateUploadSessionOptions {
+    destinationCwd: string;
+    limits: UploadLimits;
+    manifest: UploadManifest;
+}
+export declare class UploadRequestError extends Error {
+    readonly statusCode: number;
+    readonly code: string;
+    constructor(statusCode: number, code: string);
+}
+export interface UploadSession {
+    writeFile(fieldName: string, stream: Readable): Promise<void>;
+    finish(): Promise<UploadResponse>;
+    abort(): Promise<void>;
+}
+export declare function createUploadSession(options: CreateUploadSessionOptions): Promise<UploadSession>;
+export declare function parseUploadManifest(value: unknown): UploadManifest | null;

package/dist/server/uploads/uploadService.js

@@ -0,0 +1,230 @@
+import { mkdir, open, realpath, unlink } from 'node:fs/promises';
+import path from 'node:path';
+import { Transform } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
+import { planUploadTargets } from './uploadPaths.js';
+export class UploadRequestError extends Error {
+    statusCode;
+    code;
+    constructor(statusCode, code) {
+        super(code);
+        this.statusCode = statusCode;
+        this.code = code;
+    }
+}
+export async function createUploadSession(options) {
+    validateManifest(options.manifest, options.limits);
+    const pathPlan = await planUploadTargets(options.destinationCwd, options.manifest.entries);
+    return new StreamingUploadSession(options.destinationCwd, options.manifest.entries, options.limits, pathPlan.targets, pathPlan.failures);
+}
+export function parseUploadManifest(value) {
+    if (!value || typeof value !== 'object') {
+        return null;
+    }
+    const manifest = value;
+    if (typeof manifest.terminalId !== 'string' || !manifest.terminalId.trim() || !Array.isArray(manifest.entries)) {
+        return null;
+    }
+    const entries = [];
+    for (const entry of manifest.entries) {
+        if (!entry || typeof entry !== 'object') {
+            return null;
+        }
+        const candidate = entry;
+        const fieldName = candidate.fieldName;
+        const relativePath = candidate.relativePath;
+        const size = candidate.size;
+        if (typeof fieldName !== 'string' ||
+            typeof relativePath !== 'string' ||
+            typeof size !== 'number' ||
+            !Number.isSafeInteger(size) ||
+            size < 0) {
+            return null;
+        }
+        entries.push({
+            fieldName,
+            relativePath,
+            size
+        });
+    }
+    return { terminalId: manifest.terminalId, entries };
+}
+class StreamingUploadSession {
+    destinationCwd;
+    entries;
+    limits;
+    targetsByField = new Map();
+    failuresByField = new Map();
+    resultsByField = new Map();
+    createdFiles = new Set();
+    actualBatchBytes = 0;
+    constructor(destinationCwd, entries, limits, targets, failures) {
+        this.destinationCwd = destinationCwd;
+        this.entries = entries;
+        this.limits = limits;
+        for (const target of targets) {
+            if (target.size > limits.uploadMaxFileBytes) {
+                this.failuresByField.set(target.fieldName, {
+                    relativePath: target.relativePath,
+                    status: 'failed',
+                    error: 'file_too_large'
+                });
+            }
+            else {
+                this.targetsByField.set(target.fieldName, target);
+            }
+        }
+        for (const failure of failures) {
+            this.failuresByField.set(failure.fieldName, {
+                relativePath: failure.relativePath,
+                status: 'failed',
+                error: failure.error
+            });
+        }
+    }
+    async writeFile(fieldName, stream) {
+        if (this.resultsByField.has(fieldName)) {
+            await drain(stream);
+            return;
+        }
+        const target = this.targetsByField.get(fieldName);
+        if (!target || this.failuresByField.has(fieldName)) {
+            await drain(stream);
+            return;
+        }
+        const parentDir = path.dirname(target.absolutePath);
+        await mkdir(parentDir, { recursive: true });
+        if (!(await isContainedRealPath(this.destinationCwd, parentDir))) {
+            await drain(stream);
+            this.resultsByField.set(fieldName, {
+                relativePath: target.relativePath,
+                savedRelativePath: target.savedRelativePath,
+                status: 'failed',
+                error: 'unsafe_parent_path'
+            });
+            return;
+        }
+        const counter = this.createLimitCounter();
+        let createdPath = null;
+        let handle = null;
+        try {
+            handle = await open(target.absolutePath, 'wx');
+            createdPath = target.absolutePath;
+            await pipeline(stream, counter, handle.createWriteStream());
+            this.createdFiles.add(target.absolutePath);
+            this.resultsByField.set(fieldName, {
+                relativePath: target.relativePath,
+                savedRelativePath: target.savedRelativePath,
+                status: 'uploaded',
+                size: counter.bytesRead
+            });
+        }
+        catch (error) {
+            if (!createdPath) {
+                await drain(stream).catch(() => undefined);
+            }
+            await handle?.close().catch(() => undefined);
+            if (createdPath) {
+                await unlink(createdPath).catch(() => undefined);
+            }
+            this.resultsByField.set(fieldName, {
+                relativePath: target.relativePath,
+                savedRelativePath: target.savedRelativePath,
+                status: 'failed',
+                error: uploadWriteErrorCode(error)
+            });
+        }
+    }
+    async abort() {
+        const createdFiles = Array.from(this.createdFiles);
+        this.createdFiles.clear();
+        await Promise.all(createdFiles.map((filePath) => unlink(filePath).catch(() => undefined)));
+    }
+    async finish() {
+        const results = this.entries.map((entry) => {
+            const result = this.resultsByField.get(entry.fieldName);
+            if (result) {
+                return result;
+            }
+            const failure = this.failuresByField.get(entry.fieldName);
+            if (failure) {
+                return failure;
+            }
+            return {
+                relativePath: entry.relativePath,
+                status: 'failed',
+                error: 'missing_file'
+            };
+        });
+        const uploaded = results.filter((result) => result.status === 'uploaded').length;
+        return {
+            destinationCwd: this.destinationCwd,
+            uploaded,
+            failed: results.length - uploaded,
+            results
+        };
+    }
+    createLimitCounter() {
+        const limits = this.limits;
+        const session = this;
+        const counter = new Transform({
+            transform(chunk, _encoding, callback) {
+                const chunkBytes = typeof chunk === 'string' ? Buffer.byteLength(chunk) : chunk.length;
+                counter.bytesRead += chunkBytes;
+                session.actualBatchBytes += chunkBytes;
+                if (counter.bytesRead > limits.uploadMaxFileBytes) {
+                    callback(new UploadRequestError(413, 'file_too_large'));
+                    return;
+                }
+                if (session.actualBatchBytes > limits.uploadMaxBatchBytes) {
+                    callback(new UploadRequestError(413, 'batch_too_large'));
+                    return;
+                }
+                callback(null, chunk);
+            }
+        });
+        counter.bytesRead = 0;
+        return counter;
+    }
+}
+function validateManifest(manifest, limits) {
+    if (manifest.entries.length > limits.uploadMaxFiles) {
+        throw new UploadRequestError(413, 'too_many_files');
+    }
+    const fieldNames = new Set();
+    for (const entry of manifest.entries) {
+        if (fieldNames.has(entry.fieldName)) {
+            throw new UploadRequestError(400, 'duplicate_upload_field');
+        }
+        fieldNames.add(entry.fieldName);
+    }
+    const batchBytes = manifest.entries.reduce((total, entry) => total + entry.size, 0);
+    if (batchBytes > limits.uploadMaxBatchBytes) {
+        throw new UploadRequestError(413, 'batch_too_large');
+    }
+}
+async function drain(stream) {
+    for await (const _chunk of stream) {
+        // Consume the stream so multipart parsing can continue.
+    }
+}
+function uploadWriteErrorCode(error) {
+    if (isNodeErrorWithCode(error, 'EEXIST')) {
+        return 'target_exists';
+    }
+    return error instanceof UploadRequestError ? error.code : 'write_failed';
+}
+async function isContainedRealPath(root, candidate) {
+    try {
+        const [rootRealPath, candidateRealPath] = await Promise.all([realpath(root), realpath(candidate)]);
+        const relative = path.relative(rootRealPath, candidateRealPath);
+        return relative === '' || (!relative.startsWith('..') && !path.isAbsolute(relative));
+    }
+    catch {
+        return false;
+    }
+}
+function isNodeErrorWithCode(error, code) {
+    return typeof error === 'object' && error !== null && 'code' in error && error.code === code;
+}
+//# sourceMappingURL=uploadService.js.map