@abraca/resend 2.16.0 → 2.17.0

package/dist/abracadabra-resend.cjs

@@ -541,11 +541,15 @@ function readEntry(treeMap, id) {
 var OutboxWatcher = class {
 	constructor(opts) {
 		this.inFlight = /* @__PURE__ */ new Set();
-		this.handled = /* @__PURE__ */ new Set();
 		this.observer = null;
 		this.treeMap = null;
 		this.rootDoc = null;
 		this.txHandler = null;
+		this.subdocsHandler = null;
+		this.updateHandler = null;
+		this.reconnectedHandler = null;
+		this.reconnectProvider = null;
+		this.subdocHandlers = /* @__PURE__ */ new Map();
 		this.server = opts.server;
 		this.sender = opts.sender;
 		this.bootstrap = opts.bootstrap;
@@ -578,23 +582,57 @@ var OutboxWatcher = class {
 		rootDoc.on("afterTransaction", onTx);
 		this.txHandler = onTx;
 		const onSubdocs = (changes) => {
-			console.error(`[abracadabra-resend] subdocs: added=${changes.added.size} loaded=${changes.loaded.size}`);
-			for (const sub of [...changes.added, ...changes.loaded]) sub.on("afterTransaction", (tx) => {
-				console.error(`[abracadabra-resend] subdoc afterTransaction (guid=${sub.guid}, local=${tx.local})`);
-				this.scan("subdoc");
-			});
+			console.error(`[abracadabra-resend] subdocs: added=${changes.added.size} loaded=${changes.loaded.size} removed=${changes.removed.size}`);
+			for (const sub of changes.removed) {
+				const handler = this.subdocHandlers.get(sub);
+				if (handler) {
+					sub.off("afterTransaction", handler);
+					this.subdocHandlers.delete(sub);
+				}
+			}
+			for (const sub of [...changes.added, ...changes.loaded]) {
+				if (this.subdocHandlers.has(sub)) continue;
+				const handler = (tx) => {
+					console.error(`[abracadabra-resend] subdoc afterTransaction (guid=${sub.guid}, local=${tx.local})`);
+					this.scan("subdoc");
+				};
+				sub.on("afterTransaction", handler);
+				this.subdocHandlers.set(sub, handler);
+			}
 		};
 		rootDoc.on("subdocs", onSubdocs);
-		rootDoc.on("update", (_update, origin) => {
+		this.subdocsHandler = onSubdocs;
+		const onUpdate = (_update, origin) => {
 			console.error(`[abracadabra-resend] root update applied (origin=${String(origin)})`);
 			this.scan("update");
-		});
+		};
+		rootDoc.on("update", onUpdate);
+		this.updateHandler = onUpdate;
+		const provider = this.server.rootProvider;
+		if (provider && typeof provider.on === "function") {
+			const onReconnected = () => {
+				console.error("[abracadabra-resend] provider reconnected — re-scanning");
+				this.scan("reconnected");
+			};
+			provider.on("reconnected", onReconnected);
+			this.reconnectedHandler = onReconnected;
+			this.reconnectProvider = provider;
+		}
 		console.error(`[abracadabra-resend] Outbox watcher attached (ready column ${this.bootstrap.columns.Ready})`);
 	}
 	stop() {
 		if (this.rootDoc && this.txHandler) this.rootDoc.off("afterTransaction", this.txHandler);
+		if (this.rootDoc && this.subdocsHandler) this.rootDoc.off("subdocs", this.subdocsHandler);
+		if (this.rootDoc && this.updateHandler) this.rootDoc.off("update", this.updateHandler);
+		for (const [sub, handler] of this.subdocHandlers) sub.off("afterTransaction", handler);
+		this.subdocHandlers.clear();
 		if (this.treeMap && this.observer) this.treeMap.unobserveDeep(this.observer);
+		if (this.reconnectProvider && this.reconnectedHandler) this.reconnectProvider.off("reconnected", this.reconnectedHandler);
 		this.txHandler = null;
+		this.subdocsHandler = null;
+		this.updateHandler = null;
+		this.reconnectedHandler = null;
+		this.reconnectProvider = null;
 		this.rootDoc = null;
 		this.observer = null;
 		this.treeMap = null;
@@ -621,9 +659,8 @@ var OutboxWatcher = class {
 			});
 			if (e.parentId !== readyColId) return;
 			inReadyCount++;
-			if (this.inFlight.has(id) || this.handled.has(id)) return;
+			if (this.inFlight.has(id)) return;
 			if (typeof e.meta.resendId === "string" && e.meta.resendId.length > 0) {
-				this.handled.add(id);
 				this.moveTo(id, this.bootstrap.columns.Sent);
 				return;
 			}
@@ -643,7 +680,6 @@ var OutboxWatcher = class {
 			const payload = await renderEmail(this.server, id, this.defaultFrom);
 			console.error(`[abracadabra-resend] sending "${payload.subject}" → ${payload.to.join(", ")} (doc=${id})`);
 			const { id: resendId } = await this.sender.send(payload, { "X-Abra-Doc-Id": id });
-			this.handled.add(id);
 			this.patchMeta(id, {
 				resendId,
 				sentAt: Date.now(),
@@ -652,7 +688,6 @@ var OutboxWatcher = class {
 			this.moveTo(id, this.bootstrap.columns.Sent);
 			console.error(`[abracadabra-resend] sent "${payload.subject}" (resend=${resendId}, doc=${id})`);
 		} catch (err) {
-			this.handled.add(id);
 			const message = err instanceof RenderError ? err.message : err?.message ? String(err.message) : String(err);
 			console.error(`[abracadabra-resend] send failed for "${label}" (${id}): ${message}`);
 			this.patchMeta(id, {
@@ -1366,6 +1401,7 @@ var AbracadabraResendServer = class {
 		this._connection = null;
 		this.childCache = /* @__PURE__ */ new Map();
 		this.evictionTimer = null;
+		this.heartbeatTimer = null;
 		this._userId = null;
 		this._signFn = null;
 		this._reconnecting = null;
@@ -1433,6 +1469,9 @@ var AbracadabraResendServer = class {
 		await this._connectToSpace(targetId);
 		console.error("[abracadabra-resend] Space doc synced");
 		this.evictionTimer = setInterval(() => this.evictIdle(), 6e4);
+		this.heartbeatTimer = setInterval(() => {
+			this.ensureConnected();
+		}, 3e4);
 	}
 	async _connectToSpace(docId) {
 		if (!this.client.isTokenValid() && this._signFn && this._userId) {
@@ -1486,20 +1525,13 @@ var AbracadabraResendServer = class {
 					await waitForSync(conn.provider, 6e3);
 				} catch {}
 				if (this._wsConnected(conn.provider)) return;
-				console.error("[abracadabra-resend] Active connection dead — rebuilding…");
-				const docId = conn.docId;
+				console.error("[abracadabra-resend] Socket dead — forcing reconnect on the same doc…");
+				conn.provider.reconnect();
 				try {
-					conn.provider.destroy();
-				} catch {}
-				for (const [, cached] of this.childCache) try {
-					cached.provider.destroy();
-				} catch {}
-				this.childCache.clear();
-				try {
-					await this._connectToSpace(docId);
-					console.error("[abracadabra-resend] Space provider rebuilt + synced");
+					await waitForSync(conn.provider, 1e4);
+					console.error("[abracadabra-resend] Reconnected + re-synced");
 				} catch (e) {
-					console.error("[abracadabra-resend] Connection rebuild failed:", e);
+					console.error("[abracadabra-resend] Reconnect did not re-sync in time:", e);
 				}
 			} finally {
 				this._reconnecting = null;
@@ -1547,6 +1579,10 @@ var AbracadabraResendServer = class {
 			clearInterval(this.evictionTimer);
 			this.evictionTimer = null;
 		}
+		if (this.heartbeatTimer) {
+			clearInterval(this.heartbeatTimer);
+			this.heartbeatTimer = null;
+		}
 		for (const [, cached] of this.childCache) try {
 			cached.provider.destroy();
 		} catch {}