Fix reference errors around hyperbee keys (close #30)

Author: pfrazee

.gitignore

@@ -2,3 +2,4 @@
 node_modules
 npm-debug.log
 package-lock.json
+.DS_Store

lib/commands/create.js

@@ -22,7 +22,7 @@ export default {
       process.exit(1)
     }
 
-    await getMirroringClient().mirror(struct.api.key, struct.type)
+    await getMirroringClient().mirror(struct.key, struct.type)
     console.log('Seeding', struct.type)
     process.exit(0)
   }

lib/commands/drive/sync.js

@@ -171,7 +171,7 @@ async function createTarget (source) {
   }
   // If the source is a local directory, create a new drive to copy into.
   let drive = await HyperStruct.create('hyperdrive')
-  await getMirroringClient().mirror(drive.api.key, drive.type)
+  await getMirroringClient().mirror(drive.key, drive.type)
   return {fs: drive.api, path: '/', raw: drive.url + '/'}
 }
 

lib/commands/info.js

@@ -117,7 +117,7 @@ export default {
             await tracker.loadStructPromise
           }
           if (tracker.struct) {
-            ;({ mirror, network } = await getStatus(key, tracker.struct.type, tracker.struct.api.discoveryKey))
+            ;({ mirror, network } = await getStatus(key, tracker.struct.type, tracker.struct.discoveryKey))
           }
         } catch (e) {
           if (e.toString().includes('RPC stream destroyed')) {

lib/commands/seed.js

@@ -29,7 +29,7 @@ export default {
 
     for (const key of keys) {
       var struct = await HyperStruct.get(key)
-      await mirroringClient.mirror(struct.api.key, struct.type)
+      await mirroringClient.mirror(struct.key, struct.type)
       console.log(`Seeding ${chalk.bold(short(key))}`)
     }
     process.exit(0)

lib/commands/unseed.js

@@ -29,7 +29,7 @@ export default {
 
     for (const key of keys) {
       var struct = await HyperStruct.get(key)
-      await mirroringClient.unmirror(struct.api.key, struct.type)
+      await mirroringClient.unmirror(struct.key, struct.type)
       console.log(`No longer seeding ${chalk.bold(short(key))}`)
     }
     process.exit(0)

lib/hyper/struct.js

@@ -24,6 +24,14 @@ class HyperStructure extends EventEmitter {
     this.api = undefined
   }
 
+  get key () {
+    return this.core?.key
+  }
+
+  get discoveryKey () {
+    return this.core?.discoveryKey
+  }
+
   get url () {
     return `hyper://${this.keyStr}`
   }
@@ -99,15 +107,15 @@ class HyperStructure extends EventEmitter {
     if (this.type === 'hyperdrive') {
       this.api = hyperdrive(getClient().corestore(), null, {extension: false})
       await this.api.promises.ready()
-      this.keyStr = this.api.key.toString('hex')
+      this.keyStr = this.key.toString('hex')
     } else if (this.type === 'hyperbee') {
       let core = getClient().corestore().get(null)
       this.api = new Hyperbee(core, {
         keyEncoding: 'binary',
         valueEncoding: 'json'
       })
       await this.api.ready()
-      this.keyStr = this.api.feed.key.toString('hex')
+      this.keyStr = this.key.toString('hex')
     }
 
     if (!noNetConfig) getClient().network.configure(this.core, {lookup: true, announce: true})