now reacting to rate limiting

This commit is contained in:
Philipp Kunz 2017-01-22 19:37:00 +01:00
parent c76643d700
commit 0692d16dd7
14 changed files with 313 additions and 123 deletions

View File

@ -1,4 +1,5 @@
import "typings-global"; import "typings-global";
import * as interfaces from './cflare.interfaces';
export declare class CflareAccount { export declare class CflareAccount {
private authEmail; private authEmail;
private authKey; private authKey;
@ -8,12 +9,12 @@ export declare class CflareAccount {
email: string; email: string;
key: string; key: string;
}): void; }): void;
getZoneId(domainName: string): any; getZoneId(domainName: string): Promise<{}>;
getRecord(domainNameArg: string, typeArg: string): any; getRecord(domainNameArg: string, typeArg: string): Promise<interfaces.ICflareRecord>;
createRecord(domainNameArg: string, typeArg: string, contentArg: string): any; createRecord(domainNameArg: string, typeArg: string, contentArg: string): Promise<{}>;
removeRecord(domainNameArg: string, typeArg: string): any; removeRecord(domainNameArg: string, typeArg: string): Promise<{}>;
updateRecord(domainNameArg: string, typeArg: string, valueArg: any): any; updateRecord(domainNameArg: string, typeArg: string, valueArg: any): Promise<{}>;
listRecords(domainNameArg: string): any; listRecords(domainNameArg: string): Promise<interfaces.ICflareRecord[]>;
listZones(domainName?: string): any; listZones(domainName?: string): Promise<interfaces.ICflareZone[]>;
request(methodArg: string, routeArg: string, dataArg?: {}): any; request(methodArg: string, routeArg: string, dataArg?: {}): Promise<{}>;
} }

File diff suppressed because one or more lines are too long

View File

@ -1,3 +1,3 @@
"use strict"; "use strict";
require("typings-global"); require("typings-global");
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2ZsYXJlLmNsYXNzZXMuaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NmbGFyZS5jbGFzc2VzLmhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQWdCLENBQUMsQ0FBQSJ9 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2ZsYXJlLmNsYXNzZXMuaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NmbGFyZS5jbGFzc2VzLmhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDBCQUF3QiJ9

56
dist/cflare.interfaces.d.ts vendored Normal file
View File

@ -0,0 +1,56 @@
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;
}

2
dist/cflare.interfaces.js vendored Normal file
View File

@ -0,0 +1,2 @@
"use strict";
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2ZsYXJlLmludGVyZmFjZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jZmxhcmUuaW50ZXJmYWNlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

View File

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

View File

@ -1,7 +1,8 @@
"use strict"; "use strict";
require("typings-global"); require("typings-global");
exports.beautylog = require("beautylog"); exports.beautylog = require("beautylog");
exports.q = require("q"); exports.q = require("smartq");
exports.request = require("request"); exports.request = require("request");
exports.smartstring = require("smartstring"); exports.smartstring = require("smartstring");
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2ZsYXJlLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jZmxhcmUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ2IsaUJBQVMsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUM7QUFDakMsU0FBQyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUNqQixlQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzFCLG1CQUFXLFdBQVcsYUFBYSxDQUFDLENBQUMifQ== exports.smartdelay = require("smartdelay");
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2ZsYXJlLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9jZmxhcmUucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXdCO0FBQ2IsUUFBQSxTQUFTLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBQzVDLDhCQUFvQztBQUN6QixRQUFBLE9BQU8sR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDeEMsNkNBQW1EO0FBQ25ELDJDQUFpRCJ9

2
dist/index.js vendored
View File

@ -2,4 +2,4 @@
require("typings-global"); require("typings-global");
var cflare_classes_cflareaccount_1 = require("./cflare.classes.cflareaccount"); var cflare_classes_cflareaccount_1 = require("./cflare.classes.cflareaccount");
exports.CflareAccount = cflare_classes_cflareaccount_1.CflareAccount; exports.CflareAccount = cflare_classes_cflareaccount_1.CflareAccount;
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLDZDQUE0QixnQ0FBZ0MsQ0FBQztBQUFyRCxxRUFBcUQifQ== //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXdCO0FBQ3hCLCtFQUE2RDtBQUFyRCx1REFBQSxhQUFhLENBQUEifQ==

View File

@ -22,16 +22,17 @@
}, },
"homepage": "https://github.com/pushrocks/cflare#readme", "homepage": "https://github.com/pushrocks/cflare#readme",
"dependencies": { "dependencies": {
"beautylog": "^5.0.18", "beautylog": "^6.1.1",
"q": "^1.4.1", "request": "^2.79.0",
"request": "^2.74.0", "smartdelay": "^1.0.1",
"smartstring": "^2.0.15", "smartq": "^1.0.4",
"typings-global": "^1.0.6" "smartstring": "^2.0.22",
"typings-global": "^1.0.14"
}, },
"devDependencies": { "devDependencies": {
"npmts-g": "^5.2.8", "npmts-g": "^6.0.0",
"qenv": "^1.0.8", "qenv": "^1.1.3",
"should": "^10.0.0", "should": "^11.1.2",
"typings-test": "^1.0.1" "typings-test": "^1.0.3"
} }
} }

View File

@ -14,27 +14,25 @@ describe("cflare", function () {
describe(".CflareAccount", function () { describe(".CflareAccount", function () {
describe(".listZones()", function () { describe(".listZones()", function () {
it("should display an entire account", function (done) { it("should display an entire account", function (done) {
this.timeout(10000); this.timeout(30000);
testCflareAccount.listZones() testCflareAccount.listZones()
.then((responseArg) => { .then((responseArg) => {
console.log(responseArg);
done(); 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(10000); this.timeout(30000);
testCflareAccount.getZoneId("bleu.de") testCflareAccount.getZoneId("bleu.de")
.then((responseArg) => { .then((responseArg) => {
console.log(responseArg);
done(); 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(10000); this.timeout(30000);
testCflareAccount.listRecords("bleu.de") testCflareAccount.listRecords("bleu.de")
.then((responseArg) => { .then((responseArg) => {
console.log(responseArg); console.log(responseArg);
@ -43,24 +41,24 @@ describe("cflare", function () {
}); });
}); });
describe(".createRecord", function () { describe(".createRecord", function () {
this.timeout(10000);
it("should create a valid record for a level 2 domain", function (done) { 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") testCflareAccount.createRecord("bleu.de", "A", "127.0.0.1")
.then(function (responseArg) { .then(function (responseArg) {
console.log(responseArg);
done(); done();
}); });
}); });
it("should create a valid record for a subdomain", function (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") testCflareAccount.createRecord("subdomain.bleu.de", "A", "127.0.0.1")
.then(function (responseArg) { .then(function (responseArg) {
console.log(responseArg);
done(); 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);
testCflareAccount.getRecord("bleu.de", "A") testCflareAccount.getRecord("bleu.de", "A")
.then(function (responseArg) { .then(function (responseArg) {
console.log(responseArg); console.log(responseArg);
@ -70,6 +68,7 @@ describe("cflare", function () {
}); });
describe(".removeRecord", function () { describe(".removeRecord", function () {
it("should remove a record from Cloudflare", function (done) { it("should remove a record from Cloudflare", function (done) {
this.timeout(30000);
testCflareAccount.removeRecord("bleu.de", "A") testCflareAccount.removeRecord("bleu.de", "A")
.then(function (responseArg) { .then(function (responseArg) {
console.log(responseArg); console.log(responseArg);
@ -77,7 +76,7 @@ describe("cflare", function () {
}); });
}); });
it("should remove a subdomain record from Cloudflare", function (done) { it("should remove a subdomain record from Cloudflare", function (done) {
this.timeout(5000); this.timeout(30000);
testCflareAccount.removeRecord("subdomain.bleu.de", "A") testCflareAccount.removeRecord("subdomain.bleu.de", "A")
.then(function (responseArg) { .then(function (responseArg) {
console.log(responseArg); console.log(responseArg);
@ -87,4 +86,4 @@ describe("cflare", function () {
}); });
}); });
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsTUFBTyxNQUFNLFdBQVcsZUFBZSxDQUFDLENBQUM7QUFDekMsSUFBSSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQy9CLHVCQUFtQixNQUFNLENBQUMsQ0FBQTtBQUMxQixJQUFJLFFBQVEsR0FBRyxJQUFJLFdBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLFNBQVMsQ0FBQyxDQUFDO0FBQ2pFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0FBQ3JDLElBQUksaUJBQWlCLEdBQUcsSUFBSSxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7QUFDbkQsaUJBQWlCLENBQUMsSUFBSSxDQUFDO0lBQ25CLEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVE7SUFDM0IsR0FBRyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTTtDQUMxQixDQUFDLENBQUM7QUFFSCxRQUFRLENBQUMsUUFBUSxFQUFDO0lBQ2QsUUFBUSxDQUFDLGdCQUFnQixFQUFDO1FBQ3RCLFFBQVEsQ0FBQyxjQUFjLEVBQUM7WUFDcEIsRUFBRSxDQUFDLGtDQUFrQyxFQUFDLFVBQVMsSUFBSTtnQkFDL0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztnQkFDcEIsaUJBQWlCLENBQUMsU0FBUyxFQUFFO3FCQUN4QixJQUFJLENBQUMsQ0FBQyxXQUFXO29CQUNkLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUM7b0JBQ3pCLElBQUksRUFBRSxDQUFDO2dCQUNYLENBQUMsQ0FBQyxDQUFBO1lBQ1YsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDLENBQUMsQ0FBQztRQUNI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 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLHdCQUFzQjtBQUN0Qix3Q0FBeUM7QUFDekMsSUFBSSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBQy9CLCtCQUEwQjtBQUMxQixJQUFJLFFBQVEsR0FBRyxJQUFJLFdBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxHQUFHLFNBQVMsQ0FBQyxDQUFDO0FBQ2pFLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQyxDQUFDO0FBQ3JDLElBQUksaUJBQWlCLEdBQUcsSUFBSSxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7QUFDbkQsaUJBQWlCLENBQUMsSUFBSSxDQUFDO0lBQ25CLEtBQUssRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVE7SUFDM0IsR0FBRyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTTtDQUMxQixDQUFDLENBQUM7QUFFSCxRQUFRLENBQUMsUUFBUSxFQUFDO0lBQ2QsUUFBUSxDQUFDLGdCQUFnQixFQUFDO1FBQ3RCLFFBQVEsQ0FBQyxjQUFjLEVBQUM7WUFDcEIsRUFBRSxDQUFDLGtDQUFrQyxFQUFDLFVBQVMsSUFBSTtnQkFDL0MsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQztnQkFDcEIsaUJBQWlCLENBQUMsU0FBUyxFQUFFO3FCQUN4QixJQUFJLENBQUMsQ0FBQyxXQUFXO29CQUNkLElBQUksRUFBRSxDQUFDO2dCQUNYLENBQUMsQ0FBQyxDQUFBO1lBQ1YsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDLENBQUMsQ0FBQztRQUNILFFBQVEsQ0FBQyx3QkFBd0IsRUFBQztZQUM5QixFQUFFLENBQUMsaURBQWlELEVBQUMsVUFBUyxJQUFJO2dCQUM5RCxJQUFJLENBQUMsT0FBTyxDQUFDLEtBQUss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

View File

@ -14,27 +14,25 @@ describe("cflare",function(){
describe(".CflareAccount",function(){ describe(".CflareAccount",function(){
describe(".listZones()",function(){ describe(".listZones()",function(){
it("should display an entire account",function(done){ it("should display an entire account",function(done){
this.timeout(10000); this.timeout(30000);
testCflareAccount.listZones() testCflareAccount.listZones()
.then((responseArg)=>{ .then((responseArg)=>{
console.log(responseArg);
done(); 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(10000) this.timeout(30000)
testCflareAccount.getZoneId("bleu.de") testCflareAccount.getZoneId("bleu.de")
.then((responseArg)=>{ .then((responseArg)=>{
console.log(responseArg);
done(); 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(10000); this.timeout(30000);
testCflareAccount.listRecords("bleu.de") testCflareAccount.listRecords("bleu.de")
.then((responseArg) => { .then((responseArg) => {
console.log(responseArg); console.log(responseArg);
@ -43,24 +41,24 @@ describe("cflare",function(){
}); });
}) })
describe(".createRecord",function(){ describe(".createRecord",function(){
this.timeout(10000);
it("should create a valid record for a level 2 domain",function(done){ 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") testCflareAccount.createRecord("bleu.de","A","127.0.0.1")
.then(function(responseArg){ .then(function(responseArg){
console.log(responseArg);
done(); done();
}); });
}); });
it("should create a valid record for a subdomain",function(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") testCflareAccount.createRecord("subdomain.bleu.de","A","127.0.0.1")
.then(function(responseArg){ .then(function(responseArg){
console.log(responseArg);
done(); 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);
testCflareAccount.getRecord("bleu.de","A") testCflareAccount.getRecord("bleu.de","A")
.then(function(responseArg){ .then(function(responseArg){
console.log(responseArg); console.log(responseArg);
@ -70,6 +68,7 @@ describe("cflare",function(){
}); });
describe(".removeRecord",function(){ describe(".removeRecord",function(){
it("should remove a record from Cloudflare",function(done){ it("should remove a record from Cloudflare",function(done){
this.timeout(30000);
testCflareAccount.removeRecord("bleu.de","A") testCflareAccount.removeRecord("bleu.de","A")
.then(function(responseArg){ .then(function(responseArg){
console.log(responseArg); console.log(responseArg);
@ -77,7 +76,7 @@ describe("cflare",function(){
}); });
}); });
it("should remove a subdomain record from Cloudflare",function(done){ it("should remove a subdomain record from Cloudflare",function(done){
this.timeout(5000); this.timeout(30000);
testCflareAccount.removeRecord("subdomain.bleu.de","A") testCflareAccount.removeRecord("subdomain.bleu.de","A")
.then(function(responseArg){ .then(function(responseArg){
console.log(responseArg); console.log(responseArg);

View File

@ -1,73 +1,76 @@
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 { export class CflareAccount {
private authEmail:string; private authEmail: string;
private authKey:string; private authKey: string;
private authCheck(){ private authCheck() {
return (this.authEmail && this.authKey); //check if auth is available return (this.authEmail && this.authKey); //check if auth is available
} }
constructor(){ constructor() {
}; };
auth(optionsArg:{email:string,key:string}){ auth(optionsArg: { email: string, key: string }) {
this.authEmail = optionsArg.email; this.authEmail = optionsArg.email;
this.authKey = optionsArg.key; this.authKey = optionsArg.key;
} }
getZoneId(domainName:string){ getZoneId(domainName: string) {
let done = plugins.q.defer(); let done = plugins.q.defer();
this.listZones(domainName) this.listZones(domainName)
.then((responseArg) => { .then(zoneArrayArg => {
let filteredResponse = responseArg.result.filter((zoneArg)=>{ let filteredResponse = zoneArrayArg.filter((zoneArg) => {
return zoneArg.name === domainName; return zoneArg.name === domainName;
}); });
if (filteredResponse.length >= 1){ if (filteredResponse.length >= 1) {
done.resolve(filteredResponse[0].id); done.resolve(filteredResponse[0].id);
} else { } else {
plugins.beautylog.error("the domain " + domainName.blue + " 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){ 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) this.listRecords(domain.zoneName)
.then((responseArg) => { .then((recordArrayArg) => {
let filteredResponse = responseArg.result.filter((recordArg) => { 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){ 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) this.getZoneId(domain.zoneName)
.then((domainIdArg)=>{ .then((domainIdArg) => {
let dataObject = { let dataObject = {
name: domain.fullName, name: domain.fullName,
type: typeArg, type: typeArg,
content: contentArg content: contentArg
}; };
this.request("POST","/zones/" + domainIdArg + "/dns_records",dataObject) this.request("POST", "/zones/" + domainIdArg + "/dns_records", dataObject)
.then(function(responseArg){ .then(function (responseArg) {
done.resolve(responseArg); done.resolve(responseArg);
}); });
}); });
return done.promise; return done.promise;
}; };
removeRecord(domainNameArg:string,typeArg:string){ 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) this.getRecord(domain.fullName, typeArg)
.then((responseArg) => { .then((responseArg) => {
if(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) => { .then((responseArg) => {
done.resolve(responseArg); done.resolve(responseArg);
}); });
@ -77,59 +80,88 @@ export class CflareAccount {
}); });
return done.promise; return done.promise;
}; };
updateRecord(domainNameArg:string,typeArg:string,valueArg){ 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){ listRecords(domainNameArg: string): Promise<interfaces.ICflareRecord[]> {
let done = plugins.q.defer(); 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) this.getZoneId(domain.zoneName)
.then((domainIdArg)=>{ .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){ .then(function (responseArg: any) {
done.resolve(responseArg); result = responseArg.result
done.resolve(result);
}); });
}); });
return done.promise; return done.promise;
} }
listZones(domainName?:string){ // TODO: handle pagination listZones(domainName?: string): Promise<interfaces.ICflareZone[]> { // TODO: handle pagination
let done = plugins.q.defer(); 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(function(responseArg){ .then((responseArg: any) => {
result = responseArg; result = responseArg.result;
done.resolve(result); done.resolve(result);
}); });
return done.promise; return done.promise;
}; };
request(methodArg:string,routeArg:string,dataArg = {}){ 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 = {
method:methodArg, method: methodArg,
url:"https://api.cloudflare.com/client/v4" + routeArg, url: "https://api.cloudflare.com/client/v4" + routeArg,
headers:{ 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 body: jsonArg
}; };
//console.log(options); //console.log(options);
plugins.request(options,function(err, res, body){ let retryCount = 0
if (!err && res.statusCode == 200) {
var responseObj = JSON.parse(body); let makeRequest = () => {
plugins.request(options, function (err, res, body) {
let responseObj
try {
responseObj = JSON.parse(body);
} catch (err) {
console.log(res.statusCode)
retryRequest()
return
}
if (!err && res.statusCode === 200) {
done.resolve(responseObj); done.resolve(responseObj);
} else if (!err && res.statusCode === 429) {
console.log('rate limited! Waiting for retry!')
retryRequest()
return
} else { } else {
console.log(err); console.log(res.statusCode)
console.log(res); console.log(responseObj.messages);
console.log(responseObj.errors);
done.reject(err); done.reject(err);
}; };
}); });
}
let retryRequest = async (delayTimeArg = 15000) => {
console.log(`retry started and waiting for ${delayTimeArg} ms`)
await plugins.smartdelay.delayFor(delayTimeArg)
if (retryCount < 3) {
retryCount++
makeRequest()
return
}
}
makeRequest()
return done.promise; return done.promise;
} }
}; };

59
ts/cflare.interfaces.ts Normal file
View File

@ -0,0 +1,59 @@
import * as plugins from './cflare.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
}

View File

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