3.0.2

.gitignore

@@ -1,8 +1,22 @@
+.nogit/
+
+# artifacts
 coverage/
-docs/
-ts/typings/
-ts/**/*.js
-ts/**/*.js.map
-.idea/
+public/
+pages/
+
+# installs
 node_modules/
-nogit/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -0,0 +1,117 @@
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+  - .npmci_cache/
+  key: "$CI_BUILD_STAGE"
+
+stages:
+- security
+- test
+- release
+- metadata
+
+# ====================
+# security stage
+# ====================
+mirror:
+  stage: security
+  script:
+  - npmci git mirror
+  tags:
+  - docker
+  - notpriv
+
+snyk:
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install -g snyk
+    - npmci command npm install --ignore-scripts
+    - npmci command snyk test
+  tags:
+  - docker
+  - notpriv
+
+# ====================
+# test stage
+# ====================
+
+testLTS:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
+  - notpriv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install lts
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
+  - notpriv
+
+release:
+  stage: release
+  script:
+  - npmci node install lts
+  - npmci npm publish
+  only:
+  - tags
+  tags:
+  - docker
+  - notpriv
+
+# ====================
+# metadata stage
+# ====================
+codequality:
+  stage: metadata
+  allow_failure: true
+  script:
+    - npmci command npm install -g tslint typescript
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
+  tags:
+  - docker
+  - priv
+
+trigger:
+  stage: metadata
+  script:
+  - npmci trigger
+  only:
+  - tags
+  tags:
+  - docker
+  - notpriv
+
+pages:
+  image: hosttoday/ht-docker-node:npmci
+  stage: metadata
+  script:
+    - npmci command npm install -g @gitzone/tsdoc
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command tsdoc
+  tags:
+    - docker
+    - notpriv
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public
+  allow_failure: true

.travis.yml

@@ -1,12 +0,0 @@
-language: node_js
-node_js:
-- '4'
-- stable
-deploy:
-  provider: npm
-  email: npm@lossless.digital
-  api_key:
-    secure: uWqO634z8xMWI8tcIpSvUeVeG4ypX5fppXWxrSKbO5zOHCHGqJK90XiGFfKUekMf0cYQPb5dLT5+J/3nd4mf4KtU3+v1OK6ZikEqn/PcSeqOmK7EnI9wDFZwDTgJWIn0lRwX2mfB9meblSZ7XthTXumX78fmRTyeyImLm9P0ak+CrNzs8rzKauBoqeVryOez4/LaH3f0kxSz7o7zYLxFqx5xjQ7TFqd1kkVTf4pSQanLHY3z+7+mKrkbcNVxx2gF76hyx6E4pntSJHrOEE/VU/KMk2B6yzrVWYUHUiSRGYOV9U17YaaWlC9DZmnS1cvYcqq3YNujTwPWtci3It9S98hLrSTnCCqin6xhj8IuV6U4WADiXOUvNKuTRcd0/leQ4w3xpPJ1FR2gRtEhwQ0NsnY0vL9tuRAW71lf31122TTJI8lJQNrnaeIGbX7eE0Pq0jeTpmM2W/Tl8pl6s6zBjlEC/mCynQq1pBiz7UmxMYCPE162I8V5USeZOBLzDPZV2y7hmPWjMrWTT+i/IpFmXHjQtVrwlyU6fCOeYHgK/5GdyhnrRYYlx+ce6pCn4tmkVxduimC3m1G8cTkPl00fIpy7KSVcaeQrc1N+KQUqK4FpIjeqB904SVPsI5v3P7sdobaT1aqFqszhR+JK5tXaoesew8R2RncjFK69J7DHJWk=
-  on:
-    tags: true
-    repo: pushrocks/cflare

README.md

@@ -1,31 +1,50 @@
-# cflare
-allows you to manage multiple cloudflare accounts.
+# @mojoio/cloudflare
+easy cloudflare management
 
-> Note: this package is still in alpha, so some things do not yet work.
-I (Phil from Lossless) expect this package to be ready 1. of June 2016.
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@mojoio/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
-[![Build Status](https://travis-ci.org/pushrocks/cflare.svg?branch=master)](https://travis-ci.org/pushrocks/cflare)
+## Status for master
+[![build status](https://gitlab.com/mojoio/cloudflare/badges/master/build.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/)
 
 ## Usage
 
+Use TypeScript for best in class instellisense.
+
 ```javascript
-var cflare = require("cflare");
-var cflareInstance = new cflare();
+import * as cflare from 'cflare'
 
-cflareInstance.auth({
-    email:"",
-    key:""
-});
+let myCflareAccount = new cflare.CflareAccount()
+testCflareAccount.auth({
+    email: 'someuser@example.com',
+    key: 'someLongApiKey'
+})
 
-cflareInstance.createRecord(); // returns promise with resolve function getting the response;
-cflareInstance.removeRecord(); // returns promise with resolve function getting the response;
-cflareInstance.copyRecord(); // returns promise with resolve function getting the response;
-cflareInstance.listRecords(); // returns promise with resolve function getting the response;
-cflareInstance.listDomains(); // returns promise with resolve function getting the response;
+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(...)
+}
 ```
 
-### About the authors:
-[![Project Phase](https://mediaserve.lossless.digital/lossless.com/img/createdby_github.svg)](https://lossless.com/)
+For further information read the linked docs at the top of this readme.
 
-[![Gitter](https://img.shields.io/badge/Support%20us-PayPal-blue.svg)](https://paypal.me/lossless)
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+
+[![repo-footer](https://mojoio.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)

dist/cflare.classes.cflareaccount.d.ts

@@ -1,19 +0,0 @@
-import "typings-global";
-export declare class CflareAccount {
-    private authEmail;
-    private authKey;
-    private authCheck();
-    constructor();
-    auth(optionsArg: {
-        email: string;
-        key: string;
-    }): void;
-    getZoneId(domainName: string): any;
-    getRecord(domainNameArg: string, typeArg: string): any;
-    createRecord(domainNameArg: string, typeArg: string, contentArg: string): any;
-    removeRecord(domainNameArg: string, typeArg: string): any;
-    updateRecord(domainNameArg: string, typeArg: string, valueArg: any): any;
-    listRecords(domainNameArg: string): any;
-    listZones(domainName?: string): any;
-    request(methodArg: string, routeArg: string, dataArg?: {}): any;
-}

dist/cflare.classes.helpers.d.ts

@@ -1 +0,0 @@
-import "typings-global";

dist/cflare.classes.helpers.js

@@ -1,4 +0,0 @@
-"use strict";
-require("typings-global");
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNmbGFyZS5jbGFzc2VzLmhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQSIsImZpbGUiOiJjZmxhcmUuY2xhc3Nlcy5oZWxwZXJzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuaW1wb3J0IHBsdWdpbnMgPSByZXF1aXJlKFwiLi9jZmxhcmUucGx1Z2luc1wiKTsiXX0=

dist/cflare.plugins.d.ts

@@ -1,5 +0,0 @@
-import "typings-global";
-export declare let beautylog: any;
-export declare let q: any;
-export declare let request: any;
-export import smartstring = require("smartstring");

dist/cflare.plugins.js

@@ -1,8 +0,0 @@
-"use strict";
-require("typings-global");
-exports.beautylog = require("beautylog");
-exports.q = require("q");
-exports.request = require("request");
-exports.smartstring = require("smartstring");
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNmbGFyZS5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDYixpQkFBUyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNqQyxTQUFDLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBQ2pCLGVBQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDMUIsbUJBQVcsV0FBVyxhQUFhLENBQUMsQ0FBQyIsImZpbGUiOiJjZmxhcmUucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XHJcbmV4cG9ydCBsZXQgYmVhdXR5bG9nID0gcmVxdWlyZShcImJlYXV0eWxvZ1wiKTtcclxuZXhwb3J0IGxldCBxID0gcmVxdWlyZShcInFcIik7XHJcbmV4cG9ydCBsZXQgcmVxdWVzdCA9IHJlcXVpcmUoXCJyZXF1ZXN0XCIpO1xyXG5leHBvcnQgaW1wb3J0IHNtYXJ0c3RyaW5nID0gcmVxdWlyZShcInNtYXJ0c3RyaW5nXCIpOyJdfQ==

dist/index.d.ts

@@ -1,2 +0,0 @@
-import "typings-global";
-export { CflareAccount } from "./cflare.classes.cflareaccount";

dist/index.js

@@ -1,6 +0,0 @@
-"use strict";
-require("typings-global");
-var cflare_classes_cflareaccount_1 = require("./cflare.classes.cflareaccount");
-exports.CflareAccount = cflare_classes_cflareaccount_1.CflareAccount;
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDeEIsNkNBQTRCLGdDQUFnQyxDQUFDO0FBQXJELHFFQUFxRCIsImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XHJcbmV4cG9ydCB7Q2ZsYXJlQWNjb3VudH0gZnJvbSBcIi4vY2ZsYXJlLmNsYXNzZXMuY2ZsYXJlYWNjb3VudFwiOyJdfQ==

npmextra.json

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

package.json

@@ -1,35 +1,55 @@
 {
-  "name": "cflare",
-  "version": "0.0.3",
-  "description": "cloudflare management for CoreOS",
+  "name": "@mojoio/cloudflare",
+  "version": "3.0.2",
+  "private": false,
+  "description": "easy cloudflare management",
   "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)"
+    "test": "(tstest test/)",
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/pushrocks/cflare.git"
+    "url": "git+https://gitlab.com/pushrocks/cflare.git"
   },
   "keywords": [
-    "CoreOS",
+    "Push.Rocks",
     "cloudflare"
   ],
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/pushrocks/cflare/issues"
+    "url": "https://gitlab.com/pushrocks/cflare/issues"
   },
-  "homepage": "https://github.com/pushrocks/cflare#readme",
+  "homepage": "https://gitlab.com/pushrocks/cflare#readme",
   "dependencies": {
-    "beautylog": "^5.0.6",
-    "q": "^1.4.1",
-    "request": "^2.72.0",
-    "smartstring": "^2.0.1",
-    "typings-global": "^1.0.3"
+    "@pushrocks/smartdelay": "^2.0.3",
+    "@pushrocks/smartlog": "^2.0.19",
+    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartrequest": "^1.1.16",
+    "@pushrocks/smartstring": "^3.0.10",
+    "@tsclass/tsclass": "^2.0.1"
   },
   "devDependencies": {
-    "npmts": "^5.1.14",
-    "should": "^8.4.0",
-    "typings-test": "^1.0.1"
-  }
+    "@gitzone/tsbuild": "^2.1.11",
+    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tstest": "^1.0.24",
+    "@pushrocks/qenv": "^4.0.0",
+    "@pushrocks/tapbundle": "^3.0.11",
+    "@types/node": "^12.6.6",
+    "tslint": "^5.18.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

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

test/test.d.ts

@@ -1 +0,0 @@
-import "typings-test";

test/test.ts

@@ -1,71 +1,80 @@
-import "typings-test";
-import cflare = require("../dist/index");
-let should = require("should");
-let nogit = require("../nogit/nogit.json");
+// tslint:disable-next-line: no-implicit-dependencies
+import { expect, tap } from '@pushrocks/tapbundle';
+// tslint:disable-next-line: no-implicit-dependencies
+import { Qenv } from '@pushrocks/qenv';
 
-let testCflareAccount = new cflare.CflareAccount();
-testCflareAccount.auth({
-    email: nogit.cfemail,
-    key: nogit.cfkey
+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')
+  });
 });
 
-describe("cflare",function(){
-    describe(".CflareAccount",function(){
-        describe(".listZones()",function(){
-            it("should display an account",function(done){
-                this.timeout(10000);
-                testCflareAccount.listZones()
-                    .then((responseArg)=>{
-                        console.log(responseArg);
-                        done();
-                    })
-            });
-        });
-        describe(".getZoneId(domainName)",function(){
-            it("should get an Cloudflare Id for a domain string",function(done){
-                this.timeout(10000)
-                testCflareAccount.getZoneId("push.rocks")
-                    .then((responseArg)=>{
-                        console.log(responseArg);
-                        done();
-                    });
-            });
-        });
-        describe(".listRecords(domainName)",function(){
-            it("should list all records for a specific Domain Name",function(done){
-                this.timeout(10000);
-                testCflareAccount.listRecords("push.rocks")
-                    .then((responseArg) => {
-                        console.log(responseArg);
-                        done();
-                    });
-            });
-        })
-        describe(".createRecord",function(){
-            this.timeout(10000);
-            it("should create a valid record for a level 2 domain",function(done){
-                testCflareAccount.createRecord("bleu.de","A","127.0.0.1")
-                    .then(function(responseArg){
-                        console.log(responseArg);
-                        done();
-                    });
-            });
-            it("should create a valid record for a subdomain",function(done){
-                testCflareAccount.createRecord("subdomain.bleu.de","A","127.0.0.1")
-                    .then(function(responseArg){
-                        console.log(responseArg);
-                        done();
-                    });
-            });
-        });
-        describe(".removeRecord",function(){
-            /*it("should remove a record from Cloudflare",function(done){
-                testCflareAccount.removeRecord()
-                    .then(function(responseArg){
-                        console.log(responseArg);
-                        done();
-                    });
-            });*/
-        });
-    })
+
+
+tap.skip.test('.listZones() -> should display an entire account', async tools => {
+  tools.timeout(600000);
+  const result = await testCloudflareAccount.listZones();
+  console.log(result);
 });
+
+tap.test(
+  '.getZoneId(domainName) -> should get an Cloudflare Id for a domain string',
+  async tools => {
+    tools.timeout(600000);
+    await testCloudflareAccount.getZoneId('bleu.de');
+  }
+);
+
+tap.test(
+  '.listRecords(domainName) -> should list all records for a specific Domain Name',
+  async tools => {
+    tools.timeout(600000);
+    await testCloudflareAccount.listRecords('bleu.de').then(async responseArg => {
+      console.log(responseArg);
+    });
+  }
+);
+
+tap.test('should create a valid record for a subdomain', async tools => {
+  tools.timeout(600000);
+  await testCloudflareAccount.createRecord(`${randomPrefix}subdomain.bleu.de`, 'A', '127.0.0.1');
+});
+
+tap.test('should get a record from Cloudflare', async tools => {
+  tools.timeout(600000);
+  await testCloudflareAccount.getRecord(`${randomPrefix}subdomain.bleu.de`, 'A').then(responseArg => {
+    console.log(responseArg);
+  });
+});
+
+tap.test('should remove a subdomain record from Cloudflare', async tools => {
+  tools.timeout(600000);
+  await testCloudflareAccount
+    .removeRecord(`${randomPrefix}subdomain.bleu.de`, 'A')
+    .then(async responseArg => {
+      console.log(responseArg);
+    });
+});
+
+tap.test('.purge(some.domain) -> should purge everything', async () => {
+  await testCloudflareAccount.purgeZone('bleu.de');
+});
+
+// WORKERS
+tap.test('should create a worker', async () => {
+  await testCloudflareAccount.workerManager.createWorker('myawesomescript', `addEventListener('fetch', event => { event.respondWith(fetch(event.request)) })`);
+});
+
+tap.test('should get workers', async () => {
+  await testCloudflareAccount.workerManager.listWorkers();
+});
+
+tap.start();

ts/cflare.classes.cflareaccount.ts

@@ -1,125 +0,0 @@
-import "typings-global";
-import plugins = require("./cflare.plugins");
-import helpers = require("./cflare.classes.helpers");
-
-export class CflareAccount {
-    private authEmail:string;
-    private authKey:string;
-    private authCheck(){
-        return (this.authEmail && this.authKey); //check if auth is available
-    }
-    constructor(){
-        
-    };
-    auth(optionsArg:{email:string,key:string}){
-        this.authEmail = optionsArg.email;
-        this.authKey = optionsArg.key;       
-    }
-    getZoneId(domainName:string){
-        let done = plugins.q.defer();
-        this.listZones(domainName)
-            .then((responseArg) => {
-                let filteredResponse = responseArg.result.filter((zoneArg)=>{
-                    return zoneArg.name === domainName;
-                });
-                if (filteredResponse.length >= 1){
-                    done.resolve(filteredResponse[0].id);
-                } else {
-                    plugins.beautylog.error("the domain " + domainName.blue + " does not appear to be in this account!");
-                    done.reject(undefined);
-                }
-            });
-        return done.promise;
-    }
-    getRecord(domainNameArg:string,typeArg:string){
-        let done = plugins.q.defer();
-        let domain = new plugins.smartstring.Domain(domainNameArg);
-        this.listRecords(domain.zoneName)
-            .then((responseArg) => {
-                let filteredResponse = responseArg.result.filter((recordArg) => {
-                    return (recordArg.type == typeArg && recordArg.name == domainNameArg); 
-                })
-            })
-        return done.promise;
-    };
-    createRecord(domainNameArg:string,typeArg:string,contentArg:string){
-        let done = plugins.q.defer();
-        let domain = new plugins.smartstring.Domain(domainNameArg);
-        this.getZoneId(domain.zoneName)
-            .then((domainIdArg)=>{
-                let 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;
-    };
-    removeRecord(domainNameArg:string,typeArg:string){
-        let done = plugins.q.defer();
-        let domain = new plugins.smartstring.Domain(domainNameArg);
-        this.getRecord(domain.zoneName,typeArg)
-            .then((responseArg) => {
-                
-            });
-        return done.promise;
-    };
-    updateRecord(domainNameArg:string,typeArg:string,valueArg){
-        let done = plugins.q.defer();
-        let domain = new plugins.smartstring.Domain(domainNameArg);
-        return done.promise;
-    };
-    listRecords(domainNameArg:string){
-        let done = plugins.q.defer();
-        let domain = new plugins.smartstring.Domain(domainNameArg);
-        this.getZoneId(domain.zoneName)
-            .then((domainIdArg)=>{
-                this.request("GET","/zones/" + domainIdArg + "/dns_records?per_page=100")
-                    .then(function(responseArg){
-                        done.resolve(responseArg);
-                    });
-            });
-        return done.promise;
-    }
-    listZones(domainName?:string){ // TODO: handle pagination
-        let done = plugins.q.defer();
-        let requestRoute = "/zones?per_page=50"
-        if(domainName) requestRoute = requestRoute + "&name=" + domainName;
-        let result = {}; 
-        this.request("GET",requestRoute)
-            .then(function(responseArg){
-                result = responseArg;
-                done.resolve(result);
-            });
-        return done.promise;
-    };
-    request(methodArg:string,routeArg:string,dataArg = {}){
-        let done = plugins.q.defer();
-        let jsonArg:string = JSON.stringify(dataArg);
-        let options = {
-            method:methodArg,
-            url:"https://api.cloudflare.com/client/v4" + routeArg,
-            headers:{
-                "Content-Type":"application/json",
-                "X-Auth-Email":this.authEmail,
-                "X-Auth-Key":this.authKey
-            },
-            body:jsonArg
-        };
-        plugins.request(options,function(err, res, body){
-            if (!err && res.statusCode == 200) {
-                var responseObj = JSON.parse(body);
-                done.resolve(responseObj);
-            } else {
-                console.log(err);
-                console.log(res);
-                done.reject(err);
-            };
-        });
-        return done.promise;
-    }
-};

ts/cflare.classes.helpers.ts

@@ -1,2 +0,0 @@
-import "typings-global";
-import plugins = require("./cflare.plugins");

ts/cflare.plugins.ts

@@ -1,5 +0,0 @@
-import "typings-global";
-export let beautylog = require("beautylog");
-export let q = require("q");
-export let request = require("request");
-export import smartstring = require("smartstring");

ts/cloudflare.classes.account.ts

@@ -0,0 +1,217 @@
+import plugins = require('./cloudflare.plugins');
+import * as interfaces from './interfaces/cloudflare.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;
+  private accountIdentifier: 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() {
+    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
+   */
+  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.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!`);
+    }
+  }
+
+  /**
+   * gets a record
+   * @param domainNameArg
+   * @param typeArg
+   */
+  public async getRecord(
+    domainNameArg: string,
+    typeArg: 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 filteredResponse[0];
+  }
+
+  public async createRecord(
+    domainNameArg: string,
+    typeArg: 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
+    };
+    const response = await this.request(
+      'POST',
+      '/zones/' + domainIdArg + '/dns_records',
+      dataObject
+    );
+    return response;
+  }
+
+  /**
+   * removes a record from Cloudflare
+   * @param domainNameArg
+   * @param typeArg 
+   */
+  public async removeRecord(domainNameArg: string, typeArg: 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}`);
+    }
+  }
+
+  /**
+   * 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;
+  }
+
+  /**
+   * list all records of a specified domain name
+   * @param domainNameArg - the domain name that you want to get the records from
+   */
+  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'
+    );
+    const result: interfaces.ICflareRecord[] = responseArg.result;
+    return result;
+  }
+
+  /**
+   * list all zones in the associated authenticated account
+   * @param domainName
+   */
+  public async listZones(domainName?: string): Promise<interfaces.ICflareZone[]> {
+    // TODO: handle pagination
+    let requestRoute = `/zones?per_page=50`;
+
+    // may be optionally filtered by domain name
+    if (domainName) {
+      requestRoute = `${requestRoute}&name=${domainName}`;
+    }
+
+    const response: any = await this.request('GET', requestRoute);
+    const result = response.result;
+    return result;
+  }
+
+  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
+    };
+    const respone = await this.request('DELETE', requestUrl, payload);
+  }
+
+  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)),
+        ...requestHeadersArg
+      },
+      requestBody: dataArg,
+    };
+
+    // console.log(options);
+
+    let retryCount = 0; // count the amount of retries
+
+    const makeRequest = async () => {
+      const response: any = await plugins.smartrequest.request(
+        `https://api.cloudflare.com/client/v4${routeArg}`,
+        options
+      );
+      if (response.statusCode === 200) {
+        done.resolve(response.body);
+      } else if (response.statusCode === 429) {
+        console.log('rate limited! Waiting for retry!');
+        retryRequest();
+      } else if (response.statusCode === 400) {
+        console.log(`bad request for route ${routeArg}! Going to retry!`);
+        console.log(response.body);
+      } else {
+        console.log(response.statusCode);
+        done.reject(new Error('request failed'));
+      }
+    };
+    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) {
+        retryCount++;
+        return await makeRequest();
+      }
+    };
+    makeRequest();
+    return done.promise;
+  }
+
+  private authCheck() {
+    return this.authEmail && this.authKey; // check if auth is available
+  }
+}

ts/cloudflare.classes.worker.ts

@@ -0,0 +1,34 @@
+import { WorkerManager } from './cloudflare.classes.workermanager';
+
+export class Worker {
+  // STATIC
+  public static async fromApiObject(workerManager: WorkerManager, apiObject): Promise<Worker> {
+    console.log(apiObject);
+    return new Worker(workerManager);
+  }
+  
+  // INSTANCE
+  private workerManager: WorkerManager;
+  
+  public id: string;
+  public etag: string;
+  public createdOn: string;
+  public modifiedOn: string;
+
+  public routes: string[] = [];
+  constructor(workerManagerArg: WorkerManager) {
+    this.workerManager = workerManagerArg;
+  }
+
+  /**
+   * gets all routes for a worker
+   */
+  public async getRoutes(){
+    const zones = await this.workerManager.cfAccount.listZones();
+    console.log(zones);
+  }
+  
+  public setRoutes(routeArray: string[]) {
+
+  }
+}

ts/cloudflare.classes.workermanager.ts

@@ -0,0 +1,31 @@
+import * as plugins from './cloudflare.plugins';
+import { CloudflareAccount } from './cloudflare.classes.account';
+import { Worker } from './cloudflare.classes.worker';
+
+export class WorkerManager {
+  public cfAccount: CloudflareAccount;
+
+  constructor(cfAccountArg: CloudflareAccount) {
+    this.cfAccount = cfAccountArg;
+  }
+
+  public async createWorker(workerName: string, workerScript: string): Promise<Worker> {
+    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 Worker.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);
+    console.log(response);
+  }
+}

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/cloudflare.plugins.ts

@@ -0,0 +1,8 @@
+import * as smartlog from '@pushrocks/smartlog';
+import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartrequest from '@pushrocks/smartrequest';
+import * as smartstring from '@pushrocks/smartstring';
+import * as tsclass from '@tsclass/tsclass';
+
+export { smartlog, smartpromise, smartdelay, smartrequest, smartstring, tsclass };

ts/index.ts

@@ -1,2 +1 @@
-import "typings-global";
-export {CflareAccount} from "./cflare.classes.cflareaccount";
+export { CloudflareAccount } from './cloudflare.classes.account';

ts/interfaces/cloudflare.interfaces.ts

@@ -0,0 +1,59 @@
+import * as plugins from '../cloudflare.plugins';
+
+export interface ICflareZone {
+  id: string;
+  name: string;
+  development_mode: number;
+  original_name_servers: string[];
+  original_registrar: string;
+  original_dnshost: string;
+  created_on: string;
+  modified_on: string;
+  name_servers: string[];
+  owner: {
+    id: string;
+    email: string;
+    owner_type: string;
+  };
+  permissions: string[];
+  plan: {
+    id: string;
+    name: string;
+    price: number;
+    currency: string;
+    frequency: string;
+    legacy_id: string;
+    is_subscribed: boolean;
+    can_subscribe: boolean;
+  };
+  plan_pending: {
+    id: string;
+    name: string;
+    price: number;
+    currency: string;
+    frequency: string;
+    legacy_id: string;
+    is_subscribed: string;
+    can_subscribe: string;
+  };
+  status: string;
+  paused: boolean;
+  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 @@
+export * from './cloudflare.interfaces';

ts/typings.json

@@ -1,9 +0,0 @@
-{
-  "version": false,
-  "dependencies": {},
-  "ambientDependencies": {
-    "colors": "registry:dt/colors#0.6.0-1+20160425153322",
-    "mocha": "registry:dt/mocha#2.2.5+20160317120654",
-    "node": "registry:dt/node#4.0.0+20160423143914"
-  }
-}

tslint.json

@@ -0,0 +1,18 @@
+{
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "no-return-await": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
+}