Fix even more bugs

debug/libp2p.js

@@ -1,5 +1,6 @@
 const ZeroNetNode = require("zeronet-swarm")
 const PeerId = require("peer-id")
+const multiaddr=require("multiaddr")
 //const Client = require("zeronet-client")
 
 PeerId.create((e, id) => {
@@ -17,7 +18,7 @@ PeerId.create((e, id) => {
   }, err => {
     if (err) throw err
 
-    node.dial(node.peerInfo, (e, c) => {
+    node.dial(/*node.peerInfo*/multiaddr("/ip4/127.0.0.1/tcp/15543/"), (e, c) => {
       c.client.cmd.getFile({
         site: "1HeLLo4uzjaLetFx6NH3PMwFP3qbRbTf3D",
         inner_path: "content.json",

zeronet-crypto/protocol.js

@@ -38,11 +38,14 @@ module.exports = function ZeroNetCrypto(protocol) {
       if (!me.index[crypto]) return cb(new Error("Unsupported crypto " + crypto))
       log("upgrading to crypto", crypto)
       conf.crypto = crypto
-      me.index[crypto].getSocket(client.getRaw(), conf, (err, conn) => {
+      client.getRaw((err, conn) => {
         if (err) return cb(err)
-        protocol.upgradeConn(conf)(conn, (err, client) => {
+        me.index[crypto].getSocket(conn, conf, (err, conn) => {
           if (err) return cb(err)
-          return cb(null, client)
+          protocol.upgradeConn(conf)(conn, (err, client) => {
+            if (err) return cb(err)
+            return cb(null, client)
+          })
         })
       })
     }

zeronet-protocol/client.js

@@ -9,12 +9,18 @@ const pull = require('pull-stream')
 const Pushable = require('pull-pushable')
 const Readable = require("stream").Readable
 
+const debug = require("debug")
+
 module.exports = function Client(conn, protocol, zeronet, opt) {
   const self = this
+  const log = debug("zeronet:protocol:client")
 
   /* Handling */
 
   const handlers = self.handlers = protocol.getHandlers(self)
+  let addrs
+  conn.getObservedAddrs((e, a) => addrs = (opt.isServer ? "=> " : "<= ") + a.map(a => a.toString()).join(", "))
+  log("initializing", addrs)
 
   function handleIn(data) {
     if (handlers[data.cmd]) handlers[data.cmd].recv(data)
@@ -40,6 +46,7 @@ module.exports = function Client(conn, protocol, zeronet, opt) {
   self.addCallback = addCallback
 
   self.write = d => {
+    log("sent data", addrs, d)
     p.json(d)
   }
 
@@ -63,6 +70,7 @@ module.exports = function Client(conn, protocol, zeronet, opt) {
   const m = msgstream(r)
 
   m.on("msg", data => {
+    log("got data", addrs, data)
     if (data.cmd == "response") {
       handleResponse(data)
     } else {
@@ -86,4 +94,16 @@ module.exports = function Client(conn, protocol, zeronet, opt) {
     pull.drain(() => {})
   )
 
+  /* getRaw */
+
+  self.getRaw = cb => {
+    try {
+      //p.destroy()
+      r.destroy()
+    } catch (e) {
+      cb(e)
+    }
+    cb(null, conn)
+  }
+
 }

zeronet-protocol/defaults.js

@@ -9,6 +9,9 @@ module.exports = function Defaults(protocol, zeronet) {
     body: Buffer.isBuffer,
     location: "number",
     size: "number"
+  }, (data, cb) => {
+    if (!zeronet.zites[data.zite]) return cb(new Error("Unknown site"))
+    //TODO: finish
   })
 
   protocol.handle("ping", {}, {
@@ -58,10 +61,4 @@ module.exports = function Defaults(protocol, zeronet) {
     peers: "object",
     peers_onion: "object"
   })
-
-  protocol.handle("ping", {}, {
-    body: b => b == "pong"
-  }, (data, cb) => cb({
-    body: "pong"
-  }))
 }

zeronet-protocol/index.js

@@ -5,6 +5,7 @@ const PeerRequestHandler = require(__dirname + "/peer-request-handler")
 
 const Defaults = require(__dirname + "/defaults")
 const Crypto = require("zeronet-crypto/protocol")
+//const Crypto_secio = require("zeronet-crypto/secio")
 const debug = require("debug")
 
 module.exports = function Protocol(swarm, node, zeronet) {
@@ -26,6 +27,7 @@ module.exports = function Protocol(swarm, node, zeronet) {
   }
 
   self.handle = (name, def, defret, cb) => {
+    if (commands[name]) throw new Error(name + " is already handled")
     log("Handling", name)
     commands[name] = new PeerRequest(name, def, defret)
     handlers[name] = cb
@@ -50,5 +52,6 @@ module.exports = function Protocol(swarm, node, zeronet) {
   }
 
   Crypto(self)
+  //Crypto_secio(self, zeronet)
 
 }

zeronet-protocol/peer-request-handler.js

@@ -14,7 +14,7 @@ module.exports = function PeerRequestHandler(name, _req, client, handler) {
         to: req_id
       }
       if (err) {
-        data.error = err instanceof Error ? err.toString().split("\n")[0] : err.toString()
+        resp.error = err instanceof Error ? err.toString().split("\n")[0] : err.toString()
       } else {
         for (var p in _req.defOut)
           resp[p] = res[p]

zeronet-swarm/dial/index.js

@@ -3,8 +3,32 @@
 const Connection = require('interface-connection').Connection
 const debug = require('debug')
 const log = debug('zeronet:dial')
+const crypto = require("crypto")
+
+const sha5 = text => crypto.createHash('sha512').update(text).digest('hex')
+const multiaddr = require("multiaddr")
+const Id = require("peer-id")
+const Peer = require('peer-info')
+
+const BASE58 = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
+const bs58 = require('base-x')(BASE58)
 
 module.exports = function dial(swarm, ZProtocol) {
+  function getId(pi, cb) {
+    if (multiaddr.isMultiaddr(pi)) {
+      const ad = pi.toString()
+      const md = pi
+      let pid = Id.createFromB58String("Q" + bs58.encode(sha5(ad).substr(0, 34)))
+      Peer.create(pid, (err, pi) => {
+        if (err) return cb(err)
+        pi.multiaddrs.add(md)
+        return cb(null, pi)
+      })
+    } else if (Peer.isPeerInfo(pi)) {
+      return cb(null, pi)
+    }
+  }
+
   return (pi, protocol, callback) => {
     if (typeof protocol === 'function') {
       callback = protocol
@@ -15,25 +39,33 @@ module.exports = function dial(swarm, ZProtocol) {
 
     const proxyConn = new Connection()
 
-    const b58Id = pi.id.toB58String()
-    log('dialing %s', b58Id)
-
-    if (!swarm.conns[b58Id]) {
-      attemptDial(pi, (err, conn) => {
-        if (err) {
-          return callback(err)
-        }
-        conn.setPeerInfo(pi)
-        protocolLayer(conn, err => {
-          if (err) return callback(err)
-          swarm.conns[b58Id] = conn
-          return callback(null, conn)
+    getId(pi, (err, _pi) => {
+      if (err) {
+        return callback(err)
+      }
+
+      pi = _pi
+
+      const b58Id = pi.id.toB58String()
+      log('dialing %s', b58Id)
+
+      if (!swarm.conns[b58Id]) {
+        attemptDial(pi, (err, conn) => {
+          if (err) {
+            return callback(err)
+          }
+          conn.setPeerInfo(pi)
+          protocolLayer(conn, err => {
+            if (err) return callback(err)
+            swarm.conns[b58Id] = conn
+            return callback(null, conn)
+          })
         })
-      })
-    } else {
-      const conn = swarm.conns[b58Id]
-      return callback(null, conn.client)
-    }
+      } else {
+        const conn = swarm.conns[b58Id]
+        return callback(null, conn.client)
+      }
+    })
 
     return proxyConn