wiki-plugin-shoppe 0.0.30 → 0.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-plugin-shoppe",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "Multi-tenant digital goods shoppe for federated wiki, powered by Sanora",
   "keywords": [
     "wiki",

package/server/server.js

@@ -477,6 +477,44 @@ function getMimeType(filename) {
   })[ext] || 'application/octet-stream';
 }
 
+// Ensure the tenant's Sanora user exists (Redis may have been wiped).
+// If the user is found by pubKey but has a different UUID (new registration),
+// updates tenants.json so all subsequent product calls use the correct UUID.
+async function sanoraEnsureUser(tenant) {
+  const { keys } = tenant;
+  const timestamp = Date.now().toString();
+  const message = timestamp + keys.pubKey;
+  sessionless.getKeys = () => keys;
+  const signature = await sessionless.sign(message);
+
+  const resp = await fetch(`${getSanoraUrl()}/user/create`, {
+    method: 'PUT',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ timestamp, pubKey: keys.pubKey, signature }),
+    timeout: 15000
+  });
+
+  if (!resp.ok) {
+    const text = await resp.text().catch(() => '');
+    throw new Error(`Sanora user ensure failed (${resp.status}): ${text.slice(0, 200)}`);
+  }
+
+  const sanoraUser = await resp.json();
+  if (sanoraUser.error) throw new Error(`Sanora user ensure: ${sanoraUser.error}`);
+
+  if (sanoraUser.uuid !== tenant.uuid) {
+    console.log(`[shoppe] Sanora UUID changed ${tenant.uuid} → ${sanoraUser.uuid} (Redis was reset). Updating tenants.json.`);
+    const tenants = loadTenants();
+    const oldUuid = tenant.uuid;
+    delete tenants[oldUuid];
+    tenant.uuid = sanoraUser.uuid;
+    tenants[sanoraUser.uuid] = tenant;
+    saveTenants(tenants);
+  }
+
+  return tenant; // tenant.uuid is now correct
+}
+
 async function sanoraCreateProduct(tenant, title, category, description, price, shipping, tags) {
   const { uuid, keys } = tenant;
   const timestamp = Date.now().toString();
@@ -505,11 +543,32 @@ async function sanoraCreateProduct(tenant, title, category, description, price,
     }
   );
 
+  if (!resp.ok) {
+    const text = await resp.text().catch(() => '');
+    throw new Error(`Create product failed (${resp.status}): ${text.slice(0, 200)}`);
+  }
   const product = await resp.json();
   if (product.error) throw new Error(`Create product failed: ${product.error}`);
   return product;
 }
 
+// Wrapper used by processArchive. On "not found" (Sanora Redis cleared mid-upload),
+// re-registers the tenant and retries once. tenant.uuid may be updated in place.
+async function sanoraCreateProductResilient(tenant, title, category, description, price, shipping, tags) {
+  try {
+    return await sanoraCreateProduct(tenant, title, category, description, price, shipping, tags);
+  } catch (err) {
+    if (err.message.includes('not found') || err.message.includes('404')) {
+      console.warn(`[shoppe] Sanora user lost mid-upload, re-registering and retrying: ${title}`);
+      const updated = await sanoraEnsureUser(tenant);
+      // Mutate tenant in place so all subsequent calls use the new UUID
+      tenant.uuid = updated.uuid;
+      return await sanoraCreateProduct(tenant, title, category, description, price, shipping, tags);
+    }
+    throw err;
+  }
+}
+
 async function sanoraUploadArtifact(tenant, title, fileBuffer, filename, artifactType) {
   const { uuid, keys } = tenant;
   const timestamp = Date.now().toString();
@@ -717,7 +776,7 @@ async function processArchive(zipPath) {
       throw new Error('manifest.json must contain uuid and emojicode');
     }
 
-    const tenant = getTenantByIdentifier(manifest.uuid);
+    let tenant = getTenantByIdentifier(manifest.uuid);
     if (!tenant) throw new Error(`Unknown UUID: ${manifest.uuid}`);
     if (tenant.emojicode !== manifest.emojicode) {
       throw new Error('emojicode does not match registered tenant');
@@ -741,6 +800,10 @@ async function processArchive(zipPath) {
       Object.assign(tenant, tenantUpdates);
     }
 
+    // Ensure the Sanora user exists before uploading any products.
+    // If Redis was wiped, this re-creates the user and updates tenant.uuid.
+    tenant = await sanoraEnsureUser(tenant);
+
     const results = { books: [], music: [], posts: [], albums: [], products: [], videos: [], appointments: [], subscriptions: [], warnings: [] };
 
     function readInfo(entryPath) {
@@ -769,7 +832,7 @@ async function processArchive(zipPath) {
           const description = info.description || '';
           const price = info.price || 0;
 
-          await sanoraCreateProduct(tenant, title, 'book', description, price, 0, buildTags('book', info.keywords));
+          await sanoraCreateProductResilient(tenant, title, 'book', description, price, 0, buildTags('book', info.keywords));
 
           // Cover image — use info.cover to pin a specific file, else first image found
           const covers = fs.readdirSync(entryPath).filter(f => IMAGE_EXTS.has(path.extname(f).toLowerCase()));
@@ -811,7 +874,7 @@ async function processArchive(zipPath) {
           try {
             const description = info.description || `Album: ${albumTitle}`;
             const price = info.price || 0;
-            await sanoraCreateProduct(tenant, albumTitle, 'music', description, price, 0, buildTags('music,album', info.keywords));
+            await sanoraCreateProductResilient(tenant, albumTitle, 'music', description, price, 0, buildTags('music,album', info.keywords));
             const coverFile = info.cover ? (covers.find(f => f === info.cover) || covers[0]) : covers[0];
             if (coverFile) {
               const coverBuf = fs.readFileSync(path.join(entryPath, coverFile));
@@ -840,7 +903,7 @@ async function processArchive(zipPath) {
             const buf = fs.readFileSync(entryPath);
             const description = trackInfo.description || `Track: ${title}`;
             const price = trackInfo.price || 0;
-            await sanoraCreateProduct(tenant, title, 'music', description, price, 0, buildTags('music,track', trackInfo.keywords));
+            await sanoraCreateProductResilient(tenant, title, 'music', description, price, 0, buildTags('music,track', trackInfo.keywords));
             await sanoraUploadArtifact(tenant, title, buf, entry, 'audio');
             results.music.push({ title, type: 'track' });
             console.log(`[shoppe]   🎵 track: ${title}`);
@@ -880,7 +943,7 @@ async function processArchive(zipPath) {
           // Register the series itself as a parent product
           try {
             const description = info.description || `A ${subDirs.length}-part series`;
-            await sanoraCreateProduct(tenant, seriesTitle, 'post-series', description, 0, 0, buildTags(`post,series,order:${order}`, info.keywords));
+            await sanoraCreateProductResilient(tenant, seriesTitle, 'post-series', description, 0, 0, buildTags(`post,series,order:${order}`, info.keywords));
 
             const covers = fs.readdirSync(entryPath).filter(f => IMAGE_EXTS.has(path.extname(f).toLowerCase()));
             if (covers.length > 0) {
@@ -920,7 +983,7 @@ async function processArchive(zipPath) {
               const productTitle = `${seriesTitle}: ${resolvedTitle}`;
               const description = partInfo.description || partFm.body.split('\n\n')[0].replace(/^#+\s*/, '').trim() || resolvedTitle;
 
-              await sanoraCreateProduct(tenant, productTitle, 'post', description, 0, 0,
+              await sanoraCreateProductResilient(tenant, productTitle, 'post', description, 0, 0,
                 buildTags(`post,blog,series:${seriesTitle},part:${partIndex + 1},order:${order}`, partInfo.keywords));
 
               await sanoraUploadArtifact(tenant, productTitle, mdBuf, partMdFiles[0], 'text');
@@ -962,7 +1025,7 @@ async function processArchive(zipPath) {
             const firstLine = fm.body.split('\n').find(l => l.trim()).replace(/^#+\s*/, '');
             const description = info.description || fm.body.split('\n\n')[0].replace(/^#+\s*/, '').trim() || firstLine || title;
 
-            await sanoraCreateProduct(tenant, title, 'post', description, 0, 0, buildTags(`post,blog,order:${order}`, info.keywords));
+            await sanoraCreateProductResilient(tenant, title, 'post', description, 0, 0, buildTags(`post,blog,order:${order}`, info.keywords));
             await sanoraUploadArtifact(tenant, title, mdBuf, mdFiles[0], 'text');
 
             const covers = fs.readdirSync(entryPath).filter(f => IMAGE_EXTS.has(path.extname(f).toLowerCase()));
@@ -999,7 +1062,7 @@ async function processArchive(zipPath) {
         if (!fs.statSync(entryPath).isDirectory()) continue;
         const images = fs.readdirSync(entryPath).filter(f => IMAGE_EXTS.has(path.extname(f).toLowerCase()));
         try {
-          await sanoraCreateProduct(tenant, entry, 'album', `Photo album: ${entry}`, 0, 0, 'album,photos');
+          await sanoraCreateProductResilient(tenant, entry, 'album', `Photo album: ${entry}`, 0, 0, 'album,photos');
           if (images.length > 0) {
             const coverBuf = fs.readFileSync(path.join(entryPath, images[0]));
             await sanoraUploadImage(tenant, entry, coverBuf, images[0]);
@@ -1036,7 +1099,7 @@ async function processArchive(zipPath) {
           const price = info.price || 0;
           const shipping = info.shipping || 0;
 
-          await sanoraCreateProduct(tenant, title, 'product', description, price, shipping, buildTags(`product,physical,order:${order}`, info.keywords));
+          await sanoraCreateProductResilient(tenant, title, 'product', description, price, shipping, buildTags(`product,physical,order:${order}`, info.keywords));
 
           // Hero image: prefer hero.jpg / hero.png, fall back to first image
           const images = fs.readdirSync(entryPath).filter(f => IMAGE_EXTS.has(path.extname(f).toLowerCase()));
@@ -1077,7 +1140,7 @@ async function processArchive(zipPath) {
             renewalDays: info.renewalDays || 30
           };
 
-          await sanoraCreateProduct(tenant, title, 'subscription', description, price, 0, buildTags('subscription', info.keywords));
+          await sanoraCreateProductResilient(tenant, title, 'subscription', description, price, 0, buildTags('subscription', info.keywords));
 
           // Upload tier metadata (benefits list, renewal period) as a JSON artifact
           const tierBuf = Buffer.from(JSON.stringify(tierMeta));
@@ -1152,7 +1215,7 @@ async function processArchive(zipPath) {
             (lucilleVideoId ? `,lucille-id:${lucilleVideoId},lucille-url:${lucilleBase}` : '');
 
           // Sanora catalog entry (for discovery / storefront)
-          await sanoraCreateProduct(tenant, title, 'video', description, price, 0, videoTags);
+          await sanoraCreateProductResilient(tenant, title, 'video', description, price, 0, videoTags);
 
           // Cover / poster image (optional)
           const images = fs.readdirSync(entryPath).filter(f => IMAGE_EXTS.has(path.extname(f).toLowerCase()));
@@ -1198,7 +1261,7 @@ async function processArchive(zipPath) {
             advanceDays:  info.advanceDays  || 30
           };
 
-          await sanoraCreateProduct(tenant, title, 'appointment', description, price, 0, buildTags('appointment', info.keywords));
+          await sanoraCreateProductResilient(tenant, title, 'appointment', description, price, 0, buildTags('appointment', info.keywords));
 
           // Upload schedule as a JSON artifact so the booking page can retrieve it
           const scheduleBuf = Buffer.from(JSON.stringify(schedule));