From 229429fe2a06daeb028f39e7302fe0b5dbfc53ba Mon Sep 17 00:00:00 2001
From: Mitra Ardron <mitra@mitra.biz>
Date: Sun, 8 Sep 2019 12:20:40 +1000
Subject: [PATCH] Naming; Provide non-promise version

---
 .gitignore    |  1 +
 Naming.js     |  2 +-
 Transports.js |  3 ++-
 yarn.lock     | 23 ++++++++++++++++++++---
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index f1ae44c..47a0cc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 data.json
 /radata/
+yarn-error.log
diff --git a/Naming.js b/Naming.js
index 96b5981..929d239 100644
--- a/Naming.js
+++ b/Naming.js
@@ -91,4 +91,4 @@ function test() {
 test();
 */
 
-exports = module.exports = {p_namingcb};
+exports = module.exports = {naming, p_namingcb};
diff --git a/Transports.js b/Transports.js
index 249b0b3..2eddc2d 100644
--- a/Transports.js
+++ b/Transports.js
@@ -5,7 +5,7 @@ const debug = require('debug')('dweb-transports');
 const httptools = require('./httptools');
 const each = require('async/each');
 const map = require('async/map');
-const {p_namingcb} = require('./Naming.js')
+const {p_namingcb, naming} = require('./Naming.js')
 
 class Transports {
     /*
@@ -856,6 +856,7 @@ class Transports {
     }
 }
 Transports._transports = [];    // Array of transport instances connected
+Transports.naming = naming;
 Transports.namingcb = p_namingcb;    // Will be defined by the naming component (turns URLs for names into URLs for transport)
 Transports._transportclasses = {};  // Pointers to classes whose code is loaded.
 Transports.httptools = httptools;   // Static http tools
diff --git a/yarn.lock b/yarn.lock
index 8606887..790a65c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5835,7 +5835,19 @@ multiaddr-to-uri@^5.0.0:
   dependencies:
     multiaddr "^6.1.0"
 
-multiaddr@^6.0.0, multiaddr@^6.0.3, multiaddr@^6.0.4, multiaddr@^6.0.6, multiaddr@^6.1.0:
+multiaddr@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/multiaddr/-/multiaddr-6.1.1.tgz#9aae57b3e399089b9896d9455afa8f6b117dff06"
+  integrity sha512-Q1Ika0F9MNhMtCs62Ue+GWIJtRFEhZ3Xz8wH7/MZDVZTWhil1/H2bEGN02kUees3hkI3q1oHSjmXYDM0gxaFjQ==
+  dependencies:
+    bs58 "^4.0.1"
+    class-is "^1.1.0"
+    hi-base32 "~0.5.0"
+    ip "^1.1.5"
+    is-ip "^2.0.0"
+    varint "^5.0.0"
+
+multiaddr@^6.0.3, multiaddr@^6.0.4, multiaddr@^6.0.6, multiaddr@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/multiaddr/-/multiaddr-6.1.0.tgz#1f93afce58a33db5cc32a5917d8a14105d94330e"
   integrity sha512-+XTP3OzG2m6JVcjxA9QBmGDr0Vk8WwnohC/fCC3puXb5qJqfJwLVJLEtdTc6vK7ri/hw+Nn4wyT4LkZaPnvGfQ==
@@ -7080,7 +7092,7 @@ pull-write@^1.1.4:
     pull-cat "^1.1.11"
     pull-stream "^3.4.5"
 
-"pull-ws@github:hugomrdias/pull-ws#fix/bundle-size":
+pull-ws@hugomrdias/pull-ws#fix/bundle-size:
   version "3.3.1"
   resolved "https://codeload.github.com/hugomrdias/pull-ws/tar.gz/8e2ce0bb3b1cd6804828316e937fff8e0bef6225"
   dependencies:
@@ -7661,7 +7673,12 @@ seq-queue@^0.0.5:
   resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
   integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4=
 
-serialize-javascript@^1.4.0, serialize-javascript@^1.7.0:
+serialize-javascript@^1.4.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb"
+  integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==
+
+serialize-javascript@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.0.tgz#5b77019d7c3b85fe91b33ae424c53dcbfb6618bd"
   integrity sha512-UkGlcYMtw4d9w7YfCtJFgdRTps8N4L0A48R+SmcGL57ki1+yHwJXnalk5bjgrw+ljv6SfzjzPjhohod2qllg/Q==