2.0.4

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartnetwork",
-  "version": "2.0.1",
+  "version": "2.0.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -3109,6 +3109,11 @@
       "integrity": "sha1-gJPuBBam4r8qpjOBCRFLP7/6Dps=",
       "dev": true
     },
+    "@types/speedtest-net": {
+      "version": "2.1.0",
+      "resolved": "https://verdaccio.lossless.one/@types%2fspeedtest-net/-/speedtest-net-2.1.0.tgz",
+      "integrity": "sha512-a6P3s2qOWU08yu/fk/xyswqRlDyeTmg5RMwedC0h1ZbH2d2iqYVATUXX/Jgl4P5hs12uhj0AQCEZlgVbVXSfKQ=="
+    },
     "@types/through2": {
       "version": "2.0.36",
       "resolved": "https://verdaccio.lossless.one/@types%2fthrough2/-/through2-2.0.36.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartnetwork",
-  "version": "2.0.1",
+  "version": "2.0.4",
   "private": false,
   "description": "network diagnostics",
   "main": "dist_ts/index.js",
@@ -22,6 +22,7 @@
     "@pushrocks/smartpromise": "^3.1.3",
     "@pushrocks/smartstring": "^3.0.24",
     "@types/default-gateway": "^3.0.1",
+    "@types/speedtest-net": "^2.1.0",
     "isopen": "^1.3.0",
     "public-ip": "^4.0.3",
     "speedtest-net": "^2.1.1",

test/test.ts

@@ -9,9 +9,9 @@ tap.test('should create a valid instance of SmartNetwork', async () => {
 });
 
 tap.test('should perform a speedtest', async () => {
-  let result = await testSmartNetwork.getSpeed();
-  console.log(`Download speed for this instance is ${result.speeds.download}`);
-  console.log(`Upload speed for this instance is ${result.speeds.upload}`);
+  const result = await testSmartNetwork.getSpeed();
+  console.log(`Download speed for this instance is ${result.download.bandwidth}`);
+  console.log(`Upload speed for this instance is ${result.download.bandwidth}`);
 });
 
 tap.test('should determine wether a port is free', async () => {

ts/smartnetwork.classes.smartnetwork.ts

@@ -1,34 +1,31 @@
 import * as plugins from './smartnetwork.plugins';
 
 export interface ISpeedtestData {
-  speeds: {
-    download: number;
-    upload: number;
-    originalDownload: number;
-    originalUpload: number;
-  };
-  client: {
-    ip: string;
-    lat: number;
-    lon: number;
-    isp: string;
-    isprating: string;
-    rating: number;
-    ispdlavg: number;
-    ispulavg: number;
+  timestamp: Date;
+  ping: { jitter: number; latency: number };
+  download: { bandwidth: number; bytes: number; elapsed: number };
+  upload: { bandwidth: number; bytes: number; elapsed: number };
+  packetLoss: number;
+  isp: string;
+  interface: {
+    internalIp: string;
+    name: string;
+    macAddr: string;
+    isVpn: false;
+    externalIp: string;
   };
   server: {
-    host: string;
-    lat: number;
-    lon: number;
+    id: number;
+    name: string;
     location: string;
     country: string;
-    cc: string;
-    sponsor: string;
-    distance: number;
-    distanceMi: number;
-    ping: number;
+    host: string;
+    port: number;
+    ip: string;
+  };
+  result: {
     id: string;
+    url: string;
   };
 }
 
@@ -40,16 +37,9 @@ export class SmartNetwork {
    * get network speed
    * @param measurementTime
    */
-  public async getSpeed(measurementTime = 5000): Promise<ISpeedtestData> {
-    const done = plugins.smartpromise.defer<ISpeedtestData>();
-    const test = plugins.speedtestNet({ maxTime: measurementTime });
-    test.on('data', (data) => {
-      done.resolve(data);
-    });
-    test.on('error', (err) => {
-      done.reject(err);
-    });
-    return await done.promise;
+  public async getSpeed() {
+    const test = await plugins.speedtestNet({ acceptGdpr: true, acceptLicense: true });
+    return test;
   }
 
   /**
@@ -57,7 +47,7 @@ export class SmartNetwork {
    * note: false also resolves with false as argument
    * @param port
    */
-  public async isLocalPortAvailable(port: number): Promise<boolean> {
+  public async isLocalPortUnused(port: number): Promise<boolean> {
     const doneIpV4 = plugins.smartpromise.defer<boolean>();
     const doneIpV6 = plugins.smartpromise.defer<boolean>();
     const net = await import('net'); // creates only one instance of net ;) even on multiple calls