gitroll 0.1.2 → 0.2.0

package/dist/gitroll.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-/*! GitRoll 0.1.2 · MIT License · Includes third-party software; see THIRD_PARTY_NOTICES.txt */
+/*! GitRoll 0.2.0 · MIT License · Includes third-party software; see THIRD_PARTY_NOTICES.txt */
 import { createRequire as __gitrollRequire } from "node:module"; const require = __gitrollRequire(import.meta.url);
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -3129,15 +3129,15 @@ var require_timestamp = __commonJS({
           throw new Error("!!timestamp expects a date, starting with yyyy-mm-dd");
         const [, year, month, day, hour, minute, second] = match.map(Number);
         const millisec = match[7] ? Number((match[7] + "00").substr(1, 3)) : 0;
-        let date2 = Date.UTC(year, month - 1, day, hour || 0, minute || 0, second || 0, millisec);
+        let date = Date.UTC(year, month - 1, day, hour || 0, minute || 0, second || 0, millisec);
         const tz = match[8];
         if (tz && tz !== "Z") {
           let d = parseSexagesimal(tz, false);
           if (Math.abs(d) < 30)
             d *= 60;
-          date2 -= 6e4 * d;
+          date -= 6e4 * d;
         }
-        return new Date(date2);
+        return new Date(date);
       },
       stringify: ({ value }) => value?.toISOString().replace(/(T00:00:00)?\.000Z$/, "") ?? ""
     };
@@ -7844,6 +7844,10 @@ var ALIASES = {
   p: "project",
   project: "project",
   projects: "project",
+  // "Topic" is what the interface calls a project. The stored field stays
+  // `projects` (SPEC.md, format version 1), so these are aliases, not a rename.
+  topic: "project",
+  topics: "project",
   t: "tag",
   tag: "tag",
   tags: "tag",
@@ -8049,12 +8053,10 @@ var t = (id, label, icon, amount2, fields, description) => ({
   builtin: true
 });
 var text2 = (key, label, extra = {}) => ({ key, label, kind: "text", ...extra });
-var date = (key, label) => ({ key, label, kind: "date" });
 var select = (key, label, options) => ({ key, label, kind: "select", options });
 var BUILTIN_TYPES = [
   t(DEFAULT_TYPE, "Log", "\u{1F4DD}", "optional", [], "Something happened."),
   t("expense", "Expense", "\u{1F9FE}", "expected", [text2("vendor", "Paid to"), text2("category", "Category"), select("method", "Method", ["card", "cash", "check", "transfer", "other"])], "Money spent, usually with a receipt."),
-  t("maintenance", "Maintenance", "\u{1F527}", "optional", [text2("asset", "Asset"), text2("vendor", "Done by"), date("next_due", "Next due"), date("warranty_until", "Warranty until")], "Service, repair or upkeep."),
   t("decision", "Decision", "\u2696\uFE0F", "none", [select("status", "Status", ["decided", "proposed", "reversed"]), { key: "alternatives", label: "Alternatives considered", kind: "longtext" }], "A choice that was made, and why."),
   t("milestone", "Milestone", "\u{1F3C1}", "none", [], "A notable moment."),
   t("issue", "Issue", "\u26A0\uFE0F", "optional", [select("severity", "Severity", ["low", "medium", "high"]), select("status", "Status", ["open", "resolved"])], "A problem that was noticed.")
@@ -9056,8 +9058,8 @@ var GitRoll = class _GitRoll {
     const out = tryRun(this.root, ["log", "--follow", "-p", "--format=%x1e%H%x1f%an%x1f%aI%x1f%s", "--", cur.path]) ?? "";
     return out.split("").filter((c) => c.trim()).map((chunk) => {
       const nl = chunk.indexOf("\n");
-      const [commit, author, date2, subject] = (nl < 0 ? chunk : chunk.slice(0, nl)).split("");
-      return { commit, author, date: date2, subject, patch: nl < 0 ? "" : chunk.slice(nl + 1).trim() };
+      const [commit, author, date, subject] = (nl < 0 ? chunk : chunk.slice(0, nl)).split("");
+      return { commit, author, date, subject, patch: nl < 0 ? "" : chunk.slice(nl + 1).trim() };
     });
   }
   /** Validates the Roll against the GitRoll Format, on this computer. */
@@ -9119,10 +9121,13 @@ ${JSON.stringify(e.data)}`).map((kind) => ({ path: e.path, error: `may contain a
    * user hasn't explicitly trusted all stop the sync before anything is uploaded.
    */
   async sync(options = {}) {
+    const stage = options.onStage ?? (() => {
+    });
     const { remote } = this.status();
     if (!remote) {
       return { ok: false, code: "no-remote", message: "This Roll isn't backed up yet. Your events are saved on this computer. Run: gitroll backup" };
     }
+    stage("checking");
     const destinations = this.pushDestinations();
     if (!destinations.length) return { ok: false, code: "error", message: `Couldn't read where "${remote}" uploads to. Nothing was uploaded.` };
     const trusted = new Set((loadUserConfig().trustedRemotes ?? []).map((t2) => t2.toLowerCase()));
@@ -9154,7 +9159,7 @@ ${JSON.stringify(e.data)}`).map((kind) => ({ path: e.path, error: `may contain a
         };
       }
     }
-    return this.#transfer();
+    return this.#transfer(stage);
   }
   /**
    * Download, combine and upload, using the user's own Git credentials. Never
@@ -9162,22 +9167,26 @@ ${JSON.stringify(e.data)}`).map((kind) => ({ path: e.path, error: `may contain a
    * automatically without losing either version. On any other failure local
    * commits stay exactly as they were.
    */
-  #transfer() {
+  #transfer(stage = () => {
+  }) {
     const { remote, branch } = this.status();
     if (!remote) return { ok: false, code: "no-remote", message: "This Roll isn't backed up yet." };
     const merged = /* @__PURE__ */ new Set();
     for (let attempt = 0; attempt < 3; attempt++) {
       try {
+        stage("downloading");
         this.git(["fetch", "-q", remote], { network: true });
       } catch (e) {
         return this.#syncFailure(e, remote);
       }
       const upstream = `refs/remotes/${remote}/${branch}`;
       if (tryRun(this.root, ["rev-parse", "--verify", "-q", upstream]) !== null) {
+        stage("combining");
         const failed = this.#combine(upstream, merged);
         if (failed) return failed;
       }
       try {
+        stage("uploading");
         this.git(["push", "-q", "-u", remote, `HEAD:refs/heads/${branch}`], { network: true });
       } catch (e) {
         if (/\[rejected\]|non-fast-forward|fetch first/i.test(e.message) && attempt < 2) continue;
@@ -9293,7 +9302,7 @@ import path5 from "node:path";
 var WEB_DIR = assetDir("index.html", "./web/", "../../dist/web/");
 var MAX_BODY = HARD_MAX_ATTACHMENT_MB * 4 * 1024 * 1024;
 var LOOPBACK = ["127.0.0.1", "localhost", "::1"];
-var CSP = "default-src 'none'; script-src 'self'; style-src 'self'; img-src 'self' blob: data:; media-src 'self'; connect-src 'self'; form-action 'none'; base-uri 'none'; object-src 'none'; frame-ancestors 'none'";
+var CSP = "default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' blob: data:; media-src 'self'; connect-src 'self'; form-action 'none'; base-uri 'none'; object-src 'none'; frame-ancestors 'none'";
 var SECURITY_HEADERS = {
   "X-Content-Type-Options": "nosniff",
   "Referrer-Policy": "no-referrer",
@@ -9318,7 +9327,14 @@ async function serve(repo, opts) {
   if (!fs5.existsSync(path5.join(webDir, "index.html"))) {
     throw new UserError("GitRoll's app files are missing. Reinstall GitRoll (or run `make build` from source).");
   }
-  const ctx = { repo, webDir, token: opts.token ?? randomBytes(32).toString("base64url"), cookie: "gitroll", ai: opts.ai ?? null };
+  const ctx = {
+    repo,
+    webDir,
+    token: opts.token ?? randomBytes(32).toString("base64url"),
+    cookie: "gitroll",
+    ai: opts.ai ?? null,
+    sync: { stage: null, running: null, startedAt: 0, last: null }
+  };
   const server = http.createServer((req, res) => {
     handle(ctx, req, res).catch((err) => {
       const status = err instanceof HttpError ? err.status : err instanceof NotFoundError ? 404 : err instanceof UserError ? 400 : 500;
@@ -9427,11 +9443,33 @@ async function api(ctx, method, [resource, id, sub], req, res) {
       return sendJson(res, 200, { answer, sources: sources.map((e) => ({ id: e.id, short: shortId(e.id) })) });
     }
     case "POST sync":
-      return sendJson(res, 200, await repo.sync());
+      return sendJson(res, 200, await runSync(ctx));
+    case "GET sync":
+      return sendJson(res, 200, {
+        running: ctx.sync.running !== null,
+        stage: ctx.sync.stage,
+        startedAt: ctx.sync.startedAt || null,
+        last: ctx.sync.last,
+        status: repo.status()
+      });
     default:
       throw new HttpError(404, "Not found");
   }
 }
+function runSync(ctx) {
+  if (ctx.sync.running) return ctx.sync.running;
+  ctx.sync.stage = "checking";
+  ctx.sync.startedAt = Date.now();
+  const run3 = ctx.repo.sync({ onStage: (stage) => ctx.sync.stage = stage }).then((result) => {
+    ctx.sync.last = { at: Date.now(), result };
+    return result;
+  }).finally(() => {
+    ctx.sync.running = null;
+    ctx.sync.stage = null;
+  });
+  ctx.sync.running = run3;
+  return run3;
+}
 async function readJson(req) {
   const chunks = [];
   let size = 0;
@@ -9966,11 +10004,11 @@ var Tui = class {
     for (let i = this.scroll; i < Math.min(list3.length, this.scroll + rows); i++) {
       const e = list3[i];
       const d = new Date(e.occurred);
-      const date2 = d.toLocaleDateString("en-US", { month: "short", day: "numeric" }).padEnd(7);
+      const date = d.toLocaleDateString("en-US", { month: "short", day: "numeric" }).padEnd(7);
       const labels = [e.type !== "log" ? e.type : "", ...e.projects.map((p) => this.#names.get(p) ?? p), e.attachments.length ? `${e.attachments.length} file${e.attachments.length === 1 ? "" : "s"}` : ""].filter(Boolean).join(" \xB7 ");
       const first = (e.body || "(no text)").split("\n")[0];
-      const room = w - 4 - date2.length - (labels ? [...labels].length + 2 : 0);
-      const plain = `${date2} ${fit(first, Math.max(8, room))}`;
+      const room = w - 4 - date.length - (labels ? [...labels].length + 2 : 0);
+      const plain = `${date} ${fit(first, Math.max(8, room))}`;
       const pad2 = " ".repeat(Math.max(1, w - 2 - [...plain].length - [...labels].length));
       const row = `${plain}${pad2}${labels}`;
       out.push(i === this.selected && !this.finding ? inverse(fit(`\u25B8 ${row}`, w)) : `  ${fit(row, w - 2).replace(labels, dim(labels))}`);