1.1.19

.gitlab-ci.yml

@@ -4,13 +4,13 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
 
 # ====================
 # security stage
@@ -20,17 +20,19 @@ mirror:
   script:
     - npmci git mirror
   tags:
+    - lossless
     - docker
     - notpriv
 
 snyk:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -47,6 +49,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
     - priv
 
@@ -54,22 +57,24 @@ testBuild:
   stage: test
   script:
     - npmci npm prepare
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm install
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
     - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install lts
+    - npmci node install stable
     - npmci npm publish
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -81,9 +86,11 @@ codequality:
   allow_failure: true
   script:
     - npmci command npm install -g tslint typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
+    - lossless
     - docker
     - priv
 
@@ -94,20 +101,20 @@ trigger:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:

.snyk

@@ -0,0 +1,4 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.13.5
+ignore: {}
+patch: {}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartnetwork",
-  "version": "1.1.7",
+  "version": "1.1.19",
   "private": false,
   "description": "network diagnostics",
   "main": "dist/index.js",
@@ -12,28 +12,29 @@
     "build": "(tsbuild)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tstest": "^1.0.24",
+    "@gitzone/tstest": "^1.0.43",
-    "@pushrocks/tapbundle": "^3.0.13",
+    "@pushrocks/tapbundle": "^3.2.9",
-    "tslint": "^5.19.0",
+    "tslint": "^5.20.1",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartstring": "^3.0.10",
+    "@pushrocks/smartstring": "^3.0.18",
-    "@types/default-gateway": "^3.0.0",
+    "@types/default-gateway": "^3.0.1",
-    "@types/portscanner": "^2.1.0",
+    "default-gateway": "^5.0.5",
-    "default-gateway": "^5.0.3",
+    "isopen": "^1.3.0",
-    "portscanner": "^2.2.0",
+    "public-ip": "^4.0.2",
-    "speedtest-net": "^1.5.1"
+    "speedtest-net": "^1.6.0",
+    "systeminformation": "^4.26.10"
   },
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_web/**/*",
-    "dist_ts_web/*",
+    "dist_ts_web/**/*",
-    "assets/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"

readme.md

@@ -38,6 +38,10 @@ const run = async () => {
 };
 ```
 
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

test/test.ts

@@ -24,9 +24,19 @@ tap.test('should scan a port', async () => {
   // await expect(testSmartNetwork.isRemotePortAvailable('lossless.com:444')).to.eventually.be.false;
 });
 
-tap.test('should get the default gateways', async () => {
+tap.test('should get gateways', async () => {
+  const gatewayResult = await testSmartNetwork.getGateways();
+  console.log(gatewayResult);
+});
+
+tap.test('should get the default gateway', async () => {
   const gatewayResult = await testSmartNetwork.getDefaultGateway();
   console.log(gatewayResult);
-})
+});
+
+tap.test('should get public ips', async () => {
+  const ips = await testSmartNetwork.getPublicIps();
+  console.log(ips);
+});
 
 tap.start();

ts/smartnetwork.classes.smartnetwork.ts

@@ -114,12 +114,9 @@ export class SmartNetwork {
     const domainPart = domainArg.split(':')[0];
     const port = portArg ? portArg : parseInt(domainArg.split(':')[1], 10);
 
-    plugins.portscanner.checkPortStatus(port, domainPart, (err, status) => {
+    plugins.isopen(domainPart, port, (response) => {
-      if (err) {
+      console.log(response);
-        // console.log(err);
+      if (response[port.toString()].isOpen) {
-        return done.resolve(false);
-      }
-      if (status === 'open') {
         done.resolve(true);
       } else {
         done.resolve(false);
@@ -129,11 +126,34 @@ export class SmartNetwork {
     return result;
   }
 
-  public async getDefaultGateway() {
+  public async getGateways() {
-    const result =  {
+    const result = plugins.os.networkInterfaces();
-      v4: await plugins.defaultGateway.v4(),
-      v6: await plugins.defaultGateway.v6()
-    };
     return result;
   }
+
+  public async getDefaultGateway(): Promise<{
+    ipv4: plugins.os.NetworkInterfaceInfo;
+    ipv6: plugins.os.NetworkInterfaceInfo;
+  }> {
+    const defaultGatewayName = await plugins.systeminformation.networkInterfaceDefault();
+    if (!defaultGatewayName) {
+      console.log('Cannot determine default gateway');
+      return null;
+    }
+    const gateways = await this.getGateways();
+    const defaultGateway = gateways[defaultGatewayName];
+    return {
+      ipv4: defaultGateway[0],
+      ipv6: defaultGateway[1]
+    };
+  }
+
+  public async getPublicIps () {
+    return {
+      v4: await plugins.publicIp.v4({
+        timeout: 1000,
+        onlyHttps: true
+      })
+    };
+  }
 }

ts/smartnetwork.plugins.ts

@@ -1,4 +1,7 @@
 // native scope
+import * as os from 'os';
+
+export { os };
 
 // @pushrocks scope
 import * as smartpromise from '@pushrocks/smartpromise';
@@ -7,8 +10,9 @@ import * as smartstring from '@pushrocks/smartstring';
 export { smartpromise, smartstring };
 
 // @third party scope
-import defaultGateway from 'default-gateway';
+import isopen from 'isopen';
-const speedtestNet = require('speedtest-net');
+import publicIp from 'public-ip';
-import * as portscanner from 'portscanner';
+import speedtestNet from 'speedtest-net';
+import * as systeminformation from 'systeminformation';
 
-export { defaultGateway, speedtestNet, portscanner };
+export { isopen, publicIp, speedtestNet, systeminformation };