xvai-loi 0.1.99 → 0.1.100

package/co.txt

@@ -1 +1 @@
-xvaiLoi121827
+xvaiLoi122031

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xvai-loi",
-  "version": "0.1.99",
+  "version": "0.1.100",
   "description": "Loi dung video (Edit Video Tu Dong) nap vao tool Google Flow qua o cam engine/oCam.ts",
   "license": "UNLICENSED",
   "type": "module",

package/xvai-loi.js

@@ -11717,6 +11717,16 @@ function lapCuongMe(o) {
     m.ten = m.ten || cum2(m.c.chu);
   });
   const N = muc.length, ten = muc.map((m) => m.ten);
+  const cuaVideo = (t) => {
+    const K = /* @__PURE__ */ new Set();
+    (kb?.canh || []).forEach((c) => {
+      if (c && c.kieu && c.tu) K.add(c.kieu + ":" + String(c.tu).toLocaleLowerCase("vi"));
+    });
+    (kb?.muc || []).concat(muc).forEach((m) => {
+      if (m && m.ten) K.add("trang:" + String(m.ten).toLocaleLowerCase("vi").replace(/[^\p{L}\p{N}]+/gu, ""));
+    });
+    return K.has(t);
+  };
   const loiDem = W22.map((w) => w.t).join(" "), coBuoc = N >= 3 && (muc.filter((m) => m.cach === "ten").length >= Math.ceil(N * 0.6) || new Set(loiDem.match(/(đầu tiên|thứ hai|thứ ba|thứ tư|thứ năm|số một|số hai|số ba|bước một|bước hai|bước ba|thứ nhất)/g) || []).size >= 2);
   globalThis.__coBuoc = { N, coBuoc, ten: muc.filter((m) => m.cach === "ten").length };
   const sp = [];
@@ -12820,7 +12830,7 @@ function lapCuongMe(o) {
         sp.forEach((x) => {
           if (x.ten) lanCuoi[x.ten] = Math.max(lanCuoi[x.ten] ?? -99, x.f);
         });
-        const tatCa = dsTenTaiSan().filter((t) => t.indexOf("trang:") === 0 || t.indexOf("anh:") === 0);
+        const tatCa = dsTenTaiSan().filter((t) => (t.indexOf("trang:") === 0 || t.indexOf("anh:") === 0) && cuaVideo(t));
         const kho6 = tatCa.filter((t) => lanCuoi[t] == null);
         let kI = 0, nThem = 0;
         const spans = [];
@@ -13004,7 +13014,7 @@ function lapCuongMe(o) {
       G4.__vd236 = { bo: nB, lap: nL };
     }
     {
-      const tat2 = dsTenTaiSan().filter((t) => /^(anh|trang):/.test(t)), dung = {}, daTren = /* @__PURE__ */ new Set();
+      const tat2 = dsTenTaiSan().filter((t) => /^(anh|trang):/.test(t) && cuaVideo(t)), dung = {}, daTren = /* @__PURE__ */ new Set();
       sp.forEach((x) => {
         if (x.ten) dung[x.ten] = (dung[x.ten] || 0) + 1;
       });
@@ -13373,6 +13383,7 @@ function lapCuongMe(o) {
   }
   if (coBuoc) the(nguon3(f1), nguon3(f1) + Math.min(hetMuc, tong) - 0.05 - f1, { loai: "cmTien", rel: muc.map((m) => +(m.f - f1).toFixed(2)) });
   o.lichCm = globalThis.__lichCm = {
+    dungTen: [...new Set(sp.map((s) => s.ten).filter(Boolean))],
     N,
     muc: muc.map((m) => [+m.f.toFixed(2), m.ten]),
     canh: sp.flatMap((s) => [[+s.f.toFixed(2), s.bo, +s.d.toFixed(2), s.tieu || s.giant || s.chu || ""].join(" ")].concat(s.phong ? [[+s.f.toFixed(2), "phong", 0.75, ""].join(" ")] : [])),
@@ -19009,13 +19020,17 @@ function dsTaiSan(kieu, kb) {
   ICON3D.forEach(([k, v]) => ds2.push(["st3d:" + k, ICON(v), "1:1"]));
   return ds2;
 }
-async function chuanBiTaiSanAI(kieu, kb, bao) {
-  const ds2 = dsTaiSan(kieu, kb);
+async function chuanBiTaiSanAI(kieu, kb, bao, chi) {
+  const ds2 = dsTaiSan(kieu, kb).filter((x) => !chi || !/^(anh|vat|trang):/.test(x[0]) || chi.has(x[0]));
   if (!ds2.length) return 0;
   const d = await db2();
   let ok = 0, loiLien = 0;
+  const t0 = Date.now();
   for (let i = 0; i < ds2.length; i++) {
-    bao?.("T\u1EA1o \u1EA3nh t\xE0i s\u1EA3n m\u1EABu (0 credit) " + (i + 1) + "/" + ds2.length + "...");
+    {
+      const tb = i ? (Date.now() - t0) / i : 55e3, con = Math.ceil((ds2.length - i) * tb / 6e4);
+      bao?.("T\u1EA1o \u1EA3nh tr\xE1m (0 credit) " + (i + 1) + "/" + ds2.length + (i >= 2 || ds2.length - i > 3 ? " \xB7 c\xF2n ~" + con + " ph\xFAt" : "") + "...");
+    }
     try {
       if (await mot(d, ds2[i][0], ds2[i][1], ds2[i][2], bao)) ok++;
       loiLien = 0;
@@ -19323,7 +19338,24 @@ async function handleExport(currentProject, setExporting, setExportedBlob, addLo
     }
     await chuanBiKho(kb, window.__wsGocKB || currentProject.speechDraft?.analysis?.words || [], (st) => setExporting({ percent: 1, step: st }));
     await chupTrangThieu(kb, (st) => setExporting({ percent: 1, step: st }));
-    await chuanBiTaiSanAI(mauPd.doan, kb, (st) => setExporting({ percent: 1, step: st }));
+    let chiAnh = null;
+    try {
+      const G3 = globalThis;
+      if (localStorage.getItem("xvaiTaoHetAnh") !== "1") {
+        const cu = G3.__taiSanThu, gia2 = new Map(dsTaiSan(mauPd.doan, kb).map((x) => [x[0], { laVideo: false, dai: 0, width: 1080, height: 1920, khung: () => null }]));
+        G3.__taiSanThu = (t) => gia2.get(t) || (cu ? cu(t) : null);
+        try {
+          apDungDoan(currentProject, mauPd, JSON.parse(JSON.stringify(kb)));
+          const d = G3.__lichCm && G3.__lichCm.dungTen;
+          if (Array.isArray(d)) chiAnh = new Set(d);
+        } finally {
+          G3.__taiSanThu = cu;
+        }
+      }
+    } catch (e) {
+      chiAnh = null;
+    }
+    await chuanBiTaiSanAI(mauPd.doan, kb, (st) => setExporting({ percent: 1, step: st }), chiAnh);
     await kiemAnhTao(kb, window.__wsGocKB || currentProject.speechDraft?.analysis?.words || [], (st) => setExporting({ percent: 1, step: st }));
     currentProject = apDungDoan(currentProject, mauPd, kb);
   }
@@ -21055,6 +21087,7 @@ var LOI_URL = "https://cdn.jsdelivr.net/npm/xvai-loi@on-dinh/nap.js";
 var TRONG_LOI = !!globalThis.__xvaiReact;
 try {
   if (!TRONG_LOI) setTimeout(() => {
+    if (globalThis.__nenTang && globalThis.__nenTang.ten === "web") return;
     let u = LOI_URL;
     try {
       u = localStorage.getItem("xvaiLoiUrl") || LOI_URL;
@@ -21066,22 +21099,6 @@ try {
   }, 2500);
 } catch (e) {
 }
-try {
-  if (!TRONG_LOI) window.addEventListener("message", async (ev) => {
-    const d = ev.data, o = String(ev.origin || "");
-    if (!(d && d.xvaiLenh === true)) return;
-    if (!(o.indexOf("https://flow.google.com") === 0 || o.indexOf("https://labs.google") === 0)) return;
-    const tra = (kq) => {
-      try {
-        ev.source.postMessage({ xvai: true, id: d.id, kq }, ev.origin);
-      } catch (e) {
-      }
-    };
-    if (d.lenh === "ping") tra("pong");
-    else if (d.lenh === "napLoi") tra(await napLoi(d));
-  });
-} catch (e) {
-}
 
 // flow-src/engine/cauLenh.ts
 var api = null;
@@ -21097,7 +21114,7 @@ function datCauLenh(a) {
   on2 = true;
   window.addEventListener("message", async (ev) => {
     const d = ev.data;
-    if (!d || d.xvaiLoi121827 !== true) return;
+    if (!d || d.xvaiLoi122031 !== true) return;
     const o = String(ev.origin || "");
     if (!(o.indexOf("https://flow.google.com") === 0 || o.indexOf("https://labs.google") === 0)) return;
     const tra = (kq) => {