artyfax 0.3.1 → 0.3.2

package/dist/cli.js

@@ -55,7 +55,8 @@ async function apiFetch(config, path, init2) {
     if (raw) {
       try {
         const parsed = JSON.parse(raw);
-        if (parsed.error) message = parsed.error;
+        if (parsed.message) message = parsed.message;
+        else if (parsed.error) message = parsed.error;
       } catch {
         const snippet = raw.replace(/\s+/g, " ").trim().slice(0, 200);
         if (snippet) message = `HTTP ${res.status}: ${snippet}`;
@@ -375,6 +376,11 @@ async function read(config, slugOrId, forceSecure) {
   } else {
     process.stdout.write(data.md_source ?? data.content);
   }
+  if (data.content_hash) {
+    process.stderr.write(`
+content_hash: ${data.content_hash}
+`);
+  }
 }
 
 // src/commands/secure.ts
@@ -399,7 +405,7 @@ async function secure(config, slugOrId) {
   spin.text = "Uploading\u2026";
   await apiFetch(config, `/documents/${doc.id}/content`, {
     method: "PATCH",
-    body: JSON.stringify({ content: encrypted })
+    body: JSON.stringify({ content: encrypted, force: true })
   });
   await apiFetch(config, `/documents/${doc.id}`, {
     method: "PATCH",
@@ -427,7 +433,7 @@ async function unsecure(config, slugOrId) {
   spin.text = "Uploading\u2026";
   await apiFetch(config, `/documents/${doc.id}/content`, {
     method: "PATCH",
-    body: JSON.stringify({ content: plaintext })
+    body: JSON.stringify({ content: plaintext, force: true })
   });
   await apiFetch(config, `/documents/${doc.id}`, {
     method: "PATCH",
@@ -595,7 +601,7 @@ async function open(config, slugOrId) {
 // src/commands/update.ts
 import { readFileSync } from "fs";
 import { resolve } from "path";
-async function update(config, slugOrId, file, json) {
+async function update(config, slugOrId, file, json, force = false) {
   const spin = spinner("Resolving document\u2026");
   spin.start();
   const doc = await resolveSlug(config, slugOrId);
@@ -624,11 +630,35 @@ async function update(config, slugOrId, file, json) {
     const sdk = await getSDK(config);
     content = await encryptSecure(content, sdk);
   }
+  let ifMatch = null;
+  if (!force) {
+    spin.text = "Checking current version\u2026";
+    const cur = await apiFetch(config, `/documents/${doc.id}/content`);
+    ifMatch = cur.content_hash ?? null;
+  }
   spin.text = "Uploading\u2026";
-  await apiFetch(config, `/documents/${doc.id}/content`, {
-    method: "PATCH",
-    body: JSON.stringify({ content, source: "cli" })
-  });
+  try {
+    await apiFetch(config, `/documents/${doc.id}/content`, {
+      method: "PATCH",
+      body: JSON.stringify(
+        force ? { content, source: "cli", force: true } : { content, source: "cli", if_match: ifMatch ?? void 0 }
+      )
+    });
+  } catch (e) {
+    spin.stop();
+    const status = e.status;
+    if (status === 409) {
+      throw new Error(
+        "This document changed since you read it. Re-pull it with `artyfax read` and re-apply your edit, or pass --force to overwrite."
+      );
+    }
+    if (status === 428) {
+      throw new Error(
+        "Could not read the current version to guard this write. Re-run, or pass --force to overwrite."
+      );
+    }
+    throw e;
+  }
   spin.stop();
   if (json) {
     console.log(JSON.stringify({ updated: true, slug: doc.slug, id: doc.id, secure: doc.secure === 1 }));
@@ -756,6 +786,106 @@ async function addImage(config, slugOrId, file, opts) {
   }
 }
 
+// ../shared/src/limits.ts
+var SERVER_SIDE_BYTE_CAP = 10 * 1024 * 1024;
+var CLIENT_UPLOAD_BYTE_CAP_BY_TIER = {
+  free: 25 * 1024 * 1024,
+  personal: 50 * 1024 * 1024,
+  pro: 100 * 1024 * 1024
+};
+var TOTAL_STORAGE_BYTES_BY_TIER = {
+  free: 100 * 1024 * 1024,
+  personal: 10 * 1024 * 1024 * 1024,
+  pro: 50 * 1024 * 1024 * 1024
+};
+
+// ../shared/src/unsplash.ts
+function sanitizeMarkdownLabel(text) {
+  if (!text) return "";
+  return text.replace(/[[\]]/g, "").replace(/\s+/g, " ").trim();
+}
+
+// src/commands/unsplash.ts
+async function search2(config, query, page) {
+  const qs = new URLSearchParams({ q: query, page: String(page) });
+  return apiFetch(config, `/unsplash/search?${qs.toString()}`);
+}
+async function unsplashSearch(config, query, opts) {
+  const spin = spinner("Searching Unsplash\u2026");
+  spin.start();
+  const res = await search2(config, query, opts.page ?? 1);
+  spin.stop();
+  if (opts.json) {
+    console.log(JSON.stringify(res));
+    return;
+  }
+  if (res.results.length === 0) {
+    console.log(c.muted(`No Unsplash photos found for "${query}".`));
+    return;
+  }
+  res.results.forEach((r, i) => {
+    const n = c.bright(String(i + 1).padStart(2));
+    const desc = r.description ? c.bright(r.description) : c.muted("(no description)");
+    console.log(`${n}. ${desc}`);
+    console.log(`    ${c.muted(`${r.photographer.name} \xB7 ${r.width}\xD7${r.height} \xB7 ${r.photo_id}`)}`);
+  });
+  console.log(
+    c.muted(
+      `
+  ${res.total} results. Use: artyfax cover <doc> --photo <id>  |  artyfax image <doc> --photo <id>`
+    )
+  );
+}
+async function resolvePhotoId(config, opts) {
+  if (opts.photo) return opts.photo;
+  if (!opts.unsplash) throw new Error('Provide --photo <id> or --unsplash "<query>"');
+  const res = await search2(config, opts.unsplash, 1);
+  if (res.results.length === 0) throw new Error(`No Unsplash photos found for "${opts.unsplash}"`);
+  return res.results[0].photo_id;
+}
+async function coverFromUnsplash(config, slugOrId, opts) {
+  const spin = spinner("Resolving document\u2026");
+  spin.start();
+  const doc = await resolveSlug(config, slugOrId);
+  spin.text = "Finding photo\u2026";
+  const photoId = await resolvePhotoId(config, opts);
+  spin.text = "Importing cover from Unsplash\u2026";
+  const result = await apiFetch(
+    config,
+    `/documents/${doc.id}/cover/from-unsplash`,
+    { method: "POST", body: JSON.stringify({ photo_id: photoId }) }
+  );
+  spin.stop();
+  if (opts.json) {
+    console.log(JSON.stringify({ ok: true, id: doc.id, slug: doc.slug, cover_image: result.path }));
+  } else {
+    console.log(`${c.teal("Cover set")} on ${c.bright(doc.slug)} ${c.muted(`(Unsplash ${photoId})`)}`);
+  }
+}
+async function imageFromUnsplash(config, slugOrId, opts) {
+  const spin = spinner("Resolving document\u2026");
+  spin.start();
+  const doc = await resolveSlug(config, slugOrId);
+  spin.text = "Finding photo\u2026";
+  const photoId = await resolvePhotoId(config, opts);
+  spin.text = "Importing image from Unsplash\u2026";
+  const result = await apiFetch(
+    config,
+    `/documents/${doc.id}/images/from-unsplash`,
+    { method: "POST", body: JSON.stringify({ photo_id: photoId }) }
+  );
+  spin.stop();
+  const markdown = `![${sanitizeMarkdownLabel(result.alt)}](${result.path})
+: ${result.credit_markdown}`;
+  if (opts.json) {
+    console.log(JSON.stringify({ ok: true, id: doc.id, slug: doc.slug, path: result.path, markdown }));
+  } else {
+    console.log(`${c.teal("Imported")} to ${c.bright(doc.slug)} ${c.muted(`(Unsplash ${photoId})`)}`);
+    console.log(c.muted("  Paste this into the document body:"));
+    console.log(`  ${markdown.replace("\n", "\n  ")}`);
+  }
+}
+
 // src/commands/share.ts
 async function shareCreate(config, slugOrId, json) {
   const spin = spinner("Resolving document\u2026");
@@ -2145,7 +2275,7 @@ async function pagesMove(config, childRef, position, targetRef, json) {
 }
 
 // src/cli.ts
-var VERSION = true ? "0.3.1" : "0.0.0-dev";
+var VERSION = true ? "0.3.2" : "0.0.0-dev";
 function brandedHelp() {
   return `
 ${c.amber("artyfax")} ${c.muted(`v${VERSION}`)} \u2014 your personal document library
@@ -2502,6 +2632,7 @@ var KNOWN_COMMANDS = /* @__PURE__ */ new Set([
   "metadata",
   "cover",
   "image",
+  "unsplash",
   "publish",
   "unpublish",
   "doctor",
@@ -2696,8 +2827,8 @@ async function main() {
     }
     case "update": {
       const slug = positional[0];
-      if (!slug) error("Missing slug argument", "Usage: artyfax update <slug> [file] (reads from stdin if no file)");
-      await update(config, slug, positional[1], json);
+      if (!slug) error("Missing slug argument", "Usage: artyfax update <slug> [file] [--force] (reads from stdin if no file)");
+      await update(config, slug, positional[1], json, !!flags.force);
       break;
     }
     case "metadata": {
@@ -2718,15 +2849,35 @@ async function main() {
     case "cover": {
       const slug = positional[0];
       const file = positional[1];
-      if (!slug || !file) error("Missing arguments", 'Usage: artyfax cover <doc> <image-file> [--alt "..."]');
-      await setCover(config, slug, file, { alt: flags.alt, json });
+      const unsplash = flags.unsplash;
+      const photo = flags.photo;
+      if (!slug) error("Missing arguments", 'Usage: artyfax cover <doc> <image-file>  |  cover <doc> --unsplash "<query>"  |  --photo <id>');
+      if (unsplash || photo) {
+        await coverFromUnsplash(config, slug, { unsplash, photo, json });
+      } else {
+        if (!file) error("Missing image", 'Provide an image file, or --unsplash "<query>", or --photo <id>');
+        await setCover(config, slug, file, { alt: flags.alt, json });
+      }
       break;
     }
     case "image": {
       const slug = positional[0];
       const file = positional[1];
-      if (!slug || !file) error("Missing arguments", 'Usage: artyfax image <doc> <image-file> [--alt "..."]');
-      await addImage(config, slug, file, { alt: flags.alt, json });
+      const unsplash = flags.unsplash;
+      const photo = flags.photo;
+      if (!slug) error("Missing arguments", 'Usage: artyfax image <doc> <image-file>  |  image <doc> --unsplash "<query>"  |  --photo <id>');
+      if (unsplash || photo) {
+        await imageFromUnsplash(config, slug, { unsplash, photo, json });
+      } else {
+        if (!file) error("Missing image", 'Provide an image file, or --unsplash "<query>", or --photo <id>');
+        await addImage(config, slug, file, { alt: flags.alt, json });
+      }
+      break;
+    }
+    case "unsplash": {
+      const query = positional.join(" ").trim();
+      if (!query) error("Missing query", "Usage: artyfax unsplash <query>");
+      await unsplashSearch(config, query, { json, page: flags.page ? Number(flags.page) : void 0 });
       break;
     }
     case "share": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "artyfax",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "CLI for Artyfax - your personal document library. Save, theme, search, and share.",
   "type": "module",
   "bin": {