opsidian 0.1.0 → 0.1.1

package/dist/opsidian.mjs

@@ -8059,7 +8059,7 @@ var require_thread_stream = __commonJS({
     var { version } = require_package();
     var { EventEmitter } = __require("events");
     var { Worker } = __require("worker_threads");
-    var { join: join4 } = __require("path");
+    var { join: join5 } = __require("path");
     var { pathToFileURL } = __require("url");
     var { wait } = require_wait();
     var {
@@ -8110,7 +8110,7 @@ var require_thread_stream = __commonJS({
     function createWorker(stream, opts) {
       const { filename, workerData } = opts;
       const bundlerOverrides = "__bundlerPathsOverrides" in globalThis ? globalThis.__bundlerPathsOverrides : {};
-      const toExecute = bundlerOverrides["thread-stream-worker"] || join4(__dirname, "lib", "worker.js");
+      const toExecute = bundlerOverrides["thread-stream-worker"] || join5(__dirname, "lib", "worker.js");
       const worker = new Worker(toExecute, {
         ...opts.workerOpts,
         name: opts.workerOpts?.name || "thread-stream",
@@ -8578,7 +8578,7 @@ var require_transport = __commonJS({
     var { createRequire } = __require("module");
     var { existsSync: existsSync4 } = __require("node:fs");
     var getCallers = require_caller();
-    var { join: join4, isAbsolute, sep } = __require("node:path");
+    var { join: join5, isAbsolute, sep } = __require("node:path");
     var { fileURLToPath: fileURLToPath2 } = __require("node:url");
     var sleep = require_atomic_sleep();
     var onExit = require_on_exit_leak_free();
@@ -8733,7 +8733,7 @@ var require_transport = __commonJS({
         throw new Error("only one of target or targets can be specified");
       }
       if (targets) {
-        target = bundlerOverrides["pino-worker"] || join4(__dirname, "worker.js");
+        target = bundlerOverrides["pino-worker"] || join5(__dirname, "worker.js");
         options.targets = targets.filter((dest) => dest.target).map((dest) => {
           return {
             ...dest,
@@ -8754,7 +8754,7 @@ var require_transport = __commonJS({
         const pipelinesHaveLevel = options.pipelines.some((p) => p.some((t) => t.level != null));
         usesMultistream = options.targets.length + options.pipelines.length > 1 || targetsHaveLevel || pipelinesHaveLevel;
       } else if (pipeline) {
-        target = bundlerOverrides["pino-worker"] || join4(__dirname, "worker.js");
+        target = bundlerOverrides["pino-worker"] || join5(__dirname, "worker.js");
         options.pipelines = [pipeline.map((dest) => {
           return {
             ...dest,
@@ -8781,7 +8781,7 @@ var require_transport = __commonJS({
           return origin;
         }
         if (origin === "pino/file") {
-          return join4(__dirname, "..", "file.js");
+          return join5(__dirname, "..", "file.js");
         }
         let fixTarget2;
         for (const filePath of callers) {
@@ -9761,7 +9761,7 @@ var require_safe_stable_stringify = __commonJS({
               return circularValue;
             }
             let res = "";
-            let join4 = ",";
+            let join5 = ",";
             const originalIndentation = indentation;
             if (Array.isArray(value)) {
               if (value.length === 0) {
@@ -9775,7 +9775,7 @@ var require_safe_stable_stringify = __commonJS({
                 indentation += spacer;
                 res += `
 ${indentation}`;
-                join4 = `,
+                join5 = `,
 ${indentation}`;
               }
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -9783,13 +9783,13 @@ ${indentation}`;
               for (; i < maximumValuesToStringify - 1; i++) {
                 const tmp2 = stringifyFnReplacer(String(i), value, stack, replacer, spacer, indentation);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join4;
+                res += join5;
               }
               const tmp = stringifyFnReplacer(String(i), value, stack, replacer, spacer, indentation);
               res += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res += `${join4}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join5}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -9810,7 +9810,7 @@ ${originalIndentation}`;
             let separator = "";
             if (spacer !== "") {
               indentation += spacer;
-              join4 = `,
+              join5 = `,
 ${indentation}`;
               whitespace = " ";
             }
@@ -9824,13 +9824,13 @@ ${indentation}`;
               const tmp = stringifyFnReplacer(key2, value, stack, replacer, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key2)}:${whitespace}${tmp}`;
-                separator = join4;
+                separator = join5;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...":${whitespace}"${getItemCount(removedKeys)} not stringified"`;
-              separator = join4;
+              separator = join5;
             }
             if (spacer !== "" && separator.length > 1) {
               res = `
@@ -9871,7 +9871,7 @@ ${originalIndentation}`;
             }
             const originalIndentation = indentation;
             let res = "";
-            let join4 = ",";
+            let join5 = ",";
             if (Array.isArray(value)) {
               if (value.length === 0) {
                 return "[]";
@@ -9884,7 +9884,7 @@ ${originalIndentation}`;
                 indentation += spacer;
                 res += `
 ${indentation}`;
-                join4 = `,
+                join5 = `,
 ${indentation}`;
               }
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
@@ -9892,13 +9892,13 @@ ${indentation}`;
               for (; i < maximumValuesToStringify - 1; i++) {
                 const tmp2 = stringifyArrayReplacer(String(i), value[i], stack, replacer, spacer, indentation);
                 res += tmp2 !== void 0 ? tmp2 : "null";
-                res += join4;
+                res += join5;
               }
               const tmp = stringifyArrayReplacer(String(i), value[i], stack, replacer, spacer, indentation);
               res += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res += `${join4}"... ${getItemCount(removedKeys)} not stringified"`;
+                res += `${join5}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               if (spacer !== "") {
                 res += `
@@ -9911,7 +9911,7 @@ ${originalIndentation}`;
             let whitespace = "";
             if (spacer !== "") {
               indentation += spacer;
-              join4 = `,
+              join5 = `,
 ${indentation}`;
               whitespace = " ";
             }
@@ -9920,7 +9920,7 @@ ${indentation}`;
               const tmp = stringifyArrayReplacer(key2, value[key2], stack, replacer, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key2)}:${whitespace}${tmp}`;
-                separator = join4;
+                separator = join5;
               }
             }
             if (spacer !== "" && separator.length > 1) {
@@ -9978,20 +9978,20 @@ ${originalIndentation}`;
               indentation += spacer;
               let res2 = `
 ${indentation}`;
-              const join5 = `,
+              const join6 = `,
 ${indentation}`;
               const maximumValuesToStringify = Math.min(value.length, maximumBreadth);
               let i = 0;
               for (; i < maximumValuesToStringify - 1; i++) {
                 const tmp2 = stringifyIndent(String(i), value[i], stack, spacer, indentation);
                 res2 += tmp2 !== void 0 ? tmp2 : "null";
-                res2 += join5;
+                res2 += join6;
               }
               const tmp = stringifyIndent(String(i), value[i], stack, spacer, indentation);
               res2 += tmp !== void 0 ? tmp : "null";
               if (value.length - 1 > maximumBreadth) {
                 const removedKeys = value.length - maximumBreadth - 1;
-                res2 += `${join5}"... ${getItemCount(removedKeys)} not stringified"`;
+                res2 += `${join6}"... ${getItemCount(removedKeys)} not stringified"`;
               }
               res2 += `
 ${originalIndentation}`;
@@ -10007,16 +10007,16 @@ ${originalIndentation}`;
               return '"[Object]"';
             }
             indentation += spacer;
-            const join4 = `,
+            const join5 = `,
 ${indentation}`;
             let res = "";
             let separator = "";
             let maximumPropertiesToStringify = Math.min(keyLength, maximumBreadth);
             if (isTypedArrayWithEntries(value)) {
-              res += stringifyTypedArray(value, join4, maximumBreadth);
+              res += stringifyTypedArray(value, join5, maximumBreadth);
               keys = keys.slice(value.length);
               maximumPropertiesToStringify -= value.length;
-              separator = join4;
+              separator = join5;
             }
             if (deterministic) {
               keys = sort(keys, comparator);
@@ -10027,13 +10027,13 @@ ${indentation}`;
               const tmp = stringifyIndent(key2, value[key2], stack, spacer, indentation);
               if (tmp !== void 0) {
                 res += `${separator}${strEscape(key2)}: ${tmp}`;
-                separator = join4;
+                separator = join5;
               }
             }
             if (keyLength > maximumBreadth) {
               const removedKeys = keyLength - maximumBreadth;
               res += `${separator}"...": "${getItemCount(removedKeys)} not stringified"`;
-              separator = join4;
+              separator = join5;
             }
             if (separator !== "") {
               res = `
@@ -38284,7 +38284,7 @@ ${body}`);
 import { spawn } from "node:child_process";
 import { existsSync as existsSync3 } from "node:fs";
 import { copyFile as copyFile2, mkdir as mkdir4, readFile as readFile3, rm as rm3 } from "node:fs/promises";
-import { dirname as dirname3, resolve } from "node:path";
+import { dirname as dirname3, join as join4, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // src/host.ts
@@ -40460,6 +40460,20 @@ function place(home = process.env.OPSIDIAN_HOME || join2(homedir(), ".opsidian")
   };
 }
 var DEFAULT_PORT = 4810;
+var BOOLEAN = /* @__PURE__ */ new Set(["follow", "f", "delete-data", "help", "h", "version", "v"]);
+function parseArgs(argv) {
+  const flags2 = /* @__PURE__ */ new Map();
+  const words2 = [];
+  for (let position = 0; position < argv.length; position++) {
+    const word = argv[position];
+    const match = word.match(/^--?([a-z][a-z-]*)(?:=(.*))?$/);
+    if (!match) words2.push(word);
+    else if (match[2] !== void 0) flags2.set(match[1], match[2]);
+    else if (BOOLEAN.has(match[1])) flags2.set(match[1], "");
+    else flags2.set(match[1], argv[++position] ?? "");
+  }
+  return { flags: flags2, words: words2 };
+}
 async function readConfig(where2) {
   try {
     return JSON.parse(await readFile2(where2.config, "utf8"));
@@ -40605,8 +40619,16 @@ var Launchd = class {
     await writeFile3(this.file, launchdPlist(this.where));
     await run("launchctl", ["bootout", `${this.target}/${LABEL}`]).catch(() => {
     });
+    for (let tries = 0; tries < 50 && await this.loaded(); tries++)
+      await new Promise((done) => setTimeout(done, 100));
     await run("launchctl", ["bootstrap", this.target, this.file]);
   }
+  async loaded() {
+    return run("launchctl", ["print", `${this.target}/${LABEL}`]).then(
+      () => true,
+      () => false
+    );
+  }
   async remove() {
     await run("launchctl", ["bootout", `${this.target}/${LABEL}`]).catch(() => {
     });
@@ -40689,24 +40711,27 @@ function service(where2) {
 }
 
 // src/cli.ts
-var VERSION = "0.1.0";
+var VERSION = "0.1.1";
 var me = process.env.npm_lifecycle_event === "start" ? "pnpm" : process.env.npm_command === "exec" ? "npx opsidian" : "opsidian";
-var BOOLEAN = /* @__PURE__ */ new Set(["follow", "f", "delete-data", "help", "h", "version", "v"]);
-var flags = /* @__PURE__ */ new Map();
-var words = [];
-var argv = process.argv.slice(2);
-for (let position = 0; position < argv.length; position++) {
-  const word = argv[position];
-  const flag = word.match(/^--?([a-z-]+)$/)?.[1];
-  if (!flag) words.push(word);
-  else if (BOOLEAN.has(flag)) flags.set(flag, "");
-  else flags.set(flag, argv[++position] ?? "");
-}
+var { flags, words } = parseArgs(process.argv.slice(2));
 var where = place();
 var when = (time) => new Date(time).toLocaleString();
 var fail = (text) => {
   throw new Error(text);
 };
+var whole = (name, fallback, low, high) => {
+  const given = flags.get(name);
+  if (given === void 0) return fallback;
+  const value = Number(given);
+  if (!Number.isInteger(value) || value < low || value > high)
+    fail(`--${name} takes a whole number from ${low} to ${high}.`);
+  return value;
+};
+var backupFrom = (folder, before) => ({
+  folder: resolve(folder),
+  keep: whole("keep", before?.keep ?? 14, 1, 1e3),
+  hour: whole("hour", before?.hour ?? 3, 0, 23)
+});
 var HELP = `Opsidian ${VERSION}: a host for your notebooks, so every device syncs through it.
 
   ${me} host start            Run the host in the background, now and after restarts
@@ -40753,10 +40778,14 @@ async function withHost(work) {
 }
 async function deviceAddress() {
   if (process.env.OPSIDIAN_ADDRESS) return process.env.OPSIDIAN_ADDRESS;
+  if (existsSync3("/.dockerenv"))
+    fail(
+      "Inside Docker the host cannot see the address devices reach it at.\nRun the container with -e OPSIDIAN_ADDRESS=100.x.y.z:4810 (the server\u2019s Tailscale address)."
+    );
   const config = await readConfig(where);
   return reachableAt({
     address: flags.get("address") ?? config?.address ?? "0.0.0.0",
-    port: Number(flags.get("port") ?? config?.port ?? DEFAULT_PORT)
+    port: whole("port", config?.port ?? DEFAULT_PORT, 1, 65535)
   });
 }
 async function lastLines(count) {
@@ -40771,17 +40800,19 @@ function backupLine(config) {
 async function start() {
   const manager = needService();
   const before = await readConfig(where);
-  const port = Number(flags.get("port") ?? before?.port ?? DEFAULT_PORT);
-  if (!Number.isInteger(port) || port < 1 || port > 65535) fail("--port takes a number.");
+  const port = whole("port", before?.port ?? DEFAULT_PORT, 1, 65535);
   let address = flags.get("address");
+  let manual = address !== void 0 || before?.manual === true;
   let note;
   if (address === "all") {
     address = "0.0.0.0";
     note = "The host listens on every address. It has no sign-in of its own: make sure a firewall keeps it off the open internet.";
   } else if (!address) {
     const found = addresses();
-    if (before && found.some((each) => each.ip === before.address)) address = before.address;
+    if (manual && before && (before.address === "0.0.0.0" || found.some((each) => each.ip === before.address)))
+      address = before.address;
     else {
+      manual = false;
       const chosen = chooseAddress(found, process.platform);
       if ("error" in chosen) return fail(chosen.error);
       address = chosen.ip;
@@ -40789,15 +40820,18 @@ async function start() {
     }
   }
   const config = { ...before, port, address };
+  if (manual) config.manual = true;
+  else delete config.manual;
   const folder = flags.get("backup");
-  if (folder)
-    config.backup = {
-      folder: resolve(folder),
-      keep: Number(flags.get("keep") ?? before?.backup?.keep ?? 14),
-      hour: Number(flags.get("hour") ?? before?.backup?.hour ?? 3)
-    };
+  if (folder) config.backup = backupFrom(folder, before?.backup);
+  else if (flags.has("keep") || flags.has("hour"))
+    config.backup = backupFrom(
+      before?.backup?.folder ?? fail("--keep and --hour go with --backup FOLDER."),
+      before?.backup
+    );
   const reach = reachableAt(config);
-  if (!(await manager.state()).running && await answers(reach))
+  const moving = !(await manager.state()).running || before?.port !== port || before.address !== address;
+  if (moving && await answers(reach))
     fail(
       `Another Opsidian host is already using port ${port} here, perhaps the Opsidian app.
 Turn hosting off there, or start this one with --port ${port + 1}.`
@@ -40900,11 +40934,7 @@ async function backup() {
   }
   let target = config?.backup;
   if (what !== "now") {
-    target = {
-      folder: resolve(what),
-      keep: Number(flags.get("keep") ?? target?.keep ?? 14),
-      hour: Number(flags.get("hour") ?? target?.hour ?? 3)
-    };
+    target = backupFrom(what, target);
     if (config) {
       await writeConfig(where, { ...config, backup: target });
       console.log(`Backing up: ${backupLine({ ...config, backup: target })}.`);
@@ -40918,25 +40948,32 @@ async function restore() {
   const config = await readConfig(where);
   const name = words.at(-1);
   const folder = words.length > 1 ? resolve(words[0]) : config?.backup?.folder;
-  if (!name || !folder) fail(`Say which: ${me} host restore BACKUP, or restore FOLDER BACKUP`);
-  const manager = service(where);
-  const running = !("missing" in manager) && (await manager.state()).running;
-  if (running) await manager.remove();
+  if (!name || !folder)
+    return fail(`Say which: ${me} host restore BACKUP, or restore FOLDER BACKUP`);
+  const data = flags.get("data") ?? where.data;
+  const found = service(where);
+  const manager = "missing" in found ? void 0 : found;
+  const managed = (await manager?.state())?.running === true;
+  const port = config?.port ?? DEFAULT_PORT;
+  const live = [`127.0.0.1:${port}`, ...config ? [reachableAt(config)] : []];
+  if (!managed && (await Promise.all(live.map(answers))).some(Boolean))
+    fail("The host is running. Stop it first (Ctrl+C, or docker stop), then restore.");
+  if (managed) await manager.remove();
   try {
-    if (existsSync3(`${where.data}/host.sqlite`)) {
-      const keep = (config?.backup?.keep ?? 14) + 1;
+    if (existsSync3(join4(data, "host.sqlite"))) {
+      const keep = (await listBackups(folder)).length + 1;
       const safety = await withHost((host) => host.backup(folder, keep));
       console.log(`Backed up what the host held first, as ${safety.name}.`);
     }
-    await restoreBackup(flags.get("data") ?? where.data, folder, name);
+    await restoreBackup(data, folder, name);
     console.log("Restored. Devices catch up by themselves.");
   } finally {
-    if (running) await manager.install();
+    if (managed) await manager.install();
   }
 }
 async function runHere() {
   const config = await readConfig(where);
-  const port = Number(flags.get("port") ?? config?.port ?? DEFAULT_PORT);
+  const port = whole("port", config?.port ?? DEFAULT_PORT, 1, 65535);
   const address = flags.get("address") ?? config?.address ?? "0.0.0.0";
   const data = flags.get("data") ?? where.data;
   const host = new Host({ dataDir: data });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opsidian",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Host your own Opsidian notebooks: every device syncs through it.",
   "license": "MIT OR Apache-2.0",
   "homepage": "https://ferran.sh/opsidian",