ssb-conn - npm Package Compare versions

Comparing version 0.8.3 to 0.8.4

lib/conn-scheduler.js

@@ -156,3 +156,3 @@ "use strict";
             .z(take(excess))
-            .forEach(([addr]) => this.hub.disconnect(addr));
+            .forEach(([addr]) => this.ssb.conn.disconnect(addr));
         peersDown
@@ -168,3 +168,3 @@ .filter(p => !this.weBlockThem(p))
             .z(take(freeSlots))
-            .forEach(([addr, data]) => this.hub.connect(addr, data));
+            .forEach(([addr, data]) => this.ssb.conn.connect(addr, data));
     }
@@ -234,3 +234,3 @@ updateConnectionsNow() {
             .z(take(5))
-            .forEach(([addr, data]) => this.hub.connect(addr, data));
+            .forEach(([addr, data]) => this.ssb.conn.connect(addr, data));
         this.ssb.conn
@@ -240,3 +240,3 @@ .query()
             .filter(this.weBlockThem)
-            .forEach(([addr]) => this.hub.disconnect(addr));
+            .forEach(([addr]) => this.ssb.conn.disconnect(addr));
         this.ssb.conn
@@ -262,3 +262,3 @@ .query()
             .filter(peer => peer[1].stateChange + 10e3 < Date.now())
-            .forEach(([addr]) => this.hub.disconnect(addr));
+            .forEach(([addr]) => this.ssb.conn.disconnect(addr));
         this.ssb.conn
@@ -269,3 +269,3 @@ .query()
             .filter(peer => peer[1].stateChange + 1 * hour < Date.now())
-            .forEach(([addr]) => this.hub.disconnect(addr));
+            .forEach(([addr]) => this.ssb.conn.disconnect(addr));
     }
@@ -354,3 +354,3 @@ updateConnectionsSoon(period = 1000) {
                 if (this.weFollowThem([address, data])) {
-                    this.hub.connect(address, data);
+                    this.ssb.conn.connect(address, data);
                 }
@@ -378,3 +378,3 @@ else {
             if (this.weFollowThem([address, data])) {
-                this.hub.connect(address, data);
+                this.ssb.conn.connect(address, data);
             }
@@ -381,0 +381,0 @@ else {

lib/conn.d.ts

@@ -20,3 +20,2 @@ import ConnDB = require('ssb-conn-db');
     private stopScheduler;
-    private assertValidAddress;
     remember: (address: string, data?: any) => void;
@@ -26,3 +25,3 @@ forget: (address: string) => void;
     connect: (address: string, second: Record<string, any> | Callback<any> | null | undefined, third?: Callback<any> | undefined) => void;
-    disconnect: (address: string, cb: Callback<any>) => void;
+    disconnect: (address: string, cb?: Callback<any> | undefined) => void;
     peers: () => any;
@@ -29,0 +28,0 @@ stage: (address: string, data?: Partial<Readonly<{

lib/conn.js

@@ -23,3 +23,2 @@ "use strict";
 const interpool_glue_1 = require("./interpool-glue");
-const msAddress = require('multiserver-address');
 const ping = require('pull-ping');
@@ -29,7 +28,5 @@ let CONN = class CONN {
         this.remember = (address, data = {}) => {
-            this.assertValidAddress(address);
             this.db.set(address, data);
         };
         this.forget = (address) => {
-            this.assertValidAddress(address);
             this.db.delete(address);
@@ -44,9 +41,2 @@ };
             const data = (typeof third === 'function' ? second : undefined);
-            try {
-                this.assertValidAddress(address);
-            }
-            catch (err) {
-                cb(err);
-                return;
-            }
             this.hub
@@ -57,9 +47,2 @@ .connect(address, data)
         this.disconnect = (address, cb) => {
-            try {
-                this.assertValidAddress(address);
-            }
-            catch (err) {
-                cb(err);
-                return;
-            }
             this.hub
@@ -148,7 +131,2 @@ .disconnect(address)
     }
-    assertValidAddress(address) {
-        if (!msAddress.check(address)) {
-            throw new Error('The given address is not a valid multiserver-address');
-        }
-    }
 };
@@ -155,0 +133,0 @@ __decorate([

package.json

 {
 	"name": "ssb-conn",
 	"description": "SSB plugin for establishing and managing peer connections",
-	"version": "0.8.3",
+	"version": "0.8.4",
 	"homepage": "https://github.com/staltz/ssb-conn",
@@ -16,3 +16,2 @@ "main": "lib/index.js",
 		"ip": "^1.1.5",
-		"multiserver-address": "~1.0.1",
 		"on-change-network": "0.0.2",
@@ -19,0 +18,0 @@ "on-wakeup": "^1.0.1",

src/conn-scheduler.ts

@@ -173,3 +173,3 @@ import ConnHub = require('ssb-conn-hub');
       .z(take(excess))
-      .forEach(([addr]) => this.hub.disconnect(addr));
+      .forEach(([addr]) => this.ssb.conn.disconnect(addr));
 
@@ -190,3 +190,3 @@ // Connect to suitable candidates
       .z(take(freeSlots))
-      .forEach(([addr, data]) => this.hub.connect(addr, data));
+      .forEach(([addr, data]) => this.ssb.conn.connect(addr, data));
   }
@@ -267,3 +267,3 @@
       .z(take(5))
-      .forEach(([addr, data]) => this.hub.connect(addr, data));
+      .forEach(([addr, data]) => this.ssb.conn.connect(addr, data));
 
@@ -275,3 +275,3 @@ // Purge connected peers that are now blocked
       .filter(this.weBlockThem)
-      .forEach(([addr]) => this.hub.disconnect(addr));
+      .forEach(([addr]) => this.ssb.conn.disconnect(addr));
 
@@ -303,3 +303,3 @@ // Purge some old staged LAN peers
       .filter(peer => peer[1].stateChange! + 10e3 < Date.now())
-      .forEach(([addr]) => this.hub.disconnect(addr));
+      .forEach(([addr]) => this.ssb.conn.disconnect(addr));
 
@@ -312,3 +312,3 @@ // Purge an internet connection after it has been up for 1h
       .filter(peer => peer[1].stateChange! + 1 * hour < Date.now())
-      .forEach(([addr]) => this.hub.disconnect(addr));
+      .forEach(([addr]) => this.ssb.conn.disconnect(addr));
   }
@@ -422,3 +422,3 @@
           if (this.weFollowThem([address, data])) {
-            this.hub.connect(address, data);
+            this.ssb.conn.connect(address, data);
           } else {
@@ -449,3 +449,3 @@ this.ssb.conn.stage(address, data);
         if (this.weFollowThem([address, data])) {
-          this.hub.connect(address, data);
+          this.ssb.conn.connect(address, data);
         } else {
@@ -452,0 +452,0 @@ this.ssb.conn.stage(address, data);

src/conn.ts

@@ -10,3 +10,2 @@ import ConnDB = require('ssb-conn-db');
 import {interpoolGlue} from './interpool-glue';
-const msAddress = require('multiserver-address');
 const ping = require('pull-ping');
@@ -87,8 +86,2 @@
 
-  private assertValidAddress(address: string) {
-    if (!msAddress.check(address)) {
-      throw new Error('The given address is not a valid multiserver-address');
-    }
-  }
-
   //#endregion
@@ -100,4 +93,2 @@
   public remember = (address: string, data: any = {}) => {
-    this.assertValidAddress(address);
-
     this.db.set(address, data);
@@ -108,4 +99,2 @@ };
   public forget = (address: string) => {
-    this.assertValidAddress(address);
-
     this.db.delete(address);
@@ -129,9 +118,2 @@ };
 
-    try {
-      this.assertValidAddress(address);
-    } catch (err) {
-      cb(err);
-      return;
-    }
-
     this.hub
@@ -143,10 +125,3 @@ .connect(address, data)
   @muxrpc('async')
-  public disconnect = (address: string, cb: Callback<any>) => {
-    try {
-      this.assertValidAddress(address);
-    } catch (err) {
-      cb(err);
-      return;
-    }
-
+  public disconnect = (address: string, cb?: Callback<any>) => {
     this.hub
@@ -153,0 +128,0 @@ .disconnect(address)

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Dependency count

19

decreased by-5%

Worsened metrics

Total package byte prevSize

127370

decreased by-0.89%

Lines of code

2258

decreased by-1.87%

Dependency changes

• - Removedmultiserver-address@~1.0.1