wiki-plugin-shoppe 0.0.9 → 0.0.10

package/package.json

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

package/server/server.js

@@ -247,19 +247,27 @@ async function processArchive(zipPath) {
   zip.extractAllTo(tmpDir, true);
 
   try {
-    // Find manifest.json — handle zips that wrap everything in a top-level folder
-    let root = tmpDir;
-    let manifestPath = path.join(tmpDir, 'manifest.json');
-    if (!fs.existsSync(manifestPath)) {
-      const entries = fs.readdirSync(tmpDir);
-      if (entries.length === 1 && fs.statSync(path.join(tmpDir, entries[0])).isDirectory()) {
-        root = path.join(tmpDir, entries[0]);
-        manifestPath = path.join(root, 'manifest.json');
+    // Find manifest.json — handle zips wrapped in a top-level folder and
+    // macOS zips that include a __MACOSX metadata folder alongside the content.
+    function findManifest(dir, depth = 0) {
+      const direct = path.join(dir, 'manifest.json');
+      if (fs.existsSync(direct)) return dir;
+      if (depth >= 2) return null;
+      const entries = fs.readdirSync(dir).filter(f =>
+        f !== '__MACOSX' && fs.statSync(path.join(dir, f)).isDirectory()
+      );
+      for (const entry of entries) {
+        const found = findManifest(path.join(dir, entry), depth + 1);
+        if (found) return found;
       }
+      return null;
     }
-    if (!fs.existsSync(manifestPath)) {
+
+    const root = findManifest(tmpDir);
+    if (!root) {
       throw new Error('Archive is missing manifest.json');
     }
+    const manifestPath = path.join(root, 'manifest.json');
 
     const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
     if (!manifest.uuid || !manifest.emojicode) {