@libp2p/tcp 10.1.19-a02cb0461 → 10.1.19-e8398d97e

package/dist/src/utils.d.ts

@@ -1,5 +1,5 @@
 import type { Multiaddr } from '@multiformats/multiaddr';
 import type { ListenOptions, IpcSocketConnectOpts, TcpSocketConnectOpts } from 'net';
 export type NetConfig = ListenOptions | (IpcSocketConnectOpts & TcpSocketConnectOpts);
-export declare function multiaddrToNetConfig(addr: Multiaddr, config?: NetConfig): NetConfig;
+export declare function multiaddrToNetConfig(addr: Multiaddr, options?: NetConfig): NetConfig;
 //# sourceMappingURL=utils.d.ts.map

package/dist/src/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,KAAK,CAAA;AAEpF,MAAM,MAAM,SAAS,GAAG,aAAa,GAAG,CAAC,oBAAoB,GAAG,oBAAoB,CAAC,CAAA;AAErF,wBAAgB,oBAAoB,CAAE,IAAI,EAAE,SAAS,EAAE,MAAM,GAAE,SAAc,GAAG,SAAS,CAqBxF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,aAAa,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,KAAK,CAAA;AAEpF,MAAM,MAAM,SAAS,GAAG,aAAa,GAAG,CAAC,oBAAoB,GAAG,oBAAoB,CAAC,CAAA;AAErF,wBAAgB,oBAAoB,CAAE,IAAI,EAAE,SAAS,EAAE,OAAO,GAAE,SAAc,GAAG,SAAS,CA4BzF"}

package/dist/src/utils.js

@@ -1,9 +1,16 @@
 import os from 'os';
 import path from 'path';
-export function multiaddrToNetConfig(addr, config = {}) {
-    const listenPath = addr.getPath();
-    // unix socket listening
-    if (listenPath != null) {
+import { InvalidParametersError } from '@libp2p/interface';
+import { getNetConfig } from '@libp2p/utils';
+import { CODE_UNIX } from '@multiformats/multiaddr';
+import { Unix } from '@multiformats/multiaddr-matcher';
+export function multiaddrToNetConfig(addr, options = {}) {
+    if (Unix.exactMatch(addr)) {
+        const listenPath = addr.getComponents().find(c => c.code === CODE_UNIX)?.value;
+        if (listenPath == null) {
+            throw new InvalidParametersError(`Multiaddr ${addr} was not a Unix address`);
+        }
+        // unix socket listening
         if (os.platform() === 'win32') {
             // Use named pipes on Windows systems.
             return { path: path.join('\\\\.\\pipe\\', listenPath) };
@@ -12,12 +19,15 @@ export function multiaddrToNetConfig(addr, config = {}) {
             return { path: listenPath };
         }
     }
-    const options = addr.toOptions();
+    const config = getNetConfig(addr);
+    const host = config.host;
+    const port = config.port;
     // tcp listening
     return {
-        ...config,
-        ...options,
-        ipv6Only: options.family === 6
+        host,
+        port,
+        ipv6Only: config.type === 'ip6',
+        ...options
     };
 }
 //# sourceMappingURL=utils.js.map

package/dist/src/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AAMvB,MAAM,UAAU,oBAAoB,CAAE,IAAe,EAAE,SAAoB,EAAE;IAC3E,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;IAEjC,wBAAwB;IACxB,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,EAAE,CAAC;YAC9B,sCAAsC;YACtC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,EAAE,CAAA;QACzD,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;QAC7B,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,CAAA;IAEhC,gBAAgB;IAChB,OAAO;QACL,GAAG,MAAM;QACT,GAAG,OAAO;QACV,QAAQ,EAAE,OAAO,CAAC,MAAM,KAAK,CAAC;KAC/B,CAAA;AACH,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAA;AAMtD,MAAM,UAAU,oBAAoB,CAAE,IAAe,EAAE,UAAqB,EAAE;IAC5E,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,EAAE,KAAK,CAAA;QAE9E,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,sBAAsB,CAAC,aAAa,IAAI,yBAAyB,CAAC,CAAA;QAC9E,CAAC;QAED,wBAAwB;QACxB,IAAI,EAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,EAAE,CAAC;YAC9B,sCAAsC;YACtC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,EAAE,CAAA;QACzD,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;QAC7B,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;IACjC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;IACxB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;IAExB,gBAAgB;IAChB,OAAO;QACL,IAAI;QACJ,IAAI;QACJ,QAAQ,EAAE,MAAM,CAAC,IAAI,KAAK,KAAK;QAC/B,GAAG,OAAO;KACX,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/tcp",
-  "version": "10.1.19-a02cb0461",
+  "version": "10.1.19-e8398d97e",
   "description": "A TCP transport for libp2p",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/transport-tcp#readme",
@@ -53,10 +53,10 @@
     "test:electron-main": "aegir test -t electron-main"
   },
   "dependencies": {
-    "@libp2p/interface": "2.11.0-a02cb0461",
-    "@libp2p/utils": "6.7.2-a02cb0461",
-    "@multiformats/multiaddr": "^12.5.1",
-    "@multiformats/multiaddr-matcher": "^2.0.2",
+    "@libp2p/interface": "2.11.0-e8398d97e",
+    "@libp2p/utils": "6.7.2-e8398d97e",
+    "@multiformats/multiaddr": "^13.0.1",
+    "@multiformats/multiaddr-matcher": "^3.0.1",
     "@types/sinon": "^17.0.4",
     "main-event": "^1.0.1",
     "p-event": "^6.0.1",
@@ -64,8 +64,8 @@
     "uint8arraylist": "^2.4.8"
   },
   "devDependencies": {
-    "@libp2p/logger": "5.2.0-a02cb0461",
-    "aegir": "^47.0.21",
+    "@libp2p/logger": "5.2.0-e8398d97e",
+    "aegir": "^47.0.22",
     "delay": "^6.0.0",
     "p-defer": "^4.0.1",
     "p-wait-for": "^5.0.2",

package/src/utils.ts

@@ -1,15 +1,23 @@
 import os from 'os'
 import path from 'path'
+import { InvalidParametersError } from '@libp2p/interface'
+import { getNetConfig } from '@libp2p/utils'
+import { CODE_UNIX } from '@multiformats/multiaddr'
+import { Unix } from '@multiformats/multiaddr-matcher'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { ListenOptions, IpcSocketConnectOpts, TcpSocketConnectOpts } from 'net'
 
 export type NetConfig = ListenOptions | (IpcSocketConnectOpts & TcpSocketConnectOpts)
 
-export function multiaddrToNetConfig (addr: Multiaddr, config: NetConfig = {}): NetConfig {
-  const listenPath = addr.getPath()
+export function multiaddrToNetConfig (addr: Multiaddr, options: NetConfig = {}): NetConfig {
+  if (Unix.exactMatch(addr)) {
+    const listenPath = addr.getComponents().find(c => c.code === CODE_UNIX)?.value
 
-  // unix socket listening
-  if (listenPath != null) {
+    if (listenPath == null) {
+      throw new InvalidParametersError(`Multiaddr ${addr} was not a Unix address`)
+    }
+
+    // unix socket listening
     if (os.platform() === 'win32') {
       // Use named pipes on Windows systems.
       return { path: path.join('\\\\.\\pipe\\', listenPath) }
@@ -18,12 +26,15 @@ export function multiaddrToNetConfig (addr: Multiaddr, config: NetConfig = {}):
     }
   }
 
-  const options = addr.toOptions()
+  const config = getNetConfig(addr)
+  const host = config.host
+  const port = config.port
 
   // tcp listening
   return {
-    ...config,
-    ...options,
-    ipv6Only: options.family === 6
+    host,
+    port,
+    ipv6Only: config.type === 'ip6',
+    ...options
   }
 }