@qlever-llc/trellis 0.10.9 → 0.10.11

package/script/trellis.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Trellis_instances, _Trellis_log, _Trellis_tasks, _Trellis_hasExplicitApi, _Trellis_noResponderMaxRetries, _Trellis_noResponderRetryMs, _Trellis_onSessionNotFound, _Trellis_operationStore, _Trellis_eventConsumers, _Trellis_durableEventLoops, _Trellis_createStateFacade, _Trellis_createRpcFacade, _Trellis_createRpcHandleFacade, _Trellis_createEventFacade, _Trellis_createEventPublishFacade, _Trellis_createFeedFacade, _Trellis_createHandlerTrellis, _Trellis_createOperationFacade, _Trellis_unknownApiError, _Trellis_requestBuiltRpcUnknown, _Trellis_requestBuiltRpc, _Trellis_handleBrowserAuthRequired, _Trellis_authenticateFeedRequest, _Trellis_subscribeFeed, _Trellis_handleFeed, _Trellis_processFeedMessage, _Trellis_handleRPC, _Trellis_processRPCMessage, _Trellis_respondWithPayload, _Trellis_respondWithError, _Trellis_startEphemeralEvent, _Trellis_resolveEventConsumerGroup, _Trellis_registerDurableEventHandler, _Trellis_startDurableEventConsumer, _Trellis_durableEventConsumerGroupReady, _Trellis_runDurableEventConsumer, _Trellis_handleDurableEvent, _Trellis_handleDurableEventConsumer, _Trellis_parseEventMessage, _Trellis_escapeSubjectToken, _Trellis_currentIat, _Trellis_createProof, _Trellis_requestMessageWithRetry, _Trellis_requestJson, _Trellis_watchJson;
+var _Trellis_instances, _Trellis_log, _Trellis_tasks, _Trellis_hasExplicitApi, _Trellis_noResponderMaxRetries, _Trellis_noResponderRetryMs, _Trellis_onSessionNotFound, _Trellis_operationStore, _Trellis_eventConsumers, _Trellis_durableEventLoops, _Trellis_createStateFacade, _Trellis_createRpcFacade, _Trellis_createRpcHandleFacade, _Trellis_createEventFacade, _Trellis_createEventPublishFacade, _Trellis_createFeedFacade, _Trellis_createHandlerTrellis, _Trellis_createOperationFacade, _Trellis_unknownApiError, _Trellis_requestBuiltRpcUnknown, _Trellis_requestBuiltRpc, _Trellis_handleBrowserAuthRequired, _Trellis_authenticateFeedRequest, _Trellis_subscribeFeed, _Trellis_handleFeed, _Trellis_processFeedMessage, _Trellis_handleRPC, _Trellis_processRPCMessage, _Trellis_respondWithPayload, _Trellis_respondWithError, _Trellis_startEphemeralEvent, _Trellis_invokeEventHandler, _Trellis_resolveEventConsumerGroup, _Trellis_registerDurableEventHandler, _Trellis_startDurableEventConsumer, _Trellis_durableEventConsumerGroupReady, _Trellis_runDurableEventConsumer, _Trellis_handleDurableEvent, _Trellis_handleDurableEventConsumer, _Trellis_parseEventMessage, _Trellis_escapeSubjectToken, _Trellis_currentIat, _Trellis_createProof, _Trellis_requestMessageWithRetry, _Trellis_requestJson, _Trellis_watchJson;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Trellis = exports.DurableOperationRecordSchema = void 0;
 exports.safeJson = safeJson;
@@ -21,6 +21,7 @@ exports.sha256 = sha256;
 exports.buildProofInput = buildProofInput;
 exports.isOperationDeferred = isOperationDeferred;
 exports.isResultLike = isResultLike;
+exports.annotateHandlerBoundaryError = annotateHandlerBoundaryError;
 exports.buildRuntimeOperationSnapshot = buildRuntimeOperationSnapshot;
 exports.isTerminalRuntimeOperationSnapshot = isTerminalRuntimeOperationSnapshot;
 exports.createTrellisInternal = createTrellisInternal;
@@ -204,6 +205,21 @@ function isOperationDeferred(value) {
 function isResultLike(value) {
     return value instanceof result_1.Result;
 }
+function compactHandlerErrorContext(context) {
+    return Object.fromEntries(Object.entries(context).filter(([key, value]) => key !== "traceId" && value !== undefined));
+}
+function sanitizeHandlerErrorContext(error) {
+    delete error.getContext().subject;
+}
+function annotateHandlerBoundaryError(cause, context) {
+    const error = cause instanceof result_1.BaseError && !(cause instanceof RemoteError_js_1.RemoteError)
+        ? cause
+        : new index_js_1.UnexpectedError({ cause });
+    sanitizeHandlerErrorContext(error);
+    error.withContext(compactHandlerErrorContext(context));
+    error.withTraceId(context.traceId);
+    return error;
+}
 const DurableOperationSignalSchema = typebox_1.Type.Object({
     operationId: typebox_1.Type.String(),
     sequence: typebox_1.Type.Number(),
@@ -234,8 +250,11 @@ const DurableOperationSnapshotSchema = typebox_1.Type.Object({
     })),
     output: typebox_1.Type.Optional(typebox_1.Type.Any()),
     error: typebox_1.Type.Optional(typebox_1.Type.Object({
+        id: typebox_1.Type.Optional(typebox_1.Type.String()),
         type: typebox_1.Type.String(),
         message: typebox_1.Type.String(),
+        context: typebox_1.Type.Optional(typebox_1.Type.Record(typebox_1.Type.String(), typebox_1.Type.Unknown())),
+        traceId: typebox_1.Type.Optional(typebox_1.Type.String()),
     })),
 });
 exports.DurableOperationRecordSchema = typebox_1.Type.Object({
@@ -741,6 +760,18 @@ class Trellis {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "contractId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "contractDigest", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "nats", {
             enumerable: true,
             configurable: true,
@@ -783,6 +814,8 @@ class Trellis {
         __classPrivateFieldSet(this, _Trellis_log, (opts?.log ?? globals_js_1.logger).child({ lib: "trellis" }), "f");
         this.timeout = opts?.timeout ?? 3000;
         this.stream = opts?.stream ?? "trellis";
+        this.contractId = opts?.contractId;
+        this.contractDigest = opts?.contractDigest;
         __classPrivateFieldSet(this, _Trellis_hasExplicitApi, api !== undefined, "f");
         __classPrivateFieldSet(this, _Trellis_noResponderMaxRetries, opts?.noResponderRetry?.maxAttempts ??
             DEFAULT_NO_RESPONDER_MAX_RETRIES, "f");
@@ -1543,9 +1576,14 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                     }
                 }
                 catch (cause) {
-                    const error = cause instanceof result_1.BaseError
-                        ? cause
-                        : new index_js_1.UnexpectedError({ cause });
+                    const error = annotateHandlerBoundaryError(cause, {
+                        feed,
+                        requestId: msg.headers?.get("request-id"),
+                        service: this.name,
+                        contractId: this.contractId,
+                        contractDigest: this.contractDigest,
+                        traceId: traceIdFromTraceparent(msg.headers?.get("traceparent")),
+                    });
                     __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_respondWithError).call(this, msg, error);
                 }
             })();
@@ -1580,7 +1618,7 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
     await this.nats.flush();
     const controller = new AbortController();
     try {
-        await handler({
+        const handlerResult = await handler({
             input: parsed,
             caller: callerValue,
             signal: controller.signal,
@@ -1598,6 +1636,19 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 return (0, result_1.ok)(undefined);
             })()),
         });
+        const handlerOutcome = isResultLike(handlerResult)
+            ? handlerResult.take()
+            : handlerResult;
+        if ((0, result_1.isErr)(handlerOutcome)) {
+            return (0, result_1.err)(annotateHandlerBoundaryError(handlerOutcome.error, {
+                feed,
+                requestId: msg.headers?.get("request-id"),
+                service: this.name,
+                contractId: this.contractId,
+                contractDigest: this.contractDigest,
+                traceId: traceIdFromTraceparent(msg.headers?.get("traceparent")),
+            }));
+        }
         return (0, result_1.ok)(undefined);
     }
     finally {
@@ -1830,7 +1881,14 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 client: handlerTrellis,
             })));
             if (handlerResultWrapped.isErr()) {
-                const error = handlerResultWrapped.error.withContext({ method });
+                const error = annotateHandlerBoundaryError(handlerResultWrapped.error, {
+                    method: String(method),
+                    requestId: msg.headers?.get("request-id"),
+                    service: this.name,
+                    contractId: this.contractId,
+                    contractDigest: this.contractDigest,
+                    traceId: activeTraceId(span) ?? incomingTraceId,
+                });
                 __classPrivateFieldGet(this, _Trellis_log, "f").error({
                     method,
                     error: error.message,
@@ -1848,11 +1906,14 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
             const handlerResult = handlerResultWrapped.take();
             const handlerOutcome = handlerResult.take();
             if ((0, result_1.isErr)(handlerOutcome)) {
-                const handlerError = handlerOutcome.error;
-                const error = handlerError instanceof result_1.BaseError &&
-                    !(handlerError instanceof RemoteError_js_1.RemoteError)
-                    ? handlerError
-                    : new index_js_1.UnexpectedError({ cause: handlerError });
+                const error = annotateHandlerBoundaryError(handlerOutcome.error, {
+                    method: String(method),
+                    requestId: msg.headers?.get("request-id"),
+                    service: this.name,
+                    contractId: this.contractId,
+                    contractDigest: this.contractDigest,
+                    traceId: activeTraceId(span) ?? incomingTraceId,
+                });
                 __classPrivateFieldGet(this, _Trellis_log, "f").error({
                     method,
                     error: error.message,
@@ -1951,15 +2012,17 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 __classPrivateFieldGet(this, _Trellis_log, "f").error({ error: m.error }, "Event validation failed");
                 continue;
             }
-            const handlerResult = await result_1.AsyncResult.lift(fn(m, createEventListenerContext({
+            const handlerResult = await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_invokeEventHandler).call(this, {
+                event,
                 payload: m,
-                subject: msg.subject,
                 mode: "ephemeral",
                 message: msg,
-            })));
-            if (handlerResult.isErr()) {
+                fn,
+            });
+            const handlerValue = handlerResult.take();
+            if ((0, result_1.isErr)(handlerValue)) {
                 __classPrivateFieldGet(this, _Trellis_log, "f").error({
-                    error: handlerResult.error.toSerializable(),
+                    error: handlerValue.error.toSerializable(),
                     event,
                     subject: msg.subject,
                 }, "Event handler failed");
@@ -1968,6 +2031,31 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
     });
     __classPrivateFieldGet(this, _Trellis_tasks, "f").add(`event:${event}:${(0, ulid_1.ulid)()}`, task);
     return (0, result_1.ok)(undefined);
+}, _Trellis_invokeEventHandler = async function _Trellis_invokeEventHandler(args) {
+    const annotation = {
+        event: String(args.event),
+        service: this.name,
+        contractId: this.contractId,
+        contractDigest: this.contractDigest,
+        traceId: traceIdFromTraceparent(args.message.headers?.get("traceparent")),
+    };
+    try {
+        const result = await Promise.resolve(args.fn(args.payload, createEventListenerContext({
+            payload: args.payload,
+            subject: args.message.subject,
+            mode: args.mode,
+            ...(args.group ? { group: args.group } : {}),
+            message: args.message,
+        })));
+        const outcome = isResultLike(result) ? result.take() : result;
+        if ((0, result_1.isErr)(outcome)) {
+            return (0, result_1.err)(annotateHandlerBoundaryError(outcome.error, annotation));
+        }
+        return (0, result_1.ok)(undefined);
+    }
+    catch (cause) {
+        return (0, result_1.err)(annotateHandlerBoundaryError(cause, annotation));
+    }
 }, _Trellis_resolveEventConsumerGroup = function _Trellis_resolveEventConsumerGroup(event, opts) {
     const metadata = __classPrivateFieldGet(this, _Trellis_eventConsumers, "f").metadata;
     const bindings = __classPrivateFieldGet(this, _Trellis_eventConsumers, "f").bindings ?? {};
@@ -2093,15 +2181,17 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                 msg.term();
                 continue;
             }
-            const handlerResult = await result_1.AsyncResult.lift(fn(m, createEventListenerContext({
+            const handlerResult = await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_invokeEventHandler).call(this, {
+                event,
                 payload: m,
-                subject: msg.subject,
                 mode: "durable",
                 message: msg,
-            })));
-            if (handlerResult.isErr()) {
+                fn,
+            });
+            const handlerValue = handlerResult.take();
+            if ((0, result_1.isErr)(handlerValue)) {
                 __classPrivateFieldGet(this, _Trellis_log, "f").error({
-                    error: handlerResult.error.toSerializable(),
+                    error: handlerValue.error.toSerializable(),
                     event,
                     subject: msg.subject,
                 }, "Event handler failed");
@@ -2134,16 +2224,18 @@ _Trellis_log = new WeakMap(), _Trellis_tasks = new WeakMap(), _Trellis_hasExplic
                     failed = true;
                     break;
                 }
-                const handlerResult = await result_1.AsyncResult.lift(registration.fn(eventPayload, createEventListenerContext({
+                const handlerResult = await __classPrivateFieldGet(this, _Trellis_instances, "m", _Trellis_invokeEventHandler).call(this, {
+                    event: registration.event,
                     payload: eventPayload,
-                    subject: msg.subject,
                     mode: "durable",
                     group,
                     message: msg,
-                })));
-                if (handlerResult.isErr()) {
+                    fn: registration.fn,
+                });
+                const handlerValue = handlerResult.take();
+                if ((0, result_1.isErr)(handlerValue)) {
                     __classPrivateFieldGet(this, _Trellis_log, "f").error({
-                        error: handlerResult.error.toSerializable(),
+                        error: handlerValue.error.toSerializable(),
                         event: registration.event,
                         subject: msg.subject,
                     }, "Event handler failed");

package/src/client.ts

@@ -50,6 +50,8 @@ type ClientContractManifest = {
 };
 
 type ClientContractShape = {
+  CONTRACT_ID?: string;
+  CONTRACT_DIGEST?: string;
   CONTRACT: ClientContractManifest;
   API: {
     owned?: TrellisAPI;
@@ -120,6 +122,8 @@ export function createClient<
       noResponderRetry: opts?.noResponderRetry,
       api,
       state: contract[CONTRACT_STATE_METADATA],
+      contractId: contract.CONTRACT_ID,
+      contractDigest: contract.CONTRACT_DIGEST,
     },
   );
 }

package/src/client_connect.ts

@@ -224,13 +224,12 @@ const ClientTransportsSchema = Type.Object({
 type ClientConnectDeps = {
   loadTransport(): Promise<RuntimeTransport>;
   now(): number;
-  setInterval?: (
-    handler: () => void,
-    ms: number,
-  ) => ReturnType<typeof globalThis.setInterval>;
-  clearInterval?: (id: ReturnType<typeof globalThis.setInterval>) => void;
+  setInterval?: (handler: () => void, ms: number) => IntervalHandle;
+  clearInterval?: (id: IntervalHandle) => void;
 };
 
+type IntervalHandle = ReturnType<typeof globalThis.setInterval> | number;
+
 const ClientBootstrapReadySchema = Type.Object({
   status: Type.Literal("ready"),
   serverNow: Type.Integer(),
@@ -800,11 +799,14 @@ async function createRuntimeUserAuthenticator(args: {
     ((
       handler: () => void,
       ms: number,
-    ): ReturnType<typeof globalThis.setInterval> =>
-      globalThis.setInterval(handler, ms));
+    ): IntervalHandle => globalThis.setInterval(handler, ms));
   const clearRefreshInterval = args.deps.clearInterval ??
-    ((id: ReturnType<typeof globalThis.setInterval>) =>
-      globalThis.clearInterval(id));
+    ((id: IntervalHandle) => {
+      const clearIntervalFn = globalThis.clearInterval as (
+        id: IntervalHandle,
+      ) => void;
+      clearIntervalFn(id);
+    });
   const refreshIntervalId = setRefreshInterval(() => {
     void refresh();
   }, 10_000);

package/src/sdk/_generated/auth/api.ts

@@ -4,29 +4,19 @@ import { OWNED_API } from "./owned_api.js";
 export { OWNED_API };
 
 export type UsedApi = {
-  rpc: {
-  };
-  operations: {
-  };
-  events: {
-  };
-  feeds: {
-  };
-  subjects: {
-  };
+  rpc: {};
+  operations: {};
+  events: {};
+  feeds: {};
+  subjects: {};
 };
 
 export const USED_API: UsedApi = {
-  rpc: {
-  },
-  operations: {
-  },
-  events: {
-  },
-  feeds: {
-  },
-  subjects: {
-  },
+  rpc: {},
+  operations: {},
+  events: {},
+  feeds: {},
+  subjects: {},
 };
 
 export type OwnedApi = typeof OWNED_API;
@@ -44,4 +34,3 @@ export const API = {
 } as const;
 
 export type ApiViews = typeof API;
-