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

rename promise-retry to retry

Browse Source
This commit is contained in:
Girish Ramakrishnan
2026-03-27 11:39:38 +01:00
parent b08e3a5128
commit 9c3c8cc9d1
15 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/acme2.js
+6 -6
View File
@@ -7,7 +7,7 @@ import dns from './dns.js';
import openssl from './openssl.js';
import path from 'node:path';
import paths from './paths.js';
import promiseRetry from './promise-retry.js';
import retry from './retry.js';
import safe from 'safetydance';
import superagent from '@cloudron/superagent';
import users from './users.js';
@@ -244,7 +244,7 @@ Acme2.prototype.waitForOrder = async function (orderUrl) {
log(`waitForOrder: ${orderUrl}`);
return await promiseRetry({ times: 15, interval: 20000, log }, async () => {
return await retry({ times: 15, interval: 20000, log }, async () => {
log('waitForOrder: getting status');
const result = await this.postAsGet(orderUrl);
@@ -297,7 +297,7 @@ Acme2.prototype.waitForChallenge = async function (challenge) {
log(`waitingForChallenge: ${JSON.stringify(challenge)}`);
await promiseRetry({ times: 15, interval: 20000, log }, async () => {
await retry({ times: 15, interval: 20000, log }, async () => {
log('waitingForChallenge: getting status');
const result = await this.postAsGet(challenge.url);
@@ -335,7 +335,7 @@ Acme2.prototype.signCertificate = async function (finalizationUrl, csrPem) {
Acme2.prototype.downloadCertificate = async function (certUrl) {
assert.strictEqual(typeof certUrl, 'string');
return await promiseRetry({ times: 5, interval: 20000, log }, async () => {
return await retry({ times: 5, interval: 20000, log }, async () => {
log(`downloadCertificate: downloading certificate of ${this.cn}`);
const result = await this.postAsGet(certUrl);
@@ -485,7 +485,7 @@ Acme2.prototype.acmeFlow = async function () {
};
Acme2.prototype.loadDirectory = async function () {
await promiseRetry({ times: 3, interval: 20000, log }, async () => {
await retry({ times: 3, interval: 20000, log }, async () => {
const response = await superagent.get(this.caDirectory).timeout(30000).ok(() => true);
if (response.status !== 200) throw new BoxError(BoxError.ACME_ERROR, `Invalid response code when fetching directory : ${response.status}`);
@@ -522,7 +522,7 @@ async function getCertificate(fqdn, domainObject, key) {
const owner = await users.getOwner();
const email = owner?.email || 'webmaster@cloudron.io'; // can error if not activated yet
return await promiseRetry({ times: 3, interval: 0, log }, async function () {
return await retry({ times: 3, interval: 0, log }, async function () {
log(`getCertificate: for fqdn ${fqdn} and domain ${domainObject.domain}`);
const acme = new Acme2(fqdn, domainObject, email, key, { /* profile: 'shortlived' */ });