@voltro/protocol 0.67.0 → 0.69.0

package/dist/rest.js

@@ -1,4 +1,4 @@
-import { F as e, P as t } from "./scopes-C86BDyNJ.js";
+import { F as e, P as t } from "./scopes-DVtiKKsm.js";
 import { c as n, l as r, o as i, s as a, t as o } from "./serverErrorBus-BTnTpMqj.js";
 import { Effect as s, Schema as c } from "effect";
 //#region src/publicApi.ts

package/dist/{scopes-C86BDyNJ.js → scopes-DVtiKKsm.js}

@@ -88,14 +88,14 @@ var i = n.Record({
 		},
 		removed: i
 	};
-}, T = 3e4, re = 1e4, E = (e) => `${e.type}\u0000${e.tenantId ?? ""}\u0000${e.id ?? ""}`, ie = () => {
+}, re = 3e4, ie = 1e4, T = (e) => `${e.type}\u0000${e.tenantId ?? ""}\u0000${e.id ?? ""}`, ae = () => {
 	if (typeof process > "u") return;
 	let e = process.env.VOLTRO_AUTH_SCOPE_CACHE_TTL_MS;
 	if (e === void 0 || e === "") return;
 	let t = Number(e);
 	return Number.isFinite(t) && t >= 0 ? t : void 0;
-}, D = (e = {}) => {
-	let t = e.ttlMs ?? ie() ?? 3e4, n = e.maxEntries ?? 1e4, r = e.now ?? Date.now, i = /* @__PURE__ */ new Map(), a = () => {
+}, E = (e = {}) => {
+	let t = e.ttlMs ?? ae() ?? 3e4, n = e.maxEntries ?? 1e4, r = e.now ?? Date.now, i = /* @__PURE__ */ new Map(), a = () => {
 		if (i.size <= n) return;
 		let e = r();
 		for (let [t, n] of i) n.freshUntil <= e && i.delete(t);
@@ -131,14 +131,24 @@ var i = n.Record({
 			};
 		}
 	};
-}, ae = (e) => typeof e.resolve == "function", O = (e, t) => {
-	let n = t?.resolveScopes, r = t?.subjectGuards ?? [], i = n !== void 0 || r.length > 0, a = !i || t?.scopeCache === !1 ? null : t?.scopeCache !== void 0 && ae(t.scopeCache) ? t.scopeCache : D(t?.scopeCache ?? {});
+}, oe = (e) => typeof e.resolve == "function", se = (e) => {
+	let t = e.authorization ?? e.Authorization;
+	if (t !== void 0) return /^Bearer\s+(.+)$/i.exec(t.trim())?.[1]?.trim();
+}, D = (e, t) => {
+	let n = se(t);
+	if (n === void 0) return e;
+	let r = e.filter((e) => e.claimsBearerPrefix !== void 0 && e.claimsBearerPrefix !== "" && n.startsWith(e.claimsBearerPrefix));
+	if (r.length === 0) return e;
+	let i = new Set(r);
+	return [...r, ...e.filter((e) => !i.has(e))];
+}, O = (e, t) => {
+	let n = t?.resolveScopes, r = t?.subjectGuards ?? [], i = n !== void 0 || r.length > 0, a = !i || t?.scopeCache === !1 ? null : t?.scopeCache !== void 0 && oe(t.scopeCache) ? t.scopeCache : E(t?.scopeCache ?? {});
 	return async (o) => {
 		let s = t?.getStore?.(), c = s === void 0 ? o : {
 			...o,
 			store: s
 		}, l;
-		for (let o of e) {
+		for (let o of D(e, c.headers)) {
 			let e = await o.resolve(c);
 			if (e.kind === "matched") {
 				let s = e.subject;
@@ -167,7 +177,7 @@ var i = n.Record({
 					}, { decision: l, fresh: u } = a === null ? {
 						decision: await i(),
 						fresh: !0
-					} : await a.resolve(E(e.subject), i);
+					} : await a.resolve(T(e.subject), i);
 					if (l.kind === "vetoed") {
 						let e = `${l.code}: ${l.message}`;
 						throw t?.onStrategyFailed?.({
@@ -235,9 +245,9 @@ var i = n.Record({
 }, H = (e, n) => B(e, n) ? t.void : t.fail(new F({
 	required: n,
 	message: `missing required scope '${n}'`
-})), U = (e) => typeof e.action == "string" && typeof e.resourceType == "string", W = (e) => typeof e.open == "string", G = (e) => e.authenticated === !0, K = (e) => ({ open: e }), q = (e) => typeof e == "string" ? [e] : e, J, oe = (e) => {
+})), U = (e) => typeof e.action == "string" && typeof e.resourceType == "string", W = (e) => typeof e.open == "string", G = (e) => e.authenticated === !0, K = (e) => ({ open: e }), q = (e) => typeof e == "string" ? [e] : e, J, ce = (e) => {
 	J = e;
-}, se = (e) => J === void 0 ? e.filter((e) => (e.guards ?? []).some((e) => !U(e) && e.resource !== void 0)).map((e) => e.tag) : [], ce = (e) => [
+}, le = (e) => J === void 0 ? e.filter((e) => (e.guards ?? []).some((e) => !U(e) && e.resource !== void 0)).map((e) => e.tag) : [], ue = (e) => [
 	`${e.length} procedure${e.length === 1 ? "" : "s"} declare a per-resource guard that nothing enforces:`,
 	...e.slice(0, 10).map((e) => `    ${e}`),
 	...e.length > 10 ? [`    … and ${e.length - 10} more`] : [],
@@ -251,9 +261,9 @@ var i = n.Record({
 	"    • setResourceScopeResolver((req) => Effect<boolean>) — answers \"does this",
 	"      subject hold `req.scope` on `req.resource`\" from your own tables.",
 	"    • Drop the `resource` extractor if a global scope check is what you meant."
-].join("\n"), le = () => J, Y, X = (e) => {
+].join("\n"), de = () => J, Y, fe = (e) => {
 	Y = e;
-}, ue = () => Y, Z = (e) => new F({
+}, X = () => Y, Z = (e) => new F({
 	required: "access-decision",
 	message: `${e ?? "this procedure"} declares no access decision: it has neither \`guards:\` nor \`openAccess:\`, and the app runs with \`security.defaultDeny\`. Add the scope(s) a caller must hold (\`guards: [{ scope: '…' }]\`), or declare it open on purpose with \`openAccess: '<why anyone may call this>'\`.`
 }), Q = (e, t) => {
@@ -289,7 +299,7 @@ var i = n.Record({
 		}
 	}
 	return null;
-}, de = (e, n, r) => {
+}, pe = (e, n, r) => {
 	let i = (e) => new F({
 		required: `${n.resourceType}:${n.action}`,
 		message: e
@@ -304,7 +314,7 @@ var i = n.Record({
 		resourceType: n.resourceType,
 		resourceId: o
 	})).pipe(t.catchAllCause(() => t.succeed(!1)), t.map((e) => e ? null : i(`no '${n.action}' relation on ${n.resourceType}:${o}`)));
-}, fe = (e, n, r, i) => {
+}, me = (e, n, r, i) => {
 	if (!n || n.length === 0) return t.succeed($(e, n, i));
 	let a = J;
 	return !n.some(U) && (!a || !n.some((e) => e.resource !== void 0)) ? t.succeed($(e, n, i)) : t.gen(function* () {
@@ -318,7 +328,7 @@ var i = n.Record({
 				}));
 			}
 			if (U(i)) {
-				let t = yield* de(e, i, r);
+				let t = yield* pe(e, i, r);
 				if (t) return t;
 				continue;
 			}
@@ -352,4 +362,4 @@ var i = n.Record({
 	});
 };
 //#endregion
-export { _ as A, g as B, oe as C, S as D, b as E, h as F, ee as G, v as H, w as I, te as K, A as L, f as M, y as N, re as O, k as P, O as R, X as S, x as T, E as U, D as V, p as W, U as _, F as a, H as b, fe as c, ue as d, le as f, W as g, G as h, M as i, d as j, T as k, z as l, V as m, N as n, ce as o, B as p, P as r, $ as s, j as t, se as u, Z as v, I as w, R as x, K as y, ne as z };
+export { _ as A, g as B, ce as C, S as D, b as E, h as F, p as G, D as H, w as I, ee as K, A as L, f as M, y as N, ie as O, k as P, O as R, fe as S, x as T, v as U, E as V, T as W, U as _, F as a, H as b, me as c, X as d, de as f, W as g, G as h, M as i, d as j, re as k, z as l, V as m, N as n, ue as o, B as p, te as q, P as r, $ as s, j as t, le as u, Z as v, I as w, R as x, K as y, ne as z };

package/dist/session.js

@@ -1,11 +1,11 @@
-import { M as e, W as t, w as n } from "./scopes-C86BDyNJ.js";
+import { G as e, M as t, w as n } from "./scopes-DVtiKKsm.js";
 import { Schema as r } from "effect";
 import { createHmac as i, timingSafeEqual as a } from "node:crypto";
 import { createLogger as o } from "@voltro/logger";
 //#region src/session.ts
 var s = o({ scope: "@voltro/protocol:session" }), c = 2, l = r.Struct({
 	v: r.Literal(2),
-	subject: e,
+	subject: t,
 	exp: r.Number,
 	iat: r.Number,
 	kid: r.optional(r.String)
@@ -38,14 +38,14 @@ var s = o({ scope: "@voltro/protocol:session" }), c = 2, l = r.Struct({
 }, C = 604800, w = .7, T = (e, t) => x(i("sha256", t).update(e).digest()), E = (e) => typeof e == "string" ? {
 	kid: "k0",
 	secret: e
-} : e, D = (e, r, i = {}) => {
+} : e, D = (t, r, i = {}) => {
 	let a = E(r);
 	if (!a.secret) throw Error("signSession: secret must be a non-empty string");
-	let o = n(e);
-	if (o.length > 0) throw Error(`signSession: refusing to mint a session cookie for a ${e.type} subject carrying ${o.length} scope(s) (${o.slice(0, 5).join(", ")}). A session cookie carries IDENTITY only — authority is resolved per request, so that removing a role takes effect on the session that already exists instead of in up to 7 days. Mint the session from the identity and move the scopes into the auth.resolveScopes resolver, which runs on every request and can be invalidated the moment a role changes.`);
+	let o = n(t);
+	if (o.length > 0) throw Error(`signSession: refusing to mint a session cookie for a ${t.type} subject carrying ${o.length} scope(s) (${o.slice(0, 5).join(", ")}). A session cookie carries IDENTITY only — authority is resolved per request, so that removing a role takes effect on the session that already exists instead of in up to 7 days. Mint the session from the identity and move the scopes into the auth.resolveScopes resolver, which runs on every request and can be invalidated the moment a role changes.`);
 	let s = i.ttlSeconds ?? C, c = Math.floor((i.now ?? Date.now)() / 1e3), l = {
 		v: 2,
-		subject: t(e),
+		subject: e(t),
 		exp: c + s,
 		iat: c,
 		...typeof r == "string" ? {} : { kid: a.kid }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/protocol",
-  "version": "0.67.0",
+  "version": "0.69.0",
   "description": "The Voltro wire + plugin contract — defineQuery/Mutation/Action/Stream, definePlugin, sessions / JWT / API-keys, and the RPC protocol.",
   "keywords": [
     "voltro",
@@ -59,8 +59,8 @@
   },
   "dependencies": {
     "@effect/sql": "^0.52.1",
-    "@voltro/database": "0.67.0",
-    "@voltro/logger": "0.67.0",
+    "@voltro/database": "0.69.0",
+    "@voltro/logger": "0.69.0",
     "jose": "^6.2.10"
   },
   "peerDependencies": {