clidesk 0.1.1 → 0.1.3

package/README.md

@@ -6,7 +6,7 @@
 
 CliDesk is a local desktop dashboard for managing terminal sessions, files, and Git repositories — built with **Tauri v2** + **React** + **TypeScript** + **Rust**.
 
-This npm package is the launcher/downloader for the CliDesk desktop app.
+This npm package contains the CliDesk desktop app binary and a native Windows launcher.
 
 ## Install
 
@@ -20,7 +20,7 @@ npm i -g clidesk
 clidesk
 ```
 
-The launcher will find and open the CliDesk desktop app.
+The launcher copies the bundled binaries into a per-version runtime cache and opens CliDesk from there.
 
 ## Requirements
 
@@ -30,11 +30,11 @@ The launcher will find and open the CliDesk desktop app.
 
 ## How it works
 
-1. During `npm i -g clidesk`, the postinstall script checks for the CliDesk binary in `vendor/clidesk.exe`.
-2. If the binary is missing, instructions are shown to download it from GitHub Releases.
-3. When you run `clidesk`, the launcher spawns the desktop app.
+1. During `npm i -g clidesk`, the postinstall script checks that `vendor/clidesk.exe` and `vendor/clidesk-launcher.exe` are bundled.
+2. When you run `clidesk`, the npm wrapper copies both binaries to `%LOCALAPPDATA%\CliDesk\npm-runtime\<version>\`.
+3. The native launcher starts CliDesk from that runtime directory, not from `node_modules`.
 
-This npm package is only the launcher. The CliDesk desktop app itself is a Tauri application built from the [source repository](https://github.com/vykelongthuong/CliDesk).
+The CliDesk desktop app itself is a Tauri application built from the [source repository](https://github.com/vykelongthuong/CliDesk).
 
 ## License
 

package/bin/clidesk.js

@@ -1,61 +1,166 @@
 #!/usr/bin/env node
-// CliDesk npm launcher — spawns the CliDesk desktop app
+// CliDesk npm launcher.
 //
-// Usage:
-//   clidesk           → launch CliDesk
-//
-// Priority:
-//   1. vendor/clidesk-launcher.exe (native launcher with menu)
-//   2. vendor/clidesk.exe         (direct app binary)
-//
-// The launcher offers interactive menu (hidden/visible terminal).
-// If the launcher is absent, the app is spawned directly.
+// The package stores signed binaries in vendor/, but it never runs them from
+// node_modules. Each package version is copied to a runtime cache first so npm
+// can update or uninstall the global package without Windows keeping vendor/
+// locked by a running desktop process.
 
-const { spawn } = require('child_process');
-const path = require('path');
 const fs = require('fs');
+const path = require('path');
+const { execFileSync, spawn } = require('child_process');
+
+const args = process.argv.slice(2);
+const debug = args.includes('--debug-launch');
+
+const packageRoot = path.resolve(__dirname, '..');
+const pkg = require(path.join(packageRoot, 'package.json'));
+const version = pkg.version;
+
+const vendorDir = path.join(packageRoot, 'vendor');
+const runtimeBase = process.env.LOCALAPPDATA || process.env.TEMP;
 
-// ── Locate binaries ─────────────────────────────────────────────
-const vendorDir = path.join(__dirname, '..', 'vendor');
-const launcherPath = path.join(vendorDir, 'clidesk-launcher.exe');
-const appPath = path.join(vendorDir, 'clidesk.exe');
-
-let targetPath;
-let targetName;
-
-if (fs.existsSync(launcherPath)) {
-    targetPath = launcherPath;
-    targetName = 'clidesk-launcher.exe';
-} else if (fs.existsSync(appPath)) {
-    targetPath = appPath;
-    targetName = 'clidesk.exe';
-} else {
-    console.error('[CliDesk] Binary not found.');
-    console.error('[CliDesk] Try reinstalling: npm i -g clidesk');
-    console.error('[CliDesk] Or download clidesk.exe from GitHub Releases');
-    console.error('[CliDesk] and place it in: ' + vendorDir);
+if (!runtimeBase) {
+    console.error('[CliDesk] Không thể xác định LOCALAPPDATA hoặc TEMP.');
     process.exit(1);
 }
 
-// ── Forward all args ────────────────────────────────────────────
-const args = process.argv.slice(2);
+const runtimeDir = path.join(runtimeBase, 'CliDesk', 'npm-runtime', version);
 
-// ── Spawn ───────────────────────────────────────────────────────
-//
-// stdio: "inherit" — let the launcher/app use this terminal.
-// windowsHide: false — don't suppress console windows.
-// The native launcher manages its own console window (hidden/visible).
+const vendorApp = path.join(vendorDir, 'clidesk.exe');
+const vendorLauncher = path.join(vendorDir, 'clidesk-launcher.exe');
+
+const runtimeApp = path.join(runtimeDir, 'clidesk.exe');
+const runtimeLauncher = path.join(runtimeDir, 'clidesk-launcher.exe');
+const latestVersion = readLatestVersion();
+const updateAvailable = latestVersion ? isVersionNewer(latestVersion, version) : false;
+
+function ensureFileExists(filePath, label) {
+    if (!fs.existsSync(filePath)) {
+        throw new Error(`${label} không tồn tại: ${filePath}`);
+    }
+}
+
+function copyIfMissing(src, dest) {
+    ensureFileExists(src, 'Binary nguồn');
+    fs.mkdirSync(path.dirname(dest), { recursive: true });
+
+    if (fs.existsSync(dest)) {
+        return;
+    }
+
+    const tmpDest = `${dest}.tmp-${process.pid}`;
+    try {
+        fs.copyFileSync(src, tmpDest);
+        fs.renameSync(tmpDest, dest);
+    } catch (err) {
+        try {
+            if (fs.existsSync(tmpDest)) {
+                fs.unlinkSync(tmpDest);
+            }
+        } catch (_) {
+            // Best-effort cleanup only.
+        }
+        throw err;
+    }
+}
+
+function printDebugInfo() {
+    console.log('[CliDesk] packageRoot:', packageRoot);
+    console.log('[CliDesk] vendorDir:', vendorDir);
+    console.log('[CliDesk] runtimeDir:', runtimeDir);
+    console.log('[CliDesk] launcherPath:', runtimeLauncher);
+    console.log('[CliDesk] appPath:', runtimeApp);
+    console.log('[CliDesk] version:', version);
+    console.log('[CliDesk] latestVersion:', latestVersion || '(unknown)');
+    console.log('[CliDesk] updateAvailable:', updateAvailable ? 'true' : 'false');
+}
+
+function readLatestVersion() {
+    const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+    try {
+        const output = execFileSync(npmCommand, ['view', 'clidesk', 'version', '--silent'], {
+            encoding: 'utf8',
+            timeout: 5000,
+            windowsHide: true,
+            stdio: ['ignore', 'pipe', 'ignore'],
+        });
+        const latest = output.trim();
+        return latest || null;
+    } catch (_) {
+        return null;
+    }
+}
+
+function isVersionNewer(latest, current) {
+    const latestParts = parseVersion(latest);
+    const currentParts = parseVersion(current);
+    for (let index = 0; index < 3; index += 1) {
+        if (latestParts[index] > currentParts[index]) {
+            return true;
+        }
+        if (latestParts[index] < currentParts[index]) {
+            return false;
+        }
+    }
+    return false;
+}
+
+function parseVersion(value) {
+    const parts = String(value)
+        .split(/[.+-]/)
+        .slice(0, 3)
+        .map((part) => {
+            const parsed = Number.parseInt(part, 10);
+            return Number.isFinite(parsed) ? parsed : 0;
+        });
 
-const child = spawn(targetPath, args, {
-    stdio: 'inherit',
-    windowsHide: false,
-});
+    while (parts.length < 3) {
+        parts.push(0);
+    }
 
-child.on('exit', (code) => {
-    process.exit(code ?? 0);
-});
+    return parts;
+}
+
+function main() {
+    copyIfMissing(vendorApp, runtimeApp);
+    copyIfMissing(vendorLauncher, runtimeLauncher);
+
+    if (debug) {
+        printDebugInfo();
+    }
+
+    const child = spawn(runtimeLauncher, args, {
+        cwd: runtimeDir,
+        env: {
+            ...process.env,
+            CLIDESK_VERSION: version,
+            CLIDESK_LATEST_VERSION: latestVersion || '',
+            CLIDESK_UPDATE_AVAILABLE: updateAvailable ? '1' : '0',
+            CLIDESK_UPDATE_COMMAND: 'npm i -g clidesk',
+        },
+        stdio: 'inherit',
+        windowsHide: false,
+    });
 
-child.on('error', (err) => {
-    console.error('[CliDesk] Failed to start:', err.message);
+    child.on('exit', (code) => {
+        process.exit(code ?? 0);
+    });
+
+    child.on('error', (err) => {
+        console.error('[CliDesk] Không thể chạy launcher:', err.message);
+        console.error('[CliDesk] Path:', runtimeLauncher);
+        process.exit(1);
+    });
+}
+
+try {
+    main();
+} catch (err) {
+    console.error('[CliDesk] Không thể chuẩn bị runtime CliDesk.');
+    console.error('[CliDesk] Lỗi:', err && err.message ? err.message : err);
+    if (debug) {
+        printDebugInfo();
+    }
     process.exit(1);
-});
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clidesk",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "CliDesk desktop app launcher — install with npm i -g clidesk",
   "license": "Apache-2.0",
   "repository": {

package/scripts/install.js

@@ -1,66 +1,40 @@
-// CliDesk postinstall script
+// CliDesk postinstall script.
 //
-// Responsibilities:
-//   1. Detect platform (win32 x64)
-//   2. Ensure vendor/ directory exists
-//   3. Check if vendor/clidesk.exe exists
-//   4. If not, provide clear download instructions
-//
-// No admin required. No process spawned. No downloads.
+// It only validates that the package contains the Windows binaries needed by
+// bin/clidesk.js. It does not launch the app, copy runtime files, download
+// binaries, request admin rights, or use credentials.
 
 const fs = require('fs');
 const path = require('path');
 
-const VENDOR_DIR = path.join(__dirname, '..', 'vendor');
-const APP_BINARY = path.join(VENDOR_DIR, 'clidesk.exe');
+const vendorDir = path.join(__dirname, '..', 'vendor');
+const requiredBinaries = [
+    path.join(vendorDir, 'clidesk.exe'),
+    path.join(vendorDir, 'clidesk-launcher.exe'),
+];
 
 function main() {
-    // ── Platform check ──────────────────────────────────────
     if (process.platform !== 'win32') {
         console.warn('[CliDesk] This package only supports Windows x64.');
-        console.warn('[CliDesk] Skipping binary setup.');
         return;
     }
 
     if (process.arch !== 'x64') {
         console.warn('[CliDesk] This package only supports x64 architecture.');
-        console.warn('[CliDesk] Skipping binary setup.');
         return;
     }
 
-    // ── Ensure vendor directory ─────────────────────────────
-    if (!fs.existsSync(VENDOR_DIR)) {
-        fs.mkdirSync(VENDOR_DIR, { recursive: true });
-        console.log('[CliDesk] Created vendor directory.');
-    }
-
-    // ── Check for existing binary ───────────────────────────
-    if (fs.existsSync(APP_BINARY)) {
-        console.log('[CliDesk] Binary found in vendor/.');
-        return;
+    const missing = requiredBinaries.filter((filePath) => !fs.existsSync(filePath));
+    if (missing.length > 0) {
+        console.error('[CliDesk] Package is missing required binaries:');
+        for (const filePath of missing) {
+            console.error('[CliDesk] Missing:', filePath);
+        }
+        console.error('[CliDesk] Please reinstall with: npm i -g clidesk');
+        process.exit(1);
     }
 
-    // ── Binary missing — instructions ───────────────────────
-    console.log('');
-    console.log('╔══════════════════════════════════════════════╗');
-    console.log('║          CliDesk Binary Setup                ║');
-    console.log('╠══════════════════════════════════════════════╣');
-    console.log('║                                              ║');
-    console.log('║  CliDesk binary is not bundled yet.           ║');
-    console.log('║                                              ║');
-    console.log('║  To complete setup:                           ║');
-    console.log('║                                              ║');
-    console.log('║  1. Download clidesk.exe from:                ║');
-    console.log('║     GitHub Releases                           ║');
-    console.log('║     https://github.com/vykelongthuong/CliDesk  ║');
-    console.log('║                                              ║');
-    console.log('║  2. Place it in:                              ║');
-    console.log('║     ' + VENDOR_DIR.padEnd(42) + '║');
-    console.log('║                                              ║');
-    console.log('║  3. Run: clidesk                              ║');
-    console.log('║                                              ║');
-    console.log('╚══════════════════════════════════════════════╝');
-    console.log('');
+    console.log('[CliDesk] Vendor binaries found.');
 }
 
 main();