@prosopo/cli 3.10.5 → 3.10.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build$colon$cjs.log +6 -5
- package/.turbo/turbo-build$colon$esm.log +6 -5
- package/.turbo/turbo-build$colon$tsc.log +33 -33
- package/CHANGELOG.md +19 -0
- package/dist/bundle/provider.cli.bundle.js +13283 -13152
- package/dist/cjs/cli.cjs +1 -0
- package/dist/cjs/reloader.cjs +2 -1
- package/dist/cjs/retryWithBackoff.cjs +31 -0
- package/dist/cjs/start.cjs +2 -1
- package/dist/esm/cli.js +1 -0
- package/dist/esm/reloader.js +2 -1
- package/dist/esm/retryWithBackoff.js +30 -0
- package/dist/esm/start.js +2 -1
- package/dist/tsc/cli.js +1 -0
- package/dist/tsc/cli.js.map +1 -1
- package/dist/tsc/reloader.d.ts.map +1 -1
- package/dist/tsc/reloader.js +2 -1
- package/dist/tsc/reloader.js.map +1 -1
- package/dist/tsc/retryWithBackoff.d.ts +17 -0
- package/dist/tsc/retryWithBackoff.d.ts.map +1 -0
- package/dist/tsc/retryWithBackoff.js +26 -0
- package/dist/tsc/retryWithBackoff.js.map +1 -0
- package/dist/tsc/start.d.ts.map +1 -1
- package/dist/tsc/start.js +2 -1
- package/dist/tsc/start.js.map +1 -1
- package/dist/tsc/tests/retryWithBackoff.unit.test.d.ts +2 -0
- package/dist/tsc/tests/retryWithBackoff.unit.test.d.ts.map +1 -0
- package/dist/tsc/tests/retryWithBackoff.unit.test.js +68 -0
- package/dist/tsc/tests/retryWithBackoff.unit.test.js.map +1 -0
- package/dist/types/reloader.d.ts.map +1 -1
- package/dist/types/retryWithBackoff.d.ts +17 -0
- package/dist/types/retryWithBackoff.d.ts.map +1 -0
- package/dist/types/start.d.ts.map +1 -1
- package/dist/types/tests/retryWithBackoff.unit.test.d.ts +2 -0
- package/dist/types/tests/retryWithBackoff.unit.test.d.ts.map +1 -0
- package/package.json +10 -10
package/dist/cjs/cli.cjs
CHANGED
|
@@ -29,6 +29,7 @@ if ((0, _prosopo_util.isMain)(require("url").pathToFileURL(__filename).href, "pr
|
|
|
29
29
|
log.info(() => ({ msg: "Running main process..." }));
|
|
30
30
|
}).catch((error) => {
|
|
31
31
|
log.error(() => ({ err: error }));
|
|
32
|
+
node_process.default.exitCode = 1;
|
|
32
33
|
});
|
|
33
34
|
});
|
|
34
35
|
//#endregion
|
package/dist/cjs/reloader.cjs
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
const require_runtime = require("./_virtual/_rolldown/runtime.cjs");
|
|
2
|
+
const require_retryWithBackoff = require("./retryWithBackoff.cjs");
|
|
2
3
|
const require_start = require("./start.cjs");
|
|
3
4
|
let _prosopo_logger = require("@prosopo/logger");
|
|
4
5
|
let _prosopo_env = require("@prosopo/env");
|
|
@@ -24,7 +25,7 @@ var ReloadingAPI = class {
|
|
|
24
25
|
log.info(() => ({ msg: "Starting API" }));
|
|
25
26
|
(0, _prosopo_dotenv.loadEnv)();
|
|
26
27
|
if (!this._env || reloadEnv) this._env = new _prosopo_env.ProviderEnvironment(this._config, this._pair, this._authAccount);
|
|
27
|
-
await this.env
|
|
28
|
+
await require_retryWithBackoff.waitForEnvironment(this.env);
|
|
28
29
|
this.api = await require_start.start(this.env, !!this._processedArgs.adminApi);
|
|
29
30
|
if (process.env.NODE_ENV === "development") this._envWatcher = await this._watchEnv();
|
|
30
31
|
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
//#region src/retryWithBackoff.ts
|
|
2
|
+
var DEFAULT_INITIAL_DELAY_MS = 100;
|
|
3
|
+
var DEFAULT_MAX_DELAY_MS = 5e3;
|
|
4
|
+
var defaultSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
5
|
+
async function retryWithBackoff(operation, { initialDelayMs = DEFAULT_INITIAL_DELAY_MS, maxDelayMs = DEFAULT_MAX_DELAY_MS, onRetry, sleep = defaultSleep, random = Math.random } = {}) {
|
|
6
|
+
for (let attempt = 1;; attempt++) try {
|
|
7
|
+
return await operation();
|
|
8
|
+
} catch (err) {
|
|
9
|
+
const ceilingMs = Math.min(maxDelayMs, initialDelayMs * 2 ** (attempt - 1));
|
|
10
|
+
const delayMs = Math.round(ceilingMs / 2 + random() * (ceilingMs / 2));
|
|
11
|
+
onRetry?.({
|
|
12
|
+
attempt,
|
|
13
|
+
delayMs,
|
|
14
|
+
err
|
|
15
|
+
});
|
|
16
|
+
await sleep(delayMs);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
var waitForEnvironment = (env) => retryWithBackoff(() => env.isReady(), { onRetry: ({ attempt, delayMs, err }) => {
|
|
20
|
+
env.logger.warn(() => ({
|
|
21
|
+
msg: "Environment not ready, retrying",
|
|
22
|
+
err,
|
|
23
|
+
data: {
|
|
24
|
+
attempt,
|
|
25
|
+
delayMs
|
|
26
|
+
}
|
|
27
|
+
}));
|
|
28
|
+
} });
|
|
29
|
+
//#endregion
|
|
30
|
+
exports.retryWithBackoff = retryWithBackoff;
|
|
31
|
+
exports.waitForEnvironment = waitForEnvironment;
|
package/dist/cjs/start.cjs
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
const require_process_env = require("./process.env.cjs");
|
|
2
2
|
const require_prosopo_config = require("./prosopo.config.cjs");
|
|
3
|
+
const require_retryWithBackoff = require("./retryWithBackoff.cjs");
|
|
3
4
|
let _prosopo_provider = require("@prosopo/provider");
|
|
4
5
|
let _prosopo_env = require("@prosopo/env");
|
|
5
6
|
let _prosopo_dotenv = require("@prosopo/dotenv");
|
|
@@ -19,7 +20,7 @@ async function start(env, admin, port) {
|
|
|
19
20
|
if (config.authAccount) authAccount = (0, _prosopo_keyring.getPair)(void 0, config.authAccount.address);
|
|
20
21
|
env = new _prosopo_env.ProviderEnvironment(config, pair, authAccount);
|
|
21
22
|
} else env.logger.debug(() => ({ msg: "Env already defined" }));
|
|
22
|
-
await
|
|
23
|
+
await require_retryWithBackoff.waitForEnvironment(env);
|
|
23
24
|
env.cleanup();
|
|
24
25
|
const maintenanceMode = process.env.MAINTENANCE_MODE?.toLowerCase() === "true";
|
|
25
26
|
if (!maintenanceMode) await (0, _prosopo_provider.runFrictionlessLadderMigration)(env.getDb(), env.logger);
|
package/dist/esm/cli.js
CHANGED
package/dist/esm/reloader.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { waitForEnvironment } from "./retryWithBackoff.js";
|
|
1
2
|
import { start } from "./start.js";
|
|
2
3
|
import { LogLevel, getLogger } from "@prosopo/logger";
|
|
3
4
|
import { ProviderEnvironment } from "@prosopo/env";
|
|
@@ -22,7 +23,7 @@ var ReloadingAPI = class {
|
|
|
22
23
|
log.info(() => ({ msg: "Starting API" }));
|
|
23
24
|
loadEnv();
|
|
24
25
|
if (!this._env || reloadEnv) this._env = new ProviderEnvironment(this._config, this._pair, this._authAccount);
|
|
25
|
-
await this.env
|
|
26
|
+
await waitForEnvironment(this.env);
|
|
26
27
|
this.api = await start(this.env, !!this._processedArgs.adminApi);
|
|
27
28
|
if (process.env.NODE_ENV === "development") this._envWatcher = await this._watchEnv();
|
|
28
29
|
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
//#region src/retryWithBackoff.ts
|
|
2
|
+
var DEFAULT_INITIAL_DELAY_MS = 100;
|
|
3
|
+
var DEFAULT_MAX_DELAY_MS = 5e3;
|
|
4
|
+
var defaultSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
5
|
+
async function retryWithBackoff(operation, { initialDelayMs = DEFAULT_INITIAL_DELAY_MS, maxDelayMs = DEFAULT_MAX_DELAY_MS, onRetry, sleep = defaultSleep, random = Math.random } = {}) {
|
|
6
|
+
for (let attempt = 1;; attempt++) try {
|
|
7
|
+
return await operation();
|
|
8
|
+
} catch (err) {
|
|
9
|
+
const ceilingMs = Math.min(maxDelayMs, initialDelayMs * 2 ** (attempt - 1));
|
|
10
|
+
const delayMs = Math.round(ceilingMs / 2 + random() * (ceilingMs / 2));
|
|
11
|
+
onRetry?.({
|
|
12
|
+
attempt,
|
|
13
|
+
delayMs,
|
|
14
|
+
err
|
|
15
|
+
});
|
|
16
|
+
await sleep(delayMs);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
var waitForEnvironment = (env) => retryWithBackoff(() => env.isReady(), { onRetry: ({ attempt, delayMs, err }) => {
|
|
20
|
+
env.logger.warn(() => ({
|
|
21
|
+
msg: "Environment not ready, retrying",
|
|
22
|
+
err,
|
|
23
|
+
data: {
|
|
24
|
+
attempt,
|
|
25
|
+
delayMs
|
|
26
|
+
}
|
|
27
|
+
}));
|
|
28
|
+
} });
|
|
29
|
+
//#endregion
|
|
30
|
+
export { retryWithBackoff, waitForEnvironment };
|
package/dist/esm/start.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { getDB, getSecret } from "./process.env.js";
|
|
2
2
|
import getConfig from "./prosopo.config.js";
|
|
3
|
+
import { waitForEnvironment } from "./retryWithBackoff.js";
|
|
3
4
|
import { getClientList, runFrictionlessLadderMigration, startProviderApi, storeCaptchasExternally, updateSpamEmailDomainsScheduler } from "@prosopo/provider";
|
|
4
5
|
import { ProviderEnvironment } from "@prosopo/env";
|
|
5
6
|
import { loadEnv } from "@prosopo/dotenv";
|
|
@@ -19,7 +20,7 @@ async function start(env, admin, port) {
|
|
|
19
20
|
if (config.authAccount) authAccount = getPair(void 0, config.authAccount.address);
|
|
20
21
|
env = new ProviderEnvironment(config, pair, authAccount);
|
|
21
22
|
} else env.logger.debug(() => ({ msg: "Env already defined" }));
|
|
22
|
-
await env
|
|
23
|
+
await waitForEnvironment(env);
|
|
23
24
|
env.cleanup();
|
|
24
25
|
const maintenanceMode = process.env.MAINTENANCE_MODE?.toLowerCase() === "true";
|
|
25
26
|
if (!maintenanceMode) await runFrictionlessLadderMigration(env.getDb(), env.logger);
|
package/dist/tsc/cli.js
CHANGED
package/dist/tsc/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"AAaA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAEjD,KAAK,UAAU,IAAI;IAClB,MAAM,OAAO,GAAG,OAAO,EAAE,CAAC;IAE1B,MAAM,MAAM,GAAwB,SAAS,EAAE,CAAC;IAEhD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpE,MAAM,WAAW,GAAG,OAAO,CAC1B,MAAM,CAAC,WAAW,CAAC,MAAM,EACzB,MAAM,CAAC,WAAW,CAAC,OAAO,CAC1B,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IAE1D,MAAM,aAAa,GAAG,MAAM,WAAW,CACtC,OAAO,CAAC,IAAI,EACZ,IAAI,EACJ,WAAW,EACX,MAAM,CACN,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC;IACvD,IAAI,aAAa,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,IAAI,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC;aACvE,KAAK,EAAE;aACP,IAAI,CAAC,GAAG,EAAE;YACV,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,0BAA0B,EAAE,CAAC,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACP,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;AACF,CAAC;AAGD,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,CAAC;IACzC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QAC3B,IAAI,EAAE;aACJ,IAAI,CAAC,GAAG,EAAE;YACV,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,yBAAyB,EAAE,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAChB,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"AAaA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAEjD,KAAK,UAAU,IAAI;IAClB,MAAM,OAAO,GAAG,OAAO,EAAE,CAAC;IAE1B,MAAM,MAAM,GAAwB,SAAS,EAAE,CAAC;IAEhD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpE,MAAM,WAAW,GAAG,OAAO,CAC1B,MAAM,CAAC,WAAW,CAAC,MAAM,EACzB,MAAM,CAAC,WAAW,CAAC,OAAO,CAC1B,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IAE1D,MAAM,aAAa,GAAG,MAAM,WAAW,CACtC,OAAO,CAAC,IAAI,EACZ,IAAI,EACJ,WAAW,EACX,MAAM,CACN,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC;IACvD,IAAI,aAAa,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,IAAI,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC;aACvE,KAAK,EAAE;aACP,IAAI,CAAC,GAAG,EAAE;YACV,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,0BAA0B,EAAE,CAAC,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACP,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;AACF,CAAC;AAGD,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,CAAC;IACzC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QAC3B,IAAI,EAAE;aACJ,IAAI,CAAC,GAAG,EAAE;YACV,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,yBAAyB,EAAE,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YAChB,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAClC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reloader.d.ts","sourceRoot":"","sources":["../../src/reloader.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"reloader.d.ts","sourceRoot":"","sources":["../../src/reloader.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAMtD,MAAM,CAAC,OAAO,OAAO,YAAY;IAChC,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,IAAI,CAAkC;gBAG7C,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,oBAAoB;IAUpC,IAAI,GAAG,wBAMN;IAEY,KAAK,CAAC,SAAS,UAAQ;IAmBvB,IAAI;YASH,SAAS;CAevB"}
|
package/dist/tsc/reloader.js
CHANGED
|
@@ -2,6 +2,7 @@ import fs from "node:fs";
|
|
|
2
2
|
import { loadEnv } from "@prosopo/dotenv";
|
|
3
3
|
import { ProviderEnvironment } from "@prosopo/env";
|
|
4
4
|
import { LogLevel, getLogger } from "@prosopo/logger";
|
|
5
|
+
import { waitForEnvironment } from "./retryWithBackoff.js";
|
|
5
6
|
import { start } from "./start.js";
|
|
6
7
|
const log = getLogger(LogLevel.enum.info, "cli");
|
|
7
8
|
export default class ReloadingAPI {
|
|
@@ -25,7 +26,7 @@ export default class ReloadingAPI {
|
|
|
25
26
|
if (!this._env || reloadEnv) {
|
|
26
27
|
this._env = new ProviderEnvironment(this._config, this._pair, this._authAccount);
|
|
27
28
|
}
|
|
28
|
-
await this.env
|
|
29
|
+
await waitForEnvironment(this.env);
|
|
29
30
|
this.api = await start(this.env, !!this._processedArgs.adminApi);
|
|
30
31
|
if (process.env.NODE_ENV === "development") {
|
|
31
32
|
this._envWatcher = await this._watchEnv();
|
package/dist/tsc/reloader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reloader.js","sourceRoot":"","sources":["../../src/reloader.ts"],"names":[],"mappings":"AAaA,OAAO,EAAsB,MAAM,SAAS,CAAC;AAE7C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGtD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,MAAM,GAAG,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,YAAY;IAWhC,YACC,OAAe,EACf,MAA2B,EAC3B,IAAiB,EACjB,WAAwB,EACxB,aAAmC;QAEnC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAChC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED,IAAI,GAAG;QACN,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,KAAK;QACnC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;QAE1C,OAAO,EAAE,CAAC;QACV,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,mBAAmB,CAClC,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,YAAY,CACjB,CAAC;QACH,CAAC;QACD,MAAM,IAAI,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"reloader.js","sourceRoot":"","sources":["../../src/reloader.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { ProviderEnvironment } from "@prosopo/env";
|
|
2
|
+
export type RetryOptions = {
|
|
3
|
+
initialDelayMs?: number;
|
|
4
|
+
maxDelayMs?: number;
|
|
5
|
+
onRetry?: (event: {
|
|
6
|
+
attempt: number;
|
|
7
|
+
delayMs: number;
|
|
8
|
+
err: unknown;
|
|
9
|
+
}) => void;
|
|
10
|
+
sleep?: (ms: number) => Promise<void>;
|
|
11
|
+
random?: () => number;
|
|
12
|
+
};
|
|
13
|
+
export declare function retryWithBackoff<T>(operation: () => Promise<T>, { initialDelayMs, maxDelayMs, onRetry, sleep, random, }?: RetryOptions): Promise<T>;
|
|
14
|
+
export declare const waitForEnvironment: (env: Pick<ProviderEnvironment, "isReady"> & {
|
|
15
|
+
logger: Pick<ProviderEnvironment["logger"], "warn">;
|
|
16
|
+
}) => Promise<void>;
|
|
17
|
+
//# sourceMappingURL=retryWithBackoff.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retryWithBackoff.d.ts","sourceRoot":"","sources":["../../src/retryWithBackoff.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,OAAO,CAAC;KACb,KAAK,IAAI,CAAC;IACX,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;CACtB,CAAC;AAUF,wBAAsB,gBAAgB,CAAC,CAAC,EACvC,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,EACC,cAAyC,EACzC,UAAiC,EACjC,OAAO,EACP,KAAoB,EACpB,MAAoB,GACpB,GAAE,YAAiB,GAClB,OAAO,CAAC,CAAC,CAAC,CAgBZ;AAED,eAAO,MAAM,kBAAkB,QACzB,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG;IAC3C,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;CACpD,KACC,OAAO,CAAC,IAAI,CASZ,CAAC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
const DEFAULT_INITIAL_DELAY_MS = 100;
|
|
2
|
+
const DEFAULT_MAX_DELAY_MS = 5_000;
|
|
3
|
+
const defaultSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
4
|
+
export async function retryWithBackoff(operation, { initialDelayMs = DEFAULT_INITIAL_DELAY_MS, maxDelayMs = DEFAULT_MAX_DELAY_MS, onRetry, sleep = defaultSleep, random = Math.random, } = {}) {
|
|
5
|
+
for (let attempt = 1;; attempt++) {
|
|
6
|
+
try {
|
|
7
|
+
return await operation();
|
|
8
|
+
}
|
|
9
|
+
catch (err) {
|
|
10
|
+
const ceilingMs = Math.min(maxDelayMs, initialDelayMs * 2 ** (attempt - 1));
|
|
11
|
+
const delayMs = Math.round(ceilingMs / 2 + random() * (ceilingMs / 2));
|
|
12
|
+
onRetry?.({ attempt, delayMs, err });
|
|
13
|
+
await sleep(delayMs);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
export const waitForEnvironment = (env) => retryWithBackoff(() => env.isReady(), {
|
|
18
|
+
onRetry: ({ attempt, delayMs, err }) => {
|
|
19
|
+
env.logger.warn(() => ({
|
|
20
|
+
msg: "Environment not ready, retrying",
|
|
21
|
+
err,
|
|
22
|
+
data: { attempt, delayMs },
|
|
23
|
+
}));
|
|
24
|
+
},
|
|
25
|
+
});
|
|
26
|
+
//# sourceMappingURL=retryWithBackoff.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retryWithBackoff.js","sourceRoot":"","sources":["../../src/retryWithBackoff.ts"],"names":[],"mappings":"AA4BA,MAAM,wBAAwB,GAAG,GAAG,CAAC;AACrC,MAAM,oBAAoB,GAAG,KAAK,CAAC;AAEnC,MAAM,YAAY,GAAG,CAAC,EAAU,EAAiB,EAAE,CAClD,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAInD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACrC,SAA2B,EAC3B,EACC,cAAc,GAAG,wBAAwB,EACzC,UAAU,GAAG,oBAAoB,EACjC,OAAO,EACP,KAAK,GAAG,YAAY,EACpB,MAAM,GAAG,IAAI,CAAC,MAAM,MACH,EAAE;IAEpB,KAAK,IAAI,OAAO,GAAG,CAAC,GAAI,OAAO,EAAE,EAAE,CAAC;QACnC,IAAI,CAAC;YACJ,OAAO,MAAM,SAAS,EAAE,CAAC;QAC1B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CACzB,UAAU,EACV,cAAc,GAAG,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CACnC,CAAC;YAGF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC;YACvE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YACrC,MAAM,KAAK,CAAC,OAAO,CAAC,CAAC;QACtB,CAAC;IACF,CAAC;AACF,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CACjC,GAEC,EACe,EAAE,CAClB,gBAAgB,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE;IACrC,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;QACtC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACtB,GAAG,EAAE,iCAAiC;YACtC,GAAG;YACH,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;SAC1B,CAAC,CAAC,CAAC;IACL,CAAC;CACD,CAAC,CAAC"}
|
package/dist/tsc/start.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAcnD,wBAAsB,KAAK,CAC1B,GAAG,CAAC,EAAE,mBAAmB,EACzB,KAAK,CAAC,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,MAAM,iCAoFb"}
|
package/dist/tsc/start.js
CHANGED
|
@@ -4,6 +4,7 @@ import { getPair } from "@prosopo/keyring";
|
|
|
4
4
|
import { getClientList, runFrictionlessLadderMigration, startProviderApi, storeCaptchasExternally, updateSpamEmailDomainsScheduler, } from "@prosopo/provider";
|
|
5
5
|
import { getDB, getSecret } from "./process.env.js";
|
|
6
6
|
import getConfig from "./prosopo.config.js";
|
|
7
|
+
import { waitForEnvironment } from "./retryWithBackoff.js";
|
|
7
8
|
export async function start(env, admin, port) {
|
|
8
9
|
if (!env) {
|
|
9
10
|
loadEnv();
|
|
@@ -23,7 +24,7 @@ export async function start(env, admin, port) {
|
|
|
23
24
|
else {
|
|
24
25
|
env.logger.debug(() => ({ msg: "Env already defined" }));
|
|
25
26
|
}
|
|
26
|
-
await env
|
|
27
|
+
await waitForEnvironment(env);
|
|
27
28
|
env.cleanup();
|
|
28
29
|
const maintenanceMode = process.env.MAINTENANCE_MODE?.toLowerCase() === "true";
|
|
29
30
|
if (!maintenanceMode) {
|
package/dist/tsc/start.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACN,aAAa,EACb,8BAA8B,EAC9B,gBAAgB,EAChB,uBAAuB,EACvB,+BAA+B,GAC/B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,SAAS,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACN,aAAa,EACb,8BAA8B,EAC9B,gBAAgB,EAChB,uBAAuB,EACvB,+BAA+B,GAC/B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,SAAS,MAAM,qBAAqB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAE3D,MAAM,CAAC,KAAK,UAAU,KAAK,CAC1B,GAAyB,EACzB,KAAe,EACf,IAAa;IAEb,IAAI,CAAC,GAAG,EAAE,CAAC;QACV,OAAO,EAAE,CAAC;QAGV,KAAK,EAAE,CAAC;QAER,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,EAAE;YACnC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;YACpB,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;SACtB,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7B,IAAI,WAAoC,CAAC;QACzC,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACxB,WAAW,GAAG,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC9D,CAAC;QACD,GAAG,GAAG,IAAI,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;IAC1D,CAAC;SAAM,CAAC;QACP,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAG9B,GAAG,CAAC,OAAO,EAAE,CAAC;IAId,MAAM,eAAe,GACpB,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,WAAW,EAAE,KAAK,MAAM,CAAC;IAOxD,IAAI,CAAC,eAAe,EAAE,CAAC;QACtB,MAAM,8BAA8B,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/D,CAAC;IAGD,IAAI,GAAG,CAAC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;QAClC,MAAM,mBAAmB,GACxB,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,gBAAgB,EAAE,QAAQ,CAAC;QACvD,IAAI,mBAAmB,EAAE,CAAC;YACzB,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,CACvE,CAAC,GAAG,EAAE,EAAE;gBACP,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;YAClD,CAAC,CACD,CAAC;QACH,CAAC;QACD,MAAM,kBAAkB,GACvB,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,mBAAmB,EAAE,QAAQ,CAAC;QAC1D,IAAI,kBAAkB,EAAE,CAAC;YACxB,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACrE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;oBACvB,GAAG,EAAE,uCAAuC;oBAC5C,GAAG;oBACH,OAAO,EAAE,EAAE,cAAc,EAAE,aAAa,CAAC,IAAI,EAAE;iBAC/C,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,MAAM,oBAAoB,GACzB,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,yBAAyB,EAAE,QAAQ,CAAC;QAChE,IAAI,oBAAoB,EAAE,CAAC;YAC1B,+BAA+B,CAC9B,GAAG,CAAC,IAAI,EACR,oBAAoB,EACpB,GAAG,CAAC,MAAM,CACV,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACf,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;oBACvB,GAAG,EAAE,8CAA8C;oBACnD,GAAG;oBACH,OAAO,EAAE,EAAE,cAAc,EAAE,+BAA+B,CAAC,IAAI,EAAE;iBACjE,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAED,OAAO,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;AAC3C,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retryWithBackoff.unit.test.d.ts","sourceRoot":"","sources":["../../../src/tests/retryWithBackoff.unit.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { retryWithBackoff, waitForEnvironment } from "../retryWithBackoff.js";
|
|
3
|
+
const failTimes = (failures) => {
|
|
4
|
+
let calls = 0;
|
|
5
|
+
return async () => {
|
|
6
|
+
calls++;
|
|
7
|
+
if (calls <= failures) {
|
|
8
|
+
throw new Error(`failure ${calls}`);
|
|
9
|
+
}
|
|
10
|
+
return "ready";
|
|
11
|
+
};
|
|
12
|
+
};
|
|
13
|
+
const fakeClock = () => {
|
|
14
|
+
const delays = [];
|
|
15
|
+
return {
|
|
16
|
+
delays,
|
|
17
|
+
sleep: async (ms) => {
|
|
18
|
+
delays.push(ms);
|
|
19
|
+
},
|
|
20
|
+
};
|
|
21
|
+
};
|
|
22
|
+
describe("retryWithBackoff", () => {
|
|
23
|
+
it("returns without sleeping when the first attempt works", async () => {
|
|
24
|
+
const clock = fakeClock();
|
|
25
|
+
await expect(retryWithBackoff(failTimes(0), clock)).resolves.toBe("ready");
|
|
26
|
+
expect(clock.delays).toEqual([]);
|
|
27
|
+
});
|
|
28
|
+
it("succeeds after several failures and reports each retry", async () => {
|
|
29
|
+
const clock = fakeClock();
|
|
30
|
+
const onRetry = vi.fn();
|
|
31
|
+
await expect(retryWithBackoff(failTimes(3), { ...clock, onRetry, random: () => 1 })).resolves.toBe("ready");
|
|
32
|
+
expect(onRetry.mock.calls.map(([event]) => event.attempt)).toEqual([
|
|
33
|
+
1, 2, 3,
|
|
34
|
+
]);
|
|
35
|
+
});
|
|
36
|
+
it("doubles the delay up to the cap", async () => {
|
|
37
|
+
const clock = fakeClock();
|
|
38
|
+
await retryWithBackoff(failTimes(8), { ...clock, random: () => 1 });
|
|
39
|
+
expect(clock.delays).toEqual([100, 200, 400, 800, 1600, 3200, 5000, 5000]);
|
|
40
|
+
});
|
|
41
|
+
it("keeps at least half of the delay when jitter is lowest", async () => {
|
|
42
|
+
const clock = fakeClock();
|
|
43
|
+
await retryWithBackoff(failTimes(2), { ...clock, random: () => 0 });
|
|
44
|
+
expect(clock.delays).toEqual([50, 100]);
|
|
45
|
+
});
|
|
46
|
+
it("keeps retrying long after the delay has reached the cap", async () => {
|
|
47
|
+
const clock = fakeClock();
|
|
48
|
+
await expect(retryWithBackoff(failTimes(1000), { ...clock, random: () => 1 })).resolves.toBe("ready");
|
|
49
|
+
expect(clock.delays).toHaveLength(1000);
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
describe("waitForEnvironment", () => {
|
|
53
|
+
it("logs a retry and resolves once the environment is ready", async () => {
|
|
54
|
+
vi.useFakeTimers();
|
|
55
|
+
const warn = vi.fn();
|
|
56
|
+
const isReady = vi
|
|
57
|
+
.fn()
|
|
58
|
+
.mockRejectedValueOnce(new Error("ECONNREFUSED"))
|
|
59
|
+
.mockResolvedValue(undefined);
|
|
60
|
+
const waiting = waitForEnvironment({ isReady, logger: { warn } });
|
|
61
|
+
await vi.runAllTimersAsync();
|
|
62
|
+
await waiting;
|
|
63
|
+
vi.useRealTimers();
|
|
64
|
+
expect(isReady).toHaveBeenCalledTimes(2);
|
|
65
|
+
expect(warn).toHaveBeenCalledTimes(1);
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
//# sourceMappingURL=retryWithBackoff.unit.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retryWithBackoff.unit.test.js","sourceRoot":"","sources":["../../../src/tests/retryWithBackoff.unit.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reloader.d.ts","sourceRoot":"","sources":["../../src/reloader.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"reloader.d.ts","sourceRoot":"","sources":["../../src/reloader.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAMtD,MAAM,CAAC,OAAO,OAAO,YAAY;IAChC,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,OAAO,CAAsB;IACrC,OAAO,CAAC,KAAK,CAAc;IAC3B,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,GAAG,CAAqB;IAChC,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,IAAI,CAAkC;gBAG7C,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,mBAAmB,EAC3B,IAAI,EAAE,WAAW,EACjB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,oBAAoB;IAUpC,IAAI,GAAG,wBAMN;IAEY,KAAK,CAAC,SAAS,UAAQ;IAmBvB,IAAI;YASH,SAAS;CAevB"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { ProviderEnvironment } from "@prosopo/env";
|
|
2
|
+
export type RetryOptions = {
|
|
3
|
+
initialDelayMs?: number;
|
|
4
|
+
maxDelayMs?: number;
|
|
5
|
+
onRetry?: (event: {
|
|
6
|
+
attempt: number;
|
|
7
|
+
delayMs: number;
|
|
8
|
+
err: unknown;
|
|
9
|
+
}) => void;
|
|
10
|
+
sleep?: (ms: number) => Promise<void>;
|
|
11
|
+
random?: () => number;
|
|
12
|
+
};
|
|
13
|
+
export declare function retryWithBackoff<T>(operation: () => Promise<T>, { initialDelayMs, maxDelayMs, onRetry, sleep, random, }?: RetryOptions): Promise<T>;
|
|
14
|
+
export declare const waitForEnvironment: (env: Pick<ProviderEnvironment, "isReady"> & {
|
|
15
|
+
logger: Pick<ProviderEnvironment["logger"], "warn">;
|
|
16
|
+
}) => Promise<void>;
|
|
17
|
+
//# sourceMappingURL=retryWithBackoff.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retryWithBackoff.d.ts","sourceRoot":"","sources":["../../src/retryWithBackoff.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAExD,MAAM,MAAM,YAAY,GAAG;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,GAAG,EAAE,OAAO,CAAC;KACb,KAAK,IAAI,CAAC;IACX,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;CACtB,CAAC;AAUF,wBAAsB,gBAAgB,CAAC,CAAC,EACvC,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAC3B,EACC,cAAyC,EACzC,UAAiC,EACjC,OAAO,EACP,KAAoB,EACpB,MAAoB,GACpB,GAAE,YAAiB,GAClB,OAAO,CAAC,CAAC,CAAC,CAgBZ;AAED,eAAO,MAAM,kBAAkB,QACzB,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG;IAC3C,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;CACpD,KACC,OAAO,CAAC,IAAI,CASZ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/start.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAcnD,wBAAsB,KAAK,CAC1B,GAAG,CAAC,EAAE,mBAAmB,EACzB,KAAK,CAAC,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,MAAM,iCAoFb"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retryWithBackoff.unit.test.d.ts","sourceRoot":"","sources":["../../../src/tests/retryWithBackoff.unit.test.ts"],"names":[],"mappings":""}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/cli",
|
|
3
|
-
"version": "3.10.
|
|
3
|
+
"version": "3.10.6",
|
|
4
4
|
"description": "CLI for Prosopo Provider",
|
|
5
5
|
"main": "dist/esm/index.js",
|
|
6
6
|
"types": "dist/types/index.d.ts",
|
|
@@ -17,16 +17,16 @@
|
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@polkadot/types-codec": "17.0.2",
|
|
20
|
-
"@prosopo/api": "4.9.
|
|
20
|
+
"@prosopo/api": "4.9.1",
|
|
21
21
|
"@prosopo/common": "3.3.2",
|
|
22
|
-
"@prosopo/logger": "2.1.
|
|
23
|
-
"@prosopo/dotenv": "3.0.
|
|
24
|
-
"@prosopo/env": "3.6.
|
|
25
|
-
"@prosopo/keyring": "2.10.
|
|
26
|
-
"@prosopo/locale": "3.14.
|
|
27
|
-
"@prosopo/provider": "5.
|
|
28
|
-
"@prosopo/types": "5.
|
|
29
|
-
"@prosopo/util": "3.
|
|
22
|
+
"@prosopo/logger": "2.1.9",
|
|
23
|
+
"@prosopo/dotenv": "3.0.66",
|
|
24
|
+
"@prosopo/env": "3.6.91",
|
|
25
|
+
"@prosopo/keyring": "2.10.22",
|
|
26
|
+
"@prosopo/locale": "3.14.1",
|
|
27
|
+
"@prosopo/provider": "5.28.0",
|
|
28
|
+
"@prosopo/types": "5.26.0",
|
|
29
|
+
"@prosopo/util": "3.6.0",
|
|
30
30
|
"@prosopo/workspace": "3.2.6",
|
|
31
31
|
"cron-parser": "5.10.2",
|
|
32
32
|
"dotenv": "18.0.8",
|