@loggerjs/browser 0.1.0 → 0.3.1

package/dist/index.js

@@ -470,7 +470,7 @@ function browserServiceWorkerTransport(options = {}) {
 	const mapBatch = options.mapBatch ?? defaultMapBatch;
 	const queue = [];
 	let readyWorker;
-	let readyStarted = false;
+	let readyPromise;
 	let lastContext;
 	const reportError = (error, context, operation, droppedEvents = 0) => {
 		try {
@@ -521,27 +521,35 @@ function browserServiceWorkerTransport(options = {}) {
 			post(worker, item, context);
 		}
 	};
-	const startReady = (context) => {
-		if (target !== "ready" || readyStarted) return;
-		readyStarted = true;
+	const dropQueued = (reason) => {
+		const pending = queue.splice(0);
+		for (const item of pending) reportDrop(item, reason);
+		return pending.reduce((total, item) => total + item.events.length, 0);
+	};
+	const waitForReady = (context) => {
+		if (currentWorker()) return Promise.resolve();
+		if (target !== "ready") return Promise.reject(/* @__PURE__ */ new Error("service worker controller is not available"));
+		if (readyPromise) return readyPromise;
 		const container = options.serviceWorker ?? serviceWorkerContainer();
 		if (!container?.ready) {
-			reportError(/* @__PURE__ */ new Error("serviceWorker.ready is not available"), context, "ready");
-			return;
+			const error = /* @__PURE__ */ new Error("serviceWorker.ready is not available");
+			reportError(error, context, "ready", dropQueued("ready"));
+			return Promise.reject(error);
 		}
-		container.ready.then((registration) => {
+		readyPromise = container.ready.then((registration) => {
 			readyWorker = workerFromRegistration(registration);
-			if (!readyWorker) {
-				const pending = queue.splice(0);
-				for (const item of pending) reportDrop(item, "unavailable");
-				return;
-			}
-			drain(context);
+			if (!readyWorker) throw new Error("service worker registration has no active worker");
+			drain(context ?? lastContext);
 		}).catch((error) => {
-			const pending = queue.splice(0);
-			for (const item of pending) reportDrop(item, "ready");
-			reportError(error, context, "ready", pending.reduce((total, item) => total + item.events.length, 0));
+			readyPromise = void 0;
+			const droppedEvents = dropQueued("ready");
+			reportError(error, context ?? lastContext, "ready", droppedEvents);
+			throw error;
 		});
+		return readyPromise;
+	};
+	const startReady = (context) => {
+		waitForReady(context).catch(() => {});
 	};
 	const enqueue = (item) => {
 		if (queue.length >= maxQueueSize) {
@@ -575,6 +583,9 @@ function browserServiceWorkerTransport(options = {}) {
 		queueSize() {
 			return queue.length;
 		},
+		ready() {
+			return waitForReady();
+		},
 		log(event, context) {
 			send({
 				events: [event],