5.0.3

.gitignore

@@ -1,4 +1,20 @@
-node_modules/
+.nogit/
-pages/
+
-public/
+# artifacts
 coverage/
+public/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_*/
+
+# custom

.gitlab-ci.yml

@@ -1,144 +1,122 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
+
+before_script:
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
 
 # ====================
 # security stage
 # ====================
-mirror:
+# ====================
+# security stage
+# ====================
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-  - npmci git mirror
+     - npmci command npm config set registry https://registry.npmjs.org
+     - npmci command pnpm audit --audit-level=high --prod
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
-
-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
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
   script:
-    - npmci npm prepare
+    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci npm install
+    - npmci command pnpm audit --audit-level=high --dev
-    - 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
+    - lossless
-  - priv
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
 # ====================
 
-testLTS:
+testStable:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci node install stable
-  - npmci node install lts
+    - npmci npm install
-  - npmci npm install
+    - npmci npm test
-  - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - notpriv
+
-    
+testBuild:
-testSTABLE:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci node install stable
-  - npmci node install stable
+    - npmci npm install
-  - npmci npm install
+    - npmci npm build
-  - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
+  only:
-    - docker:stable-dind
+    - tags
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - npmci command npm install -g typescript
-    - docker run
+    - npmci npm prepare
-        --env SOURCE_CODE="$PWD"
+    - npmci npm install
-        --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
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci node install stable
-    - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command npm run buildDocs
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -146,5 +124,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "npm test",
+      "name": "Run npm test",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

.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", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -1,6 +1,14 @@
 {
   "gitzone": {
-    "compliance": "standard"
+    "projectType": "npm",
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartdns",
+      "description": "smart dns methods written in TypeScript",
+      "npmPackagename": "@pushrocks/smartdns",
+      "license": "MIT"
+    }
   },
   "npmci": {
     "npmGlobalTools": [],

package.json

@@ -1,13 +1,14 @@
 {
   "name": "@pushrocks/smartdns",
-  "version": "3.0.5",
+  "version": "5.0.3",
   "private": false,
   "description": "smart dns methods written in TypeScript",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web --allowimplicitany)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
@@ -25,15 +26,34 @@
   },
   "homepage": "https://gitlab.com/pushrocks/dnsly#README",
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.2",
+    "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartpromise": "^2.0.5"
+    "@pushrocks/smartenv": "^5.0.2",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartrequest": "^2.0.11",
+    "@tsclass/tsclass": "^4.0.17",
+    "dns2": "^2.0.5"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.4",
+    "@gitzone/tsbuild": "^2.1.63",
-    "@gitzone/tstest": "^1.0.18",
+    "@gitzone/tsrun": "^1.2.39",
-    "@pushrocks/tapbundle": "^3.0.7",
+    "@gitzone/tstest": "^1.0.72",
-    "@types/node": "^10.12.18",
+    "@pushrocks/tapbundle": "^5.0.4",
-    "tslint": "^5.12.0",
+    "@types/node": "^18.6.1"
-    "tslint-config-prettier": "^1.17.0"
+  },
-  }
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
+  ],
+  "type": "module"
 }

readme.md

@@ -1,43 +1,51 @@
 # @pushrocks/smartdns
-
 smart dns methods written in TypeScript
 
-## Availabililty
+## Availabililty and Links
-
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartdns)
-[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/@pushrocks/smartdns)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartdns)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartdns)
+* [github.com (source mirror)](https://github.com/pushrocks/smartdns)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartdns)
+* [docs (typedoc)](https://pushrocks.gitlab.io/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)
+Status Category | Status Badge
-[![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)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartdns/badges/master/pipeline.svg)](https://lossless.cloud)
-[![Dependency Status](https://david-dm.org/pushrocks/smartdns.svg)](https://david-dm.org/pushrocks/smartdns)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartdns/badges/master/coverage.svg)](https://lossless.cloud)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartdns/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartdns/master/dependencies/npm)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartdns)](https://lossless.cloud)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/smartdns/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartdns)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartdns)](https://lossless.cloud)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+node Support | [![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-standard-brightgreen.svg)](http://standardjs.com/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartdns)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartdns)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartdns)](https://lossless.cloud)
 
 ## 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
+const mySmartDns = new smartdns.SmartDns(); // uses Google DNS Https API
-myDnsly
+const demoRecord = await mySmartDns.getRecord('example.com', 'AAAA'); // returns promise
-  .getRecord('example.com', 'AAAA') // returns promise
+/*
-  .then((record: dnsly.I_AAAA) => {
+demoRecord looks like this:
-    // AAAA record for google.com, the I_AAAA will give you proper typings for the record return type
+{
-    // do something
+  name: 'example.com',
-  });
+  type: 'A',
+  dnsSecEnabled: true,
+  value: '104.24.103.243'
+}
+*/
 ```
 
-For further information read the linked docs at the top of this README.
+## Contribution
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+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). :)
-> | 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)
+For further information read the linked docs at the top of this readme.
+
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)

test/test.ts

@@ -1,42 +1,44 @@
 import { expect, tap } from '@pushrocks/tapbundle';
 
-import * as smartdns from '../ts/index';
+import * as smartdns from '../ts/index.js';
 
 let testDnsly: smartdns.Smartdns;
 
 tap.test('should create an instance of Dnsly', async () => {
-  testDnsly = new smartdns.Smartdns('google');
+  testDnsly = new smartdns.Smartdns({});
-  expect(testDnsly).to.be.instanceOf(smartdns.Smartdns);
+  expect(testDnsly).toBeInstanceOf(smartdns.Smartdns);
 });
 
 tap.test('should get an A DNS Record', async () => {
-  return expect(testDnsly.getRecordA('dnsly_a.bleu.de')).to.eventually.deep.equal([
+  return expect(await testDnsly.getRecordA('dnsly_a.bleu.de')).toEqual([
     {
       name: 'dnsly_a.bleu.de',
       value: '127.0.0.1',
-      type: 'A'
+      dnsSecEnabled: false,
-    }
+      type: 'A',
+    },
   ]);
 });
 
 tap.test('should get an AAAA Record', async () => {
-  return expect(testDnsly.getRecordAAAA('dnsly_aaaa.bleu.de')).to.eventually.deep.equal([
+  return expect(await testDnsly.getRecordAAAA('dnsly_aaaa.bleu.de')).toEqual([
     {
       name: 'dnsly_aaaa.bleu.de',
       value: '::1',
-      type: 'AAAA'
+      dnsSecEnabled: false,
-    }
+      type: 'AAAA',
+    },
   ]);
 });
 
 tap.test('should get a txt record', async () => {
-  return expect(testDnsly.getRecordTxt('dnsly_txt.bleu.de')).to.eventually.deep.equal([
+  return expect(await testDnsly.getRecordTxt('dnsly_txt.bleu.de')).toEqual([
     {
-      chunked: ['sometext_txt'],
       name: 'dnsly_txt.bleu.de',
       value: 'sometext_txt',
-      type: 'TXT'
+      type: 'TXT',
-    }
+      dnsSecEnabled: false,
+    },
   ]);
 });
 
@@ -46,18 +48,21 @@ tap.test('should, get a mx record for a domain', async () => {
 });
 
 tap.test('should check until DNS is available', async () => {
-  return expect(testDnsly.checkUntilAvailable('dnsly_txt.bleu.de', 'TXT', 'sometext_txt')).to
+  return expect(
-    .eventually.be.true;
+    await testDnsly.checkUntilAvailable('dnsly_txt.bleu.de', 'TXT', 'sometext_txt')
+  ).toBeTrue();
 });
 
 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
+  return expect(
-    .eventually.be.false;
+    await testDnsly.checkUntilAvailable('dnsly_txt.bleu.de', 'TXT', 'sometext_txt2')
+  ).toBeFalse();
 });
 
 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'))
+  return expect(
-    .to.eventually.be.false;
+    await testDnsly.checkUntilAvailable('dnsly_txtNotThere.bleu.de', 'TXT', 'sometext_txt2')
+  ).toBeFalse();
 });
 
 tap.test('should get name server for hostname', async () => {
@@ -65,4 +70,10 @@ tap.test('should get name server for hostname', async () => {
   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).toBeTrue();
+});
+
 tap.start();

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/smartdns',
+  version: '5.0.3',
+  description: 'smart dns methods written in TypeScript'
+}

ts/dnsly.plugins.ts

@@ -1,5 +1,22 @@
-import * as dns from 'dns';
+import * as smartenv from '@pushrocks/smartenv';
+const smartenvInstance = new smartenv.Smartenv();
+// node native scope
+import type dnsType from 'dns';
+const dns: typeof dnsType = await smartenvInstance.getSafeNodeModule('dns');
+
+export { dns };
+
+// pushrocks scope
 import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartrequest from '@pushrocks/smartrequest';
 
-export { dns, smartdelay, smartpromise };
+export { smartdelay, smartenv, smartpromise, smartrequest };
+
+import * as tsclass from '@tsclass/tsclass';
+
+export { tsclass };
+
+// third party scope
+const dns2 = smartenvInstance.getSafeNodeModule('dns2');
+export { dns2 };

ts/index.ts

@@ -1,37 +1,61 @@
-import * as plugins from './dnsly.plugins';
+import * as plugins from './dnsly.plugins.js';
 
-export type TDnsProvider = 'google';
+export type TDnsProvider = 'google' | 'cloudflare';
-export type TDnsRecordType =
-  | 'A'
-  | 'AAAA'
-  | 'CNAME'
-  | 'PTR'
-  | 'MX'
-  | 'NAPTR'
-  | 'NS'
-  | 'SOA'
-  | 'SRV'
-  | 'TXT';
 
-export interface IDnsRecord {
+export const makeNodeProcessUseDnsProvider = (providerArg: TDnsProvider) => {
-  chunked?: string[];
+  switch (providerArg) {
-  name: string;
+    case 'cloudflare':
-  type: TDnsRecordType;
+      plugins.dns.setServers([
-  value: string;
+        '1.1.1.1',
+        '1.0.0.1',
+        '[2606:4700:4700::1111]',
+        '[2606:4700:4700::1001]',
+      ]);
+      break;
+    case 'google':
+      plugins.dns.setServers([
+        '8.8.8.8',
+        '8.8.4.4',
+        '[2001:4860:4860::8888]',
+        '[2606:4700:4700::1001]',
+      ]);
+  }
+};
+
+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 Smartdns {
-  dnsServerIp: string;
+  public dnsServerIp: string;
-  dnsServerPort: number;
+  public dnsServerPort: number;
+
+  public dnsTypeMap: { [key: string]: number } = {
+    A: 1,
+    AAAA: 28,
+    CNAME: 5,
+    MX: 15,
+    TXT: 16,
+  };
+
   /**
    * constructor for class dnsly
    */
-  constructor(dnsProviderArg: TDnsProvider = 'google') {
+  constructor(optionsArg: ISmartDnsConstructorOptions) {}
-    this._setDnsProvider(dnsProviderArg);
-  }
 
   /**
    * check a dns record until it has propagated to Google DNS
@@ -40,30 +64,43 @@ export class Smartdns {
    * @param recordTypeArg
    * @param expectedValue
    */
-  async checkUntilAvailable(
+  public async checkUntilAvailable(
     recordNameArg: string,
-    recordTypeArg: TDnsRecordType,
+    recordTypeArg: plugins.tsclass.network.TDnsRecordType,
-    expectedValue: string
+    expectedValue: string,
+    cyclesArg: number = 50,
+    intervalArg: number = 500
   ) {
-    let cycleArg = 0;
+    let runCycles = 0;
-    let doCheck = async () => {
+    const doCheck = async () => {
-      if (cycleArg < 30) {
+      if (runCycles < cyclesArg) {
-        cycleArg++;
+        runCycles++;
         try {
-          let myRecordArray = await this.getRecord(recordNameArg, recordTypeArg);
+          let myRecordArray: plugins.tsclass.network.IDnsRecord[];
-          let myRecord = myRecordArray[0].value[0];
+          if (runCycles % 2 === 0 || !plugins.dns) {
+            myRecordArray = await this.getRecord(recordNameArg, recordTypeArg, 0);
+          } else {
+            myRecordArray = await this.getRecordWithNodeDNS(recordNameArg, recordTypeArg);
+          }
+          const myRecord = myRecordArray[0].value;
           if (myRecord === expectedValue) {
+            console.log(
+              `smartdns: .checkUntilAvailable() verified that wanted >>>${recordTypeArg}<<< record exists for >>>${recordNameArg}<<< with value >>>${expectedValue}<<<`
+            );
             return true;
           } else {
-            await plugins.smartdelay.delayFor(2000);
+            await plugins.smartdelay.delayFor(intervalArg);
             return await doCheck();
           }
         } catch (err) {
-          await plugins.smartdelay.delayFor(2000);
+          // console.log(err);
+          await plugins.smartdelay.delayFor(intervalArg);
           return await doCheck();
         }
       } else {
-        console.log('failed permanently...');
+        console.log(
+          `smartdns: .checkUntilAvailable() failed permanently for ${recordNameArg} with value ${recordTypeArg} - ${expectedValue}...`
+        );
         return false;
       }
     };
@@ -73,67 +110,94 @@ export class Smartdns {
   /**
    * get A Dns Record
    */
-  async getRecordA(recordNameArg: string): Promise<IDnsRecord[]> {
+  public async getRecordA(recordNameArg: string): Promise<plugins.tsclass.network.IDnsRecord[]> {
     return await this.getRecord(recordNameArg, 'A');
   }
 
   /**
    * get AAAA Record
    */
-  async getRecordAAAA(recordNameArg: string) {
+  public async getRecordAAAA(recordNameArg: string) {
     return await this.getRecord(recordNameArg, 'AAAA');
   }
 
   /**
    * gets a txt record
    */
-  getRecordTxt(recordNameArg: string): Promise<IDnsRecord[]> {
+  public async getRecordTxt(recordNameArg: string): Promise<plugins.tsclass.network.IDnsRecord[]> {
-    let done = plugins.smartpromise.defer<IDnsRecord[]>();
+    return await this.getRecord(recordNameArg, 'TXT');
-    plugins.dns.resolveTxt(recordNameArg, (err, recordsArg) => {
+  }
-      if (err) {
+
-        done.reject(err);
+  public async getRecord(
-        return;
+    recordNameArg: string,
+    recordTypeArg: plugins.tsclass.network.TDnsRecordType,
+    retriesCounterArg = 20
+  ): Promise<plugins.tsclass.network.IDnsRecord[]> {
+    const requestUrl = `https://cloudflare-dns.com/dns-query?name=${recordNameArg}&type=${recordTypeArg}&do=1`;
+    const returnArray: plugins.tsclass.network.IDnsRecord[] = [];
+    const getResponseBody = async (counterArg = 0): Promise<IGoogleDNSHTTPSResponse> => {
+      const response = await plugins.smartrequest.request(requestUrl, {
+        method: 'GET',
+        headers: {
+          accept: 'application/dns-json',
+        },
+      });
+      const responseBody: IGoogleDNSHTTPSResponse = response.body;
+      if (responseBody?.Status !== 0 && counterArg < retriesCounterArg) {
+        await plugins.smartdelay.delayFor(500);
+        return getResponseBody(counterArg++);
+      } else {
+        return responseBody;
       }
-      let responseArray: IDnsRecord[] = [];
+    };
-      for (let record of recordsArg) {
+    const responseBody = await getResponseBody();
-        let recordAny: any = record; // fix wrong typings
+    for (const dnsEntry of responseBody.Answer) {
-        responseArray.push({
+      if (dnsEntry.data.startsWith('"') && dnsEntry.data.endsWith('"')) {
-          chunked: recordAny,
+        dnsEntry.data = dnsEntry.data.replace(/^"(.*)"$/, '$1');
-          name: recordNameArg,
-          value: recordAny.join(' '),
-          type: 'TXT'
-        });
       }
-      done.resolve(responseArray);
+      if (dnsEntry.name.endsWith('.')) {
-    });
+        dnsEntry.name = dnsEntry.name.substring(0, dnsEntry.name.length - 1);
-    return done.promise;
+      }
+      returnArray.push({
+        name: dnsEntry.name,
+        type: this.convertDnsTypeNumberToTypeName(dnsEntry.type),
+        dnsSecEnabled: responseBody.AD,
+        value: dnsEntry.data,
+      });
+    }
+    // console.log(responseBody);
+    return returnArray;
   }
 
   /**
-   * get oridinary record
+   * gets a record using nodejs dns resolver
    */
-  getRecord(recordNameArg: string, recordTypeArg: TDnsRecordType): Promise<IDnsRecord[]> {
+  public async getRecordWithNodeDNS(
-    let done = plugins.smartpromise.defer<IDnsRecord[]>();
+    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;
       }
-      let responseArray: IDnsRecord[] = [];
+      const returnArray: plugins.tsclass.network.IDnsRecord[] = [];
-      for (let recordKey in recordsArg) {
+      for (const recordKey in recordsArg) {
-        responseArray.push({
+        returnArray.push({
           name: recordNameArg,
-          value: recordsArg[recordKey],
+          value: recordsArg[recordKey][0],
-          type: recordTypeArg
+          type: recordTypeArg,
+          dnsSecEnabled: false,
         });
       }
-      done.resolve(responseArray);
+      done.resolve(returnArray);
     });
     return done.promise;
   }
 
-  getNameServer(domainNameArg: string) {
+  public async getNameServer(domainNameArg: string): Promise<string[]> {
-    const done = plugins.smartpromise.defer();
+    const done = plugins.smartpromise.defer<string[]>();
     plugins.dns.resolveNs(domainNameArg, (err, result) => {
       if (!err) {
         done.resolve(result);
@@ -142,18 +206,21 @@ export class Smartdns {
         done.reject(err);
       }
     });
+    return await done.promise;
   }
 
-  /**
+  public convertDnsTypeNameToTypeNumber(dnsTypeNameArg: string): number {
-   * set the DNS provider
+    return this.dnsTypeMap[dnsTypeNameArg];
-   */
+  }
-  private _setDnsProvider(dnsProvider: TDnsProvider) {
+
-    if (dnsProvider === 'google') {
+  public convertDnsTypeNumberToTypeName(
-      this.dnsServerIp = '8.8.8.8';
+    dnsTypeNumberArg: number
-      this.dnsServerPort = 53;
+  ): plugins.tsclass.network.TDnsRecordType {
-      plugins.dns.setServers(['8.8.8.8', '8.8.4.4']);
+    for (const key in this.dnsTypeMap) {
-    } else {
+      if (this.dnsTypeMap[key] === dnsTypeNumberArg) {
-      throw new Error('unknown dns provider');
+        return key as plugins.tsclass.network.TDnsRecordType;
+      }
     }
+    return null;
   }
 }

tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "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"
-}