3.0.6

.gitignore

@@ -1,6 +1,22 @@
+.nogit/
+
+# artifacts
 coverage/
-docs/
+public/
+pages/
+
+# installs
 node_modules/
 
-.nogit/
-nogit/
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,16 +1,16 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -18,109 +18,103 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 snyk:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
   stage: security
   script:
-    - npmci command npm install -g snyk
+    - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
-testLTS:
+testStable:
   stage: test
   script:
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+    - lossless
+    - docker
+    - priv
+
+testBuild:
   stage: test
   script:
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install stable
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --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]
+    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci node install lts
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -128,15 +122,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
-  allow_failure: true
-
-windowsCompatibility:
-  image: stefanscherer/node-windows:10-build-tools
-  stage: metadata
-  script:
-  - npm install & npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - windows
+      - public
   allow_failure: true

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "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"
+    }
+  ]
+}

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

README.md

@@ -1,54 +0,0 @@
-# cflare
-
-easy cloudflare management
-
-## Availabililty
-
-[![npm](https://mojoio.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/cflare)
-[![git](https://mojoio.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/mojoio/cflare)
-[![git](https://mojoio.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/mojoio/cflare)
-[![docs](https://mojoio.gitlab.io/assets/repo-button-docs.svg)](https://mojoio.gitlab.io/cflare/)
-
-## Status for master
-
-[![build status](https://GitLab.com/mojoio/cflare/badges/master/build.svg)](https://GitLab.com/mojoio/cflare/commits/master)
-[![coverage report](https://GitLab.com/mojoio/cflare/badges/master/coverage.svg)](https://GitLab.com/mojoio/cflare/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/cflare.svg)](https://www.npmjs.com/package/cflare)
-[![Dependency Status](https://david-dm.org/mojoio/cflare.svg)](https://david-dm.org/mojoio/cflare)
-[![bitHound Dependencies](https://www.bithound.io/github/mojoio/cflare/badges/dependencies.svg)](https://www.bithound.io/github/mojoio/cflare/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/mojoio/cflare/badges/code.svg)](https://www.bithound.io/github/mojoio/cflare)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
-
-## Usage
-
-Use TypeScript for best in class instellisense.
-
-```javascript
-import * as cflare from 'cflare'
-
-let myCflareAccount = new cflare.CflareAccount()
-testCflareAccount.auth({
-    email: 'someuser@example.com',
-    key: 'someLongApiKey'
-})
-
-let myAsyncCflareManagement = async () => {
-    // get things
-    let myZones = await myCflareAccount.listZones() // zones are fully typed
-    let myIdForADomain = await myCflareAccount.getZoneId('example.com') // type number
-    let myRecordsForADomain = await myCflareAccount.listRecords('example.com') // records are fully typed
-
-    // set things
-    myCflareAccount.updateRecord(...)
-    myCflareAccount.createRecord(...)
-    myCflareAccount.deleteRecord(...)
-}
-```
-
-For further information read the linked docs at the top of this README.
-
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-
-[![repo-footer](https://mojoio.gitlab.io/assets/repo-footer.svg)](https://mojo.io)

npmextra.json

@@ -2,5 +2,16 @@
   "npmci": {
     "npmGlobalTools": [],
     "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "projectType": "npm",
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "mojoio",
+      "gitrepo": "cloudflare",
+      "shortDescription": "easy cloudflare management",
+      "npmPackagename": "@mojoio/cloudflare",
+      "license": "MIT"
+    }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/cloudflare",
-  "version": "2.0.0",
+  "version": "3.0.6",
   "private": false,
   "description": "easy cloudflare management",
   "main": "dist/index.js",
@@ -24,19 +24,32 @@
   },
   "homepage": "https://gitlab.com/pushrocks/cflare#readme",
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.2",
-    "@pushrocks/smartlog": "^2.0.1",
-    "@pushrocks/smartpromise": "^2.0.5",
-    "@pushrocks/smartrequest": "^1.1.14",
-    "@pushrocks/smartstring": "^3.0.4",
-    "@tsclass/tsclass": "^1.0.48"
+    "@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.4"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
-    "@gitzone/tsrun": "^1.1.12",
-    "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/qenv": "^2.0.2",
-    "@pushrocks/tapbundle": "^3.0.5",
-    "@types/node": "^10.5.8"
-  }
+    "@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.0",
+    "tslint": "^6.0.0",
+    "tslint-config-prettier": "^1.18.0"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_web/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

qenv.yml

@@ -1,3 +1,3 @@
-vars:
+required:
   - CF_EMAIL
   - CF_KEY

test/test.ts

@@ -1,19 +1,25 @@
+// tslint:disable-next-line: no-implicit-dependencies
 import { expect, tap } from '@pushrocks/tapbundle';
-import cloudflare = require('../ts/index');
+// tslint:disable-next-line: no-implicit-dependencies
 import { Qenv } from '@pushrocks/qenv';
-let testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit');
 
-let testCloudflareAccount = new cloudflare.CloudflareAccount();
-testCloudflareAccount.auth({
-  email: process.env.CF_EMAIL,
-  key: process.env.CF_KEY
+import cloudflare = require('../ts/index');
+
+const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit');
+
+const randomPrefix = Math.floor(Math.random() * 2000);
+let testCloudflareAccount: cloudflare.CloudflareAccount;
+
+tap.test('should create a valid instance of CloudflareAccount', async () => {
+  testCloudflareAccount = new cloudflare.CloudflareAccount({
+    email: testQenv.getEnvVarOnDemand('CF_EMAIL'),
+    key: testQenv.getEnvVarOnDemand('CF_KEY')
+  });
 });
 
-let randomPrefix = Math.floor(Math.random() * 2000);
-
-tap.skip.test('.listZones() -> should display an entire account', async tools => {
+tap.test('.listZones() -> should display an entire account', async tools => {
   tools.timeout(600000);
-  let result = await testCloudflareAccount.listZones();
+  const result = await testCloudflareAccount.listZones();
   console.log(result);
 });
 
@@ -42,9 +48,11 @@ tap.test('should create a valid record for a subdomain', async tools => {
 
 tap.test('should get a record from Cloudflare', async tools => {
   tools.timeout(600000);
-  await testCloudflareAccount.getRecord('bleu.de', 'A').then(function(responseArg) {
-    console.log(responseArg);
-  });
+  await testCloudflareAccount
+    .getRecord(`${randomPrefix}subdomain.bleu.de`, 'A')
+    .then(responseArg => {
+      console.log(responseArg);
+    });
 });
 
 tap.test('should remove a subdomain record from Cloudflare', async tools => {
@@ -60,4 +68,24 @@ tap.test('.purge(some.domain) -> should purge everything', async () => {
   await testCloudflareAccount.purgeZone('bleu.de');
 });
 
+// WORKERS
+tap.test('should create a worker', async () => {
+  const worker = await testCloudflareAccount.workerManager.createWorker(
+    'myawesomescript',
+    `addEventListener('fetch', event => { event.respondWith(fetch(event.request)) })`
+  );
+  await worker.setRoutes([
+    {
+      zoneName: 'bleu.de',
+      pattern: 'https://*bleu.de/hello'
+    }
+  ]);
+  console.log(worker);
+});
+
+tap.test('should get workers', async () => {
+  const workerArray = await testCloudflareAccount.workerManager.listWorkers();
+  console.log(workerArray);
+});
+
 tap.start();

ts/cloudflare.classes.account.ts

@@ -1,35 +1,54 @@
 import plugins = require('./cloudflare.plugins');
-import * as interfaces from './cloudflare.interfaces';
+import * as interfaces from './interfaces';
 
 // interfaces
-import { TDnsRecord } from '@tsclass/tsclass';
+import { WorkerManager } from './cloudflare.classes.workermanager';
+import { ZoneManager } from './cloudflare.classes.zonemanager';
 
 export class CloudflareAccount {
   private authEmail: string;
   private authKey: string;
-  constructor() {
-    // Nothing here
-  }
+  private accountIdentifier: string;
 
-  auth(optionsArg: { email: string; key: string }) {
+  public workerManager = new WorkerManager(this);
+  public zoneManager = new ZoneManager(this);
+
+  /**
+   * constructor sets auth information on the CloudflareAccountInstance
+   * @param optionsArg
+   */
+  constructor(optionsArg: { email: string; key: string }) {
     this.authEmail = optionsArg.email;
     this.authKey = optionsArg.key;
   }
 
+  public async getAccountIdentifier() {
+    if (!this.accountIdentifier) {
+      const route = `/accounts?page=1&per_page=20&direction=desc`;
+      const response: any = await this.request('GET', route);
+      this.accountIdentifier = response.result[0].id;
+      // console.log('Account identifier is: ' + this.accountIdentifier);
+    }
+    return this.accountIdentifier;
+  }
+
   /**
    * gets a zone id of a domain from cloudflare
    * @param domainName
    */
-  async getZoneId(domainName: string) {
-    let domain = new plugins.smartstring.Domain(domainName);
-    let zoneArray = await this.listZones(domain.zoneName);
-    let filteredResponse = zoneArray.filter(zoneArg => {
+  public async getZoneId(domainName: string) {
+    const domain = new plugins.smartstring.Domain(domainName);
+    const zoneArray = await this.listZones(domain.zoneName);
+    const filteredResponse = zoneArray.filter(zoneArg => {
       return zoneArg.name === domainName;
     });
     if (filteredResponse.length >= 1) {
       return filteredResponse[0].id;
     } else {
-      plugins.smartlog.defaultLogger.error(`the domain ${domainName} does not appear to be in this account!`);
+      plugins.smartlog.defaultLogger.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!`);
     }
   }
@@ -37,59 +56,69 @@ export class CloudflareAccount {
   /**
    * gets a record
    * @param domainNameArg
-   * @param typeArg 
+   * @param typeArg
    */
-  async getRecord(domainNameArg: string, typeArg: TDnsRecord): Promise<interfaces.ICflareRecord> {
-    let done = plugins.smartpromise.defer<interfaces.ICflareRecord>();
-    let result: interfaces.ICflareRecord;
-
-    let domain = new plugins.smartstring.Domain(domainNameArg);
-    this.listRecords(domain.zoneName).then(recordArrayArg => {
-      let filteredResponse = recordArrayArg.filter(recordArg => {
-        return recordArg.type === typeArg && recordArg.name === domainNameArg;
-      });
-      done.resolve(filteredResponse[0]);
+  public async getRecord(
+    domainNameArg: string,
+    typeArg: plugins.tsclass.network.TDnsRecord
+  ): Promise<interfaces.ICflareRecord> {
+    const domain = new plugins.smartstring.Domain(domainNameArg);
+    const recordArrayArg = await this.listRecords(domain.zoneName);
+    const filteredResponse = recordArrayArg.filter(recordArg => {
+      return recordArg.type === typeArg && recordArg.name === domainNameArg;
     });
-    return done.promise;
+    return filteredResponse[0];
   }
 
-  async createRecord(domainNameArg: string, typeArg: TDnsRecord, contentArg: string) {
-    let done = plugins.smartpromise.defer();
-    let domain = new plugins.smartstring.Domain(domainNameArg);
-    let domainIdArg = await this.getZoneId(domain.zoneName);
-    let dataObject = {
+  public async createRecord(
+    domainNameArg: string,
+    typeArg: plugins.tsclass.network.TDnsRecord,
+    contentArg: string
+  ): Promise<any> {
+    const domain = new plugins.smartstring.Domain(domainNameArg);
+    const domainIdArg = await this.getZoneId(domain.zoneName);
+    const dataObject = {
       name: domain.fullName,
       type: typeArg,
       content: contentArg
     };
-    this.request('POST', '/zones/' + domainIdArg + '/dns_records', dataObject).then(function(
-      responseArg
-    ) {
-      done.resolve(responseArg);
-    });
-    return done.promise;
+    const response = await this.request(
+      'POST',
+      '/zones/' + domainIdArg + '/dns_records',
+      dataObject
+    );
+    return response;
   }
 
-  removeRecord(domainNameArg: string, typeArg: TDnsRecord) {
-    let done = plugins.smartpromise.defer();
-    let domain = new plugins.smartstring.Domain(domainNameArg);
-    this.getRecord(domain.fullName, typeArg).then(responseArg => {
-      if (responseArg) {
-        let requestRoute: string =
-          '/zones/' + responseArg.zone_id + '/dns_records/' + responseArg.id;
-        this.request('DELETE', requestRoute).then(responseArg => {
-          done.resolve(responseArg);
-        });
-      } else {
-        done.reject();
-      }
-    });
-    return done.promise;
+  /**
+   * removes a record from Cloudflare
+   * @param domainNameArg
+   * @param typeArg
+   */
+  public async removeRecord(
+    domainNameArg: string,
+    typeArg: plugins.tsclass.network.TDnsRecord
+  ): Promise<any> {
+    const domain = new plugins.smartstring.Domain(domainNameArg);
+    const cflareRecord = await this.getRecord(domain.fullName, typeArg);
+    if (cflareRecord) {
+      const requestRoute: string = `/zones/${cflareRecord.zone_id}/dns_records/${cflareRecord.id}`;
+      return await this.request('DELETE', requestRoute);
+    } else {
+      throw new Error(`could not remove record for ${domainNameArg} with type ${typeArg}`);
+    }
   }
 
-  updateRecord(domainNameArg: string, typeArg: string, valueArg) {
-    let done = plugins.smartpromise.defer();
-    let domain = new plugins.smartstring.Domain(domainNameArg);
+  /**
+   * updates a record
+   * @param domainNameArg
+   * @param typeArg
+   * @param valueArg
+   */
+  public updateRecord(domainNameArg: string, typeArg: string, valueArg) {
+    // TODO: implement
+    const done = plugins.smartpromise.defer();
+    const domain = new plugins.smartstring.Domain(domainNameArg);
     return done.promise;
   }
 
@@ -97,14 +126,14 @@ export class CloudflareAccount {
    * list all records of a specified domain name
    * @param domainNameArg - the domain name that you want to get the records from
    */
-  async listRecords(domainNameArg: string): Promise<interfaces.ICflareRecord[]> {
-    let domain = new plugins.smartstring.Domain(domainNameArg);
-    let domainId = await this.getZoneId(domain.zoneName);
-    let responseArg: any = await this.request(
+  public async listRecords(domainNameArg: string): Promise<interfaces.ICflareRecord[]> {
+    const domain = new plugins.smartstring.Domain(domainNameArg);
+    const domainId = await this.getZoneId(domain.zoneName);
+    const responseArg: any = await this.request(
       'GET',
       '/zones/' + domainId + '/dns_records?per_page=100'
     );
-    let result: interfaces.ICflareRecord[] = responseArg.result;
+    const result: interfaces.ICflareRecord[] = responseArg.result;
     return result;
   }
 
@@ -112,7 +141,7 @@ export class CloudflareAccount {
    * list all zones in the associated authenticated account
    * @param domainName
    */
-  async listZones(domainName?: string): Promise<interfaces.ICflareZone[]> {
+  public async listZones(domainName?: string): Promise<interfaces.ICflareZone[]> {
     // TODO: handle pagination
     let requestRoute = `/zones?per_page=50`;
 
@@ -121,38 +150,46 @@ export class CloudflareAccount {
       requestRoute = `${requestRoute}&name=${domainName}`;
     }
 
-    let response: any = await this.request('GET', requestRoute);
-    let result = response.result;
+    const response: any = await this.request('GET', requestRoute);
+    const result = response.result;
     return result;
   }
 
-  async purgeZone(domainName: string) {
-    let domain = new plugins.smartstring.Domain(domainName);
-    let domainId = await this.getZoneId(domain.zoneName);
-    let requestUrl = `/zones/${domainId}/purge_cache`;
-    let payload = {
+  public async purgeZone(domainName: string) {
+    const domain = new plugins.smartstring.Domain(domainName);
+    const domainId = await this.getZoneId(domain.zoneName);
+    const requestUrl = `/zones/${domainId}/purge_cache`;
+    const payload = {
       purge_everything: true
     };
-    let respone = await this.request('DELETE', requestUrl, payload);
+    const respone = await this.request('DELETE', requestUrl, payload);
   }
 
-  request(methodArg: string, routeArg: string, dataArg = {}) {
-    let done = plugins.smartpromise.defer();
-    let options: plugins.smartrequest.ISmartRequestOptions = {
+  public request(
+    methodArg: string,
+    routeArg: string,
+    dataArg: any = {},
+    requestHeadersArg = {}
+  ): Promise<any> {
+    const done = plugins.smartpromise.defer();
+    const options: plugins.smartrequest.ISmartRequestOptions = {
       method: methodArg,
       headers: {
         'Content-Type': 'application/json',
         'X-Auth-Email': this.authEmail,
         'X-Auth-Key': this.authKey,
-        'Content-Length': Buffer.byteLength(JSON.stringify(dataArg))
+        'Content-Length': Buffer.byteLength(JSON.stringify(dataArg)),
+        ...requestHeadersArg
       },
       requestBody: dataArg
     };
 
+    // console.log(options);
+
     let retryCount = 0; // count the amount of retries
 
-    let makeRequest = async () => {
-      let response: any = await plugins.smartrequest.request(
+    const makeRequest = async () => {
+      const response: any = await plugins.smartrequest.request(
         `https://api.cloudflare.com/client/v4${routeArg}`,
         options
       );
@@ -163,13 +200,15 @@ export class CloudflareAccount {
         retryRequest();
       } else if (response.statusCode === 400) {
         console.log(`bad request for route ${routeArg}! Going to retry!`);
-        retryRequest();
+        console.log(response.body);
       } else {
         console.log(response.statusCode);
         done.reject(new Error('request failed'));
       }
     };
-    let retryRequest = async (delayTimeArg = Math.floor(Math.random() * (60000 - 8000) + 8000)) => {
+    const retryRequest = async (
+      delayTimeArg = Math.floor(Math.random() * (60000 - 8000) + 8000)
+    ) => {
       console.log(`retry started and waiting for ${delayTimeArg} ms`);
       await plugins.smartdelay.delayFor(delayTimeArg);
       if (retryCount < 10) {
@@ -184,4 +223,6 @@ export class CloudflareAccount {
   private authCheck() {
     return this.authEmail && this.authKey; // check if auth is available
   }
+
+  // acme convenience functions
 }

ts/cloudflare.classes.worker.ts

@@ -0,0 +1,92 @@
+import * as plugins from './cloudflare.plugins';
+import * as interfaces from './interfaces';
+import { WorkerManager } from './cloudflare.classes.workermanager';
+
+export interface IWorkerRoute extends interfaces.ICflareWorkerRoute {
+  zoneName: string;
+}
+
+export class CloudflareWorker {
+  // STATIC
+  public static async fromApiObject(
+    workerManager: WorkerManager,
+    apiObject
+  ): Promise<CloudflareWorker> {
+    const newWorker = new CloudflareWorker(workerManager);
+    Object.assign(newWorker, apiObject.result);
+    await newWorker.getRoutes();
+    return newWorker;
+  }
+
+  // INSTANCE
+  private workerManager: WorkerManager;
+
+  public script: string;
+  public id: string;
+  public etag: string;
+  // tslint:disable-next-line: variable-name
+  public created_on: string;
+  // tslint:disable-next-line: variable-name
+  public modified_on: string;
+
+  public routes: IWorkerRoute[] = [];
+  constructor(workerManagerArg: WorkerManager) {
+    this.workerManager = workerManagerArg;
+  }
+
+  /**
+   * gets all routes for a worker
+   */
+  public async getRoutes() {
+    const zones = await this.workerManager.cfAccount.listZones();
+    for (const zone of zones) {
+      const requestRoute = `/zones/${zone.id}/workers/routes`;
+      const response: {
+        result: interfaces.ICflareWorkerRoute[];
+      } = await this.workerManager.cfAccount.request('GET', requestRoute);
+      for (const route of response.result) {
+        console.log('hey');
+        console.log(route);
+        console.log(this.id);
+        if (route.script === this.id) {
+          this.routes.push({ ...route, zoneName: zone.name });
+        }
+      }
+    }
+  }
+
+  public async setRoutes(routeArray: Array<{ zoneName: string; pattern: string }>) {
+    for (const newRoute of routeArray) {
+      // lets determine wether a route is new, needs an update or already up to date.
+      let routeStatus: 'new' | 'needsUpdate' | 'alreadyUpToDate' = 'new';
+      let routeIdForUpdate: string;
+      for (const existingRoute of this.routes) {
+        if (existingRoute.pattern === newRoute.pattern) {
+          routeStatus = 'needsUpdate';
+          routeIdForUpdate = existingRoute.id;
+          if (existingRoute.script === this.id) {
+            routeStatus = 'alreadyUpToDate';
+            plugins.smartlog.defaultLogger.log('info', `route already exists, no update needed`);
+          }
+        }
+      }
+
+      // lets care about actually setting routes
+      if (routeStatus === 'new') {
+        const zoneId = await this.workerManager.cfAccount.getZoneId(newRoute.zoneName);
+        const requestRoute = `/zones/${zoneId}/workers/routes`;
+        await this.workerManager.cfAccount.request('POST', requestRoute, {
+          pattern: newRoute.pattern,
+          script: this.id
+        });
+      } else if (routeStatus === 'needsUpdate') {
+        const zoneId = await this.workerManager.cfAccount.getZoneId(newRoute.zoneName);
+        const requestRoute = `/zones/${zoneId}/workers/routes/${routeIdForUpdate}`;
+        await this.workerManager.cfAccount.request('PUT', requestRoute, {
+          pattern: newRoute.pattern,
+          script: this.id
+        });
+      }
+    }
+  }
+}

ts/cloudflare.classes.workermanager.ts

@@ -0,0 +1,36 @@
+import * as plugins from './cloudflare.plugins';
+import { CloudflareAccount } from './cloudflare.classes.account';
+import { CloudflareWorker } from './cloudflare.classes.worker';
+
+export class WorkerManager {
+  public cfAccount: CloudflareAccount;
+
+  constructor(cfAccountArg: CloudflareAccount) {
+    this.cfAccount = cfAccountArg;
+  }
+
+  public async createWorker(workerName: string, workerScript: string): Promise<CloudflareWorker> {
+    const accountIdentifier = await this.cfAccount.getAccountIdentifier();
+    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)
+    });
+    return CloudflareWorker.fromApiObject(this, responseBody);
+  }
+
+  /**
+   * lists workers
+   */
+  public async listWorkers() {
+    const accountIdentifier = await this.cfAccount.getAccountIdentifier();
+    const route = `/accounts/${accountIdentifier}/workers/scripts`;
+    const response = await this.cfAccount.request('GET', route);
+    const results = response.result;
+    const workers: CloudflareWorker[] = [];
+    for (const apiObject of results) {
+      workers.push(await CloudflareWorker.fromApiObject(this, apiObject));
+    }
+    return workers;
+  }
+}

ts/cloudflare.classes.zone.ts

@@ -0,0 +1,6 @@
+import * as plugins from './cloudflare.plugins';
+import * as interfaces from './interfaces';
+
+export class CloudflareZone {
+  // TODO
+}

ts/cloudflare.classes.zonemanager.ts

@@ -0,0 +1,11 @@
+import * as plugins from './cloudflare.plugins';
+import { CloudflareAccount } from './cloudflare.classes.account';
+
+export class ZoneManager {
+  public cfAccount: CloudflareAccount;
+  public zoneName: string;
+
+  constructor(cfAccountArg: CloudflareAccount) {
+    this.cfAccount = cfAccountArg;
+  }
+}

ts/index.ts

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

ts/interfaces/cloudflare.api.record.ts

@@ -0,0 +1,15 @@
+export interface ICflareRecord {
+  id: string;
+  type: string;
+  name: string;
+  content: string;
+  proxiable: boolean;
+  proxied: boolean;
+  ttl: number;
+  locked: boolean;
+  zone_id: string;
+  zone_name: string;
+  created_on: string;
+  modified_on: string;
+  data: any;
+}

ts/interfaces/cloudflare.api.workerroute.ts

@@ -0,0 +1,5 @@
+export interface ICflareWorkerRoute {
+  id: string;
+  pattern: string;
+  script: string;
+}

ts/interfaces/cloudflare.api.zone.ts

@@ -1,5 +1,3 @@
-import * as plugins from './cloudflare.plugins';
-
 export interface ICflareZone {
   id: string;
   name: string;
@@ -41,19 +39,3 @@ export interface ICflareZone {
   type: string;
   checked_on: string;
 }
-
-export interface ICflareRecord {
-  id: string;
-  type: string;
-  name: string;
-  content: string;
-  proxiable: boolean;
-  proxied: boolean;
-  ttl: number;
-  locked: boolean;
-  zone_id: string;
-  zone_name: string;
-  created_on: string;
-  modified_on: string;
-  data: any;
-}

ts/interfaces/index.ts

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

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "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"
 }