fix: origin relative api detection

- Use the gloabl URL object. We hit webpack/node-libs-browser#69 - This will only work in the browser and node >= 10 now. License: MIT Signed-off-by: Oli Evans <[email protected]>
multiformats · Oct 23, 2018 · 82540e7 · 82540e7
1 parent 3011e67
commit 82540e7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -12,10 +12,7 @@ const Multiaddr = require('multiaddr')
 // [udp, foobar.com, 8080] => /dnsaddr/foobar.com/udp/8080
 
 function multiaddrFromUri (uriStr) {
-  const { protocol, hostname } = new url.URL(uriStr)
-  // WHATWG URL hides port when it's the default for the scheme...
-  const port = url.parse(uriStr).port
-  const scheme = protocol.slice(0, -1)
+  const { scheme, hostname, port } = parseUri(uriStr)
   const parts = [
     tupleForHostname(hostname),
     tupleForPort(port, scheme),
@@ -29,6 +26,15 @@ function multiaddrFromUri (uriStr) {
   return Multiaddr(multiaddrStr)
 }
 
+function parseUri (uriStr) {
+  // Use the WHATWG URL global, in node >= 10 and the browser
+  const { protocol, hostname } = new URL(uriStr)
+  // WHATWG URL hides port when it's the default for the scheme...
+  const port = url.parse(uriStr).port
+  const scheme = protocol.slice(0, -1)
+  return { scheme, hostname, port }
+}
+
 function tupleForHostname (hostname) {
   if (!hostname) throw new Error('hostname is requried')
   if (isIp.v4(hostname)) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,6 +11,9 @@
   "devDependencies": {
     "standard": "^12.0.1"
   },
+  "engines": {
+    "node": ">=10"
+  },
   "scripts": {
     "test": "ava test.js"
   },