#2

Author: vaultec81

README.md

@@ -1,5 +1,6 @@
 <a href="https://localmesh.org">
 <img src="https://img.shields.io/badge/Sponsored%20by-localmesh.org-green">
+<img src="https://img.shields.io/badge/matrix-%23orbitdns%3Amatrix.org-blue">
 </a>
 
 # OrbitDNS

package.json

@@ -9,9 +9,18 @@
   "bin": {
     "orbitdns": "src/cli/cli.js"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vaultec81/orbitdns.git"
+  },
   "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/vaultec81/orbitdns/issues"
+  },
+  "homepage": "https://github.com/vaultec81/orbitdns#readme",
   "dependencies": {
     "@hapi/hapi": "^18.4.0",
+    "base64url": "^3.0.1",
     "bip39": "^3.0.2",
     "buffer-json": "^2.0.0",
     "datastore-fs": "^0.9.1",
@@ -23,6 +32,7 @@
     "orbit-db": "^0.21.4",
     "orbit-db-access-controllers": "^0.2.3",
     "orbit-db-identity-provider": "^0.1.7",
-    "p-map-series": "^2.1.0"
+    "p-map-series": "^2.1.0",
+    "orbitdns-http-client": "^1.0.0"
   }
 }

src/cli/commands/config.js

@@ -0,0 +1,14 @@
+'use strict'
+
+module.exports = {
+  command: 'config <command>',
+
+  description: 'Manage configuration',
+
+  builder (yargs) {
+    return yargs.commandDir('config');
+  },
+
+  handler (argv) {
+  }
+}

src/cli/commands/daemon.js

@@ -1,4 +1,5 @@
 const Yargs = require('yargs')
+const fs = require('fs');
 
 module.exports = {
     command: "daemon",
@@ -22,6 +23,7 @@ module.exports = {
                 await daemon.start();
                 daemon._httpApi._apiServers.forEach(apiServer => {
                     print(`API listening on ${apiServer.info.ma.toString()}`)
+                    
                 })
             } catch (err) {
                 console.log(err)

src/cli/commands/domain/list.js

@@ -8,6 +8,10 @@ module.exports = {
     },
 
     handler(argv) {
-        console.log(argv)
+        argv.resolve((async () => {
+            //console.log(argv)
+            const orbitdns = await argv.getOrbitDNS()
+            console.log(orbitdns)
+        })()) 
     }
 }

src/cli/commands/key.js

@@ -0,0 +1,13 @@
+const Yargs = require('yargs')
+
+module.exports = {
+    command: "key <command>",
+    describe: "Key management.",
+
+    builder(yargs) {
+        return yargs.commandDir('key');
+    },
+
+    handler(argv) {
+    }
+}

src/cli/commands/root.js

@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  command: 'net <command>',
+  command: 'root <command>',
 
   description: 'Interact with root TLD management',
 

src/cli/daemon.js

@@ -1,6 +1,8 @@
 const OrbitDNS = require('../core')
 const HttpApi = require('../http')
 const Resolver = require('../core/resolver')
+const fs = require('fs')
+const path = require('path')
 
 class Daemon {
     constructor(options) {
@@ -25,6 +27,14 @@ class Daemon {
         if (this._httpApi._apiServers.length) {
             //await promisify(ipfs._repo.apiAddr.set)(this._httpApi._apiServers[0].info.ma)
         }
+        this._httpApi._apiServers.forEach(apiServer => {
+            var str = apiServer.info.ma.toString();
+            if(str.includes("0.0.0.0")) {
+                str = str.replace("0.0.0.0", "127.0.0.1")
+            }
+            console.log(str)
+            //fs.writeFileSync(path.join(this._options.directory, "apiaddr"), apiServer.info.ma.toString())
+        })
         console.log(Resolver)
         this.resolver = new Resolver(this._orbitdns);
         this.resolver.start();
@@ -37,6 +47,7 @@ class Daemon {
 
 
         ])
+        
         return this;
     }
 }

src/cli/parser.js

@@ -12,7 +12,7 @@ const parser = yargs
     })
     .epilog(utils.ipfsPathHelp)
     .middleware(argv => Object.assign(argv, {
-        getIpfs: utils.singleton(cb => utils.getIPFS(argv, cb)),
+        getOrbitDNS: utils.singleton(cb => utils.getOrbitDNS(argv, cb)),
         print: utils.print,
         isDaemonOn: utils.isDaemonOn,
         getRepoPath: utils.getRepoPath

src/cli/utils.js

@@ -1,17 +1,22 @@
 const fs = require('fs')
 const os = require('os')
+const multiaddr = require('multiaddr')
+const path = require('path')
 const promisify = require('promisify-es6')
-
-
+const debug = require('debug')
+const log = debug('cli')
+log.error = debug('cli:error')
+const Core = require("../core/core")
 
 exports.getRepoPath = () => {
     return process.env.ORBITDNS_PATH || os.homedir() + '/.orbitdns'
 }
 
 exports.isDaemonOn = isDaemonOn
 function isDaemonOn() {
+    console.log(path.join(exports.getRepoPath(), 'apiaddr'))
     try {
-        fs.readFileSync(path.join(exports.getRepoPath(), 'api'))
+        fs.readFileSync(path.join(exports.getRepoPath(), 'apiaddr'))
         log('daemon is on')
         return true
     } catch (err) {
@@ -25,20 +30,21 @@ function getAPICtl(apiAddr) {
         throw new Error('daemon is not on')
     }
     if (!apiAddr) {
-        const apiPath = path.join(exports.getRepoPath(), 'api')
+        const apiPath = path.join(exports.getRepoPath(), 'apiaddr')
         apiAddr = multiaddr(fs.readFileSync(apiPath).toString()).toString()
     }
     // Required inline to reduce startup time
-    //const APIctl = require('ipfs-http-client')
-    return APIctl(apiAddr)
+    const APIctl = require('orbitdns-http-client')
+    return new APIctl(apiAddr)
 }
-exports.getIPFS = async (argv) => {
+exports.getOrbitDNS = async (argv, callback) => {
+    console.log(isDaemonOn())
+    console.log(argv.api)
     if (argv.api || isDaemonOn()) {
         return callback(null, getAPICtl(argv.api), promisify((cb) => cb()))
     }
-
     // Required inline to reduce startup time
-    const core = require('../core/')
+    const Core = require('../core/')
     const node = new Core({
         directory: exports.getRepoPath()
     })

src/core/AccessController.js

@@ -158,6 +158,10 @@ class orbitDNSAC extends EventEmitter {
 
   // Return true if entry is allowed to be added to the database
   async canAppend (entry, identityProvider) {
+    if(entry.payload.op === "DEL") {
+      return false; //Block deletion of records temporarily until a proper system for record deletion is created.
+    }
+    if(entry)
     console.log(entry.payload.value)
     for(var address in this._orbitdb.stores) {
       var split = address.split("/");