eimzo-sign-core 0.1.3 → 0.1.5

package/README.md

@@ -1,9 +1,13 @@
 # eimzo-sign-core
 
-E-IMZO bilan imzolash mantig'i — **oynasiz**, framework'siz.
-UI'ni o'zingiz qurasiz. Vue / React / oddiy JS — farqi yo'q.
+O'zbekiston elektron raqamli imzosi (**E-IMZO**) bilan hujjat imzolash mantig'i —
+**oynasiz, framework'siz**. Sertifikat ro'yxati va tugmalarni o'zingiz chizasiz,
+bu paket E-IMZO dasturi bilan aloqani, timeout'larni, xatolar va seriya
+tekshiruvini o'z zimmasiga oladi. React / Svelte / vanilla JS — farqi yo'q.
 
-Tayyor Vue oyna kerak bo'lsa: [`eimzo-sign-vue`](https://www.npmjs.com/package/eimzo-sign-vue).
+> Vue uchun **tayyor imzolash oynasi** kerak bo'lsa —
+> [**eimzo-sign-vue**](https://www.npmjs.com/package/eimzo-sign-vue) (u shu
+> paketni ichida ishlatadi).
 
 ---
 
@@ -82,7 +86,25 @@ try {
 | `EimzoClient.idCardCert()` | ID-karta uchun "sertifikat" obyekti |
 
 Yordamchilar: `sortCerts` (amaldagilar tepada), `certIsUsable`, `certIsExpired`,
-`certExpiresSoon`, `dedupeCerts`.
+`certIsNotYetValid`, `certExpiresSoon`, `dedupeCerts`, `certOrg` (tashkilot nomi;
+`"НЕ УКАЗАНО"` kabi E-IMZO placeholderlari bo'sh string), `certIsIndividual`.
+
+### `Cert` maydonlari
+
+```ts
+interface Cert {
+  serialNumber: string
+  CN: string          // egasi (F.I.Sh yoki rahbar)
+  TIN: string         // STIR (INN)
+  PINFL: string        // JSHSHIR — jismoniy shaxs id (bo'lmasligi mumkin)
+  UID: string
+  O: string           // tashkilot; jismoniy shaxsda bo'sh yoki "НЕ УКАЗАНО"
+  T: string
+  validFrom: Date
+  validTo: Date
+  type: 'pfx' | 'ftjc' | 'idcard'
+}
+```
 
 ### `signBatch` natijasi
 
@@ -95,6 +117,28 @@ Yordamchilar: `sortCerts` (amaldagilar tepada), `certIsUsable`, `certIsExpired`,
 
 ---
 
+## `SignFlow` — modal holat mashinasi
+
+Framework-agnostik oqim: yuklash → sertifikat tanlash → imzolash → qisman
+xato / qayta urinish → yakun. O'z UI'ingiz (Vue 2.7, React, …) shu holatga
+qarab chiziladi.
+
+```ts
+import { SignFlow } from 'eimzo-sign-core'
+
+const flow = new SignFlow({ client, docs: [{ id: 'p1', title: "To'lov", content: xml }] })
+flow.subscribe((s) => render(s))            // s.status, s.certs, s.docs, s.progress …
+flow.selectCert(serial)
+flow.confirm()                              // "Imzolash"
+flow.cancel()                               // "Bekor qilish" / Esc
+
+const { results } = await flow.promise      // yoki reject: EimzoError (.code === 'E_CANCELLED')
+```
+
+`eimzo-sign-vue` ning modali aynan shu ustiga qurilgan.
+
+---
+
 ## Sozlamalar
 
 ```ts

package/dist/index.cjs

@@ -1,12 +1,5 @@
 'use strict';
 
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-
 // src/errors.ts
 var EimzoError = class _EimzoError extends Error {
   constructor(code, message, options) {
@@ -81,9 +74,6 @@ function withTimeout(timeoutMs, timeoutError, executor, signal) {
   var _Base64 = global.Base64;
   var version = "2.1.4";
   var buffer;
-  if (typeof module !== "undefined" && module.exports) {
-    buffer = __require("buffer").Buffer;
-  }
   var b64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
   var b64tab = (function(bin) {
     var t = {};
@@ -229,9 +219,6 @@ function withTimeout(timeoutMs, timeoutError, executor, signal) {
   var _Base64 = global.Base64;
   var version = "2.1.4";
   var buffer;
-  if (typeof module !== "undefined" && module.exports) {
-    buffer = __require("buffer").Buffer;
-  }
   var b64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
   var b64tab = (function(bin) {
     var t = {};
@@ -1060,6 +1047,7 @@ var EimzoClient = class {
       CN: "ID card",
       TIN: "",
       UID: "",
+      PINFL: "",
       O: "",
       T: "",
       validFrom: /* @__PURE__ */ new Date(0),
@@ -1264,6 +1252,7 @@ function normalizeCert(raw) {
     CN: str(raw.CN),
     TIN: str(raw.TIN),
     UID: str(raw.UID),
+    PINFL: str(raw.PINFL),
     O: str(raw.O),
     T: str(raw.T),
     validFrom: toDate(raw.validFrom),
@@ -1297,6 +1286,22 @@ function assertUniqueIds(docs) {
 function certIsExpired(cert, at = /* @__PURE__ */ new Date()) {
   return cert.validTo.getTime() < at.getTime();
 }
+var ORG_PLACEHOLDERS = /* @__PURE__ */ new Set([
+  "\u041D\u0415 \u0423\u041A\u0410\u0417\u0410\u041D\u041E",
+  "\u041D\u0415 \u0423\u041A\u0410\u0417\u0410\u041D\u0410",
+  "NE UKAZANO",
+  "KO'RSATILMAGAN",
+  "\u041A\u040E\u0420\u0421\u0410\u0422\u0418\u041B\u041C\u0410\u0413\u0410\u041D",
+  "-",
+  ""
+]);
+function certOrg(cert) {
+  const o = (cert.O ?? "").trim();
+  return ORG_PLACEHOLDERS.has(o.toUpperCase()) ? "" : o;
+}
+function certIsIndividual(cert) {
+  return certOrg(cert) === "";
+}
 function certIsNotYetValid(cert, at = /* @__PURE__ */ new Date()) {
   return cert.validFrom.getTime() > at.getTime();
 }
@@ -1327,12 +1332,224 @@ function dedupeCerts(certs) {
   return out;
 }
 
+// src/sign-flow.ts
+var ID_CARD_SERIAL = "IDCARD";
+var SignFlow = class {
+  constructor(deps) {
+    this.listeners = /* @__PURE__ */ new Set();
+    this.ac = new AbortController();
+    this.finished = false;
+    this.client = deps.client;
+    this.autoInstall = deps.autoInstall ?? true;
+    this.state = {
+      status: "loading",
+      certs: [],
+      idCardAvailable: false,
+      selectedSerial: null,
+      docs: deps.docs.map((d) => ({
+        id: d.id,
+        title: d.title,
+        content: d.content,
+        preview: d.preview ?? [],
+        status: "pending"
+      })),
+      progress: { done: 0, total: deps.docs.length }
+    };
+    this.promise = new Promise((resolve, reject) => {
+      this.resolveOuter = resolve;
+      this.rejectOuter = reject;
+    });
+    void this.load();
+  }
+  // ─── Kuzatish ──────────────────────────────────────────────────────────
+  getState() {
+    return this.state;
+  }
+  subscribe(listener) {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  }
+  setState(patch) {
+    this.state = { ...this.state, ...patch };
+    for (const listener of this.listeners) listener(this.state);
+  }
+  // ─── Hosil qilingan qiymatlar ──────────────────────────────────────────
+  get selectedCert() {
+    const { selectedSerial, certs } = this.state;
+    if (!selectedSerial) return null;
+    if (selectedSerial === ID_CARD_SERIAL) return EimzoClient.idCardCert();
+    return certs.find((c) => c.serialNumber === selectedSerial) ?? null;
+  }
+  get canConfirm() {
+    return (this.state.status === "ready" || this.state.status === "partial") && this.selectedCert !== null && this.pendingDocs.length > 0;
+  }
+  /** Navbatdagi imzolанадиган hujjатlар (partial rejimда — faqat xatоликдагилар). */
+  get pendingDocs() {
+    return this.state.docs.filter((d) => d.status !== "done");
+  }
+  // ─── Harakatlar ────────────────────────────────────────────────────────
+  async load() {
+    this.setState({ status: "loading", fatal: void 0, lastError: void 0 });
+    try {
+      if (this.autoInstall) await this.client.install();
+      const [rawCerts, idCard] = await Promise.all([
+        this.client.listCerts(),
+        this.client.isIdCardPlugged()
+      ]);
+      const certs = sortCerts(dedupeCerts(rawCerts));
+      if (certs.length === 0 && !idCard) {
+        this.fail(
+          new EimzoError("E_NO_CERTS", "Imzolash uchun sertifikat topilmadi.")
+        );
+        return;
+      }
+      const firstUsable = certs.find((c) => certIsUsable(c));
+      this.setState({
+        status: "ready",
+        certs,
+        idCardAvailable: idCard,
+        selectedSerial: firstUsable?.serialNumber ?? (idCard ? ID_CARD_SERIAL : certs[0]?.serialNumber ?? null)
+      });
+    } catch (error) {
+      this.fail(toEimzoError(error, "E_NOT_INSTALLED", "E-IMZO bilan ulanib bo'lmadi."));
+    }
+  }
+  /** Fatal xatodan keyin qayta yuklash. */
+  retryLoad() {
+    if (this.state.status !== "error" || this.finished) return;
+    void this.load();
+  }
+  selectCert(serial) {
+    if (this.state.status !== "ready" && this.state.status !== "partial") return;
+    this.setState({ selectedSerial: serial, lastError: void 0 });
+  }
+  /** "Imzolash" tugmasi. */
+  async confirm() {
+    if (!this.canConfirm || this.finished) return;
+    const cert = this.selectedCert;
+    if (!cert) return;
+    const targets = this.pendingDocs;
+    this.patchDocs(targets.map((d) => d.id), { status: "pending", error: void 0 });
+    this.setState({
+      status: "signing",
+      lastError: void 0,
+      progress: {
+        done: this.state.docs.length - targets.length,
+        total: this.state.docs.length
+      }
+    });
+    try {
+      const items = await this.client.signBatch(
+        cert,
+        targets.map((d) => ({ id: d.id, content: d.content })),
+        {
+          signal: this.ac.signal,
+          onProgress: (p) => {
+            const doneTotal = this.state.docs.length - targets.length + p.done;
+            this.setState({ progress: { done: doneTotal, total: this.state.docs.length } });
+            if (p.currentId) {
+              this.patchDocs([p.currentId], { status: "signing" });
+            }
+          }
+        }
+      );
+      for (const item of items) {
+        if (item.ok) {
+          this.patchDocs([item.id], {
+            status: "done",
+            result: {
+              id: item.id,
+              pkcs7_64: item.pkcs7_64,
+              signature_hex: item.signature_hex,
+              signer_serial_number: item.signer_serial_number
+            }
+          });
+        } else {
+          this.patchDocs([item.id], { status: "failed", error: item.error });
+        }
+      }
+      const failed = this.state.docs.filter((d) => d.status === "failed");
+      if (failed.length === 0) {
+        this.succeed();
+      } else {
+        this.setState({
+          status: "partial",
+          lastError: new EimzoError(
+            "E_SIGN_FAILED",
+            `${failed.length} ta hujjat imzolanmadi.`
+          )
+        });
+      }
+    } catch (error) {
+      if (EimzoError.is(error, "E_CANCELLED")) {
+        this.cancelledByAbort();
+        return;
+      }
+      this.patchDocs(targets.map((d) => d.id), { status: "pending" });
+      this.setState({
+        status: this.state.docs.some((d) => d.status === "done") ? "partial" : "ready",
+        lastError: toEimzoError(error, "E_SIGN_FAILED", "Imzolab bo'lmadi.")
+      });
+    }
+  }
+  /** "Bekor qilish" / Esc / overlay / idle-timeout / "Yopish" (fatal ekranда). */
+  cancel() {
+    if (this.finished) return;
+    if (this.state.status === "signing") {
+      this.ac.abort();
+      return;
+    }
+    if (this.state.status === "error" && this.state.fatal) {
+      const fatal = this.state.fatal;
+      this.finish(() => this.rejectOuter(fatal));
+      return;
+    }
+    this.finish(() => this.rejectOuter(this.cancelError()));
+  }
+  // ─── Yakuniy holatlar ──────────────────────────────────────────────────
+  succeed() {
+    const results = this.state.docs.map((d) => d.result).filter((r) => Boolean(r));
+    this.finish(() => this.resolveOuter({ results }));
+  }
+  cancelledByAbort() {
+    this.patchDocs(
+      this.state.docs.filter((d) => d.status === "signing").map((d) => d.id),
+      { status: "pending" }
+    );
+    this.finish(() => this.rejectOuter(this.cancelError()));
+  }
+  fail(error) {
+    this.setState({ status: "error", fatal: error });
+  }
+  cancelError() {
+    const partial = this.state.docs.map((d) => d.result).filter((r) => Boolean(r));
+    const err = new EimzoError("E_CANCELLED", "Imzolash bekor qilindi.");
+    err.partial = partial;
+    return err;
+  }
+  finish(action) {
+    if (this.finished) return;
+    this.finished = true;
+    action();
+  }
+  patchDocs(ids, patch) {
+    const set = new Set(ids);
+    this.setState({
+      docs: this.state.docs.map((d) => set.has(d.id) ? { ...d, ...patch } : d)
+    });
+  }
+};
+
 exports.EimzoClient = EimzoClient;
 exports.EimzoError = EimzoError;
+exports.ID_CARD_SERIAL = ID_CARD_SERIAL;
+exports.SignFlow = SignFlow;
 exports.certExpiresSoon = certExpiresSoon;
 exports.certIsExpired = certIsExpired;
+exports.certIsIndividual = certIsIndividual;
 exports.certIsNotYetValid = certIsNotYetValid;
 exports.certIsUsable = certIsUsable;
+exports.certOrg = certOrg;
 exports.dedupeCerts = dedupeCerts;
 exports.sortCerts = sortCerts;
 exports.toEimzoError = toEimzoError;