@supalive/core 1.16.0 → 1.18.0

package/dist/src/client/index.js

@@ -3,7 +3,7 @@ import { r as supaliveStringify } from "../../helper-zdJT5FUc.js";
 import { o as matchesPredicate } from "../../query-LJranz0c.js";
 import { n as defineSchema, t as defineComputedField } from "../../schema-DRtz5h5l.js";
 import { C as normalizeIdToBytes, S as bytesFromJson, _ as RawRangeReadSchema, a as DEFAULT_RETRY, b as WriteEntrySchema, c as OccAbortError, d as PointReadSchema, f as PredicateSchema, g as RawPointReadSchema, h as RangeReadSchema, i as CompareOperatorSchema, l as OccConflictError, m as QueryCacheMetadataSchema, n as BigIntSchema, o as LeafPredicateSchema, p as QueryCacheEntrySchema, r as CachedPgMetadataSchema, s as NO_RETRY, t as AndPredicateSchema, u as OrPredicateSchema, v as RawReadEntrySchema, w as normalizeToBytes, x as WriteOpSchema, y as ReadEntrySchema } from "../../types_db-OUou3o2Z.js";
-import { l as ServerMessageSchema } from "../../types_client_rpc-CWZmlWmM.js";
+import { l as ServerMessageSchema } from "../../types_client_rpc-B8jh6MKl.js";
 import { a as TxContext, i as DbWriter, n as sleep, r as DbReader, t as SupaliveDb } from "../../realtime_db-B0Tin87E.js";
 import { n as resolveReadRouting, t as makeConnRouting } from "../../read-routing-BUcQAwnd.js";
 import { sha1 } from "hash-wasm";
@@ -1172,7 +1172,7 @@ var LiveQueryHandleImpl = class {
 * `useReplicaConn()` resolves to the replica whenever one is configured. With no
 * replica configured every branch resolves to the primary.
 */
-async function runRoutedCallerQuery(db, serverCtx, fn) {
+async function runRoutedCallerQuery(db, serverCtx, fn, log) {
 	const routing = await resolveReadRouting(db, await db.impl.getLatestSnapshotTimestamp(), 0n);
 	return (await db.queryInternalOn({
 		impl: routing.primaryImpl,
@@ -1181,6 +1181,7 @@ async function runRoutedCallerQuery(db, serverCtx, fn) {
 		return fn({
 			db: dbCtx,
 			serverCtx,
+			log,
 			...makeConnRouting(dbCtx, routing)
 		});
 	})).data;
@@ -1198,13 +1199,19 @@ function createCaller(options) {
 	let db;
 	let storage;
 	let scheduler;
+	let obs;
 	return new Proxy({}, { get(_target, procedureName) {
 		if (typeof procedureName !== "string") return;
 		if (procedureName == "init") return async (config) => {
 			db = config.db;
 			storage = config.storage;
 			scheduler = config.scheduler;
+			obs = config.obs;
 		};
+		const callerLog = () => obs.lazyChildLogger({
+			caller: "internal",
+			procedure: procedureName
+		});
 		const procedure = registry.getProcedure(procedureName);
 		if (!procedure) throw new Error(`Procedure "${procedureName}" not found`);
 		if (registry.isInternalProcedure(procedureName) && !isInternal) throw new Error(`Procedure "${procedureName}" is internal only`);
@@ -1218,7 +1225,7 @@ function createCaller(options) {
 			query: async (input, serverCtx) => {
 				if (procedure.type !== "query") throw new Error(`Procedure "${procedureName}" is not a query`);
 				const validatedInput = validateInput(input);
-				return runRoutedCallerQuery(db, serverCtx, (ctx) => procedure.fn(ctx, validatedInput));
+				return runRoutedCallerQuery(db, serverCtx, (ctx) => procedure.fn(ctx, validatedInput), callerLog());
 			},
 			runQuery: async (input, parentCtx) => {
 				if (procedure.type !== "query") throw new Error(`Procedure "${procedureName}" is not a query`);
@@ -1227,11 +1234,12 @@ function createCaller(options) {
 					const ctx = {
 						db: parentCtx.db,
 						serverCtx: parentCtx.serverCtx,
+						log: parentCtx.log,
 						...parentConn
 					};
 					return procedure.fn(ctx, validatedInput);
 				}
-				return runRoutedCallerQuery(parentCtx.db, parentCtx.serverCtx, (ctx) => procedure.fn(ctx, validatedInput));
+				return runRoutedCallerQuery(parentCtx.db, parentCtx.serverCtx, (ctx) => procedure.fn(ctx, validatedInput), parentCtx.log);
 			},
 			mutate: async (input, serverCtx) => {
 				if (procedure.type !== "mutation") throw new Error(`Procedure "${procedureName}" is not a mutation`);
@@ -1240,6 +1248,7 @@ function createCaller(options) {
 					const ctx = {
 						db: dbCtx,
 						serverCtx,
+						log: callerLog(),
 						...primaryOnlyConn
 					};
 					return procedure.fn(ctx, validatedInput);
@@ -1252,6 +1261,7 @@ function createCaller(options) {
 					const ctx = {
 						db: dbCtx,
 						serverCtx: parentCtx.serverCtx,
+						log: parentCtx.log,
 						...primaryOnlyConn
 					};
 					if (parentCtx.db instanceof TxContext) ctx.db.appendInternalReadSet(parentCtx.db.internalGetReadSet());
@@ -1264,6 +1274,7 @@ function createCaller(options) {
 				const ctx = {
 					db,
 					serverCtx,
+					log: callerLog(),
 					storage,
 					scheduler
 				};
@@ -1274,7 +1285,8 @@ function createCaller(options) {
 				const validatedInput = validateInput(input);
 				const ctx = {
 					db,
-					serverCtx
+					serverCtx,
+					log: callerLog()
 				};
 				return procedure.fn(ctx, validatedInput);
 			},
@@ -1284,6 +1296,7 @@ function createCaller(options) {
 					const ctx = {
 						db: dbCtx,
 						serverCtx,
+						log: callerLog(),
 						...primaryOnlyConn
 					};
 					return procedure.fn(ctx, validatedInput);