@qlever-llc/trellis 0.8.3 → 0.9.0-rc.2

package/script/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RemoteError = exports.KVError = exports.AuthError = exports.TrellisDevice = exports.TrellisClient = exports.ClientAuthHandledError = exports.Result = exports.ok = exports.isOk = exports.isErr = exports.err = exports.BaseError = exports.AsyncResult = exports.defineServiceContract = exports.defineDeviceContract = exports.defineAppContract = exports.defineAgentContract = exports.defineError = exports.ServiceHealth = exports.runServiceHealthCheck = exports.runHealthCheck = exports.runAllServiceHealthChecks = exports.runAllHealthChecks = exports.HealthRpcSchema = exports.HealthResponseSchema = exports.HealthInfoSchema = exports.HealthHeartbeatServiceSchema = exports.HealthHeartbeatSchema = exports.HealthHeartbeatHeaderSchema = exports.HealthCheckResultSchema = exports.createHealthHeartbeat = exports.TrellisConnection = exports.unwrapSchema = exports.schema = exports.isJsonValue = exports.digestJson = exports.CONTRACT_FORMAT_V1 = exports.CATALOG_FORMAT_V1 = exports.canonicalizeJson = exports.signBytes = exports.loadSessionKey = exports.isBindSuccessResponse = exports.hasSessionKey = exports.getPublicSessionKey = exports.getOrCreateSessionKey = exports.generateSessionKey = exports.createRpcProof = exports.createAuth = exports.clearSessionKey = exports.bindFlow = void 0;
-exports.Trellis = exports.OperationInvoker = exports.controlSubject = exports.FileInfoSchema = exports.createTransferHandle = exports.TypedStoreEntry = exports.TypedStore = exports.TypedKVEntry = exports.TypedKV = exports.JobWorkerHostAdapter = exports.JobRef = exports.JobQueue = exports.JobProgressSchema = exports.JobLogEntrySchema = exports.ActiveJob = exports.ValidationError = exports.UnexpectedError = exports.TrellisError = exports.TransportError = exports.TransferError = exports.StoreError = void 0;
+exports.AuthError = exports.TrellisDevice = exports.TrellisClient = exports.ClientAuthHandledError = exports.Result = exports.ok = exports.isOk = exports.isErr = exports.err = exports.BaseError = exports.AsyncResult = exports.defineServiceContract = exports.defineDeviceContract = exports.defineAppContract = exports.defineAgentContract = exports.PageResponseSchema = exports.PageRequestSchema = exports.defineError = exports.ServiceHealth = exports.runServiceHealthCheck = exports.runHealthCheck = exports.runAllServiceHealthChecks = exports.runAllHealthChecks = exports.HealthRpcSchema = exports.HealthResponseSchema = exports.HealthInfoSchema = exports.HealthHeartbeatServiceSchema = exports.HealthHeartbeatSchema = exports.HealthHeartbeatHeaderSchema = exports.HealthCheckResultSchema = exports.createHealthHeartbeat = exports.TrellisConnection = exports.unwrapSchema = exports.schema = exports.isJsonValue = exports.digestJson = exports.CONTRACT_FORMAT_V1 = exports.CATALOG_FORMAT_V1 = exports.canonicalizeJson = exports.signBytes = exports.loadSessionKey = exports.isBindSuccessResponse = exports.hasSessionKey = exports.getPublicSessionKey = exports.getOrCreateSessionKey = exports.generateSessionKey = exports.createRpcProof = exports.createAuth = exports.clearSessionKey = exports.bindFlow = void 0;
+exports.Trellis = exports.OperationInvoker = exports.controlSubject = exports.FileInfoSchema = exports.createTransferHandle = exports.TypedStoreEntry = exports.TypedStore = exports.TypedKVEntry = exports.TypedKV = exports.JobWorkerHostAdapter = exports.JobRef = exports.JobQueue = exports.JobProgressSchema = exports.JobLogEntrySchema = exports.ActiveJob = exports.ValidationError = exports.UnexpectedError = exports.TrellisError = exports.TransportError = exports.TransferError = exports.StoreError = exports.RemoteError = exports.KVError = void 0;
 var auth_ts_1 = require("./auth.js");
 Object.defineProperty(exports, "bindFlow", { enumerable: true, get: function () { return auth_ts_1.bindFlow; } });
 Object.defineProperty(exports, "clearSessionKey", { enumerable: true, get: function () { return auth_ts_1.clearSessionKey; } });
@@ -40,6 +40,9 @@ Object.defineProperty(exports, "runServiceHealthCheck", { enumerable: true, get:
 Object.defineProperty(exports, "ServiceHealth", { enumerable: true, get: function () { return health_ts_1.ServiceHealth; } });
 var mod_ts_1 = require("./contract_support/mod.js");
 Object.defineProperty(exports, "defineError", { enumerable: true, get: function () { return mod_ts_1.defineError; } });
+var mod_ts_2 = require("./contract_support/mod.js");
+Object.defineProperty(exports, "PageRequestSchema", { enumerable: true, get: function () { return mod_ts_2.PageRequestSchema; } });
+Object.defineProperty(exports, "PageResponseSchema", { enumerable: true, get: function () { return mod_ts_2.PageResponseSchema; } });
 var contract_ts_1 = require("./contract.js");
 Object.defineProperty(exports, "defineAgentContract", { enumerable: true, get: function () { return contract_ts_1.defineAgentContract; } });
 Object.defineProperty(exports, "defineAppContract", { enumerable: true, get: function () { return contract_ts_1.defineAppContract; } });

package/script/jobs.d.ts

@@ -13,6 +13,13 @@ export declare const JobProgressSchema: Type.TObject<{
 }>;
 export type JobProgress = StaticDecode<typeof JobProgressSchema>;
 export type JobLogEntry = StaticDecode<typeof JobLogEntrySchema>;
+export declare const JobContextSchema: Type.TObject<{
+    requestId: Type.TString;
+    traceId: Type.TString;
+    traceparent: Type.TString;
+    tracestate: Type.TOptional<Type.TString>;
+}>;
+export type JobContext = StaticDecode<typeof JobContextSchema>;
 export type JobState = "pending" | "active" | "retry" | "completed" | "failed" | "cancelled" | "expired" | "dead" | "dismissed";
 export type JobIdentity = {
     service: string;
@@ -24,6 +31,7 @@ export type JobSnapshot<TPayload, TResult> = {
     service: string;
     type: string;
     state: JobState;
+    context: JobContext;
     payload: TPayload;
     result?: TResult;
     createdAt: string;
@@ -94,7 +102,8 @@ export declare class ActiveJob<TPayload, TResult> {
     #private;
     readonly ref: JobRef<TPayload, TResult>;
     readonly payload: TPayload;
-    constructor(ref: JobRef<TPayload, TResult>, payload: TPayload, cancelled: boolean | (() => boolean), impl: {
+    readonly context: Readonly<JobContext>;
+    constructor(ref: JobRef<TPayload, TResult>, payload: TPayload, context: JobContext, cancelled: boolean | (() => boolean), impl: {
         heartbeat: () => AsyncResult<void, BaseError>;
         progress: (value: JobProgress) => AsyncResult<void, BaseError>;
         log: (entry: JobLogEntry) => AsyncResult<void, BaseError>;

package/script/jobs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jobs.d.ts","sourceRoot":"","sources":["../../jobs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jobs.d.ts","sourceRoot":"","sources":["../../jobs.ts"],"names":[],"mappings":"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"}

package/script/jobs.js

@@ -12,7 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _JobRef_get, _JobRef_wait, _JobRef_cancel, _ActiveJob_cancelled, _ActiveJob_heartbeat, _ActiveJob_progress, _ActiveJob_log, _ActiveJob_redeliveryCount, _JobQueue_create, _JobQueue_handle, _JobWorkerHostAdapter_stop, _JobWorkerHostAdapter_join;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JobWorkerHostAdapter = exports.JobQueue = exports.ActiveJob = exports.JobRef = exports.JobProgressSchema = exports.JobLogEntrySchema = void 0;
+exports.JobWorkerHostAdapter = exports.JobQueue = exports.ActiveJob = exports.JobRef = exports.JobContextSchema = exports.JobProgressSchema = exports.JobLogEntrySchema = void 0;
 const result_1 = require("@qlever-llc/result");
 const index_ts_1 = require("./errors/index.js");
 const typebox_1 = require("typebox");
@@ -31,6 +31,14 @@ exports.JobProgressSchema = typebox_1.Type.Object({
     current: typebox_1.Type.Optional(typebox_1.Type.Integer({ minimum: 0 })),
     total: typebox_1.Type.Optional(typebox_1.Type.Integer({ minimum: 0 })),
 });
+exports.JobContextSchema = typebox_1.Type.Object({
+    requestId: typebox_1.Type.String({ minLength: 1 }),
+    traceId: typebox_1.Type.String({ pattern: "^[0-9a-f]{32}$" }),
+    traceparent: typebox_1.Type.String({
+        pattern: "^[0-9a-f]{2}-[0-9a-f]{32}-[0-9a-f]{16}-[0-9a-f]{2}$",
+    }),
+    tracestate: typebox_1.Type.Optional(typebox_1.Type.String({ minLength: 1 })),
+});
 function toUnexpectedError(cause) {
     return cause instanceof index_ts_1.UnexpectedError
         ? cause
@@ -94,7 +102,7 @@ class JobRef {
 exports.JobRef = JobRef;
 _JobRef_get = new WeakMap(), _JobRef_wait = new WeakMap(), _JobRef_cancel = new WeakMap();
 class ActiveJob {
-    constructor(ref, payload, cancelled, impl) {
+    constructor(ref, payload, context, cancelled, impl) {
         Object.defineProperty(this, "ref", {
             enumerable: true,
             configurable: true,
@@ -107,6 +115,12 @@ class ActiveJob {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "context", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         _ActiveJob_cancelled.set(this, void 0);
         _ActiveJob_heartbeat.set(this, void 0);
         _ActiveJob_progress.set(this, void 0);
@@ -114,6 +128,7 @@ class ActiveJob {
         _ActiveJob_redeliveryCount.set(this, void 0);
         this.ref = ref;
         this.payload = payload;
+        this.context = Object.freeze({ ...context });
         __classPrivateFieldSet(this, _ActiveJob_cancelled, typeof cancelled === "function"
             ? cancelled
             : () => cancelled, "f");

package/script/kv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kv.d.ts","sourceRoot":"","sources":["../../kv.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,OAAO,EAAO,MAAM,aAAa,CAAC;AAEzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,WAAW,EAAU,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAErD,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAsJ7D;;GAEG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,OAAO,IACpC;IACA,2BAA2B;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,8CAA8C;IAC9C,SAAS,EAAE,IAAI,CAAC;CACjB,GACC,CACE;IACA,2DAA2D;IAC3D,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;CACxB,GACC;IACA,iDAAiD;IACjD,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,GACC;IACA,4DAA4D;IAC5D,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,eAAe,CAAC;IACvB,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,CACF,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,6EAA6E;IAC7E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,qBAAa,OAAO,CAAC,CAAC,SAAS,OAAO;IAElC,QAAQ,CAAC,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,EAAE,EAAE;IAFjB,OAAO;IAKP,OAAO,CAAC,MAAM,CAAC,SAAS;IAIxB,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,OAAO,EAC3B,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,CAAC,EACT,OAAO,EAAE;QACP,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,GACA,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;IA6BnC,GAAG,CACD,GAAG,EAAE,MAAM,GACV,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,OAAO,GAAG,eAAe,CAAC;IAuB1D,OAAO,CAAC,SAAS;IAIjB,MAAM,CACJ,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,OAAO,GACb,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC;IAW7B,GAAG,CACD,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,OAAO,GACb,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC;IAW7B,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC;IAW/C,IAAI,CACF,MAAM,GAAE,MAAM,GAAG,MAAM,EAAQ,GAC9B,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAY9C,MAAM,IAAI,WAAW,CAAC;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,CAAC;CAUnD;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,OAAO;;IAIvC,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,KAAK;gBAFL,MAAM,EAAE,CAAC,EACT,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,OAAO,EACtB,KAAK,EAAE,OAAO;IAKhB,IAAI,KAAK,IAAI,YAAY,CAAC,CAAC,CAAC,CAE3B;IAED,MAAM,CAAC,MAAM,CAAC,CAAC,SAAS,OAAO,EAC7B,MAAM,EAAE,CAAC,EACT,EAAE,EAAE,EAAE,EACN,KAAK,EAAE,OAAO,GACb,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,eAAe,CAAC;IAOhD,IAAI,GAAG,WAEN;IAED,IAAI,QAAQ,WAEX;IAED,IAAI,SAAS,SAEZ;IAED;;;;;;OAMG;IACG,KAAK,CACT,QAAQ,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,EACxC,IAAI,CAAC,EAAE,YAAY,GAClB,OAAO,CAAC,MAAM,IAAI,CAAC;IAoDtB,KAAK,CACH,KAAK,EAAE,OAAO,EACd,GAAG,CAAC,EAAE,OAAO,GACZ,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,eAAe,CAAC;IAsB/C,GAAG,CACD,KAAK,EAAE,OAAO,EACd,GAAG,CAAC,EAAE,OAAO,GACZ,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC;IAc7B,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC;CAYlD"}
+{"version":3,"file":"kv.d.ts","sourceRoot":"","sources":["../../kv.ts"],"names":[],"mappings":"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"}

package/script/kv.js

@@ -168,6 +168,12 @@ function kvError(operation, key, cause) {
         context: reason === undefined ? { key } : { key, reason },
     });
 }
+function kvNotFound(operation, key) {
+    return new index_ts_1.KVError({
+        operation,
+        context: { key, reason: "not found" },
+    });
+}
 class TypedKV {
     constructor(schema, kv) {
         Object.defineProperty(this, "schema", {
@@ -223,10 +229,10 @@ class TypedKV {
                 return result_1.Result.err(new index_ts_1.KVError({ operation: "get", cause, context: { key } }));
             }
             if (!s) {
-                return result_1.Result.err(new index_ts_1.KVError({
-                    operation: "get",
-                    context: { key, reason: "not found" },
-                }));
+                return result_1.Result.err(kvNotFound("get", key));
+            }
+            if (s.operation === "DEL" || s.operation === "PURGE") {
+                return result_1.Result.err(kvNotFound("get", key));
             }
             const result = await createTypedKvEntry(this.schema, this.kv, s);
             return result;

package/script/models/auth/rpc/Logout.d.ts

@@ -1,8 +1,8 @@
 import Type, { type Static } from "typebox";
-export declare const AuthLogoutSchema: Type.TObject<{}>;
-export type AuthLogoutInput = Static<typeof AuthLogoutSchema>;
-export declare const AuthLogoutResponseSchema: Type.TObject<{
+export declare const AuthSessionsLogoutSchema: Type.TObject<{}>;
+export type AuthSessionsLogoutInput = Static<typeof AuthSessionsLogoutSchema>;
+export declare const AuthSessionsLogoutResponseSchema: Type.TObject<{
     success: Type.TBoolean;
 }>;
-export type AuthLogoutResponse = Static<typeof AuthLogoutResponseSchema>;
+export type AuthSessionsLogoutResponse = Static<typeof AuthSessionsLogoutResponseSchema>;
 //# sourceMappingURL=Logout.d.ts.map

package/script/models/auth/rpc/Logout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Logout.d.ts","sourceRoot":"","sources":["../../../../../models/auth/rpc/Logout.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,gBAAgB,kBAE5B,CAAC;AACF,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE9D,eAAO,MAAM,wBAAwB;;EAIpC,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,wBAAwB,CAAC,CAAC"}
+{"version":3,"file":"Logout.d.ts","sourceRoot":"","sources":["../../../../../models/auth/rpc/Logout.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,wBAAwB,kBAEpC,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAE9E,eAAO,MAAM,gCAAgC;;EAI5C,CAAC;AACF,MAAM,MAAM,0BAA0B,GAAG,MAAM,CAC7C,OAAO,gCAAgC,CACxC,CAAC"}

package/script/models/auth/rpc/Logout.js

@@ -3,9 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthLogoutResponseSchema = exports.AuthLogoutSchema = void 0;
+exports.AuthSessionsLogoutResponseSchema = exports.AuthSessionsLogoutSchema = void 0;
 const typebox_1 = __importDefault(require("typebox"));
-exports.AuthLogoutSchema = typebox_1.default.Object({});
-exports.AuthLogoutResponseSchema = typebox_1.default.Object({
+exports.AuthSessionsLogoutSchema = typebox_1.default.Object({});
+exports.AuthSessionsLogoutResponseSchema = typebox_1.default.Object({
     success: typebox_1.default.Boolean(),
 });

package/script/models/trellis/Page.d.ts

@@ -0,0 +1,2 @@
+export { type PageRequest, PageRequestSchema, type PageResponse, PageResponseSchema, } from "../../contract_support/protocol.ts";
+//# sourceMappingURL=Page.d.ts.map

package/script/models/trellis/Page.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Page.d.ts","sourceRoot":"","sources":["../../../../models/trellis/Page.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAChB,iBAAiB,EACjB,KAAK,YAAY,EACjB,kBAAkB,GACnB,MAAM,oCAAoC,CAAC"}

package/script/models/trellis/Page.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PageResponseSchema = exports.PageRequestSchema = void 0;
+var protocol_ts_1 = require("../../contract_support/protocol.js");
+Object.defineProperty(exports, "PageRequestSchema", { enumerable: true, get: function () { return protocol_ts_1.PageRequestSchema; } });
+Object.defineProperty(exports, "PageResponseSchema", { enumerable: true, get: function () { return protocol_ts_1.PageResponseSchema; } });

package/script/models/trellis/State.d.ts

@@ -43,6 +43,7 @@ export type StateMigrationRequired = {
 export declare const StateUserTargetSchema: Type.TObject<{
     origin: Type.TString;
     id: Type.TString;
+    userId: Type.TOptional<Type.TString>;
 }>;
 export type StateUserTarget = StaticDecode<typeof StateUserTargetSchema>;
 //# sourceMappingURL=State.d.ts.map

package/script/models/trellis/State.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../../models/trellis/State.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAElD,OAAO,KAAK,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAExE,eAAO,MAAM,oBAAoB,6DAG/B,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,KAAK,CAAC;AAE7C,eAAO,MAAM,gBAAgB,qEAG3B,CAAC;AACH,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,WAAW,CAAC;AAEjD,eAAO,MAAM,eAAe,eAAiB,CAAC;AAC9C,MAAM,MAAM,SAAS,GAAG,gBAAgB,CAAC;AAEzC,eAAO,MAAM,gBAAgB;;;;;;EAM3B,CAAC;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,gBAAgB,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,4BAA4B;;;;;;;;;;;;EAMvC,CAAC;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,iBAAiB,EAAE,IAAI,CAAC;IACxB,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;EAGhC,CAAC;AACH,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,qBAAqB,CAAC,CAAC"}
+{"version":3,"file":"State.d.ts","sourceRoot":"","sources":["../../../../models/trellis/State.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,KAAK,YAAY,EAAE,MAAM,SAAS,CAAC;AAElD,OAAO,KAAK,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAExE,eAAO,MAAM,oBAAoB,6DAG/B,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,KAAK,CAAC;AAE7C,eAAO,MAAM,gBAAgB,qEAG3B,CAAC;AACH,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,WAAW,CAAC;AAEjD,eAAO,MAAM,eAAe,eAAiB,CAAC;AAC9C,MAAM,MAAM,SAAS,GAAG,gBAAgB,CAAC;AAEzC,eAAO,MAAM,gBAAgB;;;;;;EAM3B,CAAC;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,gBAAgB,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,4BAA4B;;;;;;;;;;;;EAMvC,CAAC;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,iBAAiB,EAAE,IAAI,CAAC;IACxB,KAAK,EAAE,UAAU,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;EAIhC,CAAC;AACH,MAAM,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,qBAAqB,CAAC,CAAC"}

package/script/models/trellis/State.js

@@ -31,4 +31,5 @@ exports.StateMigrationRequiredSchema = typebox_1.default.Object({
 exports.StateUserTargetSchema = typebox_1.default.Object({
     origin: typebox_1.default.String({ minLength: 1 }),
     id: typebox_1.default.String({ minLength: 1 }),
+    userId: typebox_1.default.Optional(typebox_1.default.String({ minLength: 1 })),
 });

package/script/models/trellis/rpc/StateList.d.ts

@@ -1,19 +1,12 @@
 import Type, { type Static } from "typebox";
-export declare const StateListSchema: Type.TIntersect<[Type.TObject<{
-    offset: Type.TInteger;
+export declare const StateListSchema: Type.TObject<{
+    offset: Type.TOptional<Type.TInteger>;
     limit: Type.TInteger;
-}>, Type.TObject<{
     store: Type.TString;
     prefix: Type.TOptional<Type.TString>;
-}>]>;
+}>;
 export type StateListInput = Static<typeof StateListSchema>;
-export declare const StateListResponseSchema: Type.TIntersect<[Type.TObject<{
-    count: Type.TInteger;
-    offset: Type.TInteger;
-    limit: Type.TInteger;
-    next: Type.TOptional<Type.TInteger>;
-    prev: Type.TOptional<Type.TInteger>;
-}>, Type.TObject<{
+export declare const StateListResponseSchema: Type.TObject<{
     entries: Type.TArray<Type.TUnion<[Type.TObject<{
         key: Type.TOptional<Type.TString>;
         value: Type.TUnknown;
@@ -33,6 +26,10 @@ export declare const StateListResponseSchema: Type.TIntersect<[Type.TObject<{
         currentStateVersion: Type.TString;
         writerContractDigest: Type.TString;
     }>]>>;
-}>]>;
+    count: Type.TInteger;
+    offset: Type.TInteger;
+    limit: Type.TInteger;
+    nextOffset: Type.TOptional<Type.TInteger>;
+}>;
 export type StateListResponse = Static<typeof StateListResponseSchema>;
 //# sourceMappingURL=StateList.d.ts.map

package/script/models/trellis/rpc/StateList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StateList.d.ts","sourceRoot":"","sources":["../../../../../models/trellis/rpc/StateList.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAM5C,eAAO,MAAM,eAAe;;;;;;IAM1B,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;AAE5D,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;IAWlC,CAAC;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC"}
+{"version":3,"file":"StateList.d.ts","sourceRoot":"","sources":["../../../../../models/trellis/rpc/StateList.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAI5C,eAAO,MAAM,eAAe;;;;;EAK1B,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;AAE5D,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;EAYlC,CAAC;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC"}

package/script/models/trellis/rpc/StateList.js

@@ -5,22 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StateListResponseSchema = exports.StateListSchema = void 0;
 const typebox_1 = __importDefault(require("typebox"));
-const contracts_ts_1 = require("../../../contracts.js");
 const State_ts_1 = require("../State.js");
-const Paginate_ts_1 = require("../Paginate.js");
-exports.StateListSchema = typebox_1.default.Intersect([
-    Paginate_ts_1.PaginateSchema,
-    typebox_1.default.Object({
-        store: typebox_1.default.String({ minLength: 1 }),
-        prefix: typebox_1.default.Optional(typebox_1.default.String({ minLength: 1 })),
-    }),
-]);
-exports.StateListResponseSchema = typebox_1.default.Intersect([
-    contracts_ts_1.PaginatedSchema,
-    typebox_1.default.Object({
-        entries: typebox_1.default.Array(typebox_1.default.Union([
-            State_ts_1.StateEntrySchema,
-            State_ts_1.StateMigrationRequiredSchema,
-        ]), { default: [] }),
-    }),
-]);
+exports.StateListSchema = typebox_1.default.Object({
+    offset: typebox_1.default.Optional(typebox_1.default.Integer({ minimum: 0 })),
+    limit: typebox_1.default.Integer({ minimum: 0 }),
+    store: typebox_1.default.String({ minLength: 1 }),
+    prefix: typebox_1.default.Optional(typebox_1.default.String({ minLength: 1 })),
+});
+exports.StateListResponseSchema = typebox_1.default.Object({
+    entries: typebox_1.default.Array(typebox_1.default.Union([
+        State_ts_1.StateEntrySchema,
+        State_ts_1.StateMigrationRequiredSchema,
+    ]), { default: [] }),
+    count: typebox_1.default.Integer({ minimum: 0 }),
+    offset: typebox_1.default.Integer({ minimum: 0 }),
+    limit: typebox_1.default.Integer({ minimum: 0 }),
+    nextOffset: typebox_1.default.Optional(typebox_1.default.Integer({ minimum: 0 })),
+});

package/script/npm/src/auth/browser/login.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../../src/auth/browser/login.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,iBAAiB,EAEtB,KAAK,YAAY,EAEjB,KAAK,mBAAmB,EAEzB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGrD,YAAY,EACV,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,YAAY,EACZ,mBAAmB,EACnB,gBAAgB,EAChB,aAAa,GACd,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA2BF,wBAAsB,aAAa,CACjC,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;AACnB,wBAAsB,aAAa,CACjC,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,gBAAgB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GACA,OAAO,CAAC,MAAM,CAAC,CAAC;AACnB,wBAAsB,aAAa,CACjC,IAAI,EAAE;IACJ,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,gBAAgB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GACA,OAAO,CAAC,MAAM,CAAC,CAAC;AA0CnB,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,gBAAgB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAgC7B;AAwCD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,YAAY,GACrB,QAAQ,IAAI,mBAAmB,CAEjC;AAED,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC,CAwBvB"}
+{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../../../src/auth/browser/login.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,iBAAiB,EAEtB,KAAK,YAAY,EAEjB,KAAK,mBAAmB,EAEzB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGrD,YAAY,EACV,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,YAAY,EACZ,mBAAmB,EACnB,gBAAgB,EAChB,aAAa,GACd,MAAM,eAAe,CAAC;AAEvB,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AA2BF,wBAAsB,aAAa,CACjC,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,CAAC;AACnB,wBAAsB,aAAa,CACjC,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,gBAAgB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GACA,OAAO,CAAC,MAAM,CAAC,CAAC;AACnB,wBAAsB,aAAa,CACjC,IAAI,EAAE;IACJ,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,gBAAgB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GACA,OAAO,CAAC,MAAM,CAAC,CAAC;AA0CnB,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,gBAAgB,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAqD7B;AA0ED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,YAAY,GACrB,QAAQ,IAAI,mBAAmB,CAEjC;AAED,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,CAAC,CAwBvB"}

package/script/npm/src/auth/browser/login.js

@@ -5,6 +5,7 @@ exports.startAuthRequest = startAuthRequest;
 exports.isBindSuccessResponse = isBindSuccessResponse;
 exports.bindFlow = bindFlow;
 const value_1 = require("typebox/value");
+const mod_js_1 = require("../../contract_support/mod.js");
 const schemas_js_1 = require("../schemas.js");
 const session_js_1 = require("./session.js");
 function contextRecord(value) {
@@ -41,26 +42,61 @@ async function buildLoginUrl(argsOrConfig, provider, redirectTo, handle, contrac
 }
 async function startAuthRequest(args) {
     const context = contextRecord(args.context);
-    const sig = await (0, session_js_1.oauthInitSig)(args.handle, args.redirectTo, context, args.provider, args.contract);
+    const contractDigest = isTrellisContractV1(args.contract)
+        ? (0, mod_js_1.digestContractManifest)(args.contract)
+        : undefined;
+    const sig = await (0, session_js_1.oauthInitSig)(args.handle, args.redirectTo, context, args.provider, contractDigest ?? args.contract);
     const request = value_1.Value.Parse(schemas_js_1.AuthStartRequestSchema, {
         redirectTo: args.redirectTo,
         sessionKey: (0, session_js_1.getPublicSessionKey)(args.handle),
         sig,
-        contract: args.contract,
+        ...(contractDigest ? { contractDigest } : { contract: args.contract }),
         ...(args.provider ? { provider: args.provider } : {}),
         ...(context ? { context } : {}),
     });
-    const response = await fetch(`${args.authUrl}/auth/requests`, {
+    let response = await fetch(`${args.authUrl}/auth/requests`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify(request),
     });
+    if (await authStartNeedsManifest(response)) {
+        const fullSig = await (0, session_js_1.oauthInitSig)(args.handle, args.redirectTo, context, args.provider, args.contract);
+        response = await fetch(`${args.authUrl}/auth/requests`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+                ...request,
+                sig: fullSig,
+                contract: args.contract,
+            }),
+        });
+    }
     if (!response.ok) {
         const text = await response.text();
         throw new Error(`Auth request failed: ${response.status} ${text}`);
     }
     return value_1.Value.Parse(schemas_js_1.AuthStartResponseSchema, await response.json());
 }
+async function authStartNeedsManifest(response) {
+    if (response.ok || response.status !== 409)
+        return false;
+    const clone = response.clone();
+    let payload;
+    try {
+        payload = await clone.json();
+    }
+    catch {
+        payload = undefined;
+    }
+    if (payload && typeof payload === "object") {
+        const record = payload;
+        return record.reason === "manifest_required" ||
+            record.code === "manifest_required" ||
+            record.error === "manifest_required" ||
+            record.message === "manifest_required";
+    }
+    return (await response.clone().text()).includes("manifest_required");
+}
 function buildLoginUrlArgsFromPositional(config, provider, redirectTo, handle, contract, context) {
     if (redirectTo === undefined || handle === undefined || contract === undefined) {
         throw new TypeError("buildLoginUrl requires redirectTo, handle, and contract");
@@ -74,6 +110,13 @@ function buildLoginUrlArgsFromPositional(config, provider, redirectTo, handle, c
         context,
     };
 }
+function isTrellisContractV1(contract) {
+    return contract.format === "trellis.contract.v1" &&
+        typeof contract.id === "string" &&
+        typeof contract.displayName === "string" &&
+        typeof contract.description === "string" &&
+        typeof contract.kind === "string";
+}
 function isNestedBuildLoginUrlArgs(value) {
     return "config" in value;
 }

package/script/npm/src/auth/browser/portal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"portal.d.ts","sourceRoot":"","sources":["../../../../../src/auth/browser/portal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAyB,MAAM,gBAAgB,CAAC;AAC7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAMtD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAE3D;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,eAAe,CAAC,CAY1B;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAKR;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,eAAe,CAAC,CAkB1B;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,eAAe,GAAG,IAAI,GAC5B,MAAM,GAAG,IAAI,CAEf"}
+{"version":3,"file":"portal.d.ts","sourceRoot":"","sources":["../../../../../src/auth/browser/portal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAyB,MAAM,gBAAgB,CAAC;AAC7E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAMtD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,GAAG,IAAI,CAE3D;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,eAAe,CAAC,CAY1B;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,MAAM,CAKR;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,eAAe,CAAC,CAkB1B;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,eAAe,GAAG,IAAI,GAC5B,MAAM,GAAG,IAAI,CAIf"}

package/script/npm/src/auth/browser/portal.js

@@ -36,5 +36,9 @@ async function submitPortalApproval(config, flowId, decision) {
     return value_1.Value.Parse(protocol_js_1.PortalFlowStateSchema, await response.json());
 }
 function portalRedirectLocation(state) {
-    return state?.status === "redirect" ? state.location : null;
+    if (state?.status === "redirect")
+        return state.location;
+    if (state?.status === "approval_denied")
+        return state.returnLocation ?? null;
+    return null;
 }

package/script/npm/src/auth/browser/session.d.ts

@@ -3,16 +3,27 @@ export type SessionKeyHandle = {
     publicKey: CryptoKey;
     publicKeyRaw: Uint8Array;
     sessionKey: string;
+    persistence?: SessionKeyPersistenceMode;
+    expiresAt?: number;
 };
-export declare function generateSessionKey(): Promise<SessionKeyHandle>;
-export declare function loadSessionKey(): Promise<SessionKeyHandle | null>;
-export declare function getOrCreateSessionKey(): Promise<SessionKeyHandle>;
+export type SessionKeyPersistenceMode = "temporary" | "remembered";
+export type SessionKeyOptions = {
+    /** Defaults to remembered IndexedDB storage. */
+    persistence?: SessionKeyPersistenceMode;
+    /** Expiry for remembered keys, as epoch milliseconds or a Date. */
+    expiresAt?: number | Date;
+    /** Relative expiry for remembered keys. Ignored when expiresAt is set. */
+    ttlMs?: number;
+};
+export declare function generateSessionKey(options?: SessionKeyOptions): Promise<SessionKeyHandle>;
+export declare function loadSessionKey(options?: Pick<SessionKeyOptions, "persistence">): Promise<SessionKeyHandle | null>;
+export declare function getOrCreateSessionKey(options?: SessionKeyOptions): Promise<SessionKeyHandle>;
 export declare function signBytes(handle: SessionKeyHandle, data: Uint8Array): Promise<Uint8Array>;
 export declare function getPublicSessionKey(handle: SessionKeyHandle): string;
-export declare function oauthInitSig(handle: SessionKeyHandle, redirectTo: string, context?: unknown, provider?: string, contract?: Record<string, unknown>): Promise<string>;
+export declare function oauthInitSig(handle: SessionKeyHandle, redirectTo: string, context?: unknown, provider?: string, contract?: Record<string, unknown> | string): Promise<string>;
 export declare function bindFlowSig(handle: SessionKeyHandle, flowId: string): Promise<string>;
 export declare function natsConnectSigForIat(handle: SessionKeyHandle, iat: number, contractDigest: string): Promise<string>;
-export declare function createRpcProof(handle: SessionKeyHandle, subject: string, payload: Uint8Array): Promise<string>;
-export declare function clearSessionKey(): Promise<void>;
-export declare function hasSessionKey(): Promise<boolean>;
+export declare function createRpcProof(handle: SessionKeyHandle, subject: string, payload: Uint8Array, requestId: string, iat: number): Promise<string>;
+export declare function clearSessionKey(options?: Pick<SessionKeyOptions, "persistence">): Promise<void>;
+export declare function hasSessionKey(options?: Pick<SessionKeyOptions, "persistence">): Promise<boolean>;
 //# sourceMappingURL=session.d.ts.map

package/script/npm/src/auth/browser/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../../src/auth/browser/session.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,UAAU,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAoBpE;AAED,wBAAsB,cAAc,IAAI,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CASvE;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAIvE;AAED,wBAAsB,SAAS,CAC7B,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAEpE;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,gBAAgB,EACxB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjC,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAIjB;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,cAAc,CAClC,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAErD;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,CAEtD"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../../src/auth/browser/session.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,SAAS,CAAC;IACtB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,UAAU,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,yBAAyB,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG,WAAW,GAAG,YAAY,CAAC;AAEnE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,gDAAgD;IAChD,WAAW,CAAC,EAAE,yBAAyB,CAAC;IACxC,mEAAmE;IACnE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,0EAA0E;IAC1E,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAWF,wBAAsB,kBAAkB,CACtC,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,gBAAgB,CAAC,CA8B3B;AAED,wBAAsB,cAAc,CAClC,OAAO,GAAE,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAM,GACnD,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAalC;AAED,wBAAsB,qBAAqB,CACzC,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,gBAAgB,CAAC,CAI3B;AAED,wBAAsB,SAAS,CAC7B,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,UAAU,GACf,OAAO,CAAC,UAAU,CAAC,CAOrB;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,CAEpE;AAED,wBAAsB,YAAY,CAChC,MAAM,EAAE,gBAAgB,EACxB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,OAAO,EACjB,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,GAC1C,OAAO,CAAC,MAAM,CAAC,CAUjB;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAIjB;AAED,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,cAAc,CAClC,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,UAAU,EACnB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,CAAC,CASjB;AAED,wBAAsB,eAAe,CACnC,OAAO,GAAE,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAM,GACnD,OAAO,CAAC,IAAI,CAAC,CAQf;AAED,wBAAsB,aAAa,CACjC,OAAO,GAAE,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAM,GACnD,OAAO,CAAC,OAAO,CAAC,CAIlB"}

package/script/npm/src/auth/browser/session.js

@@ -15,19 +15,42 @@ const utils_js_1 = require("../utils.js");
 const proof_js_1 = require("../proof.js");
 const session_auth_js_1 = require("../session_auth.js");
 const storage_js_1 = require("./storage.js");
-async function generateSessionKey() {
+let temporarySessionKey = null;
+function resolveExpiresAt(options) {
+    if (options.expiresAt instanceof Date)
+        return options.expiresAt.getTime();
+    if (typeof options.expiresAt === "number")
+        return options.expiresAt;
+    if (typeof options.ttlMs === "number")
+        return Date.now() + options.ttlMs;
+    return undefined;
+}
+async function generateSessionKey(options = {}) {
+    const persistence = options.persistence ?? "remembered";
+    const expiresAt = resolveExpiresAt(options);
     const keyPair = await crypto.subtle.generateKey({ name: "Ed25519" }, false, ["sign", "verify"]);
     const publicKeyRaw = new Uint8Array(await crypto.subtle.exportKey("raw", keyPair.publicKey));
     const sessionKey = (0, utils_js_1.base64urlEncode)(publicKeyRaw);
-    await (0, storage_js_1.storeKeyPair)(keyPair, publicKeyRaw);
-    return {
+    const handle = {
         privateKey: keyPair.privateKey,
         publicKey: keyPair.publicKey,
         publicKeyRaw,
         sessionKey,
+        persistence,
+        ...(expiresAt === undefined ? {} : { expiresAt }),
     };
+    if (persistence === "temporary") {
+        temporarySessionKey = handle;
+    }
+    else {
+        await (0, storage_js_1.storeKeyPair)(keyPair, publicKeyRaw, { expiresAt });
+    }
+    return handle;
 }
-async function loadSessionKey() {
+async function loadSessionKey(options = {}) {
+    const persistence = options.persistence ?? "remembered";
+    if (persistence === "temporary")
+        return temporarySessionKey;
     const stored = await (0, storage_js_1.loadKeyPair)();
     if (!stored)
         return null;
@@ -36,13 +59,15 @@ async function loadSessionKey() {
         publicKey: stored.publicKey,
         publicKeyRaw: stored.publicKeyRaw,
         sessionKey: (0, utils_js_1.base64urlEncode)(stored.publicKeyRaw),
+        persistence: "remembered",
+        ...(stored.expiresAt === undefined ? {} : { expiresAt: stored.expiresAt }),
     };
 }
-async function getOrCreateSessionKey() {
-    const existing = await loadSessionKey();
+async function getOrCreateSessionKey(options = {}) {
+    const existing = await loadSessionKey(options);
     if (existing)
         return existing;
-    return await generateSessionKey();
+    return await generateSessionKey(options);
 }
 async function signBytes(handle, data) {
     const sig = await crypto.subtle.sign({ name: "Ed25519" }, handle.privateKey, (0, utils_js_1.toArrayBuffer)(data));
@@ -70,17 +95,28 @@ async function natsConnectSigForIat(handle, iat, contractDigest) {
     const sig = await signBytes(handle, digest);
     return (0, utils_js_1.base64urlEncode)(sig);
 }
-async function createRpcProof(handle, subject, payload) {
+async function createRpcProof(handle, subject, payload, requestId, iat) {
     const payloadHash = await (0, utils_js_1.sha256)(payload);
     return await (0, proof_js_1.createProof)(handle.privateKey, {
         sessionKey: handle.sessionKey,
         subject,
         payloadHash,
+        iat,
+        requestId,
     });
 }
-async function clearSessionKey() {
-    await (0, storage_js_1.deleteKeyPair)();
+async function clearSessionKey(options = {}) {
+    const persistence = options.persistence;
+    if (persistence === undefined || persistence === "temporary") {
+        temporarySessionKey = null;
+    }
+    if (persistence === undefined || persistence === "remembered") {
+        await (0, storage_js_1.deleteKeyPair)();
+    }
 }
-async function hasSessionKey() {
+async function hasSessionKey(options = {}) {
+    const persistence = options.persistence ?? "remembered";
+    if (persistence === "temporary")
+        return temporarySessionKey !== null;
     return await (0, storage_js_1.hasKeyPair)();
 }

package/script/npm/src/auth/browser/storage.d.ts

@@ -4,8 +4,13 @@ export type StoredKeyPair = {
     publicKey: CryptoKey;
     publicKeyRaw: Uint8Array;
     createdAt: number;
+    persistence?: "remembered";
+    expiresAt?: number;
 };
-export declare function storeKeyPair(keyPair: CryptoKeyPair, publicKeyRaw: Uint8Array): Promise<void>;
+export type StoredKeyPairOptions = {
+    expiresAt?: number;
+};
+export declare function storeKeyPair(keyPair: CryptoKeyPair, publicKeyRaw: Uint8Array, options?: StoredKeyPairOptions): Promise<void>;
 export declare function loadKeyPair(): Promise<StoredKeyPair | null>;
 export declare function deleteKeyPair(): Promise<void>;
 export declare function hasKeyPair(): Promise<boolean>;