3.0.6

.gitignore

@@ -1,4 +1,4 @@
 node_modules/
 pages/
 public/
-
+coverage/

.gitlab-ci.yml

@@ -1,59 +1,150 @@
-image: hosttoday/ht-docker-node:npmts
+# gitzone standard
+image: hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+  - .npmci_cache/
+  key: "$CI_BUILD_STAGE"
 
 stages:
+- security
 - test
 - release
-- trigger
+- metadata
-- pages
 
-testLEGACY:
+# ====================
-  stage: test
+# security stage
+# ====================
+mirror:
+  stage: security
   script:
-    - npmci test legacy
+  - npmci git mirror
   tags:
-    - docker
+  - docker
+  - notpriv
+
+snyk:
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
+  tags:
+  - docker
+  - notpriv
+
+sast:
+  stage: security
+  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
+  variables:
+    DOCKER_DRIVER: overlay2
   allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command npm run build
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
+        --volume "$PWD:/code"
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
+  artifacts:
+    reports:
+      sast: gl-sast-report.json
+  tags:
+  - docker
+  - priv
+
+# ====================
+# test stage
+# ====================
 
 testLTS:
   stage: test
   script:
-    - npmci test lts
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
+  - notpriv
     
 testSTABLE:
   stage: test
   script:
-    - npmci test stable
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
+  - notpriv
 
 release:
   stage: release
   script:
-    - npmci publish
+  - npmci node install stable
+  - npmci npm publish
   only:
-    - tags
+  - tags
   tags:
-    - docker
+  - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  image: docker:stable
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SOURCE_CODE="$PWD"
+        --volume "$PWD":/code
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
+  artifacts:
+    paths: [codeclimate.json]
+  tags:
+  - docker
+  - priv
 
 trigger:
-  stage: trigger
+  stage: metadata
   script:
-    - npmci trigger
+  - npmci trigger
   only:
-    - tags
+  - tags
   tags:
-    - docker
+  - docker
+  - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmpage
+  image: hosttoday/ht-docker-node:npmci
-  stage: pages
+  stage: metadata
   script:
-    - npmci command npmpage --host gitlab
+    - npmci command npm install -g typedoc typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+  tags:
+    - docker
+    - notpriv
   only:
     - tags
   artifacts:
     expire_in: 1 week
     paths:
     - public
+  allow_failure: true

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,10 @@
+{
+  "gitzone": {
+    "compliance": "standard"
+  },
+  "npmci": {
+    "npmGlobalTools": [],
+    "npmAccessLevel": "public",
+    "npmRegistryUrl": "registry.npmjs.org"
+  }
+}

package.json

@@ -1,11 +1,13 @@
 {
-  "name": "dnsly",
+  "name": "@pushrocks/smartdns",
-  "version": "1.0.2",
+  "version": "3.0.6",
+  "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,15 @@
   },
   "homepage": "https://gitlab.com/pushrocks/dnsly#README",
   "dependencies": {
-    "@types/q": "0.0.32",
+    "@pushrocks/smartdelay": "^2.0.2",
-    "beautylog": "^6.0.0",
+    "@pushrocks/smartpromise": "^2.0.5"
-    "dns-socket": "^1.4.2",
-    "q": "^1.4.1",
-    "typings-global": "^1.0.14"
   },
   "devDependencies": {
-    "@types/should": "^8.1.30",
+    "@gitzone/tsbuild": "^2.1.4",
-    "should": "^11.1.1",
+    "@gitzone/tstest": "^1.0.18",
-    "typings-test": "^1.0.3"
+    "@pushrocks/tapbundle": "^3.0.7",
+    "@types/node": "^10.12.18",
+    "tslint": "^5.12.0",
+    "tslint-config-prettier": "^1.17.0"
   }
 }

readme.md

@@ -0,0 +1,43 @@
+# @pushrocks/smartdns
+
+smart dns methods written in TypeScript
+
+## Availabililty
+
+[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/@pushrocks/smartdns)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartdns)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartdns)
+[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartdns/)
+
+## Status for master
+
+[![build status](https://GitLab.com/pushrocks/smartdns/badges/master/build.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)
+[![Dependency Status](https://david-dm.org/pushrocks/smartdns.svg)](https://david-dm.org/pushrocks/smartdns)
+[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartdns/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartdns/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/pushrocks/smartdns/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartdns)
+[![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
+
+Use TypeScript for best in class instellisense.
+
+```typescript
+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: dnsly.I_AAAA) => {
+    // AAAA record for google.com, the I_AAAA will give you proper typings for the record return type
+    // do something
+  });
+```
+
+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.html)
+
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

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,68 @@
-import 'typings-test'
+import { expect, tap } from '@pushrocks/tapbundle';
-import * as should from 'should'
 
-import * as dnsly from '../dist/index'
+import * as smartdns from '../ts/index';
 
-let testDnsly: dnsly.Dnsly
+let testDnsly: smartdns.Smartdns;
 
-describe('dnsly', function () {
+tap.test('should create an instance of Dnsly', async () => {
-    it('should create an instance of Dnsly', function () {
+  testDnsly = new smartdns.Smartdns('cloudflare');
-        testDnsly = new dnsly.Dnsly('google')
+  expect(testDnsly).to.be.instanceOf(smartdns.Smartdns);
-        should(testDnsly).be.instanceOf(dnsly.Dnsly)
+});
-    })
 
-    it('should, get a dns record for a domain', function (done) {
+tap.test('should get an A DNS Record', async () => {
-        testDnsly.getRecord('google.com', 'A').then(res => {
+  return expect(testDnsly.getRecordA('dnsly_a.bleu.de')).to.eventually.deep.equal([
-            console.log(res)
+    {
-            done()
+      name: 'dnsly_a.bleu.de',
-        }).catch(err => {
+      value: '127.0.0.1',
-            console.log(err)
+      type: 'A'
-            done(err)
+    }
-        })
+  ]);
+});
 
-    })
+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',
+      type: 'AAAA'
+    }
+  ]);
+});
 
-    it('should close the instance', function () {
+tap.test('should get a txt record', async () => {
-        testDnsly.close()
+  return expect(testDnsly.getRecordTxt('dnsly_txt.bleu.de')).to.eventually.deep.equal([
-    })
+    {
-})
+      chunked: ['sometext_txt'],
+      name: 'dnsly_txt.bleu.de',
+      value: 'sometext_txt',
+      type: 'TXT'
+    }
+  ]);
+});
+
+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.start();

ts/dnsly.plugins.ts

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

ts/index.ts

@@ -1,72 +1,163 @@
-import * as q from 'q'
+import * as plugins from './dnsly.plugins';
-import * as plugins from './dnsly.plugins'
 
-export type TDnsProvider = 'google'
+export type TDnsProvider = 'google' | 'cloudflare';
-export type TDnsRecordType = 'A'
+export type TDnsRecordType =
-    | 'AAAA'
+  | 'A'
-    | 'CNAME'
+  | 'AAAA'
-    | 'PTR'
+  | 'CNAME'
-    | 'MX'
+  | 'PTR'
-    | 'NAPTR'
+  | 'MX'
-    | 'NS'
+  | 'NAPTR'
-    | 'SOA'
+  | 'NS'
-    | 'SRV'
+  | 'SOA'
-    | 'TXT'
+  | 'SRV'
+  | 'TXT';
+
+export interface IDnsRecord {
+  chunked?: string[];
+  name: string;
+  type: TDnsRecordType;
+  value: string;
+}
 
 /**
  * class dnsly offers methods for working with dns from a dns provider like Google DNS
  */
-export class Dnsly {
+export class Smartdns {
-    dnsServerIp: string
+  dnsServerIp: string;
-    dnsServerPort: number
+  dnsServerPort: number;
-    dnsSocketInstance
+  /**
-    /**
+   * constructor for class dnsly
-     * constructor for class dnsly
+   */
-     */
+  constructor(dnsProviderArg: TDnsProvider = 'cloudflare') {
-    constructor(dnsProviderArg: TDnsProvider) {
+    this._setDnsProvider(dnsProviderArg);
-        this._setDnsProvider(dnsProviderArg)
+  }
-        this.dnsSocketInstance = plugins.dnsSocket()
-    }
 
-    /**
+  /**
-     * gets a record
+   * check a dns record until it has propagated to Google DNS
-     */
+   * should be considerably fast
-    getRecord(recordNameArg: string, recordTypeArg: TDnsRecordType) {
+   * @param recordNameArg
-        let done = q.defer()
+   * @param recordTypeArg
-        this.dnsSocketInstance.query(
+   * @param expectedValue
-            {
+   */
-                questions: [{
+  async checkUntilAvailable(
-                    type: recordTypeArg,
+    recordNameArg: string,
-                    name: recordNameArg
+    recordTypeArg: TDnsRecordType,
-                }]
+    expectedValue: string
-            },
+  ) {
-            this.dnsServerPort,
+    let cycleArg = 0;
-            this.dnsServerIp,
+    let doCheck = async () => {
-            (err, res) => {
+      if (cycleArg < 30) {
-                if (err) {
+        cycleArg++;
-                    done.reject(err)
+        try {
-                }
+          let myRecordArray = await this.getRecord(recordNameArg, recordTypeArg);
-                done.resolve(res)
+          let myRecord = myRecordArray[0].value[0];
-            })
+          if (myRecord === expectedValue) {
-        return done.promise
+            return true;
-    }
+          } else {
-
+            await plugins.smartdelay.delayFor(2000);
-    /**
+            return await doCheck();
-     * close the dnsly instance
+          }
-     */
+        } catch (err) {
-    close() {
+          await plugins.smartdelay.delayFor(2000);
-        this.dnsSocketInstance.destroy()
+          return await doCheck();
-    }
-
-    /**
-     * 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')
         }
+      } else {
+        console.log('failed permanently...');
+        return false;
+      }
+    };
+    return await doCheck();
+  }
+
+  /**
+   * get A Dns Record
+   */
+  async getRecordA(recordNameArg: string): Promise<IDnsRecord[]> {
+    return await this.getRecord(recordNameArg, 'A');
+  }
+
+  /**
+   * get AAAA Record
+   */
+  async getRecordAAAA(recordNameArg: string) {
+    return await this.getRecord(recordNameArg, 'AAAA');
+  }
+
+  /**
+   * gets a txt record
+   */
+  getRecordTxt(recordNameArg: string): Promise<IDnsRecord[]> {
+    let done = plugins.smartpromise.defer<IDnsRecord[]>();
+    plugins.dns.resolveTxt(recordNameArg, (err, recordsArg) => {
+      if (err) {
+        done.reject(err);
+        return;
+      }
+      let responseArray: IDnsRecord[] = [];
+      for (let record of recordsArg) {
+        let recordAny: any = record; // fix wrong typings
+        responseArray.push({
+          chunked: recordAny,
+          name: recordNameArg,
+          value: recordAny.join(' '),
+          type: 'TXT'
+        });
+      }
+      done.resolve(responseArray);
+    });
+    return done.promise;
+  }
+
+  /**
+   * get oridinary record
+   */
+  getRecord(recordNameArg: string, recordTypeArg: TDnsRecordType): Promise<IDnsRecord[]> {
+    let done = plugins.smartpromise.defer<IDnsRecord[]>();
+    plugins.dns.resolve(recordNameArg, recordTypeArg, (err, recordsArg) => {
+      if (err) {
+        done.reject(err);
+        return;
+      }
+      let responseArray: IDnsRecord[] = [];
+      for (let recordKey in recordsArg) {
+        responseArray.push({
+          name: recordNameArg,
+          value: recordsArg[recordKey],
+          type: recordTypeArg
+        });
+      }
+      done.resolve(responseArray);
+    });
+    return done.promise;
+  }
+
+  getNameServer(domainNameArg: string) {
+    const done = plugins.smartpromise.defer();
+    plugins.dns.resolveNs(domainNameArg, (err, result) => {
+      if (!err) {
+        done.resolve(result);
+      } else {
+        console.log(err);
+        done.reject(err);
+      }
+    });
+  }
+
+  /**
+   * set the DNS provider
+   */
+  private _setDnsProvider(dnsProvider: TDnsProvider) {
+    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');
     }
-}
+  }
+}

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"
 }