@gscdump/cloudflare 0.25.10 → 0.25.12

package/dist/server-tail/index.d.mts

@@ -86,8 +86,8 @@ declare function createDuckDbIcebergExecutor(config: DuckDbIcebergExecutorConfig
 interface R2SqlClientConfig {
   /** Cloudflare account id. */
   accountId: string;
-  /** R2 Data Catalog warehouse name (`<bucket>` or `<account>_<bucket>`). */
-  warehouse: string;
+  /** R2 bucket backing the Iceberg catalog — R2 SQL addresses the catalog by bucket. */
+  bucket: string;
   /** Iceberg namespace the 5 fact tables live in. */
   namespace: string;
   /** Cloudflare API token with R2 Data Catalog read scope. */

package/dist/server-tail/index.mjs

@@ -14,14 +14,6 @@ function metricExpr(metric) {
 		case "position": return "SUM(sum_position) / NULLIF(SUM(impressions), 0) AS position";
 	}
 }
-function orderMetricExpr(metric) {
-	switch (metric) {
-		case "clicks": return "SUM(clicks)";
-		case "impressions": return "SUM(impressions)";
-		case "ctr": return "SUM(clicks) / NULLIF(SUM(impressions), 0)";
-		case "position": return "SUM(sum_position) / NULLIF(SUM(impressions), 0)";
-	}
-}
 const DEVICE_SUFFIXES = [
 	"desktop",
 	"mobile",
@@ -138,8 +130,8 @@ function buildTopNBreakdown(q) {
 		};
 	}
 	const col = dimColumn(q.dimension);
-	const metrics = q.metrics.map(metricExpr).join(", ");
-	const order = `${orderMetricExpr(q.orderBy.metric)} ${q.orderBy.dir.toUpperCase()}`;
+	const metrics = (q.metrics.includes(q.orderBy.metric) ? q.metrics : [...q.metrics, q.orderBy.metric]).map(metricExpr).join(", ");
+	const order = `${q.orderBy.metric} ${q.orderBy.dir.toUpperCase()}`;
 	const facet = facetPredicate(q);
 	let sql = `SELECT ${col}, ${metrics} FROM ${TABLE_PLACEHOLDER} WHERE ${w.clause}${facet.sql} GROUP BY ${col} ORDER BY ${order} LIMIT ${Math.max(0, Math.floor(q.limit))}`;
 	if (q.offset && q.offset > 0) sql += ` OFFSET ${Math.floor(q.offset)}`;
@@ -203,8 +195,8 @@ function buildTwoDimensionDetail(q) {
 	const facet = facetPredicate(q);
 	clause += facet.sql;
 	params.push(...facet.params);
-	let sql = `SELECT url, query, ${q.metrics.map(metricExpr).join(", ")} FROM ${TABLE_PLACEHOLDER} WHERE ${clause} GROUP BY url, query`;
-	if (q.orderBy) sql += ` ORDER BY ${orderMetricExpr(q.orderBy.metric)} ${q.orderBy.dir.toUpperCase()}`;
+	let sql = `SELECT url, query, ${(q.orderBy && !q.metrics.includes(q.orderBy.metric) ? [...q.metrics, q.orderBy.metric] : q.metrics).map(metricExpr).join(", ")} FROM ${TABLE_PLACEHOLDER} WHERE ${clause} GROUP BY url, query`;
+	if (q.orderBy) sql += ` ORDER BY ${q.orderBy.metric} ${q.orderBy.dir.toUpperCase()}`;
 	if (q.limit && q.limit > 0) sql += ` LIMIT ${Math.floor(q.limit)}`;
 	return {
 		table: "page_queries",
@@ -349,8 +341,12 @@ var R2SqlTimeoutError = class extends Error {
 		super(`R2 SQL query exceeded ${timeoutMs}ms deadline`);
 	}
 };
-const DEFAULT_API_BASE = "https://api.cloudflare.com/client/v4";
+const DEFAULT_API_BASE = "https://api.sql.cloudflarestorage.com/api/v1";
 const DEFAULT_TIMEOUT_MS = 25e3;
+const PARTITION_PREDICATE_RE = /\b(site_id|search_type)(\s*=)/g;
+function workaroundPartitionEquality(sql) {
+	return sql.replace(PARTITION_PREDICATE_RE, (_m, col, eq) => `CONCAT(${col}, '')${eq}`);
+}
 function escapeSqlValue(value) {
 	if (value === null || value === void 0) return "NULL";
 	if (typeof value === "number") {
@@ -406,7 +402,7 @@ function createR2SqlClient(config) {
 	const fetchImpl = config.fetchImpl ?? globalThis.fetch;
 	const apiBase = config.apiBase ?? DEFAULT_API_BASE;
 	const timeoutMs = config.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-	const endpoint = `${apiBase}/accounts/${config.accountId}/r2-catalog/${config.warehouse}/sql`;
+	const endpoint = `${apiBase}/accounts/${config.accountId}/r2-sql/query/${config.bucket}`;
 	async function query(sql) {
 		const started = Date.now();
 		const controller = new AbortController();
@@ -417,7 +413,8 @@ function createR2SqlClient(config) {
 				method: "POST",
 				headers: {
 					"authorization": `Bearer ${config.token}`,
-					"content-type": "application/json"
+					"content-type": "application/json",
+					"user-agent": "gscdump-cloudflare-r2sql/1.0"
 				},
 				body: JSON.stringify({ query: sql }),
 				signal: controller.signal
@@ -442,7 +439,7 @@ function createR2SqlClient(config) {
 	}
 	function runPlan(plan) {
 		const tableRef = r2TableRef(config.namespace, plan.table);
-		return query(inlineParams(plan.sql.split(TABLE_PLACEHOLDER).join(tableRef), plan.params));
+		return query(workaroundPartitionEquality(inlineParams(plan.sql.split(TABLE_PLACEHOLDER).join(tableRef), plan.params)));
 	}
 	function runArchetype(archetypeQuery) {
 		return runPlan(buildArchetypeSql(archetypeQuery));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/cloudflare",
   "type": "module",
-  "version": "0.25.10",
+  "version": "0.25.12",
   "description": "Cloudflare-Workers-flavored helpers for the gscdump analytics stack: AnalyticsEnv binding contract, R2 SigV4 presigner, size-hint HMAC, DuckDB Workers shims, engine factory.",
   "author": {
     "name": "Harlan Wilton",
@@ -46,11 +46,11 @@
   "dependencies": {
     "@uwdata/flechette": "^2.5.0",
     "aws4fetch": "^1.0.20",
-    "@gscdump/contracts": "0.25.10",
-    "@gscdump/engine-sqlite": "0.25.10",
-    "@gscdump/sdk": "0.25.10",
-    "gscdump": "0.25.10",
-    "@gscdump/engine": "0.25.10"
+    "@gscdump/engine": "0.25.12",
+    "@gscdump/engine-sqlite": "0.25.12",
+    "@gscdump/sdk": "0.25.12",
+    "@gscdump/contracts": "0.25.12",
+    "gscdump": "0.25.12"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.16.10",