@prampta/sdk 0.11.0 → 0.11.1

package/README.md

@@ -40,8 +40,9 @@ exists solely so an already-connected provider keeps working mid-migration.
 
 `createPregen` speaks the simplified PRE-GEN v5 formats at `/v2`: signed
 answers bound to your request, signed reports, signed acknowledgements. Set it
-up once; wrap each generation in one call. Use 0.11.0 or later: 0.10.0 had
-defects found by an external review (see CHANGELOG).
+up once; wrap each generation in one call. Use 0.11.1 or later: 0.10.0 and
+0.11.0 had defects found by external reviews (see CHANGELOG). A complete
+program you can run as it stands: https://prampta.com/get-started-v2.md.
 
 ```typescript
 import pg from "pg";
@@ -52,7 +53,8 @@ const pregen = createPregen({
   providerId: "my-ai",
   token: process.env.PRAMPTA_TOKEN!,                      // your exchange_secret, server-side only
   providerSigningKeyHex: process.env.PREGEN_SIGNING_KEY!, // your Ed25519 private key (32 bytes hex): signs your reports
-  pregenDirectory: await loadPregenDirectory({ previous: saved }), // PRAMPTA's keys, namespaces, revocations
+  pregenDirectory: await loadPregenDirectory({ previous: lastAccepted }), // PRAMPTA's keys, namespaces, revocations;
+                                         // lastAccepted: the directory you saved last time (toJSON()), or undefined
   store: postgresStore(new pg.Pool()),                    // shared by all your workers; table pregen_jobs
 });
 

package/dist/index.js

@@ -494,11 +494,15 @@ async function verifyEnvelope(env, type, role, keyFor) {
   if (!ok) throw new PregenError("PG_SIGNATURE", `${type} signature does not verify`);
   return e.body;
 }
+var GRANT_FORMATS = {
+  // The id is the SHA-256 of the bytes the licence's registry countersigned.
+  "pg.license.v2": (g) => keysWithin(g, ["format", "id", "license_id"]) && typeof g.id === "string" && HEX64.test(g.id) && (g.license_id === void 0 || str(g.license_id))
+};
 function checkBasis(b) {
   if (!isObj(b)) return false;
   if (b.kind === "grant") {
     const g = b.grant;
-    return keysWithin(b, ["kind", "grant"]) && isObj(g) && keysWithin(g, ["format", "id", "license_id"]) && str(g.format) && typeof g.id === "string" && Object.values(g).every((v) => typeof v === "string");
+    return keysWithin(b, ["kind", "grant"]) && isObj(g) && typeof g.format === "string" && !!GRANT_FORMATS[g.format]?.(g);
   }
   return b.kind === "policy" && keysWithin(b, ["kind", "rule"]) && str(b.rule);
 }
@@ -579,6 +583,7 @@ function createPregen(config) {
   };
   const listed = dir?.registries.find((r) => sameBase(r.api));
   if (dir && !listed) fail2(`${base} is not a registry listed in the PRE-GEN directory`);
+  const registryCode = listed ? listed.prefix ? `PG-${listed.prefix}-0` : "PG-0" : "";
   const ready = (async () => {
     const registry = /* @__PURE__ */ new Map();
     for (const p of pins) registry.set(await keyIdOf(unhex(p)), unhex(p));
@@ -589,10 +594,9 @@ function createPregen(config) {
   async function keyFor(keyId) {
     const { registry } = await ready;
     if (pins.length) return registry.get(keyId);
-    const code = listed.prefix ? `PG-${listed.prefix}-0` : "PG-0";
     let p = fromDirectory.get(keyId);
     if (!p) {
-      p = dir.publicKey(code, keyId).then(unhex, () => {
+      p = dir.publicKey(registryCode, keyId).then(unhex, () => {
         fromDirectory.delete(keyId);
         return void 0;
       });
@@ -600,7 +604,7 @@ function createPregen(config) {
     }
     return p;
   }
-  const directoryVerdict = (subject, keyId) => !dir || !isPgCode(subject) ? "valid" : dir.checkSigner(subject, keyId);
+  const directoryVerdict = (subject, keyId) => !dir ? "valid" : dir.checkSigner(isPgCode(subject) ? subject : registryCode, keyId);
   async function post(path, payload) {
     const resp = await fetch(base + path, {
       method: "POST",
@@ -676,12 +680,11 @@ function createPregen(config) {
     return { subject: a.request.subject_ref, answerStatus: a.answer?.body.status ?? "none", report: await seal("pg.report.v1", body) };
   }
   async function checkAck(r, env) {
-    const { keyId } = await ready;
     const ack = await verifyEnvelope(env, "pg.report_ack.v1", "registry", keyFor);
     const verdict = directoryVerdict(r.subject, ack.signers[0].key_id);
     if (verdict !== "valid") throw new PregenError(`PG_KEY_${verdict.toUpperCase()}`, "the directory does not list this key");
     if (Object.keys(ack).sort().join() !== [...ACK_FIELDS].sort().join()) throw malformed("acknowledgement fields");
-    if (ack.report !== await messageId("pg.report.v1", r.report.body) || ack.answer !== r.report.body.answer || ack.answer_status !== r.answerStatus || ack.provider_key_id !== keyId) {
+    if (ack.report !== await messageId("pg.report.v1", r.report.body) || ack.answer !== r.report.body.answer || ack.answer_status !== r.answerStatus || ack.provider_key_id !== r.report.body.signers?.[0]?.key_id) {
       throw new PregenError("PG_BINDING", "the acknowledgement is not for this report");
     }
     if (!(ack.counted === null || HEX64.test(ack.counted)) || !Array.isArray(ack.released) || !ack.released.every((x) => typeof x === "string" && HEX64.test(x)) || !Number.isSafeInteger(ack.received_at)) {

package/dist/index.mjs

@@ -429,11 +429,15 @@ async function verifyEnvelope(env, type, role, keyFor) {
   if (!ok) throw new PregenError("PG_SIGNATURE", `${type} signature does not verify`);
   return e.body;
 }
+var GRANT_FORMATS = {
+  // The id is the SHA-256 of the bytes the licence's registry countersigned.
+  "pg.license.v2": (g) => keysWithin(g, ["format", "id", "license_id"]) && typeof g.id === "string" && HEX64.test(g.id) && (g.license_id === void 0 || str(g.license_id))
+};
 function checkBasis(b) {
   if (!isObj(b)) return false;
   if (b.kind === "grant") {
     const g = b.grant;
-    return keysWithin(b, ["kind", "grant"]) && isObj(g) && keysWithin(g, ["format", "id", "license_id"]) && str(g.format) && typeof g.id === "string" && Object.values(g).every((v) => typeof v === "string");
+    return keysWithin(b, ["kind", "grant"]) && isObj(g) && typeof g.format === "string" && !!GRANT_FORMATS[g.format]?.(g);
   }
   return b.kind === "policy" && keysWithin(b, ["kind", "rule"]) && str(b.rule);
 }
@@ -514,6 +518,7 @@ function createPregen(config) {
   };
   const listed = dir?.registries.find((r) => sameBase(r.api));
   if (dir && !listed) fail2(`${base} is not a registry listed in the PRE-GEN directory`);
+  const registryCode = listed ? listed.prefix ? `PG-${listed.prefix}-0` : "PG-0" : "";
   const ready = (async () => {
     const registry = /* @__PURE__ */ new Map();
     for (const p of pins) registry.set(await keyIdOf(unhex(p)), unhex(p));
@@ -524,10 +529,9 @@ function createPregen(config) {
   async function keyFor(keyId) {
     const { registry } = await ready;
     if (pins.length) return registry.get(keyId);
-    const code = listed.prefix ? `PG-${listed.prefix}-0` : "PG-0";
     let p = fromDirectory.get(keyId);
     if (!p) {
-      p = dir.publicKey(code, keyId).then(unhex, () => {
+      p = dir.publicKey(registryCode, keyId).then(unhex, () => {
         fromDirectory.delete(keyId);
         return void 0;
       });
@@ -535,7 +539,7 @@ function createPregen(config) {
     }
     return p;
   }
-  const directoryVerdict = (subject, keyId) => !dir || !isPgCode(subject) ? "valid" : dir.checkSigner(subject, keyId);
+  const directoryVerdict = (subject, keyId) => !dir ? "valid" : dir.checkSigner(isPgCode(subject) ? subject : registryCode, keyId);
   async function post(path, payload) {
     const resp = await fetch(base + path, {
       method: "POST",
@@ -611,12 +615,11 @@ function createPregen(config) {
     return { subject: a.request.subject_ref, answerStatus: a.answer?.body.status ?? "none", report: await seal("pg.report.v1", body) };
   }
   async function checkAck(r, env) {
-    const { keyId } = await ready;
     const ack = await verifyEnvelope(env, "pg.report_ack.v1", "registry", keyFor);
     const verdict = directoryVerdict(r.subject, ack.signers[0].key_id);
     if (verdict !== "valid") throw new PregenError(`PG_KEY_${verdict.toUpperCase()}`, "the directory does not list this key");
     if (Object.keys(ack).sort().join() !== [...ACK_FIELDS].sort().join()) throw malformed("acknowledgement fields");
-    if (ack.report !== await messageId("pg.report.v1", r.report.body) || ack.answer !== r.report.body.answer || ack.answer_status !== r.answerStatus || ack.provider_key_id !== keyId) {
+    if (ack.report !== await messageId("pg.report.v1", r.report.body) || ack.answer !== r.report.body.answer || ack.answer_status !== r.answerStatus || ack.provider_key_id !== r.report.body.signers?.[0]?.key_id) {
       throw new PregenError("PG_BINDING", "the acknowledgement is not for this report");
     }
     if (!(ack.counted === null || HEX64.test(ack.counted)) || !Array.isArray(ack.released) || !ack.released.every((x) => typeof x === "string" && HEX64.test(x)) || !Number.isSafeInteger(ack.received_at)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prampta/sdk",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "PRAMPTA SDK — authorization before generation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",