npm - @plank-cms/plank - Versions diffs - 0.19.0 → 0.20.1 - Mend

@plank-cms/plank 0.19.0 → 0.20.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dist/admin/assets/index-BrTr5m2J.css +2 -0
package/dist/admin/assets/index-cDCZafS6.js +223 -0
package/dist/admin/index.html +2 -2
package/dist/index.js +2 -2
package/dist/{server-KVOZGN2H.js → server-JCTD2EIO.js} +137 -32
package/package.json +4 -4
package/dist/admin/assets/index-BepYvDmW.js +0 -223
package/dist/admin/assets/index-FkEexpp5.css +0 -2

package/dist/admin/index.html CHANGED Viewed

@@ -12,8 +12,8 @@
       href="https://fonts.googleapis.com/css2?family=Google+Sans:ital,opsz,wght@0,17..18,400..700;1,17..18,400..700&display=swap"
       rel="stylesheet"
     />
-    <script type="module" crossorigin src="/admin/assets/index-BepYvDmW.js"></script>
-    <link rel="stylesheet" crossorigin href="/admin/assets/index-FkEexpp5.css">
+    <script type="module" crossorigin src="/admin/assets/index-cDCZafS6.js"></script>
+    <link rel="stylesheet" crossorigin href="/admin/assets/index-BrTr5m2J.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/index.js CHANGED Viewed

@@ -7,7 +7,7 @@ import { randomBytes } from "crypto";
 import { resolve, join } from "path";
 import fs from "fs-extra";
 import { execa } from "execa";
-var PACKAGE_VERSION = "0.19.0";
+var PACKAGE_VERSION = "0.20.1";
 function generateSecret() {
   return randomBytes(32).toString("hex");
 }
@@ -101,7 +101,7 @@ import { dirname, join as join2, resolve as resolve2 } from "path";
 async function start() {
   config({ path: resolve2(process.cwd(), ".env") });
   process.env.PLANK_ADMIN_DIST = join2(dirname(fileURLToPath(import.meta.url)), "admin");
-  const { start: startServer } = await import("./server-KVOZGN2H.js");
+  const { start: startServer } = await import("./server-JCTD2EIO.js");
   await startServer();
 }

package/dist/{server-KVOZGN2H.js → server-JCTD2EIO.js} RENAMED Viewed

@@ -2164,7 +2164,7 @@ async function setSettings(namespace, values) {
 }
 // ../core/dist/media/providers/local.js
-import { writeFile, mkdir } from "fs/promises";
+import { writeFile, mkdir, rm } from "fs/promises";
 import { join as join3, extname } from "path";
 import { randomBytes as randomBytes3 } from "crypto";
 async function uploadsDir() {
@@ -2200,6 +2200,10 @@ var localProvider = {
     const dir = await uploadsDir();
     await unlink(join3(dir, key));
   },
+  async deletePrefix(prefix) {
+    const dir = await uploadsDir();
+    await rm(join3(dir, prefix), { recursive: true, force: true });
+  },
   async getUrl(key) {
     const base = await publicUrl();
     return `${base}/uploads/${key}`;
@@ -2207,7 +2211,7 @@ var localProvider = {
 };
 // ../core/dist/media/providers/s3.js
-import { S3Client, PutObjectCommand, DeleteObjectCommand } from "@aws-sdk/client-s3";
+import { S3Client, PutObjectCommand, DeleteObjectCommand, ListObjectsV2Command, DeleteObjectsCommand } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import { extname as extname2 } from "path";
 import { randomBytes as randomBytes4 } from "crypto";
@@ -2237,6 +2241,9 @@ function buildKey(cfg, filename, prefix) {
   const parts = [cfg.pathPrefix?.replace(/\/$/, ""), prefix, name].filter(Boolean);
   return parts.join("/");
 }
+function withPathPrefix(cfg, key) {
+  return [cfg.pathPrefix?.replace(/\/$/, ""), key.replace(/^\//, "")].filter(Boolean).join("/");
+}
 function buildStoredUrl(cfg, key) {
   return cfg.publicUrl ? `${cfg.publicUrl.replace(/\/$/, "")}/${key}` : `https://${cfg.bucket}.s3.${cfg.region}.amazonaws.com/${key}`;
 }
@@ -2253,22 +2260,44 @@ var s3Provider = {
     }));
     return { url: buildStoredUrl(cfg, key), key };
   },
-  async uploadRaw(buffer, exactKey, mimeType) {
+  async uploadRaw(buffer, key, mimeType) {
     const cfg = await getConfig();
     const client = buildClient(cfg);
+    const fullKey = withPathPrefix(cfg, key);
     await client.send(new PutObjectCommand({
       Bucket: cfg.bucket,
-      Key: exactKey,
+      Key: fullKey,
       Body: buffer,
       ContentType: mimeType
     }));
-    return { url: buildStoredUrl(cfg, exactKey), key: exactKey };
+    return { url: buildStoredUrl(cfg, fullKey), key: fullKey };
   },
   async delete(key) {
     const cfg = await getConfig();
     const client = buildClient(cfg);
     await client.send(new DeleteObjectCommand({ Bucket: cfg.bucket, Key: key }));
   },
+  async deletePrefix(prefix) {
+    const cfg = await getConfig();
+    const client = buildClient(cfg);
+    const fullPrefix = prefix.endsWith("/") ? prefix : `${prefix}/`;
+    let continuationToken;
+    do {
+      const list = await client.send(new ListObjectsV2Command({
+        Bucket: cfg.bucket,
+        Prefix: fullPrefix,
+        ContinuationToken: continuationToken
+      }));
+      const objects = (list.Contents ?? []).map((o) => o.Key ? { Key: o.Key } : null).filter((o) => o !== null);
+      if (objects.length > 0) {
+        await client.send(new DeleteObjectsCommand({
+          Bucket: cfg.bucket,
+          Delete: { Objects: objects, Quiet: true }
+        }));
+      }
+      continuationToken = list.IsTruncated ? list.NextContinuationToken : void 0;
+    } while (continuationToken);
+  },
   async getUrl(key) {
     const cfg = await getConfig();
     return buildStoredUrl(cfg, key);
@@ -2284,7 +2313,7 @@ var s3Provider = {
 };
 // ../core/dist/media/providers/r2.js
-import { S3Client as S3Client2, PutObjectCommand as PutObjectCommand2, DeleteObjectCommand as DeleteObjectCommand2 } from "@aws-sdk/client-s3";
+import { S3Client as S3Client2, PutObjectCommand as PutObjectCommand2, DeleteObjectCommand as DeleteObjectCommand2, ListObjectsV2Command as ListObjectsV2Command2, DeleteObjectsCommand as DeleteObjectsCommand2 } from "@aws-sdk/client-s3";
 import { getSignedUrl as getSignedUrl2 } from "@aws-sdk/s3-request-presigner";
 import { extname as extname3 } from "path";
 import { randomBytes as randomBytes5 } from "crypto";
@@ -2317,6 +2346,9 @@ function buildKey2(cfg, filename, prefix) {
   const parts = [cfg.pathPrefix?.replace(/\/$/, ""), prefix, name].filter(Boolean);
   return parts.join("/");
 }
+function withPathPrefix2(cfg, key) {
+  return [cfg.pathPrefix?.replace(/\/$/, ""), key.replace(/^\//, "")].filter(Boolean).join("/");
+}
 function buildStoredUrl2(cfg, key) {
   if (!cfg.publicUrl) {
     throw new Error("R2 provider requires a public_url configured in Settings > Media.");
@@ -2336,22 +2368,44 @@ var r2Provider = {
     }));
     return { url: buildStoredUrl2(cfg, key), key };
   },
-  async uploadRaw(buffer, exactKey, mimeType) {
+  async uploadRaw(buffer, key, mimeType) {
     const cfg = await getConfig2();
     const client = buildClient2(cfg);
+    const fullKey = withPathPrefix2(cfg, key);
     await client.send(new PutObjectCommand2({
       Bucket: cfg.bucket,
-      Key: exactKey,
+      Key: fullKey,
       Body: buffer,
       ContentType: mimeType
     }));
-    return { url: buildStoredUrl2(cfg, exactKey), key: exactKey };
+    return { url: buildStoredUrl2(cfg, fullKey), key: fullKey };
   },
   async delete(key) {
     const cfg = await getConfig2();
     const client = buildClient2(cfg);
     await client.send(new DeleteObjectCommand2({ Bucket: cfg.bucket, Key: key }));
   },
+  async deletePrefix(prefix) {
+    const cfg = await getConfig2();
+    const client = buildClient2(cfg);
+    const fullPrefix = prefix.endsWith("/") ? prefix : `${prefix}/`;
+    let continuationToken;
+    do {
+      const list = await client.send(new ListObjectsV2Command2({
+        Bucket: cfg.bucket,
+        Prefix: fullPrefix,
+        ContinuationToken: continuationToken
+      }));
+      const objects = (list.Contents ?? []).map((o) => o.Key ? { Key: o.Key } : null).filter((o) => o !== null);
+      if (objects.length > 0) {
+        await client.send(new DeleteObjectsCommand2({
+          Bucket: cfg.bucket,
+          Delete: { Objects: objects, Quiet: true }
+        }));
+      }
+      continuationToken = list.IsTruncated ? list.NextContinuationToken : void 0;
+    } while (continuationToken);
+  },
   async getUrl(key) {
     const cfg = await getConfig2();
     return buildStoredUrl2(cfg, key);
@@ -3256,15 +3310,40 @@ var listEntries = async (req, res) => {
   const quotedSortField = quoteIdentifier(sortField);
   const locale = req.query.locale ? String(req.query.locale) : void 0;
   const fallbacks = req.query.fallback ? String(req.query.fallback).split(",") : [];
+  const search = req.query.search ? String(req.query.search).trim() : "";
+  const rawSearchFields = req.query.searchFields ? String(req.query.searchFields).split(",") : [];
+  const textLikeTypes = ["string", "uid", "text", "richtext"];
+  const searchFields = rawSearchFields.filter((name) => ct.fields.some((f2) => f2.name === name && textLikeTypes.includes(f2.type)));
+  let mainWhereClause = "";
+  let countWhereClause = "";
+  const mainParams = [limit, offset];
+  const countParams = [];
+  if (search && searchFields.length > 0) {
+    const term = `%${search}%`;
+    mainParams.push(term);
+    countParams.push(term);
+    const mainIdx = mainParams.length;
+    const countIdx = countParams.length;
+    const mainConditions = searchFields.map((name) => {
+      assertSafeIdentifier(name);
+      return `e.${quoteIdentifier(name)}::text ILIKE $${mainIdx}`;
+    });
+    const countConditions = searchFields.map((name) => {
+      return `e.${quoteIdentifier(name)}::text ILIKE $${countIdx}`;
+    });
+    mainWhereClause = `WHERE (${mainConditions.join(" OR ")})`;
+    countWhereClause = `WHERE (${countConditions.join(" OR ")})`;
+  }
   const [{ rows }, { rows: countRows }] = await Promise.all([
     pool_default.query(`SELECT e.*, u.first_name AS _author_first_name, u.last_name AS _author_last_name, u.avatar_url AS _author_avatar_url,
               ed.first_name AS _editor_first_name, ed.last_name AS _editor_last_name, ed.avatar_url AS _editor_avatar_url
        FROM ${quotedTableName} e
        LEFT JOIN plank_users u ON u.id = e.created_by
        LEFT JOIN plank_users ed ON ed.id = e.editor_id
+       ${mainWhereClause}
        ORDER BY e.${quotedSortField} ${sortDir}
-       LIMIT $1 OFFSET $2`, [limit, offset]),
-    pool_default.query(`SELECT COUNT(*) as count FROM ${quotedTableName}`)
+       LIMIT $1 OFFSET $2`, mainParams),
+    pool_default.query(`SELECT COUNT(*) as count FROM ${quotedTableName} e ${countWhereClause}`, countParams)
   ]);
   const provider = await getProvider();
   function entryMatchesLocale(row, locale2) {
@@ -4231,16 +4310,40 @@ function buildDefaultAlt(filename) {
   const withoutExtension = baseName.replace(/\.[^.]+$/, "").trim();
   return withoutExtension || baseName.trim();
 }
+function mimeForHLSFile(filename) {
+  const ext = filename.toLowerCase().split(".").pop();
+  switch (ext) {
+    case "m3u8":
+      return "application/vnd.apple.mpegurl";
+    case "ts":
+      return "video/mp2t";
+    case "m4s":
+      return "video/iso.segment";
+    case "mp4":
+      return "video/mp4";
+    case "aac":
+      return "audio/aac";
+    case "vtt":
+      return "text/vtt";
+    case "key":
+      return "application/octet-stream";
+    default:
+      return null;
+  }
+}
 async function listMedia(req, res) {
   const page = Math.max(1, parseInt(req.query.page) || 1);
   const limit = Math.min(100, Math.max(1, parseInt(req.query.limit) || 24));
   const offset = (page - 1) * limit;
   const folderId = req.query.folder_id || null;
+  const search = req.query.search ? String(req.query.search).trim() : null;
+  const searchTerm = search ? `%${search}%` : null;
   const { rows } = await pool_default.query(`SELECT *, COUNT(*) OVER() AS total
      FROM plank_media
      WHERE folder_id IS NOT DISTINCT FROM $3
+       AND ($4::text IS NULL OR filename ILIKE $4 OR alt ILIKE $4 OR caption ILIKE $4)
      ORDER BY created_at DESC
-     LIMIT $1 OFFSET $2`, [limit, offset, folderId]);
+     LIMIT $1 OFFSET $2`, [limit, offset, folderId, searchTerm]);
   const provider = await getProvider();
   const items = await Promise.all(rows.map(async (r2) => ({
     id: r2.id,
@@ -4285,30 +4388,25 @@ async function uploadMedia(req, res) {
     const prefix = [MEDIA_PREFIX, folderId, bundleId].filter(Boolean).join("/");
     const rootDir = m3u8File.originalname.includes("/") ? m3u8File.originalname.split("/")[0] : null;
     const stripRoot = (path) => rootDir && path.startsWith(`${rootDir}/`) ? path.slice(rootDir.length + 1) : path;
-    await Promise.all(files.map((file2) => {
+    const m3u8Mime = mimeForHLSFile(m3u8File.originalname) ?? "application/vnd.apple.mpegurl";
+    const uploaded = await Promise.all(files.map(async (file2) => {
       const relativePath = stripRoot(file2.originalname);
-      const exactKey = `${prefix}/${relativePath}`;
-      return provider.uploadRaw(file2.buffer, exactKey, file2.mimetype);
+      const relativeKey = `${prefix}/${relativePath}`;
+      const mimeType = mimeForHLSFile(relativePath) ?? file2.mimetype;
+      const result = await provider.uploadRaw(file2.buffer, relativeKey, mimeType);
+      return { file: file2, result };
     }));
-    const m3u8RelPath = stripRoot(m3u8File.originalname);
-    const m3u8Key = `${prefix}/${m3u8RelPath}`;
-    const m3u8Url = await provider.getUrl(m3u8Key);
+    const m3u8 = uploaded.find((u) => u.file === m3u8File)?.result;
+    if (!m3u8) {
+      res.status(500).json({ error: "Failed to upload HLS playlist" });
+      return;
+    }
     const id2 = createId();
     const filename = m3u8File.originalname.split("/").pop() ?? m3u8File.originalname;
     const alt2 = buildDefaultAlt(filename);
     await pool_default.query(`INSERT INTO plank_media (id, filename, url, provider_key, mime_type, size, alt, folder_id, uploaded_by)
-       VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`, [
-      id2,
-      filename,
-      m3u8Url,
-      m3u8Key,
-      m3u8File.mimetype,
-      m3u8File.size,
-      alt2,
-      folderId,
-      req.user.id
-    ]);
-    res.status(201).json({ id: id2, url: m3u8Url, filename, alt: alt2, caption: null });
+       VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`, [id2, filename, m3u8.url, m3u8.key, m3u8Mime, m3u8File.size, alt2, folderId, req.user.id]);
+    res.status(201).json({ id: id2, url: m3u8.url, filename, alt: alt2, caption: null });
     return;
   }
   const file = files[0];
@@ -4345,7 +4443,13 @@ async function deleteMedia(req, res) {
     return;
   }
   const provider = await getProvider();
-  await provider.delete(rows[0].provider_key);
+  const key = rows[0].provider_key;
+  if (key.toLowerCase().endsWith(".m3u8")) {
+    const bundlePrefix = key.substring(0, key.lastIndexOf("/"));
+    await provider.deletePrefix(bundlePrefix);
+  } else {
+    await provider.delete(key);
+  }
   await pool_default.query("DELETE FROM plank_media WHERE id = $1", [id]);
   res.status(204).end();
 }
@@ -5227,7 +5331,8 @@ app.use(helmet({
     directives: {
       ...helmet.contentSecurityPolicy.getDefaultDirectives(),
       "img-src": ["'self'", "data:", "https:"],
-      "connect-src": ["'self'", "https:"]
+      "connect-src": ["'self'", "https:"],
+      "media-src": ["'self'", "blob:", "https:"]
     }
   }
 }));

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@plank-cms/plank",
-  "version": "0.19.0",
+  "version": "0.20.1",
   "description": "Self-hosted headless CMS. Deploy in minutes on your own infrastructure.",
   "type": "module",
   "files": [
@@ -55,9 +55,9 @@
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "tsup": "^8.5.0",
-    "@plank-cms/core": "0.19.0",
-    "@plank-cms/db": "0.19.0",
-    "@plank-cms/schema": "0.19.0"
+    "@plank-cms/core": "0.20.1",
+    "@plank-cms/schema": "0.20.1",
+    "@plank-cms/db": "0.20.1"
   },
   "scripts": {
     "build": "tsup",