@inoku/lepan 0.7.69 → 0.7.71

package/README.md

@@ -2,6 +2,17 @@
 
 This public repository contains versioned LifeDrive installation assets built from the private LifeAlbum source repository.
 
+## Version 0.7.70
+
+The account service now serializes login renewal for each user, preventing
+simultaneous requests from overwriting temporary login files. It also discovers
+Leither's current local service port before each request, verifies the node's
+identity before using a changed endpoint, and follows port changes without an
+account-service restart. The existing mobile login protocol and stored data
+formats are unchanged.
+
+Both fixes are included in the packaged service for Linux, macOS and Windows.
+
 For an ordinary Windows or macOS installation, download the matching package from LePan's Cloudflare-backed download URLs:
 
 - **Windows 10/11 or Windows Server (x64):** [LePan-Setup-windows-x64.exe](https://lepan.org/download/LePan-Setup-windows-x64.exe)
@@ -88,6 +99,27 @@ LifeDrive requires Leither V0.24.11 or newer. Linux/macOS browser-owner setup cr
 
 After successful npm setup, the installer displays the QR code at the end of its output whenever the terminal is wide enough. If the whole code cannot fit on screen, it automatically opens the full-size QR image in the computer's image viewer. In the iPhone or Android app, open **Settings → Set up users → Scan QR code** and scan the displayed code. A private `lepan-pairing-<id>.png` is also saved, with its path printed as a fallback for remote sessions or computers without an image viewer. A private `.json` invitation is saved alongside it for apps without a setup scanner: transfer that file to the phone and use **Choose identity file**. These files are saved in the Leither root on Linux/macOS and its private `.lifedrive-household` directory on Windows. Household invitations expire ten minutes after creation; legacy identity codes contain a device private key, so keep them private and delete the transfer copies after pairing. Legacy `--add-device` and `--upgrade` also produce a code when an identity is available; household upgrades preserve existing pairings without issuing new invitations.
 
+If the terminal is too narrow, the output gives the required width and an exact
+command to redisplay the saved code after widening the window. Run it on the node
+when connected over SSH. For npm installations, the command has this form:
+
+```bash
+npx --yes @inoku/lepan@latest --show-qr '/path/to/lepan-pairing.json'
+```
+
+This displays the saved code without installing, upgrading, or changing device
+authorization. Desktop packages print a command using their private Node runtime.
+Redisplaying an invitation does **not** reset its ten-minute expiry; output shows
+its expiry in UTC and how to renew it. A legacy `lifedrive-device-identity` file
+is a persistent device key and has no ten-minute expiry; it remains usable while
+authorized. Keep its original safe and offline, and delete transfer copies after
+pairing. Upgrades keep the output brief: the existing identity path or saved-pairing
+directory, the QR and file paths when available, and a help command. If the QR
+cannot fit, the output gives the required width and the command to redisplay it.
+Use `--help` for expiry, file import, and account reconnection instructions.
+Initial setup's local browser links are labeled with the node's detected LAN
+interfaces; these are node addresses, not router or gateway addresses.
+
 ### Renew an expired first-phone invitation
 
 Run this again **on the computer running Leither**:

package/USER_MANUAL.md

@@ -147,13 +147,32 @@ This keeps what step 2.1 installed and adds users and phones:
 The setup invitation is what makes a phone the first user of this node. Treat it
 like a key: do not post it, email it to others, or paste it anywhere public.
 
+If the terminal is too narrow for the QR, widen it to the number of columns
+printed by setup, then run the printed `--show-qr` command. Over SSH, run the
+command on the node in that same terminal. It displays the saved code without
+installing or upgrading again. You can also open the saved PNG image or transfer
+the saved JSON privately to your phone and use **Choose identity file**.
+For npm installations:
+
+```bash
+npx --yes @inoku/lepan@latest --show-qr '/path/to/lepan-pairing.json'
+```
+
+The Windows and macOS desktop installers print an equivalent command using their
+bundled runtime. Redisplaying a code does not renew it: setup and reconnect
+invitations expire ten minutes after creation. The output shows the expiry in
+UTC. Older browser-owner installations use a `lifedrive-device-identity` file
+containing a persistent device private key; that identity has no ten-minute
+expiry and remains usable while authorized. Keep its original safe and offline;
+delete transfer copies after pairing.
+
 ### 2.3 Create the first user from your phone
 
 Within ten minutes of the invitation being printed:
 
-1. Scan the installer’s final QR code or the QR image that opens automatically. The saved image path is a fallback for remote sessions or computers without an image viewer. If you used the standalone shell installer, copy the whole invitation block instead.
+1. Leave the installer’s final QR code or the QR image that opens automatically visible on the computer. The saved image path is a fallback for remote sessions or computers without an image viewer. If you used the standalone shell installer, copy the whole invitation block instead.
 2. Open LifeDrive on the phone. The **Set up your LifeDrive** screen opens by itself (or open **Settings → Set up users**).
-3. Enter **Your name** and a name for this device.
+3. Review **Your name** and the name for this device. Android fills in **Owner** and the phone model; you can change either.
 4. Tap **Scan QR code** and point the phone at the terminal or saved image. You can also use **Paste node identity** or **Choose identity file**.
 
 The phone creates its own device key, claims the node, and opens your personal
@@ -204,6 +223,14 @@ To install a specific release instead of the latest, name it, for example
 `npx --yes @inoku/lepan@0.7.35 --upgrade`. Release versions are never reused,
 so a version number always means the same files.
 
+Upgrade output shows the existing identity path or saved-pairing directory and a
+help command. When a QR cannot fit, it shows the required terminal width and the
+`--show-qr` command to run after widening the window. Use `--help` for file import,
+identity expiry, and device-management instructions. Household
+upgrades preserve paired phones and do not issue or renew an invitation; to
+reconnect to an existing household account, run `--recover-device` with its name
+or user ID on the node. For another device, use **My devices** on a paired phone.
+
 The installer saves the previous application files to a backup directory, prints
 where, and then:
 

package/bin/lifedrive.js

@@ -11,6 +11,17 @@ const { pathToFileURL } = require("node:url");
 const distributionDirectory = path.resolve(__dirname, "..", "dist");
 const bundlePath = path.join(distributionDirectory, "lifedrive-bundle.tar.gz");
 const checksumPath = `${bundlePath}.sha256`;
+const packageVersion = require("../package.json").version;
+// Desktop installers carry Node privately; their users need not have npx.
+const pairingCommand = path.basename(path.resolve(__dirname, "..")) === "package"
+  ? `${process.platform === "win32" ? "& " : ""}${quoteArgument(process.execPath)} ${quoteArgument(__filename)}`
+  : `npx --yes @inoku/lepan@${/^\d+\.\d+\.\d+$/.test(packageVersion) ? packageVersion : "latest"}`;
+
+function quoteArgument(value) {
+  return process.platform === "win32"
+    ? `'${value.replace(/'/g, "''")}'`
+    : `'${value.replace(/'/g, "'\\''")}'`;
+}
 
 function openPairingImage(imagePath) {
   // A remote server must not open a window in another user's desktop session.
@@ -37,15 +48,16 @@ function openPairingImage(imagePath) {
   return !result.error && result.status === 0;
 }
 
-async function showPairingCode(resultPath) {
+async function showPairingCode(resultPath, savedFile = false) {
   if (!fs.existsSync(resultPath)) return;
+  const compact = savedFile || (process.argv.includes("--upgrade") && !process.argv.includes("--household"));
   // The child writes this only after setup succeeds. Never scrape its output:
   // it can contain node keys as well as the mobile device's pairing identity.
   const pairing = JSON.parse(fs.readFileSync(resultPath, "utf8"));
   if (pairing.version !== 1 || !["lifedrive-device-identity", "lifedrive-node-setup", "lifedrive-user-identity"].includes(pairing.type)) {
     throw new Error("Unsupported pairing data");
   }
-  const directory = fs.readFileSync(`${resultPath}.directory`, "utf8");
+  const directory = savedFile ? path.dirname(resultPath) : fs.readFileSync(`${resultPath}.directory`, "utf8");
   if (!path.isAbsolute(directory)) throw new Error("Invalid pairing image directory");
   const payload = JSON.stringify(pairing);
   // Only encode fields consumed by the existing Android and iOS setup parsers.
@@ -60,17 +72,26 @@ async function showPairingCode(resultPath) {
     : payload;
   const basename = path.join(directory, `lepan-pairing-${randomUUID()}`);
   const imagePath = `${basename}.png`;
-  const identityPath = `${basename}.json`;
+  const identityPath = savedFile ? resultPath : `${basename}.json`;
   // Older mobile releases support importing this file but have no setup scanner.
   // Keep a private copy even when QR generation succeeds.
-  fs.writeFileSync(identityPath, payload, { flag: "wx", mode: 0o600 });
+  if (!savedFile) fs.writeFileSync(identityPath, payload, { flag: "wx", mode: 0o600 });
   const options = { errorCorrectionLevel: "M", margin: 4, scale: 8 };
   const privacyNote = pairing.type !== "lifedrive-device-identity"
     ? "Keep it private. This invitation expires ten minutes after creation."
-    : "This contains your device private key. Keep it private and delete it after pairing.";
+    : "This is a persistent device identity; it does not expire after ten minutes. It remains usable while the device is authorized.\nIt contains your device private key. Keep the original safe and offline; delete transfer copies after pairing.";
+  const expiry = pairing.type !== "lifedrive-device-identity" && Number.isFinite(pairing.expires)
+    ? `\nInvitation expiry: ${new Date(pairing.expires * 1000).toISOString()} (UTC).\n${pairing.expires <= Date.now() / 1000 ? "This invitation has expired. Create a fresh invitation before pairing.\n" : ""}` : "";
+  const reopenHint = `\nTo show this QR again, run on this computer (on the node for an SSH session):\n  ${pairingCommand} --show-qr ${quoteArgument(identityPath)}\nThis only displays the saved pairing code; it does not install or upgrade LePan.\n`;
+  const nodeRoot = process.platform === "win32" && path.basename(directory) === ".lifedrive-household"
+    ? path.dirname(directory) : directory;
+  // A saved file may have been moved off the node. Its new parent is not proof
+  // of the original Leither root; let node discovery choose in that case.
+  const renewalRoot = savedFile ? "" : ` --leither-root ${quoteArgument(nodeRoot)}`;
   const renewalHint = pairing.type === "lifedrive-node-setup"
-    ? "\nInvitation expired? Run this again on the node:\n  npx --yes @inoku/lepan@latest --household\n"
-    : pairing.type === "lifedrive-user-identity" ? "\nInvitation expired? Run the same reconnect command again on this computer.\n" : "";
+    ? `\nInvitation expired? Run this again on the node before the first owner is created:\n  ${pairingCommand}${renewalRoot} --household\n`
+    : pairing.type === "lifedrive-user-identity"
+      ? `\nInvitation expired? Run the same reconnect command again on the node${pairing.user_id ? `:\n  ${pairingCommand}${renewalRoot} --recover-device ${quoteArgument(pairing.user_id)}` : "."}\n` : "";
   let modules;
   try {
     const QRCode = require("qrcode");
@@ -82,11 +103,22 @@ async function showPairingCode(resultPath) {
   } catch {
     // The child no longer prints secrets. Preserve an importable fallback
     // before runInstaller removes the temporary handoff directory.
+    if (compact) {
+      process.stderr.write(`\nThe QR code could not be created. In LePan, open Settings > Set up users > Choose identity file.\nPairing file: ${identityPath}\nKeep it private.\n`);
+      process.stderr.write(expiry);
+      process.stderr.write(`\nHelp:\n  ${pairingCommand} --help\n`);
+      return;
+    }
     process.stderr.write("\nNext: pair your phone\n\nThe QR code could not be created. Use the saved pairing file instead.\n");
     process.stderr.write(`  ${identityPath}\n\n`);
     process.stderr.write("Transfer this file to your phone, then select it in LePan > Settings > Set up users > Choose identity file.\n");
     process.stderr.write(`${privacyNote}\n`);
+    process.stderr.write(expiry);
+    process.stderr.write(reopenHint);
     process.stderr.write(renewalHint);
+    if (pairing.type !== "lifedrive-device-identity") {
+      process.stderr.write("Redisplaying the QR does not extend the invitation's ten-minute expiry.\n");
+    }
     return;
   }
   // Never hide a terminal code just because the window is short. Open the PNG
@@ -97,17 +129,43 @@ async function showPairingCode(resultPath) {
   const fitsWidth = process.stdout.isTTY && process.stdout.columns > width;
   const fitsScreen = fitsWidth && process.stdout.rows >= height + 3;
   const imageOpened = !fitsScreen && openPairingImage(imagePath);
-  process.stdout.write("\nPair your phone\n\n");
-  process.stdout.write("Open LePan > Settings > Set up users > Scan QR code.\n");
-  process.stdout.write(imageOpened
-    ? "The QR image has opened automatically. Scan it with your phone.\n"
-    : fitsWidth ? "Scan the QR code below with your phone.\n"
-    : "This terminal is too narrow for the QR code and no image viewer could be opened. Open the saved image below.\n");
-  process.stdout.write(`${privacyNote}\n`);
-  process.stdout.write(`\nSaved QR image: ${imagePath}\n`);
-  process.stdout.write(`Pairing file (Choose identity file): ${identityPath}\n`);
-  process.stdout.write("Keep this computer on and connected while using LePan.\n");
-  process.stdout.write(renewalHint);
+  if (compact) {
+    if (savedFile) process.stdout.write(`\nIdentity file: ${identityPath}\nKeep it private.\n`);
+    process.stdout.write("\nHow to pair your phone:\nOpen LePan > Settings > Set up users > Scan QR code.\n");
+    if (imageOpened) process.stdout.write("\nThe QR image has opened automatically.\n");
+    if (!fitsWidth) {
+      process.stdout.write(process.stdout.isTTY
+        ? `\nThis terminal is too narrow for the QR code. To display it here, widen the terminal\nto at least ${width + 1} columns, then run:\n`
+        : "\nTo display the QR code, run in an interactive terminal:\n");
+      process.stdout.write(`\n  ${pairingCommand} --show-qr ${quoteArgument(identityPath)}\n`);
+    }
+    process.stdout.write(`\nSaved QR image: ${imagePath}\nPairing file (Choose identity file): ${identityPath}\n`);
+    process.stdout.write(expiry);
+    process.stdout.write(`\nHelp:\n  ${pairingCommand} --help\n`);
+  } else {
+    process.stdout.write("\nPair your phone\n\n");
+    process.stdout.write("Open LePan > Settings > Set up users > Scan QR code.\n");
+    process.stdout.write(imageOpened
+      ? "The QR image has opened automatically. Scan it with your phone.\n"
+      : fitsWidth ? "Scan the QR code below with your phone.\n"
+      : process.stdout.isTTY
+        ? "This terminal is too narrow for the QR code. You can open the saved QR image.\n"
+        : "A QR code cannot be displayed in this output. Run the --show-qr command below in an interactive terminal, or open the saved QR image.\n");
+    if (!fitsWidth && process.stdout.isTTY) {
+      process.stdout.write(`To display it here, widen the terminal to at least ${width + 1} columns,\nthen run the --show-qr command below.\n`);
+    }
+    process.stdout.write(`${privacyNote}\n`);
+    process.stdout.write(expiry);
+    process.stdout.write(`\nSaved QR image: ${imagePath}\n`);
+    process.stdout.write(`Pairing file (Choose identity file): ${identityPath}\n`);
+    process.stdout.write("To import the file, transfer it privately to your phone, then open\nLePan > Settings > Set up users > Choose identity file.\n");
+    process.stdout.write(reopenHint);
+    process.stdout.write("Keep this computer on and connected while using LePan.\n");
+    process.stdout.write(renewalHint);
+    if (pairing.type !== "lifedrive-device-identity") {
+      process.stdout.write("Redisplaying the QR does not extend the invitation's ten-minute expiry.\n");
+    }
+  }
   if (fitsWidth) {
     process.stdout.write("\n");
     // Explicit colors and a four-module quiet zone work on light/dark themes.
@@ -130,7 +188,7 @@ async function runInstaller(command, args) {
   try {
     const result = spawnSync(command, args, {
       stdio: "inherit",
-      env: { ...process.env, LIFEDRIVE_PAIRING_RESULT: resultPath },
+      env: { ...process.env, LIFEDRIVE_PAIRING_RESULT: resultPath, LIFEDRIVE_PAIRING_COMMAND: pairingCommand },
     });
     if (result.error) throw result.error;
     if (typeof result.status === "number") process.exitCode = result.status;
@@ -142,6 +200,7 @@ async function runInstaller(command, args) {
       catch {
         // Parser errors may contain identity text; never print them.
         process.stderr.write("\nPhone pairing could not be prepared. Use your existing identity file, or create a new setup invitation from the node.\n");
+        process.stderr.write(`\nHelp:\n  ${pairingCommand} --help\n`);
       }
     }
   } finally {
@@ -182,6 +241,43 @@ function windowsArguments(values) {
 }
 
 async function main() {
+  const argumentsList = process.argv.slice(2);
+  if (argumentsList.some(argument => argument === "--show-qr" || argument.startsWith("--show-qr="))) {
+    const file = argumentsList[0] === "--show-qr" && argumentsList.length === 2
+      ? argumentsList[1]
+      : argumentsList.length === 1 && argumentsList[0].startsWith("--show-qr=")
+        ? argumentsList[0].slice("--show-qr=".length) : "";
+    if (!file || file.startsWith("--")) throw new Error("Use --show-qr FILE by itself to display a saved identity or invitation.");
+    const identityPath = path.resolve(file);
+    if (!fs.existsSync(identityPath)) throw new Error("The saved identity or invitation file was not found. Use the path printed during setup or upgrade.");
+    // JSON parse failures can contain private identity data. Keep them off stderr.
+    try { await showPairingCode(identityPath, true); }
+    catch { throw new Error("Could not display the pairing file. Choose a readable LePan identity or invitation JSON file."); }
+    return;
+  }
+  if (argumentsList.includes("--help") || argumentsList.includes("-h")) {
+    process.stdout.write(`Pairing help:
+  --show-qr FILE  Display a saved identity or invitation as a QR code.
+
+  Example:
+    ${pairingCommand} --show-qr '/path/to/lepan-pairing.json'
+
+Run pairing commands on the computer running Leither. If the terminal is too
+narrow, widen it to the printed number of columns and run --show-qr again.
+You can also open the saved PNG, or transfer the JSON privately to your phone
+and use LePan > Settings > Set up users > Choose identity file.
+
+Device identity files contain persistent private keys and have no ten-minute
+expiry. Keep the original safe and offline; delete transfer copies after pairing.
+Setup and reconnect invitations expire ten minutes after creation. Showing the
+QR again does not renew them. Use --household to renew an unclaimed first-owner
+invitation, or --recover-device ACCOUNT to reconnect an existing account.
+For another household device, use Settings > My devices on a paired phone.
+If a saved identity file is missing, restore your private backup or use the
+device-management options below.
+
+`);
+  }
   if (process.platform === "win32") {
     const installerPath = path.join(distributionDirectory, "lifedrive-install.ps1");
     if (![installerPath, bundlePath, checksumPath].every(candidate => fs.existsSync(candidate))) {

package/dist/lifedrive-bundle.tar.gz

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/lifedrive-bundle.tar.gz
-size: 44204388 bytes
-sha256: b1d6c652dbda51b836a30778abb722774fd28559373cee7efe2670991d7297b7
+size: 44302951 bytes
+sha256: 093f14e7fe7816a667e81c2ae300a2b0c1b0c6577e81b7eb83eac6a1d38f6b16

package/dist/lifedrive-bundle.tar.gz.sha256

@@ -1 +1 @@
-b1d6c652dbda51b836a30778abb722774fd28559373cee7efe2670991d7297b7  lifedrive-bundle.tar.gz
+093f14e7fe7816a667e81c2ae300a2b0c1b0c6577e81b7eb83eac6a1d38f6b16  lifedrive-bundle.tar.gz

package/dist/lifedrive-install.ps1

@@ -472,6 +472,11 @@ if ($Upgrade) {
         throw
     }
     Write-Host "LePan Windows upgrade complete. Leither was not restarted."
+    $pairingLauncher = if ($env:LIFEDRIVE_PAIRING_COMMAND) { $env:LIFEDRIVE_PAIRING_COMMAND } else { "npx --yes @inoku/lepan@latest" }
+    Write-Host "Saved pairing files, if retained: $root\.lifedrive-household\lepan-pairing-*.json (with matching .png images)."
+    Write-Host ""
+    Write-Host "Help:"
+    Write-Host "  $pairingLauncher --help"
     return
 }
 try {

package/dist/lifedrive-install.sh

@@ -32,15 +32,24 @@ Installer options:
   --household              Set up household users or renew an unclaimed setup invitation.
   --recover-device USER    Reconnect a phone to an existing account, using its name or user ID.
   --household-config FILE   Install mobile-led household setup using a private service configuration.
+  --add-device LABEL        Create a separate device identity (legacy browser-owner setup, Linux/macOS).
 
 Setup options are forwarded to lifeDrive-setup.sh. Common examples:
   --registry-url URL
   --publisher-key FILE
-  --add-device LABEL
   --identity-out FILE
   --list-devices
   --revoke-device UID
   --skip-domain
+
+Create an identity for another phone or browser:
+  npx --yes @inoku/lepan@latest --add-device "My iPhone"
+
+LABEL is a name you choose to recognize the device, such as "My iPhone".
+Each device gets its own key and can be revoked independently. The npm installer
+displays the new identity's QR code and file path for pairing.
+Run this command on the computer running Leither.
+For household accounts, invite another device from Settings > My devices on a paired phone.
 EOF
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inoku/lepan",
-  "version": "0.7.69",
+  "version": "0.7.71",
   "description": "Install LePan and its Leither runtime on Linux, macOS, or Windows",
   "os": [
     "linux",