5.0.8

.gitignore

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

.gitlab-ci.yml

@@ -19,22 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - 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:
+    - docker
+
+auditDevDependencies:
+  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 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -62,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -84,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

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

package.json

@@ -1,13 +1,13 @@
 {
   "name": "@mojoio/cloudflare",
-  "version": "5.0.1",
+  "version": "5.0.8",
   "private": false,
   "description": "easy cloudflare management",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web)"
   },
   "repository": {
     "type": "git",
@@ -24,32 +24,36 @@
   },
   "homepage": "https://gitlab.com/pushrocks/cflare#readme",
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.6",
-    "@pushrocks/smartlog": "^2.0.21",
-    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartrequest": "^1.1.47",
-    "@pushrocks/smartstring": "^3.0.18",
-    "@tsclass/tsclass": "^3.0.7"
+    "@pushrocks/smartdelay": "^2.0.10",
+    "@pushrocks/smartlog": "^2.0.39",
+    "@pushrocks/smartpromise": "^3.1.3",
+    "@pushrocks/smartrequest": "^1.1.51",
+    "@pushrocks/smartstring": "^3.0.24",
+    "@tsclass/tsclass": "^3.0.29"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/qenv": "^4.0.6",
-    "@pushrocks/tapbundle": "^3.2.0",
-    "@types/node": "^13.7.2",
-    "tslint": "^6.0.0",
+    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tstest": "^1.0.52",
+    "@pushrocks/qenv": "^4.0.10",
+    "@pushrocks/tapbundle": "^3.2.9",
+    "@types/node": "^14.14.22",
+    "tslint": "^6.1.3",
     "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

@@ -8,13 +8,20 @@ easy cloudflare management
 * [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)
-[![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)
-[![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/)
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/mojoio/cloudflare/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/mojoio/cloudflare/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@mojoio/cloudflare)](https://lossless.cloud)
+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/@mojoio/cloudflare)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@mojoio/cloudflare)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@mojoio/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
 

test/test.ts

@@ -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,15 +30,15 @@ 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`,
@@ -47,20 +47,20 @@ tap.test('should create a valid record for a subdomain', async tools => {
   );
 });
 
-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 +78,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/cloudflare.classes.account.ts

@@ -1,4 +1,5 @@
 import plugins = require('./cloudflare.plugins');
+import { logger } from './cloudflare.logger';
 import * as interfaces from './interfaces';
 
 // interfaces
@@ -17,7 +18,7 @@ export class CloudflareAccount {
    * @param optionsArg
    */
   constructor(authTokenArg: string) {
-    this.authToken = authTokenArg
+    this.authToken = authTokenArg;
   }
 
   /**
@@ -40,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 {
-      plugins.smartlog.defaultLogger.log(
-        'error',
-        `the domain ${domainName} does not appear to be in this account!`
-      );
+        logger.log('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!`);
       }
     },
@@ -64,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];
@@ -75,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',
@@ -121,7 +121,11 @@ export class CloudflareAccount {
      * @param typeArg
      * @param valueArg
      */
-    updateRecord: async (domainNameArg: string, typeArg: plugins.tsclass.network.TDnsRecordType, valueArg) => {
+    updateRecord: async (
+      domainNameArg: string,
+      typeArg: plugins.tsclass.network.TDnsRecordType,
+      valueArg
+    ) => {
       // TODO: implement
       const domain = new plugins.smartstring.Domain(domainNameArg);
     },
@@ -164,18 +168,18 @@ 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, 2);
     },
     acmeRemoveDnsChallenge: async (dnsChallenge: plugins.tsclass.network.IDnsChallenge) => {
       await this.convenience.removeRecord(dnsChallenge.hostName, 'TXT');
-    }
+    },
   };
 
   public async request(
@@ -188,29 +192,60 @@ export class CloudflareAccount {
       method: methodArg,
       headers: {
         'Content-Type': 'application/json',
-        'Authorization': `Bearer ${this.authToken}`,
+        Authorization: `Bearer ${this.authToken}`,
         'Content-Length': Buffer.byteLength(JSON.stringify(dataArg)),
-        ...requestHeadersArg
+        ...requestHeadersArg,
       },
-      requestBody: dataArg
+      requestBody: dataArg,
     };
 
+    // route analysis
+    const routeWithoutQuery = routeArg.split('?')[0];
+    let queryParams: string[] = [];
+    if (routeArg.split('?').length > 1) {
+      queryParams = routeArg.split('?')[1].split('&');
+    }
+
     // console.log(options);
 
     let retryCount = 0; // count the amount of retries
     let pageCount = 1;
+
+    const getQueryParams = () => {
+      let result = '';
+      if (queryParams.length > 0) {
+        result += '?';
+      } else {
+        return result;
+      }
+
+      let isFirst = true;
+      for (const queryParam of queryParams) {
+        if (!isFirst) {
+          result += '&';
+        }
+        isFirst = false;
+        const queryParamSerialized = queryParam.split('=');
+        if (queryParam === 'page') {
+          result += `page=${pageCount}`;
+        } else {
+          result += queryParam;
+        }
+      }
+      return result;
+    };
+
     const makeRequest = async (): Promise<plugins.smartrequest.IExtendedIncomingMessage> => {
-      const requestUrl = `https://api.cloudflare.com/client/v4${routeArg}`;
-      const response = await plugins.smartrequest.request(
-        requestUrl,
-        options
-      );
+      const requestUrl = `https://api.cloudflare.com/client/v4${routeWithoutQuery}${getQueryParams()}`;
+      const response = await plugins.smartrequest.request(requestUrl, options);
       if (response.statusCode === 200) {
         if (response.body.result_info) {
           const rI = response.body.result_info;
-          if ((rI.total_count / rI.per_page) > pageCount) {
+          if (rI.total_count / rI.per_page > pageCount) {
             pageCount++;
-            return await makeRequest();
+            const subresponse = await makeRequest();
+            response.body.result = response.body.result.concat(subresponse.body.result);
+            return response;
           } else {
             return response;
           }
@@ -221,12 +256,12 @@ export class CloudflareAccount {
         console.log('rate limited! Waiting for retry!');
         return await retryRequest();
       } else if (response.statusCode === 400) {
-        console.log(`bad request for route ${routeArg}!`);
+        console.log(`bad request for route ${requestUrl}!`);
         console.log(response.body);
-        throw new Error(`request failed for ${routeArg}`);
+        throw new Error(`request failed for ${requestUrl}`);
       } else {
-        console.log(response.statusCode);
-        throw Error('request failed');
+        console.log(response.body);
+        throw new Error(`request failed for ${requestUrl} with status${response.statusCode}}`);
       }
     };
 

ts/cloudflare.classes.record.ts

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

ts/cloudflare.classes.worker.ts

@@ -1,6 +1,7 @@
 import * as plugins from './cloudflare.plugins';
 import * as interfaces from './interfaces';
 import { WorkerManager } from './cloudflare.classes.workermanager';
+import { logger } from './cloudflare.logger';
 
 export interface IWorkerRoute extends interfaces.ICflareWorkerRoute {
   zoneName: string;
@@ -66,7 +67,7 @@ export class CloudflareWorker {
           routeIdForUpdate = existingRoute.id;
           if (existingRoute.script === this.id) {
             routeStatus = 'alreadyUpToDate';
-            plugins.smartlog.defaultLogger.log('info', `route already exists, no update needed`);
+            logger.log('info', `route already exists, no update needed`);
           }
         }
       }
@@ -77,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

@@ -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

@@ -47,5 +47,4 @@ export class CloudflareZone implements interfaces.ICflareZone {
   paused: boolean;
   type: string;
   checked_on: string;
-
 }

ts/cloudflare.logger.ts

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