@fjall/clickhouse 2.34.0 → 3.0.0

package/dist/.minified

@@ -1 +1 @@
-10 files minified at 2026-07-17T22:47:15.434Z
+10 files minified at 2026-07-18T01:56:03.828Z

package/dist/connectWithRetry.js

@@ -1 +1 @@
-import{getErrorMessage as g,maskSensitiveOutput as d}from"@fjall/util";import{sleepAbortable as y}from"./sleepAbortable.js";const h=[5e3,1e4,2e4,4e4,6e4],p=3,m=516,A=["ECONNREFUSED","ETIMEDOUT","ENOTFOUND"];async function u(f,c){const{label:n,signal:a,logger:i}=c,e=c.delays??h;let s;for(let t=0;t<e.length;t++){if(a?.aborted)throw new Error(`connectWithRetry: ${n} aborted by signal before attempt ${t+1}`);try{await f.ping(),t>0&&i?.info("connect succeeded after retry",{label:n,attempt:t+1});return}catch(r){s=r;const o=typeof r=="object"&&r!==null&&"code"in r?r.code:void 0,l=o===m,E=typeof o=="string"&&A.includes(o);if(!(E||l&&t<p))throw r;const b=l?"AUTH_FAILED":E?o:"UNKNOWN";i?.warn("connect attempt failed; retrying",{label:d(n),attempt:t+1,attempts:e.length,delayMs:e[t],code:b}),await y(e[t],a)}}if(a?.aborted)throw new Error(`connectWithRetry: ${n} aborted by signal after ${e.length} attempts`);const _=d(g(s));throw new Error(`connectWithRetry: ${n} failed after ${e.length} attempts: ${_}`)}export{u as connectWithRetry};
+var y=Object.defineProperty;var f=(c,o)=>y(c,"name",{value:o,configurable:!0});import{getErrorMessage as h,maskSensitiveOutput as _}from"@fjall/util";import{sleepAbortable as p}from"./sleepAbortable.js";const m=[5e3,1e4,2e4,4e4,6e4],A=3,w=516,D=["ECONNREFUSED","ETIMEDOUT","ENOTFOUND"];async function O(c,o){const{label:n,signal:i,logger:s}=o,e=o.delays??m;let l;for(let t=0;t<e.length;t++){if(i?.aborted)throw new Error(`connectWithRetry: ${n} aborted by signal before attempt ${t+1}`);try{await c.ping(),t>0&&s?.info("connect succeeded after retry",{label:n,attempt:t+1});return}catch(r){l=r;const a=typeof r=="object"&&r!==null&&"code"in r?r.code:void 0,E=a===w,d=typeof a=="string"&&D.includes(a);if(!(d||E&&t<A))throw r;const g=E?"AUTH_FAILED":d?a:"UNKNOWN";s?.warn("connect attempt failed; retrying",{label:_(n),attempt:t+1,attempts:e.length,delayMs:e[t],code:g}),await p(e[t],i)}}if(i?.aborted)throw new Error(`connectWithRetry: ${n} aborted by signal after ${e.length} attempts`);const b=_(h(l));throw new Error(`connectWithRetry: ${n} failed after ${e.length} attempts: ${b}`)}f(O,"connectWithRetry");export{O as connectWithRetry};

package/dist/createClient.js

@@ -1 +1 @@
-import{createClient as d}from"@clickhouse/client";function c(e={}){const n=process.env.CLICKHOUSE_URL,i=e.url!==void 0&&e.url!==""?e.url:n!==void 0&&n!==""?n:void 0;if(i===void 0)throw new Error("createFjallClickHouseClient: CLICKHOUSE_URL must be set (env or opts.url)");const r=process.env.CLICKHOUSE_CA_CERT,u=e.caCert!==void 0&&e.caCert!==""?e.caCert:r!==void 0&&r!==""?r:void 0;return d({url:i,...e.username!==void 0&&{username:e.username},...e.password!==void 0&&{password:e.password},...e.database!==void 0&&{database:e.database},...e.clickhouse_settings!==void 0&&{clickhouse_settings:e.clickhouse_settings},...e.compression!==void 0&&{compression:e.compression},...e.request_timeout!==void 0&&{request_timeout:e.request_timeout},...e.max_open_connections!==void 0&&{max_open_connections:e.max_open_connections},...e.keep_alive!==void 0&&{keep_alive:e.keep_alive},...u!==void 0&&{tls:{ca_cert:Buffer.from(u,"utf8")}}})}export{c as createFjallClickHouseClient};
+var a=Object.defineProperty;var d=(e,n)=>a(e,"name",{value:n,configurable:!0});import{createClient as c}from"@clickhouse/client";function l(e={}){const n=process.env.CLICKHOUSE_URL,i=e.url!==void 0&&e.url!==""?e.url:n!==void 0&&n!==""?n:void 0;if(i===void 0)throw new Error("createFjallClickHouseClient: CLICKHOUSE_URL must be set (env or opts.url)");const r=process.env.CLICKHOUSE_CA_CERT,u=e.caCert!==void 0&&e.caCert!==""?e.caCert:r!==void 0&&r!==""?r:void 0;return c({url:i,...e.username!==void 0&&{username:e.username},...e.password!==void 0&&{password:e.password},...e.database!==void 0&&{database:e.database},...e.clickhouse_settings!==void 0&&{clickhouse_settings:e.clickhouse_settings},...e.compression!==void 0&&{compression:e.compression},...e.request_timeout!==void 0&&{request_timeout:e.request_timeout},...e.max_open_connections!==void 0&&{max_open_connections:e.max_open_connections},...e.keep_alive!==void 0&&{keep_alive:e.keep_alive},...u!==void 0&&{tls:{ca_cert:Buffer.from(u,"utf8")}}})}d(l,"createFjallClickHouseClient");export{l as createFjallClickHouseClient};

package/dist/logger.js

@@ -1,3 +1,3 @@
-function r(n){return{info(t,e){process.stdout.write(JSON.stringify({level:"info",namespace:n,msg:t,ctx:e??{},ts:new Date().toISOString()})+`
-`)},warn(t,e){process.stdout.write(JSON.stringify({level:"warn",namespace:n,msg:t,ctx:e??{},ts:new Date().toISOString()})+`
-`)}}}export{r as createConsoleMigrationLogger};
+var o=Object.defineProperty;var r=(e,t)=>o(e,"name",{value:t,configurable:!0});function s(e){return{info(t,n){process.stdout.write(JSON.stringify({level:"info",namespace:e,msg:t,ctx:n??{},ts:new Date().toISOString()})+`
+`)},warn(t,n){process.stdout.write(JSON.stringify({level:"warn",namespace:e,msg:t,ctx:n??{},ts:new Date().toISOString()})+`
+`)}}}r(s,"createConsoleMigrationLogger");export{s as createConsoleMigrationLogger};

package/dist/provisionUsers.js

@@ -1 +1 @@
-import{getErrorMessage as w,maskSensitiveOutput as g}from"@fjall/util";import{CLICKHOUSE_MANAGED_USERS_ENV as i,userPasswordEnvName as S}from"./constants.js";import{ManagedUserNamesSchema as h}from"./schemas.js";function I(r){return r.replace(/\\/g,"\\\\").replace(/'/g,"''")}async function F(r){const{client:t,signal:v,logger:s}=r,m=r.env??process.env,o=m[i];if(o===void 0||o==="")return s?.info("no managed users to provision (manifest env absent)",{}),{provisioned:[]};let c;try{c=JSON.parse(o)}catch(e){throw new Error(`provisionUsersFromEnv: malformed ${i} \u2014 JSON parse failed: ${g(w(e))}`)}const n=h.safeParse(c);if(!n.success)throw new Error(`provisionUsersFromEnv: malformed ${i} \u2014 ${n.error.message}`);const p=n.data;if(p.length===0)return s?.info("no managed users to provision (manifest empty)",{}),{provisioned:[]};const d=[];for(const e of p){if(v?.aborted)throw new Error(`provisionUsersFromEnv: aborted by signal before user '${e}'`);const f=S(e),a=m[f];if(a===void 0||a==="")throw new Error(`provisionUsersFromEnv: required env ${f} is missing or empty`);const E=I(a),u=`CREATE USER IF NOT EXISTS ${e} IDENTIFIED WITH sha256_password BY '${E}'`,l=`ALTER USER ${e} IDENTIFIED WITH sha256_password BY '${E}'`;await t.command({query:u}),await t.command({query:l}),s?.info("clickhouse user provisioned",{name:e}),d.push(e)}return{provisioned:d}}export{F as provisionUsersFromEnv};
+var g=Object.defineProperty;var t=(r,s)=>g(r,"name",{value:s,configurable:!0});import{getErrorMessage as S,maskSensitiveOutput as h}from"@fjall/util";import{CLICKHOUSE_MANAGED_USERS_ENV as m,userPasswordEnvName as I}from"./constants.js";import{ManagedUserNamesSchema as N}from"./schemas.js";function U(r){return r.replace(/\\/g,"\\\\").replace(/'/g,"''")}t(U,"escapeSqlLiteral");async function R(r){const{client:s,signal:u,logger:o}=r,c=r.env??process.env,n=c[m];if(n===void 0||n==="")return o?.info("no managed users to provision (manifest env absent)",{}),{provisioned:[]};let p;try{p=JSON.parse(n)}catch(e){throw new Error(`provisionUsersFromEnv: malformed ${m} \u2014 JSON parse failed: ${h(S(e))}`)}const a=N.safeParse(p);if(!a.success)throw new Error(`provisionUsersFromEnv: malformed ${m} \u2014 ${a.error.message}`);const d=a.data;if(d.length===0)return o?.info("no managed users to provision (manifest empty)",{}),{provisioned:[]};const f=[];for(const e of d){if(u?.aborted)throw new Error(`provisionUsersFromEnv: aborted by signal before user '${e}'`);const E=I(e),i=c[E];if(i===void 0||i==="")throw new Error(`provisionUsersFromEnv: required env ${E} is missing or empty`);const v=U(i),l=`CREATE USER IF NOT EXISTS ${e} IDENTIFIED WITH sha256_password BY '${v}'`,w=`ALTER USER ${e} IDENTIFIED WITH sha256_password BY '${v}'`;await s.command({query:l}),await s.command({query:w}),o?.info("clickhouse user provisioned",{name:e}),f.push(e)}return{provisioned:f}}t(R,"provisionUsersFromEnv");export{R as provisionUsersFromEnv};

package/dist/runSqlMigrations.js

@@ -1,2 +1,2 @@
-import{readFileSync as S,readdirSync as E}from"node:fs";import{join as w}from"node:path";import{getErrorMessage as q,maskSensitiveOutput as M}from"@fjall/util";import{CLICKHOUSE_MIGRATION_SKIP_RE as y}from"@fjall/util/migration";const R=y,l=400;function b(e){return e.split(`
-`).some(r=>{const n=r.trim();return n.length>0&&!n.startsWith("--")})}function _(e){return e.split(/;\s*\n/).map(r=>r.trim()).filter(r=>r.length>0&&b(r))}async function P(e){const{client:r,dir:n,signal:s,logger:c}=e,m=e.skipFilesMatching??R,f=E(n).filter(t=>t.endsWith(".sql")).filter(t=>!m.test(t)).sort(),a=[];for(const t of f){if(s?.aborted)throw new Error(`runSqlMigrations: aborted by signal before applying '${t}'`);const p=w(n,t),g=S(p,"utf8"),u=_(g);try{for(const o of u){if(s?.aborted)throw new Error(`runSqlMigrations: aborted by signal while applying '${t}'`);await r.command({query:o})}}catch(o){const d=q(o).replace(/'(?:[^']|'')*'/g,"'<REDACTED>'"),i=M(d),h=i.length>l?i.slice(0,l)+"\u2026":i;throw new Error(`runSqlMigrations: ${t}: ${h}`,{cause:o})}c?.info("sql migration applied",{file:t}),a.push(t)}return{applied:a}}export{b as hasSqlContent,P as runSqlMigrations};
+var E=Object.defineProperty;var i=(e,t)=>E(e,"name",{value:t,configurable:!0});import{readFileSync as w,readdirSync as q}from"node:fs";import{join as M}from"node:path";import{getErrorMessage as y,maskSensitiveOutput as R}from"@fjall/util";import{CLICKHOUSE_MIGRATION_SKIP_RE as b}from"@fjall/util/migration";const _=b,c=400;function C(e){return e.split(`
+`).some(t=>{const n=t.trim();return n.length>0&&!n.startsWith("--")})}i(C,"hasSqlContent");function A(e){return e.split(/;\s*\n/).map(t=>t.trim()).filter(t=>t.length>0&&C(t))}i(A,"splitSqlStatements");async function D(e){const{client:t,dir:n,signal:a,logger:m}=e,f=e.skipFilesMatching??_,p=q(n).filter(r=>r.endsWith(".sql")).filter(r=>!f.test(r)).sort(),l=[];for(const r of p){if(a?.aborted)throw new Error(`runSqlMigrations: aborted by signal before applying '${r}'`);const g=M(n,r),u=w(g,"utf8"),d=A(u);try{for(const o of d){if(a?.aborted)throw new Error(`runSqlMigrations: aborted by signal while applying '${r}'`);await t.command({query:o})}}catch(o){const h=y(o).replace(/'(?:[^']|'')*'/g,"'<REDACTED>'"),s=R(h),S=s.length>c?s.slice(0,c)+"\u2026":s;throw new Error(`runSqlMigrations: ${r}: ${S}`,{cause:o})}m?.info("sql migration applied",{file:r}),l.push(r)}return{applied:l}}i(D,"runSqlMigrations");export{C as hasSqlContent,D as runSqlMigrations};

package/dist/sleepAbortable.js

@@ -1 +1 @@
-function b(o,e){return e?.aborted?Promise.resolve():new Promise(r=>{const t=()=>{clearTimeout(n),e?.removeEventListener("abort",t),r()},n=setTimeout(()=>{e?.removeEventListener("abort",t),r()},o);e?.addEventListener("abort",t,{once:!0})})}export{b as sleepAbortable};
+var i=Object.defineProperty;var o=(t,e)=>i(t,"name",{value:e,configurable:!0});function s(t,e){return e?.aborted?Promise.resolve():new Promise(n=>{const r=o(()=>{clearTimeout(b),e?.removeEventListener("abort",r),n()},"onAbort"),b=setTimeout(()=>{e?.removeEventListener("abort",r),n()},t);e?.addEventListener("abort",r,{once:!0})})}o(s,"sleepAbortable");export{s as sleepAbortable};

package/dist/verifyExpectedClickHouseSchemaVersion.js

@@ -1 +1 @@
-import{isSchemaVersionSatisfied as l}from"@fjall/util/migration";const s=/^[A-Za-z_][A-Za-z0-9_]*$/,n=["version","ch_version","prisma_version"],u="analytics",E="_schema_migrations",f="ch_version";async function S(e){if(e.signal?.aborted)throw new Error("verifyExpectedClickHouseSchemaVersion: aborted by signal before query");const t=e.database??u,r=e.table??E,a=e.field??f;if(!s.test(t))throw new Error(`verifyExpectedClickHouseSchemaVersion: unsafe database identifier '${t}'`);if(!s.test(r))throw new Error(`verifyExpectedClickHouseSchemaVersion: unsafe table identifier '${r}'`);if(!n.includes(a))throw new Error(`verifyExpectedClickHouseSchemaVersion: field must be one of ${n.join("|")} (got '${a}')`);const o=(await(await e.client.query({query:`SELECT ${a} AS value FROM ${t}.${r} ORDER BY applied_at DESC LIMIT 1`,format:"JSONEachRow"})).json())[0]?.value,i=typeof o=="string"?o:null,c={matches:i!==null&&l(e.expected,i),expected:e.expected,actual:i};return e.logger?.info("ClickHouse schema-version check complete",{matches:c.matches,expected:c.expected,actual:c.actual,database:t,table:r,field:a}),c}export{S as verifyExpectedClickHouseSchemaVersion};
+var u=Object.defineProperty;var s=(e,t)=>u(e,"name",{value:t,configurable:!0});import{isSchemaVersionSatisfied as E}from"@fjall/util/migration";const n=/^[A-Za-z_][A-Za-z0-9_]*$/,l=["version","ch_version","prisma_version"],f="analytics",d="_schema_migrations",h="ch_version";async function A(e){if(e.signal?.aborted)throw new Error("verifyExpectedClickHouseSchemaVersion: aborted by signal before query");const t=e.database??f,r=e.table??d,a=e.field??h;if(!n.test(t))throw new Error(`verifyExpectedClickHouseSchemaVersion: unsafe database identifier '${t}'`);if(!n.test(r))throw new Error(`verifyExpectedClickHouseSchemaVersion: unsafe table identifier '${r}'`);if(!l.includes(a))throw new Error(`verifyExpectedClickHouseSchemaVersion: field must be one of ${l.join("|")} (got '${a}')`);const o=(await(await e.client.query({query:`SELECT ${a} AS value FROM ${t}.${r} ORDER BY applied_at DESC LIMIT 1`,format:"JSONEachRow"})).json())[0]?.value,i=typeof o=="string"?o:null,c={matches:i!==null&&E(e.expected,i),expected:e.expected,actual:i};return e.logger?.info("ClickHouse schema-version check complete",{matches:c.matches,expected:c.expected,actual:c.actual,database:t,table:r,field:a}),c}s(A,"verifyExpectedClickHouseSchemaVersion");export{A as verifyExpectedClickHouseSchemaVersion};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fjall/clickhouse",
-  "version": "2.34.0",
+  "version": "3.0.0",
   "description": "Runtime helpers for ClickHouse migration containers — user provisioning, SQL file application, connection retry. Consumes the manifest contract published by @fjall/components-infrastructure ClickHouseDatabase.",
   "type": "module",
   "main": "dist/index.js",
@@ -45,11 +45,11 @@
     "@clickhouse/client": "^1.18.0"
   },
   "dependencies": {
-    "@fjall/util": "^2.34.0",
+    "@fjall/util": "^3.0.0",
     "zod": "^4.4.3"
   },
   "engines": {
     "node": ">=22.0.0"
   },
-  "gitHead": "8c553fca8f9737d445061ea75cf6c6c7db0d24c9"
+  "gitHead": "848a386e3e2244401b76faabd02818c682d231e8"
 }