now using smartrequest
This commit is contained in:
@ -1,167 +1,161 @@
|
||||
import "typings-global";
|
||||
import plugins = require("./cflare.plugins");
|
||||
import helpers = require("./cflare.classes.helpers");
|
||||
import 'typings-global';
|
||||
import plugins = require('./cflare.plugins')
|
||||
import helpers = require('./cflare.classes.helpers')
|
||||
import * as interfaces from './cflare.interfaces'
|
||||
|
||||
export class CflareAccount {
|
||||
private authEmail: string;
|
||||
private authKey: string;
|
||||
private authCheck() {
|
||||
return (this.authEmail && this.authKey); //check if auth is available
|
||||
}
|
||||
private authEmail: string
|
||||
private authKey: string
|
||||
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!`);
|
||||
done.reject(undefined);
|
||||
plugins.beautylog.error(`the domain ${domainName} does not appear to be in this account!`)
|
||||
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 domain = new plugins.smartstring.Domain(domainNameArg);
|
||||
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)
|
||||
}
|
||||
this.request('POST', '/zones/' + domainIdArg + '/dns_records', dataObject)
|
||||
.then(function (responseArg) {
|
||||
done.resolve(responseArg);
|
||||
});
|
||||
});
|
||||
return done.promise;
|
||||
done.resolve(responseArg)
|
||||
})
|
||||
})
|
||||
return done.promise
|
||||
};
|
||||
removeRecord(domainNameArg: string, typeArg: string) {
|
||||
let done = plugins.q.defer();
|
||||
let domain = new plugins.smartstring.Domain(domainNameArg);
|
||||
let done = plugins.q.defer()
|
||||
let domain = new plugins.smartstring.Domain(domainNameArg)
|
||||
this.getRecord(domain.fullName, typeArg)
|
||||
.then((responseArg) => {
|
||||
if (responseArg) {
|
||||
let requestRoute: string = "/zones/" + responseArg.zone_id + "/dns_records/" + responseArg.id;
|
||||
this.request("DELETE", requestRoute)
|
||||
let requestRoute: string = '/zones/' + responseArg.zone_id + '/dns_records/' + responseArg.id
|
||||
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 domain = new plugins.smartstring.Domain(domainNameArg);
|
||||
return done.promise;
|
||||
let done = plugins.q.defer()
|
||||
let domain = new plugins.smartstring.Domain(domainNameArg)
|
||||
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);
|
||||
});
|
||||
});
|
||||
return done.promise;
|
||||
done.resolve(result)
|
||||
})
|
||||
})
|
||||
return done.promise
|
||||
}
|
||||
listZones(domainName?: string): Promise<interfaces.ICflareZone[]> { // TODO: handle pagination
|
||||
let done = plugins.q.defer<interfaces.ICflareZone[]>();
|
||||
let requestRoute = "/zones?per_page=50"
|
||||
if (domainName) requestRoute = requestRoute + "&name=" + domainName;
|
||||
let result = [];
|
||||
this.request("GET", requestRoute)
|
||||
let done = plugins.q.defer<interfaces.ICflareZone[]>()
|
||||
let requestRoute = '/zones?per_page=50'
|
||||
if (domainName) requestRoute = requestRoute + '&name=' + domainName
|
||||
let result = []
|
||||
this.request('GET', requestRoute)
|
||||
.then((responseArg: any) => {
|
||||
result = responseArg.result;
|
||||
done.resolve(result);
|
||||
});
|
||||
return done.promise;
|
||||
result = responseArg.result
|
||||
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 = {
|
||||
let done = plugins.q.defer()
|
||||
let jsonArg: string = JSON.stringify(dataArg)
|
||||
let options: plugins.smartrequest.ISmartRequestOptions = {
|
||||
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
|
||||
'Content-Type': 'application/json',
|
||||
'X-Auth-Email': this.authEmail,
|
||||
'X-Auth-Key': this.authKey
|
||||
},
|
||||
body: jsonArg
|
||||
};
|
||||
//console.log(options);
|
||||
requestBody: jsonArg
|
||||
}
|
||||
// console.log(options);
|
||||
let retryCount = 0
|
||||
|
||||
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);
|
||||
} else if (!err && res.statusCode === 429) {
|
||||
console.log('rate limited! Waiting for retry!')
|
||||
retryRequest()
|
||||
return
|
||||
} else {
|
||||
console.log(res.statusCode)
|
||||
console.log(responseObj.messages);
|
||||
console.log(responseObj.errors);
|
||||
done.reject(err);
|
||||
};
|
||||
});
|
||||
let makeRequest = async () => {
|
||||
let 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 {
|
||||
console.log(response.status)
|
||||
console.log(response.messages)
|
||||
console.log(response.errors)
|
||||
done.reject(new Error('request failed'))
|
||||
}
|
||||
}
|
||||
let retryRequest = async (delayTimeArg = 15000) => {
|
||||
let retryRequest = async (delayTimeArg = 6000) => {
|
||||
console.log(`retry started and waiting for ${delayTimeArg} ms`)
|
||||
await plugins.smartdelay.delayFor(delayTimeArg)
|
||||
if (retryCount < 3) {
|
||||
if (retryCount < 10) {
|
||||
retryCount++
|
||||
makeRequest()
|
||||
return
|
||||
return await makeRequest()
|
||||
}
|
||||
}
|
||||
makeRequest()
|
||||
return done.promise;
|
||||
return done.promise
|
||||
}
|
||||
};
|
||||
|
||||
private authCheck() {
|
||||
return (this.authEmail && this.authKey) // check if auth is available
|
||||
}
|
||||
}
|
||||
|
||||
@ -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');
|
||||
Reference in New Issue
Block a user