@loggerjs/browser 0.5.6 → 0.6.0

package/dist/index.js

@@ -187,7 +187,7 @@ function browserHttpTransport(options) {
 	let timer;
 	let activeFlush;
 	let flushingBeacon = false;
-	let replayingOffline = false;
+	let replayPromise;
 	let lastContext;
 	const headers = (payloadHeaders, contentType = codec.contentType) => ({
 		"content-type": contentType,
@@ -303,17 +303,18 @@ function browserHttpTransport(options) {
 		incrementLoggerMetaCounter("transport.offline.queued");
 		return true;
 	};
+	const isOnline = () => typeof navigator === "undefined" || navigator.onLine !== false;
 	const sendFetchBatch = async (batch) => {
-		if (batch.length === 0) return;
 		const transformed = await encodeTransformedPayload(batch);
-		if (offlineQueue && typeof navigator !== "undefined" && navigator.onLine === false) {
+		if (offlineQueue && !isOnline()) {
 			await enqueueOfflinePayload(transformed.payload, transformed.headers, transformed.contentType);
-			return;
+			return "queued";
 		}
 		try {
 			await sendPayload(createOfflineEntry(transformed.payload, transformed.headers, transformed.contentType));
+			return "sent";
 		} catch (error) {
-			if (await enqueueOfflinePayload(transformed.payload, transformed.headers, transformed.contentType)) return;
+			if (await enqueueOfflinePayload(transformed.payload, transformed.headers, transformed.contentType)) return "queued";
 			throw error;
 		}
 	};
@@ -335,13 +336,23 @@ function browserHttpTransport(options) {
 			await sleep(replayRetryDelay(attempt));
 		}
 	};
-	const replayOfflineQueue = async () => {
-		if (!offlineQueue || replayingOffline) return;
-		replayingOffline = true;
+	const replayOfflineQueue = () => {
+		if (!offlineQueue) return Promise.resolve();
+		replayPromise ??= (async () => {
+			try {
+				await offlineQueue.replay(sendOfflineEntryWithRetry);
+			} finally {
+				replayPromise = void 0;
+			}
+		})();
+		return replayPromise;
+	};
+	const replayOfflineQueueSafely = async (operation) => {
+		if (!offlineQueue || !isOnline()) return;
 		try {
-			await offlineQueue.replay(sendOfflineEntryWithRetry);
-		} finally {
-			replayingOffline = false;
+			await replayOfflineQueue();
+		} catch (error) {
+			reportInternalError(error, operation);
 		}
 	};
 	const flushBeaconQueue = () => {
@@ -368,7 +379,7 @@ function browserHttpTransport(options) {
 			}
 			return activeFlush;
 		}
-		if (queue.length === 0) return Promise.resolve();
+		if (queue.length === 0) return preferBeacon ? Promise.resolve() : replayOfflineQueueSafely("replay");
 		clearTimer();
 		let resolve;
 		let reject;
@@ -380,15 +391,19 @@ function browserHttpTransport(options) {
 		(async () => {
 			try {
 				if (preferBeacon) flushBeaconQueue();
+				let sent = false;
+				let queued = false;
 				while (queue.length > 0) {
 					const batch = queue.splice(0, maxBatchSize);
 					try {
-						await sendFetchBatch(batch);
+						if (await sendFetchBatch(batch) === "sent") sent = true;
+						else queued = true;
 					} catch (error) {
 						queue.unshift(...batch);
 						throw error;
 					}
 				}
+				if (!preferBeacon && sent && !queued) await replayOfflineQueueSafely("replay");
 				resolve();
 			} catch (error) {
 				reject(error);
@@ -419,7 +434,10 @@ function browserHttpTransport(options) {
 		globalThis.addEventListener?.("pagehide", onPageHide);
 		globalThis.addEventListener?.("visibilitychange", onVisibilityChange);
 	}
-	if (offlineQueue) globalThis.addEventListener?.("online", onOnline);
+	if (offlineQueue) {
+		globalThis.addEventListener?.("online", onOnline);
+		if (options.offlineReplayOnStart ?? true) setTimeout(() => void replayOfflineQueueSafely("startup-replay"), 0);
+	}
 	return {
 		name: options.name ?? "browser-http",
 		minLevel: options.minLevel,
@@ -2073,6 +2091,7 @@ function offlineFirstTransport(remote, options = {}) {
 		name,
 		minLevel: options.minLevel ?? remote.minLevel,
 		queue,
+		ready: remote.ready && (() => remote.ready?.()),
 		write(record, context) {
 			return sendOrQueue(context.toEvent(record), context);
 		},