Merge pull request #180 from p2plabsxyz/fix/p2p-app-update-packaged-builds

fix: P2P app updates for packaged builds

Author: akhileshthite

package.json

@@ -34,6 +34,7 @@
     "files": [
       "node_modules/**/*",
       "package.json",
+      ".gitmodules",
       "pages/**/*",
       "public/*",
       "src/**/*",

src/p2p-app-registry.js

@@ -4,6 +4,7 @@ import { app, ipcMain, dialog } from "electron";
 import { promises as fs } from "fs";
 import { exec } from "child_process";
 import { promisify } from "util";
+import unzipper from "unzipper";
 
 const execAsync = promisify(exec);
 const __filename = fileURLToPath(import.meta.url);
@@ -363,9 +364,124 @@ class P2PAppRegistry {
     await this.saveRegistry();
   }
 
+  parseGitModules(content) {
+    const submodules = [];
+    let current = null;
+    for (const line of content.split('\n')) {
+      const trimmed = line.trim();
+      if (trimmed.startsWith('[submodule')) {
+        current = {};
+        submodules.push(current);
+      } else if (current && trimmed.startsWith('path =')) {
+        current.subPath = trimmed.slice('path ='.length).trim();
+      } else if (current && trimmed.startsWith('url =')) {
+        current.url = trimmed.slice('url ='.length).trim();
+      }
+    }
+    return submodules
+      .filter(s => s.subPath && s.url && s.url.includes('github.com'))
+      .map(s => ({
+        repo: s.url.replace(/^https?:\/\/github\.com\//, '').replace(/\.git$/, ''),
+        dir: path.basename(s.subPath)
+      }));
+  }
+
+  async updateSubmodulesFromGitHub() {
+    let SUBMODULE_APPS;
+    try {
+      const gitmodulesPath = path.join(app.getAppPath(), '.gitmodules');
+      const content = await fs.readFile(gitmodulesPath, 'utf8');
+      SUBMODULE_APPS = this.parseGitModules(content);
+      if (!SUBMODULE_APPS.length) throw new Error('No GitHub submodules found in .gitmodules');
+    } catch (err) {
+      console.error('Could not parse .gitmodules:', err.message);
+      return { success: false, error: `Could not read .gitmodules: ${err.message}` };
+    }
+
+    // In packaged builds, __dirname points inside app.asar (read-only)
+    // We need to write to app.asar.unpacked instead
+    let p2pDir;
+    if (app.isPackaged) {
+      const appPath = app.getAppPath();
+      const unpackedPath = appPath.replace(/\.asar$/, '.asar.unpacked');
+      p2pDir = path.join(unpackedPath, 'src', 'pages', 'p2p');
+    } else {
+      p2pDir = path.join(__dirname, 'pages', 'p2p');
+    }
+    const errors = [];
+
+    for (const mod of SUBMODULE_APPS) {
+      try {
+        const zipUrl = `https://github.com/${mod.repo}/archive/HEAD.zip`;
+        const controller = new AbortController();
+        const timer = setTimeout(() => controller.abort(), 60000);
+
+        let response;
+        try {
+          response = await fetch(zipUrl, { signal: controller.signal });
+        } finally {
+          clearTimeout(timer);
+        }
+
+        if (!response.ok) {
+          throw new Error(`HTTP ${response.status}`);
+        }
+
+        const buffer = Buffer.from(await response.arrayBuffer());
+        const directory = await unzipper.Open.buffer(buffer);
+        const targetDir = path.join(p2pDir, mod.dir);
+
+        // Clear existing contents before extracting fresh copy
+        try {
+          const existing = await fs.readdir(targetDir);
+          await Promise.all(
+            existing.map(e => fs.rm(path.join(targetDir, e), { recursive: true, force: true }))
+          );
+        } catch {
+          await fs.mkdir(targetDir, { recursive: true });
+        }
+
+        // Extract all files, stripping the top-level GitHub zip folder (e.g. "peerchat-main/")
+        for (const file of directory.files) {
+          const relativePath = file.path.replace(/^[^/]+\//, '');
+          if (!relativePath) continue;
+
+          const destPath = path.join(targetDir, relativePath);
+          if (file.type === 'Directory' || relativePath.endsWith('/')) {
+            await fs.mkdir(destPath, { recursive: true });
+          } else {
+            await fs.mkdir(path.dirname(destPath), { recursive: true });
+            const content = await file.buffer();
+            await fs.writeFile(destPath, content);
+          }
+        }
+      } catch (error) {
+        console.error(`Failed to update ${mod.dir}:`, error);
+        errors.push(`${mod.dir}: ${error.message}`);
+      }
+    }
+
+    if (errors.length > 0) {
+      return {
+        success: false,
+        error: `Failed to update some apps: ${errors.join('; ')}`
+      };
+    }
+
+    return {
+      success: true,
+      message: 'P2P apps updated to latest versions. Refresh to see changes.'
+    };
+  }
+
   async updateSubmodules() {
+    // Packaged builds have no .git and no git binary — use GitHub zip downloads instead
+    if (app.isPackaged) {
+      return await this.updateSubmodulesFromGitHub();
+    }
+
+    // Development: use git submodule update
     try {
-      // Get the project root directory (where .git is located)
       const projectRoot = app.getAppPath();
 
       // Update all submodules to their latest commits

src/pages/p2p/p2p-list.js

@@ -1,7 +1,7 @@
 const builtInP2PApps = [
   { id: "ai-chat", name: "AI Chat", icon: "robot.svg", url: "peersky://p2p/ai-chat/" },
-  { id: "chat", name: "Chat", icon: "chat.svg", url: "peersky://p2p/peerchat/" },
-  { id: "editor", name: "Editor", icon: "file-code.svg", url: "peersky://p2p/peerpad/" },
+  { id: "chat", name: "PeerChat", icon: "chat.svg", url: "peersky://p2p/peerchat/" },
+  { id: "editor", name: "PeerPad", icon: "file-code.svg", url: "peersky://p2p/peerpad/" },
   { id: "p2pmd", name: "P2P Markdown", icon: "markdown.svg", url: "peersky://p2p/p2pmd/" },
   { id: "reader", name: "Social Reader", icon: "people.svg", url: "https://reader.distributed.press/" },
   { id: "upload", name: "Upload", icon: "file-upload.svg", url: "peersky://p2p/upload/" },

src/pages/p2p/peerchat

@@ -11,7 +11,17 @@ import extensionManager from '../extensions/index.js';
 const log = createLogger('protocols:peersky');
 
 const __dirname = fileURLToPath(new URL('./', import.meta.url));
-const pagesPath = path.join(__dirname, '../pages');
+
+// In packaged builds, serve from app.asar.unpacked so we can read updated P2P apps
+let pagesPath;
+if (app.isPackaged) {
+  const appPath = app.getAppPath();
+  const unpackedPath = appPath.replace(/\.asar$/, '.asar.unpacked');
+  pagesPath = path.join(unpackedPath, 'src', 'pages');
+} else {
+  pagesPath = path.join(__dirname, '../pages');
+}
+
 const fs = new ScopedFS(pagesPath);
 
 const CHECK_PATHS = [