mixi2-js 1.4.0 → 1.4.1

package/dist/index.cjs

@@ -530,27 +530,29 @@ var StreamWatcher = class {
 		if (!fn) throw new Error("subscribeEvents method not found on stream client");
 		return fn.call(this.streamClient, {}, metadata);
 	}
-	async reconnect() {
-		const maxRetries = this.maxRetries;
-		let lastError;
-		for (let i = 0; i < maxRetries; i++) {
-			if (this.aborted) throw new Error("Watcher aborted");
-			await new Promise((resolve) => setTimeout(resolve, Math.pow(2, i) * 1e3));
-			try {
-				return await this.connect();
-			} catch (err) {
-				lastError = err instanceof Error ? err : new Error(String(err));
-				console.warn(`Reconnect attempt ${i + 1}/${maxRetries} failed:`, lastError.message);
-			}
-		}
-		throw lastError || /* @__PURE__ */ new Error("Failed to reconnect");
+	async reconnect(retryIndex) {
+		if (this.aborted) throw new Error("Watcher aborted");
+		const backoff = Math.min(Math.pow(2, retryIndex) * 1e3, 3e4);
+		await new Promise((resolve) => setTimeout(resolve, backoff));
+		if (this.aborted) throw new Error("Watcher aborted");
+		return this.connect();
 	}
 	async watch(handler) {
 		this.aborted = false;
 		let stream = await this.connect();
+		let consecutiveFailures = 0;
 		return new Promise((resolve, reject) => {
 			const setupStream = (s) => {
+				let receivedData = false;
+				const connectionTimeout = setTimeout(() => {
+					if (!receivedData && !this.aborted) s.destroy(/* @__PURE__ */ new Error("Connection timeout: no data received"));
+				}, 3e4);
 				s.on("data", (response) => {
+					if (!receivedData) {
+						receivedData = true;
+						clearTimeout(connectionTimeout);
+						consecutiveFailures = 0;
+					}
 					const events = (response.events || []).map(convertEvent);
 					for (const event of events) {
 						if (event.eventType === require_types.EventType.PING) continue;
@@ -559,14 +561,20 @@ var StreamWatcher = class {
 				});
 				let disconnected = false;
 				const handleDisconnect = async () => {
+					clearTimeout(connectionTimeout);
 					if (disconnected) return;
 					disconnected = true;
 					if (this.aborted) {
 						resolve();
 						return;
 					}
+					if (!receivedData) consecutiveFailures++;
+					if (consecutiveFailures >= this.maxRetries) {
+						reject(/* @__PURE__ */ new Error(`Failed to reconnect after ${this.maxRetries} consecutive attempts`));
+						return;
+					}
 					try {
-						stream = await this.reconnect();
+						stream = await this.reconnect(consecutiveFailures);
 						setupStream(stream);
 					} catch (reconnectErr) {
 						reject(reconnectErr);

package/dist/index.mjs

@@ -502,27 +502,29 @@ var StreamWatcher = class {
 		if (!fn) throw new Error("subscribeEvents method not found on stream client");
 		return fn.call(this.streamClient, {}, metadata);
 	}
-	async reconnect() {
-		const maxRetries = this.maxRetries;
-		let lastError;
-		for (let i = 0; i < maxRetries; i++) {
-			if (this.aborted) throw new Error("Watcher aborted");
-			await new Promise((resolve) => setTimeout(resolve, Math.pow(2, i) * 1e3));
-			try {
-				return await this.connect();
-			} catch (err) {
-				lastError = err instanceof Error ? err : new Error(String(err));
-				console.warn(`Reconnect attempt ${i + 1}/${maxRetries} failed:`, lastError.message);
-			}
-		}
-		throw lastError || /* @__PURE__ */ new Error("Failed to reconnect");
+	async reconnect(retryIndex) {
+		if (this.aborted) throw new Error("Watcher aborted");
+		const backoff = Math.min(Math.pow(2, retryIndex) * 1e3, 3e4);
+		await new Promise((resolve) => setTimeout(resolve, backoff));
+		if (this.aborted) throw new Error("Watcher aborted");
+		return this.connect();
 	}
 	async watch(handler) {
 		this.aborted = false;
 		let stream = await this.connect();
+		let consecutiveFailures = 0;
 		return new Promise((resolve, reject) => {
 			const setupStream = (s) => {
+				let receivedData = false;
+				const connectionTimeout = setTimeout(() => {
+					if (!receivedData && !this.aborted) s.destroy(/* @__PURE__ */ new Error("Connection timeout: no data received"));
+				}, 3e4);
 				s.on("data", (response) => {
+					if (!receivedData) {
+						receivedData = true;
+						clearTimeout(connectionTimeout);
+						consecutiveFailures = 0;
+					}
 					const events = (response.events || []).map(convertEvent);
 					for (const event of events) {
 						if (event.eventType === EventType.PING) continue;
@@ -531,14 +533,20 @@ var StreamWatcher = class {
 				});
 				let disconnected = false;
 				const handleDisconnect = async () => {
+					clearTimeout(connectionTimeout);
 					if (disconnected) return;
 					disconnected = true;
 					if (this.aborted) {
 						resolve();
 						return;
 					}
+					if (!receivedData) consecutiveFailures++;
+					if (consecutiveFailures >= this.maxRetries) {
+						reject(/* @__PURE__ */ new Error(`Failed to reconnect after ${this.maxRetries} consecutive attempts`));
+						return;
+					}
 					try {
-						stream = await this.reconnect();
+						stream = await this.reconnect(consecutiveFailures);
 						setupStream(stream);
 					} catch (reconnectErr) {
 						reject(reconnectErr);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mixi2-js",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "TypeScript/JavaScript SDK for mixi2 Application API",
   "keywords": [
     "api",