console2svg 0.6.4 → 0.7.0

package/cli/install.js

@@ -4,6 +4,7 @@
 const fs = require('fs');
 const path = require('path');
 const https = require('https');
+const { spawnSync } = require('child_process');
 const { HttpsProxyAgent } = require('https-proxy-agent');
 const { getProxyForUrl } = require('proxy-from-env');
 
@@ -38,13 +39,8 @@ if (platform === 'win32') {
 }
 
 const isWin = platform === 'win32';
-const ext = isWin ? '.exe' : '';
-const fileName = `console2svg-${rid}${ext}`;
-const url = `https://github.com/arika0093/console2svg/releases/download/v${version}/${fileName}`;
-
 const distDir = path.join(__dirname, '..', 'dist');
-const destPath = path.join(distDir, `console2svg${ext}`);
-const tempPath = `${destPath}.tmp`;
+const destPath = path.join(distDir, `console2svg${isWin ? '.exe' : ''}`);
 
 if (fs.existsSync(destPath)) {
   process.exit(0);
@@ -61,21 +57,23 @@ function fail(message, err) {
   process.exit(1);
 }
 
-function download(downloadUrl, redirects) {
+function download(downloadUrl, redirects, onFinish) {
   if (redirects > 5) {
     fail('console2svg: too many redirects while downloading.');
   }
 
   const proxy = getProxyForUrl(downloadUrl);
   const agent = proxy ? new HttpsProxyAgent(proxy) : undefined;
-  const url = new URL(downloadUrl);
+  const urlObj = new URL(downloadUrl);
+
+  const tempPath = `${destPath}.tmp`;
 
   const request = https.get(
     {
-      hostname: url.hostname,
-      path: url.pathname + url.search,
-      protocol: url.protocol,
-      port: url.port,
+      hostname: urlObj.hostname,
+      path: urlObj.pathname + urlObj.search,
+      protocol: urlObj.protocol,
+      port: urlObj.port,
       agent,
       headers: {
         'User-Agent': 'console2svg-npm-wrapper',
@@ -85,7 +83,7 @@ function download(downloadUrl, redirects) {
     (res) => {
       if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
         res.resume();
-        download(res.headers.location, redirects + 1);
+        download(res.headers.location, redirects + 1, onFinish);
         return;
       }
 
@@ -99,11 +97,7 @@ function download(downloadUrl, redirects) {
       file.on('finish', () => {
         file.close(() => {
           try {
-            fs.renameSync(tempPath, destPath);
-            if (!isWin) {
-              fs.chmodSync(destPath, 0o755);
-            }
-            process.exit(0);
+            onFinish(tempPath);
           } catch (err) {
             fail('console2svg: failed to finalize download.', err);
           }
@@ -111,11 +105,11 @@ function download(downloadUrl, redirects) {
       });
       file.on('error', (err) => {
         try {
-          fs.unlinkSync(tempPath);
-        } catch {
-          // ignore
-        }
-        fail('console2svg: write failed.', err);
+            fs.unlinkSync(tempPath);
+          } catch {
+            // ignore
+          }
+          fail('console2svg: write failed.', err);
       });
     }
   );
@@ -125,4 +119,47 @@ function download(downloadUrl, redirects) {
   });
 }
 
-download(url, 0);
+if (isWin) {
+  // On Windows: download the ffmpeg bundle zip (console2svg.exe + ffmpeg.exe + DLLs)
+  const zipFileName = `console2svg-${rid}-ffmpeg.zip`;
+  const zipUrl = `https://github.com/arika0093/console2svg/releases/download/v${version}/${zipFileName}`;
+
+  download(zipUrl, 0, (tempZipPath) => {
+    // Escape single quotes in paths for PowerShell single-quoted string literals.
+    const psEscape = (p) => p.replace(/'/g, "''");
+    // Extract the zip into distDir using PowerShell
+    const result = spawnSync(
+      'powershell',
+      [
+        '-NoProfile',
+        '-NonInteractive',
+        '-Command',
+        `Expand-Archive -LiteralPath '${psEscape(tempZipPath)}' -DestinationPath '${psEscape(distDir)}' -Force`
+      ],
+      { stdio: 'inherit' }
+    );
+
+    try { fs.unlinkSync(tempZipPath); } catch { /* ignore */ }
+
+    if (result.status !== 0) {
+      fail('console2svg: failed to extract zip bundle.');
+    }
+
+    if (!fs.existsSync(destPath)) {
+      fail('console2svg: console2svg.exe not found after extraction.');
+    }
+
+    process.exit(0);
+  });
+} else {
+  // On Linux/macOS: download the single binary
+  const fileName = `console2svg-${rid}`;
+  const url = `https://github.com/arika0093/console2svg/releases/download/v${version}/${fileName}`;
+
+  download(url, 0, (tempPath) => {
+    fs.renameSync(tempPath, destPath);
+    fs.chmodSync(destPath, 0o755);
+    process.exit(0);
+  });
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "console2svg",
-  "version": "0.6.4",
+  "version": "0.7.0",
   "description": "Convert terminal output into SVG images",
   "license": "Apache-2.0",
   "repository": {