@interactive-inc/flume 0.4.0 → 0.6.0

package/dist/slack.js

@@ -1,9 +1,9 @@
-import { a as FlumeParseError, c as safeNormalizeError, i as FlumeStartError, l as safeErrorMessage, n as FlumeLogger, o as createFlumeDefaultDeps, r as safeNow, s as attempt, t as safeInvokeCallback } from "./safe-invoke-callback-EpWXwfwp.js";
+import { a as FlumeStartError, c as safeNormalizeError, i as safeNow, l as safeErrorMessage, o as FlumeParseError, r as FlumeLogger, s as attempt, t as FlumeSource } from "./flume-source-DUvt9aJt.js";
 import { t as FlumeConnectionError } from "./connection-error-HUO3PC3G.js";
 import { t as FlumeHttpError } from "./http-error-CPSKoSie.js";
-import { a as FlumeReconnector, i as resolveFlumeReconnectConfig, n as isRecord, r as scheduleFlumeReconnect, t as safeStringify } from "./safe-stringify-BWS-uXZP.js";
-import { i as safeJsonParse, n as FlumeStatusEmitter, r as FlumeSignalRegistry, t as FlumeSerialQueue } from "./serial-queue-B9LoBc64.js";
-import { t as safeReadText } from "./safe-read-text-DgrJ4Uhl.js";
+import { i as FlumeReconnector, n as isRecord, r as scheduleFlumeReconnect, t as safeStringify } from "./safe-stringify-DbWQw9qe.js";
+import { t as safeJsonParse } from "./safe-json-parse-CfJjt-RY.js";
+import { t as safeReadText } from "./safe-read-text-JQd_5vbd.js";
 import { z } from "zod/v4";
 //#region lib/slack/extract-slack-meta.ts
 function flumeExtractSlackMeta(envelope) {
@@ -472,108 +472,58 @@ var FlumeSlackSocketMode = class {
 //#region lib/slack/slack-source.ts
 const SEEN_CACHE_MAX = 1024;
 const SEEN_CACHE_TTL_MS = 300 * 1e3;
-var FlumeSlackSource = class {
+var FlumeSlackSource = class extends FlumeSource {
 	options;
 	name = "slack";
 	socket = null;
 	reconnector = null;
-	handler = null;
 	internalController = null;
-	log;
-	deps;
-	queue = new FlumeSerialQueue();
-	seen;
-	signals;
-	statusEmitter;
-	onSignalAbort = () => {
-		safeInvokeCallback({
-			fn: () => this.stop(),
-			onError: (error) => {
-				this.log.error({
-					action: "signal.abort.stop.failed",
-					message: safeErrorMessage({ error }),
-					error
-				});
-			}
-		});
-	};
+	seen = null;
 	constructor(options) {
+		super();
 		this.options = options;
-		this.deps = options.deps ?? createFlumeDefaultDeps();
-		this.log = new FlumeLogger({
-			source: "slack",
-			handler: options.onLog,
-			deps: this.deps
-		});
-		this.signals = new FlumeSignalRegistry({
-			log: this.log,
-			onAbort: this.onSignalAbort
-		});
-		this.statusEmitter = new FlumeStatusEmitter({
-			log: this.log,
-			onStatus: options.onStatus
-		});
+	}
+	async connect(ctx) {
+		if (!this.hasWebSocket(ctx)) return new FlumeStartError("Slack source: deps.WebSocket is null (no WebSocket runtime available)");
 		this.seen = new FlumeSlackSeenCache({
 			maxSize: SEEN_CACHE_MAX,
 			ttlMs: SEEN_CACHE_TTL_MS,
-			deps: this.deps
+			deps: ctx.deps
 		});
-		const rc = resolveFlumeReconnectConfig(options.reconnect);
-		if (rc) this.reconnector = new FlumeReconnector({
-			...rc,
-			log: this.log,
-			deps: this.deps
+		if (ctx.reconnect && !this.reconnector) this.reconnector = new FlumeReconnector({
+			...ctx.reconnect,
+			log: ctx.log,
+			deps: ctx.deps
 		});
-	}
-	async start(handler, options) {
-		if (this.signals.isAnyAborted(this.options.signal) || this.signals.isAnyAborted(options?.signal)) return new FlumeStartError("Slack source: signal already aborted");
-		if (!this.hasWebSocket()) return new FlumeStartError("Slack source: deps.WebSocket is null (no WebSocket runtime available)");
-		this.signals.register(this.options.signal);
-		this.signals.register(options?.signal);
-		this.handler = handler;
 		const controllerResult = attempt(() => new AbortController());
 		if (controllerResult instanceof Error) {
 			const error = safeNormalizeError({ value: controllerResult });
-			this.log.error({
+			ctx.log.error({
 				action: "slack.abort-controller.new.error",
 				message: safeErrorMessage({ error }),
 				error
 			});
 			this.internalController = null;
 		} else this.internalController = controllerResult;
-		this.log.info({
-			action: "source.start",
-			message: "starting Slack source"
-		});
-		return await this.connectInternal();
+		return await this.connectInternal(ctx);
 	}
-	async stop() {
-		this.signals.unregisterAll();
-		this.log.info({
-			action: "source.stop",
-			message: "stopping Slack source"
-		});
-		if (this.reconnector && !this.reconnector.aborted) this.log.debug({
+	disconnect() {
+		const ctx = this.context;
+		if (ctx && this.reconnector && !this.reconnector.aborted) ctx.log.debug({
 			action: "reconnect.cancel",
 			message: "aborting reconnector"
 		});
 		this.reconnector?.cancel();
 		this.internalController?.abort();
 		this.socket?.disconnect();
-		await this.queue.drain();
 		this.socket = null;
-		this.handler = null;
 		this.internalController = null;
-		this.statusEmitter.set("disconnected");
-	}
-	status() {
-		return this.statusEmitter.value;
 	}
-	hasWebSocket() {
-		const result = attempt(() => Boolean(this.deps.WebSocket));
+	hasWebSocket(ctx) {
+		const result = attempt(() => Boolean(ctx.deps.WebSocket));
 		if (result instanceof Error) {
 			const error = safeNormalizeError({ value: result });
-			this.log.error({
+			ctx.log.error({
 				action: "deps.web-socket.read.error",
 				message: safeErrorMessage({ error }),
 				error
@@ -582,47 +532,49 @@ var FlumeSlackSource = class {
 		}
 		return result;
 	}
-	async connectInternal() {
-		this.statusEmitter.set("connecting");
+	async connectInternal(ctx) {
+		this.setStatus("connecting");
 		this.socket = new FlumeSlackSocketMode({
 			appToken: this.options.appToken,
-			onLog: this.options.onLog,
-			deps: this.deps,
-			onMessage: (envelope) => this.handleMessage(envelope),
+			onLog: ctx.log.handler,
+			deps: ctx.deps,
+			onMessage: (envelope) => this.handleMessage(ctx, envelope),
 			onConnected: () => {
-				if (this.reconnector && this.reconnector.attempt > 0) this.log.info({
+				if (this.reconnector && this.reconnector.attempt > 0) ctx.log.info({
 					action: "reconnect.reset",
 					message: `cleared ${this.reconnector.attempt} attempts`
 				});
 				this.reconnector?.reset();
-				this.statusEmitter.set("connected");
+				this.setStatus("connected");
 			},
 			onDisconnected: () => {
 				if (this.socket?.isStopped) {
-					this.statusEmitter.set("disconnected");
+					this.setStatus("disconnected");
 					return;
 				}
-				this.scheduleReconnect();
+				this.scheduleReconnect(ctx);
 			}
 		});
 		const error = await this.socket.connect({ signal: this.internalController?.signal });
 		if (error instanceof Error) {
-			this.log.error({
+			ctx.log.error({
 				action: "connect.failed",
 				message: safeErrorMessage({ error }),
 				error
 			});
 			if (this.socket.isStopped || !this.reconnector || this.reconnector.aborted) {
-				this.statusEmitter.set("disconnected");
+				this.setStatus("disconnected");
 				return error;
 			}
-			this.scheduleReconnect();
+			this.scheduleReconnect(ctx);
 		}
 		return null;
 	}
-	handleMessage(envelope) {
-		if (this.seen.has(envelope.envelope_id)) {
-			this.log.debug({
+	handleMessage(ctx, envelope) {
+		const seen = this.seen;
+		if (!seen) return;
+		if (seen.has(envelope.envelope_id)) {
+			ctx.log.debug({
 				action: "dedup.skip",
 				message: `duplicate envelope_id=${envelope.envelope_id}`,
 				detail: {
@@ -632,31 +584,21 @@ var FlumeSlackSource = class {
 			});
 			return;
 		}
-		this.seen.add(envelope.envelope_id);
-		this.seen.trim();
-		const handler = this.handler;
-		if (!handler) return;
-		this.queue.add(async () => {
-			const event = {
-				source: "slack",
-				type: envelope.type,
-				data: envelope.payload,
-				meta: this.safeExtractMeta(envelope),
-				receivedAt: safeNow({ deps: this.deps })
-			};
-			const r = await attempt(() => Promise.resolve(handler(event)));
-			if (r instanceof Error) this.log.error({
-				action: "handler.error",
-				message: safeErrorMessage({ error: r }),
-				error: r
-			});
+		seen.add(envelope.envelope_id);
+		seen.trim();
+		this.emit({
+			source: "slack",
+			type: envelope.type,
+			data: envelope.payload,
+			meta: this.safeExtractMeta(ctx, envelope),
+			receivedAt: safeNow({ deps: ctx.deps })
 		});
 	}
-	safeExtractMeta(envelope) {
+	safeExtractMeta(ctx, envelope) {
 		const result = attempt(() => flumeExtractSlackMeta(envelope));
 		if (result instanceof Error) {
 			const error = safeNormalizeError({ value: result });
-			this.log.warn({
+			ctx.log.warn({
 				action: "meta.extract.error",
 				message: safeErrorMessage({ error }),
 				error,
@@ -666,20 +608,20 @@ var FlumeSlackSource = class {
 		}
 		return result;
 	}
-	scheduleReconnect() {
+	scheduleReconnect(ctx) {
 		scheduleFlumeReconnect({
 			reconnector: this.reconnector,
-			log: this.log,
-			setStatus: (status) => this.statusEmitter.set(status),
+			log: ctx.log,
+			setStatus: (status) => this.setStatus(status),
 			retry: () => {
-				this.connectInternal().catch((err) => {
+				this.connectInternal(ctx).catch((err) => {
 					const error = safeNormalizeError({ value: err });
-					this.log.error({
+					ctx.log.error({
 						action: "reconnect.unhandled",
 						message: safeErrorMessage({ error }),
 						error
 					});
-					this.statusEmitter.set("disconnected");
+					this.setStatus("disconnected");
 				});
 			}
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interactive-inc/flume",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Unified notification listener for Discord, Slack, and GitHub. Raw WebSocket + fetch + Zod. No SDK dependencies.",
   "keywords": [
     "discord",
@@ -71,6 +71,7 @@
     "zod": "^4.4.3"
   },
   "devDependencies": {
+    "typescript": "^5.6.0",
     "vite-plus": "^0.1.21",
     "vitest": "^4.1.9"
   },

package/dist/safe-invoke-callback-EpWXwfwp.js

@@ -1,170 +0,0 @@
-//#region lib/utils/safe-error-message.ts
-/**
-* 任意の値から人が読めるメッセージ文字列を取り出す。
-* `Error.message` getter / `Symbol.toPrimitive` / `toString` / `valueOf` が throw しても固定文字列に fallback。
-* 自身は決して throw しない
-*/
-function safeErrorMessage(props) {
-	if (props.error instanceof Error) try {
-		const message = props.error.message;
-		if (typeof message === "string") return message;
-		return "<non-string error message>";
-	} catch {
-		return "<unreadable error message>";
-	}
-	try {
-		return String(props.error);
-	} catch {
-		return "<unprintable error>";
-	}
-}
-//#endregion
-//#region lib/utils/safe-normalize-error.ts
-/**
-* 任意の値を `Error` インスタンスへ正規化する。すでに Error ならそのまま返し、
-* それ以外は `safeErrorMessage` で安全な文字列化を経由して new Error する。
-* Error コンストラクタ自体が throw する病的環境でも fallback を返し、決して throw しない
-*/
-function safeNormalizeError(props) {
-	if (props.value instanceof Error) return props.value;
-	const message = safeErrorMessage({ error: props.value });
-	try {
-		return new Error(message);
-	} catch {
-		try {
-			return /* @__PURE__ */ new Error("unknown error");
-		} catch {
-			const fallback = Object.create(Error.prototype);
-			fallback.name = "Error";
-			fallback.message = "unknown error";
-			return fallback;
-		}
-	}
-}
-//#endregion
-//#region lib/utils/attempt.ts
-function attempt(fn) {
-	try {
-		const result = fn();
-		if (result instanceof Promise) return result.catch((err) => safeNormalizeError({ value: err }));
-		return result;
-	} catch (err) {
-		return safeNormalizeError({ value: err });
-	}
-}
-//#endregion
-//#region lib/deps.ts
-const wsCandidate = attempt(() => globalThis.WebSocket);
-const cachedWebSocket = wsCandidate instanceof Error || typeof wsCandidate !== "function" ? null : wsCandidate;
-/**
-* platform 既定の IO を束ねた `FlumeRuntimeDeps`。
-* `FlumeTimerHandle` は不透明型 (`unknown`) のため、setTimeout / clearTimeout の戻り値・引数を
-* platform 型と橋渡しする際に境界で `as unknown as` を使う (IO 境界の最終手段)
-*/
-function createFlumeDefaultDeps() {
-	return {
-		fetch: (url, init) => globalThis.fetch(url, init),
-		WebSocket: cachedWebSocket,
-		now: () => Date.now(),
-		random: () => Math.random(),
-		setTimeout: (fn, ms) => globalThis.setTimeout(fn, ms),
-		clearTimeout: (id) => globalThis.clearTimeout(id),
-		setInterval: (fn, ms) => globalThis.setInterval(fn, ms),
-		clearInterval: (id) => globalThis.clearInterval(id)
-	};
-}
-//#endregion
-//#region lib/errors/parse-error.ts
-var FlumeParseError = class extends Error {
-	constructor(message, options) {
-		super(message, options?.cause === void 0 ? void 0 : { cause: options.cause });
-		this.name = "FlumeParseError";
-		Object.freeze(this);
-	}
-};
-//#endregion
-//#region lib/errors/start-error.ts
-var FlumeStartError = class extends Error {
-	constructor(message, options) {
-		super(message, options?.cause === void 0 ? void 0 : { cause: options.cause });
-		this.name = "FlumeStartError";
-		Object.freeze(this);
-	}
-};
-//#endregion
-//#region lib/utils/safe-now.ts
-/**
-* `deps.now()` を保護する。throw / 非数値が返った場合は 0 を返す。
-* IO 境界のため呼び出し側はこの戻り値を信頼できる
-*/
-function safeNow(props) {
-	try {
-		const value = props.deps.now();
-		if (typeof value !== "number" || !Number.isFinite(value)) return 0;
-		return value;
-	} catch {
-		return 0;
-	}
-}
-//#endregion
-//#region lib/logger.ts
-/**
-* 構造化ログを onLog に流す。handler が throw / reject してもループは継続する
-*/
-var FlumeLogger = class {
-	props;
-	constructor(props) {
-		this.props = props;
-		Object.freeze(this);
-	}
-	debug(entry) {
-		this.emit("debug", entry);
-	}
-	info(entry) {
-		this.emit("info", entry);
-	}
-	warn(entry) {
-		this.emit("warn", entry);
-	}
-	error(entry) {
-		this.emit("error", entry);
-	}
-	emit(level, input) {
-		const handler = this.props.handler;
-		if (!handler) return;
-		const log = {
-			level,
-			source: this.props.source,
-			action: input.action,
-			message: input.message,
-			timestamp: safeNow({ deps: this.props.deps }),
-			error: input.error,
-			detail: input.detail
-		};
-		try {
-			Promise.resolve(handler(log)).catch(() => {});
-		} catch {}
-	}
-};
-//#endregion
-//#region lib/utils/safe-invoke-callback.ts
-/**
-* fire-and-forget でユーザーコールバックを呼び出す。sync throw と async reject のどちらも
-* `onError(Error)` に正規化して通知。`onError` 自身が throw しても外に漏らさない。
-* 戻り値を持たない fire-and-forget 専用のため log/出力先には依存しない (caller が onError で決める)
-*/
-function safeInvokeCallback(props) {
-	try {
-		Promise.resolve(props.fn()).catch((err) => {
-			try {
-				props.onError(safeNormalizeError({ value: err }));
-			} catch {}
-		}).catch(() => {});
-	} catch (err) {
-		try {
-			props.onError(safeNormalizeError({ value: err }));
-		} catch {}
-	}
-}
-//#endregion
-export { FlumeParseError as a, safeNormalizeError as c, FlumeStartError as i, safeErrorMessage as l, FlumeLogger as n, createFlumeDefaultDeps as o, safeNow as r, attempt as s, safeInvokeCallback as t };

package/dist/serial-queue-B9LoBc64.js

@@ -1,162 +0,0 @@
-import { a as FlumeParseError, c as safeNormalizeError, l as safeErrorMessage, s as attempt, t as safeInvokeCallback } from "./safe-invoke-callback-EpWXwfwp.js";
-//#region lib/utils/safe-json-parse.ts
-function safeJsonParse(raw) {
-	try {
-		return JSON.parse(raw);
-	} catch (error) {
-		return new FlumeParseError(error instanceof Error ? `invalid JSON: ${error.message}` : "invalid JSON", { cause: error });
-	}
-}
-//#endregion
-//#region lib/source-helpers/flume-signal-registry.ts
-/**
-* Source 群に共通する AbortSignal の登録・解除・abort 判定を集約する。
-* 異常な polyfill / poisoned getter / 凍結 signal を吸収するため境界呼び出しは全て try/catch で
-* 包み、失敗時はログに流して握り潰す
-*/
-var FlumeSignalRegistry = class {
-	props;
-	signals = [];
-	constructor(props) {
-		this.props = props;
-	}
-	isAnyAborted(extra) {
-		if (this.isAborted(extra)) return true;
-		for (const signal of this.signals) if (this.isAborted(signal)) return true;
-		return false;
-	}
-	register(signal) {
-		if (!signal) return;
-		const result = attempt(() => signal.addEventListener("abort", this.props.onAbort, { once: true }));
-		if (result instanceof Error) {
-			const error = safeNormalizeError({ value: result });
-			this.props.log.error({
-				action: "signal.addListener.failed",
-				message: safeErrorMessage({ error }),
-				error
-			});
-			return;
-		}
-		this.signals.push(signal);
-	}
-	unregisterAll() {
-		for (const signal of this.signals) {
-			const result = attempt(() => signal.removeEventListener("abort", this.props.onAbort));
-			if (result instanceof Error) {
-				const error = safeNormalizeError({ value: result });
-				this.props.log.error({
-					action: "signal.removeListener.failed",
-					message: safeErrorMessage({ error }),
-					error
-				});
-			}
-		}
-		this.signals.length = 0;
-	}
-	get size() {
-		return this.signals.length;
-	}
-	isAborted(signal) {
-		if (!signal) return false;
-		const result = attempt(() => signal.aborted === true);
-		return result instanceof Error ? true : result;
-	}
-};
-//#endregion
-//#region lib/source-helpers/flume-status-emitter.ts
-/**
-* Source の `currentStatus` と `onStatus` 通知を集約する。
-* 同一 (status, detail) の連続遷移は冪等に握り潰し、ユーザーコールバックは `safeInvokeCallback`
-* 経由で例外を隔離する
-*/
-var FlumeStatusEmitter = class {
-	props;
-	currentStatus = "disconnected";
-	currentDetail = null;
-	constructor(props) {
-		this.props = props;
-	}
-	get value() {
-		return this.currentStatus;
-	}
-	set(next, detail) {
-		const normalizedDetail = detail ?? null;
-		if (this.currentStatus === next && this.currentDetail === normalizedDetail) return;
-		const prev = this.currentStatus;
-		const suffix = detail ? ` (${detail})` : "";
-		this.props.log.info({
-			action: "status",
-			message: `${prev} → ${next}${suffix}`,
-			detail: {
-				from: prev,
-				to: next,
-				reason: normalizedDetail
-			}
-		});
-		this.currentStatus = next;
-		this.currentDetail = normalizedDetail;
-		const onStatus = this.props.onStatus;
-		if (!onStatus) return;
-		safeInvokeCallback({
-			fn: detail !== void 0 ? () => onStatus(next, detail) : () => onStatus(next),
-			onError: (error) => {
-				this.props.log.error({
-					action: "onStatus.error",
-					message: safeErrorMessage({ error }),
-					error
-				});
-			}
-		});
-	}
-};
-//#endregion
-//#region lib/utils/serial-queue.ts
-/**
-* 投入順を保ったまま task を直列実行する。各 task は前の完了を待ってから走る。
-* task が throw しても後続には伝播しない (キュー自体は止まらない)。
-* maxDepth を超えた場合は新規 task を drop し onOverflow に通知。
-* cancel() 後の add() は no-op となり drain() は即時 resolve する
-*/
-var FlumeSerialQueue = class {
-	props;
-	chain = Promise.resolve();
-	depth = 0;
-	cancelled = false;
-	constructor(props = {}) {
-		this.props = props;
-	}
-	add(task) {
-		if (this.cancelled) return;
-		if (this.props.maxDepth !== void 0 && this.depth >= this.props.maxDepth) {
-			this.props.onOverflow?.({
-				dropped: 1,
-				depth: this.depth
-			});
-			return;
-		}
-		this.depth++;
-		this.chain = this.chain.then(async () => {
-			try {
-				await task();
-			} catch {} finally {
-				this.depth--;
-			}
-		});
-	}
-	async drain() {
-		await this.chain;
-	}
-	cancel() {
-		this.cancelled = true;
-		this.depth = 0;
-		this.chain = Promise.resolve();
-	}
-	size() {
-		return this.depth;
-	}
-	isCancelled() {
-		return this.cancelled;
-	}
-};
-//#endregion
-export { safeJsonParse as i, FlumeStatusEmitter as n, FlumeSignalRegistry as r, FlumeSerialQueue as t };