4.0.11

.gitlab-ci.yml

@@ -12,30 +12,35 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
-mirror:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci git mirror
-  only:
-    - tags
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
-audit:
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
     - docker
+  allow_failure: true
 
 # ====================
 # test stage
@@ -84,10 +89,9 @@ codequality:
   only:
     - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
     - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
     - lossless
     - docker
@@ -107,11 +111,10 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
-    - npmci command npm install -g @gitzone/tsdoc
+    - npmci node install stable 
     - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
     - lossless
     - docker

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
-      "type": "node",
+      "command": "npm test",
+      "name": "Run npm test",
       "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"
+      "type": "node-terminal"
     }
   ]
 }

npmextra.json

@@ -5,7 +5,7 @@
       "githost": "gitlab.com",
       "gitscope": "pushrocks",
       "gitrepo": "smartdns",
-      "shortDescription": "smart dns methods written in TypeScript",
+      "description": "smart dns methods written in TypeScript",
       "npmPackagename": "@pushrocks/smartdns",
       "license": "MIT"
     }

package.json

@@ -1,13 +1,14 @@
 {
   "name": "@pushrocks/smartdns",
-  "version": "4.0.5",
+  "version": "4.0.11",
   "private": false,
   "description": "smart dns methods written in TypeScript",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web)"
+    "build": "(tsbuild --web)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
@@ -25,17 +26,18 @@
   },
   "homepage": "https://gitlab.com/pushrocks/dnsly#README",
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.10",
-    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartrequest": "^1.1.47",
-    "@tsclass/tsclass": "^3.0.21",
-    "dns2": "^1.4.2"
+    "@pushrocks/smartdelay": "^2.0.13",
+    "@pushrocks/smartenv": "^5.0.2",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartrequest": "^1.1.56",
+    "@tsclass/tsclass": "^4.0.17",
+    "dns2": "^2.0.5"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
-    "@gitzone/tstest": "^1.0.43",
-    "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^14.0.27",
+    "@gitzone/tsbuild": "^2.1.63",
+    "@gitzone/tstest": "^1.0.72",
+    "@pushrocks/tapbundle": "^5.0.4",
+    "@types/node": "^18.6.1",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
@@ -53,5 +55,6 @@
   ],
   "browserslist": [
     "last 1 chrome versions"
-  ]
+  ],
+  "type": "module"
 }

test/test.ts

@@ -1,16 +1,16 @@
 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({});
-  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',
@@ -21,7 +21,7 @@ tap.test('should get an A DNS Record', async () => {
 });
 
 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',
@@ -32,7 +32,7 @@ tap.test('should get an AAAA Record', async () => {
 });
 
 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([
     {
       name: 'dnsly_txt.bleu.de',
       value: 'sometext_txt',
@@ -48,18 +48,15 @@ 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
-    .eventually.be.true;
+  return expect(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
-    .eventually.be.false;
+  return expect(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'))
-    .to.eventually.be.false;
+  return expect(await testDnsly.checkUntilAvailable('dnsly_txtNotThere.bleu.de', 'TXT', 'sometext_txt2')).toBeFalse()
 });
 
 tap.test('should get name server for hostname', async () => {
@@ -70,7 +67,7 @@ tap.test('should get name server for hostname', async () => {
 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;
+  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: '4.0.11',
+  description: 'smart dns methods written in TypeScript'
+}

ts/dnsly.plugins.ts

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

ts/index.ts

@@ -1,7 +1,27 @@
-import * as plugins from './dnsly.plugins';
+import * as plugins from './dnsly.plugins.js';
 
 export type TDnsProvider = 'google' | 'cloudflare';
 
+export const makeNodeProcessUseDnsProvider = async (providerArg: TDnsProvider) => {
+  switch (providerArg) {
+    case 'cloudflare':
+      plugins.dns.setServers([
+        '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 {
@@ -24,8 +44,6 @@ export class Smartdns {
   public dnsServerIp: string;
   public dnsServerPort: number;
 
-  public dns2 = new plugins.dns2();
-
   public dnsTypeMap: { [key: string]: number } = {
     A: 1,
     AAAA: 28,
@@ -58,7 +76,12 @@ export class Smartdns {
       if (runCycles < cyclesArg) {
         runCycles++;
         try {
-          const myRecordArray = await this.getRecordWithNodeDNS(recordNameArg, recordTypeArg);
+          let myRecordArray: plugins.tsclass.network.IDnsRecord[];
+          if (runCycles % 2 === 0 || !plugins.dns) {
+            myRecordArray = await this.getRecord(recordNameArg, recordTypeArg);
+          } else {
+            myRecordArray = await this.getRecordWithNodeDNS(recordNameArg, recordTypeArg);
+          }
           const myRecord = myRecordArray[0].value;
           if (myRecord === expectedValue) {
             console.log(
@@ -67,11 +90,10 @@ export class Smartdns {
             return true;
           } else {
             await plugins.smartdelay.delayFor(intervalArg);
-            // lets try backup strategy
-            const backupResult = this.dns2[`resolve${recordTypeArg}`]('google.com')
             return await doCheck();
           }
         } catch (err) {
+          // console.log(err);
           await plugins.smartdelay.delayFor(intervalArg);
           return await doCheck();
         }
@@ -144,7 +166,6 @@ export class Smartdns {
     recordNameArg: string,
     recordTypeArg: plugins.tsclass.network.TDnsRecordType
   ): Promise<plugins.tsclass.network.IDnsRecord[]> {
-    this.setNodeDnsProvider('cloudflare');
     const done = plugins.smartpromise.defer<plugins.tsclass.network.IDnsRecord[]>();
     plugins.dns.resolve(recordNameArg, recordTypeArg, (err, recordsArg) => {
       if (err) {
@@ -178,28 +199,6 @@ export class Smartdns {
     return await done.promise;
   }
 
-  /**
-   * set the DNS provider
-   */
-  public setNodeDnsProvider(dnsProvider: TDnsProvider) {
-    if (!this.dnsServerIp) {
-      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.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.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];
   }

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