0.0.19

.gitlab-ci.yml

@@ -1,35 +1,30 @@
 image: hosttoday/ht-docker-node:npmts
 
 stages:
-- test1
+- test
-- test2
-- test3
 - release
+- trigger
+- pages
 
 testLEGACY:
-  stage: test1
+  stage: test
   script:
     - npmci test legacy
-  only:
-    - tags
   tags:
     - docker
+  allow_failure: true
 
 testLTS:
-  stage: test2
+  stage: test
   script:
     - npmci test lts
-  only:
-    - tags
   tags:
     - docker
     
 testSTABLE:
-  stage: test3
+  stage: test
   script:
     - npmci test stable
-  only:
-    - tags
   tags:
     - docker
 
@@ -41,3 +36,24 @@ release:
     - tags
   tags:
     - docker
+
+trigger:
+  stage: trigger
+  script:
+    - npmci trigger
+  only:
+    - tags
+  tags:
+    - docker
+
+pages:
+  image: hosttoday/ht-docker-node:npmpage
+  stage: pages
+  script:
+    - npmci command npmpage --publish gitlab
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public

README.md

@@ -1,31 +1,51 @@
 # cflare
-allows you to manage multiple cloudflare accounts.
+easy cloudflare management
 
-> Note: this package is still in alpha, so some things do not yet work.
+## Availabililty
-I (Phil from Lossless) expect this package to be ready 1. of June 2016.
+[![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
+## Status for master
-[![Build Status](https://travis-ci.org/pushrocks/cflare.svg?branch=master)](https://travis-ci.org/pushrocks/cflare)
+[![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
-var cflare = require("cflare");
+import * as cflare from 'cflare'
-var cflareInstance = new cflare();
 
-cflareInstance.auth({
+let myCflareAccount = new cflare.CflareAccount()
-    email:"",
+testCflareAccount.auth({
-    key:""
+    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(...)
+}
 
-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;
 ```
 
-### About the authors:
+For further information read the linked docs at the top of this README.
-[![Project Phase](https://mediaserve.lossless.digital/lossless.com/img/createdby_github.svg)](https://lossless.com/)
 
-[![Gitter](https://img.shields.io/badge/Support%20us-PayPal-blue.svg)](https://paypal.me/lossless)
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+
+[![repo-footer](https://mojoio.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

dist/cflare.classes.cflareaccount.d.ts

@@ -1,9 +1,8 @@
-import "typings-global";
+import 'typings-global';
 import * as interfaces from './cflare.interfaces';
 export declare class CflareAccount {
     private authEmail;
     private authKey;
-    private authCheck();
     constructor();
     auth(optionsArg: {
         email: string;
@@ -17,4 +16,5 @@ export declare class CflareAccount {
     listRecords(domainNameArg: string): Promise<interfaces.ICflareRecord[]>;
     listZones(domainName?: string): Promise<interfaces.ICflareZone[]>;
     request(methodArg: string, routeArg: string, dataArg?: {}): Promise<{}>;
+    private authCheck();
 }

dist/cflare.plugins.d.ts

@@ -1,6 +1,6 @@
 import "typings-global";
 export declare let beautylog: any;
 export import q = require("smartq");
-export declare let request: any;
+export import smartrequest = require("smartrequest");
 export import smartstring = require("smartstring");
 export import smartdelay = require('smartdelay');

dist/cflare.plugins.js

@@ -2,7 +2,7 @@
 require("typings-global");
 exports.beautylog = require("beautylog");
 exports.q = require("smartq");
-exports.request = require("request");
+exports.smartrequest = require("smartrequest");
 exports.smartstring = require("smartstring");
 exports.smartdelay = require("smartdelay");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2ZsYXJlLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jZmxhcmUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXdCO0FBQ2IsUUFBQSxTQUFTLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBQzVDLDhCQUFvQztBQUN6QixRQUFBLE9BQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDeEMsNkNBQW1EO0FBQ25ELDJDQUFpRCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2ZsYXJlLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jZmxhcmUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXdCO0FBQ2IsUUFBQSxTQUFTLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBQzVDLDhCQUFvQztBQUNwQywrQ0FBcUQ7QUFDckQsNkNBQW1EO0FBQ25ELDJDQUFpRCJ9

package.json

@@ -1,7 +1,7 @@
 {
   "name": "cflare",
-  "version": "0.0.11",
+  "version": "0.0.19",
-  "description": "cloudflare management for CoreOS",
+  "description": "easy cloudflare management",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -9,30 +9,30 @@
   },
   "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": "^6.1.1",
-    "request": "^2.79.0",
     "smartdelay": "^1.0.1",
-    "smartq": "^1.0.4",
+    "smartq": "^1.1.0",
+    "smartrequest": "^1.0.4",
     "smartstring": "^2.0.22",
     "typings-global": "^1.0.14"
   },
   "devDependencies": {
     "npmts-g": "^6.0.0",
     "qenv": "^1.1.3",
-    "should": "^11.1.2",
+    "smartchai": "^1.0.1",
     "typings-test": "^1.0.3"
   }
 }

test/test.d.ts

@@ -1 +1 @@
-import "typings-test";
+import 'typings-test';

test/test.js

@@ -1,83 +1,68 @@
 "use strict";
 require("typings-test");
 const cflare = require("../dist/index");
-let should = require("should");
 const qenv_1 = require("qenv");
-let testQenv = new qenv_1.Qenv(process.cwd(), process.cwd() + "/.nogit");
+let testQenv = new qenv_1.Qenv(process.cwd(), process.cwd() + '/.nogit');
 console.log(testQenv.missingEnvVars);
 let testCflareAccount = new cflare.CflareAccount();
 testCflareAccount.auth({
     email: process.env.CF_EMAIL,
     key: process.env.CF_KEY
 });
-describe("cflare", function () {
+let randomPrefix = Math.floor(Math.random() * 2000);
-    describe(".CflareAccount", function () {
+describe('cflare', function () {
-        describe(".listZones()", function () {
+    describe('.CflareAccount', function () {
-            it("should display an entire account", function (done) {
+        describe('.listZones()', function () {
-                this.timeout(30000);
+            it('should display an entire account', function (done) {
+                this.timeout(600000);
                 testCflareAccount.listZones()
                     .then((responseArg) => {
                     done();
                 });
             });
         });
-        describe(".getZoneId(domainName)", function () {
+        describe('.getZoneId(domainName)', function () {
-            it("should get an Cloudflare Id for a domain string", function (done) {
+            it('should get an Cloudflare Id for a domain string', function (done) {
-                this.timeout(30000);
+                this.timeout(600000);
-                testCflareAccount.getZoneId("bleu.de")
+                testCflareAccount.getZoneId('bleu.de')
                     .then((responseArg) => {
                     done();
                 });
             });
         });
-        describe(".listRecords(domainName)", function () {
+        describe('.listRecords(domainName)', function () {
-            it("should list all records for a specific Domain Name", function (done) {
+            it('should list all records for a specific Domain Name', function (done) {
-                this.timeout(30000);
+                this.timeout(600000);
-                testCflareAccount.listRecords("bleu.de")
+                testCflareAccount.listRecords('bleu.de')
                     .then((responseArg) => {
                     console.log(responseArg);
                     done();
                 });
             });
         });
-        describe(".createRecord", function () {
+        describe('.createRecord', function () {
-            it("should create a valid record for a level 2 domain", function (done) {
+            it('should create a valid record for a subdomain', function (done) {
-                this.timeout(30000);
+                this.timeout(600000);
-                testCflareAccount.createRecord("bleu.de", "A", "127.0.0.1")
+                testCflareAccount.createRecord(`${randomPrefix}subdomain.bleu.de`, 'A', '127.0.0.1')
-                    .then(function (responseArg) {
-                    done();
-                });
-            });
-            it("should create a valid record for a subdomain", function (done) {
-                this.timeout(30000);
-                testCflareAccount.createRecord("subdomain.bleu.de", "A", "127.0.0.1")
                     .then(function (responseArg) {
                     done();
                 });
             });
         });
-        describe(".getRecord", function () {
+        describe('.getRecord', function () {
-            it("should get a record from Cloudflare", function (done) {
+            it('should get a record from Cloudflare', function (done) {
-                this.timeout(30000);
+                this.timeout(600000);
-                testCflareAccount.getRecord("bleu.de", "A")
+                testCflareAccount.getRecord('bleu.de', 'A')
                     .then(function (responseArg) {
                     console.log(responseArg);
                     done();
                 });
             });
         });
-        describe(".removeRecord", function () {
+        describe('.removeRecord', function () {
-            it("should remove a record from Cloudflare", function (done) {
+            it('should remove a subdomain record from Cloudflare', function (done) {
-                this.timeout(30000);
+                this.timeout(600000);
-                testCflareAccount.removeRecord("bleu.de", "A")
+                testCflareAccount.removeRecord(`${randomPrefix}subdomain.bleu.de`, 'A')
-                    .then(function (responseArg) {
-                    console.log(responseArg);
-                    done();
-                });
-            });
-            it("should remove a subdomain record from Cloudflare", function (done) {
-                this.timeout(30000);
-                testCflareAccount.removeRecord("subdomain.bleu.de", "A")
                     .then(function (responseArg) {
                     console.log(responseArg);
                     done();
@@ -86,4 +71,4 @@ describe("cflare", function () {
         });
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFzQjtBQUN0Qix3Q0FBeUM7QUFDekMsSUFBSSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQy9CLCtCQUEwQjtBQUMxQixJQUFJLFFBQVEsR0FBRyxJQUFJLFdBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLFNBQVMsQ0FBQyxDQUFDO0FBQ2pFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0FBQ3JDLElBQUksaUJBQWlCLEdBQUcsSUFBSSxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7QUFDbkQsaUJBQWlCLENBQUMsSUFBSSxDQUFDO0lBQ25CLEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVE7SUFDM0IsR0FBRyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTTtDQUMxQixDQUFDLENBQUM7QUFFSCxRQUFRLENBQUMsUUFBUSxFQUFDO0lBQ2QsUUFBUSxDQUFDLGdCQUFnQixFQUFDO1FBQ3RCLFFBQVEsQ0FBQyxjQUFjLEVBQUM7WUFDcEIsRUFBRSxDQUFDLGtDQUFrQyxFQUFDLFVBQVMsSUFBSTtnQkFDL0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztnQkFDcEIsaUJBQWlCLENBQUMsU0FBUyxFQUFFO3FCQUN4QixJQUFJLENBQUMsQ0FBQyxXQUFXO29CQUNkLElBQUksRUFBRSxDQUFDO2dCQUNYLENBQUMsQ0FBQyxDQUFBO1lBQ1YsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDLENBQUMsQ0FBQztRQUNILFFBQVEsQ0FBQyx3QkFBd0IsRUFBQztZQUM5QixFQUFFLENBQUMsaURBQWlELEVBQUMsVUFBUyxJQUFJO2dCQUM5RCxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUss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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFxQjtBQUNyQix3Q0FBd0M7QUFFeEMsK0JBQTJCO0FBQzNCLElBQUksUUFBUSxHQUFHLElBQUksV0FBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsRUFBRSxPQUFPLENBQUMsR0FBRyxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUE7QUFDakUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsY0FBYyxDQUFDLENBQUE7QUFDcEMsSUFBSSxpQkFBaUIsR0FBRyxJQUFJLE1BQU0sQ0FBQyxhQUFhLEVBQUUsQ0FBQTtBQUNsRCxpQkFBaUIsQ0FBQyxJQUFJLENBQUM7SUFDbkIsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtJQUMzQixHQUFHLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNO0NBQzFCLENBQUMsQ0FBQTtBQUVGLElBQUksWUFBWSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFBO0FBRW5ELFFBQVEsQ0FBQyxRQUFRLEVBQUU7SUFDZixRQUFRLENBQUMsZ0JBQWdCLEVBQUU7UUFDdkIsUUFBUSxDQUFDLGNBQWMsRUFBRTtZQUNyQixFQUFFLENBQUMsa0NBQWtDLEVBQUUsVUFBVSxJQUFJO2dCQUNqRCxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO2dCQUNwQixpQkFBaUIsQ0FBQyxTQUFTLEVBQUU7cUJBQ3hCLElBQUksQ0FBQyxDQUFDLFdBQVc7b0JBQ2QsSUFBSSxFQUFFLENBQUE7Z0JBQ1YsQ0FBQyxDQUFDLENBQUE7WUFDVixDQUFDLENBQUMsQ0FBQTtRQUNOLENBQUMsQ0FBQyxDQUFBO1FBQ0YsUUFBUSxDQUFDLHdCQUF3QixFQUFFO1lBQy9CLEVBQUUsQ0FBQyxpREFBaUQsRUFBRSxVQUFVLElBQUk7Z0JBQ2hFLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUE7Z0JBQ3BCLGlCQUFpQixDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUM7cUJBQ2pDLElBQUksQ0FBQyxDQUFDLFdBQVc7b0JBQ2QsSUFBSSxFQUFFLENBQUE7Z0JBQ1YsQ0FBQyxDQUFDLENBQUE7WUFDVixDQUFDLENBQUMsQ0FBQTtRQUNOLENBQUMsQ0FBQyxDQUFBO1FBQ0YsUUFBUSxDQUFDLDBCQUEwQixFQUFFO1lBQ2pDLEVBQUUsQ0FBQyxvREFBb0QsRUFBRSxVQUFVLElBQUk7Z0JBQ25FLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUE7Z0JBQ3BCLGlCQUFpQixDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUM7cUJBQ25DLElBQUksQ0FBQyxDQUFDLFdBQVc7b0JBQ2QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQTtvQkFDeEIsSUFBSSxFQUFFLENBQUE7Z0JBQ1YsQ0FBQyxDQUFDLENBQUE7WUFDVixDQUFDLENBQUMsQ0FBQTtRQUNOLENBQUMsQ0FBQyxDQUFBO1FBQ0YsUUFBUSxDQUFDLGVBQWUsRUFBRTtZQUN0QixFQUFFLENBQUMsOENBQThDLEVBQUUsVUFBVSxJQUFJO2dCQUM3RCxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO2dCQUNwQixpQkFBaUIsQ0FBQyxZQUFZLENBQUMsR0FBRyxZQUFZLG1CQUFtQixFQUFFLEdBQUcsRUFBRSxXQUFXLENBQUM7cUJBQy9FLElBQUksQ0FBQyxVQUFVLFdBQVc7b0JBQ3ZCLElBQUksRUFBRSxDQUFBO2dCQUNWLENBQUMsQ0FBQyxDQUFBO1lBQ1YsQ0FBQyxDQUFDLENBQUE7UUFDTixDQUFDLENBQUMsQ0FBQTtRQUNGLFFBQVEsQ0FBQyxZQUFZLEVBQUU7WUFDbkIsRUFBRSxDQUFDLHFDQUFxQyxFQUFFLFVBQVUsSUFBSTtnQkFDcEQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQTtnQkFDcEIsaUJBQWlCLENBQUMsU0FBUyxDQUFDLFNBQVMsRUFBRSxHQUFHLENBQUM7cUJBQ3RDLElBQUksQ0FBQyxVQUFVLFdBQVc7b0JBQ3ZCLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUE7b0JBQ3hCLElBQUksRUFBRSxDQUFBO2dCQUNWLENBQUMsQ0FBQyxDQUFBO1lBQ1YsQ0FBQyxDQUFDLENBQUE7UUFDTixDQUFDLENBQUMsQ0FBQTtRQUNGLFFBQVEsQ0FBQyxlQUFlLEVBQUU7WUFDdEIsRUFBRSxDQUFDLGtEQUFrRCxFQUFFLFVBQVUsSUFBSTtnQkFDakUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQTtnQkFDcEIsaUJBQWlCLENBQUMsWUFBWSxDQUFDLEdBQUcsWUFBWSxtQkFBbUIsRUFBRSxHQUFHLENBQUM7cUJBQ2xFLElBQUksQ0FBQyxVQUFVLFdBQVc7b0JBQ3ZCLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUE7b0JBQ3hCLElBQUksRUFBRSxDQUFBO2dCQUNWLENBQUMsQ0FBQyxDQUFBO1lBQ1YsQ0FBQyxDQUFDLENBQUE7UUFDTixDQUFDLENBQUMsQ0FBQTtJQUNOLENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyxDQUFDLENBQUEifQ==

test/test.ts

@@ -1,88 +1,75 @@
-import "typings-test";
+import 'typings-test'
-import cflare = require("../dist/index");
+import cflare = require('../dist/index')
-let should = require("should");
+import { expect } from 'smartchai'
-import {Qenv} from "qenv";
+import { Qenv } from 'qenv'
-let testQenv = new Qenv(process.cwd(),process.cwd() + "/.nogit"); 
+let testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit')
-console.log(testQenv.missingEnvVars);
+console.log(testQenv.missingEnvVars)
-let testCflareAccount = new cflare.CflareAccount();
+let testCflareAccount = new cflare.CflareAccount()
 testCflareAccount.auth({
     email: process.env.CF_EMAIL,
     key: process.env.CF_KEY
-});
+})
 
-describe("cflare",function(){
+let randomPrefix = Math.floor(Math.random() * 2000)
-    describe(".CflareAccount",function(){
+
-        describe(".listZones()",function(){
+describe('cflare', function () {
-            it("should display an entire account",function(done){
+    describe('.CflareAccount', function () {
-                this.timeout(30000);
+        describe('.listZones()', function () {
+            it('should display an entire account', function (done) {
+                this.timeout(600000)
                 testCflareAccount.listZones()
-                    .then((responseArg)=>{
-                        done();
-                    })
-            });
-        });
-        describe(".getZoneId(domainName)",function(){
-            it("should get an Cloudflare Id for a domain string",function(done){
-                this.timeout(30000)
-                testCflareAccount.getZoneId("bleu.de")
-                    .then((responseArg)=>{
-                        done();
-                    });
-            });
-        });
-        describe(".listRecords(domainName)",function(){
-            it("should list all records for a specific Domain Name",function(done){
-                this.timeout(30000);
-                testCflareAccount.listRecords("bleu.de")
                     .then((responseArg) => {
-                        console.log(responseArg);
+                        done()
-                        done();
-                    });
-            });
                     })
-        describe(".createRecord",function(){
-            it("should create a valid record for a level 2 domain",function(done){
-                this.timeout(30000);
-                testCflareAccount.createRecord("bleu.de","A","127.0.0.1")
-                    .then(function(responseArg){
-                        done();
-                    });
-            });
-            it("should create a valid record for a subdomain",function(done){
-                this.timeout(30000);
-                testCflareAccount.createRecord("subdomain.bleu.de","A","127.0.0.1")
-                    .then(function(responseArg){
-                        done();
-                    });
-            });
-        });
-        describe(".getRecord",function(){
-            it("should get a record from Cloudflare",function(done){
-                this.timeout(30000);
-                testCflareAccount.getRecord("bleu.de","A")
-                    .then(function(responseArg){
-                        console.log(responseArg);
-                        done();
-                    });
-            });
-        });
-        describe(".removeRecord",function(){
-            it("should remove a record from Cloudflare",function(done){
-                this.timeout(30000);
-                testCflareAccount.removeRecord("bleu.de","A")
-                    .then(function(responseArg){
-                        console.log(responseArg);
-                        done();
-                    });
-            });
-            it("should remove a subdomain record from Cloudflare",function(done){
-                this.timeout(30000);
-                testCflareAccount.removeRecord("subdomain.bleu.de","A")
-                    .then(function(responseArg){
-                        console.log(responseArg);
-                        done();
-                    });
-            });
-        });
             })
-});
+        })
+        describe('.getZoneId(domainName)', function () {
+            it('should get an Cloudflare Id for a domain string', function (done) {
+                this.timeout(600000)
+                testCflareAccount.getZoneId('bleu.de')
+                    .then((responseArg) => {
+                        done()
+                    })
+            })
+        })
+        describe('.listRecords(domainName)', function () {
+            it('should list all records for a specific Domain Name', function (done) {
+                this.timeout(600000)
+                testCflareAccount.listRecords('bleu.de')
+                    .then((responseArg) => {
+                        console.log(responseArg)
+                        done()
+                    })
+            })
+        })
+        describe('.createRecord', function () {
+            it('should create a valid record for a subdomain', function (done) {
+                this.timeout(600000)
+                testCflareAccount.createRecord(`${randomPrefix}subdomain.bleu.de`, 'A', '127.0.0.1')
+                    .then(function (responseArg) {
+                        done()
+                    })
+            })
+        })
+        describe('.getRecord', function () {
+            it('should get a record from Cloudflare', function (done) {
+                this.timeout(600000)
+                testCflareAccount.getRecord('bleu.de', 'A')
+                    .then(function (responseArg) {
+                        console.log(responseArg)
+                        done()
+                    })
+            })
+        })
+        describe('.removeRecord', function () {
+            it('should remove a subdomain record from Cloudflare', function (done) {
+                this.timeout(600000)
+                testCflareAccount.removeRecord(`${randomPrefix}subdomain.bleu.de`, 'A')
+                    .then(function (responseArg) {
+                        console.log(responseArg)
+                        done()
+                    })
+            })
+        })
+    })
+})

ts/cflare.classes.cflareaccount.ts

@@ -1,167 +1,161 @@
-import "typings-global";
+import 'typings-global';
-import plugins = require("./cflare.plugins");
+import plugins = require('./cflare.plugins')
-import helpers = require("./cflare.classes.helpers");
+import helpers = require('./cflare.classes.helpers')
 import * as interfaces from './cflare.interfaces'
 
 export class CflareAccount {
-    private authEmail: string;
+    private authEmail: string
-    private authKey: 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;
     }
+
+    auth(optionsArg: { email: string, key: string }) {
+        this.authEmail = optionsArg.email
+        this.authKey = optionsArg.key
+    }
+
     getZoneId(domainName: string) {
-        let done = plugins.q.defer();
+        let done = plugins.q.defer()
         this.listZones(domainName)
             .then(zoneArrayArg => {
                 let filteredResponse = zoneArrayArg.filter((zoneArg) => {
-                    return zoneArg.name === domainName;
+                    return zoneArg.name === domainName
-                });
+                })
                 if (filteredResponse.length >= 1) {
-                    done.resolve(filteredResponse[0].id);
+                    done.resolve(filteredResponse[ 0 ].id)
                 } else {
-                    plugins.beautylog.error(`the domain ${domainName} does not appear to be in this account!`);
+                    plugins.beautylog.error(`the domain ${domainName} does not appear to be in this account!`)
-                    done.reject(undefined);
+                    done.reject(undefined)
                 }
-            });
+            })
-        return done.promise;
+        return done.promise
     }
     getRecord(domainNameArg: string, typeArg: string): Promise<interfaces.ICflareRecord> {
-        let done = plugins.q.defer();
+        let done = plugins.q.defer()
         let result: interfaces.ICflareRecord
 
-        let domain = new plugins.smartstring.Domain(domainNameArg);
+        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);
+                    return (recordArg.type === typeArg && recordArg.name === domainNameArg)
                 })
-                done.resolve(filteredResponse[0]);
+                done.resolve(filteredResponse[ 0 ])
             })
-        return done.promise;
+        return done.promise
     };
     createRecord(domainNameArg: string, typeArg: string, contentArg: string) {
-        let done = plugins.q.defer();
+        let done = plugins.q.defer()
-        let domain = new plugins.smartstring.Domain(domainNameArg);
+        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)
+                this.request('POST', '/zones/' + domainIdArg + '/dns_records', dataObject)
                     .then(function (responseArg) {
-                        done.resolve(responseArg);
+                        done.resolve(responseArg)
-                    });
+                    })
-            });
+            })
-        return done.promise;
+        return done.promise
     };
     removeRecord(domainNameArg: string, typeArg: string) {
-        let done = plugins.q.defer();
+        let done = plugins.q.defer()
-        let domain = new plugins.smartstring.Domain(domainNameArg);
+        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;
+                    let requestRoute: string = '/zones/' + responseArg.zone_id + '/dns_records/' + responseArg.id
-                    this.request("DELETE", requestRoute)
+                    this.request('DELETE', requestRoute)
                         .then((responseArg) => {
-                            done.resolve(responseArg);
+                            done.resolve(responseArg)
-                        });
+                        })
                 } else {
-                    done.reject();
+                    done.reject()
                 }
-            });
+            })
-        return done.promise;
+        return done.promise
     };
     updateRecord(domainNameArg: string, typeArg: string, valueArg) {
-        let done = plugins.q.defer();
+        let done = plugins.q.defer()
-        let domain = new plugins.smartstring.Domain(domainNameArg);
+        let domain = new plugins.smartstring.Domain(domainNameArg)
-        return done.promise;
+        return done.promise
     };
     listRecords(domainNameArg: string): Promise<interfaces.ICflareRecord[]> {
-        let done = plugins.q.defer<interfaces.ICflareRecord[]>();
+        let done = plugins.q.defer<interfaces.ICflareRecord[]>()
         let result: interfaces.ICflareRecord[] = []
 
-        let domain = new plugins.smartstring.Domain(domainNameArg);
+        let domain = new plugins.smartstring.Domain(domainNameArg)
         this.getZoneId(domain.zoneName)
             .then((domainIdArg) => {
-                this.request("GET", "/zones/" + domainIdArg + "/dns_records?per_page=100")
+                this.request('GET', '/zones/' + domainIdArg + '/dns_records?per_page=100')
                     .then(function (responseArg: any) {
                         result = responseArg.result
-                        done.resolve(result);
+                        done.resolve(result)
-                    });
+                    })
-            });
+            })
-        return done.promise;
+        return done.promise
     }
     listZones(domainName?: string): Promise<interfaces.ICflareZone[]> { // TODO: handle pagination
-        let done = plugins.q.defer<interfaces.ICflareZone[]>();
+        let done = plugins.q.defer<interfaces.ICflareZone[]>()
-        let requestRoute = "/zones?per_page=50"
+        let requestRoute = '/zones?per_page=50'
-        if (domainName) requestRoute = requestRoute + "&name=" + domainName;
+        if (domainName) requestRoute = requestRoute + '&name=' + domainName
-        let result = [];
+        let result = []
-        this.request("GET", requestRoute)
+        this.request('GET', requestRoute)
             .then((responseArg: any) => {
-                result = responseArg.result;
+                result = responseArg.result
-                done.resolve(result);
+                done.resolve(result)
-            });
+            })
-        return done.promise;
+        return done.promise
     };
     request(methodArg: string, routeArg: string, dataArg = {}) {
-        let done = plugins.q.defer();
+        let done = plugins.q.defer()
-        let jsonArg: string = JSON.stringify(dataArg);
+        let jsonArg: string = JSON.stringify(dataArg)
-        let options = {
+        let options: plugins.smartrequest.ISmartRequestOptions = {
             method: methodArg,
-            url: "https://api.cloudflare.com/client/v4" + routeArg,
             headers: {
-                "Content-Type": "application/json",
+                'Content-Type': 'application/json',
-                "X-Auth-Email": this.authEmail,
+                'X-Auth-Email': this.authEmail,
-                "X-Auth-Key": this.authKey
+                'X-Auth-Key': this.authKey
             },
-            body: jsonArg
+            requestBody: jsonArg
-        };
+        }
-        //console.log(options);
+        // console.log(options);
         let retryCount = 0
 
-        let makeRequest = () => {
+        let makeRequest = async () => {
-            plugins.request(options, function (err, res, body) {
+            let response: any = await plugins.smartrequest.request(
-                let responseObj
+                `https://api.cloudflare.com/client/v4${routeArg}`,
-                try {
+                options
-                    responseObj = JSON.parse(body);
+            )
-                } catch (err) {
+            if (response.statusCode === 200) {
-                    console.log(res.statusCode)
+                done.resolve(response.body)
-                    retryRequest()
+            } else if (response.statusCode === 429) {
-                    return
-                }
-                if (!err && res.statusCode === 200) {
-                    done.resolve(responseObj);
-                } else if (!err && res.statusCode === 429) {
                 console.log('rate limited! Waiting for retry!')
                 retryRequest()
-                    return
+            } else if(response.statusCode === 400) {
+                console.log('bad request! Going to retry!')
             } else {
-                    console.log(res.statusCode)
+                console.log(response.statusCode)
-                    console.log(responseObj.messages);
+                done.reject(new Error('request failed'))
-                    console.log(responseObj.errors);
-                    done.reject(err);
-                };
-            });
             }
-        let retryRequest = async (delayTimeArg = 15000) => {
+        }
+        let 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 < 3) {
+            if (retryCount < 10) {
                 retryCount++
-                makeRequest()
+                return await makeRequest()
-                return
             }
         }
         makeRequest()
-        return done.promise;
+        return done.promise
     }
-};
+
+    private authCheck() {
+        return (this.authEmail && this.authKey) // check if auth is available
+    }
+}

ts/cflare.plugins.ts

@@ -1,6 +1,6 @@
 import "typings-global";
 export let beautylog = require("beautylog");
 export import q = require("smartq");
-export let request = require("request");
+export import smartrequest = require("smartrequest");
 export import smartstring = require("smartstring");
 export import smartdelay = require('smartdelay');

tslint.json

@@ -0,0 +1,3 @@
+{
+    "extends": "tslint-config-standard"
+}