@voltro/protocol 0.74.0 → 0.76.0

package/dist/rest.js

@@ -1,4 +1,4 @@
-import { I as e, L as t } from "./scopes-Dj7KCJab.js";
+import { I as e, L as t } from "./scopes-D2dnEr4U.js";
 import { C as n, S as r, T as i, _ as a, a as o, c as s, d as c, f as l, i as u, l as d, n as f, o as p, r as m, s as h, t as g, u as _, v, w as y } from "./restFormat-ChSVyufA.js";
 import { Effect as b, ParseResult as x, Schema as S } from "effect";
 import * as C from "effect/SchemaAST";

package/dist/{scopes-Dj7KCJab.js → scopes-D2dnEr4U.js}

@@ -63,7 +63,7 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 	tenantId: n.Null,
 	scopes: c,
 	metadata: n.optional(s)
-}), ee = n.Union(l, u, d, f, p), m = n.Union(l.omit("scopes"), u.omit("scopes"), d.omit("scopes"), f, p.omit("scopes")), h = (e) => {
+}), m = n.Union(l, u, d, f, p), h = n.Union(l.omit("scopes"), u.omit("scopes"), d.omit("scopes"), f, p.omit("scopes")), ee = (e) => {
 	if (e.type === "anonymous") return e;
 	let { scopes: t, ...n } = e;
 	return n;
@@ -72,32 +72,35 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 	id: null,
 	tenantId: e,
 	...t === void 0 ? {} : { credentialRejected: t }
-}), te = (e, t = ["admin:full"]) => ({
+}), v = (e, t = ["admin:full"]) => ({
 	type: "system",
 	id: e,
 	tenantId: null,
 	scopes: t
-}), v = (e) => {
+}), y = (e) => {
 	if (e.type === "system") return null;
 	if (e.type === "serviceAccount" && e.auditActorId !== void 0) return e.auditActorId;
 	if (e.type !== "apiKey") return e.id;
 	let t = e.metadata?.userId;
 	return typeof t == "string" && t !== "" ? t : e.id;
-}, ne = (e, t) => {
+}, te = (e, t) => {
 	let n = e;
 	return {
 		type: "serviceAccount",
 		id: e.id ?? "system",
 		tenantId: t,
-		auditActorId: v(e),
+		auditActorId: y(e),
 		scopes: g(e),
 		...n.metadata === void 0 ? {} : { metadata: n.metadata }
 	};
-}, re = (e) => e.type === "system", ie = "impersonation", ae = (e) => e.metadata?.impersonation ?? null, y = class extends e.Tag("@voltro/Subject")() {}, b = class extends e.Tag("@voltro/ConnectionInfo")() {}, oe = class extends r.Tag()("@voltro/AuthMiddleware", { provides: y }) {}, x = class extends r.Tag()("@voltro/ConnectionInfoMiddleware", { provides: b }) {}, S = (e) => typeof e.mountRoutes == "function", se = (e) => Array.isArray(e) ? {
+}, ne = (e) => e.type === "system", b = "impersonation", x = (e) => e.metadata?.impersonation ?? null, S = class extends e.Tag("@voltro/Subject")() {}, C = class extends e.Tag("@voltro/ConnectionInfo")() {}, w = class extends n.TaggedError()("Unauthenticated", { reason: n.optional(n.String) }) {}, T = class extends r.Tag()("@voltro/AuthMiddleware", {
+	provides: S,
+	failure: w
+}) {}, re = class extends r.Tag()("@voltro/ConnectionInfoMiddleware", { provides: C }) {}, ie = (e) => typeof e.mountRoutes == "function", ae = (e) => Array.isArray(e) ? {
 	kind: "grant",
 	scopes: e
-} : e, C = (e, t) => {
-	if (t.kind === "vetoed") throw new A({ reason: `${t.code}: ${t.message}` });
+} : e, E = (e, t) => {
+	if (t.kind === "vetoed") throw new w({ reason: `${t.code}: ${t.message}` });
 	if (e.type === "anonymous") return {
 		subject: e,
 		removed: []
@@ -125,13 +128,13 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 		},
 		removed: i
 	};
-}, w = 3e4, T = 1e4, E = (e) => `${e.type}\u0000${e.tenantId ?? ""}\u0000${e.id ?? ""}`, ce = () => {
+}, oe = 3e4, se = 1e4, D = (e) => `${e.type}\u0000${e.tenantId ?? ""}\u0000${e.id ?? ""}`, ce = () => {
 	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 = {}) => {
+}, O = (e = {}) => {
 	let t = e.ttlMs ?? ce() ?? 3e4, n = e.maxEntries ?? 1e4, r = e.now ?? Date.now, i = /* @__PURE__ */ new Map(), a = () => {
 		if (i.size <= n) return;
 		let e = r();
@@ -200,40 +203,40 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 		}
 		return e;
 	}
-}, O = (e, t) => {
+}, k = (e, t) => {
 	let n = ue(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))];
-}, k = (e, t) => {
+}, A = (e, t) => {
 	let n = t?.resolveScopes, r = t?.subjectGuards ?? [];
 	if (t?.memberships === void 0 != (t?.tenantSelection === void 0)) throw Error("composeAuthStrategies: `memberships` and `tenantSelection` come together — a tenant selection is verified against the memberships and read from the store; configure both or neither.");
 	let i = t?.memberships !== void 0 && t.tenantSelection !== void 0 ? {
 		memberships: t.memberships,
 		store: t.tenantSelection
-	} : void 0, a = n !== void 0 || r.length > 0, o = !a || t?.scopeCache === !1 ? null : t?.scopeCache !== void 0 && le(t.scopeCache) ? t.scopeCache : D(t?.scopeCache ?? {});
+	} : void 0, a = n !== void 0 || r.length > 0, o = !a || t?.scopeCache === !1 ? null : t?.scopeCache !== void 0 && le(t.scopeCache) ? t.scopeCache : O(t?.scopeCache ?? {});
 	return async (s) => {
 		let c = t?.getStore?.(), l = c === void 0 ? s : {
 			...s,
 			store: c
 		}, u;
-		for (let s of O(e, l.headers)) {
+		for (let s of k(e, l.headers)) {
 			let e = await s.resolve(l);
 			if (e.kind === "matched") {
 				let c = i === void 0 ? e.subject : await de(e.subject, l, i, (e) => (t?.onStrategyFailed?.({
 					strategyId: s.id,
 					reason: e
-				}), new A({ reason: e }))), u = c;
+				}), new w({ reason: e }))), u = c;
 				if (a) {
 					let e = async () => {
 						let e = n === void 0 ? {
 							kind: "grant",
 							scopes: []
-						} : se(await n(c, l));
+						} : ae(await n(c, l));
 						if (e.kind === "unavailable" || r.length === 0) return e;
-						let t = C(c, e).subject, i = {
+						let t = E(c, e).subject, i = {
 							origin: "request",
 							headers: l.headers,
 							clientId: l.clientId,
@@ -251,22 +254,22 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 					}, { decision: i, fresh: a } = o === null ? {
 						decision: await e(),
 						fresh: !0
-					} : await o.resolve(E(c), e);
+					} : await o.resolve(D(c), e);
 					if (i.kind === "vetoed") {
 						let e = `${i.code}: ${i.message}`;
 						throw t?.onStrategyFailed?.({
 							strategyId: s.id,
 							reason: e
-						}), new A({ reason: e });
+						}), new w({ reason: e });
 					}
 					if (i.kind === "unavailable") {
 						let e = `scope resolution unavailable: ${i.reason}`;
 						throw t?.onStrategyFailed?.({
 							strategyId: s.id,
 							reason: e
-						}), new A({ reason: e });
+						}), new w({ reason: e });
 					}
-					let d = C(c, i);
+					let d = E(c, i);
 					a && d.removed.length > 0 && t?.onScopesNarrowed?.({
 						strategyId: s.id,
 						subjectType: c.type,
@@ -295,14 +298,14 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 				credentialRejected: u
 			} : e };
 		}
-		if (u !== void 0) throw new A({ reason: `credential rejected: ${u}` });
+		if (u !== void 0) throw new w({ reason: `credential rejected: ${u}` });
 		if (t?.anonymousTenantId !== void 0) return { subject: _(t.anonymousTenantId) };
 		let d = l.headers["x-tenant"] ?? null;
-		if (d === null && t?.anonymousTenantRequired === !0) throw new A({ reason: "tenant required (x-tenant header missing)" });
+		if (d === null && t?.anonymousTenantRequired === !0) throw new w({ reason: "tenant required (x-tenant header missing)" });
 		return { subject: _(d) };
 	};
-}, A = class extends n.TaggedError()("Unauthenticated", { reason: n.optional(n.String) }) {}, j = (e, t) => {
-	if (e.type === "anonymous") throw new A(t === void 0 ? {} : { reason: t });
+}, j = (e, t) => {
+	if (e.type === "anonymous") throw new w(t === void 0 ? {} : { reason: t });
 }, M = "admin:full", N = "apikeys:issue:self", P = "apikeys:issue:org", F = "apikeys:issue:other", I = "devices:manage", L = class extends n.TaggedError()("ScopeError", {
 	required: n.String,
 	message: n.String
@@ -317,13 +320,13 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 }, H = (e, t) => {
 	let n = V(e);
 	return n.includes("admin:full") || n.includes(t);
-}, U = (e, t) => {
+}, fe = (e, t) => {
 	let n = R(e);
 	return n.includes("admin:full") || n.includes(t);
-}, fe = (e, n) => H(e, n) ? t.void : t.fail(new L({
+}, pe = (e, n) => H(e, n) ? t.void : t.fail(new L({
 	required: n,
 	message: `missing required scope '${n}'`
-})), W = (e, t) => {
+})), U = (e, t) => {
 	let n;
 	try {
 		n = typeof e.action == "function" ? e.action(t) : e.action;
@@ -338,9 +341,9 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 		message: "policy action selector returned no action"
 	});
 	return n;
-}, G = (e) => (typeof e.action == "string" || typeof e.action == "function") && typeof e.resourceType == "string", K = (e) => typeof e.open == "string", q = (e) => e.authenticated === !0, pe = (e) => ({ open: e }), J = (e) => typeof e == "string" ? [e] : e, Y, me = (e) => {
-	Y = e;
-}, he = (e) => Y === void 0 ? e.filter((e) => (e.guards ?? []).some((e) => !G(e) && e.resource !== void 0)).map((e) => e.tag) : [], ge = (e) => [
+}, W = (e) => (typeof e.action == "string" || typeof e.action == "function") && typeof e.resourceType == "string", G = (e) => typeof e.open == "string", K = (e) => e.authenticated === !0, me = (e) => ({ open: e }), q = (e) => typeof e == "string" ? [e] : e, J, he = (e) => {
+	J = e;
+}, ge = (e) => J === void 0 ? e.filter((e) => (e.guards ?? []).some((e) => !W(e) && e.resource !== void 0)).map((e) => e.tag) : [], _e = (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`] : [],
@@ -354,33 +357,33 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 	"    • 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"), _e = () => Y, X, ve = (e) => {
-	X = e;
-}, ye = () => X, Z = (e) => new L({
+].join("\n"), ve = () => J, Y, ye = (e) => {
+	Y = e;
+}, X = () => Y, Z = (e) => new L({
 	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) => {
 	let n = e.credentialRejected;
-	return n === void 0 ? t : new A({ reason: `${n} — the request carried a credential and it was REJECTED, so this caller resolved to anonymous. The guard then refused (${t.message}); the scope is not the problem. Re-authenticate and retry.` });
+	return n === void 0 ? t : new w({ reason: `${n} — the request carried a credential and it was REJECTED, so this caller resolved to anonymous. The guard then refused (${t.message}); the scope is not the problem. Re-authenticate and retry.` });
 }, $ = (e, t, n) => {
 	if (!t || t.length === 0) return n?.defaultDeny === !0 ? Z(n.procedure) : null;
 	for (let n of t) {
-		if (K(n)) continue;
-		if (q(n)) {
+		if (G(n)) continue;
+		if (K(n)) {
 			if (e.id !== null && e.id !== void 0) continue;
 			return Q(e, new L({
 				required: "authenticated",
 				message: "this procedure requires an authenticated caller"
 			}));
 		}
-		if (G(n)) {
+		if (W(n)) {
 			if (H(e, "admin:full")) continue;
 			return Q(e, new L({
 				required: `${n.resourceType}:${n.action}`,
 				message: `relationship guard '${n.action}' on '${n.resourceType}' cannot be checked synchronously`
 			}));
 		}
-		let t = J(n.scope);
+		let t = q(n.scope);
 		if (t.length === 0) continue;
 		let r = t.filter((t) => H(e, t));
 		if (!((n.mode ?? "all") === "any" ? r.length > 0 : r.length === t.length)) {
@@ -395,7 +398,7 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 }, be = (e, n, r) => {
 	let i;
 	try {
-		i = W(n, r);
+		i = U(n, r);
 	} catch (e) {
 		return t.succeed(e);
 	}
@@ -404,7 +407,7 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 		message: e
 	});
 	if (H(e, "admin:full")) return t.succeed(null);
-	let o = X;
+	let o = Y;
 	if (o === void 0) return t.succeed(a(`no policy resolver registered — cannot authorize '${i}' on '${n.resourceType}'`));
 	let s = n.resource(r);
 	return s === void 0 || s === "" ? t.succeed(a(`input does not identify a '${n.resourceType}' to authorize`)) : t.suspend(() => o({
@@ -415,23 +418,23 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 	})).pipe(t.catchAllCause(() => t.succeed(!1)), t.map((e) => e ? null : a(`no '${i}' relation on ${n.resourceType}:${s}`)));
 }, xe = (e, n, r, i) => {
 	if (!n || n.length === 0) return t.succeed($(e, n, i));
-	let a = Y;
-	return !n.some(G) && (!a || !n.some((e) => e.resource !== void 0)) ? t.succeed($(e, n, i)) : t.gen(function* () {
+	let a = J;
+	return !n.some(W) && (!a || !n.some((e) => e.resource !== void 0)) ? t.succeed($(e, n, i)) : t.gen(function* () {
 		for (let i of n) {
-			if (K(i)) continue;
-			if (q(i)) {
+			if (G(i)) continue;
+			if (K(i)) {
 				if (e.id !== null && e.id !== void 0) continue;
 				return Q(e, new L({
 					required: "authenticated",
 					message: "this procedure requires an authenticated caller"
 				}));
 			}
-			if (G(i)) {
+			if (W(i)) {
 				let t = yield* be(e, i, r);
 				if (t) return t;
 				continue;
 			}
-			let n = J(i.scope);
+			let n = q(i.scope);
 			if (n.length === 0) continue;
 			let o = i.resource ? i.resource(r) : void 0, s = [];
 			for (let r of n) {
@@ -461,4 +464,4 @@ var i = (e) => e.type === "user" || e.type === "apiKey" || e.type === "serviceAc
 	});
 };
 //#endregion
-export { o as $, T as A, k as B, B as C, oe as D, R as E, y as F, ae as G, re as H, A as I, h as J, E as K, _ as L, ie as M, ee as N, b as O, m as P, i as Q, C as R, W as S, me as T, D as U, S as V, O as W, ne as X, te as Y, a as Z, K as _, I as a, pe as b, $ as c, he as d, ye as f, q as g, U as h, N as i, w as j, x as k, xe as l, H as m, P as n, L as o, _e as p, v as q, F as r, ge as s, M as t, V as u, G as v, ve as w, fe as x, Z as y, j as z };
+export { o as $, se as A, A as B, B as C, T as D, R as E, S as F, x as G, ne as H, w as I, ee as J, D as K, _ as L, b as M, m as N, C as O, h as P, i as Q, E as R, U as S, he as T, O as U, ie as V, k as W, te as X, v as Y, a as Z, G as _, I as a, me as b, $ as c, ge as d, X as f, K as g, fe as h, N as i, oe as j, re as k, xe as l, H as m, P as n, L as o, ve as p, y as q, F as r, _e as s, M as t, V as u, W as v, ye as w, pe as x, Z as y, j as z };

package/dist/session.js

@@ -1,4 +1,4 @@
-import { E as e, J as t, P as n } from "./scopes-Dj7KCJab.js";
+import { E as e, J as t, P as n } from "./scopes-D2dnEr4U.js";
 import { Schema as r } from "effect";
 import { createHmac as i, timingSafeEqual as a } from "node:crypto";
 import { createLogger as o } from "@voltro/logger";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/protocol",
-  "version": "0.74.0",
+  "version": "0.76.0",
   "description": "The Voltro wire + plugin contract — defineQuery/Mutation/Action/Stream, definePlugin, sessions / JWT / API-keys, and the RPC protocol.",
   "keywords": [
     "voltro",
@@ -65,14 +65,14 @@
   "dependencies": {
     "@effect/experimental": "^0.61.1",
     "@effect/sql": "^0.52.1",
-    "@voltro/database": "0.74.0",
-    "@voltro/logger": "0.74.0",
-    "jose": "^6.2.10"
+    "@voltro/database": "0.76.0",
+    "@voltro/logger": "0.76.0",
+    "jose": "^6.2.12"
   },
   "peerDependencies": {
-    "@effect/platform": "^0.97.1",
+    "@effect/platform": "^0.97.2",
     "@effect/rpc": "^0.76.2",
-    "effect": "^3.22.1"
+    "effect": "^3.22.2"
   },
   "publishConfig": {
     "access": "public"