@gerege-systems/eid-mongolia-sdk 0.15.0 → 0.15.2

package/dist/index.js

@@ -3,6 +3,13 @@ import {
   isMobileUserAgent,
   openOrShowQR
 } from "./chunk-REWNE7PO.js";
+import {
+  OID,
+  equal,
+  ocspRequest,
+  parseCertificate,
+  parseOCSPForCert
+} from "./chunk-52O3T7DZ.js";
 import {
   ApiError,
   AuthenticationError,
@@ -33,6 +40,13 @@ var Http = class {
   post(path, body, timeoutMs) {
     return this.json("POST", path, JSON.stringify(body), "application/json", timeoutMs);
   }
+  /** {@link post} + HTTP статус (201 / 200-г ялгах: `POST /pdf/signatures`). */
+  async postWithStatus(path, body, timeoutMs) {
+    const op = `POST ${maskPath(path)}`;
+    const res = await this.send("POST", path, JSON.stringify(body), "application/json", timeoutMs);
+    const text = new TextDecoder().decode(await readLimited(res, MAX_JSON_BYTES, op));
+    return { status: res.status, body: text ? JSON.parse(text) : {} };
+  }
   get(path, timeoutMs) {
     return this.json("GET", path, void 0, void 0, timeoutMs);
   }
@@ -346,12 +360,32 @@ function registrationFromCompleted(done, extra) {
   if (extra.medium) out.medium = extra.medium;
   if (extra.sessionID) out.sessionID = extra.sessionID;
   if (done.hasPage && done.pageSha256) out.pageSha256 = done.pageSha256;
-  if (done.priorCmsSha256.length) out.priorCmsSha256 = done.priorCmsSha256;
-  if (extra.priorRevisionSha256?.length) out.priorRevisionSha256 = extra.priorRevisionSha256;
+  if (extra.priorRevisionSha256?.length) {
+    if (done.priorCmsSha256.length) out.priorCmsSha256 = done.priorCmsSha256;
+    out.priorRevisionSha256 = extra.priorRevisionSha256;
+  } else if (done.priorCmsSha256.length) {
+    out.priorCmsSha256 = done.priorCmsSha256;
+    const rev = done.priorRevisionSha256 ?? [];
+    if (rev.length === done.priorCmsSha256.length) {
+      out.priorSignatures = done.priorCmsSha256.map((c, i) => ({ cmsSha256: c, revisionSha256: rev[i] }));
+    }
+  }
   if (extra.onBehalfOf) out.onBehalfOf = extra.onBehalfOf;
   if (extra.signerEtsi) out.signerEtsi = extra.signerEtsi;
   return out;
 }
+function priorSplits(n) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (let k = 1; k <= n; k++) {
+    seen.add((1 << k) - 1);
+    out.push(Array.from({ length: n }, (_, i) => i < k));
+  }
+  if (n <= 4) {
+    for (let m = 1; m < 1 << n; m++) if (!seen.has(m)) out.push(Array.from({ length: n }, (_, i) => (m & 1 << i) !== 0));
+  }
+  return out;
+}
 var HEX64 = /^[0-9a-f]{64}$/;
 var MAX_CMS_BYTES = 28672;
 function buildRegisterBody(input) {
@@ -553,16 +587,38 @@ var SignApi = class {
    * `/verify` «бүртгэлгүй» гэнэ.
    */
   async registerSignature(input) {
-    return this.registerBody(buildRegisterBody(input));
+    const body = buildRegisterBody(input);
+    const prior = input.priorSignatures ?? [];
+    if (input.priorRevisionSha256?.length || prior.length === 0 || prior.length !== input.revIndex - 1) return this.registerBody(body);
+    try {
+      return await this.registerBody(body);
+    } catch (first) {
+      if (!(first instanceof ApiError && first.code === "PRIOR_MISMATCH")) throw first;
+      for (const asRevision of priorSplits(prior.length)) {
+        const next = {
+          ...input,
+          priorSignatures: void 0,
+          priorCmsSha256: prior.filter((_, i) => !asRevision[i]).map((p) => p.cmsSha256),
+          priorRevisionSha256: prior.filter((_, i) => asRevision[i]).map((p) => p.revisionSha256)
+        };
+        try {
+          return await this.registerBody(buildRegisterBody(next));
+        } catch (e) {
+          if (!(e instanceof ApiError && e.code === "PRIOR_MISMATCH")) throw e;
+        }
+      }
+      throw first;
+    }
   }
   async registerBody(body) {
-    const raw = await this.http.post(routePath(RP_ROUTES.pdfSignatures), body);
+    const { status, body: raw } = await this.http.postWithStatus(routePath(RP_ROUTES.pdfSignatures), body);
     const r = rec2(raw);
     return {
       docID: String(r.docID ?? body.docID),
       revIndex: Number(r.revIndex ?? 0),
       registeredAt: typeof r.registeredAt === "string" ? r.registeredAt : "",
       verifyUrl: String(r.verifyUrl ?? ""),
+      created: status === 201,
       raw
     };
   }
@@ -1450,13 +1506,20 @@ var ResponseValidator = class {
    * "skipped" (hook алга). "revoked", мөн hard-fail горимд "unknown" → ValidationError; hook-ийн алдаа дамжина.
    */
   async checkRevocationStatus(cert) {
-    if (!this.revocation) return "skipped";
-    const status = await this.revocation(cert, this.findIssuer(cert));
+    return this.checkRevocationWith(cert, this.revocation, this.revocationMode);
+  }
+  /**
+   * {@link checkRevocationStatus}-тэй ижил, гэхдээ TrustConfig-ийн биш өгсөн checker ба горимоор (issuer-ийг trust
+   * pool-оос олно). checker алга бол "skipped"; горим анхдагч "hard-fail".
+   */
+  async checkRevocationWith(cert, checker, mode = "hard-fail") {
+    if (!checker) return "skipped";
+    const status = await checker(cert, this.findIssuer(cert));
     if (status === "good") return "good";
     if (status === "revoked") {
       throw new ValidationError("\u0413\u044D\u0440\u0447\u0438\u043B\u0433\u044D\u044D \u0446\u0443\u0446\u043B\u0430\u0433\u0434\u0441\u0430\u043D (revoked)");
     }
-    if (this.revocationMode === "hard-fail") {
+    if (mode === "hard-fail") {
       throw new ValidationError("\u0413\u044D\u0440\u0447\u0438\u043B\u0433\u044D\u044D\u043D\u0438\u0439 revocation \u0442\u04E9\u043B\u04E9\u0432 \u0442\u043E\u0433\u0442\u043E\u043E\u0433\u0434\u0441\u043E\u043D\u0433\u04AF\u0439 (hard-fail)");
     }
     return "unchecked";
@@ -1772,6 +1835,76 @@ var EidClient = class {
   }
 };
 
+// src/ocsp.ts
+import { createHash as createHash4 } from "crypto";
+var CACHE_TTL_MS = 5 * 6e4;
+var CACHE_MAX = 1024;
+var MAX_BYTES = 16 << 10;
+var CLOCK_SKEW_MS = 5 * 6e4;
+var MAX_AGE_MS = 48 * 36e5;
+function ocspRevocationChecker(opts = {}) {
+  const doFetch = opts.fetchImpl ?? globalThis.fetch;
+  const timeoutMs = opts.timeoutMs ?? 2e3;
+  const totalMs = Math.max(timeoutMs, 3e3);
+  const now = opts.now ?? Date.now;
+  const cache = /* @__PURE__ */ new Map();
+  async function ask(leaf, issuer) {
+    const body = await ocspRequest(leaf, issuer);
+    const deadline = Date.now() + totalMs;
+    for (const raw of leaf.ocspServers) {
+      const left = deadline - Date.now();
+      if (left <= 0) break;
+      try {
+        const u = new URL(raw);
+        if (u.protocol !== "http:" && u.protocol !== "https:") continue;
+        const res = await doFetch(u.toString(), {
+          method: "POST",
+          headers: { "Content-Type": "application/ocsp-request", Accept: "application/ocsp-response" },
+          body,
+          redirect: "manual",
+          signal: AbortSignal.timeout(Math.min(timeoutMs, left))
+        });
+        if (res.status !== 200) continue;
+        const der = new Uint8Array(await res.arrayBuffer());
+        if (der.length > MAX_BYTES) continue;
+        const resp = await parseOCSPForCert(der, leaf, issuer);
+        const t = now();
+        const rc = resp.certificate;
+        if (rc && !equal(rc.raw, issuer.raw)) {
+          if (!rc.extKeyUsage.includes(OID.kpOCSPSigning)) continue;
+          if (t < rc.notBefore.getTime() || t > rc.notAfter.getTime()) continue;
+        }
+        const tu = resp.thisUpdate.date.getTime();
+        if (tu > t + CLOCK_SKEW_MS || tu < t - MAX_AGE_MS) continue;
+        if (resp.nextUpdate && resp.nextUpdate.getTime() < t) continue;
+        return resp.status === "good" ? "good" : "revoked";
+      } catch {
+      }
+    }
+    return void 0;
+  }
+  return async (cert, issuer) => {
+    if (!issuer) return "unknown";
+    let leaf, iss;
+    try {
+      leaf = parseCertificate(new Uint8Array(cert.raw));
+      iss = parseCertificate(new Uint8Array(issuer.raw));
+    } catch {
+      return "unknown";
+    }
+    const key = createHash4("sha256").update(issuer.raw).digest("hex").slice(0, 16) + ":" + cert.serialNumber;
+    const exp = cache.get(key);
+    if (exp !== void 0 && now() < exp) return "good";
+    const status = await ask(leaf, iss);
+    if (!status) return "unknown";
+    if (status === "good") {
+      if (cache.size >= CACHE_MAX) cache.clear();
+      cache.set(key, now() + CACHE_TTL_MS);
+    }
+    return status;
+  };
+}
+
 // src/devicelinkv3.ts
 import { createHmac } from "crypto";
 var TYPES = ["QR", "Web2App", "App2App"];
@@ -1874,7 +2007,7 @@ function qrDeviceLinkTicker(input, onLink, opts) {
 }
 
 // src/login.ts
-import { createHash as createHash4, randomBytes as randomBytes2, timingSafeEqual as timingSafeEqual2 } from "crypto";
+import { createHash as createHash5, createHmac as createHmac2, randomBytes as randomBytes2, randomInt, randomUUID, timingSafeEqual as timingSafeEqual2 } from "crypto";
 function memoryLoginStore() {
   const m = /* @__PURE__ */ new Map();
   return {
@@ -1899,6 +2032,51 @@ function memoryLoginStore() {
     }
   };
 }
+var defaultRateLimit = Object.freeze({
+  push: Object.freeze({ limit: 3, windowMs: 6e4 })
+});
+var RATE_KINDS = ["start", "push"];
+function windowLimiter(limit, windowMs) {
+  const hits = /* @__PURE__ */ new Map();
+  return (key) => {
+    const now = Date.now();
+    const h = (hits.get(key) ?? []).filter((t) => now - t < windowMs);
+    if (hits.size > 1e4) hits.clear();
+    if (h.length >= limit) {
+      hits.set(key, h);
+      return false;
+    }
+    h.push(now);
+    hits.set(key, h);
+    return true;
+  };
+}
+function buildRateLimit(opt) {
+  const extra = typeof opt === "function" ? opt : void 0;
+  const user = opt && typeof opt === "object" ? opt : {};
+  for (const k of Object.keys(user)) {
+    if (!RATE_KINDS.includes(k)) throw new Error(`createEidLogin: rateLimit.${k} \u2014 \u0437\u04E9\u0432\u0445\u04E9\u043D start | push`);
+  }
+  const merged = { ...defaultRateLimit, ...user };
+  const perKind = /* @__PURE__ */ new Map();
+  for (const k of RATE_KINDS) {
+    const r = merged[k];
+    if (r === void 0 || r === false) continue;
+    if (typeof r === "function") {
+      perKind.set(k, r);
+      continue;
+    }
+    if (!(Number.isInteger(r.limit) && r.limit > 0 && r.windowMs > 0)) {
+      throw new Error(`createEidLogin: rateLimit.${k} \u2014 limit (\u0431\u04AF\u0445\u044D\u043B > 0), windowMs (> 0)`);
+    }
+    perKind.set(k, windowLimiter(r.limit, r.windowMs));
+  }
+  return async (key) => {
+    const fn = perKind.get(key.slice(0, key.indexOf(":")));
+    if (fn && !await fn(key)) return false;
+    return extra ? extra(key) : true;
+  };
+}
 var CALLBACK_PATH = "/auth/eid/callback";
 function forwardedClientIp(headers, trustProxy) {
   if (trustProxy === false || trustProxy === 0) return void 0;
@@ -1955,13 +2133,43 @@ function readCookie(h, name) {
   }
   return "";
 }
-var sha256hex = (s) => createHash4("sha256").update(s).digest("hex");
+var sha256hex = (s) => createHash5("sha256").update(s).digest("hex");
 function safeEqualHex(a, b) {
   const x = Buffer.from(a, "hex");
   const y = Buffer.from(b, "hex");
   return x.length === y.length && x.length > 0 && timingSafeEqual2(x, y);
 }
-function toIdentity(sessionId, r, v, flowType) {
+function sleep(ms2, signal) {
+  return new Promise((resolve) => {
+    if (ms2 <= 0 || signal?.aborted) return resolve();
+    const done = () => {
+      clearTimeout(t);
+      signal?.removeEventListener("abort", done);
+      resolve();
+    };
+    const t = setTimeout(done, ms2);
+    signal?.addEventListener("abort", done, { once: true });
+  });
+}
+function isRefusal(e) {
+  if (!(e instanceof ApiError) || e.status < 400 || e.status >= 500 || e.status === 401 || e.status === 403 || e.status === 429) {
+    return false;
+  }
+  try {
+    JSON.parse(e.body);
+    return true;
+  } catch {
+    return false;
+  }
+}
+var RevocationFailure = class extends ValidationError {
+  constructor(message, revoked) {
+    super(message);
+    this.revoked = revoked;
+  }
+  revoked;
+};
+function toIdentity(sessionId, r, v, flowType, revocation) {
   const s = v.parsedSubject;
   const etsi = s.serialNumber ?? "";
   const m = /^PNOMN-([0-9]+)$/.exec(etsi);
@@ -1977,7 +2185,8 @@ function toIdentity(sessionId, r, v, flowType) {
     certificateLevel: v.certificateLevel,
     certificateDerB64: r.certificateDerB64 ?? "",
     flowType,
-    person: personMatchesCertificate(r.person, s) ? r.person ?? null : null
+    person: personMatchesCertificate(r.person, s) ? r.person ?? null : null,
+    revocation
   };
 }
 function createEidLogin(opts) {
@@ -1998,17 +2207,29 @@ function createEidLogin(opts) {
   const successRedirect = opts.successRedirect ?? "/";
   const failureRedirect = opts.failureRedirect ?? "/";
   const onError = opts.onError ?? ((e) => console.error("eid-login:", e instanceof Error ? e.message : e));
-  const pushHits = /* @__PURE__ */ new Map();
-  const rateLimit = opts.rateLimit ?? ((key) => {
-    if (!key.startsWith("push:")) return true;
-    const now = Date.now();
-    const hits = (pushHits.get(key) ?? []).filter((t) => now - t < 6e4);
-    if (pushHits.size > 1e4) pushHits.clear();
-    if (hits.length >= 3) return false;
-    hits.push(now);
-    pushHits.set(key, hits);
-    return true;
-  });
+  const rateLimit = buildRateLimit(opts.rateLimit);
+  const decoyOn = opts.decoy !== false;
+  const pushFloorMs = opts.pushFloorMs ?? 1e3;
+  const revocation = opts.revocation === false ? void 0 : opts.revocation ?? ocspRevocationChecker();
+  const revocationMode = opts.revocationMode ?? "soft-fail";
+  const auditKey = opts.auditKey ?? randomBytes2(32);
+  const pushKey = (idCode) => createHmac2("sha256", auditKey).update(`eid-push-audit:${idCode}`).digest("hex").slice(0, 32);
+  async function emit(kind, sessionId, meta, ctx) {
+    if (!opts.onEvent) return;
+    try {
+      await opts.onEvent({ kind, sessionId, meta });
+    } catch (e) {
+      onError(e, ctx);
+    }
+  }
+  function endEvent(tx, endResult, ctx) {
+    const kind = endResult?.startsWith("USER_REFUSED") ? "refused" : endResult === "TIMEOUT" ? "expired" : "failed";
+    return emit(kind, tx.sessionId, { mode: tx.mode, endResult: endResult ?? "UNKNOWN" }, ctx);
+  }
+  function unverified(tx, e, ctx) {
+    const reason = e instanceof RevocationFailure ? e.revoked ? "revoked" : "revocation_unavailable" : "validation";
+    return emit("unverified", tx.sessionId, { mode: tx.mode, reason }, ctx);
+  }
   const displayText = (opts.displayText ?? `${client.rpName}-\u0434 \u043D\u044D\u0432\u0442\u0440\u044D\u0445`).slice(0, 60);
   const interactions = [{ type: "displayTextAndPIN", displayText60: displayText }];
   const json = (status2, body, extra = {}) => ({
@@ -2099,11 +2320,18 @@ function createEidLogin(opts) {
         });
       }
     }
+    return { ...await save(tx), appLink };
+  }
+  async function save(tx) {
     const binding = randomBytes2(32).toString("base64url");
     const full = { ...tx, bindingHash: sha256hex(binding), expiresAt: Date.now() + ttl };
     await store.set(full.sessionId, full, ttl);
     const setCookie = `${cookieName}=${full.sessionId}.${binding}; ${cookieAttrs(Math.ceil(ttl / 1e3))}`;
-    return { tx: full, setCookie, appLink };
+    return { tx: full, setCookie, appLink: void 0 };
+  }
+  function startDecoy() {
+    const acsp = void 0;
+    return save({ sessionId: randomUUID(), mode: "push", vc: String(randomInt(1e5)).padStart(5, "0"), acsp, decoy: true });
   }
   async function start(req) {
     const url = new URL(req.url, "http://x");
@@ -2133,18 +2361,36 @@ function createEidLogin(opts) {
     if (mode === "web2app" && !opts.callbackUrl) return json(400, { error: "web2app_not_configured" });
     const idCode = typeof body.idCode === "string" ? body.idCode.replace(/\s+/g, "").toUpperCase() : "";
     if (mode === "push" && !ID_RE.test(idCode)) return json(400, { error: "invalid_id" });
-    const limited = () => json(429, { error: "rate_limited" }, { "Retry-After": "60" });
+    const limited = async () => {
+      if (mode === "push") await emit("push_limited", null, { mode, pushKey: pushKey(idCode) }, ctx);
+      return json(429, { error: "rate_limited" }, { "Retry-After": "60" });
+    };
     const ip = req.ip || (opts.trustProxy ? forwardedClientIp(req.headers, opts.trustProxy) : void 0);
     if (ip && !await rateLimit(`start:${ip}`)) return limited();
     if (mode === "push" && !await rateLimit(`push:${idCode}`)) return limited();
+    const began = Date.now();
     let r;
+    let err;
+    let decoy = false;
     try {
       r = await begin(req, mode, idCode, lang);
     } catch (e) {
-      onError(e, ctx);
-      const status2 = e instanceof ApiError && e.status === 429 ? 429 : 502;
-      return json(status2, { error: status2 === 429 ? "rate_limited" : "eid_unavailable" });
+      err = e;
     }
+    if (err !== void 0 && mode === "push" && decoyOn && isRefusal(err)) {
+      const ae = err;
+      onError(new Error(`eid-login: eID push-\u0438\u0439\u0433 \u0442\u0430\u0442\u0433\u0430\u043B\u0437\u0430\u0432 (${ae.status}${ae.code ? ` ${ae.code}` : ""}); decoy session-\u043E\u043E\u0440 \u0445\u0430\u0440\u0438\u0443\u043B\u0430\u0432`), ctx);
+      err = void 0;
+      r = await startDecoy();
+      decoy = true;
+    }
+    if (mode === "push" && pushFloorMs > 0) await sleep(began + pushFloorMs - Date.now(), req.signal);
+    if (err !== void 0 || !r) {
+      onError(err, ctx);
+      if (err instanceof ApiError && err.status === 429) return limited();
+      return json(502, { error: "eid_unavailable" });
+    }
+    if (mode === "push") await emit("push_sent", r.tx.sessionId, { mode, pushKey: pushKey(idCode), decoy }, ctx);
     if (mode === "web2app") {
       return { status: 302, headers: { Location: r.appLink, "Cache-Control": "no-store", "Referrer-Policy": "no-referrer", "Set-Cookie": r.setCookie }, body: "" };
     }
@@ -2156,8 +2402,19 @@ function createEidLogin(opts) {
   }
   async function finish(req, tx, r, flow, verifier) {
     const v = client.validator.validateAuth(r, tx.acsp, { expectedFlowType: flow, userChallengeVerifier: verifier });
+    const ctx = { request: req, mode: tx.mode };
+    let rev;
+    let status2;
+    const checker = revocation && (async (c, i) => status2 = await revocation(c, i));
+    try {
+      rev = await client.validator.checkRevocationWith(v.certificate, checker, revocationMode);
+    } catch (e) {
+      throw new RevocationFailure(`revocation: ${e instanceof Error ? e.message : String(e)}`, status2 === "revoked");
+    }
+    if (rev === "unchecked") onError(new Error("eid-login: OCSP \u0445\u0430\u0440\u0438\u0443\u0433\u04AF\u0439 \u2014 \u0446\u0443\u0446\u043B\u0430\u043B\u0442 \u0448\u0430\u043B\u0433\u0430\u043B\u0433\u04AF\u0439 \u0437\u04E9\u0432\u0448\u04E9\u04E9\u0440\u04E9\u0432 (soft-fail)"), ctx);
     if (!await store.delete(tx.sessionId)) return void 0;
-    const out = await opts.onSuccess(toIdentity(tx.sessionId, r, v, flow), { request: req, mode: tx.mode }) ?? {};
+    const out = await opts.onSuccess(toIdentity(tx.sessionId, r, v, flow, rev), ctx) ?? {};
+    await emit("success", tx.sessionId, { mode: tx.mode, flow, revocation: rev }, ctx);
     return out;
   }
   async function status(req) {
@@ -2166,20 +2423,28 @@ function createEidLogin(opts) {
     if (!tx) return json(200, { state: "EXPIRED" }, { "Set-Cookie": clearCookie });
     const ctx = { request: req, mode: tx.mode };
     let r;
-    try {
-      r = await client.session.poll(tx.sessionId, pollMs);
-    } catch (e) {
-      if (e instanceof ApiError && e.status === 404) {
-        await store.delete(tx.sessionId);
-        return json(200, { state: "EXPIRED" }, { "Set-Cookie": clearCookie });
+    if (tx.decoy) {
+      await sleep(pollMs, req.signal);
+      r = { state: "RUNNING" };
+    } else {
+      try {
+        r = await client.session.poll(tx.sessionId, pollMs);
+      } catch (e) {
+        if (e instanceof ApiError && e.status === 404) {
+          await store.delete(tx.sessionId);
+          await emit("expired", tx.sessionId, { mode: tx.mode }, ctx);
+          return json(200, { state: "EXPIRED" }, { "Set-Cookie": clearCookie });
+        }
+        onError(e, ctx);
+        return json(502, { error: "eid_unavailable" });
       }
-      onError(e, ctx);
-      return json(502, { error: "eid_unavailable" });
     }
     const expiresIn = Math.max(0, Math.ceil((tx.expiresAt - Date.now()) / 1e3));
     if (r.state !== "COMPLETE") return json(200, { state: "PENDING", qr: qrLink(tx), vc: tx.vc, expiresIn });
     if (r.endResult !== "OK") {
       await store.delete(tx.sessionId);
+      await endEvent(tx, r.endResult, ctx);
+      if (tx.mode === "push" && r.endResult === "TIMEOUT") return json(200, { state: "EXPIRED" }, { "Set-Cookie": clearCookie });
       return json(200, { state: "FAILED", error: r.endResult ?? "UNKNOWN" }, { "Set-Cookie": clearCookie });
     }
     if (tx.mode === "web2app") return json(200, { state: "WAIT_CALLBACK" });
@@ -2191,6 +2456,7 @@ function createEidLogin(opts) {
       onError(e, ctx);
       if (!(e instanceof ValidationError || e instanceof SessionFailedError)) return json(500, { error: "internal" });
       await store.delete(tx.sessionId);
+      await unverified(tx, e, ctx);
       return json(200, { state: "FAILED", error: "VALIDATION" }, { "Set-Cookie": clearCookie });
     }
   }
@@ -2201,9 +2467,12 @@ function createEidLogin(opts) {
     const verifier = q.get("userChallengeVerifier") ?? "";
     const fail2 = (code) => redirect(failTo(code), { "Set-Cookie": clearCookie });
     const tx = await loadTx(req);
-    if (!tx || tx.sessionId !== sid || tx.mode !== "web2app") return fail2(tx ? "unbound" : "expired");
-    if (!verifier) return fail2("unbound");
+    if (!tx) return fail2("expired");
     const ctx = { request: req, mode: tx.mode };
+    if (tx.sessionId !== sid || tx.mode !== "web2app" || !verifier) {
+      await emit("flow_refused", tx.sessionId, { mode: tx.mode, reason: "unbound" }, ctx);
+      return fail2("unbound");
+    }
     let r;
     try {
       r = await client.session.poll(tx.sessionId, 1e4);
@@ -2214,6 +2483,7 @@ function createEidLogin(opts) {
     if (r.state !== "COMPLETE") return fail2("not_complete");
     if (r.endResult !== "OK") {
       await store.delete(tx.sessionId);
+      await endEvent(tx, r.endResult, ctx);
       return fail2(r.endResult ?? "UNKNOWN");
     }
     try {
@@ -2224,6 +2494,7 @@ function createEidLogin(opts) {
       onError(e, ctx);
       if (!(e instanceof ValidationError || e instanceof SessionFailedError)) return fail2("internal");
       await store.delete(tx.sessionId);
+      await unverified(tx, e, ctx);
       return fail2("VALIDATION");
     }
   }
@@ -2253,7 +2524,7 @@ function createEidLogin(opts) {
         mode: "qr"
       });
     }
-    const r = await handleRequest({ method: req.method, url: req.url, headers, body, ip });
+    const r = await handleRequest({ method: req.method, url: req.url, headers, body, ip, signal: req.signal });
     const h = new Headers();
     for (const [k, v] of Object.entries(r.headers)) for (const x of [v].flat()) h.append(k, x);
     return new Response(r.status === 302 || r.status === 303 || r.body === "" ? null : r.body, { status: r.status, headers: h });
@@ -2293,12 +2564,14 @@ export {
   buildDeviceLink,
   buildRegisterBody,
   createEidLogin,
+  defaultRateLimit,
   deviceLink,
   deviceLinkInput,
   forwardedClientIp,
   interactionsToBase64,
   isMobileUserAgent,
   memoryLoginStore,
+  ocspRevocationChecker,
   openOrShowQR,
   parseExpiresAt,
   parseRetryAfter,

package/dist/pades.cjs

@@ -3173,12 +3173,20 @@ function signatureCMSList(doc) {
     if (v.kind() !== "dict" || v.key("Contents").isNull() || v.key("ByteRange").isNull()) continue;
     const t = v.key("Type").name();
     if (t !== "" && t !== "Sig") continue;
+    let cms;
     try {
       const n = readNode(v.key("Contents").rawString(), 0);
-      out.push(n.tag === TAG.SEQUENCE ? n.raw : void 0);
+      cms = n.tag === TAG.SEQUENCE ? n.raw : void 0;
     } catch {
-      out.push(void 0);
+      cms = void 0;
     }
+    let end;
+    const br = v.key("ByteRange");
+    if (br.len() === 4 && br.index(2).kind() === "int" && br.index(3).kind() === "int") {
+      const e = br.index(2).int64() + br.index(3).int64();
+      if (e > 0 && e <= doc.length) end = e;
+    }
+    out.push({ cms, end });
   }
   return out;
 }
@@ -3489,9 +3497,13 @@ async function complete(state, signature, opts = {}) {
   }
   if (out.length > MAX_OUTPUT_BYTES) throw new PadesError("PDF_TOO_LARGE", "\u0433\u0430\u0440\u0430\u043B\u0442 10 MiB-\u0430\u0430\u0441 \u0438\u0445");
   const prior = [];
+  const priorRev = [];
   try {
     const list = signatureCMSList(signed);
-    for (const c of list.slice(0, -1)) prior.push(c ? toHex(await sha256(c)) : "");
+    for (const s of list.slice(0, -1)) {
+      prior.push(s.cms ? toHex(await sha256(s.cms)) : "");
+      priorRev.push(s.end !== void 0 ? toHex(await sha256(signed.subarray(0, s.end))) : "");
+    }
   } catch (e) {
     throw new PadesError("SELF_VALIDATION_FAILED", "\u0433\u0430\u0440\u0430\u043B\u0442\u044B\u0433 \u0437\u0430\u0434\u0430\u043B\u0436 \u0447\u0430\u0434\u0441\u0430\u043D\u0433\u04AF\u0439", { cause: e });
   }
@@ -3506,6 +3518,7 @@ async function complete(state, signature, opts = {}) {
     revIndex: st.revIndex,
     sigRevSha256: toHex(await sha256(signed)),
     priorCmsSha256: prior,
+    priorRevisionSha256: priorRev,
     signerCert: cert.raw
   };
 }

package/dist/pades.d.cts

@@ -103,6 +103,11 @@ interface PadesCompleted {
     sigRevSha256: string;
     /** Өмнөх гарын үсгүүдийн CMS-ийн SHA-256 (hex), баримтын дарааллаар. */
     priorCmsSha256: string[];
+    /**
+     * Өмнөх гарын үсгүүдийн revision-ий SHA-256 (hex) — `sha256(doc[0 : ByteRange[2]+ByteRange[3]])`, `priorCmsSha256`-тай
+     * ижил дарааллаар. CA горим A-ийн (CA угсарсан) мөрийг үүгээр таньдаг (`priorRevisionSha256`).
+     */
+    priorRevisionSha256: string[];
     /** Зурагчийн гэрчилгээ (DER). */
     signerCert: Uint8Array;
 }

package/dist/pades.d.ts

@@ -103,6 +103,11 @@ interface PadesCompleted {
     sigRevSha256: string;
     /** Өмнөх гарын үсгүүдийн CMS-ийн SHA-256 (hex), баримтын дарааллаар. */
     priorCmsSha256: string[];
+    /**
+     * Өмнөх гарын үсгүүдийн revision-ий SHA-256 (hex) — `sha256(doc[0 : ByteRange[2]+ByteRange[3]])`, `priorCmsSha256`-тай
+     * ижил дарааллаар. CA горим A-ийн (CA угсарсан) мөрийг үүгээр таньдаг (`priorRevisionSha256`).
+     */
+    priorRevisionSha256: string[];
     /** Зурагчийн гэрчилгээ (DER). */
     signerCert: Uint8Array;
 }