superprint 1.0.70 → 1.0.72

package/README.md

@@ -16,12 +16,24 @@ Use the npm launcher below when you prefer to run SuperPrint locally on your com
 
 Prerequisite: [Node.js 18+](https://nodejs.org) (npm included).
 
+### Windows PowerShell
+
+The `npm i superprint` command displayed automatically by npm installs the package but does not launch SuperPrint. On Windows PowerShell, script execution policies may also block `npm.ps1` and `npx.ps1`.
+
+Launch SuperPrint with the Windows command wrapper instead:
+
+```powershell
+npx.cmd superprint@latest
+```
+
+This does not require changing your PowerShell execution policy. If you specifically want to install the package first, use `npm.cmd i superprint`, then launch it with `npx.cmd superprint`.
+
+### macOS and Linux
+
 ```bash
 npx superprint
 ```
 
-**Windows PowerShell:** if script execution is disabled, use `npx.cmd superprint`.
-
 On first launch, the launcher downloads the application (about 50 MB), installs its local dependencies and opens **http://127.0.0.1:5173**. Later launches reuse the installed copy and automatically detect application updates. The server binds to the loopback interface by default, so it is not exposed to your local network or the Internet.
 
 ## What is included

package/cli.mjs

@@ -141,17 +141,28 @@ function isInstalled() {
   return existsSync(path.join(APP_DIR, 'package.json'));
 }
 function installedVersion() {
+  try { return JSON.parse(readFileSync(path.join(APP_DIR, 'package.json'), 'utf8')).version || null; } catch {}
   try { return readFileSync(VERSION_FILE, 'utf8').trim(); } catch { return null; }
 }
-function newestVersion(first, second) {
+function compareVersions(first, second) {
   const parts = version => String(version || '').split('.').map(value => parseInt(value, 10) || 0);
   const a = parts(first);
   const b = parts(second);
   for (let index = 0; index < Math.max(a.length, b.length); index++) {
-    if ((a[index] || 0) > (b[index] || 0)) return first;
-    if ((a[index] || 0) < (b[index] || 0)) return second;
+    if ((a[index] || 0) > (b[index] || 0)) return 1;
+    if ((a[index] || 0) < (b[index] || 0)) return -1;
+  }
+  return 0;
+}
+function newestVersion(first, second) {
+  return compareVersions(first, second) >= 0 ? (first || second) : second;
+}
+function extractedVersion() {
+  try {
+    return JSON.parse(readFileSync(path.join(APP_DIR, 'package.json'), 'utf8')).version || null;
+  } catch {
+    return null;
   }
-  return first || second;
 }
 function dependenciesReady() {
   return [
@@ -161,8 +172,8 @@ function dependenciesReady() {
   ].every(existsSync);
 }
 function runNpmInstall() {
-  return spawnSync('npm', ['install', '--no-audit', '--no-fund'], {
-    stdio: 'inherit', cwd: APP_DIR, shell: true
+  return spawnSync(isWin ? 'npm.cmd' : 'npm', ['install', '--no-audit', '--no-fund'], {
+    stdio: 'inherit', cwd: APP_DIR, shell: isWin
   });
 }
 
@@ -180,8 +191,8 @@ async function main() {
   const localVer = installedVersion();
 
   if (isInstalled()) {
-    if (onlineVersion && localVer && onlineVersion !== localVer) {
-      info('Online version (' + onlineVersion + ') ≠ local (' + localVer + ') — updating.');
+    if (!localVer || compareVersions(localVer, onlineVersion) < 0) {
+      info('Online version (' + onlineVersion + ') is newer than local (' + (localVer || '?') + ') — updating.');
       // Remove the old app to re-download the new one
       const { rmSync } = await import('node:fs');
       rmSync(APP_DIR, { recursive: true, force: true });
@@ -213,11 +224,14 @@ async function main() {
       fail('Failed to extract the zip.');
       process.exit(1);
     }
-    ok('Application extracted.');
-    if (onlineVersion) {
-      try { mkdirSync(APP_DIR, { recursive: true }); } catch {}
-      try { writeFileSync(VERSION_FILE, onlineVersion); } catch {}
+    const downloadedVersion = extractedVersion();
+    if (!downloadedVersion || compareVersions(downloadedVersion, onlineVersion) < 0) {
+      rmSync(APP_DIR, { recursive: true, force: true });
+      fail('Downloaded application version is invalid or older than the online version.');
+      process.exit(1);
     }
+    ok('Application extracted.');
+    try { writeFileSync(VERSION_FILE, downloadedVersion); } catch {}
     // Clean up the zip (save space)
     try { unlinkSync(ZIP_PATH); } catch {}
   }
@@ -238,8 +252,8 @@ async function main() {
     // npm 12+ blocks install scripts (e.g. esbuild needs its postinstall
     // to place its native binary). We approve all: this is our own
     // trusted application.
-    const appr = spawnSync('npm', ['install-scripts', 'approve', '--all'], {
-      stdio: 'inherit', cwd: APP_DIR, shell: true
+    const appr = spawnSync(isWin ? 'npm.cmd' : 'npm', ['install-scripts', 'approve', '--all'], {
+      stdio: 'inherit', cwd: APP_DIR, shell: isWin
     });
     if (appr.status !== 0) {
       // Command missing (npm < 12): not an issue, scripts run by default.
@@ -252,15 +266,18 @@ async function main() {
   }
 
   // ---- Launch Vite ----
-  console.log(SEP);
-  console.log(C.green + C.bold + '  Starting SuperPrint…' + C.reset);
-  console.log(C.dim + '  Open your browser at: http://127.0.0.1:5173' + C.reset);
-  console.log(SEP);
-
   const viteBin = path.join(APP_DIR, 'node_modules', 'vite', 'bin', 'vite.js');
   const userArgs = process.argv.slice(2);
   const hasExplicitHost = userArgs.some(arg => arg === '--host' || arg.startsWith('--host='));
+  const portArgIndex = userArgs.findIndex(arg => arg === '--port');
+  const inlinePort = userArgs.find(arg => arg.startsWith('--port='));
+  const displayPort = inlinePort ? inlinePort.slice('--port='.length) : (portArgIndex >= 0 ? userArgs[portArgIndex + 1] : '5173');
   const args = hasExplicitHost ? userArgs : ['--host', '127.0.0.1', ...userArgs];
+
+  console.log(SEP);
+  console.log(C.green + C.bold + '  Starting SuperPrint…' + C.reset);
+  console.log(C.dim + '  Open your browser at: http://127.0.0.1:' + displayPort + C.reset);
+  console.log(SEP);
   const child = spawn(process.execPath, [viteBin, ...args], {
     stdio: 'inherit', cwd: APP_DIR
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "superprint",
-  "version": "1.0.70",
+  "version": "1.0.72",
   "description": "SuperPrint by 2.13 — free browser DTP and prepress editor. Use online at https://superprint.cc or run locally with npx.",
   "keywords": [
     "superprint",