6.0.2

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
+dist_*/
-dist_serve/
-dist_ts_web/
 
 # custom

.gitlab-ci.yml

@@ -12,29 +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
+    - 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
 
-snyk:
+auditDevDependencies:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -49,9 +55,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -62,9 +66,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -84,11 +86,12 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  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
@@ -108,11 +111,10 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
+    - npmci node install stable 
-    - npmci command npm install -g @gitzone/tsdoc
     - 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",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${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

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

npmextra.json

@@ -9,8 +9,8 @@
       "githost": "gitlab.com",
       "gitscope": "mojoio",
       "gitrepo": "cloudflare",
-      "shortDescription": "easy cloudflare management",
+      "description": "easy cloudflare management",
-      "npmPackagename": "@mojoio/cloudflare",
+      "npmPackagename": "@apiclient.xyz/cloudflare",
       "license": "MIT"
     }
   }

package.json

@@ -1,13 +1,15 @@
 {
-  "name": "@mojoio/cloudflare",
+  "name": "@apiclient.xyz/cloudflare",
-  "version": "5.0.5",
+  "version": "6.0.2",
   "private": false,
   "description": "easy cloudflare management",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web)"
+    "build": "(tsbuild --web --allowimplicitany)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
@@ -24,32 +26,34 @@
   },
   "homepage": "https://gitlab.com/pushrocks/cflare#readme",
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.9",
+    "@pushrocks/smartdelay": "^3.0.1",
-    "@pushrocks/smartlog": "^2.0.28",
+    "@pushrocks/smartlog": "^3.0.2",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartpromise": "^4.0.2",
-    "@pushrocks/smartrequest": "^1.1.47",
+    "@pushrocks/smartrequest": "^2.0.15",
-    "@pushrocks/smartstring": "^3.0.18",
+    "@pushrocks/smartstring": "^4.0.5",
-    "@tsclass/tsclass": "^3.0.17"
+    "@tsclass/tsclass": "^4.0.42"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tsrun": "^1.2.42",
-    "@gitzone/tstest": "^1.0.33",
+    "@gitzone/tstest": "^1.0.74",
-    "@pushrocks/qenv": "^4.0.10",
+    "@pushrocks/qenv": "^5.0.2",
-    "@pushrocks/tapbundle": "^3.2.1",
+    "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^14.0.13",
+    "@types/node": "^20.3.1"
-    "tslint": "^6.1.2",
-    "tslint-config-prettier": "^1.18.0"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -1,27 +1,34 @@
-# @mojoio/cloudflare
+# @apiclient.xyz/cloudflare
 easy cloudflare management
 
 ## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@mojoio/cloudflare)
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@apiclient.xyz/cloudflare)
 * [gitlab.com (source)](https://gitlab.com/mojoio/cloudflare)
 * [github.com (source mirror)](https://github.com/mojoio/cloudflare)
 * [docs (typedoc)](https://mojoio.gitlab.io/cloudflare/)
 
 ## Status for master
-[![pipeline status](https://gitlab.com/mojoio/cloudflare/badges/master/pipeline.svg)](https://gitlab.com/mojoio/cloudflare/commits/master)
+
-[![coverage report](https://gitlab.com/mojoio/cloudflare/badges/master/coverage.svg)](https://gitlab.com/mojoio/cloudflare/commits/master)
+Status Category | Status Badge
-[![npm downloads per month](https://img.shields.io/npm/dm/@mojoio/cloudflare.svg)](https://www.npmjs.com/package/@mojoio/cloudflare)
+-- | --
-[![Known Vulnerabilities](https://snyk.io/test/npm/@mojoio/cloudflare/badge.svg)](https://snyk.io/test/npm/@mojoio/cloudflare)
+GitLab Pipelines | [![pipeline status](https://gitlab.com/mojoio/cloudflare/badges/master/pipeline.svg)](https://lossless.cloud)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/mojoio/cloudflare/badges/master/coverage.svg)](https://lossless.cloud)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@apiclient.xyz/cloudflare)](https://lossless.cloud)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/mojoio/cloudflare)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+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/@apiclient.xyz/cloudflare)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@apiclient.xyz/cloudflare)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@apiclient.xyz/cloudflare)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
 Use TypeScript for best in class instellisense.
 
 ```javascript
-import * as cflare from '@mojoio/cloudflare';
+import * as cflare from '@apiclient.xyz/cloudflare';
 
 const myCflareAccount = new cflare.CflareAccount('mySuperAwesomeAccountToken');
 

test/test.ts

@@ -3,7 +3,7 @@ import { expect, tap } from '@pushrocks/tapbundle';
 // tslint:disable-next-line: no-implicit-dependencies
 import { Qenv } from '@pushrocks/qenv';
 
-import cloudflare = require('../ts/index');
+import * as cloudflare from '../ts/index.js';
 
 const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit');
 
@@ -14,7 +14,7 @@ tap.test('should create a valid instance of CloudflareAccount', async () => {
   testCloudflareAccount = new cloudflare.CloudflareAccount(testQenv.getEnvVarOnDemand('CF_KEY'));
 });
 
-tap.test('.listZones() -> should display an entire account', async tools => {
+tap.test('.listZones() -> should display an entire account', async (tools) => {
   tools.timeout(600000);
   const result = await testCloudflareAccount.convenience.listZones();
   console.log(result);
@@ -22,7 +22,7 @@ tap.test('.listZones() -> should display an entire account', async tools => {
 
 tap.test(
   '.getZoneId(domainName) -> should get an Cloudflare Id for a domain string',
-  async tools => {
+  async (tools) => {
     tools.timeout(600000);
     await testCloudflareAccount.convenience.getZoneId('bleu.de');
   }
@@ -30,37 +30,38 @@ tap.test(
 
 tap.test(
   '.listRecords(domainName) -> should list all records for a specific Domain Name',
-  async tools => {
+  async (tools) => {
     tools.timeout(600000);
-    await testCloudflareAccount.convenience.listRecords('bleu.de').then(async responseArg => {
+    await testCloudflareAccount.convenience.listRecords('bleu.de').then(async (responseArg) => {
       console.log(responseArg);
     });
   }
 );
 
-tap.test('should create a valid record for a subdomain', async tools => {
+tap.test('should create a valid record for a subdomain', async (tools) => {
   tools.timeout(600000);
   await testCloudflareAccount.convenience.createRecord(
     `${randomPrefix}subdomain.bleu.de`,
     'A',
-    '127.0.0.1'
+    '127.0.0.1',
+    120
   );
 });
 
-tap.test('should get a record from Cloudflare', async tools => {
+tap.test('should get a record from Cloudflare', async (tools) => {
   tools.timeout(600000);
   await testCloudflareAccount.convenience
     .getRecord(`${randomPrefix}subdomain.bleu.de`, 'A')
-    .then(responseArg => {
+    .then((responseArg) => {
       console.log(responseArg);
     });
 });
 
-tap.test('should remove a subdomain record from Cloudflare', async tools => {
+tap.test('should remove a subdomain record from Cloudflare', async (tools) => {
   tools.timeout(600000);
   await testCloudflareAccount.convenience
     .removeRecord(`${randomPrefix}subdomain.bleu.de`, 'A')
-    .then(async responseArg => {
+    .then(async (responseArg) => {
       console.log(responseArg);
     });
 });
@@ -78,8 +79,8 @@ tap.test('should create a worker', async () => {
   await worker.setRoutes([
     {
       zoneName: 'bleu.de',
-      pattern: 'https://*bleu.de/hello'
+      pattern: 'https://*bleu.de/hello',
-    }
+    },
   ]);
   console.log(worker);
 });

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@apiclient.xyz/cloudflare',
+  version: '6.0.2',
+  description: 'easy cloudflare management'
+}

ts/cloudflare.classes.account.ts

@@ -1,10 +1,10 @@
-import plugins = require('./cloudflare.plugins');
+import * as plugins from './cloudflare.plugins.js';
-import { logger } from './cloudflare.logger';
+import { logger } from './cloudflare.logger.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
 // interfaces
-import { WorkerManager } from './cloudflare.classes.workermanager';
+import { WorkerManager } from './cloudflare.classes.workermanager.js';
-import { ZoneManager } from './cloudflare.classes.zonemanager';
+import { ZoneManager } from './cloudflare.classes.zonemanager.js';
 
 export class CloudflareAccount {
   private authToken: string;
@@ -41,16 +41,13 @@ export class CloudflareAccount {
     getZoneId: async (domainName: string) => {
       const domain = new plugins.smartstring.Domain(domainName);
       const zoneArray = await this.convenience.listZones(domain.zoneName);
-      const filteredResponse = zoneArray.filter(zoneArg => {
+      const filteredResponse = zoneArray.filter((zoneArg) => {
         return zoneArg.name === domainName;
       });
       if (filteredResponse.length >= 1) {
         return filteredResponse[0].id;
       } else {
-        logger.log(
+        logger.log('error', `the domain ${domainName} does not appear to be in this account!`);
-          'error',
-          `the domain ${domainName} does not appear to be in this account!`
-        );
         throw new Error(`the domain ${domainName} does not appear to be in this account!`);
       }
     },
@@ -65,7 +62,7 @@ export class CloudflareAccount {
     ): Promise<interfaces.ICflareRecord> => {
       const domain = new plugins.smartstring.Domain(domainNameArg);
       const recordArrayArg = await this.convenience.listRecords(domain.zoneName);
-      const filteredResponse = recordArrayArg.filter(recordArg => {
+      const filteredResponse = recordArrayArg.filter((recordArg) => {
         return recordArg.type === typeArg && recordArg.name === domainNameArg;
       });
       return filteredResponse[0];
@@ -76,14 +73,16 @@ export class CloudflareAccount {
     createRecord: async (
       domainNameArg: string,
       typeArg: plugins.tsclass.network.TDnsRecordType,
-      contentArg: string
+      contentArg: string,
+      ttlArg = 1
     ): Promise<any> => {
       const domain = new plugins.smartstring.Domain(domainNameArg);
       const domainIdArg = await this.convenience.getZoneId(domain.zoneName);
       const dataObject = {
         name: domain.fullName,
         type: typeArg,
-        content: contentArg
+        content: contentArg,
+        ttl: ttlArg,
       };
       const response = await this.request(
         'POST',
@@ -169,18 +168,23 @@ export class CloudflareAccount {
       const domainId = await this.convenience.getZoneId(domain.zoneName);
       const requestUrl = `/zones/${domainId}/purge_cache`;
       const payload = {
-        purge_everything: true
+        purge_everything: true,
       };
       const respone = await this.request('DELETE', requestUrl, payload);
     },
     // acme convenience functions
     acmeSetDnsChallenge: async (dnsChallenge: plugins.tsclass.network.IDnsChallenge) => {
       await this.convenience.cleanRecord(dnsChallenge.hostName, 'TXT');
-      await this.convenience.createRecord(dnsChallenge.hostName, 'TXT', dnsChallenge.challenge);
+      await this.convenience.createRecord(
+        dnsChallenge.hostName,
+        'TXT',
+        dnsChallenge.challenge,
+        120
+      );
     },
     acmeRemoveDnsChallenge: async (dnsChallenge: plugins.tsclass.network.IDnsChallenge) => {
       await this.convenience.removeRecord(dnsChallenge.hostName, 'TXT');
-    }
+    },
   };
 
   public async request(
@@ -195,9 +199,9 @@ export class CloudflareAccount {
         'Content-Type': 'application/json',
         Authorization: `Bearer ${this.authToken}`,
         'Content-Length': Buffer.byteLength(JSON.stringify(dataArg)),
-        ...requestHeadersArg
+        ...requestHeadersArg,
       },
-      requestBody: dataArg
+      requestBody: dataArg,
     };
 
     // route analysis

ts/cloudflare.classes.record.ts

@@ -1,5 +1,3 @@
-import * as plugins from './cloudflare.plugins';
+import * as plugins from './cloudflare.plugins.js';
 
-export class CloudflareRecord {
+export class CloudflareRecord {}
-
-}

ts/cloudflare.classes.worker.ts

@@ -1,7 +1,7 @@
-import * as plugins from './cloudflare.plugins';
+import * as plugins from './cloudflare.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
-import { WorkerManager } from './cloudflare.classes.workermanager';
+import { WorkerManager } from './cloudflare.classes.workermanager.js';
-import { logger } from './cloudflare.logger';
+import { logger } from './cloudflare.logger.js';
 
 export interface IWorkerRoute extends interfaces.ICflareWorkerRoute {
   zoneName: string;
@@ -78,14 +78,14 @@ export class CloudflareWorker {
         const requestRoute = `/zones/${zoneId}/workers/routes`;
         await this.workerManager.cfAccount.request('POST', requestRoute, {
           pattern: newRoute.pattern,
-          script: this.id
+          script: this.id,
         });
       } else if (routeStatus === 'needsUpdate') {
         const zoneId = await this.workerManager.cfAccount.convenience.getZoneId(newRoute.zoneName);
         const requestRoute = `/zones/${zoneId}/workers/routes/${routeIdForUpdate}`;
         await this.workerManager.cfAccount.request('PUT', requestRoute, {
           pattern: newRoute.pattern,
-          script: this.id
+          script: this.id,
         });
       }
     }

ts/cloudflare.classes.workermanager.ts

@@ -1,6 +1,6 @@
-import * as plugins from './cloudflare.plugins';
+import * as plugins from './cloudflare.plugins.js';
-import { CloudflareAccount } from './cloudflare.classes.account';
+import { CloudflareAccount } from './cloudflare.classes.account.js';
-import { CloudflareWorker } from './cloudflare.classes.worker';
+import { CloudflareWorker } from './cloudflare.classes.worker.js';
 
 export class WorkerManager {
   public cfAccount: CloudflareAccount;
@@ -14,7 +14,7 @@ export class WorkerManager {
     const route = `/accounts/${accountIdentifier}/workers/scripts/${workerName}`;
     const responseBody = await this.cfAccount.request('PUT', route, workerScript, {
       'Content-Type': 'application/javascript',
-      'Content-Length': Buffer.byteLength(workerScript)
+      'Content-Length': Buffer.byteLength(workerScript),
     });
     return CloudflareWorker.fromApiObject(this, responseBody.result);
   }

ts/cloudflare.classes.zone.ts

@@ -1,5 +1,5 @@
-import * as plugins from './cloudflare.plugins';
+import * as plugins from './cloudflare.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
 export class CloudflareZone implements interfaces.ICflareZone {
   public static createFromApiObject(apiObject: interfaces.ICflareZone) {
@@ -47,5 +47,4 @@ export class CloudflareZone implements interfaces.ICflareZone {
   paused: boolean;
   type: string;
   checked_on: string;
-
 }

ts/cloudflare.classes.zonemanager.ts

@@ -1,7 +1,7 @@
-import * as plugins from './cloudflare.plugins';
+import * as plugins from './cloudflare.plugins.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
-import { CloudflareAccount } from './cloudflare.classes.account';
+import { CloudflareAccount } from './cloudflare.classes.account.js';
-import { CloudflareZone } from './cloudflare.classes.zone';
+import { CloudflareZone } from './cloudflare.classes.zone.js';
 
 export class ZoneManager {
   public cfAccount: CloudflareAccount;

ts/cloudflare.logger.ts

@@ -1,3 +1,3 @@
-import * as plugins from './cloudflare.plugins';
+import * as plugins from './cloudflare.plugins.js';
 
 export const logger = new plugins.smartlog.ConsoleLog();

ts/index.ts

@@ -1,2 +1,2 @@
-export { CloudflareAccount } from './cloudflare.classes.account';
+export { CloudflareAccount } from './cloudflare.classes.account.js';
-export { CloudflareWorker } from './cloudflare.classes.worker';
+export { CloudflareWorker } from './cloudflare.classes.worker.js';

ts/interfaces/index.ts

@@ -1,3 +1,3 @@
-export * from './cloudflare.api.record';
+export * from './cloudflare.api.record.js';
-export * from './cloudflare.api.zone';
+export * from './cloudflare.api.zone.js';
-export * from './cloudflare.api.workerroute';
+export * from './cloudflare.api.workerroute.js';

tsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": 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"
-}