1.1.4

fix(core): update
1.1.3
2019-04-17 09:28:09 +02:00 · 2019-04-17 09:28:09 +02:00 · 2019-04-17 09:23:47 +02:00 · 2019-04-17 09:23:47 +02:00 · 2019-04-16 10:23:11 +02:00 · 2019-04-16 10:23:11 +02:00
8 changed files with 232 additions and 141 deletions
--- a/npmextra.json
+++ b/npmextra.json
@ -1,8 +1,6 @@
 {
  "npmci": {
-    "npmGlobalTools": [
-      "npmts"
-    ],
+    "npmGlobalTools": [],
    "npmAccessLevel": "public"
  },
  "gitzone": {
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "@pushrocks/smartnetwork",
-  "version": "1.1.1",
+  "version": "1.1.4",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@ -65,6 +65,22 @@
        "typescript": "^3.4.2"
      }
    },
+    "@gitzone/tstest": {
+      "version": "1.0.20",
+      "resolved": "https://verdaccio.lossless.one/@gitzone%2ftstest/-/tstest-1.0.20.tgz",
+      "integrity": "sha512-nEHRDpmPOns47/LIJQ+y+CJDzjiS17UKJpl7PYok4EgNJJGqJUN5ilz2KVLPDcRd/7JiB7JYKujlf2UgFKadgQ==",
+      "dev": true,
+      "requires": {
+        "@gitzone/tsrun": "^1.2.5",
+        "@pushrocks/consolecolor": "^2.0.1",
+        "@pushrocks/smartfile": "^7.0.2",
+        "@pushrocks/smartlog": "^2.0.19",
+        "@pushrocks/smartpromise": "^3.0.2",
+        "@pushrocks/smartshell": "^2.0.13",
+        "@types/figures": "^2.0.0",
+        "figures": "^2.0.0"
+      }
+    },
    "@pushrocks/consolecolor": {
      "version": "2.0.1",
      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fconsolecolor/-/consolecolor-2.0.1.tgz",
@ -265,6 +281,25 @@
        }
      }
    },
+    "@pushrocks/smartshell": {
+      "version": "2.0.13",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartshell/-/smartshell-2.0.13.tgz",
+      "integrity": "sha512-jLfAhLxMVKAScKdln1QrQqBI7A7INhMNHIq28fJEBi0BNDUS0eerw4yMAnR4CRmcrh4xFp1z+ju1kaPO3I/4MA==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartpromise": "^2.0.5",
+        "@types/which": "^1.3.1",
+        "which": "^1.3.1"
+      },
+      "dependencies": {
+        "@pushrocks/smartpromise": {
+          "version": "2.0.5",
+          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartpromise/-/smartpromise-2.0.5.tgz",
+          "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g==",
+          "dev": true
+        }
+      }
+    },
    "@pushrocks/smartstring": {
      "version": "3.0.10",
      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartstring/-/smartstring-3.0.10.tgz",
@ -337,6 +372,12 @@
        "moment": ">=2.14.0"
      }
    },
+    "@types/figures": {
+      "version": "2.0.0",
+      "resolved": "https://verdaccio.lossless.one/@types%2ffigures/-/figures-2.0.0.tgz",
+      "integrity": "sha512-mcRgJ+ncKuNI+Dwac7omO18B8C8u+YBS+AU/oyLhEyjAnT3cUUThhHgZpbiIvu5ZqSvdD30BXtrqg9nxc3OKMg==",
+      "dev": true
+    },
    "@types/form-data": {
      "version": "2.2.1",
      "resolved": "https://verdaccio.lossless.one/@types%2fform-data/-/form-data-2.2.1.tgz",
@ -387,6 +428,12 @@
        "@types/node": "*"
      }
    },
+    "@types/which": {
+      "version": "1.3.1",
+      "resolved": "https://verdaccio.lossless.one/@types%2fwhich/-/which-1.3.1.tgz",
+      "integrity": "sha512-ZrJDWpvg75LTGX4XwuneY9s6bF3OeZcGTpoGh3zDV9ytzcHMFsRrMIaLBRJZQMBoGyKs6unBQfVdrLZiYfb1zQ==",
+      "dev": true
+    },
    "@types/yargs": {
      "version": "12.0.12",
      "resolved": "https://verdaccio.lossless.one/@types%2fyargs/-/yargs-12.0.12.tgz",
@ -456,6 +503,59 @@
      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
      "dev": true
    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://verdaccio.lossless.one/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://verdaccio.lossless.one/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://verdaccio.lossless.one/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://verdaccio.lossless.one/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://verdaccio.lossless.one/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://verdaccio.lossless.one/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
    "balanced-match": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@ -487,6 +587,12 @@
      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
      "dev": true
    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://verdaccio.lossless.one/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
+    },
    "camelcase": {
      "version": "5.3.1",
      "resolved": "https://verdaccio.lossless.one/camelcase/-/camelcase-5.3.1.tgz",
@ -606,6 +712,12 @@
        "delayed-stream": "~1.0.0"
      }
    },
+    "commander": {
+      "version": "2.20.0",
+      "resolved": "https://verdaccio.lossless.one/commander/-/commander-2.20.0.tgz",
+      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+      "dev": true
+    },
    "concat-map": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@ -724,6 +836,12 @@
      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
      "dev": true
    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://verdaccio.lossless.one/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true
+    },
    "execa": {
      "version": "1.0.0",
      "resolved": "https://verdaccio.lossless.one/execa/-/execa-1.0.0.tgz",
@ -739,6 +857,15 @@
        "strip-eof": "^1.0.0"
      }
    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://verdaccio.lossless.one/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
    "file-uri-to-path": {
      "version": "1.0.0",
      "resolved": "https://verdaccio.lossless.one/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@ -832,6 +959,23 @@
      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
      "dev": true
    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://verdaccio.lossless.one/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://verdaccio.lossless.one/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "dev": true
+        }
+      }
+    },
    "has-flag": {
      "version": "3.0.0",
      "resolved": "https://verdaccio.lossless.one/has-flag/-/has-flag-3.0.0.tgz",
@ -931,6 +1075,12 @@
      "resolved": "https://verdaccio.lossless.one/js-base64/-/js-base64-2.5.1.tgz",
      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://verdaccio.lossless.one/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "dev": true
+    },
    "js-yaml": {
      "version": "3.13.1",
      "resolved": "https://verdaccio.lossless.one/js-yaml/-/js-yaml-3.13.1.tgz",
@ -1076,6 +1226,23 @@
      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
      "dev": true
    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://verdaccio.lossless.one/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://verdaccio.lossless.one/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
+        }
+      }
+    },
    "moment": {
      "version": "2.24.0",
      "resolved": "https://verdaccio.lossless.one/moment/-/moment-2.24.0.tgz",
@ -1208,6 +1375,12 @@
      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
      "dev": true
    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://verdaccio.lossless.one/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
+    },
    "pathval": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
@ -1300,6 +1473,15 @@
      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
      "dev": true
    },
+    "resolve": {
+      "version": "1.10.0",
+      "resolved": "https://verdaccio.lossless.one/resolve/-/resolve-1.10.0.tgz",
+      "integrity": "sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==",
+      "dev": true,
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
    "rxjs": {
      "version": "6.4.0",
      "resolved": "https://verdaccio.lossless.one/rxjs/-/rxjs-6.4.0.tgz",
@ -1501,6 +1683,42 @@
      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
      "dev": true
    },
+    "tslint": {
+      "version": "5.15.0",
+      "resolved": "https://verdaccio.lossless.one/tslint/-/tslint-5.15.0.tgz",
+      "integrity": "sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA==",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.22.0",
+        "builtin-modules": "^1.1.1",
+        "chalk": "^2.3.0",
+        "commander": "^2.12.1",
+        "diff": "^3.2.0",
+        "glob": "^7.1.1",
+        "js-yaml": "^3.13.0",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "resolve": "^1.3.2",
+        "semver": "^5.3.0",
+        "tslib": "^1.8.0",
+        "tsutils": "^2.29.0"
+      }
+    },
+    "tslint-config-prettier": {
+      "version": "1.18.0",
+      "resolved": "https://verdaccio.lossless.one/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz",
+      "integrity": "sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg==",
+      "dev": true
+    },
+    "tsutils": {
+      "version": "2.29.0",
+      "resolved": "https://verdaccio.lossless.one/tsutils/-/tsutils-2.29.0.tgz",
+      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.8.1"
+      }
+    },
    "type-detect": {
      "version": "4.0.8",
      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@pushrocks/smartnetwork",
-  "version": "1.1.1",
+  "version": "1.1.4",
  "private": false,
  "description": "network diagnostics",
  "main": "dist/index.js",
@ -8,12 +8,15 @@
  "author": "Lossless GmbH",
  "license": "MIT",
  "scripts": {
-    "test": "(tsrun test/test.ts)",
-    "build": "(npmts)"
+    "test": "(tsrun test/)",
+    "build": "(tsbuild)"
  },
  "devDependencies": {
-    "@gitzone/tsrun": "^1.2.5",
-    "@pushrocks/tapbundle": "^3.0.9"
+    "@gitzone/tsbuild": "^2.1.8",
+    "@gitzone/tstest": "^1.0.20",
+    "@pushrocks/tapbundle": "^3.0.9",
+    "tslint": "^5.15.0",
+    "tslint-config-prettier": "^1.18.0"
  },
  "dependencies": {
    "@pushrocks/smartpromise": "^3.0.2",
--- a/test/test.ts
+++ b/test/test.ts
@ -19,8 +19,8 @@ tap.test('should determine wether a port is free', async () => {
 });

 tap.test('should scan a port', async () => {
-  const portscanner = new smartnetwork.PortScanner();
-  expect(portscanner.checkPortStatus('google.com:80')).to.eventually.be.true;
+  await expect(testSmartNetwork.isRemotePortAvailable('google.com:80')).to.eventually.be.true;
+  await expect(testSmartNetwork.isRemotePortAvailable('67.207.79.63:12346')).to.eventually.be.false;
 });

 tap.start();
--- a/ts/index.ts
+++ b/ts/index.ts
@ -1,2 +1 @@
-export * from './smartnetwork.classes.portscanner';
-export * from './smartnetwork.classes.speedtest';
+export * from './smartnetwork.classes.smartnetwork';
--- a/ts/smartnetwork.classes.portscanner.ts
+++ b/ts/smartnetwork.classes.portscanner.ts
@ -1,22 +0,0 @@
-import * as plugins from './smartnetwork.plugins';
-
-export class PortScanner {
-  public async checkPortStatus(domainArg: string): Promise<boolean> {
-    const done = plugins.smartpromise.defer<boolean>();
-    const domainPart = domainArg.split(':')[0];
-    const port = parseInt(domainArg.split(':')[1], 10);
-
-    plugins.portscanner.checkPortStatus(port, domainPart, (err, status ) => {
-      if (err) {
-        throw err;
-      }
-      if (status === 'open') {
-        done.resolve(true);
-      } else {
-        done.resolve(false)
-      }
-    })
-    const result = await done.promise;
-    return result;
-  }
-}
--- a/ts/smartnetwork.classes.smartnetwork.ts
+++ b/ts/smartnetwork.classes.smartnetwork.ts
@ -108,9 +108,7 @@ export class SmartNetwork {
  public async isRemotePortAvailable(domainArg: string, portArg?: number): Promise<boolean> {
    const done = plugins.smartpromise.defer<boolean>();
    const domainPart = domainArg.split(':')[0];
-    const port = (() => {
-      return portArg ? portArg : parseInt(domainArg.split(':')[1], 10);
-    })()
+    const port = portArg ? portArg : parseInt(domainArg.split(':')[1], 10);

    plugins.portscanner.checkPortStatus(port, domainPart, (err, status ) => {
      if (err) {
--- a/ts/smartnetwork.classes.speedtest.ts
+++ b/ts/smartnetwork.classes.speedtest.ts
@ -1,103 +0,0 @@
-import * as plugins from './smartnetwork.plugins';
-
-export class 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;
-  };
-  server: {
-    host: string;
-    lat: number;
-    lon: number;
-    location: string;
-    country: string;
-    cc: string;
-    sponsor: string;
-    distance: number;
-    distanceMi: number;
-    ping: number;
-    id: string;
-  };
-}
-
-/**
- * SmartNetwork simplifies actions within the network
- */
-export class SmartNetwork {
-  async getSpeed(measurementTime = 5000): Promise<ISpeedtestData> {
-    let 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;
-  }
-
-  /**
-   * returns a promise with a boolean answer
-   * note: false also resolves with false as argument
-   * @param port
-   */
-  async isLocalPortAvailable(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
-
-    // test IPv4 space
-    const ipv4Test = net.createServer();
-    ipv4Test.once('error', function(err: any) {
-      if (err.code !== 'EADDRINUSE') {
-        doneIpV4.resolve(false);
-        return;
-      }
-      doneIpV4.resolve(false);
-    });
-    ipv4Test.once('listening', function() {
-      ipv4Test.once('close', () => {
-        doneIpV4.resolve(true);
-      });
-      ipv4Test.close();
-    });
-    ipv4Test.listen(port, '0.0.0.0');
-
-    await doneIpV4.promise;
-
-    // test IPv6 space
-    const test_ipv6 = net.createServer();
-    test_ipv6.once('error', function(err: any) {
-      if (err.code !== 'EADDRINUSE') {
-        doneIpV6.resolve(false);
-        return;
-      }
-      doneIpV6.resolve(false);
-    });
-    test_ipv6.once('listening', function() {
-      test_ipv6.once('close', () => {
-        doneIpV6.resolve(true);
-      });
-      test_ipv6.close();
-    });
-    test_ipv6.listen(port, '::');
-
-    // lets wait for the result
-    const resultIpV4 = await doneIpV4.promise;
-    const resultIpV6 = await doneIpV6.promise;
-    const result = resultIpV4 === true && resultIpV6 === true;
-    return result;
-  }
-}
Author	SHA1	Message	Date
Phil Kunz	2ce69f4a8e	1.1.4	2019-04-17 09:28:09 +02:00
Phil Kunz	7625866ca9	fix(core): update	2019-04-17 09:28:09 +02:00
Phil Kunz	b88f52ba90	1.1.3	2019-04-17 09:23:47 +02:00
Phil Kunz	43c8f63ce6	fix(core): update	2019-04-17 09:23:47 +02:00
Phil Kunz	b5eac3c54f	1.1.2	2019-04-16 10:23:11 +02:00
Phil Kunz	fda63e4f95	fix(core): update	2019-04-16 10:23:11 +02:00