watch-tail 0.9.0 → 0.10.1

package/build/server/chunks/entries/endpoints/api/stream/{_server.ts.js-BxXw5K0R.js → _server.ts.js-B6obpUbh.js}

@@ -1,7 +1,7 @@
-import { a as apiError, p as parseRegionParam, b as readEnv, r as resolveAwsConfig, d as createLogsClient, f as describeAwsError, e as resolveEffectiveRegion, R as REGION_PARAM_HINT } from '../../../../chunks/env2.js-C5BgBJDY.js';
-import { g as getArchive } from '../../../../chunks/archive.js-D2jtMmDo.js';
+import { a as apiError, p as parseRegionParam, b as readEnv, r as resolveAwsConfig, f as describeAwsError, d as createLogsClient, e as resolveEffectiveRegion, R as REGION_PARAM_HINT } from '../../../../chunks/env2.js-C5BgBJDY.js';
+import { g as getArchive, i as intersectCoverage, s as subtractCoverage, a as settleCoverage, m as mergeCoverage } from '../../../../chunks/archive.js-D7cGVWaq.js';
 import { p as parseSourceParam, S as SOURCE_PARAM_HINT } from '../../../../chunks/source.js-DZEVvuho.js';
-import { p as parseGroupParams, a as parseLevelParam, r as resolveWindow, c as clampPollMs, w as withDetections, L as LEVEL_PARAM_HINT } from '../../../../chunks/level-filter.js-D9MNrew3.js';
+import { p as parseGroupParams, a as parseLevelParam, r as resolveWindow, c as clampPollMs, w as withDetections, L as LEVEL_PARAM_HINT } from '../../../../chunks/level-filter.js-kKdNjmbR.js';
 import '../../../../chunks/utils.js-BIlHjgGW.js';
 import { FilterLogEventsCommand } from '@aws-sdk/client-cloudwatch-logs';
 import '../../../../chunks/shared-server.js-Dn5XheXH.js';
@@ -9,11 +9,11 @@ import '@aws-sdk/client-sts';
 import 'node:fs';
 import 'node:path';
 import '../../../../chunks/identity.js-NmGXxBz3.js';
-import '../../../../chunks/log-buffer.js-A9FA-Qv8.js';
+import '../../../../chunks/log-buffer.js-BjT3sJlh.js';
 import 'node:os';
 import 'node:crypto';
 import 'node:timers/promises';
-import '../../../../chunks/time-range.js-BLMT8aU3.js';
+import '../../../../chunks/time-range.js-__87ZPq6.js';
 import '../../../../chunks/shared.js-CgjUIvRK.js';
 import '../../../../chunks/uneval.js-DaakSYFQ.js';
 
@@ -72,8 +72,8 @@ function archiveUnavailableMessage(archive) {
 /**
 * Yields archived events for one window, oldest first.
 *
-* An unavailable archive produces a single `error` batch instead of throwing, so
-* the browser shows a normal stream error. An aborted signal ends the generator
+* An unavailable archive, or a page that cannot be read, produces a single
+* `error` batch instead of throwing, so the browser shows a normal stream error. An aborted signal ends the generator
 * without yielding an `end` batch, which is what the route treats as a
 * client disconnect.
 */
@@ -106,6 +106,14 @@ async function* tailArchivedEvents(options) {
 			after: cursor,
 			limit: pageSize
 		});
+		if (page.error !== void 0) {
+			yield {
+				type: "error",
+				message: `The local archive could not be read: ${page.error}`,
+				code: "archive-read-failed"
+			};
+			return;
+		}
 		if (page.events.length === 0) {
 			yield {
 				type: "end",
@@ -116,7 +124,8 @@ async function* tailArchivedEvents(options) {
 		emitted += page.events.length;
 		yield {
 			type: "events",
-			events: page.events
+			events: page.events,
+			origin: "archive"
 		};
 		cursor = page.last;
 		if (cursor === null || page.events.length < pageSize) {
@@ -326,14 +335,16 @@ function nextCursor(previous, events) {
 *
 * `startTime` is inclusive upstream, so the cursor advances to the newest
 * timestamp seen and repeated events are removed by {@link SeenEventIds}.
-* Nothing is new in a poll => sleep `pollIntervalMs`. Errors are yielded as
+* A `nextToken` is followed straight away, so a sweep reads its whole range
+* before the next one starts. Nothing is new in a sweep => sleep
+* `pollIntervalMs`. Errors are yielded as
 * `error` batches and retried with exponential backoff
 * (`pollIntervalMs * 2^consecutiveErrors`, capped at 15000 ms) until
 * `maxConsecutiveErrors` (default 8) failures in a row, then the generator
 * returns. An aborted signal ends the generator without throwing.
 */
 async function* tailLogEvents(options) {
-	const { client, logGroupName, startTime, pollIntervalMs = DEFAULT_POLL_MS, limit = DEFAULT_LIMIT, filterPattern, signal, sleep = defaultSleep, maxConsecutiveErrors = DEFAULT_MAX_CONSECUTIVE_ERRORS, logStreamNamePrefix, endTime = null, idlePolls = DEFAULT_IDLE_POLLS, maxEvents = DEFAULT_MAX_EVENTS } = options;
+	const { client, logGroupName, startTime, pollIntervalMs = DEFAULT_POLL_MS, limit = DEFAULT_LIMIT, filterPattern, signal, sleep = defaultSleep, maxConsecutiveErrors = DEFAULT_MAX_CONSECUTIVE_ERRORS, logStreamNamePrefix, endTime = null, idlePolls = DEFAULT_IDLE_POLLS, maxEvents = DEFAULT_MAX_EVENTS, reportCoverage = false, now = Date.now } = options;
 	const historic = typeof endTime === "number" && Number.isFinite(endTime);
 	const windowEnd = historic ? endTime : null;
 	const idlePollsAllowed = Number.isFinite(idlePolls) && idlePolls > 0 ? Math.floor(idlePolls) : DEFAULT_IDLE_POLLS;
@@ -362,18 +373,29 @@ async function* tailLogEvents(options) {
 	let consecutiveErrors = 0;
 	let emitted = 0;
 	let emptyPolls = 0;
+	let sweepStart = cursor;
+	let sweepSentAt = 0;
+	let sweepHadEvents = false;
+	let nextToken;
 	for (;;) {
 		if (isAborted()) return;
 		try {
+			if (nextToken === void 0) {
+				sweepStart = cursor;
+				sweepSentAt = now();
+				sweepHadEvents = false;
+			}
 			const input = {
 				...baseInput,
-				startTime: cursor
+				startTime: sweepStart
 			};
+			if (nextToken !== void 0) input.nextToken = nextToken;
 			const response = await client.send(new FilterLogEventsCommand(input), { abortSignal: signal });
 			consecutiveErrors = 0;
+			nextToken = typeof response.nextToken === "string" && response.nextToken.length > 0 ? response.nextToken : void 0;
 			const events = selectNewEvents(response.events, seen);
 			if (events.length > 0) {
-				emptyPolls = 0;
+				sweepHadEvents = true;
 				cursor = nextCursor(cursor, events);
 				emitted += events.length;
 				yield {
@@ -387,6 +409,19 @@ async function* tailLogEvents(options) {
 					};
 					return;
 				}
+			}
+			if (nextToken !== void 0) continue;
+			if (reportCoverage) {
+				const end = windowEnd === null ? sweepSentAt : Math.min(windowEnd, sweepSentAt);
+				if (end >= sweepStart) yield {
+					type: "coverage",
+					start: sweepStart,
+					end,
+					readAt: sweepSentAt
+				};
+			}
+			if (sweepHadEvents) {
+				emptyPolls = 0;
 				if (windowEnd !== null && cursor >= windowEnd) {
 					yield {
 						type: "end",
@@ -451,13 +486,21 @@ var SSE_HEADERS = {
 	"x-accel-buffering": "no"
 };
 /**
-* Tags every event of one tail with its log group.
+* Tags every event of one tail with its log group and where it came from.
 *
 * A merged multi-group stream has to say which group each line came from, both
-* for the archive and for the group column in the viewer.
+* for the archive and for the group column in the viewer. `origin` is what keeps
+* a mixed archive/CloudWatch view from writing archived rows back.
 */
-async function* taggedEvents(source, group) {
+async function* taggedEvents(source, group, origin) {
 	for await (const batch of source) {
+		if (batch.type === "coverage") {
+			yield {
+				...batch,
+				group
+			};
+			continue;
+		}
 		if (batch.type !== "events") {
 			yield batch;
 			continue;
@@ -469,7 +512,8 @@ async function* taggedEvents(source, group) {
 		});
 		yield {
 			type: "events",
-			events
+			events,
+			origin
 		};
 	}
 }
@@ -478,7 +522,8 @@ async function* taggedEvents(source, group) {
 *
 * A merged multi-group stream tags every event with its own group, so a batch
 * that mixes groups is split; a single-group stream falls back to the group the
-* request named.
+* request named. Answers `false` when any row was not stored, which is what
+* stops the stream from recording coverage it cannot back up.
 */
 async function recordBatch(archive, region, groupNames, events) {
 	const fallback = groupNames[0] ?? "";
@@ -489,9 +534,35 @@ async function recordBatch(archive, region, groupNames, events) {
 		if (bucket === void 0) byGroup.set(group, [event]);
 		else bucket.push(event);
 	}
-	for (const [group, groupEvents] of byGroup) await archive.record(region, group, groupEvents);
+	let stored = true;
+	for (const [group, groupEvents] of byGroup) if (await archive.record(region, group, groupEvents) !== groupEvents.length) stored = false;
+	return stored;
 }
 /**
+* Collects the ranges a stream read from CloudWatch, per log group.
+*
+* Each range arrives after the events it produced, and the pump has archived
+* those by then, so a range seen here is backed by stored rows. Only the part
+* that had settled when it was read is kept, and ranges are merged as they
+* arrive so a long live tail holds a handful of intervals, not one per poll.
+*/
+var CoverageCollector = class {
+	#byGroup = /* @__PURE__ */ new Map();
+	add(group, range) {
+		const settled = settleCoverage(range, range.readAt);
+		if (settled === null) return;
+		this.#byGroup.set(group, mergeCoverage([...this.#byGroup.get(group) ?? [], settled]));
+	}
+	entries() {
+		const entries = [];
+		for (const [logGroup, intervals] of this.#byGroup) for (const interval of intervals) entries.push({
+			logGroup,
+			...interval
+		});
+		return entries;
+	}
+};
+/**
 * Parses a positive integer parameter within `limits`.
 *
 * Returns `null` for a missing value (meaning "use the default") and for an
@@ -507,6 +578,32 @@ function parseBoundedInt(value, limits) {
 	return Math.min(Math.max(Math.round(parsed), limits.min), limits.max);
 }
 /**
+* Creates the CloudWatch Logs client and resolves the region it reads.
+*
+* Returns an `apiError` response the route can send unchanged when either step
+* fails (a missing region is the common case), so both the plain and the hybrid
+* feed build the client the same way.
+*/
+async function openCloudWatch(config) {
+	let client;
+	try {
+		client = createLogsClient(config);
+	} catch (error) {
+		const described = describeAwsError(error);
+		return apiError(502, described.message, described.code);
+	}
+	try {
+		return {
+			client,
+			region: await resolveEffectiveRegion(client, config)
+		};
+	} catch (error) {
+		client.destroy();
+		const described = describeAwsError(error);
+		return apiError(502, described.message, described.code);
+	}
+}
+/**
 * Builds the feed for a request.
 *
 * The archive path never creates a CloudWatch client, so browsing history works
@@ -540,35 +637,83 @@ async function resolveFeed(request) {
 			release: () => void 0
 		};
 	}
-	let client;
-	try {
-		client = createLogsClient(config);
-	} catch (error) {
-		const described = describeAwsError(error);
-		return apiError(502, described.message, described.code);
-	}
-	let region;
-	try {
-		region = await resolveEffectiveRegion(client, config);
-	} catch (error) {
-		client.destroy();
-		const described = describeAwsError(error);
-		return apiError(502, described.message, described.code);
+	const opened = await openCloudWatch(config);
+	if (opened instanceof Response) return opened;
+	const { client, region } = opened;
+	const reportCoverage = (request.filterPattern ?? "").length === 0;
+	return {
+		region,
+		groupNames,
+		generator: mergeTails(groupNames.map((group) => taggedEvents(tailLogEvents({
+			client,
+			logGroupName: group,
+			startTime,
+			endTime,
+			pollIntervalMs: request.pollIntervalMs,
+			filterPattern: request.filterPattern,
+			signal,
+			maxConsecutiveErrors: MAX_CONSECUTIVE_ERRORS,
+			reportCoverage,
+			...request.maxEvents === null ? {} : { maxEvents: request.maxEvents }
+		}), group, "cloudwatch"))),
+		release: () => client.destroy()
+	};
+}
+/**
+* Builds a historic CloudWatch view that reads the archive wherever it can.
+*
+* For each group the window is split against the archive's coverage: ranges the
+* archive already holds are replayed locally, and only the gaps are fetched from
+* CloudWatch. That is what makes re-searching a window that was streamed before
+* fast and offline-first, without ever dropping events the archive never saw -
+* the gaps are always filled from AWS.
+*
+* Each gap is recorded as coverage once CloudWatch has been read over it and
+* its events are stored, so the next view of the same window is answered from
+* the archive (all but its last few minutes, which may still be arriving).
+*/
+async function resolveHybridFeed(request) {
+	const { config, env, groupNames, startTime, filterPattern, pollIntervalMs, signal } = request;
+	const { maxEvents, pageSize } = request;
+	const end = request.endTime ?? Date.now();
+	const opened = await openCloudWatch(config);
+	if (opened instanceof Response) return opened;
+	const { client, region } = opened;
+	const archive = await getArchive(env, {
+		region,
+		readOnly: true
+	});
+	const coverage = await archive.coverage(region, groupNames, startTime, end);
+	const generators = [];
+	for (const group of groupNames) {
+		const intervals = coverage.get(group) ?? [];
+		for (const covered of intersectCoverage(startTime, end, intervals)) generators.push(taggedEvents(tailArchivedEvents({
+			archive,
+			region,
+			logGroups: [group],
+			startTime: covered.start,
+			endTime: covered.end,
+			...pageSize === null ? {} : { pageSize },
+			...maxEvents === null ? {} : { maxEvents },
+			signal
+		}), group, "archive"));
+		for (const gap of subtractCoverage(startTime, end, intervals)) generators.push(taggedEvents(tailLogEvents({
+			client,
+			logGroupName: group,
+			startTime: gap.start,
+			endTime: gap.end,
+			pollIntervalMs,
+			filterPattern,
+			signal,
+			maxConsecutiveErrors: MAX_CONSECUTIVE_ERRORS,
+			reportCoverage: true,
+			...maxEvents === null ? {} : { maxEvents }
+		}), group, "cloudwatch"));
 	}
-	const tails = groupNames.map((group) => taggedEvents(tailLogEvents({
-		client,
-		logGroupName: group,
-		startTime,
-		endTime,
-		pollIntervalMs: request.pollIntervalMs,
-		filterPattern: request.filterPattern,
-		signal,
-		maxConsecutiveErrors: MAX_CONSECUTIVE_ERRORS
-	}), group));
 	return {
 		region,
 		groupNames,
-		generator: mergeTails(tails),
+		generator: mergeTails(generators),
 		release: () => client.destroy()
 	};
 }
@@ -610,7 +755,8 @@ var GET = async ({ url, request }) => {
 	if (!streamWindow.ok) return apiError(400, streamWindow.message, streamWindow.code);
 	if (source === "archive" && streamWindow.mode === "live") return apiError(400, "The local archive only serves historic windows: use mode=historic, or source=cloudwatch to tail live", "invalid-mode");
 	const bodyAbort = new AbortController();
-	const feed = await resolveFeed({
+	const hybrid = source === "cloudwatch" && streamWindow.mode === "historic" && (filterPattern ?? "").length === 0;
+	const feedRequest = {
 		source,
 		config,
 		env,
@@ -624,7 +770,8 @@ var GET = async ({ url, request }) => {
 		maxEvents: parseBoundedInt(url.searchParams.get("max"), ARCHIVE_MAX_LIMITS),
 		pollIntervalMs: clampPollMs(url.searchParams.get("poll")),
 		signal: bodyAbort.signal
-	});
+	};
+	const feed = hybrid ? await resolveHybridFeed(feedRequest) : await resolveFeed(feedRequest);
 	if (feed instanceof Response) return feed;
 	const archive = source === "cloudwatch" ? await getArchive(env, { region: feed.region }) : null;
 	const encoder = new TextEncoder();
@@ -687,19 +834,33 @@ var GET = async ({ url, request }) => {
 		request.signal.removeEventListener("abort", onAbort);
 		feed.release();
 	};
+	const eventCap = source === "cloudwatch" && streamWindow.mode === "historic" ? feedRequest.maxEvents : null;
 	const pump = async () => {
 		let consecutiveErrors = 0;
 		let reason = "completed";
+		let sent = 0;
+		const coverage = new CoverageCollector();
+		let archiveComplete = true;
 		try {
 			for await (const batch of feed.generator) {
 				if (closed || bodyAbort.signal.aborted) break;
 				if (batch.type === "events") {
 					const events = withDetections(batch.events);
-					const payload = { events };
+					const remaining = eventCap === null ? events.length : eventCap - sent;
+					const shown = remaining < events.length ? events.slice(0, remaining) : events;
+					const payload = { events: shown };
 					consecutiveErrors = 0;
+					sent += shown.length;
 					enqueue(sseFrame("log", payload));
-					if (archive !== null) await recordBatch(archive, feed.region, feed.groupNames, events);
-				} else if (batch.type === "end") {
+					if (archive !== null && batch.origin !== "archive") {
+						if (!await recordBatch(archive, feed.region, feed.groupNames, events)) archiveComplete = false;
+					}
+					if (eventCap !== null && sent >= eventCap) {
+						reason = "event-limit";
+						break;
+					}
+				} else if (batch.type === "coverage") coverage.add(batch.group ?? feed.groupNames[0] ?? "", batch);
+				else if (batch.type === "end") {
 					reason = batch.reason;
 					break;
 				} else {
@@ -713,6 +874,8 @@ var GET = async ({ url, request }) => {
 				if (bodyAbort.signal.aborted) reason = "client-disconnected";
 				else if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) reason = "repeated-errors";
 			}
+			const covered = coverage.entries();
+			if (archive !== null && archiveComplete && covered.length > 0) await archive.recordCoverage(feed.region, covered);
 		} catch (error) {
 			const described = describeAwsError(error);
 			const payload = { message: described.message };
@@ -756,4 +919,3 @@ var GET = async ({ url, request }) => {
 };
 
 export { GET };
-//# sourceMappingURL=_server.ts.js-BxXw5K0R.js.map

package/build/server/chunks/entries/fallbacks/{error.svelte.js-ylsqA41Y.js → error.svelte.js-BupH3lxJ.js}

@@ -1,11 +1,9 @@
-import { a8 as escape_html } from '../../chunks/index-server.js-CtH9Hqwf.js';
-import { p as page } from '../../chunks/state.js-i-NVNGIq.js';
+import { ae as escape_html } from '../../chunks/index-server.js-DOq0LmqS.js';
+import { p as page } from '../../chunks/state.js-CdO6iuBd.js';
 import '../../chunks/uneval.js-DaakSYFQ.js';
 import '../../chunks/shared.js-CgjUIvRK.js';
-import '../../chunks/exports.js-ClPPfcHj.js';
-import '../../chunks/internal2.js-CfVVfAb5.js';
-import '../../chunks/legacy-client.js-DAqKExQD.js';
-import '../../chunks/events.js-zIVaXIP1.js';
+import '../../chunks/exports.js-CvFPPbaH.js';
+import '../../chunks/internal2.js-B2FekELn.js';
 import '../../chunks/utils.js-BIlHjgGW.js';
 
 //#region node_modules/.pnpm/@sveltejs+kit@2.70.3_@sveltejs+vite-plugin-svelte@7.3.0_svelte@5.57.0_vite@8.2.2_@types_ab6e39593f61aae0ad0b9a1bac6935c7/node_modules/@sveltejs/kit/src/runtime/components/svelte-5/error.svelte
@@ -16,4 +14,3 @@ function Error($$renderer, $$props) {
 }
 
 export { Error as default };
-//# sourceMappingURL=error.svelte.js-ylsqA41Y.js.map