LukeParke/vercel
1
0
Fork 0
mirror of https://github.com/LukeHagar/vercel.git synced 2025-12-09 21:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cli] Add request counter to --debug logs (#6510)

Browse Source 
Follow up to #6508. Adds a request "counter" that increments for every API request, matching how `front` does it.

Also tweaks the `output.time()` output a bit by rendering the timestamp in gray, and with `[]` brackets. If the time diff is < 1000ms then the full milliseconds will be printed intstead of the seconds.

<img width="710" alt="Screen Shot 2021-07-22 at 2 45 39 PM" src="https://user-images.githubusercontent.com/71256/126713843-db70ed9c-4752-4ca9-8f54-313c4cb44914.png">
This commit is contained in:
Nathan Rajlich
2021-07-22 15:36:01 -07:00
committed by GitHub
parent 89553e6015
commit 7cadbc3989
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/cli/src/util/client.ts
View File

@@ -48,6 +48,7 @@ export default class Client extends EventEmitter {
output: Output; output: Output;
config: GlobalConfig; config: GlobalConfig;
localConfig: VercelConfig; localConfig: VercelConfig;
private requestIdCounter: number;
constructor(opts: ClientOptions) { constructor(opts: ClientOptions) {
super(); super();
@@ -57,6 +58,7 @@ export default class Client extends EventEmitter {
this.output = opts.output; this.output = opts.output;
this.config = opts.config; this.config = opts.config;
this.localConfig = opts.localConfig; this.localConfig = opts.localConfig;
this.requestIdCounter = 1;
} }
retry<T>(fn: RetryFunction<T>, { retries = 3, maxTimeout = Infinity } = {}) { retry<T>(fn: RetryFunction<T>, { retries = 3, maxTimeout = Infinity } = {}) {
@@ -67,7 +69,7 @@ export default class Client extends EventEmitter {
}); });
} }
async _fetch(_url: string, opts: FetchOptions = {}) { _fetch(_url: string, opts: FetchOptions = {}) {
const parsedUrl = parseUrl(_url, true); const parsedUrl = parseUrl(_url, true);
const apiUrl = parsedUrl.host const apiUrl = parsedUrl.host
? `${parsedUrl.protocol}//${parsedUrl.host}` ? `${parsedUrl.protocol}//${parsedUrl.host}`
@@ -104,17 +106,16 @@ export default class Client extends EventEmitter {
} }
const url = `${apiUrl ? '' : this.apiUrl}${_url}`; const url = `${apiUrl ? '' : this.apiUrl}${_url}`;
const outputTime = await this.output.time(res => { const requestId = this.requestIdCounter++;
return this.output.time(res => {
if (res) { if (res) {
return `← ${res.status}: ${res.headers.get('x-vercel-id')}`; return `#${requestId} ← ${res.status} ${
res.statusText
}: ${res.headers.get('x-vercel-id')}`;
} else { } else {
return `→ ${opts.method || 'GET'} ${url} ${ return `#${requestId} → ${opts.method || 'GET'} ${url}`;
JSON.stringify(opts.body) || ''
}`;
} }
}, fetch(url, { ...opts, headers, body })); }, fetch(url, { ...opts, headers, body }));
return outputTime;
} }
fetch(url: string, opts: { json: false }): Promise<Response>; fetch(url: string, opts: { json: false }): Promise<Response>;

4
packages/cli/src/util/output/create-output.ts
View File

@@ -149,7 +149,9 @@ function _createOutput({ debug: debugEnabled = false }: OutputOptions = {}) {
const r = await promise; const r = await promise;
const endLabel = typeof label === 'function' ? label(r) : label; const endLabel = typeof label === 'function' ? label(r) : label;
const duration = Date.now() - start; const duration = Date.now() - start;
debug(`${endLabel}: ${(duration / 1000).toFixed(2)}s`); const durationPretty =
duration < 1000 ? `${duration}ms` : `${(duration / 1000).toFixed(2)}s`;
debug(`${endLabel} ${chalk.gray(`[${durationPretty}]`)}`);
return r; return r;
} }