xvai-loi 0.1.141 → 0.1.142

package/co.txt

@@ -1 +1 @@
-xvaiLoi140209
+xvaiLoi140229

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xvai-loi",
-  "version": "0.1.141",
+  "version": "0.1.142",
   "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

@@ -5090,11 +5090,11 @@ function giaiBoCuc(ung, tong, nc = {}) {
 // flow-src/engine/moNhanh.ts
 var KHO = {};
 function moNhanh(g, W3, H2, ve, r, them = "") {
-  const k = 4, w = Math.ceil(W3 / k), h = Math.ceil(H2 / k), khoa2 = w + "x" + h;
-  let c = KHO[khoa2];
+  const k = 4, w = Math.ceil(W3 / k), h = Math.ceil(H2 / k), khoa3 = w + "x" + h;
+  let c = KHO[khoa3];
   if (!c) {
     const cv = new OffscreenCanvas(w, h);
-    c = KHO[khoa2] = { cv, g: cv.getContext("2d") };
+    c = KHO[khoa3] = { cv, g: cv.getContext("2d") };
   }
   const x = c.g;
   x.setTransform(1, 0, 0, 1, 0, 0);
@@ -14085,12 +14085,12 @@ var bam = (s) => {
 };
 var DE = 'B\u1EA1n l\xE0 bi\xEAn t\u1EADp vi\xEAn ph\u1EE5 \u0111\u1EC1 video ng\u1EAFn ti\u1EBFng Vi\u1EC7t. D\u01B0\u1EDBi \u0111\xE2y l\xE0 l\u1EDDi n\xF3i, m\u1ED7i t\u1EEB c\xF3 s\u1ED1 th\u1EE9 t\u1EF1 \u0111\u1EE9ng tr\u01B0\u1EDBc d\u1EA5u hai ch\u1EA5m. Ch\u1ECDn t\u1EEB c\u1EA7n NH\u1EA4N tr\xEAn ph\u1EE5 \u0111\u1EC1. k = t\u1EEB kho\xE1 mang \xFD ch\xEDnh c\u1EE7a c\xE2u, X\u1EBEP t\u1EEB quan tr\u1ECDng nh\u1EA5t tr\u1EDF xu\u1ED1ng (t\u1EEB gh\xE9p nh\u01B0 kh\xF3 kh\u0103n, l\xF2ng ng\u01B0\u1EDDi th\xEC ch\u1ECDn c\u1EA3 hai ti\u1EBFng, \u0111\u1EE9ng li\u1EC1n nhau; kh\xF4ng ch\u1ECDn h\u01B0 t\u1EEB nh\u01B0 l\xE0, th\xEC, m\xE0, c\u1EE7a, c\xF3, nh\u1EEFng). d = danh t\u1EEB quan tr\u1ECDng. g = t\u1EEB g\u1EE3i h\xECnh ho\u1EB7c c\u1EA3m x\xFAc m\u1EA1nh. Ch\u1EC9 tr\u1EA3 v\u1EC1 \u0111\xFAng m\u1ED9t d\xF2ng JSON d\u1EA1ng {"k":[s\u1ED1],"d":[s\u1ED1],"g":[s\u1ED1]}, kh\xF4ng gi\u1EA3i th\xEDch. L\u1EDDi n\xF3i: ';
 async function nhanAI(ws, onStatus) {
-  const khoa2 = "xvaiNhan:2" + bam(ws.map((w) => w.text).join(" "));
-  if (kho4.has(khoa2)) return kho4.get(khoa2);
+  const khoa3 = "xvaiNhan:2" + bam(ws.map((w) => w.text).join(" "));
+  if (kho4.has(khoa3)) return kho4.get(khoa3);
   try {
-    const c = JSON.parse(localStorage.getItem(khoa2) || "null");
+    const c = JSON.parse(localStorage.getItem(khoa3) || "null");
     if (c && Array.isArray(c.k)) {
-      kho4.set(khoa2, c);
+      kho4.set(khoa3, c);
       return c;
     }
   } catch (e) {
@@ -14110,9 +14110,9 @@ async function nhanAI(ws, onStatus) {
     onStatus?.("AI ch\u1ECDn t\u1EEB nh\u1EA5n l\u1ED7i, xu\u1EA5t kh\xF4ng nh\u1EA5n: " + String(e?.message || e).slice(0, 60));
     return null;
   }
-  kho4.set(khoa2, ra2);
+  kho4.set(khoa3, ra2);
   try {
-    localStorage.setItem(khoa2, JSON.stringify(ra2));
+    localStorage.setItem(khoa3, JSON.stringify(ra2));
   } catch (e) {
   }
   return ra2;
@@ -15212,13 +15212,13 @@ async function chuanBiKho(kb, words, bao) {
         }
       }
       if (best < 0 || bd2 > Math.max(2, Math.round(0.25 * t.length))) continue;
-      const tu2 = W3.slice(best, best + 3).map((w) => String(w.text).replace(/[.,!?;:…"“”]/g, "")).join(" "), khoa2 = "anh:" + tu2.toLocaleLowerCase("vi");
-      const cu = taiSan(khoa2);
+      const tu2 = W3.slice(best, best + 3).map((w) => String(w.text).replace(/[.,!?;:…"“”]/g, "")).join(" "), khoa3 = "anh:" + tu2.toLocaleLowerCase("vi");
+      const cu = taiSan(khoa3);
       if (cu && cu.laVideo) continue;
       try {
         const im = await napVideo(a.blob, bao);
         im.khoId = a.id;
-        datTaiSan(khoa2, im);
+        datTaiSan(khoa3, im);
         da.add(a.id);
         n++;
         them++;
@@ -15454,9 +15454,9 @@ async function kichBanDoan(ws) {
     let x = 5381;
     for (let i = 0; i < t.length; i++) x = (x * 33 ^ t.charCodeAt(i)) >>> 0;
     return x.toString(36).slice(0, 5);
-  })(), khoa2 = (cm ? "xvaiKbCm9" + hp + ":" : "xvaiKb3:") + h.toString(36);
+  })(), khoa3 = (cm ? "xvaiKbCm9" + hp + ":" : "xvaiKb3:") + h.toString(36);
   try {
-    const c = localStorage.getItem("xvaiDemLanh") === "1" ? null : JSON.parse(localStorage.getItem(khoa2) || "null");
+    const c = localStorage.getItem("xvaiDemLanh") === "1" ? null : JSON.parse(localStorage.getItem(khoa3) || "null");
     if (c && c.moc) {
       globalThis.__kbNguon = "dem";
       return c;
@@ -15464,8 +15464,8 @@ async function kichBanDoan(ws) {
   } catch (e) {
   }
   try {
-    const kDa = "kb:" + khoa2.split(":")[0] + ":da:" + maDuAn(), sg = (x) => String(x || "").replace(/[^\p{L}]/gu, "").slice(0, 40);
-    const b = await docDem("kb:" + khoa2) || await (async () => {
+    const kDa = "kb:" + khoa3.split(":")[0] + ":da:" + maDuAn(), sg = (x) => String(x || "").replace(/[^\p{L}]/gu, "").slice(0, 40);
+    const b = await docDem("kb:" + khoa3) || await (async () => {
       const c = await docDem(kDa);
       return c && c.van && sg(c.van.dau) === sg(van.dau) ? c : null;
     })();
@@ -15478,7 +15478,7 @@ async function kichBanDoan(ws) {
   if (cm) {
     const dau = van.dau;
     for (const k of Object.keys(localStorage)) {
-      if (k.indexOf(khoa2.split(":")[0] + ":") !== 0) continue;
+      if (k.indexOf(khoa3.split(":")[0] + ":") !== 0) continue;
       try {
         const c = JSON.parse(localStorage.getItem(k) || "null"), v = c && c.van;
         if (c && c.moc && Array.isArray(c.canh) && c.canh.length > 10 && dau.indexOf(String(c.moc).toLocaleLowerCase("vi").slice(0, 18)) >= 0 && v && v.dau === van.dau && v.cuoi === van.cuoi && Math.abs((v.n || 0) - van.n) <= van.n * 0.1) {
@@ -15536,13 +15536,13 @@ async function kichBanDoan(ws) {
     }
     if (j && j.moc) {
       try {
-        localStorage.setItem(khoa2, JSON.stringify({ ...j, van }));
+        localStorage.setItem(khoa3, JSON.stringify({ ...j, van }));
       } catch (e) {
       }
       try {
         const v2 = JSON.parse(JSON.stringify({ ...j, van }));
-        ghiDem("kb:" + khoa2, v2);
-        ghiDem("kb:" + khoa2.split(":")[0] + ":da:" + maDuAn(), v2);
+        ghiDem("kb:" + khoa3, v2);
+        ghiDem("kb:" + khoa3.split(":")[0] + ":da:" + maDuAn(), v2);
       } catch (e) {
       }
       return j;
@@ -16083,14 +16083,20 @@ function xepKho(p, mau2, kb, gia2) {
   }
 }
 var khoTile = (mau2, kb) => new Map(dsTaiSan(mau2.doan, kb).map((x) => [x[0], x[2]]));
-function canhClip(p, mau2, kb) {
+var khoa = (c) => "anh:" + String(c.tu || "").toLocaleLowerCase("vi");
+function canhClip(p, mau2, kb, toiDa = 4) {
   if (!mau2?.doan || !kb) return null;
-  const tile = khoTile(mau2, kb);
-  const d = xepKho(p, mau2, kb, (k) => /^anh:/.test(k) ? clipGia : tile.has(k) ? anhGia(String(tile.get(k))) : null);
-  if (!d) return null;
-  const dung = new Set(d);
-  const ra2 = (kb.canh || []).filter((c) => c && c.kieu === "anh" && (c.en || c.de) && dung.has("anh:" + String(c.tu || "").toLocaleLowerCase("vi")));
-  G2.__xepThu = { ...G2.__xepThu || {}, clip: [d.length, ra2.length] };
+  const tile = khoTile(mau2, kb), anhG = (k) => tile.has(k) ? anhGia(String(tile.get(k))) : null;
+  const d0 = xepKho(p, mau2, kb, anhG);
+  if (!d0) return null;
+  const dung = new Set(d0);
+  const ung = (kb.canh || []).filter((c) => c && c.kieu === "anh" && (c.en || c.de) && dung.has(khoa(c))), b = ung.length / Math.max(1, toiDa);
+  const chon = ung.length <= toiDa ? ung : Array.from({ length: toiDa }, (_, i) => ung[Math.floor(i * b)]), ck = new Set(chon.map(khoa));
+  const d1 = xepKho(p, mau2, kb, (k) => ck.has(k) ? clipGia : anhG(k));
+  if (!d1) return null;
+  const song = new Set(d1);
+  const ra2 = chon.filter((c) => song.has(khoa(c)));
+  G2.__xepThu = { ...G2.__xepThu || {}, clip: [ung.length, chon.length, ra2.length] };
   return ra2;
 }
 function anhCan(p, mau2, kb) {
@@ -16440,7 +16446,7 @@ async function handleExport(currentProject, setExporting, setExportedBlob, addLo
           const khoCu = await layKho(), nVid = khoCu.filter((m) => m.loai === "video" && cuaDuAn(m.ten)).length;
           const canVid = Math.max(3, Math.min(8, Math.ceil((window.__loiApp?.p?.timeline || []).reduce((s, t) => s + Math.max(0, (t.trimEnd || 0) - (t.trimStart || 0)), 0) / 18) || 4));
           if (nVid < canVid) {
-            const cc = canhClip(currentProject, mauPd, kb);
+            const cc = canhClip(currentProject, mauPd, kb, canVid - nVid);
             const r = await taoTramOmni(cc || kb && kb.canh || [], { toiDa: canVid - nVid, giay: 4, tran: 40, daXep: !!cc, bao: (st) => setExporting({ percent: 1, step: "T\u1EA1o clip tr\xE1m Omni (c\xF3 credit) " + st }) });
             window.__omniXuat = r;
           }
@@ -18211,7 +18217,7 @@ function datCauLenh(a) {
   on2 = true;
   window.addEventListener("message", async (ev) => {
     const d = ev.data;
-    if (!d || d.xvaiLoi140209 !== true) return;
+    if (!d || d.xvaiLoi140229 !== 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) => {
@@ -18234,24 +18240,6 @@ function datCauLenh(a) {
         const p = api.project;
         return tra({ id: p && p.id, ten: p && p.name, doan: p && p.timeline ? p.timeline.length : 0, fx: p && p.studioFx || null, sua: p && p.speechEdit && p.speechEdit.metrics || null, xuat: api.exporting || null, phim: api.blob ? api.blob.size : 0, pro: pro ? pro.trangThai() : null });
       }
-      if (d.lenh === "datFx") {
-        api.setProject((c) => c ? { ...c, studioFx: { ...c.studioFx || {}, ...d.fx || {} } } : c);
-        return tra("ok");
-      }
-      if (d.lenh === "tuyChon") return tra(pro ? pro.dat(d.tuyChon || {}) : "CHUA CO BANG HAU KY");
-      if (d.lenh === "tuDongPro") {
-        if (!pro) return tra("CHUA CO BANG HAU KY");
-        pro.tuDong();
-        return tra("ok");
-      }
-      if (d.lenh === "xuat") {
-        api.xuat();
-        return tra("ok");
-      }
-      if (d.lenh === "dongXuat") {
-        api.dongXuat();
-        return tra("ok");
-      }
       if (d.lenh === "taiPhim") {
         await api.tai();
         return tra("ok");
@@ -18269,14 +18257,6 @@ function datCauLenh(a) {
         const text2 = JSON.stringify(api.project), a2 = Number(d.tu) || 0, b = Math.min(text2.length, Number(d.den) || text2.length);
         return tra({ size: text2.length, tu: a2, den: b, text: text2.slice(a2, b) });
       }
-      if (d.lenh === "datXuatNhanh") {
-        window.__xuatNhanh = !!d.bat;
-        return tra("ok");
-      }
-      if (d.lenh === "datMauPhuDe") {
-        window.__mauPhuDe = d.mau ? String(d.mau) : "";
-        return tra("ok");
-      }
       if (d.lenh === "napLoi") return tra(await napLoi(d));
       if (d.lenh === "taoTramOmni") return tra(await taoTramOmni(d.canh || [], d));
       if (d.lenh === "cauApp") return tra(cauApp(d));
@@ -18293,10 +18273,10 @@ var sfx_kho_default = { "bong_001.ogg": "T2dnUwACAAAAAAAAAAABSQAAAAAAANTOBngBHgF
 // loi/tuyChonBen.ts
 var KHOA_TUY_CHON = ["xvaiNhipCham", "xvaiChuoiTram", "xvaiToanKhung", "xvaiNhacMuc", "xvaiNhac", "xvaiTramDai", "xvaiSfxCach", "xvaiMau", "xvaiAm", "xvaiKieuChu", "xvaiDem", "xvaiTuDien", "xvaiNguonTram", "xvaiTranAnh", "xvaiPhuDe"];
 var G4 = globalThis;
-var khoa = () => Array.isArray(G4.__khoaTuyChon) ? G4.__khoaTuyChon : KHOA_TUY_CHON;
+var khoa2 = () => Array.isArray(G4.__khoaTuyChon) ? G4.__khoaTuyChon : KHOA_TUY_CHON;
 var anh = () => {
   const o = {};
-  for (const k of khoa()) {
+  for (const k of khoa2()) {
     try {
       const v = localStorage.getItem(k);
       if (v != null) o[k] = v;
@@ -18318,7 +18298,7 @@ async function khoiPhucTuyChon() {
   let n = 0;
   try {
     const o = await hoiNgoai("lay", "tuyChon");
-    if (o && typeof o === "object") for (const k of khoa()) {
+    if (o && typeof o === "object") for (const k of khoa2()) {
       if (typeof o[k] === "string" && localStorage.getItem(k) == null) {
         localStorage.setItem(k, o[k]);
         n++;
@@ -18332,11 +18312,11 @@ async function khoiPhucTuyChon() {
     const S = Storage.prototype, set = S.setItem, rm = S.removeItem;
     S.setItem = function(k, v) {
       set.call(this, k, v);
-      if (this === localStorage && khoa().indexOf(k) >= 0) (G4.__luuTuyChon || luu)();
+      if (this === localStorage && khoa2().indexOf(k) >= 0) (G4.__luuTuyChon || luu)();
     };
     S.removeItem = function(k) {
       rm.call(this, k);
-      if (this === localStorage && khoa().indexOf(k) >= 0) (G4.__luuTuyChon || luu)();
+      if (this === localStorage && khoa2().indexOf(k) >= 0) (G4.__luuTuyChon || luu)();
     };
   }
   return n;
@@ -18863,7 +18843,7 @@ var SuaLich = ({ ten, onDong }) => {
     const S = p && p.speechDraft && p.speechDraft.analysis && p.speechDraft.analysis.silences || [];
     return Array.isArray(w) ? canVung(w, S) : [];
   })();
-  const khoa2 = (r) => r.t0g !== void 0 ? r.t0g : r.t0;
+  const khoa3 = (r) => r.t0g !== void 0 ? r.t0g : r.t0;
   const luuCat = (n) => {
     setCatTay(n);
     G6.__catTay = n;
@@ -18872,7 +18852,7 @@ var SuaLich = ({ ten, onDong }) => {
     } catch (e) {
     }
   };
-  const ids = (r) => Array.isArray(r.ids) ? r.ids : [khoa2(r)];
+  const ids = (r) => Array.isArray(r.ids) ? r.ids : [khoa3(r)];
   const daCat = (w) => catTay.some((r) => ids(r).some((x) => Math.abs(x - w.t0g) < 0.01));
   const batCat = async (w) => {
     const chon = /* @__PURE__ */ new Set();