5.0.5

package.json

@@ -1,13 +1,13 @@
 {
   "name": "@mojoio/cloudflare",
-  "version": "5.0.1",
+  "version": "5.0.5",
   "private": false,
   "description": "easy cloudflare management",
-  "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)"
   },
   "repository": {
     "type": "git",
@@ -24,21 +24,21 @@
   },
   "homepage": "https://gitlab.com/pushrocks/cflare#readme",
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.6",
+    "@pushrocks/smartdelay": "^2.0.9",
-    "@pushrocks/smartlog": "^2.0.21",
+    "@pushrocks/smartlog": "^2.0.28",
     "@pushrocks/smartpromise": "^3.0.6",
     "@pushrocks/smartrequest": "^1.1.47",
     "@pushrocks/smartstring": "^3.0.18",
-    "@tsclass/tsclass": "^3.0.7"
+    "@tsclass/tsclass": "^3.0.17"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.24",
-    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.28",
+    "@gitzone/tstest": "^1.0.33",
-    "@pushrocks/qenv": "^4.0.6",
+    "@pushrocks/qenv": "^4.0.10",
-    "@pushrocks/tapbundle": "^3.2.0",
+    "@pushrocks/tapbundle": "^3.2.1",
-    "@types/node": "^13.7.2",
+    "@types/node": "^14.0.13",
-    "tslint": "^6.0.0",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "files": [

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;
   }
 
   /**
@@ -34,25 +35,25 @@ export class CloudflareAccount {
 
   public convenience = {
     /**
-   * gets a zone id of a domain from cloudflare
+     * gets a zone id of a domain from cloudflare
-   * @param domainName
+     * @param domainName
-   */
+     */
-    getZoneId: async(domainName: string) => {
+    getZoneId: async (domainName: string) => {
-    const domain = new plugins.smartstring.Domain(domainName);
+      const domain = new plugins.smartstring.Domain(domainName);
-    const zoneArray = await this.convenience.listZones(domain.zoneName);
+      const zoneArray = await this.convenience.listZones(domain.zoneName);
-    const filteredResponse = zoneArray.filter(zoneArg => {
+      const filteredResponse = zoneArray.filter(zoneArg => {
-      return zoneArg.name === domainName;
+        return zoneArg.name === domainName;
-    });
+      });
-    if (filteredResponse.length >= 1) {
+      if (filteredResponse.length >= 1) {
-      return filteredResponse[0].id;
+        return filteredResponse[0].id;
-    } else {
+      } else {
-      plugins.smartlog.defaultLogger.log(
+        logger.log(
-        'error',
+          'error',
-        `the domain ${domainName} does not appear to be in this account!`
+          `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!`);
+        throw new Error(`the domain ${domainName} does not appear to be in this account!`);
-    }
+      }
-  },
+    },
     /**
      * gets a record
      * @param domainNameArg
@@ -121,7 +122,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);
     },
@@ -188,29 +193,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
       },
       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 requestUrl = `https://api.cloudflare.com/client/v4${routeWithoutQuery}${getQueryParams()}`;
-      const response = await plugins.smartrequest.request(
+      const response = await plugins.smartrequest.request(requestUrl, options);
-        requestUrl,
-        options
-      );
       if (response.statusCode === 200) {
-        if(response.body.result_info) {
+        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 +257,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);
+        console.log(response.body);
-        throw Error('request failed');
+        throw new Error(`request failed for ${requestUrl} with status${response.statusCode}}`);
       }
     };
 

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`);
           }
         }
       }

ts/cloudflare.logger.ts

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