@infuro/cms-core 1.0.15 → 1.0.16

package/dist/api.js

@@ -397,7 +397,7 @@ var init_paid_order_erp = __esm({
 });
 
 // src/api/crud.ts
-import { ILike, Like, MoreThan } from "typeorm";
+import { Brackets, ILike, MoreThan } from "typeorm";
 
 // src/plugins/erp/erp-contact-sync.ts
 init_erp_queue();
@@ -710,14 +710,38 @@ function createCrudHandler(dataSource, entityMap, options) {
       const repo = dataSource.getRepository(entity);
       const typeFilter = searchParams.get("type");
       const columnNames = new Set(repo.metadata.columns.map((c) => c.propertyName));
+      if (resource === "media") {
+        const qb = repo.createQueryBuilder("m");
+        const parentIdParam = searchParams.get("parentId");
+        if (parentIdParam != null && parentIdParam !== "") {
+          const n = Number(parentIdParam);
+          if (!Number.isFinite(n)) return json({ error: "Invalid parentId" }, { status: 400 });
+          qb.where("m.parentId = :pid", { pid: n });
+        } else {
+          qb.where("m.parentId IS NULL");
+        }
+        if (search && typeof search === "string" && search.trim()) {
+          qb.andWhere("m.filename ILIKE :search", { search: `%${search.trim()}%` });
+        }
+        if (typeFilter) {
+          qb.andWhere(
+            new Brackets((sq) => {
+              sq.where("m.kind = :folderKind", { folderKind: "folder" }).orWhere("m.mimeType LIKE :mtp", {
+                mtp: `${typeFilter}/%`
+              });
+            })
+          );
+        }
+        const allowedSort = ["filename", "createdAt", "id"];
+        const sf = allowedSort.includes(sortFieldRaw) ? sortFieldRaw : "filename";
+        const so = sortOrder === "DESC" ? "DESC" : "ASC";
+        qb.orderBy("CASE WHEN m.kind = :fk THEN 0 ELSE 1 END", "ASC").addOrderBy(`m.${sf}`, so).setParameter("fk", "folder").skip(skip).take(limit);
+        const [data2, total2] = await qb.getManyAndCount();
+        return json({ total: total2, page, limit, totalPages: Math.ceil(total2 / limit), data: data2 });
+      }
       const sortField = columnNames.has(sortFieldRaw) ? sortFieldRaw : "createdAt";
       let where = {};
-      if (resource === "media") {
-        const mediaWhere = {};
-        if (search) mediaWhere.filename = ILike(`%${search}%`);
-        if (typeFilter) mediaWhere.mimeType = Like(`${typeFilter}/%`);
-        where = Object.keys(mediaWhere).length > 0 ? mediaWhere : {};
-      } else if (search) {
+      if (search) {
         where = buildSearchWhereClause(repo, search);
       }
       const intFilterKeys = ["productId", "attributeId", "taxId"];
@@ -757,6 +781,38 @@ function createCrudHandler(dataSource, entityMap, options) {
       if (!body || typeof body !== "object" || Object.keys(body).length === 0) {
         return json({ error: "Invalid request payload" }, { status: 400 });
       }
+      if (resource === "media") {
+        const b = body;
+        const kind = b.kind === "folder" ? "folder" : "file";
+        b.kind = kind;
+        const fn = String(b.filename ?? "").trim().slice(0, 255);
+        if (!fn) return json({ error: "filename required" }, { status: 400 });
+        b.filename = fn;
+        let pid = null;
+        if (b.parentId != null && b.parentId !== "") {
+          const n = Number(b.parentId);
+          if (!Number.isFinite(n)) return json({ error: "Invalid parentId" }, { status: 400 });
+          pid = n;
+        }
+        b.parentId = pid;
+        const mediaRepo = dataSource.getRepository(entityMap.media);
+        if (pid != null) {
+          const parent = await mediaRepo.findOne({ where: { id: pid } });
+          if (!parent || parent.kind !== "folder") {
+            return json({ error: "parent must be a folder" }, { status: 400 });
+          }
+        }
+        if (kind === "folder") {
+          b.url = null;
+          b.mimeType = "inode/directory";
+          b.size = 0;
+        } else {
+          if (!b.url || typeof b.url !== "string") return json({ error: "url required for files" }, { status: 400 });
+          if (!b.mimeType || typeof b.mimeType !== "string") {
+            b.mimeType = "application/octet-stream";
+          }
+        }
+      }
       const repo = dataSource.getRepository(entity);
       sanitizeBodyForEntity(repo, body);
       const created = await repo.save(repo.create(body));
@@ -1029,6 +1085,11 @@ function createCrudByIdHandler(dataSource, entityMap, options) {
         return updated2 ? json(updated2) : json({ message: "Not found" }, { status: 404 });
       }
       const updatePayload = rawBody && typeof rawBody === "object" ? pickColumnUpdates(repo, rawBody) : {};
+      if (resource === "media") {
+        const u = updatePayload;
+        delete u.parentId;
+        delete u.kind;
+      }
       if (Object.keys(updatePayload).length > 0) {
         sanitizeBodyForEntity(repo, updatePayload);
         await repo.update(numericId, updatePayload);
@@ -1205,7 +1266,7 @@ function createUserAuthApiRouter(config) {
 // src/api/cms-handlers.ts
 init_email_queue();
 init_erp_queue();
-import { MoreThanOrEqual, ILike as ILike2 } from "typeorm";
+import { MoreThanOrEqual, ILike as ILike2, In } from "typeorm";
 
 // src/plugins/captcha/assert.ts
 async function assertCaptchaOk(getCms, body, req, json) {
@@ -1223,6 +1284,194 @@ async function assertCaptchaOk(getCms, body, req, json) {
   return json({ error: result.message }, { status: result.status });
 }
 
+// src/lib/media-folder-path.ts
+function sanitizeMediaFolderPath(input) {
+  if (input == null) return "";
+  if (typeof input !== "string") return "";
+  const segments = input.replace(/\\/g, "/").split("/").map((s) => s.trim()).filter(Boolean).filter((s) => s !== ".." && s !== ".");
+  const joined = segments.join("/");
+  return joined.length > 512 ? joined.slice(0, 512) : joined;
+}
+function sanitizeStorageSegment(name) {
+  const s = name.replace(/[/\\]/g, "-").trim().slice(0, 255);
+  return s || "item";
+}
+
+// src/lib/media-parent-path.ts
+async function relativePathFromMediaParentId(dataSource, entityMap, parentId) {
+  if (parentId == null) return "";
+  const repo = dataSource.getRepository(entityMap.media);
+  const segments = [];
+  let id = parentId;
+  for (let d = 0; d < 64 && id != null; d++) {
+    const row = await repo.findOne({ where: { id } });
+    if (!row) break;
+    const m = row;
+    if (m.kind !== "folder") break;
+    segments.unshift(sanitizeStorageSegment(m.filename));
+    id = m.parentId ?? null;
+  }
+  return segments.join("/");
+}
+
+// src/lib/media-zip-extract.ts
+import { IsNull as IsNull2 } from "typeorm";
+var ZIP_MIME_TYPES = /* @__PURE__ */ new Set(["application/zip", "application/x-zip-compressed"]);
+var MAX_ENTRIES = 2e3;
+var MAX_TOTAL_UNCOMPRESSED = 80 * 1024 * 1024;
+function isZipMedia(mime, filename) {
+  if (mime && ZIP_MIME_TYPES.has(mime)) return true;
+  return filename.toLowerCase().endsWith(".zip");
+}
+async function readBufferFromPublicUrl(url) {
+  if (url.startsWith("http://") || url.startsWith("https://")) {
+    const r = await fetch(url);
+    if (!r.ok) throw new Error("Failed to download file");
+    return Buffer.from(await r.arrayBuffer());
+  }
+  if (url.startsWith("/")) {
+    const { readFile } = await import("fs/promises");
+    const { join } = await import("path");
+    const rel = url.replace(/^\/+/, "");
+    return readFile(join(process.cwd(), "public", rel));
+  }
+  throw new Error("Unsupported media URL");
+}
+function sanitizeZipPath(entryName) {
+  const norm = entryName.replace(/\\/g, "/").split("/").filter(Boolean);
+  for (const seg of norm) {
+    if (seg === ".." || seg === ".") return null;
+  }
+  return norm;
+}
+function shouldSkipEntry(parts) {
+  if (parts[0] === "__MACOSX") return true;
+  const last = parts[parts.length - 1];
+  if (last === ".DS_Store") return true;
+  return false;
+}
+function guessMimeType(fileName) {
+  const lower = fileName.toLowerCase();
+  if (lower.endsWith(".png")) return "image/png";
+  if (lower.endsWith(".jpg") || lower.endsWith(".jpeg")) return "image/jpeg";
+  if (lower.endsWith(".gif")) return "image/gif";
+  if (lower.endsWith(".webp")) return "image/webp";
+  if (lower.endsWith(".svg")) return "image/svg+xml";
+  if (lower.endsWith(".pdf")) return "application/pdf";
+  if (lower.endsWith(".txt")) return "text/plain";
+  if (lower.endsWith(".json")) return "application/json";
+  if (lower.endsWith(".zip")) return "application/zip";
+  return "application/octet-stream";
+}
+async function findOrCreateFolder(dataSource, entityMap, parentId, name) {
+  const safe = sanitizeStorageSegment(name);
+  const repo = dataSource.getRepository(entityMap.media);
+  const where = parentId == null ? { kind: "folder", filename: safe, parentId: IsNull2() } : { kind: "folder", filename: safe, parentId };
+  const existing = await repo.findOne({ where });
+  if (existing) return existing.id;
+  const row = await repo.save(
+    repo.create({
+      kind: "folder",
+      parentId,
+      filename: safe,
+      url: null,
+      mimeType: "inode/directory",
+      size: 0,
+      alt: null,
+      isPublic: false,
+      deleted: false
+    })
+  );
+  return row.id;
+}
+async function ensureFolderChain(dataSource, entityMap, rootParentId, pathSegments) {
+  let pid = rootParentId;
+  for (const seg of pathSegments) {
+    if (!seg) continue;
+    pid = await findOrCreateFolder(dataSource, entityMap, pid, seg);
+  }
+  return pid;
+}
+async function extractZipMediaIntoParentTree(opts) {
+  const { dataSource, entityMap, zipMediaRow } = opts;
+  const row = zipMediaRow;
+  if (row.kind !== "file" || !row.url) throw new Error("Not a file");
+  if (!isZipMedia(row.mimeType, row.filename)) throw new Error("Not a zip archive");
+  const buffer = await readBufferFromPublicUrl(row.url);
+  const { default: AdmZip } = await import("adm-zip");
+  const zip = new AdmZip(buffer);
+  const entries = zip.getEntries();
+  if (entries.length > MAX_ENTRIES) throw new Error(`Too many zip entries (max ${MAX_ENTRIES})`);
+  const rootParentId = row.parentId;
+  const items = [];
+  let totalUncompressed = 0;
+  for (const e of entries) {
+    const raw = e.entryName;
+    const parts = sanitizeZipPath(raw);
+    if (!parts || shouldSkipEntry(parts)) continue;
+    const isDir = e.isDirectory || /\/$/.test(raw);
+    let data = null;
+    if (!isDir) {
+      data = e.getData();
+      totalUncompressed += data.length;
+      if (totalUncompressed > MAX_TOTAL_UNCOMPRESSED) {
+        throw new Error(`Uncompressed content exceeds limit (${MAX_TOTAL_UNCOMPRESSED} bytes)`);
+      }
+    }
+    items.push({ parts, isDir, data });
+  }
+  items.sort((a, b) => {
+    const da = a.parts.length;
+    const db = b.parts.length;
+    if (da !== db) return da - db;
+    return a.parts.join("/").localeCompare(b.parts.join("/"));
+  });
+  let files = 0;
+  let folderEntries = 0;
+  const repo = dataSource.getRepository(entityMap.media);
+  for (const it of items) {
+    if (it.isDir) {
+      await ensureFolderChain(dataSource, entityMap, rootParentId, it.parts);
+      folderEntries++;
+      continue;
+    }
+    const fileName = it.parts[it.parts.length - 1];
+    const dirParts = it.parts.slice(0, -1);
+    const parentFolderId = await ensureFolderChain(dataSource, entityMap, rootParentId, dirParts);
+    const buf = it.data;
+    const relBase = await relativePathFromMediaParentId(dataSource, entityMap, parentFolderId);
+    const relativeUnderUploads = relBase ? `${relBase}/${fileName}` : fileName;
+    const contentType = guessMimeType(fileName);
+    let publicUrl;
+    if (opts.storage) {
+      publicUrl = await opts.storage.upload(buf, `uploads/${relativeUnderUploads}`, contentType);
+    } else {
+      const fs = await import("fs/promises");
+      const pathMod = await import("path");
+      const dir = pathMod.join(process.cwd(), opts.localUploadDir);
+      const filePath = pathMod.join(dir, relativeUnderUploads);
+      await fs.mkdir(pathMod.dirname(filePath), { recursive: true });
+      await fs.writeFile(filePath, buf);
+      publicUrl = `/${opts.localUploadDir.replace(/^\/+/, "").replace(/\\/g, "/")}/${relativeUnderUploads.replace(/\\/g, "/")}`;
+    }
+    await repo.save(
+      repo.create({
+        kind: "file",
+        parentId: parentFolderId,
+        filename: fileName,
+        url: publicUrl,
+        mimeType: contentType,
+        size: buf.length,
+        alt: null,
+        isPublic: false,
+        deleted: false
+      })
+    );
+    files++;
+  }
+  return { files, folderEntries };
+}
+
 // src/api/cms-handlers.ts
 function createDashboardStatsHandler(config) {
   const { dataSource, entityMap, json, requireAuth, requirePermission, requireEntityPermission } = config;
@@ -1240,26 +1489,209 @@ function createDashboardStatsHandler(config) {
     try {
       const sevenDaysAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1e3);
       const repo = (name) => entityMap[name] ? dataSource.getRepository(entityMap[name]) : void 0;
-      const [contactsCount, formsCount, formSubmissionsCount, usersCount, blogsCount, recentContacts, recentSubmissions] = await Promise.all([
+      const [contactsCount, formsCount, formSubmissionsCount, usersCount, blogsCount, recentContacts, recentSubmissions, contactTypeRows] = await Promise.all([
         repo("contacts")?.count() ?? 0,
         repo("forms")?.count({ where: { deleted: false } }) ?? 0,
         repo("form_submissions")?.count() ?? 0,
         repo("users")?.count({ where: { deleted: false } }) ?? 0,
         repo("blogs")?.count({ where: { deleted: false } }) ?? 0,
         repo("contacts")?.count({ where: { createdAt: MoreThanOrEqual(sevenDaysAgo) } }) ?? 0,
-        repo("form_submissions")?.count({ where: { createdAt: MoreThanOrEqual(sevenDaysAgo) } }) ?? 0
+        repo("form_submissions")?.count({ where: { createdAt: MoreThanOrEqual(sevenDaysAgo) } }) ?? 0,
+        repo("contacts")?.createQueryBuilder("c").select("COALESCE(NULLIF(TRIM(c.type), ''), 'unknown')", "type").addSelect("COUNT(*)", "count").where("c.deleted = :deleted", { deleted: false }).groupBy("COALESCE(NULLIF(TRIM(c.type), ''), 'unknown')").getRawMany() ?? []
       ]);
       return json({
         contacts: { total: contactsCount, recent: recentContacts },
         forms: { total: formsCount, submissions: formSubmissionsCount, recentSubmissions },
         users: usersCount,
-        blogs: blogsCount
+        blogs: blogsCount,
+        contactTypes: (contactTypeRows ?? []).map((row) => ({
+          type: row.type || "unknown",
+          count: Number(row.count || 0)
+        }))
       });
     } catch (err) {
       return json({ error: "Failed to fetch dashboard stats" }, { status: 500 });
     }
   };
 }
+function toNum(v) {
+  const n = typeof v === "number" ? v : Number(v ?? 0);
+  return Number.isFinite(n) ? n : 0;
+}
+function toIsoDate(d) {
+  return d.toISOString().slice(0, 10);
+}
+function createEcommerceAnalyticsHandler(config) {
+  const { dataSource, entityMap, json, requireAuth, requireEntityPermission } = config;
+  return async function GET(req) {
+    const authErr = await requireAuth(req);
+    if (authErr) return authErr;
+    if (requireEntityPermission) {
+      const pe = await requireEntityPermission(req, "analytics", "read");
+      if (pe) return pe;
+    }
+    if (!entityMap.orders || !entityMap.order_items || !entityMap.payments || !entityMap.products) {
+      return json({ error: "Store analytics unavailable" }, { status: 404 });
+    }
+    try {
+      const url = new URL(req.url);
+      const rawDays = parseInt(url.searchParams.get("days") || "30", 10);
+      const days = Number.isFinite(rawDays) ? Math.min(365, Math.max(7, rawDays)) : 30;
+      const end = /* @__PURE__ */ new Date();
+      const start = new Date(end.getTime() - days * 24 * 60 * 60 * 1e3);
+      const orderRepo = dataSource.getRepository(entityMap.orders);
+      const paymentRepo = dataSource.getRepository(entityMap.payments);
+      const itemRepo = dataSource.getRepository(entityMap.order_items);
+      const productRepo = dataSource.getRepository(entityMap.products);
+      const [salesOrders, returnOrders, replacementOrders, payments, products] = await Promise.all([
+        orderRepo.find({
+          where: { deleted: false, createdAt: MoreThanOrEqual(start), orderKind: "sale", status: In(["confirmed", "processing", "completed"]) },
+          select: ["id", "contactId", "createdAt", "subtotal", "discount", "tax", "total", "status"]
+        }),
+        orderRepo.find({
+          where: { deleted: false, createdAt: MoreThanOrEqual(start), orderKind: "return" },
+          select: ["id", "createdAt", "total"]
+        }),
+        orderRepo.find({
+          where: { deleted: false, createdAt: MoreThanOrEqual(start), orderKind: "replacement" },
+          select: ["id", "createdAt", "total"]
+        }),
+        paymentRepo.find({
+          where: { deleted: false, createdAt: MoreThanOrEqual(start) },
+          select: ["id", "status", "method", "amount", "createdAt"]
+        }),
+        productRepo.find({
+          where: { deleted: false },
+          select: ["id", "name", "quantity"]
+        })
+      ]);
+      const saleOrderIds = salesOrders.map((o) => o.id);
+      const orderItems = saleOrderIds.length ? await itemRepo.find({
+        where: { orderId: In(saleOrderIds) },
+        select: ["id", "orderId", "productId", "quantity", "total"]
+      }) : [];
+      const grossSales = salesOrders.reduce((sum, o) => sum + toNum(o.subtotal), 0);
+      const discounts = salesOrders.reduce((sum, o) => sum + toNum(o.discount), 0);
+      const taxes = salesOrders.reduce((sum, o) => sum + toNum(o.tax), 0);
+      const returnsValue = returnOrders.reduce((sum, o) => sum + toNum(o.total), 0);
+      const replacementsValue = replacementOrders.reduce((sum, o) => sum + toNum(o.total), 0);
+      const netSales = grossSales - discounts - returnsValue;
+      const ordersCount = salesOrders.length;
+      const aov = ordersCount > 0 ? netSales / ordersCount : 0;
+      const returnRate = ordersCount > 0 ? returnOrders.length / ordersCount * 100 : 0;
+      const salesByDate = /* @__PURE__ */ new Map();
+      const returnsByDate = /* @__PURE__ */ new Map();
+      for (const o of salesOrders) {
+        const key = toIsoDate(new Date(o.createdAt));
+        const row = salesByDate.get(key) ?? { value: 0, orders: 0 };
+        row.value += toNum(o.total);
+        row.orders += 1;
+        salesByDate.set(key, row);
+      }
+      for (const o of returnOrders) {
+        const key = toIsoDate(new Date(o.createdAt));
+        const row = returnsByDate.get(key) ?? { value: 0, count: 0 };
+        row.value += toNum(o.total);
+        row.count += 1;
+        returnsByDate.set(key, row);
+      }
+      const salesOverTime = [];
+      const returnsTrend = [];
+      for (let i = days - 1; i >= 0; i--) {
+        const d = new Date(end.getTime() - i * 24 * 60 * 60 * 1e3);
+        const key = toIsoDate(d);
+        const sales = salesByDate.get(key) ?? { value: 0, orders: 0 };
+        const returns = returnsByDate.get(key) ?? { value: 0, count: 0 };
+        salesOverTime.push({ date: key, value: Number(sales.value.toFixed(2)), orders: sales.orders });
+        returnsTrend.push({ date: key, value: Number(returns.value.toFixed(2)), count: returns.count });
+      }
+      const productNameMap = /* @__PURE__ */ new Map();
+      for (const p of products) productNameMap.set(Number(p.id), (p.name || `Product #${p.id}`).trim());
+      const productAgg = /* @__PURE__ */ new Map();
+      for (const item of orderItems) {
+        const productId = Number(item.productId);
+        const productName = productNameMap.get(productId) || `Product #${productId}`;
+        const row = productAgg.get(productId) ?? { name: productName, units: 0, sales: 0 };
+        row.units += toNum(item.quantity);
+        row.sales += toNum(item.total);
+        productAgg.set(productId, row);
+      }
+      const topProducts = Array.from(productAgg.values()).sort((a, b) => b.sales - a.sales).slice(0, 5).map((p) => ({ ...p, sales: Number(p.sales.toFixed(2)) }));
+      const allSaleOrderContactIds = Array.from(new Set(salesOrders.map((o) => Number(o.contactId)).filter((n) => Number.isInteger(n) && n > 0)));
+      const allTimeCounts = allSaleOrderContactIds.length ? await orderRepo.createQueryBuilder("o").select("o.contactId", "contactId").addSelect("COUNT(*)", "total").where("o.deleted = :deleted", { deleted: false }).andWhere("o.orderKind = :orderKind", { orderKind: "sale" }).andWhere("o.contactId IN (:...contactIds)", { contactIds: allSaleOrderContactIds }).groupBy("o.contactId").getRawMany() : [];
+      const countMap = /* @__PURE__ */ new Map();
+      for (const c of allTimeCounts) countMap.set(Number(c.contactId), Number(c.total));
+      const purchasingCustomers = allSaleOrderContactIds.length;
+      const returningCustomers = allSaleOrderContactIds.filter((id) => (countMap.get(id) ?? 0) > 1).length;
+      const newCustomers = Math.max(0, purchasingCustomers - returningCustomers);
+      const returningCustomerRate = purchasingCustomers > 0 ? returningCustomers / purchasingCustomers * 100 : 0;
+      const totalPayments = payments.length;
+      const completedPayments = payments.filter((p) => p.status === "completed").length;
+      const failedPayments = payments.filter((p) => p.status === "failed").length;
+      const paymentSuccessRate = totalPayments > 0 ? completedPayments / totalPayments * 100 : 0;
+      const paymentMethodMap = /* @__PURE__ */ new Map();
+      for (const p of payments) {
+        const method = (p.method || "unknown").toLowerCase();
+        const row = paymentMethodMap.get(method) ?? { method, count: 0, amount: 0 };
+        row.count += 1;
+        row.amount += toNum(p.amount);
+        paymentMethodMap.set(method, row);
+      }
+      const paymentMethods = Array.from(paymentMethodMap.values()).sort((a, b) => b.count - a.count).map((p) => ({ ...p, amount: Number(p.amount.toFixed(2)) }));
+      const totalInventory = products.reduce((sum, p) => sum + toNum(p.quantity), 0);
+      const outOfStockCount = products.filter((p) => toNum(p.quantity) <= 0).length;
+      const lowStockCount = products.filter((p) => toNum(p.quantity) > 0 && toNum(p.quantity) <= 5).length;
+      const inventoryRisk = {
+        outOfStockCount,
+        lowStockCount,
+        totalInventory
+      };
+      return json({
+        rangeDays: days,
+        kpis: {
+          netSales: Number(netSales.toFixed(2)),
+          grossSales: Number(grossSales.toFixed(2)),
+          ordersPlaced: ordersCount,
+          averageOrderValue: Number(aov.toFixed(2)),
+          returningCustomerRate: Number(returningCustomerRate.toFixed(2)),
+          returnRate: Number(returnRate.toFixed(2)),
+          returnValue: Number(returnsValue.toFixed(2)),
+          discounts: Number(discounts.toFixed(2)),
+          taxes: Number(taxes.toFixed(2)),
+          paymentSuccessRate: Number(paymentSuccessRate.toFixed(2))
+        },
+        salesOverTime,
+        topProducts,
+        customerMix: {
+          newCustomers,
+          returningCustomers,
+          repeatPurchaseRate: Number(returningCustomerRate.toFixed(2))
+        },
+        returnsTrend,
+        paymentPerformance: {
+          successCount: completedPayments,
+          failedCount: failedPayments,
+          successRate: Number(paymentSuccessRate.toFixed(2)),
+          methods: paymentMethods
+        },
+        conversionProxy: {
+          sessions: 0,
+          checkoutStarted: 0,
+          ordersPlaced: ordersCount
+        },
+        salesBreakdown: {
+          sales: { count: ordersCount, value: Number(grossSales.toFixed(2)) },
+          returns: { count: returnOrders.length, value: Number(returnsValue.toFixed(2)) },
+          replacements: { count: replacementOrders.length, value: Number(replacementsValue.toFixed(2)) }
+        },
+        geoPerformance: [],
+        inventoryRisk
+      });
+    } catch {
+      return json({ error: "Failed to fetch ecommerce analytics" }, { status: 500 });
+    }
+  };
+}
 function createAnalyticsHandlers(config) {
   const { json, getAnalyticsData, getPropertyId, getPermissions } = config;
   return {
@@ -1291,8 +1723,27 @@ function createAnalyticsHandlers(config) {
   };
 }
 function createUploadHandler(config) {
-  const { json, requireAuth, requireEntityPermission, storage, localUploadDir = "public/uploads", allowedTypes, maxSizeBytes = 10 * 1024 * 1024 } = config;
-  const allowed = allowedTypes ?? ["image/jpeg", "image/png", "image/gif", "image/webp", "application/pdf", "text/plain"];
+  const {
+    json,
+    requireAuth,
+    requireEntityPermission,
+    storage,
+    localUploadDir = "public/uploads",
+    allowedTypes,
+    maxSizeBytes = 10 * 1024 * 1024,
+    dataSource,
+    entityMap
+  } = config;
+  const allowed = allowedTypes ?? [
+    "image/jpeg",
+    "image/png",
+    "image/gif",
+    "image/webp",
+    "application/pdf",
+    "text/plain",
+    "application/zip",
+    "application/x-zip-compressed"
+  ];
   return async function POST(req) {
     const authErr = await requireAuth(req);
     if (authErr) return authErr;
@@ -1305,28 +1756,92 @@ function createUploadHandler(config) {
       const file = formData.get("file");
       if (!file) return json({ error: "No file uploaded" }, { status: 400 });
       if (!allowed.includes(file.type)) return json({ error: "File type not allowed" }, { status: 400 });
-      if (file.size > maxSizeBytes) return json({ error: "File size exceeds limit" }, { status: 400 });
+      const defaultMax = 10 * 1024 * 1024;
+      const maxZipBytes = 80 * 1024 * 1024;
+      const baseMax = maxSizeBytes ?? defaultMax;
+      const effectiveMax = file.type === "application/zip" || file.type === "application/x-zip-compressed" ? Math.max(baseMax, maxZipBytes) : baseMax;
+      if (file.size > effectiveMax) return json({ error: "File size exceeds limit" }, { status: 400 });
+      const parentRaw = formData.get("parentId");
+      let parentId = null;
+      if (parentRaw != null && String(parentRaw).trim() !== "") {
+        const n = Number(parentRaw);
+        if (!Number.isFinite(n)) return json({ error: "Invalid parentId" }, { status: 400 });
+        parentId = n;
+      }
+      let folder = "";
+      if (parentId != null) {
+        if (!dataSource || !entityMap?.media) {
+          return json({ error: "Upload handler needs dataSource and entityMap for folder uploads" }, { status: 400 });
+        }
+        const repo = dataSource.getRepository(entityMap.media);
+        const p = await repo.findOne({ where: { id: parentId } });
+        if (!p || p.kind !== "folder") {
+          return json({ error: "parent must be a folder" }, { status: 400 });
+        }
+        folder = await relativePathFromMediaParentId(dataSource, entityMap, parentId);
+      } else {
+        const folderRawLegacy = formData.get("folder") ?? formData.get("folderPath");
+        if (folderRawLegacy && typeof folderRawLegacy === "string" && folderRawLegacy.trim()) {
+          folder = sanitizeMediaFolderPath(folderRawLegacy);
+        }
+      }
       const buffer = Buffer.from(await file.arrayBuffer());
       const fileName = `${Date.now()}-${file.name}`;
       const contentType = file.type || "application/octet-stream";
+      const relativeUnderUploads = folder ? `${folder}/${fileName}` : fileName;
       const raw = typeof storage === "function" ? storage() : storage;
       const storageService = raw instanceof Promise ? await raw : raw;
       if (storageService) {
-        const fileUrl = await storageService.upload(buffer, `uploads/${fileName}`, contentType);
-        return json({ filePath: fileUrl });
+        const fileUrl = await storageService.upload(buffer, `uploads/${relativeUnderUploads}`, contentType);
+        return json({ filePath: fileUrl, parentId });
       }
       const fs = await import("fs/promises");
       const path = await import("path");
       const dir = path.join(process.cwd(), localUploadDir);
-      await fs.mkdir(dir, { recursive: true });
-      const filePath = path.join(dir, fileName);
+      const filePath = path.join(dir, relativeUnderUploads);
+      await fs.mkdir(path.dirname(filePath), { recursive: true });
       await fs.writeFile(filePath, buffer);
-      return json({ filePath: `/${localUploadDir.replace(/^\/+/, "").replace(/\\/g, "/")}/${fileName}` });
+      const urlRel = `${localUploadDir.replace(/^\/+/, "").replace(/\\/g, "/")}/${relativeUnderUploads.replace(/\\/g, "/")}`;
+      return json({ filePath: `/${urlRel}`, parentId });
     } catch (err) {
       return json({ error: "File upload failed" }, { status: 500 });
     }
   };
 }
+function createMediaZipExtractHandler(config) {
+  const { json, requireAuth, requireEntityPermission, storage, localUploadDir = "public/uploads", dataSource, entityMap } = config;
+  return async function POST(_req, zipMediaId) {
+    const authErr = await requireAuth(_req);
+    if (authErr) return authErr;
+    if (requireEntityPermission) {
+      const pe = await requireEntityPermission(_req, "media", "create");
+      if (pe) return pe;
+    }
+    if (!dataSource || !entityMap?.media) {
+      return json({ error: "Media extract requires dataSource and entityMap" }, { status: 500 });
+    }
+    const id = Number(zipMediaId);
+    if (!Number.isFinite(id)) return json({ error: "Invalid id" }, { status: 400 });
+    const repo = dataSource.getRepository(entityMap.media);
+    const row = await repo.findOne({ where: { id } });
+    if (!row) return json({ error: "Not found" }, { status: 404 });
+    try {
+      const raw = typeof storage === "function" ? storage() : storage;
+      const storageService = raw instanceof Promise ? await raw : raw;
+      const result = await extractZipMediaIntoParentTree({
+        dataSource,
+        entityMap,
+        zipMediaRow: row,
+        storage: storageService,
+        localUploadDir
+      });
+      return json({ ok: true, ...result });
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : "Extract failed";
+      return json({ error: msg }, { status: 400 });
+    }
+  };
+}
 function createBlogBySlugHandler(config) {
   const { dataSource, entityMap, json } = config;
   return async function GET(_req, slug) {
@@ -2468,6 +2983,7 @@ function createCmsApiHandler(config) {
     getCms,
     userAuth: userAuthConfig,
     dashboard,
+    ecommerceAnalytics,
     analytics: analyticsConfig,
     upload,
     blogBySlug,
@@ -2534,8 +3050,28 @@ function createCmsApiHandler(config) {
   });
   const userAuthRouter = userAuth ? createUserAuthApiRouter(userAuth) : null;
   const dashboardGet = dashboard ? createDashboardStatsHandler(mergePerm(dashboard) ?? dashboard) : null;
+  const ecommerceAnalyticsResolved = mergePerm(
+    ecommerceAnalytics ?? {
+      dataSource,
+      entityMap,
+      json: config.json,
+      requireAuth: config.requireAuth
+    }
+  ) ?? {
+    dataSource,
+    entityMap,
+    json: config.json,
+    requireAuth: config.requireAuth
+  };
+  const ecommerceAnalyticsGet = createEcommerceAnalyticsHandler(ecommerceAnalyticsResolved);
   const analyticsHandlers = analytics ? createAnalyticsHandlers(analytics) : null;
-  const uploadPost = upload ? createUploadHandler(mergePerm(upload) ?? upload) : null;
+  const uploadMerged = upload ? {
+    ...mergePerm(upload) ?? upload,
+    dataSource: upload.dataSource ?? dataSource,
+    entityMap: upload.entityMap ?? entityMap
+  } : null;
+  const uploadPost = uploadMerged ? createUploadHandler(uploadMerged) : null;
+  const zipExtractPost = uploadMerged ? createMediaZipExtractHandler(uploadMerged) : null;
   const blogBySlugGet = blogBySlug ? createBlogBySlugHandler(blogBySlug) : null;
   const formBySlugGet = formBySlug ? createFormBySlugHandler(formBySlug) : null;
   const formSaveHandlers = formSaveConfig ? createFormSaveHandlers(mergePerm(formSaveConfig) ?? formSaveConfig) : null;
@@ -2584,6 +3120,11 @@ function createCmsApiHandler(config) {
       if (path[0] === "dashboard" && path[1] === "stats" && path.length === 2 && method === "GET" && dashboardGet) {
         return dashboardGet(req);
       }
+      if (path[0] === "dashboard" && path[1] === "ecommerce" && path.length === 2 && method === "GET" && ecommerceAnalyticsGet) {
+        const g = await analyticsGate();
+        if (g) return g;
+        return ecommerceAnalyticsGet(req);
+      }
       if (path[0] === "analytics" && analyticsHandlers) {
         if (path.length === 1 && method === "GET") {
           const g = await analyticsGate();
@@ -2602,6 +3143,9 @@ function createCmsApiHandler(config) {
         }
       }
       if (path[0] === "upload" && path.length === 1 && method === "POST" && uploadPost) return uploadPost(req);
+      if (path[0] === "media" && path[1] === "extract" && path.length === 3 && method === "POST" && zipExtractPost) {
+        return zipExtractPost(req, path[2]);
+      }
       if (path[0] === "blogs" && path[1] === "slug" && path.length === 3 && method === "GET" && blogBySlugGet) {
         return blogBySlugGet(req, path[2]);
       }
@@ -2739,7 +3283,7 @@ function createCmsApiHandler(config) {
 }
 
 // src/api/storefront-handlers.ts
-import { In, IsNull as IsNull3 } from "typeorm";
+import { In as In2, IsNull as IsNull4 } from "typeorm";
 
 // src/lib/is-valid-signup-email.ts
 var MAX_EMAIL = 254;
@@ -2999,7 +3543,7 @@ async function queueSms(cms, payload) {
 
 // src/lib/otp-challenge.ts
 import { createHmac, randomInt, timingSafeEqual } from "crypto";
-import { IsNull as IsNull2, MoreThan as MoreThan2 } from "typeorm";
+import { IsNull as IsNull3, MoreThan as MoreThan2 } from "typeorm";
 var OTP_TTL_MS = 10 * 60 * 1e3;
 var MAX_SENDS_PER_HOUR = 5;
 var MAX_VERIFY_ATTEMPTS = 8;
@@ -3047,7 +3591,7 @@ async function createOtpChallenge(dataSource, entityMap, input) {
   await repo.delete({
     purpose,
     identifier,
-    consumedAt: IsNull2()
+    consumedAt: IsNull3()
   });
   const expiresAt = new Date(Date.now() + OTP_TTL_MS);
   const codeHash = hashOtpCode(code, purpose, identifier, pepper);
@@ -3068,7 +3612,7 @@ async function verifyAndConsumeOtpChallenge(dataSource, entityMap, input) {
   const { purpose, identifier, code, pepper } = input;
   const repo = dataSource.getRepository(entityMap.otp_challenges);
   const row = await repo.findOne({
-    where: { purpose, identifier, consumedAt: IsNull2() },
+    where: { purpose, identifier, consumedAt: IsNull3() },
     order: { id: "DESC" }
   });
   if (!row) {
@@ -3302,7 +3846,7 @@ function createStorefrontApiHandler(config) {
     const u = await userRepo().findOne({ where: { id: userId } });
     if (!u) return null;
     const unclaimed = await contactRepo().findOne({
-      where: { email: u.email, userId: IsNull3(), deleted: false }
+      where: { email: u.email, userId: IsNull4(), deleted: false }
     });
     if (unclaimed) {
       await contactRepo().update(unclaimed.id, { userId });
@@ -4343,7 +4887,7 @@ function createStorefrontApiHandler(config) {
           const previewByOrder = {};
           if (orderIds.length) {
             const oItems = await orderItemRepo().find({
-              where: { orderId: In(orderIds) },
+              where: { orderId: In2(orderIds) },
               relations: ["product"],
               order: { id: "ASC" }
             });
@@ -4475,9 +5019,11 @@ export {
   createCrudByIdHandler,
   createCrudHandler,
   createDashboardStatsHandler,
+  createEcommerceAnalyticsHandler,
   createForgotPasswordHandler,
   createFormBySlugHandler,
   createInviteAcceptHandler,
+  createMediaZipExtractHandler,
   createSetPasswordHandler,
   createSettingsApiHandlers,
   createStorefrontApiHandler,