@voltro/plugin-clickhouse 0.84.0 → 0.85.0

package/dist/index.js

@@ -1,17 +1,17 @@
 import { createClient as e } from "@clickhouse/client";
-import { Effect as t, Option as n } from "effect";
-import { createLogger as r } from "@voltro/logger";
-import { AnalyticsError as i } from "@voltro/runtime";
+import { Effect as t } from "effect";
+import { createLogger as n } from "@voltro/logger";
+import { AnalyticsError as r } from "@voltro/runtime";
 //#region src/sink.ts
-var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) => `voltro_mirror_${e}`, c = (e, t) => `
-  CREATE TABLE IF NOT EXISTS ${e}.${s(t)} (
+var i = n({ scope: "@voltro/plugin-clickhouse" }), a = "clickhouse", o = (e) => `voltro_mirror_${e}`, s = (e, t) => `
+  CREATE TABLE IF NOT EXISTS ${e}.${o(t)} (
     id          String,
     data        String CODEC(ZSTD(1)),
     version     UInt64,
     is_deleted  UInt8 DEFAULT 0
   ) ENGINE = ReplacingMergeTree(version)
   ORDER BY id
-`.trim(), l = (e, t) => `
+`.trim(), c = (e, t) => `
   CREATE TABLE IF NOT EXISTS ${e}.${t} (
     id          UUID DEFAULT generateUUIDv7(),
     name        LowCardinality(String),
@@ -22,57 +22,57 @@ var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) =>
     ingested_at DateTime64(3) DEFAULT now64()
   ) ENGINE = MergeTree
   ORDER BY (name, occurred_at, id)
-`.trim(), u = (e) => (t) => t instanceof i ? new i({
-	provider: o,
+`.trim(), l = (e) => (t) => t instanceof r ? new r({
+	provider: a,
 	operation: e,
 	cause: t.cause
-}) : new i({
-	provider: o,
+}) : new r({
+	provider: a,
 	operation: e,
 	cause: t instanceof Error ? `${t.name}: ${t.message}` : String(t)
-}), d = (e) => (r) => r.pipe(t.catchSomeDefect((e) => e instanceof i ? n.some(t.fail(e)) : n.none()), t.mapError(u(e))), f = /^[A-Za-z_][A-Za-z0-9_]*$/, p = (e, t) => {
-	if (!f.test(e)) throw new i({
-		provider: o,
+}), u = (e) => (n) => n.pipe(t.catchDefect((e) => e instanceof r ? t.fail(e) : t.die(e)), t.mapError(l(e))), d = /^[A-Za-z_][A-Za-z0-9_]*$/, f = (e, t) => {
+	if (!d.test(e)) throw new r({
+		provider: a,
 		operation: "config",
-		cause: `invalid ${t} ${JSON.stringify(e)} — must match ${f.source} (letters, digits, underscore; no dots/quotes/spaces)`
+		cause: `invalid ${t} ${JSON.stringify(e)} — must match ${d.source} (letters, digits, underscore; no dots/quotes/spaces)`
 	});
 	return e;
-}, m = /['\\]/, h = (e) => {
+}, p = /['\\]/, m = (e) => {
 	for (let t = 0; t < e.length; t++) if (e.charCodeAt(t) < 32) return !0;
 	return !1;
-}, g = (e) => (t) => {
-	if (m.test(t) || h(t)) throw new i({
-		provider: o,
+}, h = (e) => (t) => {
+	if (p.test(t) || m(t)) throw new r({
+		provider: a,
 		operation: e,
 		cause: `invalid property key ${JSON.stringify(t)} — must not contain quotes, backslashes, or control characters`
 	});
 	return t;
-}, _ = (e) => e.client === null ? t.fail(new i({
-	provider: o,
+}, g = (e) => e.client === null ? t.fail(new r({
+	provider: a,
 	operation: "ensureClient",
 	cause: "client not initialized — spec.initialize must run before queries"
-})) : t.succeed(e.client), v = (e) => t.gen(function* () {
+})) : t.succeed(e.client), _ = (e) => t.gen(function* () {
 	let n = e.client;
-	e.client = null, n !== null && (yield* t.tryPromise(() => n.close()).pipe(t.catchAll((e) => t.logWarning("clickhouse analytics sink teardown failed", {
-		provider: o,
+	e.client = null, n !== null && (yield* t.tryPromise(() => n.close()).pipe(t.catch((e) => t.logWarning("clickhouse analytics sink teardown failed", {
+		provider: a,
 		err: e
 	}))));
-}), y = (e) => ({
+}), v = (e) => ({
 	name: e.name,
 	subject_id: e.subjectId ?? null,
 	tenant_id: e.tenantId ?? null,
 	properties: JSON.stringify(e.properties),
 	occurred_at: (e.occurredAt ?? /* @__PURE__ */ new Date()).toISOString()
-}), b = (e, t) => {
-	let n = [], r, i = () => {
+}), y = (e, t) => {
+	let n = [], r, a = () => {
 		r !== void 0 && (clearTimeout(r), r = void 0);
 	}, o = async () => {
-		if (i(), n.length === 0) return;
+		if (a(), n.length === 0) return;
 		let t = n;
 		n = [];
 		let r = e.client;
 		if (r === null) {
-			a.warn("clickhouse batch flush skipped — client not initialized; events dropped", { dropped: t.length });
+			i.warn("clickhouse batch flush skipped — client not initialized; events dropped", { dropped: t.length });
 			return;
 		}
 		try {
@@ -82,12 +82,12 @@ var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) =>
 				format: "JSONEachRow"
 			});
 		} catch (e) {
-			a.warn("clickhouse batch flush failed — dropped events", { dropped: t.length }, e);
+			i.warn("clickhouse batch flush failed — dropped events", { dropped: t.length }, e);
 		}
 	};
 	return {
 		add: (e) => {
-			if (n.push(y(e)), n.length >= t.maxSize) {
+			if (n.push(v(e)), n.length >= t.maxSize) {
 				o();
 				return;
 			}
@@ -97,7 +97,7 @@ var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) =>
 		},
 		flush: o
 	};
-}, x = (e) => {
+}, b = (e) => {
 	switch (e) {
 		case "minute": return "toStartOfMinute";
 		case "hour": return "toStartOfHour";
@@ -105,7 +105,7 @@ var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) =>
 		case "week": return "toStartOfWeek";
 		case "month": return "toStartOfMonth";
 	}
-}, S = (e, t) => `JSONExtractString(properties, '${g(e)(t)}')`, C = (e, t) => `JSONExtractFloat(properties, '${g(e)(t)}')`, w = (e, t) => t === "count" ? "count()" : t === "unique" ? "uniqExact(subject_id)" : "sum" in t ? `sum(${C(e, t.sum)})` : `avg(${C(e, t.avg)})`, T = (e, t) => t === "count" ? "count()" : `sum(${C(e, t.sum)})`, E = (e, t, n, r, i) => {
+}, x = (e, t) => `JSONExtractString(properties, '${h(e)(t)}')`, S = (e, t) => `JSONExtractFloat(properties, '${h(e)(t)}')`, C = (e, t) => t === "count" ? "count()" : t === "unique" ? "uniqExact(subject_id)" : "sum" in t ? `sum(${S(e, t.sum)})` : `avg(${S(e, t.avg)})`, w = (e, t) => t === "count" ? "count()" : `sum(${S(e, t.sum)})`, T = (e, t, n, r, i) => {
 	let a = {
 		event: t,
 		from: n.from.toISOString(),
@@ -115,20 +115,20 @@ var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) =>
 		let t = 0;
 		for (let [n, i] of Object.entries(r)) {
 			let r = `f${t++}`;
-			a[r] = String(i), o += ` AND ${S(e, n)} = {${r}:String}`;
+			a[r] = String(i), o += ` AND ${x(e, n)} = {${r}:String}`;
 		}
 	}
 	return {
 		sql: o,
 		params: a
 	};
-}, D = (e) => {
+}, E = (e) => {
 	let n = (n, r) => t.gen(function* () {
-		p(n, "mirror table");
-		let i = yield* _(e);
+		f(n, "mirror table");
+		let i = yield* g(e);
 		yield* t.tryPromise({
 			try: () => i.insert({
-				table: `${e.database}.${s(n)}`,
+				table: `${e.database}.${o(n)}`,
 				values: [r],
 				format: "JSONEachRow"
 			}),
@@ -146,7 +146,7 @@ var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) =>
 				version: a,
 				is_deleted: 0
 			});
-		}).pipe(d("mirror.upsert")),
+		}).pipe(u("mirror.upsert")),
 		remove: ({ table: e, primaryKeyValue: r, version: i }) => t.gen(function* () {
 			yield* n(e, {
 				id: String(r),
@@ -154,27 +154,27 @@ var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) =>
 				version: i,
 				is_deleted: 1
 			});
-		}).pipe(d("mirror.remove")),
+		}).pipe(u("mirror.remove")),
 		maxVersion: ({ table: n, primaryKeyValue: r }) => t.gen(function* () {
-			p(String(n), "mirror table");
-			let i = yield* _(e), a = `SELECT max(version) AS v, count() AS n FROM ${e.database}.${s(String(n))} WHERE id = {id: String} FORMAT JSON`, o = yield* t.tryPromise({
+			f(String(n), "mirror table");
+			let i = yield* g(e), a = `SELECT max(version) AS v, count() AS n FROM ${e.database}.${o(String(n))} WHERE id = {id: String} FORMAT JSON`, s = yield* t.tryPromise({
 				try: () => i.query({
 					query: a,
 					query_params: { id: String(r) }
 				}),
 				catch: (e) => e
 			}), { data: c } = yield* t.tryPromise({
-				try: () => o.json(),
+				try: () => s.json(),
 				catch: (e) => e
 			}), l = c[0];
 			return l === void 0 || Number(l.n) === 0 || l.v === null ? null : Number(l.v);
-		}).pipe(d("mirror.maxVersion"))
+		}).pipe(u("mirror.maxVersion"))
 	};
-}, O = (e) => {
-	let n = e.mirrorTables.length > 0 ? D(e) : void 0;
+}, D = (e) => {
+	let n = e.mirrorTables.length > 0 ? E(e) : void 0;
 	return {
 		info: {
-			provider: o,
+			provider: a,
 			capabilities: {
 				track: !0,
 				aggregate: !0,
@@ -190,18 +190,18 @@ var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) =>
 			}
 		},
 		track: (n) => e.batcher ? t.sync(() => e.batcher.add(n)) : t.gen(function* () {
-			let r = yield* _(e);
+			let r = yield* g(e);
 			yield* t.tryPromise({
 				try: () => r.insert({
 					table: `${e.database}.${e.table}`,
-					values: [y(n)],
+					values: [v(n)],
 					format: "JSONEachRow"
 				}),
 				catch: (e) => e
 			});
-		}).pipe(d("track")),
+		}).pipe(u("track")),
 		aggregate: (n) => t.gen(function* () {
-			let r = yield* _(e), i = E("aggregate", n.event, n.range, n.filter, n.tenantId), a = `SELECT ${w("aggregate", n.metric)} AS value FROM ${e.database}.${e.table} WHERE ${i.sql} FORMAT JSON`, o = yield* t.tryPromise({
+			let r = yield* g(e), i = T("aggregate", n.event, n.range, n.filter, n.tenantId), a = `SELECT ${C("aggregate", n.metric)} AS value FROM ${e.database}.${e.table} WHERE ${i.sql} FORMAT JSON`, o = yield* t.tryPromise({
 				try: () => r.query({
 					query: a,
 					query_params: i.params
@@ -212,10 +212,10 @@ var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) =>
 				catch: (e) => e
 			}), c = s[0]?.value ?? 0;
 			return typeof c == "number" ? c : Number(c ?? 0);
-		}).pipe(d("aggregate")),
+		}).pipe(u("aggregate")),
 		timeseries: (n) => t.gen(function* () {
-			let r = yield* _(e), i = E("timeseries", n.event, n.range, n.filter, n.tenantId), a = `
-        SELECT ${`${x(n.bucket)}(occurred_at)`} AS bucket_start, ${w("timeseries", n.metric)} AS value
+			let r = yield* g(e), i = T("timeseries", n.event, n.range, n.filter, n.tenantId), a = `
+        SELECT ${`${b(n.bucket)}(occurred_at)`} AS bucket_start, ${C("timeseries", n.metric)} AS value
         FROM ${e.database}.${e.table}
         WHERE ${i.sql}
         GROUP BY bucket_start
@@ -235,10 +235,10 @@ var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) =>
 				bucketStart: new Date(e.bucket_start),
 				value: typeof e.value == "number" ? e.value : Number(e.value ?? 0)
 			}));
-		}).pipe(d("timeseries")),
+		}).pipe(u("timeseries")),
 		topN: (n) => t.gen(function* () {
-			let r = yield* _(e), i = E("topN", n.event, n.range, n.filter, n.tenantId), a = Math.max(1, Math.floor(n.n)), o = S("topN", n.groupBy), s = `
-        SELECT ${o} AS key, ${T("topN", n.metric)} AS value
+			let r = yield* g(e), i = T("topN", n.event, n.range, n.filter, n.tenantId), a = Math.max(1, Math.floor(n.n)), o = x("topN", n.groupBy), s = `
+        SELECT ${o} AS key, ${w("topN", n.metric)} AS value
         FROM ${e.database}.${e.table}
         WHERE ${i.sql}
         GROUP BY ${o}
@@ -259,27 +259,27 @@ var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) =>
 				key: e.key,
 				value: typeof e.value == "number" ? e.value : Number(e.value ?? 0)
 			}));
-		}).pipe(d("topN")),
+		}).pipe(u("topN")),
 		...n === void 0 ? {} : { mirror: n }
 	};
-}, k = 20, A = 5e3, j = (n) => {
-	let r = (n.mirrorTables ?? []).map((e) => p(e, "mirror table")), i = {
+}, O = 20, k = 5e3, A = (n) => {
+	let r = (n.mirrorTables ?? []).map((e) => f(e, "mirror table")), i = {
 		client: null,
-		database: p(n.database ?? "default", "database"),
-		table: p(n.table ?? "events", "table"),
+		database: f(n.database ?? "default", "database"),
+		table: f(n.table ?? "events", "table"),
 		mirrorTables: r,
 		mirrorPrimaryKey: n.mirrorPrimaryKey ?? "id"
 	};
 	if (n.batch !== !1) {
 		let e = n.batch ?? {};
-		i.batcher = b(i, {
-			maxSize: e.maxSize ?? k,
-			flushIntervalMs: e.flushIntervalMs ?? A
+		i.batcher = y(i, {
+			maxSize: e.maxSize ?? O,
+			flushIntervalMs: e.flushIntervalMs ?? k
 		});
 	}
 	return {
 		kind: "clickhouse",
-		build: (e) => O(i),
+		build: (e) => D(i),
 		initialize: () => t.gen(function* () {
 			let r = yield* t.promise(() => Promise.resolve(e({
 				url: n.url,
@@ -287,14 +287,14 @@ var a = r({ scope: "@voltro/plugin-clickhouse" }), o = "clickhouse", s = (e) =>
 				...n.username === void 0 ? {} : { username: n.username },
 				...n.password === void 0 ? {} : { password: n.password }
 			})));
-			yield* t.promise(() => r.ping()), yield* t.promise(() => r.command({ query: l(i.database, i.table) }));
-			for (let e of i.mirrorTables) yield* t.promise(() => r.command({ query: c(i.database, e) }));
+			yield* t.promise(() => r.ping()), yield* t.promise(() => r.command({ query: c(i.database, i.table) }));
+			for (let e of i.mirrorTables) yield* t.promise(() => r.command({ query: s(i.database, e) }));
 			i.client = r;
 		}),
 		dispose: () => t.gen(function* () {
-			i.batcher && (yield* t.promise(() => i.batcher.flush())), yield* v(i);
+			i.batcher && (yield* t.promise(() => i.batcher.flush())), yield* _(i);
 		})
 	};
 };
 //#endregion
-export { l as EVENTS_TABLE_DDL, c as MIRROR_TABLE_DDL, j as clickhouseAnalytics };
+export { c as EVENTS_TABLE_DDL, s as MIRROR_TABLE_DDL, A as clickhouseAnalytics };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/plugin-clickhouse",
-  "version": "0.84.0",
+  "version": "0.85.0",
   "description": "ClickHouse AnalyticsSink. Native HTTP ingest into a ClickHouse cluster — self-hosted OR ClickHouse Cloud. Production-grade OLAP for high-cardinality events with millisecond aggregate queries over billions of rows.",
   "keywords": [
     "voltro",
@@ -34,11 +34,11 @@
   },
   "dependencies": {
     "@clickhouse/client": "^1.23.1",
-    "@voltro/logger": "0.84.0",
-    "@voltro/runtime": "0.84.0"
+    "@voltro/logger": "0.85.0",
+    "@voltro/runtime": "0.85.0"
   },
   "peerDependencies": {
-    "effect": "^3.22.2"
+    "effect": "4.0.1"
   },
   "publishConfig": {
     "access": "public"