@interactive-inc/flume 0.10.0 → 0.11.0

package/dist/parse-error.d.ts

@@ -0,0 +1,9 @@
+//#region lib/errors/parse-error.d.ts
+type Options = {
+  cause?: unknown;
+};
+declare class FlumeParseError extends Error {
+  constructor(message: string, options?: Options);
+}
+//#endregion
+export { FlumeParseError as t };

package/dist/safe-json-parse.js

@@ -1,4 +1,4 @@
-import { o as FlumeParseError } from "./flume-source.js";
+import { c as FlumeParseError } from "./flume-source.js";
 //#region lib/utils/safe-json-parse.ts
 function safeJsonParse(raw) {
 	try {

package/dist/safe-read-text.js

@@ -1,20 +1,37 @@
-import { l as safeErrorMessage } from "./flume-source.js";
-import { t as FlumeHttpError } from "./http-error.js";
+import { d as safeErrorMessage, l as attempt } from "./flume-source.js";
+//#region lib/errors/http-error.ts
+var FlumeHttpError = class extends Error {
+	status;
+	code;
+	retryAfterMs;
+	constructor(props) {
+		super(props.message, props.cause === void 0 ? void 0 : { cause: props.cause });
+		this.name = "FlumeHttpError";
+		this.status = props.status;
+		this.code = props.code ?? null;
+		this.retryAfterMs = props.retryAfterMs ?? null;
+		Object.freeze(this);
+	}
+};
+//#endregion
 //#region lib/utils/safe-read-text.ts
 /**
 * `response.text()` を保護する。body 読み取り中の reject (接続切断 / 解凍失敗 / 二重消費) を
-* `FlumeHttpError` (status / cause 保持) に変換する。log には書かない (呼び出し側で書く)
+* `FlumeHttpError` (status / cause 保持) に変換する。DI モックの `status` getter が throw
+* しても reject しない。log には書かない (呼び出し側で書く)
 */
 async function safeReadText(props) {
 	try {
 		return await props.response.text();
 	} catch (err) {
+		const statusResult = attempt(() => props.response.status);
+		const status = typeof statusResult === "number" ? statusResult : 0;
 		return new FlumeHttpError({
 			message: `${props.context}: failed to read body: ${safeErrorMessage({ error: err })}`,
-			status: props.response.status,
+			status,
 			cause: err
 		});
 	}
 }
 //#endregion
-export { safeReadText as t };
+export { FlumeHttpError as n, safeReadText as t };

package/dist/safe-stringify.js

@@ -1,151 +1,51 @@
-import { l as safeErrorMessage, n as safeInvokeCallback, s as attempt } from "./flume-source.js";
-import { t as FlumeConnectionError } from "./connection-error.js";
+import { c as FlumeParseError, l as attempt } from "./flume-source.js";
+//#region lib/errors/connection-error.ts
+/**
+* 接続失敗を表す。Discord Gateway / Slack Socket Mode / その他 WebSocket 系の close で発生。
+* `code` は接続が落ちた際の close code (Discord は 4xxx 帯が再接続可否を示す)
+*/
+var FlumeConnectionError = class extends Error {
+	code;
+	constructor(message, options) {
+		super(message, options?.cause === void 0 ? void 0 : { cause: options.cause });
+		this.name = "FlumeConnectionError";
+		this.code = options?.code ?? null;
+		Object.freeze(this);
+	}
+};
+//#endregion
 //#region lib/utils/safe-random.ts
 /**
-* `deps.random()` を保護する。throw / 範囲外値 / 非数値が返った場合は 0.5 を返す。
-* 0 以上 1 未満 (Math.random と同等) の値のみそのまま透過
+* `deps.random()` を保護する。throw / 範囲外値 / 非数値が返った場合は `Math.random()` へ
+* フォールバックする。0 以上 1 未満 (Math.random と同等) の値のみそのまま透過。
+* `Math.random` 自体まで壊れている病的環境でのみ 0.5 を返す
 */
 function safeRandom(props) {
 	try {
 		const value = props.deps.random();
-		if (typeof value !== "number" || !Number.isFinite(value)) return .5;
-		if (value < 0 || value >= 1) return .5;
-		return value;
+		if (typeof value === "number" && Number.isFinite(value) && value >= 0 && value < 1) return value;
+	} catch {}
+	try {
+		const native = Math.random();
+		if (typeof native === "number" && Number.isFinite(native) && native >= 0 && native < 1) return native;
+		return .5;
 	} catch {
 		return .5;
 	}
 }
 //#endregion
-//#region lib/reconnector.ts
-/**
-* 指数バックオフ + ジッタ付きの再接続スケジューラ。
-* `schedule()` の戻り値: 正の delay = 予約成功 / -1 = 試行上限到達 / 0 = cancel 済み or 内部 timer 拒否。
-* setTimeout コールバック内のユーザー fn が throw / reject しても reconnect ループは止めない
-*/
-var FlumeReconnector = class {
-	props;
-	currentAttempt = 0;
-	isAborted = false;
-	timer = null;
-	constructor(props) {
-		this.props = props;
-	}
-	get attempt() {
-		return this.currentAttempt;
-	}
-	get aborted() {
-		return this.isAborted;
-	}
-	schedule(fn) {
-		if (this.isAborted) return 0;
-		if (this.currentAttempt >= this.props.maxAttempts) return -1;
-		this.clearTimer();
-		const delay = this.computeDelay();
-		const timerResult = attempt(() => this.props.deps.setTimeout(() => this.runRetry(fn), delay));
-		if (timerResult instanceof Error) {
-			this.props.log.error({
-				action: "reconnect.timer.schedule.error",
-				message: safeErrorMessage({ error: timerResult }),
-				error: timerResult
-			});
-			this.timer = null;
-			return 0;
-		}
-		this.currentAttempt++;
-		this.timer = timerResult;
-		return delay;
-	}
-	reset() {
-		this.currentAttempt = 0;
-	}
-	cancel() {
-		this.isAborted = true;
-		this.clearTimer();
-	}
-	runRetry(fn) {
-		this.timer = null;
-		safeInvokeCallback({
-			fn,
-			onError: (error) => {
-				this.props.log.error({
-					action: "reconnect.timer.error",
-					message: safeErrorMessage({ error }),
-					error
-				});
-			}
-		});
-	}
-	clearTimer() {
-		if (this.timer === null) return;
-		const handle = this.timer;
-		const result = attempt(() => this.props.deps.clearTimeout(handle));
-		if (result instanceof Error) this.props.log.error({
-			action: "reconnect.timer.clear.error",
-			message: safeErrorMessage({ error: result }),
-			error: result
-		});
-		this.timer = null;
-	}
-	computeDelay() {
-		return Math.min(this.props.baseDelay * 2 ** this.currentAttempt, this.props.maxDelay) * (.5 + safeRandom({ deps: this.props.deps }) * .5);
-	}
-};
-//#endregion
-//#region lib/schedule-reconnect.ts
-/**
-* 接続が落ちた際の共通再接続スケジューラ。
-* 再接続の設定状況 (無効 / 中止 / 試行尽き) を見極めてからステータス遷移する。
-* - reconnector が無ければ reconnect.disabled を info ログし disconnected へ
-* - cancel 済みなら reconnect.aborted を info ログし disconnected へ
-* - schedule() が -1 を返したら reconnect.exhausted を error ログし disconnected へ
-* - それ以外は reconnecting へ遷移し reconnect.scheduled を info ログ
-*/
-function scheduleFlumeReconnect(props) {
-	if (!props.reconnector) {
-		props.log.info({
-			action: "reconnect.disabled",
-			message: "reconnect is disabled, staying disconnected"
-		});
-		props.setStatus("disconnected");
-		return;
-	}
-	if (props.reconnector.aborted) {
-		props.log.info({
-			action: "reconnect.aborted",
-			message: "reconnector cancelled, staying disconnected"
-		});
-		props.setStatus("disconnected");
-		return;
-	}
-	const delay = props.reconnector.schedule(props.retry);
-	if (delay === -1) {
-		const error = new FlumeConnectionError(`reconnect exhausted after ${props.reconnector.attempt} attempts`);
-		props.log.error({
-			action: "reconnect.exhausted",
-			message: safeErrorMessage({ error }),
-			error
-		});
-		props.setStatus("disconnected");
-		return;
-	}
-	props.setStatus("reconnecting");
-	props.log.info({
-		action: "reconnect.scheduled",
-		message: `next attempt in ${Math.round(delay)}ms`,
-		detail: {
-			attempt: props.reconnector.attempt,
-			delayMs: Math.round(delay)
-		}
-	});
-}
-//#endregion
 //#region lib/utils/safe-stringify.ts
 /**
-* `JSON.stringify` を `string | Error` に変換するだけのラッパ。
-* cyclic / BigInt / throwing toJSON など標準が throw するケースを Error として返す
+* `JSON.stringify` を `string | Error` に変換するラッパ。
+* cyclic / BigInt / throwing toJSON など標準が throw するケースを Error として返す。
+* `undefined` / function / symbol は `JSON.stringify` が (型定義に反して) `undefined` を
+* 返すため、これも Error に正規化して戻り値を必ず string にする
 */
 function safeStringify(value) {
-	return attempt(() => JSON.stringify(value));
+	const result = attempt(() => JSON.stringify(value));
+	if (result instanceof Error) return result;
+	if (typeof result !== "string") return new FlumeParseError("value is not JSON-serializable (undefined / function / symbol)");
+	return result;
 }
 //#endregion
-export { safeRandom as i, scheduleFlumeReconnect as n, FlumeReconnector as r, safeStringify as t };
+export { safeRandom as n, FlumeConnectionError as r, safeStringify as t };

package/dist/schedule-reconnect.js

@@ -0,0 +1,153 @@
+import { a as safeInvokeCallback, d as safeErrorMessage, l as attempt } from "./flume-source.js";
+import { n as safeRandom, r as FlumeConnectionError } from "./safe-stringify.js";
+//#region lib/reconnector.ts
+const MAX_TIMER_DELAY_MS = 2147483647;
+/**
+* 指数バックオフ + ジッタ付きの再接続スケジューラ。
+* setTimeout コールバック内のユーザー fn が throw / reject しても reconnect ループは止めない。
+* `generation` は clearTimeout が throw して古い timer が生き残った場合でも
+* stale な発火を無視するための世代トークン
+*/
+var FlumeReconnector = class {
+	props;
+	currentAttempt = 0;
+	isAborted = false;
+	timer = null;
+	generation = 0;
+	constructor(props) {
+		this.props = props;
+	}
+	get attempt() {
+		return this.currentAttempt;
+	}
+	get aborted() {
+		return this.isAborted;
+	}
+	schedule(fn, options) {
+		if (this.isAborted) return { kind: "refused" };
+		if (this.currentAttempt >= this.props.maxAttempts) {
+			this.generation++;
+			this.clearTimer();
+			return { kind: "exhausted" };
+		}
+		this.clearTimer();
+		const delay = this.computeDelay(options?.minDelayMs ?? 0);
+		const scheduledGeneration = ++this.generation;
+		const timerResult = attempt(() => this.props.deps.setTimeout(() => this.runRetry(fn, scheduledGeneration), delay));
+		if (timerResult instanceof Error) {
+			this.props.log.error({
+				action: "reconnect.timer.schedule.error",
+				message: safeErrorMessage({ error: timerResult }),
+				error: timerResult
+			});
+			this.timer = null;
+			return { kind: "refused" };
+		}
+		this.currentAttempt++;
+		this.timer = timerResult;
+		return {
+			kind: "scheduled",
+			delayMs: delay
+		};
+	}
+	reset() {
+		this.currentAttempt = 0;
+	}
+	cancel() {
+		this.isAborted = true;
+		this.generation++;
+		this.clearTimer();
+	}
+	runRetry(fn, scheduledGeneration) {
+		if (this.isAborted) return;
+		if (scheduledGeneration !== this.generation) return;
+		this.timer = null;
+		safeInvokeCallback({
+			fn,
+			onError: (error) => {
+				this.props.log.error({
+					action: "reconnect.timer.error",
+					message: safeErrorMessage({ error }),
+					error
+				});
+			}
+		});
+	}
+	clearTimer() {
+		if (this.timer === null) return;
+		const handle = this.timer;
+		const result = attempt(() => this.props.deps.clearTimeout(handle));
+		if (result instanceof Error) this.props.log.error({
+			action: "reconnect.timer.clear.error",
+			message: safeErrorMessage({ error: result }),
+			error: result
+		});
+		this.timer = null;
+	}
+	computeDelay(minDelayMs) {
+		const jittered = Math.min(this.props.baseDelay * 2 ** this.currentAttempt, this.props.maxDelay) * (.5 + safeRandom({ deps: this.props.deps }) * .5);
+		return Math.min(Math.max(jittered, Number.isFinite(minDelayMs) && minDelayMs > 0 ? minDelayMs : 0), MAX_TIMER_DELAY_MS);
+	}
+};
+//#endregion
+//#region lib/schedule-reconnect.ts
+/**
+* 接続が落ちた際の共通再接続スケジューラ。
+* 再接続の設定状況 (無効 / 中止 / 試行尽き / timer 拒否) を見極めてからステータス遷移する。
+* - reconnector が無ければ reconnect.disabled を info ログし disconnected へ
+* - cancel 済みなら reconnect.aborted を info ログし disconnected へ
+* - schedule() が exhausted なら reconnect.exhausted を error ログし disconnected へ
+* - schedule() が refused (timer 予約失敗) なら reconnect.refused を error ログし disconnected へ
+*   ("reconnecting" のまま発火しない timer を待ち続けるハングを防ぐ)
+* - scheduled なら reconnecting へ遷移し reconnect.scheduled を info ログ
+*/
+function scheduleFlumeReconnect(props) {
+	if (!props.reconnector) {
+		props.log.info({
+			action: "reconnect.disabled",
+			message: "reconnect is disabled, staying disconnected"
+		});
+		props.setStatus("disconnected");
+		return;
+	}
+	if (props.reconnector.aborted) {
+		props.log.info({
+			action: "reconnect.aborted",
+			message: "reconnector cancelled, staying disconnected"
+		});
+		props.setStatus("disconnected");
+		return;
+	}
+	const schedule = props.reconnector.schedule(props.retry, { minDelayMs: props.minDelayMs });
+	if (schedule.kind === "exhausted") {
+		const error = new FlumeConnectionError(`reconnect exhausted after ${props.reconnector.attempt} attempts`);
+		props.log.error({
+			action: "reconnect.exhausted",
+			message: safeErrorMessage({ error }),
+			error
+		});
+		props.setStatus("disconnected");
+		return;
+	}
+	if (schedule.kind === "refused") {
+		const error = new FlumeConnectionError("reconnect timer could not be scheduled");
+		props.log.error({
+			action: "reconnect.refused",
+			message: safeErrorMessage({ error }),
+			error
+		});
+		props.setStatus("disconnected");
+		return;
+	}
+	props.setStatus("reconnecting");
+	props.log.info({
+		action: "reconnect.scheduled",
+		message: `next attempt in ${Math.round(schedule.delayMs)}ms`,
+		detail: {
+			attempt: props.reconnector.attempt,
+			delayMs: Math.round(schedule.delayMs)
+		}
+	});
+}
+//#endregion
+export { FlumeReconnector as n, scheduleFlumeReconnect as t };

package/dist/slack.d.ts

@@ -1,4 +1,4 @@
-import { D as FlumeSourceStartContext, S as FlumeSlackEnvelope, t as FlumeSource, w as FlumeSlackSourceOptions } from "./flume-source.js";
+import { C as FlumeSlackEnvelope, O as FlumeSourceStartContext, T as FlumeSlackSourceOptions, t as FlumeSource } from "./flume-source.js";
 
 //#region lib/slack/slack-source.d.ts
 declare class FlumeSlackSource extends FlumeSource {
@@ -13,7 +13,14 @@ declare class FlumeSlackSource extends FlumeSource {
   protected disconnect(): void;
   private hasWebSocket;
   private connectInternal;
+  private isTerminalSlackError;
+  private minRetryDelayMs;
   private handleMessage;
+  /**
+   * Events API の再配送は envelope_id が変わり得るため、payload.event_id があれば
+   * そちらを重複判定キーとして優先する (再配送をまたいで安定な識別子)
+   */
+  private toDedupKey;
   private safeExtractMeta;
   private scheduleReconnect;
 }