wiki-plugin-shoppe 0.0.29 → 0.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-plugin-shoppe",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "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();
@@ -678,7 +716,13 @@ async function processArchive(zipPath) {
   // Use system unzip to stream-extract without loading entire archive into RAM.
   // AdmZip loads the whole zip into memory upfront, which OOM-kills Node on large archives.
   try {
-    execSync(`unzip -o "${zipPath}" -d "${tmpDir}"`, { stdio: 'pipe' });
+    const unzipBin = (() => {
+      for (const p of ['/usr/bin/unzip', '/bin/unzip', '/usr/local/bin/unzip']) {
+        if (fs.existsSync(p)) return p;
+      }
+      return 'unzip'; // fallback, let it fail with a clear error
+    })();
+    execSync(`"${unzipBin}" -o "${zipPath}" -d "${tmpDir}"`, { stdio: 'pipe' });
   } catch (err) {
     throw new Error(`Failed to extract archive: ${err.stderr ? err.stderr.toString().trim() : err.message}`);
   }
@@ -711,7 +755,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');
@@ -735,6 +779,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) {