@orangecheck/me-client 0.36.0 → 0.37.0

package/README.md

@@ -90,7 +90,7 @@ export default withOcAuth(handler, {
 });
 ```
 
-Or set it in code with `requireBond: { minSats: 100_000, minDays: 30, maxAgeSecs: 3600 }`. ochk.io re-checks the coin when its last check is over ten minutes old; `maxAgeSecs` refuses a claim checked longer ago than you accept. From 0.28.0, an account below the floor gets `403 { ok: false, reason: 'bond_required', need: { min_sats, min_days }, have: { sats_floor, days_floor } | null, back_url }`: link the person to `back_url` to back their account. If the project's setting can't be read and never has been, the request gets `503 { reason: 'bond_policy_unavailable' }` rather than being let through unchecked. `readBondClaim(session)` and `bondMeets(session, { minSats, minDays, maxAgeSecs })` are exported for your own checks.
+Or set it in code with `requireBond: { minSats: 100_000, minDays: 30, maxAgeSecs: 3600 }`. ochk.io re-checks the coin when its last check is over ten minutes old; `maxAgeSecs` refuses a claim checked longer ago than you accept. From 0.28.0, an account below the floor gets `403 { ok: false, reason: 'bond_required', need: { min_sats, min_days }, have: { sats_floor, days_floor } | null, back_url }`: link the person to `back_url` to back their account. If the project's setting can't be read, the last one read stands for ten minutes; with none read in that time, a signed-in request gets `503 { reason: 'bond_policy_unavailable' }` rather than being let through unchecked. A request with no session is not held to the project's setting and never waits on it (0.37.0); pass `required: true` to answer it 401. `readBondClaim(session)` and `bondMeets(session, { minSats, minDays, maxAgeSecs })` are exported for your own checks.
 
 ## Pay your users, when you choose to
 

package/dist/server.d.mts

@@ -5,6 +5,7 @@ export { A as ActivityAttestation, a as ActivityAttestationBundle, b as Activity
 interface OcSessionOptions extends VerifyOcOptions {
     method?: string;
     projectKey?: string;
+    meOrigin?: string;
     revocation?: RevocationCheck | false;
 }
 declare function _resetSessionChecksForTests(): void;
@@ -34,7 +35,6 @@ interface WithOcAuthOptions extends OcSessionOptions {
         maxAgeSecs?: number;
     };
     projectKey?: string;
-    meOrigin?: string;
 }
 declare const BACK_ACCOUNT_URL = "https://ochk.app/me/account#backing";
 declare function withOcAuth<Req extends NextApiRequestLike = NextApiRequestLike, Res extends NextApiResponseLike = NextApiResponseLike>(handler: (req: WithOcSession<Req>, res: Res) => unknown, options?: WithOcAuthOptions): (req: Req, res: Res) => Promise<unknown>;

package/dist/server.d.ts

@@ -5,6 +5,7 @@ export { A as ActivityAttestation, a as ActivityAttestationBundle, b as Activity
 interface OcSessionOptions extends VerifyOcOptions {
     method?: string;
     projectKey?: string;
+    meOrigin?: string;
     revocation?: RevocationCheck | false;
 }
 declare function _resetSessionChecksForTests(): void;
@@ -34,7 +35,6 @@ interface WithOcAuthOptions extends OcSessionOptions {
         maxAgeSecs?: number;
     };
     projectKey?: string;
-    meOrigin?: string;
 }
 declare const BACK_ACCOUNT_URL = "https://ochk.app/me/account#backing";
 declare function withOcAuth<Req extends NextApiRequestLike = NextApiRequestLike, Res extends NextApiResponseLike = NextApiResponseLike>(handler: (req: WithOcSession<Req>, res: Res) => unknown, options?: WithOcAuthOptions): (req: Req, res: Res) => Promise<unknown>;

package/dist/server.js

@@ -575,11 +575,14 @@ var warnedUnchecked = false;
 function revocationFor(options) {
   if (options.revocation === false) return null;
   if (options.revocation) return options.revocation;
-  const key = options.projectKey ?? "";
+  const key = `${options.meOrigin ?? ""} ${options.projectKey ?? ""}`;
   if (!sessionChecks.has(key)) {
     sessionChecks.set(
       key,
-      authCore.integratorRevocationCheck(options.projectKey ? { projectKey: options.projectKey } : {})
+      authCore.integratorRevocationCheck({
+        ...options.projectKey ? { projectKey: options.projectKey } : {},
+        ...options.meOrigin ? { meOrigin: options.meOrigin } : {}
+      })
     );
   }
   const check = sessionChecks.get(key);
@@ -636,38 +639,49 @@ var unknownKeys = /* @__PURE__ */ new Map();
 var UNKNOWN_PROJECT = /* @__PURE__ */ Symbol("unknown_project");
 var POLICY_TTL_MS = 6e4;
 var POLICY_RETRY_MS = 1e4;
+var POLICY_MAX_STALE_MS = 6e5;
 var policies = /* @__PURE__ */ new Map();
+var isFloor = (n) => Number.isSafeInteger(n) && n >= 0;
+function readRequirement(body) {
+  const b = body;
+  if (!b || typeof b !== "object" || b.ok !== true || !("require_bond" in b)) return void 0;
+  if (b.require_bond === null) return null;
+  const r = b.require_bond;
+  if (!r || typeof r !== "object" || !isFloor(r.min_sats) || !isFloor(r.min_days)) return void 0;
+  return { minSats: r.min_sats, minDays: r.min_days };
+}
 async function projectRequirement(options) {
+  const base = (options.meOrigin ?? "https://me.ochk.io").replace(/\/$/, "");
   const key = options.projectKey;
-  const hit = policies.get(key);
+  const slot = `${base} ${key}`;
+  const hit = policies.get(slot);
   const now = Date.now();
-  if (unknownKeys.has(key) && now - unknownKeys.get(key) < POLICY_TTL_MS) return UNKNOWN_PROJECT;
+  const standing = () => hit?.at && now - hit.at < POLICY_MAX_STALE_MS ? hit.need : void 0;
+  if (unknownKeys.has(slot) && now - unknownKeys.get(slot) < POLICY_TTL_MS) return UNKNOWN_PROJECT;
   if (hit && now - hit.at < POLICY_TTL_MS) return hit.need;
-  if (hit?.failedAt && now - hit.failedAt < POLICY_RETRY_MS) return hit.at ? hit.need : void 0;
+  if (hit?.failedAt && now - hit.failedAt < POLICY_RETRY_MS) return standing();
   try {
-    const base = options.meOrigin ?? "https://me.ochk.io";
     const r = await fetch(`${base}/api/integrator/${encodeURIComponent(key)}/sign-in`, {
       signal: AbortSignal.timeout(4e3)
     });
     if (r.status === 404) {
-      if (!unknownKeys.has(key)) {
+      if (!unknownKeys.has(slot)) {
         console.error(
           `[@orangecheck/me-client] projectKey "${key}" is not a project. Copy yours from https://ochk.app/me/projects.`
         );
       }
-      unknownKeys.set(key, Date.now());
+      unknownKeys.set(slot, Date.now());
       return UNKNOWN_PROJECT;
     }
-    unknownKeys.delete(key);
+    unknownKeys.delete(slot);
     if (!r.ok) throw new Error(`HTTP ${r.status}`);
-    const j = await r.json();
-    const req = j.require_bond ?? null;
-    const need = req ? { minSats: req.min_sats, minDays: req.min_days } : null;
-    policies.set(key, { at: Date.now(), need });
+    const need = readRequirement(await r.json());
+    if (need === void 0) throw new Error("unexpected body");
+    policies.set(slot, { at: Date.now(), need });
     return need;
   } catch {
-    policies.set(key, { at: hit?.at ?? 0, need: hit?.need ?? null, failedAt: Date.now() });
-    return hit?.at ? hit.need : void 0;
+    policies.set(slot, { at: hit?.at ?? 0, need: hit?.need ?? null, failedAt: Date.now() });
+    return standing();
   }
 }
 async function bondNeed(options) {
@@ -676,10 +690,11 @@ async function bondNeed(options) {
   return null;
 }
 async function refusal(session, options) {
-  const need = await bondNeed(options);
   if (!session && options.required) {
     return { status: 401, body: { ok: false, reason: "unauthenticated" } };
   }
+  if (!session && !options.requireBond) return null;
+  const need = await bondNeed(options);
   if (need === UNKNOWN_PROJECT) {
     return { status: 500, body: { ok: false, reason: "unknown_project_key" } };
   }