diff --git a/src/common/utils/readableStream.ts b/src/common/utils/readableStream.ts index 136e18c841..59fb5ae4f4 100644 --- a/src/common/utils/readableStream.ts +++ b/src/common/utils/readableStream.ts @@ -4,7 +4,6 @@ */ import { Readable } from "readable-stream"; -import type { ReadableStreamDefaultReadResult } from "stream/web"; import type { TypedArray } from "type-fest"; /** @@ -24,8 +23,8 @@ export class ReadableWebToNodeStream extends Readable { * Default web API stream reader * https://developer.mozilla.org/en-US/docs/Web/API/ReadableStreamDefaultReader */ - private reader: ReadableStreamReader; - private pendingRead?: Promise>; + private reader: ReadableStreamDefaultReader; + private pendingRead?: Promise>; /** * diff --git a/src/renderer/components/dock/logs/store.ts b/src/renderer/components/dock/logs/store.ts index 53f6f03196..58462f41db 100644 --- a/src/renderer/components/dock/logs/store.ts +++ b/src/renderer/components/dock/logs/store.ts @@ -193,8 +193,8 @@ export class LogStore { */ getLastSinceTime(tabId: TabId): string { const logs = this.podLogs.get(tabId) ?? []; - const timestamps = this.getTimestamps(logs[logs.length - 1]); - const stamp = timestamps[0] ? new Date(timestamps[0]) : new Date(); + const [timestamp] = this.getTimestamps(logs[logs.length - 1]) ?? []; + const stamp = timestamp ? new Date(timestamp) : new Date(); stamp.setSeconds(stamp.getSeconds() + 1); // avoid duplicates from last second @@ -211,8 +211,8 @@ export class LogStore { return [extraction[1], extraction[2]]; } - getTimestamps(logs: string): RegExpMatchArray { - return logs.match(/^\d+\S+/gm) ?? []; + getTimestamps(logs: string) { + return logs.match(/^\d+\S+/gm); } removeTimestamps(logs: string): string {