@gerege-systems/eid-mongolia-sdk 0.14.0 → 0.14.1

package/dist/button.js

@@ -436,7 +436,7 @@ var T = {
     minute: "1 minute left"
   }
 };
-var CSS = `
+var CSS_BASE = `
 :host { display: inline-block;
   --eid-bg: hsl(0 0% 100%); --eid-bg-subtle: hsl(210 40% 98%); --eid-bg-muted: hsl(210 40% 96%);
   --eid-fg: hsl(222 47% 11%); --eid-fg-muted: hsl(215 19% 35%); --eid-fg-subtle: hsl(215 16% 45%);
@@ -444,22 +444,26 @@ var CSS = `
   --eid-accent: oklch(0.534 0.2 259); --eid-accent-fg: #fff; --eid-accent-subtle: oklch(0.97 0.03 259);
   --eid-accent-subtle-fg: oklch(0.474 0.19 259); --eid-ring: oklch(0.604 0.2 259);
   --eid-warning-bg: hsl(48 100% 96%); --eid-warning-border: hsl(45 95% 78%); --eid-warning-fg: hsl(23 75% 33%);
-  --eid-danger-fg: hsl(0 74% 42%); --eid-radius: 6px; --eid-radius-lg: 8px; font-family: inherit; }
-@media (prefers-color-scheme: dark) { :host {
+  --eid-danger-fg: hsl(0 74% 42%); --eid-radius: 6px; --eid-radius-lg: 8px; font-family: inherit; color-scheme: light; }
+button, input { font-family: inherit; }
+`;
+var DARK_CSS = `:host { color-scheme: dark;
   --eid-bg: hsl(229 50% 6%); --eid-bg-subtle: hsl(222 47% 9%); --eid-bg-muted: hsl(217 33% 13%);
   --eid-fg: hsl(210 40% 98%); --eid-fg-muted: hsl(213 27% 84%); --eid-fg-subtle: hsl(215 20% 65%);
   --eid-border: hsl(217 33% 17%); --eid-border-strong: hsl(215 25% 27%);
   --eid-accent: oklch(0.64 0.15 259); --eid-accent-fg: hsl(229 50% 6%); --eid-accent-subtle: oklch(0.24 0.06 259);
   --eid-accent-subtle-fg: oklch(0.82 0.1 259); --eid-ring: oklch(0.68 0.15 259);
   --eid-warning-bg: hsl(20 60% 10%); --eid-warning-border: hsl(22 70% 26%); --eid-warning-fg: hsl(40 92% 65%);
-  --eid-danger-fg: hsl(0 91% 71%); } }
+  --eid-danger-fg: hsl(0 91% 71%); }
+`;
+var CSS_REST = `
 *, *::before, *::after { box-sizing: border-box; }
 [hidden] { display: none !important; }
 h2, p, ol { margin: 0; }
 :focus-visible { outline: 2px solid var(--eid-ring); outline-offset: 2px; }
 .sr-only { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0 0 0 0); white-space: nowrap; border: 0; }
 .btn { display: inline-flex; width: 100%; align-items: center; justify-content: center; gap: 8px; min-height: 44px; padding: 0 20px;
-  border-radius: var(--eid-radius); font: 500 1rem/1.25 inherit; text-decoration: none; border: 1px solid transparent; cursor: pointer;
+  border-radius: var(--eid-radius); font-family: inherit; font-weight: 500; font-size: 1rem; line-height: 1.25; text-decoration: none; border: 1px solid transparent; cursor: pointer;
   transition: background-color 160ms cubic-bezier(0,0,0.2,1); }
 .btn:disabled { opacity: 0.6; cursor: progress; }
 .btn-primary { background: var(--eid-accent); color: var(--eid-accent-fg); }
@@ -496,7 +500,7 @@ h2, p, ol { margin: 0; }
 .field { display: grid; gap: 8px; }
 .field label { font-weight: 500; }
 .field input { width: 100%; height: 44px; padding: 0 12px; border: 1px solid var(--eid-border-strong); border-radius: var(--eid-radius);
-  background: var(--eid-bg); color: var(--eid-fg); font: 1rem/1.5rem inherit; letter-spacing: 0.02em; text-transform: uppercase; }
+  background: var(--eid-bg); color: var(--eid-fg); font-family: inherit; font-size: 1rem; line-height: 1.5rem; letter-spacing: 0.02em; text-transform: uppercase; }
 .field input::placeholder { color: var(--eid-fg-subtle); text-transform: none; }
 .field input[aria-invalid="true"] { border-color: var(--eid-danger-fg); }
 .hint { font-size: 0.8125rem; color: var(--eid-fg-subtle); }
@@ -516,6 +520,17 @@ h2, p, ol { margin: 0; }
 @media (prefers-reduced-motion: reduce) { *, *::before, *::after { transition: none !important; }
   .spinner { animation: none; border-right-color: currentColor; opacity: 0.6; } }
 `;
+var CSS = CSS_BASE + CSS_REST;
+function resolveEidTheme(theme, doc = document) {
+  if (theme === "light" || theme === "dark") return theme;
+  const html = doc.documentElement;
+  const dt = html?.getAttribute("data-theme");
+  if (dt === "dark" || dt === "light") return dt;
+  if (html?.classList.contains("dark")) return "dark";
+  if (html?.classList.contains("light")) return "light";
+  const mq = doc.defaultView?.matchMedia?.("(prefers-color-scheme: dark)");
+  return mq?.matches ? "dark" : "light";
+}
 var ID_RE = /^([А-ЯЁӨҮ]{2}[0-9]{8}|[0-9]{8,14})$/;
 var FOCUSABLE = 'button:not([disabled]), input:not([disabled]), a[href], [tabindex]:not([tabindex="-1"])';
 function el(tag, attrs = {}, text) {
@@ -527,7 +542,7 @@ function el(tag, attrs = {}, text) {
 var Base = typeof HTMLElement === "undefined" ? class {
 } : HTMLElement;
 var EidLoginButton = class extends Base {
-  static observedAttributes = ["lang"];
+  static observedAttributes = ["lang", "theme"];
   /** Тест/дотоод: гар утас эсэхийг дарж бичих. */
   isMobile = () => isMobileUserAgent();
   /** Тест/дотоод: шилжилт (location.assign). */
@@ -544,6 +559,10 @@ var EidLoginButton = class extends Base {
   gen = 0;
   // цонх нээх бүрд нэмэгдэнэ — хуучин fetch-ийн хариуг үл тооно
   lastFocus = null;
+  darkStyle;
+  themeObs = null;
+  mq = null;
+  onScheme = () => this.applyTheme();
   get t() {
     return T[this.getAttribute("lang") === "en" ? "en" : "mn"];
   }
@@ -551,21 +570,52 @@ var EidLoginButton = class extends Base {
     return this.getAttribute(name) ?? def;
   }
   connectedCallback() {
-    if (this.root) return;
-    this.root = this.attachShadow({ mode: "open" });
-    const style = el("style");
-    style.textContent = CSS;
-    this.trigger = el("button", { type: "button", class: "btn btn-outline trigger", part: "button", "aria-haspopup": "dialog" });
-    this.trigger.append(el("img", { src: EID_LOGO_DATA_URI, alt: "", width: "20", height: "20" }), el("span", {}, this.t.button));
-    this.trigger.addEventListener("click", () => this.start());
-    this.root.append(style, this.trigger);
-  }
-  attributeChangedCallback() {
+    if (!this.root) {
+      this.root = this.attachShadow({ mode: "open" });
+      const style = el("style");
+      style.textContent = CSS;
+      this.darkStyle = el("style", { "data-eid-theme": "dark" });
+      this.trigger = el("button", { type: "button", class: "btn btn-outline trigger", part: "button", "aria-haspopup": "dialog" });
+      this.trigger.append(el("img", { src: EID_LOGO_DATA_URI, alt: "", width: "20", height: "20" }), el("span", {}, this.t.button));
+      this.trigger.addEventListener("click", () => this.start());
+      this.root.append(style, this.darkStyle, this.trigger);
+    }
+    this.watchTheme();
+    this.applyTheme();
+  }
+  attributeChangedCallback(name) {
+    if (name === "theme") {
+      if (this.root) this.applyTheme();
+      return;
+    }
     const label = this.trigger?.querySelector("span");
     if (label) label.textContent = this.t.button;
   }
   disconnectedCallback() {
     this.close();
+    this.themeObs?.disconnect();
+    this.themeObs = null;
+    this.mq?.removeEventListener?.("change", this.onScheme);
+    this.mq = null;
+  }
+  /** Одоогийн бодит схем (`theme` + auto үед хуудас/OS). */
+  get scheme() {
+    return resolveEidTheme(this.getAttribute("theme"));
+  }
+  applyTheme() {
+    const css = this.scheme === "dark" ? DARK_CSS : "";
+    if (this.darkStyle.textContent !== css) this.darkStyle.textContent = css;
+  }
+  /** auto үед хуудасны html[data-theme]/class ба OS-ийн схемийн өөрчлөлтийг дагана. */
+  watchTheme() {
+    if (!this.themeObs && typeof MutationObserver !== "undefined" && document.documentElement) {
+      this.themeObs = new MutationObserver(this.onScheme);
+      this.themeObs.observe(document.documentElement, { attributes: true, attributeFilter: ["data-theme", "class"] });
+    }
+    if (!this.mq && typeof matchMedia === "function") {
+      this.mq = matchMedia("(prefers-color-scheme: dark)");
+      this.mq.addEventListener?.("change", this.onScheme);
+    }
   }
   /** Товчны үйлдэл (программаар ч дуудаж болно). */
   start() {
@@ -909,6 +959,7 @@ function mountEidLoginButton(target, opts) {
   b.setAttribute("status-url", opts.statusUrl);
   b.setAttribute("lang", opts.lang ?? "mn");
   if (opts.mode) b.setAttribute("mode", opts.mode);
+  if (opts.theme) b.setAttribute("theme", opts.theme);
   if (opts.successUrl) b.setAttribute("success-url", opts.successUrl);
   if (opts.onSuccess) b.addEventListener("eid-login-success", (e) => opts.onSuccess(e.detail));
   if (opts.onError) b.addEventListener("eid-login-error", (e) => opts.onError(e.detail.error));
@@ -919,5 +970,6 @@ defineEidLoginButton();
 export {
   EidLoginButton,
   defineEidLoginButton,
-  mountEidLoginButton
+  mountEidLoginButton,
+  resolveEidTheme
 };

package/dist/index.cjs

@@ -27,6 +27,7 @@ __export(index_exports, {
   DEFAULT_BASE_URL: () => DEFAULT_BASE_URL,
   DEFAULT_PDF_MAX_BYTES: () => DEFAULT_PDF_MAX_BYTES,
   DEFAULT_PDF_TIMEOUT_MS: () => DEFAULT_PDF_TIMEOUT_MS,
+  DEFAULT_SIGN_SESSION_TTL_MS: () => DEFAULT_SIGN_SESSION_TTL_MS,
   DeviceLinkError: () => DeviceLinkError,
   EidClient: () => EidClient,
   EidError: () => EidError,
@@ -50,6 +51,8 @@ __export(index_exports, {
   buildDeviceLink: () => buildDeviceLink,
   createEidLogin: () => createEidLogin,
   deviceLink: () => deviceLink,
+  deviceLinkInput: () => deviceLinkInput,
+  forwardedClientIp: () => forwardedClientIp,
   interactionsToBase64: () => interactionsToBase64,
   isMobileUserAgent: () => isMobileUserAgent,
   memoryLoginStore: () => memoryLoginStore,
@@ -61,6 +64,7 @@ __export(index_exports, {
   qrDeviceLinkTicker: () => qrDeviceLinkTicker,
   randomChallenge: () => randomChallenge,
   resolveBaseUrl: () => resolveBaseUrl,
+  sessionExpiry: () => sessionExpiry,
   sha256Base64: () => sha256Base64,
   tokenAuthDigest: () => tokenAuthDigest,
   tokenLimitOf: () => tokenLimitOf,
@@ -318,6 +322,11 @@ var RP_ROUTES = {
   authDeviceLinkEtsi: { method: "POST", path: "/authentication/device-link/etsi/{semanticsIdentifier}" },
   signNotificationEtsi: { method: "POST", path: "/signature/notification/etsi/{semanticsIdentifier}" },
   signNotificationDocument: { method: "POST", path: "/signature/notification/document/{documentNumber}" },
+  signNotificationLinked: { method: "POST", path: "/signature/notification/linked/{documentNumber}" },
+  signDeviceLinkEtsi: { method: "POST", path: "/signature/device-link/etsi/{semanticsIdentifier}" },
+  signDeviceLinkDocument: { method: "POST", path: "/signature/device-link/document/{documentNumber}" },
+  certChoiceDeviceLink: { method: "POST", path: "/signature/certificate-choice/device-link/anonymous" },
+  certChoiceEtsi: { method: "POST", path: "/signature/certificate-choice/notification/etsi/{semanticsIdentifier}" },
   pdfPrepare: { method: "POST", path: "/pdf/sign/prepare" },
   pdfDocument: { method: "GET", path: "/pdf/sign/{sessionID}/document" },
   orgRepresentations: { method: "GET", path: "/organization/representations/etsi/{personEtsi}" },
@@ -444,7 +453,8 @@ var AuthApi = class {
       vc: vc != null ? String(vc) : null,
       rpChallenge: acsp.rpChallenge,
       acsp,
-      receivedAt: Date.now()
+      receivedAt: Date.now(),
+      sessionType: "auth"
     };
   }
   /** Push — РД/иргэний дугаар/ETSI-ээр (сервер төрлийг таьна). Иргэний утас руу мэдэгдэл очно. */
@@ -473,10 +483,20 @@ var AuthApi = class {
   }
 };
 
+// src/types.ts
+var DEFAULT_SIGN_SESSION_TTL_MS = 6e5;
+function sessionExpiry(sentAtMs, ttlMs) {
+  return sentAtMs + (ttlMs && ttlMs > 0 ? ttlMs : DEFAULT_SIGN_SESSION_TTL_MS);
+}
+
 // src/sign.ts
 function rec2(v) {
   return v && typeof v === "object" ? v : {};
 }
+var vcOf = (r) => {
+  const vc = typeof r.vc === "object" && r.vc !== null ? rec2(r.vc).value : r.vc;
+  return vc != null ? String(vc) : null;
+};
 var SignApi = class {
   constructor(http, creds, defaults) {
     this.http = http;
@@ -486,46 +506,155 @@ var SignApi = class {
   http;
   creds;
   defaults;
-  body(digestB64, interactions, opts) {
+  body(digestB64, interactions, opts, defAlg) {
+    const sign = {
+      digest: digestB64,
+      hashAlgorithm: opts?.hashAlgorithm ?? "SHA-256",
+      signatureAlgorithm: opts?.signatureAlgorithm ?? defAlg,
+      relyingPartyName: this.creds.rpName,
+      interactions: interactionsToBase64(interactions),
+      initialCallbackUrl: opts?.callbackUrl?.trim() ?? ""
+    };
     const body = {
       relyingPartyUUID: this.creds.rpUUID,
-      relyingPartyName: this.creds.rpName,
+      relyingPartyName: sign.relyingPartyName,
       certificateLevel: opts?.certificateLevel ?? this.defaults.certificateLevel,
       signatureProtocol: "RAW_DIGEST_SIGNATURE",
       signatureProtocolParameters: {
         digest: digestB64,
-        signatureAlgorithm: opts?.signatureAlgorithm ?? "rsassa-pss",
-        signatureAlgorithmParameters: { hashAlgorithm: opts?.hashAlgorithm ?? "SHA-256" }
+        signatureAlgorithm: sign.signatureAlgorithm,
+        signatureAlgorithmParameters: { hashAlgorithm: sign.hashAlgorithm }
       },
-      interactions: interactionsToBase64(interactions)
+      interactions: sign.interactions
     };
-    if (opts?.callbackUrl?.trim()) body.initialCallbackUrl = opts.callbackUrl.trim();
+    if (sign.initialCallbackUrl) body.initialCallbackUrl = sign.initialCallbackUrl;
     if (opts?.onBehalfOf?.trim()) body.onBehalfOf = opts.onBehalfOf.trim();
     if (opts?.fileName?.trim()) body.fileName = opts.fileName.trim();
-    return body;
+    return { body, sign };
+  }
+  async notification(path, body, sign) {
+    const sent = Date.now();
+    const r = rec2(await this.http.post(path, body));
+    return {
+      sessionId: String(r.sessionID),
+      vc: vcOf(r),
+      rpChallenge: "",
+      ...sign ? { sign } : {},
+      expiresAt: sessionExpiry(sent, this.defaults.sessionTtlMs)
+    };
   }
-  parse(raw) {
-    const r = rec2(raw);
-    const vc = rec2(r.vc).value;
-    return { sessionId: String(r.sessionID), vc: vc != null ? String(vc) : null, rpChallenge: "" };
+  async deviceLink(path, body, extra) {
+    const sent = Date.now();
+    const r = rec2(await this.http.post(path, body));
+    return {
+      sessionId: String(r.sessionID),
+      sessionToken: r.sessionToken != null ? String(r.sessionToken) : null,
+      sessionSecret: r.sessionSecret != null ? String(r.sessionSecret) : null,
+      deviceLinkBase: r.deviceLinkBase != null ? String(r.deviceLinkBase) : null,
+      vc: vcOf(r),
+      rpChallenge: "",
+      receivedAt: Date.now(),
+      ...extra,
+      expiresAt: sessionExpiry(sent, this.defaults.sessionTtlMs)
+    };
   }
   /**
    * Бэлэн digest-ээр push sign (РД/civil_id/ETSI). Баримт (PDF/файл)-ын байтын SHA-256
    * digest-ийг гаднаас бэлдэж өгнө — текст бус бинар баримтад тохиромжтой.
+   *
+   * ⚠️ Олон утастай иргэнд CA etsi-г ЭХНИЙ идэвхтэй төхөөрөмж рүү шийднэ. Гэрчилгээг урьдчилж мэдэх шаардлагатай бол
+   * (PAdES/CMS) {@link certificateChoiceByEtsi} → {@link digestForSigner}.
    */
   async digestByEtsi(id, digestB64, interactions, opts) {
-    const raw = await this.http.post(routePath(RP_ROUTES.signNotificationEtsi, id), this.body(digestB64, interactions, opts));
-    return this.parse(raw);
+    const { body, sign } = this.body(digestB64, interactions, opts, "rsassa-pss");
+    return this.notification(routePath(RP_ROUTES.signNotificationEtsi, id), body, sign);
   }
-  /** Бэлэн digest-ээр push sign — баримтын дугаараар (auth-аас гарсан documentNumber дээр). */
+  /** Бэлэн digest-ээр push sign — баримтын дугаараар (auth / certificate-choice-оос гарсан documentNumber дээр). */
   async digestByDocument(documentNumber, digestB64, interactions, opts) {
-    const raw = await this.http.post(routePath(RP_ROUTES.signNotificationDocument, documentNumber), this.body(digestB64, interactions, opts));
-    return this.parse(raw);
+    const { body, sign } = this.body(digestB64, interactions, opts, "rsassa-pss");
+    return this.notification(routePath(RP_ROUTES.signNotificationDocument, documentNumber), body, sign);
   }
   /** Текстийн SHA-256 digest-ийг дотроо тооцоод push sign (богино текст баримтад тохиромжтой). */
   async textByEtsi(id, text, interactions, opts) {
     return this.digestByEtsi(id, sha256Base64(text), interactions, opts);
   }
+  /**
+   * QR / Web2App / App2App sign — тодорхой иргэн (РД/civil_id/ETSI). Холбоосыг backend-д
+   * `buildDeviceLink(deviceLinkInput(s, type, lang))`-ээр; Web2App/App2App-д `callbackUrl` заавал.
+   * `validateSign`-д `expectedFlowType` = харуулсан холбоосын төрөл.
+   */
+  async deviceLinkByEtsi(id, digestB64, interactions, opts) {
+    const { body, sign } = this.body(digestB64, interactions, opts, "rsassa-pss");
+    return this.deviceLink(routePath(RP_ROUTES.signDeviceLinkEtsi, id), body, { sessionType: "sign", sign });
+  }
+  /** QR / Web2App / App2App sign — баримтын дугаараар (тодорхой төхөөрөмж). */
+  async deviceLinkByDocument(documentNumber, digestB64, interactions, opts) {
+    const { body, sign } = this.body(digestB64, interactions, opts, "rsassa-pss");
+    return this.deviceLink(routePath(RP_ROUTES.signDeviceLinkDocument, documentNumber), body, { sessionType: "sign", sign });
+  }
+  // ── Certificate-choice ──
+  certChoiceBody(opts) {
+    return {
+      relyingPartyUUID: this.creds.rpUUID,
+      relyingPartyName: this.creds.rpName,
+      certificateLevel: opts?.certificateLevel ?? this.defaults.certificateLevel
+    };
+  }
+  /**
+   * Push: иргэний (РД/civil_id/ETSI) утас руу гарын үсгийн гэрчилгээ сонгуулах хүсэлт (PIN-гүй). Үр дүнг
+   * `session.waitForResult` → `validator.validateCertificateChoice`. CERT эрх шаардана.
+   */
+  async certificateChoiceByEtsi(id, opts) {
+    return this.notification(routePath(RP_ROUTES.certChoiceEtsi, id), this.certChoiceBody(opts));
+  }
+  /**
+   * QR: иргэн хэн болохыг урьдчилж мэдэхгүй үед гэрчилгээ сонгуулах. CA-ийн certificate-choice хүсэлт
+   * initialCallbackUrl авдаггүй тул ЗӨВХӨН QR холбоос (`deviceLinkInput(s, "QR", lang)`). CERT эрх.
+   */
+  async certificateChoiceDeviceLink(opts) {
+    return this.deviceLink(routePath(RP_ROUTES.certChoiceDeviceLink), this.certChoiceBody(opts), {
+      sessionType: "cert",
+      relyingPartyName: this.creds.rpName
+    });
+  }
+  // ── Гэрчилгээ урьдчилж мэдэгдэх гарын үсэг (client-side PAdES / CMS) ──
+  signerBody(signer, digestB64, interactions, opts) {
+    if (!signer?.documentNumber?.trim()) {
+      throw new Error("eid: signer.documentNumber \u0445\u043E\u043E\u0441\u043E\u043D \u2014 validateCertificateChoice-\u0438\u0439\u043D \u04AF\u0440 \u0434\u04AF\u043D\u0433 \u04E9\u0433");
+    }
+    const out = this.body(digestB64, interactions, opts, "sha256WithRSAEncryption");
+    const want = hashLen(out.sign.hashAlgorithm);
+    const d = /^[A-Za-z0-9+/]*={0,2}$/.test(digestB64) ? Buffer.from(digestB64, "base64") : null;
+    if (!d || d.length !== want || d.toString("base64") !== digestB64) {
+      throw new Error(`eid: digest \u043D\u044C \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442 base64, ${out.sign.hashAlgorithm}-\u0438\u0439\u043D \u0443\u0440\u0442 (${want} \u0431\u0430\u0439\u0442) \u0431\u0430\u0439\u0445 \u0451\u0441\u0442\u043E\u0439`);
+    }
+    return out;
+  }
+  /**
+   * Certificate-choice-оор сонгосон ЯГ ТЭР төхөөрөмж (`signer.documentNumber`) рүү push sign. Олон утастай иргэнд
+   * etsi-ээр эхлүүлбэл өөр утас (өөр гэрчилгээ) зурж, гэрчилгээг урьдчилж оруулсан CMS (PAdES signingCertificateV2)
+   * хүчингүй болдог — тиймээс digest-ийг ҮРГЭЛЖ documentNumber-аар зуруулна.
+   *
+   * `signer.certChoiceSessionId` байвал `/signature/notification/linked/{documentNumber}` (`linkedSessionID`), эс
+   * бөгөөс `/signature/notification/document/{documentNumber}`. Default `sha256WithRSAEncryption` + SHA-256 (digest =
+   * 32 байт DTBS); digest-ийн урт буруу бол хүсэлт явахгүй. Хариуг:
+   * `validator.validateSign(r, s.sign.digest, { hashAlgorithm: s.sign.hashAlgorithm, expectedAlgorithm:
+   * s.sign.signatureAlgorithm, expectedCertificate: signer.certificate, expectedFlowType: "Notification" })`.
+   */
+  async digestForSigner(signer, digestB64, interactions, opts) {
+    const { body, sign } = this.signerBody(signer, digestB64, interactions, opts);
+    const linked = signer.certChoiceSessionId?.trim();
+    if (linked) {
+      body.linkedSessionID = linked;
+      return this.notification(routePath(RP_ROUTES.signNotificationLinked, signer.documentNumber), body, sign);
+    }
+    return this.notification(routePath(RP_ROUTES.signNotificationDocument, signer.documentNumber), body, sign);
+  }
+  /** {@link digestForSigner}-ийн QR / Web2App / App2App хувилбар: `/signature/device-link/document/{documentNumber}`. */
+  async deviceLinkForSigner(signer, digestB64, interactions, opts) {
+    const { body, sign } = this.signerBody(signer, digestB64, interactions, opts);
+    return this.deviceLink(routePath(RP_ROUTES.signDeviceLinkDocument, signer.documentNumber), body, { sessionType: "sign", sign });
+  }
 };
 
 // src/session.ts
@@ -1286,13 +1415,19 @@ var ResponseValidator = class {
    * @param opts — `hashAlgorithm` мөр (хуучин хэлбэр; default SHA-256) эсвэл {@link ValidateSignOptions}.
    */
   validateSign(result, digestB64, opts = {}) {
-    const { hashAlgorithm = "SHA-256", expectedFlowType } = typeof opts === "string" ? { hashAlgorithm: opts } : opts;
+    const o = typeof opts === "string" ? { hashAlgorithm: opts } : opts;
+    const { hashAlgorithm = "SHA-256", expectedFlowType } = o;
     const leaf = this.precheck(result, "RAW_DIGEST_SIGNATURE");
     if (expectedFlowType && result.flowType !== expectedFlowType) {
       throw new ValidationError(`flowType ${result.flowType} \u2260 \u044D\u0445\u043B\u04AF\u04AF\u043B\u0441\u044D\u043D \u0443\u0440\u0441\u0433\u0430\u043B ${expectedFlowType} (relay \u0431\u0430\u0439\u0436 \u0431\u043E\u043B\u0437\u043E\u0448\u0433\u04AF\u0439)`);
     }
+    if (o.expectedCertificate && !leaf.raw.equals(o.expectedCertificate.raw)) {
+      throw new ValidationError(
+        `\u0413\u044D\u0440\u0447\u0438\u043B\u0433\u044D\u044D certificate-choice-\u043E\u043E\u0440 \u0441\u043E\u043D\u0433\u043E\u0441\u043E\u043D\u0442\u043E\u0439 \u0442\u0430\u0430\u0440\u0430\u0445\u0433\u04AF\u0439 (serial ${leaf.serialNumber} \u2260 ${o.expectedCertificate.serialNumber})`
+      );
+    }
     const digest = Buffer.from(digestB64, "base64");
-    const { alg, hash } = this.algorithmOf(result, leaf, null, hashAlgorithm);
+    const { alg, hash } = this.algorithmOf(result, leaf, o.expectedAlgorithm ?? null, hashAlgorithm);
     if (digest.length !== hashLen(hash)) throw new ValidationError("digest \u0443\u0440\u0442 hashAlgorithm-\u0442\u0430\u0439 \u0442\u0430\u0430\u0440\u0430\u0445\u0433\u04AF\u0439");
     if (!verifyPrehashedSignature(digest, result.signatureValueB64, leaf.publicKey, alg, hash)) {
       throw new ValidationError("\u0413\u0430\u0440\u044B\u043D \u04AF\u0441\u044D\u0433 \u04E9\u0433\u0441\u04E9\u043D digest-\u0442\u044D\u0439 \u0442\u0430\u0430\u0440\u0441\u0430\u043D\u0433\u04AF\u0439");
@@ -1306,6 +1441,24 @@ var ResponseValidator = class {
       parsedSubject: parseSubject(leaf)
     };
   }
+  /**
+   * Certificate-choice session-ий хариуг шалгана: COMPLETE/OK (эс бөгөөс `SessionFailedError`), гэрчилгээ ба
+   * documentNumber байгаа, хугацаа, certLevel, зориулалт (гарын үсгийн — contentCommitment, `checkKeyUsage` үед), гинж,
+   * issuer. Энэ хариунд гарын үсэг БАЙХГҮЙ — иргэнийг таниагүй (нэвтрэлт биш); зөвхөн дараагийн sign session-ий
+   * гэрчилгээг урьдчилж мэдэхэд. `sessionId` — certificate-choice session.
+   */
+  validateCertificateChoice(result, sessionId = null) {
+    this.sessionDone(result);
+    const leaf = this.leafOf(result, "RAW_DIGEST_SIGNATURE");
+    return {
+      documentNumber: result.documentNumber,
+      certificate: leaf,
+      certificateDerB64: leaf.raw.toString("base64"),
+      certificateLevel: String(result.certificateLevel ?? ""),
+      parsedSubject: parseSubject(leaf),
+      certChoiceSessionId: sessionId
+    };
+  }
   /**
    * Хариуны signatureAlgorithm + hashAlgorithm-ийг RP-ийн хүссэнтэй ба иргэний түлхүүрийн төрөлтэй тулгана
    * (downgrade / alg confusion хаалт).
@@ -1355,13 +1508,22 @@ var ResponseValidator = class {
   // ── дотоод ──
   /** state/endResult, cert байгаа эсэх, chain, validity, certLevel — нийтлэг шалгалт. */
   precheck(result, protocol) {
-    if (result.state !== "COMPLETE") throw new ValidationError(`Session \u0434\u0443\u0443\u0441\u0430\u0430\u0433\u04AF\u0439 (state=${result.state})`);
-    if (result.endResult !== "OK") throw new SessionFailedError(result.endResult ?? "UNKNOWN");
+    this.sessionDone(result);
     if (result.signatureProtocol && result.signatureProtocol !== protocol) {
       throw new ValidationError(`signatureProtocol ${result.signatureProtocol} \u2260 ${protocol}`);
     }
     if (!result.certificateDerB64) throw new ValidationError("\u0425\u0430\u0440\u0438\u0443\u043D\u0434 \u0433\u044D\u0440\u0447\u0438\u043B\u0433\u044D\u044D \u0430\u043B\u0433\u0430");
     if (!result.signatureValueB64) throw new ValidationError("\u0425\u0430\u0440\u0438\u0443\u043D\u0434 \u0433\u0430\u0440\u044B\u043D \u04AF\u0441\u044D\u0433 \u0430\u043B\u0433\u0430");
+    return this.leafOf(result, protocol);
+  }
+  /** COMPLETE + OK; амжилтгүй endResult → SessionFailedError. */
+  sessionDone(result) {
+    if (result.state !== "COMPLETE") throw new ValidationError(`Session \u0434\u0443\u0443\u0441\u0430\u0430\u0433\u04AF\u0439 (state=${result.state})`);
+    if (result.endResult !== "OK") throw new SessionFailedError(result.endResult ?? "UNKNOWN");
+  }
+  /** Хариуны гэрчилгээ: documentNumber, задлалт, хугацаа, certLevel, зориулалт (protocol), гинж, issuer. */
+  leafOf(result, protocol) {
+    if (!result.certificateDerB64) throw new ValidationError("\u0425\u0430\u0440\u0438\u0443\u043D\u0434 \u0433\u044D\u0440\u0447\u0438\u043B\u0433\u044D\u044D \u0430\u043B\u0433\u0430");
     if (!result.documentNumber) throw new ValidationError("\u0425\u0430\u0440\u0438\u0443\u043D\u0434 documentNumber \u0430\u043B\u0433\u0430");
     const leaf = new import_node_crypto5.X509Certificate(Buffer.from(result.certificateDerB64, "base64"));
     this.checkValidity(leaf);
@@ -1778,7 +1940,7 @@ var EidClient = class {
     });
     const level = cfg.defaultCertificateLevel ?? "QUALIFIED";
     this.auth = new AuthApi(http, cfg.credentials, { certificateLevel: level });
-    this.sign = new SignApi(http, cfg.credentials, { certificateLevel: level });
+    this.sign = new SignApi(http, cfg.credentials, { certificateLevel: level, sessionTtlMs: cfg.signSessionTtlMs });
     this.pdf = new PdfApi(http, cfg.credentials, {
       certificateLevel: level,
       timeoutMs: cfg.pdfTimeoutMs ?? DEFAULT_PDF_TIMEOUT_MS,
@@ -1896,6 +2058,37 @@ function buildDeviceLink(p) {
   const authCode = (0, import_node_crypto6.createHmac)("sha256", Buffer.from(p.sessionSecret, "base64")).update(payload, "utf8").digest("base64url");
   return `${unprotected}&authCode=${authCode}`;
 }
+function deviceLinkInput(s, deviceLinkType, lang) {
+  const base = {
+    deviceLinkBase: s.deviceLinkBase ?? "",
+    deviceLinkType,
+    sessionToken: s.sessionToken ?? "",
+    sessionSecret: s.sessionSecret ?? "",
+    lang,
+    receivedAt: s.receivedAt
+  };
+  if (s.sessionType === "sign" && s.sign) {
+    return {
+      ...base,
+      sessionType: "sign",
+      digest: s.sign.digest,
+      relyingPartyName: s.sign.relyingPartyName,
+      interactions: s.sign.interactions,
+      initialCallbackUrl: s.sign.initialCallbackUrl
+    };
+  }
+  if (s.sessionType === "cert") {
+    return { ...base, sessionType: "cert", relyingPartyName: s.relyingPartyName ?? "", interactions: "" };
+  }
+  return {
+    ...base,
+    sessionType: "auth",
+    rpChallenge: s.acsp?.rpChallenge ?? s.rpChallenge,
+    relyingPartyName: s.acsp?.relyingPartyName ?? "",
+    interactions: s.acsp?.interactions ?? "",
+    initialCallbackUrl: s.acsp?.initialCallbackUrl ?? ""
+  };
+}
 function qrDeviceLinkTicker(input, onLink, opts) {
   const clock = opts?.clock ?? Date.now;
   const tick = () => onLink(buildDeviceLink({ ...input, deviceLinkType: "QR", now: clock() }));
@@ -1932,6 +2125,16 @@ function memoryLoginStore() {
   };
 }
 var CALLBACK_PATH = "/auth/eid/callback";
+function forwardedClientIp(headers, trustProxy) {
+  if (trustProxy === false || trustProxy === 0) return void 0;
+  const xff = header(headers, "x-forwarded-for").split(",").map((x) => x.trim()).filter(Boolean);
+  if (xff.length) {
+    if (trustProxy === true) return xff[0];
+    const n = Math.floor(trustProxy);
+    return n >= 1 && n <= xff.length ? xff[xff.length - n] : void 0;
+  }
+  return header(headers, "x-real-ip").trim() || void 0;
+}
 var ID_RE = /^(\p{L}{2}[0-9]{8}|[0-9]{8,14}|PNOMN-[0-9]{8,14})$/u;
 var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 var B64URL_RE = /^[A-Za-z0-9_-]{43}$/;
@@ -1983,11 +2186,12 @@ function safeEqualHex(a, b) {
   const y = Buffer.from(b, "hex");
   return x.length === y.length && x.length > 0 && (0, import_node_crypto7.timingSafeEqual)(x, y);
 }
-function toIdentity(r, v, flowType) {
+function toIdentity(sessionId, r, v, flowType) {
   const s = v.parsedSubject;
   const etsi = s.serialNumber ?? "";
   const m = /^PNOMN-([0-9]+)$/.exec(etsi);
   return {
+    sessionId,
     etsi,
     civilId: m ? m[1] : null,
     givenName: s.givenName ?? null,
@@ -2155,7 +2359,8 @@ function createEidLogin(opts) {
     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" });
-    if (req.ip && !await rateLimit(`start:${req.ip}`)) return limited();
+    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();
     let r;
     try {
@@ -2177,7 +2382,7 @@ function createEidLogin(opts) {
   async function finish(req, tx, r, flow, verifier) {
     const v = client.validator.validateAuth(r, tx.acsp, { expectedFlowType: flow, userChallengeVerifier: verifier });
     if (!await store.delete(tx.sessionId)) return void 0;
-    const out = await opts.onSuccess(toIdentity(r, v, flow), { request: req, mode: tx.mode }) ?? {};
+    const out = await opts.onSuccess(toIdentity(tx.sessionId, r, v, flow), { request: req, mode: tx.mode }) ?? {};
     return out;
   }
   async function status(req) {
@@ -2260,11 +2465,20 @@ function createEidLogin(opts) {
     }
     return json(404, { error: "not_found" });
   }
+  let warnedNoIp = false;
   async function handle(req) {
     const headers = {};
     req.headers.forEach((v, k) => headers[k] = v);
     const body = req.method === "POST" ? await req.text() : void 0;
-    const r = await handleRequest({ method: req.method, url: req.url, headers, body });
+    const ip = opts.getClientIp?.(req) || void 0;
+    if (!ip && !opts.getClientIp && !opts.trustProxy && !warnedNoIp) {
+      warnedNoIp = true;
+      onError(new Error("eid-login: handle(Request)-\u0434 \u043A\u043B\u0438\u0435\u043D\u0442 IP \u0430\u043B\u0433\u0430 \u2014 `start:<ip>` \u0445\u044F\u0437\u0433\u0430\u0430\u0440 \u0430\u0436\u0438\u043B\u043B\u0430\u0445\u0433\u04AF\u0439; getClientIp \u044D\u0441\u0432\u044D\u043B trustProxy \u04E9\u0433"), {
+        request: { method: req.method, url: req.url, headers },
+        mode: "qr"
+      });
+    }
+    const r = await handleRequest({ method: req.method, url: req.url, headers, body, ip });
     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 });
@@ -2280,6 +2494,7 @@ function createEidLogin(opts) {
   DEFAULT_BASE_URL,
   DEFAULT_PDF_MAX_BYTES,
   DEFAULT_PDF_TIMEOUT_MS,
+  DEFAULT_SIGN_SESSION_TTL_MS,
   DeviceLinkError,
   EidClient,
   EidError,
@@ -2303,6 +2518,8 @@ function createEidLogin(opts) {
   buildDeviceLink,
   createEidLogin,
   deviceLink,
+  deviceLinkInput,
+  forwardedClientIp,
   interactionsToBase64,
   isMobileUserAgent,
   memoryLoginStore,
@@ -2314,6 +2531,7 @@ function createEidLogin(opts) {
   qrDeviceLinkTicker,
   randomChallenge,
   resolveBaseUrl,
+  sessionExpiry,
   sha256Base64,
   tokenAuthDigest,
   tokenLimitOf,