@oxy-hq/sdk 2.11.0 → 2.13.0

package/dist/{react-DqnINwTi.mjs → react-Cq3xULOr.mjs}

@@ -364,10 +364,25 @@ function validateFunctions(raw) {
 			}
 			fn.retries = retries;
 		}
+		if (value.webhook !== void 0) {
+			const w = value.webhook;
+			if (!isRecord(w)) throw new Error(`oxy-app.json: function "${fnName}" \`webhook\` must be an object`);
+			for (const key of ["secretVar", "signatureHeader"]) if (typeof w[key] !== "string" || !w[key].trim()) throw new Error(`oxy-app.json: function "${fnName}" \`webhook.${key}\` must be a non-empty string`);
+			const webhook = {
+				secretVar: w.secretVar,
+				signatureHeader: w.signatureHeader
+			};
+			if (w.encoding !== void 0) {
+				if (w.encoding !== "hex" && w.encoding !== "base64") throw new Error(`oxy-app.json: function "${fnName}" \`webhook.encoding\` must be "hex" or "base64"`);
+				webhook.encoding = w.encoding;
+			}
+			fn.webhook = webhook;
+		}
 		if (value.inputExample !== void 0) fn.inputExample = value.inputExample;
 		const hasSchedule = fn.schedule !== void 0;
 		const hasAirway = fn.airwayStep !== void 0;
-		if (!(fn.route ?? !(hasSchedule || hasAirway)) && !hasSchedule && !hasAirway) throw new Error(`oxy-app.json: function "${fnName}" must enable at least one of route/schedule/airwayStep`);
+		const hasWebhook = fn.webhook !== void 0;
+		if (!(fn.route ?? !(hasSchedule || hasAirway || hasWebhook)) && !hasSchedule && !hasAirway && !hasWebhook) throw new Error(`oxy-app.json: function "${fnName}" must enable at least one of route/schedule/airwayStep/webhook`);
 		out[fnName] = fn;
 	}
 	return out;
@@ -621,6 +636,44 @@ async function sharedQuery(fetcher, projectId, sql, db, opts = {}) {
 	return p;
 }
 
+//#endregion
+//#region src/custom-app/traceparent.ts
+const HEX = "0123456789abcdef";
+function randomHex(bytes) {
+	const buf = new Uint8Array(bytes);
+	const c = globalThis.crypto;
+	if (c && typeof c.getRandomValues === "function") c.getRandomValues(buf);
+	else for (let i = 0; i < bytes; i++) buf[i] = Math.floor(Math.random() * 256);
+	let out = "";
+	for (let i = 0; i < bytes; i++) out += HEX[buf[i] >> 4] + HEX[buf[i] & 15];
+	return out;
+}
+/** Mint a fresh, sampled `traceparent`. All-zero ids are invalid per the spec;
+*  the loop guards the astronomically unlikely draw. */
+function newTraceparent() {
+	let traceId = randomHex(16);
+	while (/^0+$/.test(traceId)) traceId = randomHex(16);
+	let spanId = randomHex(8);
+	while (/^0+$/.test(spanId)) spanId = randomHex(8);
+	return {
+		header: `00-${traceId}-${spanId}-01`,
+		traceId
+	};
+}
+/**
+* Stamp the ids of a failed invoke onto whatever was thrown, so the app (and
+* the platform's error beacon, which reads `traceId`) can name the trace and
+* the server-minted request id. Non-objects are returned untouched.
+*/
+function withInvocationIds(err, traceId, requestId) {
+	if (err && typeof err === "object") {
+		const target = err;
+		if (!target.traceId) target.traceId = traceId;
+		if (requestId && !target.requestId) target.requestId = requestId;
+	}
+	return err;
+}
+
 //#endregion
 //#region src/custom-app/react.tsx
 function defaultFetcher(input, init) {
@@ -893,9 +946,11 @@ function useFunction(name) {
 				error: null
 			}));
 			try {
+				const trace = newTraceparent();
 				const headers = {
 					"content-type": "application/json",
-					accept: "text/event-stream"
+					accept: "text/event-stream",
+					traceparent: trace.header
 				};
 				if (opts?.idempotencyKey) headers["idempotency-key"] = opts.idempotencyKey;
 				const result = await sharedFunctionInvoke(functionInvokeKey(name, body), async () => {
@@ -904,8 +959,13 @@ function useFunction(name) {
 						headers,
 						body: JSON.stringify(body ?? {})
 					});
-					if (!resp.ok && resp.status !== 200) throw await apiErrorFromResponse(resp);
-					return readFunctionSseStream(resp);
+					const requestId = resp.headers?.get?.("x-oxy-request-id") ?? null;
+					if (!resp.ok && resp.status !== 200) throw withInvocationIds(await apiErrorFromResponse(resp), trace.traceId, requestId);
+					try {
+						return await readFunctionSseStream(resp);
+					} catch (err) {
+						throw withInvocationIds(err, trace.traceId, requestId);
+					}
 				});
 				setState({
 					data: result.value,
@@ -947,7 +1007,7 @@ function useFunction(name) {
 * inputs (e.g. a user-picked filter value) are available.
 */
 function useSemanticQuery(input, opts = {}) {
-	const { projectId, fetcher } = useOxyApp();
+	const { projectId, appId, fetcher } = useOxyApp();
 	const enabled = opts.enabled !== false;
 	const debug = opts.debug === true;
 	const inputKey = React.useMemo(() => JSON.stringify(input), [input]);
@@ -982,7 +1042,11 @@ function useSemanticQuery(input, opts = {}) {
 			measures: input.measures ?? [],
 			time_dimensions: input.time_dimensions ?? [],
 			filters: input.filters ?? [],
-			...input.limit != null ? { limit: input.limit } : {}
+			...input.limit != null ? { limit: input.limit } : {},
+			...input.scope ? {
+				scope: input.scope,
+				...appId ? { app: appId } : {}
+			} : {}
 		});
 		const url = `/api/projects/${projectId}/semantic-query${debug ? "?debug=1" : ""}`;
 		fetcher(url, {
@@ -1020,6 +1084,7 @@ function useSemanticQuery(input, opts = {}) {
 	}, [
 		enabled,
 		projectId,
+		appId,
 		inputKey,
 		debug,
 		nonce,
@@ -2292,4 +2357,4 @@ const styles = {
 
 //#endregion
 export { interpretCustomAppError as _, useFunction as a, useQuery as c, useTrackEvent as d, _resetCustomAppManifestCacheForTest as f, apiErrorFromResponse as g, OxyApiError as h, useAgentRun as i, useResolvedManifest as l, readInjectedAppConfig as m, OxyAppProvider as n, useOxyApp as o, loadCustomAppManifest as p, OxyChat as r, useProcedureRun as s, OxyAnswer as t, useSemanticQuery as u, getOxyAppLogger as v, setOxyAppLogger as y };
-//# sourceMappingURL=react-DqnINwTi.mjs.map
+//# sourceMappingURL=react-Cq3xULOr.mjs.map