jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove usage of util.format

Browse Source
This commit is contained in:
Girish Ramakrishnan
2025-01-31 09:41:10 +01:00
parent dcae882009
commit 6cd97d2cb9
7 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/dns/cloudflare.js
View File

@@ -19,7 +19,6 @@ const assert = require('assert'),
ipaddr = require('ipaddr.js'),
safe = require('safetydance'),
superagent = require('superagent'),
util = require('util'),
waitForDns = require('./waitfordns.js'),
_ = require('underscore');
@@ -38,20 +37,20 @@ function injectPrivateFields(newConfig, currentConfig) {
function translateRequestError(result) {
assert.strictEqual(typeof result, 'object');
if (result.statusCode === 404) return new BoxError(BoxError.NOT_FOUND, util.format('%s %j', result.statusCode, 'API does not exist'));
if (result.statusCode === 404) return new BoxError(BoxError.NOT_FOUND, `[${result.statusCode}] ${JSON.stringify(result.body)}`);
if (result.statusCode === 422) return new BoxError(BoxError.BAD_FIELD, result.body.message);
if (result.statusCode === 400 || result.statusCode === 401 || result.statusCode === 403) {
let message = 'Unknown error';
if (typeof result.body.error === 'string') {
message = `message: ${result.body.error} statusCode: ${result.statusCode}`;
message = `[${result.statusCode}] ${result.body.error}`;
} else if (Array.isArray(result.body.errors) && result.body.errors.length > 0) {
const error = result.body.errors[0];
message = `message: ${error.message} statusCode: ${result.statusCode} code:${error.code}`;
message = `[${result.statusCode}] ${error.message} code:${error.code}`;
}
return new BoxError(BoxError.ACCESS_DENIED, message);
}
return new BoxError(BoxError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body));
return new BoxError(BoxError.EXTERNAL_ERROR, `${result.statusCode} ${JSON.stringify(result.body)}`);
}
function createRequest(method, url, domainConfig) {

3
src/dns/desec.js
View File

@@ -19,13 +19,12 @@ const assert = require('assert'),
safe = require('safetydance'),
timers = require('timers/promises'),
superagent = require('superagent'),
util = require('util'),
waitForDns = require('./waitfordns.js');
const DESEC_ENDPOINT = 'https://desec.io/api/v1';
function formatError(response) {
return util.format('deSEC DNS error [%s] %j', response.statusCode, response.body);
return `deSEC DNS error [${response.statusCode}] ${JSON.stringify(response.body)}`;
}
function removePrivateFields(domainObject) {

3
src/dns/gandi.js
View File

@@ -18,13 +18,12 @@ const assert = require('assert'),
dns = require('../dns.js'),
safe = require('safetydance'),
superagent = require('superagent'),
util = require('util'),
waitForDns = require('./waitfordns.js');
const GANDI_API = 'https://dns.api.gandi.net/api/v5';
function formatError(response) {
return util.format(`Gandi DNS error [${response.statusCode}] ${response.body.message}`);
return `Gandi DNS error [${response.statusCode}] ${response.body.message}`;
}
function removePrivateFields(domainObject) {

3
src/dns/godaddy.js
View File

@@ -18,14 +18,13 @@ const assert = require('assert'),
dns = require('../dns.js'),
safe = require('safetydance'),
superagent = require('superagent'),
util = require('util'),
waitForDns = require('./waitfordns.js');
// const GODADDY_API_OTE = 'https://api.ote-godaddy.com/v1/domains';
const GODADDY_API = 'https://api.godaddy.com/v1/domains';
function formatError(response) {
return util.format(`GoDaddy DNS error [${response.statusCode}] ${response.body.message}`);
return `GoDaddy DNS error [${response.statusCode}] ${response.body.message}`;
}
function removePrivateFields(domainObject) {

6
src/dns/linode.js
View File

@@ -18,13 +18,12 @@ const assert = require('assert'),
dns = require('../dns.js'),
safe = require('safetydance'),
superagent = require('superagent'),
util = require('util'),
waitForDns = require('./waitfordns.js');
const LINODE_ENDPOINT = 'https://api.linode.com/v4';
function formatError(response) {
return util.format('Linode DNS error [%s] %j', response.statusCode, response.body);
return `Linode DNS error [${response.statusCode}] ${JSON.stringify(response.body)}`;
}
function removePrivateFields(domainObject) {
@@ -126,7 +125,8 @@ async function upsert(domainObject, location, type, values) {
debug('upsert: %s for zone %s of type %s with values %j', name, zoneName, type, values);
const { zoneId, records } = await getZoneRecords(domainConfig, zoneName, name, type);
let i = 0, recordIds = []; // used to track available records to update instead of create
let i = 0; // used to track available records to update instead of create
const recordIds = [];
for (const value of values) {
const data = {

5
src/dns/netcup.js
View File

@@ -18,14 +18,13 @@ const assert = require('assert'),
dns = require('../dns.js'),
safe = require('safetydance'),
superagent = require('superagent'),
util = require('util'),
waitForDns = require('./waitfordns.js');
const API_ENDPOINT = 'https://ccp.netcup.net/run/webservice/servers/endpoint.php?JSON';
function formatError(response) {
if (response.body) return util.format('Netcup DNS error [%s] %s', response.body.statuscode, response.body.longmessage);
else return util.format('Netcup DNS error [%s] %s', response.statusCode, response.text);
if (response.body) return `Netcup DNS error [${response.body.statuscode}] ${response.body.longmessage}`;
else return `Netcup DNS error [${response.statusCode}] ${response.text}`;
}
function removePrivateFields(domainObject) {

3
src/dns/vultr.js
View File

@@ -18,13 +18,12 @@ const assert = require('assert'),
dns = require('../dns.js'),
safe = require('safetydance'),
superagent = require('superagent'),
util = require('util'),
waitForDns = require('./waitfordns.js');
const VULTR_ENDPOINT = 'https://api.vultr.com/v2';
function formatError(response) {
return util.format('Vultr DNS error [%s] %j', response.statusCode, response.body);
return `Vultr DNS error [${response.statusCode}] ${JSON.stringify(response.body)}`;
}
function removePrivateFields(domainObject) {