capture patches by their branching hash

Author: heapwolf

src/components/publish.js

@@ -1,6 +1,6 @@
 import fs from 'socket:fs'
 import path from 'socket:path'
-import { exec } from 'socket:child_process'
+import { exec, execSync } from 'socket:child_process'
 
 import Tonic from '@socketsupply/tonic'
 import { TonicDialog } from '@socketsupply/components/dialog'
@@ -131,7 +131,7 @@ export class DialogPublish extends TonicDialog {
       }
 
       try {
-        output = await exec(`git commit -m '${JSON.stringify(msg)}'`, { cwd })
+        output = await exec(`git commit -m "${currentHash}" -m "${commitMessage}"`, { cwd })
       } catch (err) {
         output.stderr = err.message
       }
@@ -165,20 +165,15 @@ export class DialogPublish extends TonicDialog {
         //
         // Just publish the diff
         //
+        let output
         try {
-          output = await exec('git format-patch -1 HEAD --stdout', { cwd })
+          output = await execSync('git format-patch -1 HEAD --stdout', { cwd })
         } catch (err) {
-          output.stderr = err.message
-        }
-
-        if (output.stderr) {
-          coTerminal.error(output.stderr)
-          await this.hide()
-          return this.html``
+          console.log(err)
         }
 
-        coTerminal.info('Publishing patch')
-        this.publish('patch', Buffer.from(output.stdout)) // into the background
+        coTerminal.info(output.toString())
+        this.publish('patch', Buffer.from(output)) // into the background
       }
 
       const coProjectSummary = document.querySelector('view-project-summary')

src/index.js

@@ -269,6 +269,8 @@ class AppView extends Tonic {
           await sub.join()
         }
       })
+
+      socket.on('#data', (...args) => console.log)
     } else {
       // If the user has changed the clusterId and or subclusterId, we need to tell the peer about it
       // TODO(@heapwolf): we need a nice way to send config updates to the peer worker.
@@ -277,12 +279,13 @@ class AppView extends Tonic {
     const { data: dataProjects } = await this.db.projects.readAll()
 
     for (const [projectId, project] of dataProjects.entries()) {
-      if (socket.subclusters.get(project.subclusterId)) continue
+      if (socket.subclusters.get(project.subclusterId)) {
+        continue
+      }
 
       const subcluster = await socket.subcluster({ sharedKey: project.sharedKey })
 
       subcluster.on('patch', async (value, packet) => {
-        console.log('GOT PATCH!', value, packet)
         if (!packet.verified) return // gtfoa
         if (packet.index !== -1) return // not interested
 
@@ -293,6 +296,14 @@ class AppView extends Tonic {
         const { data: hasPacket } = await this.db.patches.has(key)
         if (hasPacket) return
 
+        const patch = Buffer.from(value.data).toString()
+        const headers = patch.split('---')[0]
+        const subjectHeader = headers.find(s => s.includes('Subject:'))
+        const branchingHash = subjectHeader.split(/\[PATCH]\s*/)[0]
+
+        if (branchingHash) {
+          await this.db.patches.put(branchingHash.trim(), patch)
+        }
       })
 
       subcluster.on('clone', async (value, packet) => {