Skip to content

Commit fe06074

Browse files
authored
fix(web-console): align displayed timings with real fetch time (#282)
* fix(web-console): align displayed timings with real fetch time * lower token refresh wait interval * remove warnings
1 parent 87a3359 commit fe06074

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

packages/web-console/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@questdb/web-console",
3-
"version": "0.4.0",
3+
"version": "0.4.1",
44
"license": "Apache-2.0",
55
"description": "QuestDB Console",
66
"files": [

packages/web-console/src/utils/questdb.ts

+16-14
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ export class Client {
277277
Client.refreshTokenPending = false
278278
return resolve(true)
279279
}
280-
}, 100)
280+
}, 50)
281281
})
282282
}
283283

@@ -343,23 +343,25 @@ export class Client {
343343

344344
this._controllers.push(controller)
345345
let response: Response
346-
const start = new Date()
347346

348347
if (this.tokenNeedsRefresh() && !Client.refreshTokenPending) {
349348
await this.refreshAuthToken()
350349
}
351350

352-
await new Promise((resolve) => {
353-
const interval = setInterval(() => {
354-
if (!Client.refreshTokenPending) {
355-
clearInterval(interval)
356-
return resolve(true)
357-
}
358-
}, 100)
359-
})
351+
if (Client.refreshTokenPending) {
352+
await new Promise((resolve) => {
353+
const interval = setInterval(() => {
354+
if (!Client.refreshTokenPending) {
355+
clearInterval(interval)
356+
return resolve(true)
357+
}
358+
}, 50)
359+
})
360+
}
360361

361362
Client.numOfPendingQueries++
362363

364+
const start = new Date()
363365
try {
364366
response = await fetch(
365367
`${this._host}/exec?${Client.encodeParams(payload)}`,
@@ -379,7 +381,7 @@ export class Client {
379381

380382
if (error instanceof DOMException) {
381383
// eslint-disable-next-line prefer-promise-reject-errors
382-
return await Promise.reject({
384+
return Promise.reject({
383385
...err,
384386
error:
385387
error.code === 20
@@ -391,7 +393,7 @@ export class Client {
391393
eventBus.publish(EventType.MSG_CONNECTION_ERROR, genericErrorPayload)
392394

393395
// eslint-disable-next-line prefer-promise-reject-errors
394-
return await Promise.reject(genericErrorPayload)
396+
return Promise.reject(genericErrorPayload)
395397
} finally {
396398
const index = this._controllers.indexOf(controller)
397399

@@ -425,7 +427,7 @@ export class Client {
425427

426428
if (data.error) {
427429
// eslint-disable-next-line prefer-promise-reject-errors
428-
return await Promise.reject({
430+
return Promise.reject({
429431
...data,
430432
type: Type.ERROR,
431433
})
@@ -471,7 +473,7 @@ export class Client {
471473
}
472474

473475
// eslint-disable-next-line prefer-promise-reject-errors
474-
return await Promise.reject(errorPayload)
476+
return Promise.reject(errorPayload)
475477
}
476478

477479
async showTables(): Promise<QueryResult<Table>> {

0 commit comments

Comments
 (0)