@libp2p/utils 1.0.7 → 1.0.10

package/dist/src/address-sort.d.ts

@@ -1,12 +1,8 @@
-import type { Multiaddr } from '@multiformats/multiaddr';
-interface Address {
-    multiaddr: Multiaddr;
-    isCertified: boolean;
-}
+import type { Address } from '@libp2p/interfaces/peer-store';
 /**
- * Sort given addresses by putting public addresses first.
+ * Compare function for array.sort().
+ * This sort aims to move the private addresses to the end of the array.
  * In case of equality, a certified address will come first.
  */
-export declare function publicAddressesFirst(addresses: Address[]): Address[];
-export {};
+export declare function publicAddressesFirst(a: Address, b: Address): -1 | 0 | 1;
 //# sourceMappingURL=address-sort.d.ts.map

package/dist/src/address-sort.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"address-sort.d.ts","sourceRoot":"","sources":["../../src/address-sort.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAGxD,UAAU,OAAO;IACf,SAAS,EAAE,SAAS,CAAA;IACpB,WAAW,EAAE,OAAO,CAAA;CACrB;AA0BD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAE,SAAS,EAAE,OAAO,EAAE,aAEzD"}
+{"version":3,"file":"address-sort.d.ts","sourceRoot":"","sources":["../../src/address-sort.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAA;AAG5D;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAiBxE"}

package/dist/src/address-sort.js

@@ -1,10 +1,10 @@
 import { isPrivate } from './multiaddr/is-private.js';
 /**
  * Compare function for array.sort().
- * This sort aims to move the private adresses to the end of the array.
+ * This sort aims to move the private addresses to the end of the array.
  * In case of equality, a certified address will come first.
  */
-function addressesPublicFirstCompareFunction(a, b) {
+export function publicAddressesFirst(a, b) {
     const isAPrivate = isPrivate(a.multiaddr);
     const isBPrivate = isPrivate(b.multiaddr);
     if (isAPrivate && !isBPrivate) {
@@ -22,11 +22,4 @@ function addressesPublicFirstCompareFunction(a, b) {
     }
     return 0;
 }
-/**
- * Sort given addresses by putting public addresses first.
- * In case of equality, a certified address will come first.
- */
-export function publicAddressesFirst(addresses) {
-    return [...addresses].sort(addressesPublicFirstCompareFunction);
-}
 //# sourceMappingURL=address-sort.js.map

package/dist/src/address-sort.js.map

@@ -1 +1 @@
-{"version":3,"file":"address-sort.js","sourceRoot":"","sources":["../../src/address-sort.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAOrD;;;;GAIG;AACH,SAAS,mCAAmC,CAAE,CAAU,EAAE,CAAU;IAClE,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACzC,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAEzC,IAAI,UAAU,IAAI,CAAC,UAAU,EAAE;QAC7B,OAAO,CAAC,CAAA;KACT;SAAM,IAAI,CAAC,UAAU,IAAI,UAAU,EAAE;QACpC,OAAO,CAAC,CAAC,CAAA;KACV;IACD,mBAAmB;IACnB,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE;QACnC,OAAO,CAAC,CAAC,CAAA;KACV;SAAM,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,WAAW,EAAE;QAC1C,OAAO,CAAC,CAAA;KACT;IAED,OAAO,CAAC,CAAA;AACV,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAE,SAAoB;IACxD,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAA;AACjE,CAAC"}
+{"version":3,"file":"address-sort.js","sourceRoot":"","sources":["../../src/address-sort.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAErD;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAE,CAAU,EAAE,CAAU;IAC1D,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACzC,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IAEzC,IAAI,UAAU,IAAI,CAAC,UAAU,EAAE;QAC7B,OAAO,CAAC,CAAA;KACT;SAAM,IAAI,CAAC,UAAU,IAAI,UAAU,EAAE;QACpC,OAAO,CAAC,CAAC,CAAA;KACV;IACD,mBAAmB;IACnB,IAAI,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE;QACnC,OAAO,CAAC,CAAC,CAAA;KACV;SAAM,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,WAAW,EAAE;QAC1C,OAAO,CAAC,CAAA;KACT;IAED,OAAO,CAAC,CAAA;AACV,CAAC"}

package/dist/src/index.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAA"}

package/dist/src/index.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@libp2p/utils",
-  "version": "1.0.7",
+  "version": "1.0.10",
   "description": "Package to aggregate shared logic and dependencies for the libp2p ecosystem",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/libp2p/js-libp2p-utils#readme",
@@ -64,8 +64,8 @@
       "types": "./dist/src/multiaddr/is-private.d.ts"
     },
     "./stream-to-ma-conn": {
-      "import": "./dist/src/stream-to-ma-connr.js",
-      "types": "./dist/src/stream-to-ma-connr.d.ts"
+      "import": "./dist/src/stream-to-ma-conn.js",
+      "types": "./dist/src/stream-to-ma-conn.d.ts"
     }
   },
   "eslintConfig": {
@@ -156,18 +156,18 @@
     ]
   },
   "scripts": {
+    "clean": "aegir clean",
     "lint": "aegir lint",
-    "dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",
-    "build": "tsc",
-    "pretest": "npm run build",
-    "test": "aegir test -f ./dist/test/*.js -f ./dist/test/**/*.js",
-    "test:chrome": "npm run test -- -t browser --cov",
-    "test:chrome-webworker": "npm run test -- -t webworker",
-    "test:firefox": "npm run test -- -t browser -- --browser firefox",
-    "test:firefox-webworker": "npm run test -- -t webworker -- --browser firefox",
-    "test:node": "npm run test -- -t node --cov",
-    "test:electron-main": "npm run test -- -t electron-main",
-    "release": "semantic-release"
+    "dep-check": "aegir dep-check",
+    "build": "aegir build",
+    "test": "aegir test",
+    "test:chrome": "aegir test -t browser --cov",
+    "test:chrome-webworker": "aegir test -t webworker",
+    "test:firefox": "aegir test -t browser -- --browser firefox",
+    "test:firefox-webworker": "aegir test -t webworker -- --browser firefox",
+    "test:node": "aegir test -t node --cov",
+    "test:electron-main": "aegir test -t electron-main",
+    "release": "aegir release"
   },
   "dependencies": {
     "@achingbrain/ip-address": "^8.1.0",
@@ -177,13 +177,16 @@
     "err-code": "^3.0.1",
     "is-loopback-addr": "^2.0.1",
     "it-stream-types": "^1.0.4",
-    "private-ip": "^2.1.1"
+    "private-ip": "^2.1.1",
+    "ts-mocha": "^9.0.2",
+    "ts-node": "^10.7.0"
   },
   "devDependencies": {
     "@libp2p/interfaces": "^1.0.3",
-    "aegir": "^36.1.2",
+    "aegir": "^37.0.4",
     "it-all": "^1.0.6",
     "it-pair": "^2.0.2",
-    "it-pipe": "^2.0.2"
+    "it-pipe": "^2.0.2",
+    "uint8arrays": "^3.0.0"
   }
 }

package/src/address-sort.ts

@@ -1,17 +1,12 @@
-import type { Multiaddr } from '@multiformats/multiaddr'
+import type { Address } from '@libp2p/interfaces/peer-store'
 import { isPrivate } from './multiaddr/is-private.js'
 
-interface Address {
-  multiaddr: Multiaddr
-  isCertified: boolean
-}
-
 /**
  * Compare function for array.sort().
- * This sort aims to move the private adresses to the end of the array.
+ * This sort aims to move the private addresses to the end of the array.
  * In case of equality, a certified address will come first.
  */
-function addressesPublicFirstCompareFunction (a: Address, b: Address) {
+export function publicAddressesFirst (a: Address, b: Address): -1 | 0 | 1 {
   const isAPrivate = isPrivate(a.multiaddr)
   const isBPrivate = isPrivate(b.multiaddr)
 
@@ -29,11 +24,3 @@ function addressesPublicFirstCompareFunction (a: Address, b: Address) {
 
   return 0
 }
-
-/**
- * Sort given addresses by putting public addresses first.
- * In case of equality, a certified address will come first.
- */
-export function publicAddressesFirst (addresses: Address[]) {
-  return [...addresses].sort(addressesPublicFirstCompareFunction)
-}

package/src/index.ts

@@ -0,0 +1 @@
+export {}