gip-remote 1.2.2 → 1.2.4

package/index.d.ts

@@ -1,14 +1,15 @@
 import { Readable } from 'streamx'
 
 interface RemoteOpts {
-  name?: string
-  store: any
-  swarm: any
-  key?: Buffer
   timeout?: number
-  blind?: boolean
+  blind?: any
 }
 
+type RemoteLink =
+  | string
+  | { name: string; key?: Buffer }
+  | { drive: { key: Buffer }; pathname?: string }
+
 interface GitObject {
   oid: string
   type: string
@@ -19,6 +20,7 @@ interface GitObject {
 interface Ref {
   ref: string
   oid: string
+  symref?: string
 }
 
 interface RefObject extends GitObject {
@@ -26,13 +28,14 @@ interface RefObject extends GitObject {
 }
 
 declare class Remote {
-  constructor(opts: RemoteOpts)
+  constructor(store: any, link: RemoteLink, opts?: RemoteOpts)
 
   readonly name: string
   readonly core: any
   readonly key: Buffer
   readonly discoveryKey: Buffer
   readonly availablePeers: number
+  readonly url: string
 
   ready(): Promise<void>
   close(): Promise<void>
@@ -42,11 +45,20 @@ declare class Remote {
     commitOid: string,
     objects: Map<string, { type: string; size: number; data: Buffer }>
   ): Promise<void>
+
+  getHead(): Promise<string | null>
+  setHead(branch: string): Promise<void>
+
   getAllRefs(): Promise<Ref[]>
   getBranchRef(branch: string): Promise<Ref | null>
+  deleteBranch(branchName: string): Promise<boolean>
+
   getObject(oid: string): Promise<GitObject | null>
   getRefObjects(commitOid: string, onLoad?: (size: number) => void): Promise<RefObject[]>
+
   toDrive(branch: string): Promise<RemoteDrive | null>
+
+  update(): Promise<void>
   waitForPeers(): Promise<void>
 }
 
@@ -73,6 +85,22 @@ declare class RemoteDrive {
   mirror(out: any, opts?: any): any
 }
 
+interface ParsedGitPearLink {
+  protocol: string
+  origin: string
+  pathname?: string
+  drive: {
+    key: Buffer
+    length: number
+    fork?: number | null
+  }
+}
+
+declare const GitPearLink: {
+  parse(link: string): ParsedGitPearLink
+  serialize(o: ParsedGitPearLink): string
+}
+
 interface ToDiskOpts {
   gitDir: string
   objects: Array<{ type: string; id: string; size: number; data: Buffer }>
@@ -107,4 +135,16 @@ declare function walkTree(
   prefix: string
 ): FileEntry[]
 
-export { Remote, RemoteDrive, toDisk, parseCommit, walkTree }
+export { Remote, RemoteDrive, GitPearLink, toDisk, parseCommit, walkTree }
+export type {
+  RemoteOpts,
+  RemoteLink,
+  GitObject,
+  Ref,
+  RefObject,
+  DriveEntry,
+  ParsedGitPearLink,
+  ToDiskOpts,
+  Commit,
+  FileEntry
+}

package/index.js

@@ -5,7 +5,7 @@ const z32 = require('z32')
 const def = require('./schema/hyperdb/index')
 const RemoteDrive = require('./lib/drive')
 const GitPearLink = require('./lib/link')
-const { parseCommit, walkTree } = require('./lib/git')
+const { parseCommit, parseTag, walkTree } = require('./lib/git')
 
 class Remote extends ReadyResource {
   _swarm = null
@@ -22,7 +22,7 @@ class Remote extends ReadyResource {
     let config
     if (typeof this._link === 'string') {
       this._name = this._link
-      config = {}
+      config = { core: store.get({ name: this._link }) }
     } else if (this._link.drive) {
       this._name = this._link.pathname?.split('/').slice(1)[0]
       config = { key: this._link.drive.key }
@@ -91,13 +91,18 @@ class Remote extends ReadyResource {
   }
 
   async getAllRefs() {
-    const branches = this._db.find('@gip/branches')
     const refs = []
 
+    const branches = this._db.find('@gip/branches')
     for await (const b of branches) {
       refs.push({ ref: `refs/heads/${b.name}`, oid: b.commitOid })
     }
 
+    const tags = this._db.find('@gip/tags')
+    for await (const t of tags) {
+      refs.push({ ref: `refs/tags/${t.name}`, oid: t.oid })
+    }
+
     const headBranch = await this.getHead()
     if (headBranch) {
       const head = refs.find((r) => r.ref === `refs/heads/${headBranch}`)
@@ -129,28 +134,58 @@ class Remote extends ReadyResource {
     return true
   }
 
-  // --- Push: store objects + index branch + files ---
+  async deleteTag(tagName) {
+    const tag = await this._db.get('@gip/tags', { name: tagName })
+    if (!tag) return false
+
+    await this._db.delete('@gip/tags', { name: tagName })
 
-  async push(branchName, commitOid, objects) {
+    // Remove file records for this tag
+    const filesBranch = 'tags/' + tagName
+    const files = this._db.find('@gip/files', { branch: filesBranch })
+    for await (const file of files) {
+      await this._db.delete('@gip/files', { branch: filesBranch, path: file.path })
+    }
+
+    await this._db.flush()
+    return true
+  }
+
+  // --- Push: store objects + index branch/tag + files ---
+
+  async push(refName, oid, objects) {
     // 1. Store all git objects
-    for (const [oid, obj] of objects) {
-      const existing = await this.getObject(oid)
+    for (const [objOid, obj] of objects) {
+      const existing = await this.getObject(objOid)
       if (existing) continue
 
       await this._db.insert('@gip/objects', {
-        oid,
+        oid: objOid,
         type: obj.type,
         size: obj.size,
         data: obj.data
       })
     }
 
-    // 2. Parse commit metadata
-    const commitObj = objects.get(commitOid)
-    if (!commitObj) throw new Error('Commit object not found: ' + commitOid)
+    // 2. Dereference tag objects to find the commit
+    let resolvedOid = oid
+    let obj = objects.get(resolvedOid)
+    if (!obj) throw new Error('Object not found: ' + resolvedOid)
+
+    let tagMeta = null
+    while (obj.type === 'tag') {
+      const tag = parseTag(obj.data)
+      if (!tagMeta) tagMeta = tag
+      if (!tag.object) throw new Error('Tag has no object: ' + resolvedOid)
+      resolvedOid = tag.object
+      obj = objects.get(resolvedOid)
+      if (!obj) throw new Error('Object not found: ' + resolvedOid)
+    }
+
+    if (obj.type !== 'commit') throw new Error('Expected commit, got ' + obj.type + ': ' + resolvedOid)
 
-    const commit = parseCommit(commitObj.data)
-    if (!commit.tree) throw new Error('Commit has no tree: ' + commitOid)
+    const commit = parseCommit(obj.data)
+    if (!commit.tree) throw new Error('Commit has no tree: ' + resolvedOid)
 
     // 3. Walk tree to enumerate files
     const files = walkTree(objects, commit.tree, '')
@@ -158,7 +193,7 @@ class Remote extends ReadyResource {
     // 4. Insert file records
     for (const file of files) {
       await this._db.insert('@gip/files', {
-        branch: branchName,
+        branch: refName,
         path: file.path,
         oid: file.oid,
         mode: file.mode,
@@ -169,21 +204,38 @@ class Remote extends ReadyResource {
       })
     }
 
-    // 5. Insert branch record
-    await this._db.insert('@gip/branches', {
-      name: branchName,
-      commitOid,
-      treeOid: commit.tree,
-      author: commit.author,
-      message: commit.message,
-      timestamp: commit.timestamp,
-      objects: [...objects.keys()]
-    })
+    const isTag = refName.startsWith('tags/')
 
-    // 6. Set HEAD to first branch pushed (like git init)
-    const currentHead = await this.getHead()
-    if (!currentHead) {
-      await this._db.insert('@gip/head', { branch: branchName })
+    if (isTag) {
+      // 5a. Insert tag record
+      const tagName = refName.slice(5) // strip 'tags/'
+      await this._db.insert('@gip/tags', {
+        name: tagName,
+        oid,
+        commitOid: resolvedOid,
+        treeOid: commit.tree,
+        tagger: tagMeta ? tagMeta.tagger : null,
+        message: tagMeta ? tagMeta.message : null,
+        timestamp: tagMeta ? tagMeta.timestamp : 0,
+        objects: [...objects.keys()]
+      })
+    } else {
+      // 5b. Insert branch record
+      await this._db.insert('@gip/branches', {
+        name: refName,
+        commitOid: oid,
+        treeOid: commit.tree,
+        author: commit.author,
+        message: commit.message,
+        timestamp: commit.timestamp,
+        objects: [...objects.keys()]
+      })
+
+      // 6. Set HEAD to first branch pushed (like git init)
+      const currentHead = await this.getHead()
+      if (!currentHead) {
+        await this._db.insert('@gip/head', { branch: refName })
+      }
     }
 
     // 7. Flush
@@ -192,29 +244,41 @@ class Remote extends ReadyResource {
 
   // --- Fetch support ---
 
-  async getRefObjects(commitOid, onLoad) {
-    const branches = this._db.find('@gip/branches')
-    let branch = null
+  async getRefObjects(oid, onLoad) {
+    let record = null
 
+    // Check branches first
+    const branches = this._db.find('@gip/branches')
     for await (const b of branches) {
-      if (b.commitOid === commitOid) {
-        branch = b
+      if (b.commitOid === oid) {
+        record = b
         break
       }
     }
 
-    if (!branch) return []
+    // Then check tags
+    if (!record) {
+      const tags = this._db.find('@gip/tags')
+      for await (const t of tags) {
+        if (t.oid === oid) {
+          record = t
+          break
+        }
+      }
+    }
+
+    if (!record) return []
 
     const results = []
-    for (const oid of branch.objects) {
-      const obj = await this.getObject(oid)
+    for (const objOid of record.objects) {
+      const obj = await this.getObject(objOid)
       if (!obj) continue
 
       // Empty blobs have null data after round-tripping through compact-encoding
       const data = obj.data || Buffer.alloc(0)
 
       if (onLoad) onLoad(obj.size)
-      results.push({ ...obj, data, id: oid })
+      results.push({ ...obj, data, id: objOid })
     }
 
     return results
@@ -223,8 +287,16 @@ class Remote extends ReadyResource {
   // --- Drive ---
 
   async toDrive(branch) {
+    // Check branches first, then tags
     const b = await this._db.get('@gip/branches', { name: branch })
-    if (!b) return null
+    if (!b) {
+      const t = await this._db.get('@gip/tags', { name: branch })
+      if (!t) return null
+      // For tags, files are stored under 'tags/<name>'
+      const drive = new RemoteDrive(this._db, { branch: 'tags/' + branch })
+      await drive.ready()
+      return drive
+    }
 
     const drive = new RemoteDrive(this._db, { branch })
     await drive.ready()

package/lib/drive.js

@@ -26,15 +26,7 @@ class RemoteDrive extends ReadyResource {
     })
     if (!record) return null
 
-    return {
-      key,
-      value: {
-        executable: record.mode === '100755',
-        linkname: null,
-        blob: { byteLength: record.size },
-        metadata: null
-      }
-    }
+    return toEntry(key, record)
   }
 
   async get(nameOrEntry) {
@@ -89,7 +81,7 @@ class RemoteDrive extends ReadyResource {
         try {
           for await (const record of stream) {
             if (ignore && ignore(record.path)) continue
-            this.push(record.path)
+            this.push(toEntry(record.path, record))
           }
           this.push(null)
           cb(null)
@@ -130,4 +122,21 @@ class RemoteDrive extends ReadyResource {
   }
 }
 
+function toEntry(key, record) {
+  return {
+    key,
+    value: {
+      executable: record.mode === '100755',
+      linkname: null,
+      blob: {
+        blockOffset: 0,
+        blockLength: 0,
+        byteOffset: 0,
+        byteLength: record.size
+      },
+      metadata: null
+    }
+  }
+}
+
 module.exports = RemoteDrive

package/lib/git.js

@@ -35,6 +35,37 @@ function parseCommit(data) {
   return result
 }
 
+// --- Git tag parser ---
+
+function parseTag(data) {
+  const text = data.toString('utf8')
+  const lines = text.split('\n')
+  const result = { object: null, type: null, tag: null, tagger: null, timestamp: 0, message: '' }
+
+  let i = 0
+  for (; i < lines.length; i++) {
+    const line = lines[i]
+    if (line === '') {
+      i++
+      break
+    }
+
+    if (line.startsWith('object ')) result.object = line.slice(7)
+    else if (line.startsWith('type ')) result.type = line.slice(5)
+    else if (line.startsWith('tag ')) result.tag = line.slice(4)
+    else if (line.startsWith('tagger ')) {
+      const match = line.match(/^tagger (.+) <.+> (\d+) [+-]\d+$/)
+      if (match) {
+        result.tagger = match[1]
+        result.timestamp = parseInt(match[2])
+      }
+    }
+  }
+
+  result.message = lines.slice(i).join('\n').trim()
+  return result
+}
+
 // --- Tree walker: extracts all file paths from git tree objects ---
 
 function walkTree(objects, treeOid, prefix) {
@@ -136,4 +167,4 @@ async function toDisk(opts) {
   }
 }
 
-module.exports = { parseCommit, walkTree, toDisk }
+module.exports = { parseCommit, parseTag, walkTree, toDisk }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gip-remote",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "Git+Pear remote DB for handling git data",
   "main": "index.js",
   "scripts": {

package/schema/hyperdb/db.json

@@ -1,5 +1,5 @@
 {
-  "version": 2,
+  "version": 3,
   "offset": 0,
   "schema": [
     {
@@ -12,7 +12,9 @@
       "indexes": [],
       "schema": "@gip/repos",
       "derived": false,
-      "key": ["name"],
+      "key": [
+        "name"
+      ],
       "trigger": null
     },
     {
@@ -25,7 +27,9 @@
       "indexes": [],
       "schema": "@gip/branches",
       "derived": false,
-      "key": ["name"],
+      "key": [
+        "name"
+      ],
       "trigger": null
     },
     {
@@ -35,10 +39,15 @@
       "type": 1,
       "version": 1,
       "versionField": null,
-      "indexes": ["@gip/files-by-branch"],
+      "indexes": [
+        "@gip/files-by-branch"
+      ],
       "schema": "@gip/files",
       "derived": false,
-      "key": ["branch", "path"],
+      "key": [
+        "branch",
+        "path"
+      ],
       "trigger": null
     },
     {
@@ -51,7 +60,9 @@
       "indexes": [],
       "schema": "@gip/objects",
       "derived": false,
-      "key": ["oid"],
+      "key": [
+        "oid"
+      ],
       "trigger": null
     },
     {
@@ -63,7 +74,9 @@
       "collection": "@gip/files",
       "unique": false,
       "deprecated": false,
-      "key": ["branch"]
+      "key": [
+        "branch"
+      ]
     },
     {
       "name": "head",
@@ -77,6 +90,21 @@
       "derived": false,
       "key": [],
       "trigger": null
+    },
+    {
+      "name": "tags",
+      "namespace": "gip",
+      "id": 6,
+      "type": 1,
+      "version": 3,
+      "versionField": null,
+      "indexes": [],
+      "schema": "@gip/tags",
+      "derived": false,
+      "key": [
+        "name"
+      ],
+      "trigger": null
     }
   ]
-}
+}