4.0.2

.gitignore

@@ -1,4 +1,22 @@
-node_modules/
-pages/
-public/
+.nogit/
 
+# artifacts
+coverage/
+public/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,59 +1,126 @@
-image: hosttoday/ht-docker-node:npmts
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- test
-- release
-- trigger
-- pages
+  - security
+  - test
+  - release
+  - metadata
 
-testLEGACY:
+# ====================
+# security stage
+# ====================
+mirror:
+  stage: security
+  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 --ignore-scripts
+    - npmci command snyk test
+  tags:
+    - lossless
+    - docker
+    - notpriv
+
+# ====================
+# test stage
+# ====================
+
+testStable:
   stage: test
   script:
-    - npmci test legacy
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
     - docker
-  allow_failure: true
+    - priv
 
-testLTS:
+testBuild:
   stage: test
   script:
-    - npmci test lts
-  tags:
-    - docker
-    
-testSTABLE:
-  stage: test
-  script:
-    - npmci test stable
+    - npmci npm prepare
+    - 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 publish
+    - npmci node install stable
+    - npmci npm publish
   only:
     - tags
   tags:
+    - lossless
     - docker
+    - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  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
 
 trigger:
-  stage: trigger
+  stage: metadata
   script:
     - npmci trigger
   only:
     - tags
   tags:
+    - lossless
     - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmpage
-  stage: pages
+  stage: metadata
   script:
-    - npmci command npmpage --host gitlab
+    - 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:
     - tags
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
+  allow_failure: true

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

README.md

@@ -1,32 +0,0 @@
-# dnsly
-smart dns methods written in TypeScript
-
-## Availabililty
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/dnsly)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/dnsly)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/dnsly)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/dnsly/)
-
-## Status for master
-[![build status](https://gitlab.com/pushrocks/dnsly/badges/master/build.svg)](https://gitlab.com/pushrocks/dnsly/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/dnsly/badges/master/coverage.svg)](https://gitlab.com/pushrocks/dnsly/commits/master)
-[![Dependency Status](https://david-dm.org/pushrocks/dnsly.svg)](https://david-dm.org/pushrocks/dnsly)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/dnsly/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/dnsly/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/dnsly/badges/code.svg)](https://www.bithound.io/github/pushrocks/dnsly)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
-
-## Usage
-we recommend the use of TypeScript for optimal intellisense
-```javascript
-import * as dnsly from 'dnsly'
-
-let myDnsly = new dnsly.Dnsly('google') // uses Google DNS Servers e.g 8.8.8.8
-myDnsly.getRecord('example.com','AAAA') // returns promise
-    .then(record => { // AAAA record for google.com
-        // do something 
-    })
-```
-
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)

coverage/lcov.info

@@ -1,80 +0,0 @@
-TN:
-SF:/Users/philkunz/gitlab/pushrocks/dnsly/dist/index.js
-FN:3,(anonymous_1)
-FN:3,defineProperties
-FN:3,(anonymous_3)
-FN:5,_classCallCheck
-FN:13,(anonymous_5)
-FN:17,Dnsly
-FN:30,getRecord
-FN:37,(anonymous_8)
-FN:51,close
-FN:60,_setDnsProvider
-FNF:10
-FNH:10
-FNDA:1,(anonymous_1)
-FNDA:1,defineProperties
-FNDA:1,(anonymous_3)
-FNDA:2,_classCallCheck
-FNDA:1,(anonymous_5)
-FNDA:2,Dnsly
-FNDA:3,getRecord
-FNDA:3,(anonymous_8)
-FNDA:2,close
-FNDA:2,_setDnsProvider
-DA:3,3
-DA:5,2
-DA:7,1
-DA:8,1
-DA:13,1
-DA:17,1
-DA:18,2
-DA:20,2
-DA:21,2
-DA:28,1
-DA:31,3
-DA:32,3
-DA:38,3
-DA:39,0
-DA:41,3
-DA:43,3
-DA:52,2
-DA:61,2
-DA:62,2
-DA:63,2
-DA:65,0
-DA:70,1
-DA:73,1
-LF:23
-LH:21
-BRDA:3,1,0,3
-BRDA:3,1,1,3
-BRDA:3,2,0,3
-BRDA:3,2,1,0
-BRDA:3,3,0,1
-BRDA:3,3,1,0
-BRDA:3,4,0,0
-BRDA:3,4,1,1
-BRDA:5,5,0,0
-BRDA:5,5,1,2
-BRDA:38,6,0,0
-BRDA:38,6,1,3
-BRDA:61,7,0,2
-BRDA:61,7,1,0
-BRF:14
-BRH:8
-end_of_record
-TN:
-SF:/Users/philkunz/gitlab/pushrocks/dnsly/dist/dnsly.plugins.js
-FNF:0
-FNH:0
-DA:3,1
-DA:4,1
-DA:5,1
-DA:6,1
-DA:7,1
-LF:5
-LH:5
-BRF:0
-BRH:0
-end_of_record

dist/dnsly.plugins.d.ts

@@ -1,4 +0,0 @@
-import 'typings-global';
-import * as beautylog from 'beautylog';
-declare let dnsSocket: any;
-export { beautylog, dnsSocket };

dist/dnsly.plugins.js

@@ -1,7 +0,0 @@
-"use strict";
-require("typings-global");
-const beautylog = require("beautylog");
-exports.beautylog = beautylog;
-let dnsSocket = require('dns-socket');
-exports.dnsSocket = dnsSocket;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG5zbHkucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2Ruc2x5LnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF1QjtBQUN2Qix1Q0FBc0M7QUFJbEMsOEJBQVM7QUFIYixJQUFJLFNBQVMsR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUE7QUFJakMsOEJBQVMifQ==

dist/index.d.ts

@@ -1,28 +0,0 @@
-/// <reference types="q" />
-import * as q from 'q';
-export declare type TDnsProvider = 'google';
-export declare type TDnsRecordType = 'A' | 'AAAA' | 'CNAME' | 'PTR' | 'MX' | 'NAPTR' | 'NS' | 'SOA' | 'SRV' | 'TXT';
-/**
- * class dnsly offers methods for working with dns from a dns provider like Google DNS
- */
-export declare class Dnsly {
-    dnsServerIp: string;
-    dnsServerPort: number;
-    dnsSocketInstance: any;
-    /**
-     * constructor for class dnsly
-     */
-    constructor(dnsProviderArg: TDnsProvider);
-    /**
-     * gets a record
-     */
-    getRecord(recordNameArg: string, recordTypeArg: TDnsRecordType): q.Promise<{}>;
-    /**
-     * close the dnsly instance
-     */
-    close(): void;
-    /**
-     * set the DNS provider
-     */
-    private _setDnsProvider(dnsProvider);
-}

dist/index.js

@@ -1,53 +0,0 @@
-"use strict";
-const q = require("q");
-const plugins = require("./dnsly.plugins");
-/**
- * class dnsly offers methods for working with dns from a dns provider like Google DNS
- */
-class Dnsly {
-    /**
-     * constructor for class dnsly
-     */
-    constructor(dnsProviderArg) {
-        this._setDnsProvider(dnsProviderArg);
-        this.dnsSocketInstance = plugins.dnsSocket();
-    }
-    /**
-     * gets a record
-     */
-    getRecord(recordNameArg, recordTypeArg) {
-        let done = q.defer();
-        this.dnsSocketInstance.query({
-            questions: [{
-                    type: recordTypeArg,
-                    name: recordNameArg
-                }]
-        }, this.dnsServerPort, this.dnsServerIp, (err, res) => {
-            if (err) {
-                done.reject(err);
-            }
-            done.resolve(res);
-        });
-        return done.promise;
-    }
-    /**
-     * close the dnsly instance
-     */
-    close() {
-        this.dnsSocketInstance.destroy();
-    }
-    /**
-     * set the DNS provider
-     */
-    _setDnsProvider(dnsProvider) {
-        if (dnsProvider === 'google') {
-            this.dnsServerIp = '8.8.8.8';
-            this.dnsServerPort = 53;
-        }
-        else {
-            throw new Error('unknown dns provider');
-        }
-    }
-}
-exports.Dnsly = Dnsly;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsdUJBQXNCO0FBQ3RCLDJDQUEwQztBQWMxQzs7R0FFRztBQUNIO0lBSUk7O09BRUc7SUFDSCxZQUFZLGNBQTRCO1FBQ3BDLElBQUksQ0FBQyxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUE7UUFDcEMsSUFBSSxDQUFDLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxTQUFTLEVBQUUsQ0FBQTtJQUNoRCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxTQUFTLENBQUMsYUFBcUIsRUFBRSxhQUE2QjtRQUMxRCxJQUFJLElBQUksR0FBRyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDcEIsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEtBQUssQ0FDeEI7WUFDSSxTQUFTLEVBQUUsQ0FBQztvQkFDUixJQUFJLEVBQUUsYUFBYTtvQkFDbkIsSUFBSSxFQUFFLGFBQWE7aUJBQ3RCLENBQUM7U0FDTCxFQUNELElBQUksQ0FBQyxhQUFhLEVBQ2xCLElBQUksQ0FBQyxXQUFXLEVBQ2hCLENBQUMsR0FBRyxFQUFFLEdBQUc7WUFDTCxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNOLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUE7WUFDcEIsQ0FBQztZQUNELElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDckIsQ0FBQyxDQUFDLENBQUE7UUFDTixNQUFNLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQTtJQUN2QixDQUFDO0lBRUQ7O09BRUc7SUFDSCxLQUFLO1FBQ0QsSUFBSSxDQUFDLGlCQUFpQixDQUFDLE9BQU8sRUFBRSxDQUFBO0lBQ3BDLENBQUM7SUFFRDs7T0FFRztJQUNLLGVBQWUsQ0FBQyxXQUF5QjtRQUM3QyxFQUFFLENBQUMsQ0FBQyxXQUFXLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQztZQUMzQixJQUFJLENBQUMsV0FBVyxHQUFHLFNBQVMsQ0FBQTtZQUM1QixJQUFJLENBQUMsYUFBYSxHQUFHLEVBQUUsQ0FBQTtRQUMzQixDQUFDO1FBQUMsSUFBSSxDQUFDLENBQUM7WUFDSixNQUFNLElBQUksS0FBSyxDQUFDLHNCQUFzQixDQUFDLENBQUE7UUFDM0MsQ0FBQztJQUNMLENBQUM7Q0FDSjtBQXJERCxzQkFxREMifQ==

npmextra.json

@@ -0,0 +1,18 @@
+{
+  "gitzone": {
+    "projectType": "npm",
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartdns",
+      "shortDescription": "smart dns methods written in TypeScript",
+      "npmPackagename": "@pushrocks/smartdns",
+      "license": "MIT"
+    }
+  },
+  "npmci": {
+    "npmGlobalTools": [],
+    "npmAccessLevel": "public",
+    "npmRegistryUrl": "registry.npmjs.org"
+  }
+}

package.json

@@ -1,11 +1,13 @@
 {
-  "name": "dnsly",
-  "version": "1.0.2",
+  "name": "@pushrocks/smartdns",
+  "version": "4.0.2",
+  "private": false,
   "description": "smart dns methods written in TypeScript",
   "main": "dist/index.js",
-  "typings": "../dist/index.d.ts",
+  "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)"
+    "test": "(tstest test/)",
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
@@ -23,15 +25,28 @@
   },
   "homepage": "https://gitlab.com/pushrocks/dnsly#README",
   "dependencies": {
-    "@types/q": "0.0.32",
-    "beautylog": "^6.0.0",
-    "dns-socket": "^1.4.2",
-    "q": "^1.4.1",
-    "typings-global": "^1.0.14"
+    "@pushrocks/smartdelay": "^2.0.6",
+    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartrequest": "^1.1.47",
+    "@tsclass/tsclass": "^3.0.6"
   },
   "devDependencies": {
-    "@types/should": "^8.1.30",
-    "should": "^11.1.1",
-    "typings-test": "^1.0.3"
-  }
+    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tstest": "^1.0.28",
+    "@pushrocks/tapbundle": "^3.2.0",
+    "@types/node": "^13.7.1",
+    "tslint": "^6.0.0",
+    "tslint-config-prettier": "^1.18.0"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_web/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

readme.md

@@ -0,0 +1,46 @@
+# @pushrocks/smartdns
+smart dns methods written in TypeScript
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartdns)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartdns)
+* [github.com (source mirror)](https://github.com/pushrocks/smartdns)
+* [docs (typedoc)](https://pushrocks.gitlab.io/smartdns/)
+
+## Status for master
+[![pipeline status](https://gitlab.com/pushrocks/smartdns/badges/master/pipeline.svg)](https://gitlab.com/pushrocks/smartdns/commits/master)
+[![coverage report](https://gitlab.com/pushrocks/smartdns/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartdns/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartdns.svg)](https://www.npmjs.com/package/@pushrocks/smartdns)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartdns/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartdns)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+## Usage
+
+Use TypeScript for best in class instellisense.
+
+```typescript
+const mySmartDns = new smartdns.SmartDns(); // uses Google DNS Https API
+const demoRecord = await mySmartDns.getRecord('example.com', 'AAAA'); // returns promise
+/*
+demoRecord looks like this:
+{
+  name: 'example.com',
+  type: 'A',
+  dnsSecEnabled: true,
+  value: '104.24.103.243'
+}
+*/
+```
+
+## 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)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.d.ts

@@ -1 +0,0 @@
-import 'typings-test';

test/test.js

@@ -1,49 +0,0 @@
-"use strict";
-require("typings-test");
-const should = require("should");
-const dnsly = require("../dist/index");
-let testDnsly;
-describe('dnsly', function () {
-    it('should create an instance of Dnsly', function () {
-        testDnsly = new dnsly.Dnsly('google');
-        should(testDnsly).be.instanceOf(dnsly.Dnsly);
-    });
-    it('should, get a dns record for a domain when called quickly', function (done) {
-        testDnsly.getRecord('google.com', 'A').then(res => {
-            console.log(res);
-            done();
-        }).catch(err => {
-            console.log(err);
-            done(err);
-        });
-    });
-    it('should, get a dns record for a domain when called with timeout', function (done) {
-        setTimeout(() => {
-            testDnsly.getRecord('google.com', 'A').then(res => {
-                console.log(res);
-                done();
-            }).catch(err => {
-                console.log(err);
-                done(err);
-            });
-        }, 1000);
-    });
-    it('should get a dns record for a domain when called with second instance and timeout', function (done) {
-        this.timeout(10000);
-        let testDnsly2 = new dnsly.Dnsly('google');
-        setTimeout(() => {
-            testDnsly2.getRecord('google.com', 'MX').then(res => {
-                console.log(res);
-                done();
-                testDnsly2.close();
-            }).catch(err => {
-                console.log(err);
-                done(err);
-            });
-        }, 5000);
-    });
-    it('should close the instance', function () {
-        testDnsly.close();
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQixpQ0FBZ0M7QUFFaEMsdUNBQXNDO0FBRXRDLElBQUksU0FBc0IsQ0FBQTtBQUUxQixRQUFRLENBQUMsT0FBTyxFQUFFO0lBQ2QsRUFBRSxDQUFDLG9DQUFvQyxFQUFFO1FBQ3JDLFNBQVMsR0FBRyxJQUFJLEtBQUssQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDckMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQ2hELENBQUMsQ0FBQyxDQUFBO0lBRUYsRUFBRSxDQUFDLDJEQUEyRCxFQUFFLFVBQVUsSUFBSTtRQUMxRSxTQUFTLENBQUMsU0FBUyxDQUFDLFlBQVksRUFBRSxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRztZQUMzQyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLElBQUksRUFBRSxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUc7WUFDUixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2hCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNiLENBQUMsQ0FBQyxDQUFBO0lBRU4sQ0FBQyxDQUFDLENBQUE7SUFFRixFQUFFLENBQUMsZ0VBQWdFLEVBQUUsVUFBVSxJQUFJO1FBQy9FLFVBQVUsQ0FBQztZQUNQLFNBQVMsQ0FBQyxTQUFTLENBQUMsWUFBWSxFQUFFLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHO2dCQUMzQyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNoQixJQUFJLEVBQUUsQ0FBQTtZQUNWLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHO2dCQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQ2hCLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUNiLENBQUMsQ0FBQyxDQUFBO1FBQ04sQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFBO0lBRVosQ0FBQyxDQUFDLENBQUE7SUFDRixFQUFFLENBQUMsbUZBQW1GLEVBQUUsVUFBVSxJQUFJO1FBQ2xHLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDbkIsSUFBSSxVQUFVLEdBQUcsSUFBSSxLQUFLLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQzFDLFVBQVUsQ0FBQztZQUNQLFVBQVUsQ0FBQyxTQUFTLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHO2dCQUM3QyxPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO2dCQUNoQixJQUFJLEVBQUUsQ0FBQTtnQkFDTixVQUFVLENBQUMsS0FBSyxFQUFFLENBQUE7WUFDdEIsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUc7Z0JBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtnQkFDaEIsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2IsQ0FBQyxDQUFDLENBQUE7UUFDTixDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUE7SUFFWixDQUFDLENBQUMsQ0FBQTtJQUVGLEVBQUUsQ0FBQywyQkFBMkIsRUFBRTtRQUM1QixTQUFTLENBQUMsS0FBSyxFQUFFLENBQUE7SUFDckIsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDLENBQUMsQ0FBQSJ9

test/test.ts

@@ -1,28 +1,76 @@
-import 'typings-test'
-import * as should from 'should'
+import { expect, tap } from '@pushrocks/tapbundle';
 
-import * as dnsly from '../dist/index'
+import * as smartdns from '../ts/index';
 
-let testDnsly: dnsly.Dnsly
+let testDnsly: smartdns.Smartdns;
 
-describe('dnsly', function () {
-    it('should create an instance of Dnsly', function () {
-        testDnsly = new dnsly.Dnsly('google')
-        should(testDnsly).be.instanceOf(dnsly.Dnsly)
-    })
+tap.test('should create an instance of Dnsly', async () => {
+  testDnsly = new smartdns.Smartdns({});
+  expect(testDnsly).to.be.instanceOf(smartdns.Smartdns);
+});
 
-    it('should, get a dns record for a domain', function (done) {
-        testDnsly.getRecord('google.com', 'A').then(res => {
-            console.log(res)
-            done()
-        }).catch(err => {
-            console.log(err)
-            done(err)
-        })
+tap.test('should get an A DNS Record', async () => {
+  return expect(testDnsly.getRecordA('dnsly_a.bleu.de')).to.eventually.deep.equal([
+    {
+      name: 'dnsly_a.bleu.de',
+      value: '127.0.0.1',
+      dnsSecEnabled: false,
+      type: 'A'
+    }
+  ]);
+});
 
-    })
+tap.test('should get an AAAA Record', async () => {
+  return expect(testDnsly.getRecordAAAA('dnsly_aaaa.bleu.de')).to.eventually.deep.equal([
+    {
+      name: 'dnsly_aaaa.bleu.de',
+      value: '::1',
+      dnsSecEnabled: false,
+      type: 'AAAA'
+    }
+  ]);
+});
 
-    it('should close the instance', function () {
-        testDnsly.close()
-    })
-})
+tap.test('should get a txt record', async () => {
+  return expect(testDnsly.getRecordTxt('dnsly_txt.bleu.de')).to.eventually.deep.equal([
+    {
+      name: 'dnsly_txt.bleu.de',
+      value: 'sometext_txt',
+      type: 'TXT',
+      dnsSecEnabled: false
+    }
+  ]);
+});
+
+tap.test('should, get a mx record for a domain', async () => {
+  const res = await testDnsly.getRecord('bleu.de', 'MX');
+  console.log(res);
+});
+
+tap.test('should check until DNS is available', async () => {
+  return expect(testDnsly.checkUntilAvailable('dnsly_txt.bleu.de', 'TXT', 'sometext_txt')).to
+    .eventually.be.true;
+});
+
+tap.test('should check until DNS is available an return false if it fails', async () => {
+  return expect(testDnsly.checkUntilAvailable('dnsly_txt.bleu.de', 'TXT', 'sometext_txt2')).to
+    .eventually.be.false;
+});
+
+tap.test('should check until DNS is available an return false if it fails', async () => {
+  return expect(testDnsly.checkUntilAvailable('dnsly_txtNotThere.bleu.de', 'TXT', 'sometext_txt2'))
+    .to.eventually.be.false;
+});
+
+tap.test('should get name server for hostname', async () => {
+  let result = await testDnsly.getNameServer('bleu.de');
+  console.log(result);
+});
+
+tap.test('should detect dns sec', async () => {
+  const result = await testDnsly.getRecordA('lossless.com');
+  console.log(result[0]);
+  expect(result[0].dnsSecEnabled).to.be.true;
+});
+
+tap.start();

ts/dnsly.plugins.ts

@@ -1,8 +1,15 @@
-import 'typings-global'
-import * as beautylog from 'beautylog'
-let dnsSocket = require('dns-socket')
+// node native scope
+import * as dns from 'dns';
 
-export {
-    beautylog,
-    dnsSocket
-}
+export { dns };
+
+// pushrocks scope
+import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartrequest from '@pushrocks/smartrequest';
+
+export { smartdelay, smartpromise, smartrequest };
+
+import * as tsclass from '@tsclass/tsclass';
+
+export { tsclass };

ts/index.ts

@@ -1,72 +1,202 @@
-import * as q from 'q'
-import * as plugins from './dnsly.plugins'
+import * as plugins from './dnsly.plugins';
 
-export type TDnsProvider = 'google'
-export type TDnsRecordType = 'A'
-    | 'AAAA'
-    | 'CNAME'
-    | 'PTR'
-    | 'MX'
-    | 'NAPTR'
-    | 'NS'
-    | 'SOA'
-    | 'SRV'
-    | 'TXT'
+export type TDnsProvider = 'google' | 'cloudflare';
+
+export interface ISmartDnsConstructorOptions {}
+
+export interface IGoogleDNSHTTPSResponse {
+  Status: number;
+  TC: boolean;
+  RD: boolean;
+  RA: boolean;
+  AD: boolean;
+  CD: boolean;
+  Question: Array<{ name: string; type: number }>;
+  Answer: Array<{ name: string; type: number; TTL: number; data: string }>;
+  Additional: [];
+  Comment: string;
+}
 
 /**
  * class dnsly offers methods for working with dns from a dns provider like Google DNS
  */
-export class Dnsly {
-    dnsServerIp: string
-    dnsServerPort: number
-    dnsSocketInstance
-    /**
-     * constructor for class dnsly
-     */
-    constructor(dnsProviderArg: TDnsProvider) {
-        this._setDnsProvider(dnsProviderArg)
-        this.dnsSocketInstance = plugins.dnsSocket()
-    }
+export class Smartdns {
+  public dnsServerIp: string;
+  public dnsServerPort: number;
 
-    /**
-     * gets a record
-     */
-    getRecord(recordNameArg: string, recordTypeArg: TDnsRecordType) {
-        let done = q.defer()
-        this.dnsSocketInstance.query(
-            {
-                questions: [{
-                    type: recordTypeArg,
-                    name: recordNameArg
-                }]
-            },
-            this.dnsServerPort,
-            this.dnsServerIp,
-            (err, res) => {
-                if (err) {
-                    done.reject(err)
-                }
-                done.resolve(res)
-            })
-        return done.promise
-    }
+  public dnsTypeMap: { [key: string]: number } = {
+    A: 1,
+    AAAA: 28,
+    CNAME: 5,
+    MX: 15,
+    TXT: 16
+  };
 
-    /**
-     * close the dnsly instance
-     */
-    close() {
-        this.dnsSocketInstance.destroy()
-    }
+  /**
+   * constructor for class dnsly
+   */
+  constructor(optionsArg: ISmartDnsConstructorOptions) {}
 
-    /**
-     * set the DNS provider
-     */
-    private _setDnsProvider(dnsProvider: TDnsProvider) {
-        if (dnsProvider === 'google') {
-            this.dnsServerIp = '8.8.8.8'
-            this.dnsServerPort = 53
-        } else {
-            throw new Error('unknown dns provider')
+  /**
+   * check a dns record until it has propagated to Google DNS
+   * should be considerably fast
+   * @param recordNameArg
+   * @param recordTypeArg
+   * @param expectedValue
+   */
+  public async checkUntilAvailable(
+    recordNameArg: string,
+    recordTypeArg: plugins.tsclass.network.TDnsRecordType,
+    expectedValue: string,
+    cyclesArg: number = 50,
+    intervalArg: number = 500
+  ) {
+    let runCycles = 0;
+    const doCheck = async () => {
+      if (runCycles < cyclesArg) {
+        runCycles++;
+        try {
+          const myRecordArray = await this.getRecord(recordNameArg, recordTypeArg);
+          const myRecord = myRecordArray[0].value;
+          if (myRecord === expectedValue) {
+            return true;
+          } else {
+            await plugins.smartdelay.delayFor(intervalArg);
+            return await doCheck();
+          }
+        } catch (err) {
+          await plugins.smartdelay.delayFor(intervalArg);
+          return await doCheck();
         }
+      } else {
+        console.log('failed permanently...');
+        return false;
+      }
+    };
+    return await doCheck();
+  }
+
+  /**
+   * get A Dns Record
+   */
+  public async getRecordA(recordNameArg: string): Promise<plugins.tsclass.network.IDnsRecord[]> {
+    return await this.getRecord(recordNameArg, 'A');
+  }
+
+  /**
+   * get AAAA Record
+   */
+  public async getRecordAAAA(recordNameArg: string) {
+    return await this.getRecord(recordNameArg, 'AAAA');
+  }
+
+  /**
+   * gets a txt record
+   */
+  public async getRecordTxt(recordNameArg: string): Promise<plugins.tsclass.network.IDnsRecord[]> {
+    return await this.getRecord(recordNameArg, 'TXT');
+  }
+
+  public async getRecord(
+    recordNameArg: string,
+    recordTypeArg: plugins.tsclass.network.TDnsRecordType
+  ): Promise<plugins.tsclass.network.IDnsRecord[]> {
+    const requestUrl = `https://dns.google/resolve?name=${recordNameArg}&type=${recordTypeArg}&do=1`;
+    const response = await plugins.smartrequest.request(requestUrl, {
+      method: 'GET'
+    });
+    const returnArray: plugins.tsclass.network.IDnsRecord[] = [];
+    const responseBody: IGoogleDNSHTTPSResponse = response.body;
+    for (const dnsEntry of responseBody.Answer) {
+      if (dnsEntry.data.startsWith('"') && dnsEntry.data.endsWith('"')) {
+        dnsEntry.data = dnsEntry.data.replace(/^"(.*)"$/, '$1');
+      }
+      if (dnsEntry.name.endsWith('.')) {
+        dnsEntry.name = dnsEntry.name.substring(0, dnsEntry.name.length - 1);
+      }
+      returnArray.push({
+        name: dnsEntry.name,
+        type: this.convertDnsTypeNumberToTypeName(dnsEntry.type),
+        dnsSecEnabled: responseBody.AD,
+        value: dnsEntry.data
+      });
     }
+    // console.log(responseBody);
+    return returnArray;
+  }
+
+  /**
+   * gets a record using nodejs dns resolver
+   */
+  public async getRecordWithNodeDNS(
+    recordNameArg: string,
+    recordTypeArg: plugins.tsclass.network.TDnsRecordType
+  ): Promise<plugins.tsclass.network.IDnsRecord[]> {
+    const done = plugins.smartpromise.defer<plugins.tsclass.network.IDnsRecord[]>();
+    plugins.dns.resolve(recordNameArg, recordTypeArg, (err, recordsArg) => {
+      if (err) {
+        done.reject(err);
+        return;
+      }
+      const returnArray: plugins.tsclass.network.IDnsRecord[] = [];
+      for (const recordKey in recordsArg) {
+        returnArray.push({
+          name: recordNameArg,
+          value: recordsArg[recordKey],
+          type: recordTypeArg,
+          dnsSecEnabled: false
+        });
+      }
+      done.resolve(returnArray);
+    });
+    return done.promise;
+  }
+
+  public async getNameServer(domainNameArg: string): Promise<string[]> {
+    const done = plugins.smartpromise.defer<string[]>();
+    plugins.dns.resolveNs(domainNameArg, (err, result) => {
+      if (!err) {
+        done.resolve(result);
+      } else {
+        console.log(err);
+        done.reject(err);
+      }
+    });
+    return await done.promise;
+  }
+
+  /**
+   * set the DNS provider
+   */
+  public setNodeDnsProvider(dnsProvider: TDnsProvider) {
+    console.log(
+      `Warning: Setting the nodejs dns authority to ${dnsProvider}. Only do this if you know what you are doing.`
+    );
+    if (dnsProvider === 'google') {
+      this.dnsServerIp = '8.8.8.8';
+      this.dnsServerPort = 53;
+      plugins.dns.setServers(['8.8.8.8', '8.8.4.4']);
+    } else if (dnsProvider === 'cloudflare') {
+      this.dnsServerIp = '1.1.1.1';
+      this.dnsServerPort = 53;
+      plugins.dns.setServers(['1.1.1.1', '1.0.0.1']);
+    } else {
+      throw new Error('unknown dns provider');
+    }
+  }
+
+  public convertDnsTypeNameToTypeNumber(dnsTypeNameArg: string): number {
+    return this.dnsTypeMap[dnsTypeNameArg];
+  }
+
+  public convertDnsTypeNumberToTypeName(
+    dnsTypeNumberArg: number
+  ): plugins.tsclass.network.TDnsRecordType {
+    for (const key in this.dnsTypeMap) {
+      if (this.dnsTypeMap[key] === dnsTypeNumberArg) {
+        return key as plugins.tsclass.network.TDnsRecordType;
+      }
+    }
+    return null;
+  }
 }

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
 }