@oxy-hq/sdk 2.12.0 → 2.16.0

package/dist/{react-BXGyzgz0.mjs → react-OW1t_J0M.mjs}

@@ -87,6 +87,25 @@ async function apiErrorFromResponse(resp) {
 		message: snippet || `HTTP ${resp.status}`
 	});
 }
+/**
+* Normalize a rejected request into the `Error` a hook reports.
+*
+* An `AbortError` reaching a hook's `.catch` is by construction an abort the
+* hook did NOT cause — its own teardown is marked separately — so it is a
+* fetcher's request timeout, a dropped socket, or a navigation. The platform's
+* wording for those ("The user aborted a request.") is wrong on its face by
+* the time a bundle renders it, so rephrase and keep the original as `cause`.
+*
+* The name is used only to WORD an error already being reported. Whether to
+* report at all is the caller's teardown flag, never the name — that
+* conflation is what left hooks loading forever.
+*/
+function asReportableError(err) {
+	const name = typeof err === "object" && err !== null && "name" in err ? String(err.name) : "";
+	const e = err instanceof Error ? err : new Error(String(err));
+	if (name !== "AbortError" && e.name !== "AbortError") return e;
+	return Object.assign(/* @__PURE__ */ new Error("request was interrupted (the connection dropped or timed out)"), { cause: e });
+}
 const ARCH_DOC = "internal-docs/customer-apps.md";
 /** Interpret a thrown error as a structured report for UI display. */
 function interpretCustomAppError(err) {
@@ -299,7 +318,7 @@ const FUNCTION_NAME_RE = /^[a-z][a-z0-9-]{0,63}$/;
 *
 * This runs at manifest LOAD (app boot / `pnpm dev`), not at `oxy build` — the
 * build-time gate is the vite plugin's `validateManifest`, which now checks
-* function names too. `oxy publish` also validates them locally before esbuild,
+* function names too. `oxyc publish` also validates them locally before esbuild,
 * so a bad name fails before the upload regardless.
 */
 function validateFunctions(raw) {
@@ -338,6 +357,10 @@ function validateFunctions(raw) {
 			if (typeof t !== "number" || !Number.isInteger(t) || t < 1 || t > 300) throw new Error(`oxy-app.json: function "${fnName}" \`timeoutSeconds\` must be an integer in [1, 300]`);
 			fn.timeoutSeconds = t;
 		}
+		if (value.check !== void 0) {
+			if (typeof value.check !== "boolean") throw new Error(`oxy-app.json: function "${fnName}" \`check\` must be a boolean`);
+			fn.check = value.check;
+		}
 		if (value.cache !== void 0) {
 			const c = value.cache;
 			if (!isRecord(c)) throw new Error(`oxy-app.json: function "${fnName}" \`cache\` must be an object`);
@@ -364,10 +387,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 +659,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) {
@@ -839,7 +915,7 @@ function useQuery(input, opts = {}) {
 			setState((s) => ({
 				...s,
 				loading: false,
-				error: err instanceof Error ? err : new Error(String(err))
+				error: asReportableError(err)
 			}));
 		});
 		return () => {
@@ -893,9 +969,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 +982,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,
@@ -1010,11 +1093,10 @@ function useSemanticQuery(input, opts = {}) {
 			});
 		}).catch((err) => {
 			if (cancelled) return;
-			if (err instanceof DOMException && err.name === "AbortError") return;
 			setState((s) => ({
 				...s,
 				loading: false,
-				error: err instanceof Error ? err : new Error(String(err))
+				error: asReportableError(err)
 			}));
 		});
 		return () => {
@@ -1171,13 +1253,13 @@ function useProcedureRun(input, opts = {}) {
 					return;
 				}
 			} catch (e) {
-				if (e instanceof DOMException && e.name === "AbortError") return;
+				if (ctrl.signal.aborted) return;
 				inflight.current.runId = void 0;
 				setState({
 					state: "failed",
 					progress: null,
 					result: null,
-					error: e instanceof Error ? e : new Error(String(e))
+					error: asReportableError(e)
 				});
 			}
 		})();
@@ -1278,6 +1360,8 @@ function useAgentRun(input) {
 					if (ctrl.signal.aborted) return;
 					if (terminated) return;
 					attempts += 1;
+					const idBeforeAttempt = lastEventId;
+					let windowError;
 					try {
 						await consumeSseStream({
 							url: `/api/projects/${projectId}/agents/runs/${encodeURIComponent(run_id)}/events`,
@@ -1327,36 +1411,29 @@ function useAgentRun(input) {
 							}
 						});
 					} catch (err) {
-						if (err instanceof DOMException && err.name === "AbortError") return;
-						if (attempts >= 5) {
-							inflight.current.runId = void 0;
-							setState((s) => ({
-								...s,
-								state: "failed",
-								error: err instanceof Error ? err : new Error(String(err))
-							}));
-							return;
-						}
+						if (ctrl.signal.aborted) return;
+						windowError = err;
 					}
 					if (terminated) return;
-					if (attempts >= 5) {
+					if (lastEventId !== idBeforeAttempt) attempts = 0;
+					else if (attempts >= 5) {
 						inflight.current.runId = void 0;
 						setState((s) => ({
 							...s,
 							state: "failed",
-							error: /* @__PURE__ */ new Error("run event stream closed without a terminal event")
+							error: windowError ? asReportableError(windowError) : /* @__PURE__ */ new Error("run event stream closed without a terminal event")
 						}));
 						return;
 					}
 					await sleep(1e3, ctrl.signal);
 				}
 			} catch (e) {
-				if (e instanceof DOMException && e.name === "AbortError") return;
+				if (ctrl.signal.aborted) return;
 				inflight.current.runId = void 0;
 				setState((s) => ({
 					...s,
 					state: "failed",
-					error: e instanceof Error ? e : new Error(String(e))
+					error: asReportableError(e)
 				}));
 			}
 		})();
@@ -2296,5 +2373,5 @@ 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-BXGyzgz0.mjs.map
+export { asReportableError as _, useFunction as a, setOxyAppLogger as b, 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, interpretCustomAppError as v, getOxyAppLogger as y };
+//# sourceMappingURL=react-OW1t_J0M.mjs.map