@wizzlethorpe/vaults 0.13.2 → 0.13.5

package/dist/foundry-importer.bundle.js

@@ -131,13 +131,19 @@ async function syncImages(host, vault, manifestFiles) {
   }
   const lastImageManifest = host.getVaultState(vault.id).lastImageManifest;
   const last = new Map(Object.entries(lastImageManifest || {}));
+  const baseDir = vaultCacheDir(vault.id);
+  const present = await listCached(baseDir, last.keys());
+  const vanished = [...last.keys()].filter((p) => !present.has(p));
+  for (const path of vanished) last.delete(path);
+  if (vanished.length > 0) {
+    console.info(`Vaults | ${vanished.length} cached file(s) are gone from ${baseDir}; re-fetching.`);
+  }
   const toDownload = [];
   for (const [path, hash] of remoteImages) {
     if (last.get(path) !== hash) toDownload.push(path);
   }
-  const toDelete = [...last.keys()].filter((p) => !remoteImages.has(p));
+  let toDelete = [...last.keys()].filter((p) => !remoteImages.has(p));
   if (toDownload.length === 0 && toDelete.length === 0) return { downloaded: 0, removed: 0, errors: 0 };
-  const baseDir = vaultCacheDir(vault.id);
   const worldRoot = `worlds/${game.world.id}`;
   const dirsNeeded = /* @__PURE__ */ new Set();
   const addChain = (fullPath) => {
@@ -155,6 +161,7 @@ async function syncImages(host, vault, manifestFiles) {
     if (segs.length > 0) addChain(`${baseDir}/${segs.join("/")}`);
   }
   await ensureDirs([...dirsNeeded]);
+  await writeCacheMarker(baseDir, vault);
   const sizeOf = /* @__PURE__ */ new Map();
   for (const f of manifestFiles) sizeOf.set(f.path, f.size ?? 0);
   const chunks = [];
@@ -203,6 +210,10 @@ async function syncImages(host, vault, manifestFiles) {
     console.warn(`Vaults | ${errors.length} image(s) failed to download:`, errors);
   }
   let removed = 0;
+  if (toDelete.length > 0 && !canDelete()) {
+    console.info(`Vaults | ${toDelete.length} cached image(s) are no longer in the vault. Foundry provides no API to delete files, so they stay in ${baseDir} until removed by hand.`);
+    toDelete = [];
+  }
   for (const path of toDelete) {
     try {
       await deleteFromWorld(baseDir, path);
@@ -302,6 +313,47 @@ async function ensureDirs(paths) {
     }
   }
 }
+async function writeCacheMarker(baseDir, vault) {
+  const body = JSON.stringify({
+    label: vault.label ?? null,
+    url: vault.url ?? null,
+    vaultId: vault.id,
+    note: "Cache for one vault. Safe to delete entirely; the next sync re-downloads it."
+  }, null, 2);
+  try {
+    await uploadToWorld(baseDir, "vault-info.json", new Blob([body], { type: "application/json" }));
+  } catch (err) {
+    console.debug(`Vaults | could not write cache marker in ${baseDir}:`, err?.message || err);
+  }
+}
+async function listCached(baseDir, paths) {
+  const byDir = /* @__PURE__ */ new Map();
+  for (const p of paths) {
+    const segs = p.split("/");
+    segs.pop();
+    const dir = segs.join("/");
+    if (!byDir.has(dir)) byDir.set(dir, []);
+    byDir.get(dir).push(p);
+  }
+  const present = /* @__PURE__ */ new Set();
+  for (const dir of byDir.keys()) {
+    const full = dir ? `${baseDir}/${dir}` : baseDir;
+    let listing;
+    try {
+      listing = await fp().browse("data", full);
+    } catch {
+      continue;
+    }
+    for (const file of listing?.files ?? []) {
+      const name = decodeURIComponent(String(file).split("/").pop());
+      present.add(dir ? `${dir}/${name}` : name);
+    }
+  }
+  return present;
+}
+function canDelete() {
+  return typeof fp().deleteFile === "function";
+}
 async function deleteFromWorld(baseDir, path) {
   const full = `${baseDir}/${path}`;
   const impl = fp();
@@ -364,7 +416,9 @@ function buildPathIndex(manifestFiles) {
       docTargets.set(mdPath, docName);
     }
   }
-  return { paths, idOverrides, docTargets };
+  const hashes = /* @__PURE__ */ new Map();
+  for (const f of manifestFiles) if (f.hash) hashes.set(f.path, f.hash);
+  return { paths, idOverrides, docTargets, hashes };
 }
 function docNameFromBase(base) {
   if (typeof base !== "string" || !base) return null;
@@ -398,9 +452,9 @@ function decodeHtmlEntities(s) {
   ta.innerHTML = s;
   return ta.value;
 }
-async function transformHtmlForFoundry(vault, html, index) {
+async function transformHtmlForFoundry(vault, html, index, mediaRefs) {
   html = await rewriteWikilinks(vault.id, html, index);
-  html = rewriteMediaSrcs(vault.id, html);
+  html = rewriteMediaSrcs(vault.id, html, index?.hashes, mediaRefs);
   html = rewritePassthroughLinks(vault.id, html);
   html = await applyDomTransforms(html, vault, index);
   return html;
@@ -537,14 +591,20 @@ async function rewriteWikilinks(vaultId, html, index) {
   }
   return html;
 }
-function rewriteMediaSrcs(vaultId, html) {
+function rewriteMediaSrcs(vaultId, html, hashes, mediaRefs) {
   return html.replace(MEDIA_SRC_RE, (full, tag, before, src, after) => {
     if (!src.startsWith("/")) return full;
     const path = decodeURIComponent(src.replace(/^\//, ""));
     if (!CACHED_EXT_RE.test(path)) return full;
-    return `<${tag}${before}src="${escapeAttr(localFileUrl(vaultId, path))}"${after}>`;
+    mediaRefs?.add(path);
+    const url2 = localFileUrl(vaultId, path) + mediaVersion(hashes, path);
+    return `<${tag}${before}src="${escapeAttr(url2)}"${after}>`;
   });
 }
+function mediaVersion(hashes, path) {
+  const hash = hashes?.get(path);
+  return hash ? `?v=${encodeURIComponent(String(hash).slice(0, 12))}` : "";
+}
 function rewritePassthroughLinks(vaultId, html) {
   return html.replace(ANCHOR_RE, (full, attrs, inner) => {
     const cls = ATTR_CLASS_RE.exec(attrs)?.[1] || "";
@@ -629,8 +689,8 @@ function buildFolderInfo(mdPaths) {
 function isIndexFile(filename) {
   return filename.replace(/\.md$/i, "") === INDEX_BASENAME;
 }
-async function upsertFile(vault, path, body, index, meta, folderInfo) {
-  let html = await transformHtmlForFoundry(vault, body, index);
+async function upsertFile(vault, path, body, index, meta, folderInfo, mediaRefs) {
+  let html = await transformHtmlForFoundry(vault, body, index, mediaRefs);
   html = await appendInstanceDocLink(html, vault, path, meta);
   const segs = path.split("/");
   const filename = segs.pop();
@@ -1177,7 +1237,10 @@ async function sync(host, vault, { forceFull = false } = {}) {
   for (const f of files) {
     if (f.meta && f.path.endsWith(".body.html")) bodyMetaIndex.set(f.path, f.meta);
   }
-  const toUpsert = bodyPaths.filter((p) => remote.get(p) !== local.get(p));
+  const prevImages = forceFull ? /* @__PURE__ */ new Map() : new Map(Object.entries(lastSync.lastImageManifest || {}));
+  const lastMediaRefs = lastSync.lastMediaRefs || {};
+  const mediaStale = (bodyPath) => (lastMediaRefs[bodyPath] || []).some((m) => remote.get(m) !== prevImages.get(m));
+  const toUpsert = bodyPaths.filter((p) => remote.get(p) !== local.get(p) || mediaStale(p));
   const toDelete = [...local.keys()].filter((p) => p.endsWith(".body.html") && !remote.has(p));
   if (forceFull) await host.setVaultState(vault.id, { lastImageManifest: {} });
   let imageStats = { downloaded: 0, removed: 0, errors: 0 };
@@ -1215,6 +1278,8 @@ async function sync(host, vault, { forceFull = false } = {}) {
     return { ok: false, refreshHandlerAssets: false };
   }
   let added = 0, modified = 0, instances = 0;
+  const mediaRefs = {};
+  for (const p of bodyPaths) if (lastMediaRefs[p]) mediaRefs[p] = lastMediaRefs[p];
   for (const bodyPath of toUpsert) {
     const html = bodies.get(bodyPath);
     if (html == null) {
@@ -1227,7 +1292,9 @@ async function sync(host, vault, { forceFull = false } = {}) {
       if (pageMeta?.foundry?.journal === false) {
         await deleteFile(vault, logicalPath);
       } else {
-        const result = await upsertFile(vault, logicalPath, html, pathIndex, pageMeta, folderInfo);
+        const refs = /* @__PURE__ */ new Set();
+        const result = await upsertFile(vault, logicalPath, html, pathIndex, pageMeta, folderInfo, refs);
+        mediaRefs[bodyPath] = [...refs];
         if (result === "added") added++;
         else modified++;
       }
@@ -1258,7 +1325,7 @@ async function sync(host, vault, { forceFull = false } = {}) {
       console.warn(`Vaults | delete instance failed for ${logicalPath}:`, err);
     }
   }
-  await host.setVaultState(vault.id, { lastManifest: Object.fromEntries(remote) });
+  await host.setVaultState(vault.id, { lastManifest: Object.fromEntries(remote), lastMediaRefs: mediaRefs });
   await reconcileEntryPlacement(vault, folderInfo);
   await reconcileOwnership(vault, bodyMetaIndex);
   const seconds = ((Date.now() - start) / 1e3).toFixed(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wizzlethorpe/vaults",
-  "version": "0.13.2",
+  "version": "0.13.5",
   "description": "Sync an Obsidian vault to a Cloudflare-hosted wiki with role-based access. Renders locally, deploys to Cloudflare Pages.",
   "keywords": [
     "obsidian",