@argusaudit/cli 0.2.0 → 0.2.1
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/dist/src/commands/audit.js +9 -8
- package/dist/src/commands/audit.js.map +1 -1
- package/dist/src/commands/login.js +2 -1
- package/dist/src/commands/login.js.map +1 -1
- package/dist/src/lib/api.js +1 -1
- package/dist/src/lib/api.js.map +1 -1
- package/dist/src/lib/auth.js +1 -1
- package/dist/src/lib/auth.js.map +1 -1
- package/dist/src/lib/http.d.ts +8 -1
- package/dist/src/lib/http.js +18 -1
- package/dist/src/lib/http.js.map +1 -1
- package/dist/src/lib/registry.js +2 -2
- package/dist/src/lib/registry.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,6 +7,7 @@ import { ApiError, get, post, postMultipart } from '../lib/api.js';
|
|
|
7
7
|
import { refreshTokens, requireAuth } from '../lib/auth.js';
|
|
8
8
|
import { resolvePostgresImage } from '../lib/registry.js';
|
|
9
9
|
import { getRefreshToken } from '../lib/keychain.js';
|
|
10
|
+
import { describeError } from '../lib/http.js';
|
|
10
11
|
import { getEngineBaseUrl, getHubBaseUrl, getWorkerImage } from '../config.js';
|
|
11
12
|
const ANALYSIS_INITIAL_POLL_DELAY_MS = 15_000;
|
|
12
13
|
const ANALYSIS_POLL_INTERVAL_MS = 5_000;
|
|
@@ -75,7 +76,7 @@ export async function audit({ ddlPath, queryPath, keepContainers = false, postgr
|
|
|
75
76
|
composeSpinner.succeed('Docker Compose version OK');
|
|
76
77
|
}
|
|
77
78
|
catch (err) {
|
|
78
|
-
composeSpinner.fail(err
|
|
79
|
+
composeSpinner.fail(describeError(err));
|
|
79
80
|
process.exit(1);
|
|
80
81
|
}
|
|
81
82
|
// Step 0: resolve the requested postgres version before anything is created
|
|
@@ -87,7 +88,7 @@ export async function audit({ ddlPath, queryPath, keepContainers = false, postgr
|
|
|
87
88
|
resolveSpinner.succeed(`Postgres image resolved · ${chalk.cyan(postgresImage)}`);
|
|
88
89
|
}
|
|
89
90
|
catch (err) {
|
|
90
|
-
resolveSpinner.fail(err
|
|
91
|
+
resolveSpinner.fail(describeError(err));
|
|
91
92
|
process.exit(1);
|
|
92
93
|
}
|
|
93
94
|
}
|
|
@@ -106,7 +107,7 @@ export async function audit({ ddlPath, queryPath, keepContainers = false, postgr
|
|
|
106
107
|
spinner.fail('No audits remaining. Visit the Argus website to top up.');
|
|
107
108
|
process.exit(1);
|
|
108
109
|
}
|
|
109
|
-
spinner.fail(err
|
|
110
|
+
spinner.fail(describeError(err));
|
|
110
111
|
throw err;
|
|
111
112
|
}
|
|
112
113
|
// Step 2: wait for the engine to analyze the query and generate variants
|
|
@@ -116,7 +117,7 @@ export async function audit({ ddlPath, queryPath, keepContainers = false, postgr
|
|
|
116
117
|
spinner.succeed('Analysis complete');
|
|
117
118
|
}
|
|
118
119
|
catch (err) {
|
|
119
|
-
spinner.fail(err
|
|
120
|
+
spinner.fail(describeError(err));
|
|
120
121
|
process.exit(1);
|
|
121
122
|
}
|
|
122
123
|
// Step 3: get a fresh token to pass to containers
|
|
@@ -134,7 +135,7 @@ export async function audit({ ddlPath, queryPath, keepContainers = false, postgr
|
|
|
134
135
|
spinner.succeed('Credentials refreshed');
|
|
135
136
|
}
|
|
136
137
|
catch (err) {
|
|
137
|
-
spinner.fail(err
|
|
138
|
+
spinner.fail(describeError(err));
|
|
138
139
|
throw err;
|
|
139
140
|
}
|
|
140
141
|
// Step 4: prepare Docker environment
|
|
@@ -151,7 +152,7 @@ export async function audit({ ddlPath, queryPath, keepContainers = false, postgr
|
|
|
151
152
|
spinner.succeed('Docker environment ready');
|
|
152
153
|
}
|
|
153
154
|
catch (err) {
|
|
154
|
-
spinner.fail(err
|
|
155
|
+
spinner.fail(describeError(err));
|
|
155
156
|
throw err;
|
|
156
157
|
}
|
|
157
158
|
try {
|
|
@@ -162,7 +163,7 @@ export async function audit({ ddlPath, queryPath, keepContainers = false, postgr
|
|
|
162
163
|
spinner.succeed('Benchmark complete');
|
|
163
164
|
}
|
|
164
165
|
catch (err) {
|
|
165
|
-
spinner.fail(err
|
|
166
|
+
spinner.fail(describeError(err));
|
|
166
167
|
// best-effort: report each container's error to the API
|
|
167
168
|
const containerErrors = getContainerErrors(composePath);
|
|
168
169
|
if (containerErrors.length > 0) {
|
|
@@ -188,7 +189,7 @@ export async function audit({ ddlPath, queryPath, keepContainers = false, postgr
|
|
|
188
189
|
spinner.succeed(`Report ready · ${chalk.cyan(`${getHubBaseUrl()}/audits/${recipe.public_id}`)}`);
|
|
189
190
|
}
|
|
190
191
|
catch (err) {
|
|
191
|
-
spinner.fail(err
|
|
192
|
+
spinner.fail(describeError(err));
|
|
192
193
|
throw err;
|
|
193
194
|
}
|
|
194
195
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audit.js","sourceRoot":"","sources":["../../../src/commands/audit.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"audit.js","sourceRoot":"","sources":["../../../src/commands/audit.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import open from 'open';
|
|
|
8
8
|
import chalk from 'chalk';
|
|
9
9
|
import { getAccessToken, setTokens } from '../lib/keychain.js';
|
|
10
10
|
import { callbackPage } from '../lib/callback-page.js';
|
|
11
|
+
import { describeError } from '../lib/http.js';
|
|
11
12
|
import { getEngineBaseUrl, getHubBaseUrl } from '../config.js';
|
|
12
13
|
async function findFreePort(start, end) {
|
|
13
14
|
for (let port = start; port <= end; port++) {
|
|
@@ -93,7 +94,7 @@ export function loginCommand() {
|
|
|
93
94
|
await login();
|
|
94
95
|
}
|
|
95
96
|
catch (err) {
|
|
96
|
-
console.error(chalk.red(`Login failed: ${err
|
|
97
|
+
console.error(chalk.red(`Login failed: ${describeError(err)}`));
|
|
97
98
|
process.exit(1);
|
|
98
99
|
}
|
|
99
100
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/login.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/login.ts"],"names":[],"mappings":"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"}
|
package/dist/src/lib/api.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
|
-
import { agent } from './http.js';
|
|
2
|
+
import { agent, fetch, FormData } from './http.js';
|
|
3
3
|
import { getEngineBaseUrl } from '../config.js';
|
|
4
4
|
import { refreshTokens, requireAuth } from './auth.js';
|
|
5
5
|
import { getRefreshToken } from './keychain.js';
|
package/dist/src/lib/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/lib/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/lib/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAgB,MAAM,WAAW,CAAC;AAChE,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAE,WAAW,EAAC,MAAM,WAAW,CAAC;AACrD,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAE9C,iFAAiF;AAEjF,MAAM,OAAO,QAAS,SAAQ,KAAK;IACH,MAAM;IAAlC,YAA4B,MAAc,EAAE,OAAe;QACvD,KAAK,CAAC,OAAO,CAAC,CAAC;sBADS,MAAM;QAE9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;QAClC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC1B,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACpD,CAAC;IACL,CAAC;CACJ;AASD,iFAAiF;AACjF,EAAE;AACF,4EAA4E;AAC5E,+EAA+E;AAC/E,8EAA8E;AAC9E,kCAAkC;AAElC,IAAI,cAAc,GAAkC,IAAI,CAAC;AAEzD,SAAS,iBAAiB;IACtB,IAAI,CAAC,cAAc,EAAE,CAAC;QAClB,cAAc,GAAG,CAAC,KAAK,IAAI,EAAE;YACzB,MAAM,YAAY,GAAG,MAAM,eAAe,EAAE,CAAC;YAC7C,IAAI,CAAC,YAAY;gBAAE,OAAO,IAAI,CAAC;YAC/B,IAAI,CAAC;gBACD,OAAO,MAAM,aAAa,CAAC,YAAY,CAAC,CAAC;YAC7C,CAAC;YAAC,MAAM,CAAC;gBACL,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;YACd,cAAc,GAAG,IAAI,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IACD,OAAO,cAAc,CAAC;AAC1B,CAAC;AAED,iFAAiF;AAEjF,KAAK,UAAU,OAAO,CAAI,OAA2C;IACjE,MAAM,GAAG,GAAG,MAAM,WAAW,EAAE,CAAC;IAChC,IAAI,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IAElC,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,iBAAiB,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QAClE,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACf,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,OAAO,GAAG,uBAAuB,QAAQ,CAAC,MAAM,GAAG,CAAC;QACxD,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;gBACvB,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;YAClC,CAAC;iBAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACtB,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAC3B,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,GAAG,OAAO,KAAK,IAAI,EAAE,CAAC;YACpC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACL,OAAO,GAAG,GAAG,OAAO,KAAK,IAAI,EAAE,CAAC;QACpC,CAAC;QACD,MAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAe,CAAC;AAC5E,CAAC;AAED,iFAAiF;AAEjF,SAAS,WAAW,CAAC,KAAqB;IACtC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,UAAU,IAAI,KAAK,CAAC;AAC5D,CAAC;AAED,KAAK,UAAU,SAAS,CAAC,MAAsC;IAC3D,MAAM,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;IAC5B,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACjD,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACjD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,iFAAiF;AAEjF,MAAM,UAAU,GAAG,CAAI,IAAY;IAC/B,MAAM,GAAG,GAAG,GAAG,gBAAgB,EAAE,GAAG,IAAI,EAAE,CAAC;IAC3C,OAAO,OAAO,CAAI,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;QAChC,OAAO,EAAE,EAAC,aAAa,EAAE,UAAU,GAAG,EAAE,EAAC;QACzC,UAAU,EAAE,KAAK;KACpB,CAAC,CAAC,CAAC;AACR,CAAC;AAED,MAAM,UAAU,IAAI,CAAI,IAAY,EAAE,IAAa;IAC/C,MAAM,GAAG,GAAG,GAAG,gBAAgB,EAAE,GAAG,IAAI,EAAE,CAAC;IAC3C,OAAO,OAAO,CAAI,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;QAC1B,OAAO,EAAE,EAAC,aAAa,EAAE,UAAU,GAAG,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAC;QAC7E,UAAU,EAAE,KAAK;KACpB,CAAC,CAAC,CAAC;AACR,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAC/B,IAAY,EACZ,MAAsC;IAEtC,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,GAAG,gBAAgB,EAAE,GAAG,IAAI,EAAE,CAAC;IAC3C,OAAO,OAAO,CAAI,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;QAChC,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,EAAC,aAAa,EAAE,UAAU,GAAG,EAAE,EAAC;QACzC,UAAU,EAAE,KAAK;KACpB,CAAC,CAAC,CAAC;AACR,CAAC"}
|
package/dist/src/lib/auth.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Core authentication logic: token retrieval and silent refresh on 401.
|
|
2
2
|
import { clearTokens, getAccessToken, setTokens } from './keychain.js';
|
|
3
3
|
import { getEngineBaseUrl } from '../config.js';
|
|
4
|
-
import { agent } from './http.js';
|
|
4
|
+
import { agent, fetch } from './http.js';
|
|
5
5
|
export async function refreshTokens(refreshToken) {
|
|
6
6
|
const url = `${getEngineBaseUrl()}/auth/refresh`;
|
|
7
7
|
const response = await fetch(url, {
|
package/dist/src/lib/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/lib/auth.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,SAAS,EAAC,MAAM,eAAe,CAAA;AACpE,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAC,KAAK,EAAC,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/lib/auth.ts"],"names":[],"mappings":"AAAA,wEAAwE;AACxE,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,SAAS,EAAC,MAAM,eAAe,CAAA;AACpE,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAC,KAAK,EAAE,KAAK,EAAC,MAAM,WAAW,CAAA;AAEtC,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,YAAoB;IACpD,MAAM,GAAG,GAAG,GAAG,gBAAgB,EAAE,eAAe,CAAA;IAChD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAC9B,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAC,cAAc,EAAE,kBAAkB,EAAC;QAC7C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,aAAa,EAAE,YAAY,EAAC,CAAC;QACnD,UAAU,EAAE,KAAK;KACpB,CAAC,CAAA;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACf,MAAM,WAAW,EAAE,CAAA;QACnB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;IACxD,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAqD,CAAA;IACrF,MAAM,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,aAAa,CAAC,CAAA;IACtD,OAAO,IAAI,CAAC,YAAY,CAAA;AAC5B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW;IAC7B,0CAA0C;IAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IAChD,IAAI,QAAQ,EAAE,CAAC;QACX,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAA;IAC1C,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;IAC1D,CAAC;IAED,OAAO,WAAW,CAAA;AACtB,CAAC"}
|
package/dist/src/lib/http.d.ts
CHANGED
|
@@ -1,2 +1,9 @@
|
|
|
1
|
-
import { Agent } from 'undici';
|
|
1
|
+
import { Agent, fetch, FormData } from 'undici';
|
|
2
2
|
export declare const agent: Agent;
|
|
3
|
+
export { fetch, FormData };
|
|
4
|
+
export type { Response } from 'undici';
|
|
5
|
+
/**
|
|
6
|
+
* Format an error for display, surfacing `cause` — undici wraps network
|
|
7
|
+
* failures in a generic "fetch failed" TypeError with the real error inside.
|
|
8
|
+
*/
|
|
9
|
+
export declare function describeError(err: unknown): string;
|
package/dist/src/lib/http.js
CHANGED
|
@@ -1,4 +1,21 @@
|
|
|
1
|
-
import { Agent } from 'undici';
|
|
1
|
+
import { Agent, fetch, FormData } from 'undici';
|
|
2
2
|
// Keep idle sockets for 10s (reuse within a command), prune before they go stale.
|
|
3
3
|
export const agent = new Agent({ keepAliveTimeout: 10_000, keepAliveMaxTimeout: 30_000 });
|
|
4
|
+
// `agent` must only be used with undici's own `fetch`, never Node's global one:
|
|
5
|
+
// Node's built-in fetch is backed by its bundled undici, and a dispatcher from a
|
|
6
|
+
// different undici major is rejected at dispatch time (surfaced as "fetch failed").
|
|
7
|
+
// Response/FormData are re-exported alongside so callers stay on the same copy.
|
|
8
|
+
export { fetch, FormData };
|
|
9
|
+
/**
|
|
10
|
+
* Format an error for display, surfacing `cause` — undici wraps network
|
|
11
|
+
* failures in a generic "fetch failed" TypeError with the real error inside.
|
|
12
|
+
*/
|
|
13
|
+
export function describeError(err) {
|
|
14
|
+
if (!(err instanceof Error))
|
|
15
|
+
return String(err);
|
|
16
|
+
if (err.cause instanceof Error && err.cause.message) {
|
|
17
|
+
return `${err.message}: ${err.cause.message}`;
|
|
18
|
+
}
|
|
19
|
+
return err.message;
|
|
20
|
+
}
|
|
4
21
|
//# sourceMappingURL=http.js.map
|
package/dist/src/lib/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/lib/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/lib/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAC,MAAM,QAAQ,CAAC;AAE9C,kFAAkF;AAClF,MAAM,CAAC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,EAAC,gBAAgB,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAC,CAAC,CAAC;AAExF,gFAAgF;AAChF,iFAAiF;AACjF,oFAAoF;AACpF,gFAAgF;AAChF,OAAO,EAAC,KAAK,EAAE,QAAQ,EAAC,CAAC;AAGzB;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,GAAY;IACtC,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,GAAG,CAAC,KAAK,YAAY,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QAClD,OAAO,GAAG,GAAG,CAAC,OAAO,KAAK,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IAClD,CAAC;IACD,OAAO,GAAG,CAAC,OAAO,CAAC;AACvB,CAAC"}
|
package/dist/src/lib/registry.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { request } from 'undici';
|
|
2
|
-
import { agent } from './http.js';
|
|
2
|
+
import { agent, describeError } from './http.js';
|
|
3
3
|
const DOCKER_HUB_TAGS_URL = 'https://hub.docker.com/v2/repositories/library/postgres/tags';
|
|
4
4
|
// Debian/Alpine flavor suffixes published for the official postgres image.
|
|
5
5
|
const FLAVOR_PATTERN = /-(alpine|bookworm|bullseye|trixie|slim)/;
|
|
@@ -11,7 +11,7 @@ async function tagExists(tag) {
|
|
|
11
11
|
await response.body.dump();
|
|
12
12
|
}
|
|
13
13
|
catch (err) {
|
|
14
|
-
throw new Error(`Could not verify postgres version against Docker Hub: ${err
|
|
14
|
+
throw new Error(`Could not verify postgres version against Docker Hub: ${describeError(err)}`);
|
|
15
15
|
}
|
|
16
16
|
if (statusCode === 200)
|
|
17
17
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/lib/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAC,KAAK,EAAC,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../src/lib/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAC,KAAK,EAAE,aAAa,EAAC,MAAM,WAAW,CAAC;AAE/C,MAAM,mBAAmB,GAAG,8DAA8D,CAAC;AAE3F,2EAA2E;AAC3E,MAAM,cAAc,GAAG,yCAAyC,CAAC;AAEjE,KAAK,UAAU,SAAS,CAAC,GAAW;IAChC,IAAI,UAAkB,CAAC;IACvB,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,mBAAmB,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,EAAC,UAAU,EAAE,KAAK,EAAC,CAAC,CAAC;QACzG,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QACjC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC/B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,yDAAyD,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACnG,CAAC;IACD,IAAI,UAAU,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IACpC,IAAI,UAAU,KAAK,GAAG;QAAE,OAAO,KAAK,CAAC;IACrC,MAAM,IAAI,KAAK,CAAC,yEAAyE,UAAU,EAAE,CAAC,CAAC;AAC3G,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAAe;IACtD,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,SAAS,EAAE,OAAO,CAAC,CAAC;IAE7F,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,MAAM,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,YAAY,GAAG,EAAE,CAAC;QAC7B,CAAC;IACL,CAAC;IAED,MAAM,IAAI,KAAK,CACX,qBAAqB,OAAO,+CAA+C,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACtG,CAAC;AACN,CAAC"}
|
package/package.json
CHANGED