@inoku/lepan 0.7.72 → 0.7.73

package/README.md

@@ -97,9 +97,9 @@ The Linux/macOS legacy browser-owner setup uses the built-in AV1 registration en
 
 LifeDrive requires Leither V0.24.11 or newer. Linux/macOS browser-owner setup creates a separate Ed25519 `sodiumv2` identity for the primary browser. Windows prints a private ten-minute invitation for the first paired phone; later users and devices are managed from a paired device.
 
-After successful npm setup, the installer displays the QR code at the end of its output whenever the complete code fits in the terminal. 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.
+After successful npm setup, the installer displays the QR code at the end of its output whenever the terminal is wide enough, regardless of its height. You can scroll vertically. If the terminal is too narrow, 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 small, the output gives the required columns and rows,
+If the terminal is too narrow, the output gives the required number of columns,
 a width marker, and a command to redisplay the code after resizing. Run it on the node
 when connected over SSH. For npm installations, the command has this form:
 
@@ -107,7 +107,7 @@ when connected over SSH. For npm installations, the command has this form:
 npx --yes @inoku/lepan@latest --show-qr '/path/to/lepan-pairing.json'
 ```
 
-Redisplaying shows only the QR and a privacy reminder, or a short size warning
+Redisplaying shows only the QR and a privacy reminder, or a short width warning
 and width marker if it cannot fit. It does not repeat the setup instructions or
 create another image file. Terminal QR codes use a smaller payload and lower
 error correction; the saved PNG keeps medium error correction. The full original
@@ -160,9 +160,9 @@ private and expires in ten minutes; rerun the same command if it expires before
 being claimed. The account service briefly restarts, while Leither keeps running.
 Normal phone-to-phone invitations still require device-manager approval.
 
-First-account pairing prepares the file catalog before opening Files and adds
-`Getting started with LePan.txt` once. The guide can be renamed or deleted and is
-not duplicated when another phone joins. First setup also grants each account
+First-account pairing prepares the file catalog before opening Files. The phone app
+then adds `LePan Guide.md`, and a copy in the phone's language when LePan is translated
+into it. A guide already in Files is not added again. First setup also grants each account
 write access only to its own node staging directory when Leither requires it.
 
 An existing installation is backed up before replacement. The explicit `--upgrade` path requires the saved application and key-auth owner state before changing files, synchronizes the same published application MID, and does not rerun device or domain setup. This release intentionally does not migrate the earlier password-owner prototype. Application files are active only after Leither advances the application from `cur` to `last`; a publication timeout leaves the prior `last` version serving users.

package/USER_MANUAL.md

@@ -147,7 +147,7 @@ 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 small for the QR, resize it to the columns and rows
+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
@@ -158,8 +158,9 @@ For npm installations:
 npx --yes @inoku/lepan@latest --show-qr '/path/to/lepan-pairing.json'
 ```
 
-This command shows only the QR and a privacy reminder. If it cannot fit, it prints
-the required size and a width marker so you can resize and retry. It does not
+This command shows only the QR and a privacy reminder. There is no minimum
+height; scroll vertically as needed. If the terminal is too narrow, it prints
+the required width and a width marker so you can widen it and retry. It does not
 repeat the setup instructions or create another image file. Terminal QR codes use
 a smaller encoding; the saved PNG retains stronger error correction.
 
@@ -181,10 +182,12 @@ Within ten minutes of the invitation being printed:
 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
-drive after its file list is ready. Files contains **Getting started with LePan.txt**,
-a short guide to Files, Backups, connecting other phones, and keeping access to
-your account. It is added once per account; reconnecting a phone does not duplicate
-it, and deleting or renaming it does not cause it to return. You are now the node's first user and its **administrator**, and
+drive after its file list is ready. When a phone first pairs, the app adds **LePan Guide.md**
+to Files, a short guide to the tabs, photo backup, sharing, adding devices and keeping
+the computer on. If LePan is translated into the phone's language (简体中文, 繁體中文 or
+日本語) it adds a copy in that language too. A guide already in Files is not added
+again, so another phone does not duplicate it; one you delete comes back the next
+time a phone pairs. Tap a Markdown file in Files to read it formatted. You are now the node's first user and its **administrator**, and
 this phone is a **device manager**.
 
 You can close the setup screen without pairing to look around the app. Tapping an
@@ -229,7 +232,7 @@ To install a specific release instead of the latest, name it, for example
 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 size and the
+help command. When a QR cannot fit, it shows the required terminal width and the
 `--show-qr` command to run after resizing 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

package/bin/lifedrive.js

@@ -17,12 +17,73 @@ 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"}`;
 
+// Opt-in: print the smaller device QR that only newer LePan apps can read. Older
+// apps accept the full identity QR, so that stays the default. The flag belongs
+// to this wrapper; the shell and PowerShell installers do not know it.
+const compactQr = process.argv.includes("--compact-qr");
+if (compactQr) process.argv = process.argv.filter(argument => argument !== "--compact-qr");
+const qrFlag = compactQr ? " --compact-qr" : "";
+
 function quoteArgument(value) {
   return process.platform === "win32"
     ? `'${value.replace(/'/g, "''")}'`
     : `'${value.replace(/'/g, "'\\''")}'`;
 }
 
+// A device identity's signer_info is a Go-gob certificate of about 770 characters
+// that repeats the device ID and public key, plus constant type metadata. Only the
+// signature and the certificate name are unique, so the compact QR carries those and
+// the app rebuilds the same bytes. buildSignerInfo must stay identical to
+// CompactIdentity in the Android and iOS apps.
+const CERT_PREFIX = Buffer.from("307f030101085369676e496e666f01ff80000102010c426173655369676e496e666f01ff8200010444617461010c0000002eff810301010c426173655369676e496e666f01ff82000101010e426173655369676e496e666f563101ff8400000065ff830301010e426173655369676e496e666f563101ff8400010601095369676e6174757265010a0001085369676e65724944010c00010a5369676e6572496e666f010a0001074b657954797065010c00010756657273696f6e0106000102504b010a000000", "hex");
+const CERT_KEY_PREFIX = Buffer.from("0b0c0008736f6469756d76322f7f0301010f536f6469756d4b657950616972563201ff80000101010d536f6469756d4b65795061697201ff8200000029ff810301010d536f6469756d4b65795061697201ff820001020102536b010a000102506b010a00000027ff80010220", "hex");
+const CERT_BODY_HEAD = Buffer.from("ff8001010140", "hex");
+const CERT_AFTER_ID = Buffer.concat([Buffer.from("0208", "hex"), Buffer.from("sodiumv2"), Buffer.from("0101000001", "hex")]);
+// Go gob unsigned integer: one byte below 128, else a byte-count marker and the
+// big-endian value.
+function gobUint(n) {
+  if (n < 128) return Buffer.from([n]);
+  const bytes = [];
+  for (let v = n; v > 0; v = Math.floor(v / 256)) bytes.unshift(v % 256);
+  return Buffer.from([256 - bytes.length, ...bytes]);
+}
+function buildSignerInfo(signature, uid, publicKey, name) {
+  const keyBlob = Buffer.concat([CERT_KEY_PREFIX, publicKey, Buffer.from([0, 0])]);
+  const certificate = Buffer.from(`CertPK=${keyBlob.toString("base64url")}==;CertPKID=${uid};name=${name};`, "utf8");
+  const body = Buffer.concat([CERT_BODY_HEAD, signature, Buffer.from([1, 27]), Buffer.from(uid, "utf8"),
+    CERT_AFTER_ID, gobUint(certificate.length), certificate, Buffer.from([0])]);
+  return Buffer.concat([CERT_PREFIX, gobUint(body.length), body]).toString("base64");
+}
+function splitSignerInfo(signerInfo, uid, publicKey) {
+  const raw = Buffer.from(signerInfo, "base64");
+  const start = CERT_PREFIX.length + 3;
+  if (raw.length < start + 6 + 64 + 2 + 27) return null;
+  const signature = raw.subarray(start + 6, start + 70);
+  const text = raw.toString("utf8");
+  const found = /;name=([^;]*);\x00$/.exec(text);
+  if (!found) return null;
+  const rebuilt = buildSignerInfo(signature, uid, publicKey, found[1]);
+  return rebuilt === signerInfo ? { signature, name: found[1] } : null;
+}
+
+function compactDeviceQrPayload(pairing) {
+  const seed = Buffer.from(pairing.private_key, "base64url");
+  const publicKey = Buffer.from(pairing.public_key, "base64url");
+  if (seed.length === 64 && publicKey.length === 32 && seed.subarray(32).equals(publicKey)) {
+    const split = splitSignerInfo(pairing.signer_info, pairing.uid, publicKey);
+    if (split) {
+      const compact = {
+        t: "ldq", a: pairing.app_id, n: pairing.node_id, u: pairing.uid, s: seed.subarray(0, 32).toString("base64url"),
+        g: split.signature.toString("base64url"), l: pairing.label, o: pairing.public_username, c: split.name,
+      };
+      seed.fill(0);
+      return JSON.stringify(compact);
+    }
+  }
+  seed.fill(0);
+  return null;
+}
+
 function pairingQrPayload(pairing) {
   const legacy = pairing.type === "lifedrive-device-identity";
   // Preserve every field consumed by the existing mobile importers. The full
@@ -34,6 +95,11 @@ function pairingQrPayload(pairing) {
     "type", "version", "app_id", "node_id", "endpoint", "transport",
     "transport_key", "certificate_sha256", "request_id", "secret",
   ];
+  // A certificate this wrapper cannot rebuild exactly keeps the full identity QR.
+  if (legacy && compactQr) {
+    const compact = compactDeviceQrPayload(pairing);
+    if (compact) return compact;
+  }
   const qr = Object.fromEntries(fields.filter(key => Object.hasOwn(pairing, key)).map(key => [key, pairing[key]]));
   if (legacy && typeof qr.private_key === "string" && typeof qr.public_key === "string") {
     // sodium's 64-byte secret includes a duplicate public key. Both Android and
@@ -113,7 +179,7 @@ async function showPairingCode(resultPath, savedFile = false) {
     : "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 reopenHint = `\nTo show this QR again, run on this computer (on the node for an SSH session):\n  ${pairingCommand} --show-qr ${quoteArgument(identityPath)}${qrFlag}\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
@@ -161,19 +227,17 @@ async function showPairingCode(resultPath, savedFile = false) {
     }
     return;
   }
-  // Only print a terminal QR when the complete code fits. Otherwise, explain
-  // the required size and offer the saved image instead of a wrapped/clipped QR.
+  // Prevent horizontal wrapping; terminal height does not restrict printing.
+  // Users can scroll vertically when the QR is taller than the window.
   const width = modules.size + options.margin * 2;
   const widthMarker = `|${"-".repeat(width - 1)}|`;
-  const height = Math.ceil(width / 2);
   const fitsWidth = process.stdout.isTTY && process.stdout.columns > width;
-  const fitsScreen = fitsWidth && process.stdout.rows >= height + 3;
   // Redisplaying is deliberately quiet and creates no additional files.
   if (savedFile) {
     if (!process.stdout.isTTY) {
       process.stdout.write("Run --show-qr in an interactive terminal.\n");
-    } else if (!fitsScreen) {
-      process.stdout.write(`Terminal too small for the QR code: ${width + 1} columns and ${height + 3} rows needed.\n${widthMarker}\nResize the terminal, then run the same command again.\n`);
+    } else if (!fitsWidth) {
+      process.stdout.write(`Terminal too narrow for the QR code: ${width + 1} columns needed.\n${widthMarker}\nWiden the terminal, then run the same command again.\n`);
     } else {
       process.stdout.write("Keep it private.\n");
       process.stdout.write(expiry);
@@ -181,15 +245,15 @@ async function showPairingCode(resultPath, savedFile = false) {
     }
     return;
   }
-  const imageOpened = !fitsScreen && openPairingImage(imagePath);
+  const imageOpened = !fitsWidth && openPairingImage(imagePath);
   if (compact) {
     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 (!fitsScreen) {
+    if (!fitsWidth) {
       process.stdout.write(process.stdout.isTTY
-        ? `\nThe QR code needs ${width + 1} columns and ${height + 3} rows. Resize this terminal or open the saved image.\n${widthMarker}\nTo display it here, resize and run:\n`
+        ? `\nThe QR code needs ${width + 1} columns. Widen this terminal or open the saved image.\n${widthMarker}\nTo display it here, widen and 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(`\n  ${pairingCommand} --show-qr ${quoteArgument(identityPath)}${qrFlag}\n`);
     }
     process.stdout.write(`\nSaved QR image: ${imagePath}\nPairing file (Choose identity file): ${identityPath}\n`);
     process.stdout.write(expiry);
@@ -199,11 +263,11 @@ async function showPairingCode(resultPath, savedFile = false) {
     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"
-      : fitsScreen ? "Scan the QR code below with your phone.\n"
+      : fitsWidth ? "Scan the QR code below with your phone.\n"
       : process.stdout.isTTY
-        ? `The QR code needs ${width + 1} columns and ${height + 3} rows. Resize this terminal or open the saved image.\n`
+        ? `The QR code needs ${width + 1} columns. Widen this terminal or open the saved 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 (!fitsScreen && process.stdout.isTTY) process.stdout.write(`${widthMarker}\n`);
+    if (!fitsWidth && process.stdout.isTTY) process.stdout.write(`${widthMarker}\n`);
     process.stdout.write(`${privacyNote}\n`);
     process.stdout.write(expiry);
     process.stdout.write(`\nSaved QR image: ${imagePath}\n`);
@@ -216,7 +280,7 @@ async function showPairingCode(resultPath, savedFile = false) {
       process.stdout.write("Redisplaying the QR does not extend the invitation's ten-minute expiry.\n");
     }
   }
-  if (fitsScreen) {
+  if (fitsWidth) {
     printTerminalQr(modules, options.margin);
   }
 }
@@ -297,12 +361,16 @@ async function main() {
   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.
+  --compact-qr    Use the smaller device QR (a much smaller code to scan).
+                  Needs a LePan app version that supports it; add it to an
+                  install, upgrade or --show-qr command.
 
   Example:
     ${pairingCommand} --show-qr '/path/to/lepan-pairing.json'
 
-Run pairing commands on the computer running Leither. If the QR does not fit,
-resize to the printed columns and rows and run --show-qr again.
+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.
+There is no minimum height; scroll vertically as needed.
 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.
 

package/dist/lifedrive-bundle.tar.gz

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/lifedrive-bundle.tar.gz
-size: 44304002 bytes
-sha256: 76ec5e8ea0f34c6a9b45b71765e0a6dbc5fc00e282396f946fccb5e9b83910d3
+size: 44296194 bytes
+sha256: 9dd6f47e4ffcabaae7f4d16b9372db15010252283c003fe576bd4fabb614e5b9

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

@@ -1 +1 @@
-76ec5e8ea0f34c6a9b45b71765e0a6dbc5fc00e282396f946fccb5e9b83910d3  lifedrive-bundle.tar.gz
+9dd6f47e4ffcabaae7f4d16b9372db15010252283c003fe576bd4fabb614e5b9  lifedrive-bundle.tar.gz

package/dist/lifedrive-install.sh

@@ -535,7 +535,7 @@ wait_for_leither() {
   local version="$1" port="$2" previous_pid="${3:-}" attempt response current_pid
   for attempt in {1..30}; do
     current_pid=$(leither_service_pid || true)
-    response=$(curl --noproxy '*' -fsS --max-time 2 "http://127.0.0.1:$port/getvar?name=ver" 2>/dev/null || true)
+    response=$(curl -q --noproxy '*' -fsS --max-time 2 "http://127.0.0.1:$port/getvar?name=ver" 2>/dev/null || true)
     if [[ -z "$previous_pid" || "$current_pid" != "$previous_pid" ]] &&
        leither_service_owns_process &&
        node -e 'try { process.exit(JSON.parse(process.argv[1]).replace(/^V/, "") === process.argv[2] ? 0 : 1); } catch { process.exit(1); }' "$response" "$version"; then
@@ -799,7 +799,10 @@ if [[ -s "$LEITHER_WORKDIR/lifeDrive.owner" && "$(sed -n '1p' "$LEITHER_WORKDIR/
   echo "This key-auth release intentionally requires a fresh LePan owner state." >&2
   exit 1
 fi
-if [[ -s "$LEITHER_WORKDIR/lifeDrive.owner" && -z "$HOUSEHOLD_CONFIG" ]] && (( ! UPGRADE_ONLY && ! MANAGEMENT_ONLY )); then
+# --recover-device reconnects an account of a household that already exists; it creates
+# no owner, so key-auth state left behind from before the node became a household must
+# not stop it (minipc kept its lifeDrive.owner and answered "an initialized LePan exists").
+if [[ -s "$LEITHER_WORKDIR/lifeDrive.owner" && -z "$HOUSEHOLD_CONFIG" && -z "$RECOVER_DEVICE" ]] && (( ! UPGRADE_ONLY && ! MANAGEMENT_ONLY )); then
   echo "LePan installation stopped: an initialized LePan already exists at $LEITHER_WORKDIR." >&2
   echo "Use --upgrade for application files or --add-device for another browser." >&2
   exit 1

package/package.json

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