mktcms 0.3.3 → 0.3.5

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "mktcms",
   "configKey": "mktcms",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/app/components/content/treeNode.vue

@@ -1,6 +1,5 @@
 <script setup>
 import { ref } from "vue";
-import { useFetch } from "#app";
 import FileIcon from "./fileIcon.vue";
 import FileButtons from "./fileButtons.vue";
 const props = defineProps({
@@ -25,12 +24,12 @@ async function toggleExpand() {
   isExpanded.value = !isExpanded.value;
   if (isExpanded.value && files.value.length === 0 && dirs.value.length === 0 && !isLoading.value) {
     isLoading.value = true;
-    const { data } = await useFetch("/api/admin/list", {
+    const data = await $fetch("/api/admin/list", {
       query: { path: props.path }
     });
-    if (data.value) {
-      files.value = data.value.files;
-      dirs.value = data.value.dirs;
+    if (data) {
+      files.value = data.files;
+      dirs.value = data.dirs;
     }
     isLoading.value = false;
   }

package/dist/runtime/server/api/content/[path].js

@@ -1,10 +1,115 @@
 import { z } from "zod";
+import { createHash } from "node:crypto";
 import { createError, defineEventHandler, getValidatedRouterParams, send } from "h3";
 import { useStorage } from "nitropack/runtime";
 import { toNodeBuffer } from "../../utils/toNodeBuffer.js";
 import { parsedFile } from "../../utils/parsedFile.js";
 import { normalizeContentKey } from "../../utils/contentKey.js";
 import { isCsvPath, isImagePath, isJsonPath, isMarkdownPath, isPdfPath, toFileExtension } from "../../../shared/contentFiles.js";
+const CACHE_CONTROL_CONTENT = "public, max-age=86400, stale-while-revalidate=604800";
+function getMetaRecord(meta) {
+  if (!meta || typeof meta !== "object") {
+    return void 0;
+  }
+  return meta;
+}
+function getLastModifiedMs(meta) {
+  const metaRecord = getMetaRecord(meta);
+  const mtimeCandidate = metaRecord?.mtime ?? metaRecord?.updatedAt;
+  if (mtimeCandidate instanceof Date) {
+    return mtimeCandidate.getTime();
+  }
+  if (typeof mtimeCandidate === "number" && Number.isFinite(mtimeCandidate)) {
+    return mtimeCandidate;
+  }
+  if (typeof mtimeCandidate === "string") {
+    const parsed = Date.parse(mtimeCandidate);
+    if (!Number.isNaN(parsed)) {
+      return parsed;
+    }
+  }
+  return void 0;
+}
+function getSizeBytes(meta, fallbackContent, fallbackRawSize) {
+  if (typeof fallbackRawSize === "number" && Number.isFinite(fallbackRawSize)) {
+    return fallbackRawSize;
+  }
+  const metaSize = getMetaRecord(meta)?.size;
+  if (typeof metaSize === "number" && Number.isFinite(metaSize)) {
+    return metaSize;
+  }
+  if (typeof fallbackContent === "string") {
+    return Buffer.byteLength(fallbackContent);
+  }
+  if (fallbackContent !== void 0) {
+    return Buffer.byteLength(JSON.stringify(fallbackContent));
+  }
+  return 0;
+}
+function getContentFingerprint(content) {
+  if (content === void 0 || content === null) {
+    return void 0;
+  }
+  if (Buffer.isBuffer(content)) {
+    return createHash("sha1").update(content).digest("base64url").slice(0, 12);
+  }
+  if (typeof content === "string") {
+    return createHash("sha1").update(content).digest("base64url").slice(0, 12);
+  }
+  return createHash("sha1").update(JSON.stringify(content)).digest("base64url").slice(0, 12);
+}
+function buildWeakEtag(lastModifiedMs, sizeBytes, fingerprint) {
+  const etagVersion = Number.isFinite(lastModifiedMs) ? Math.floor(lastModifiedMs) : 0;
+  const base = `${etagVersion.toString(36)}-${Math.floor(sizeBytes).toString(36)}`;
+  return `W/"${fingerprint ? `${base}-${fingerprint}` : base}"`;
+}
+function toHeaderString(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.join(",");
+  }
+  return void 0;
+}
+function ifNoneMatchMatches(headerValue, etag) {
+  if (!headerValue) {
+    return false;
+  }
+  if (headerValue.trim() === "*") {
+    return true;
+  }
+  const normalizedEtag = etag.replace(/^W\//, "").trim();
+  return headerValue.split(",").map((token) => token.trim().replace(/^W\//, "").trim()).includes(normalizedEtag);
+}
+function ifModifiedSinceMatches(headerValue, lastModifiedMs) {
+  if (!headerValue || !Number.isFinite(lastModifiedMs)) {
+    return false;
+  }
+  const ifModifiedSinceMs = Date.parse(headerValue);
+  if (Number.isNaN(ifModifiedSinceMs)) {
+    return false;
+  }
+  const lastModifiedSeconds = Math.floor(lastModifiedMs / 1e3);
+  const ifModifiedSinceSeconds = Math.floor(ifModifiedSinceMs / 1e3);
+  return lastModifiedSeconds <= ifModifiedSinceSeconds;
+}
+function setCachingHeaders(event, etag, lastModifiedMs) {
+  event.node.res.setHeader("Cache-Control", CACHE_CONTROL_CONTENT);
+  event.node.res.setHeader("ETag", etag);
+  if (Number.isFinite(lastModifiedMs)) {
+    const lastModifiedSeconds = Math.floor(lastModifiedMs / 1e3);
+    event.node.res.setHeader("Last-Modified", new Date(lastModifiedSeconds * 1e3).toUTCString());
+  }
+}
+function isNotModified(event, etag, lastModifiedMs) {
+  const ifNoneMatch = toHeaderString(event.node.req.headers["if-none-match"]);
+  if (ifNoneMatch) {
+    return ifNoneMatchMatches(ifNoneMatch, etag);
+  }
+  const ifModifiedSince = toHeaderString(event.node.req.headers["if-modified-since"]);
+  return ifModifiedSinceMatches(ifModifiedSince, lastModifiedMs);
+}
 function getFileType(path) {
   const isImage = isImagePath(path);
   const isPdf = isPdfPath(path);
@@ -19,6 +124,8 @@ function getContentType(path) {
     const ext = toFileExtension(path).slice(1);
     if (ext === "jpg") {
       return "image/jpeg";
+    } else if (ext === "svg") {
+      return "image/svg+xml";
     } else {
       return "image/" + ext;
     }
@@ -39,24 +146,46 @@ export default defineEventHandler(async (event) => {
   const { isImage, isPdf } = getFileType(contentKey);
   event.node.res.setHeader("Content-Type", getContentType(contentKey));
   const storage = useStorage("content");
+  const meta = await storage.getMeta(contentKey);
+  const lastModifiedMs = getLastModifiedMs(meta);
   if (isImage || isPdf) {
     const raw = await storage.getItemRaw(contentKey);
-    if (!raw) {
+    if (raw == null) {
       throw createError({
         statusCode: 404,
         statusMessage: "File not found"
       });
     }
     const body = toNodeBuffer(raw);
+    const etag2 = buildWeakEtag(
+      lastModifiedMs,
+      getSizeBytes(meta, void 0, body.byteLength),
+      Number.isFinite(lastModifiedMs) ? void 0 : getContentFingerprint(body)
+    );
+    setCachingHeaders(event, etag2, lastModifiedMs);
+    if (isNotModified(event, etag2, lastModifiedMs)) {
+      event.node.res.statusCode = 304;
+      return;
+    }
     event.node.res.setHeader("Content-Length", String(body.byteLength));
     return send(event, body);
   }
   const file = await storage.getItem(contentKey);
-  if (!file) {
+  if (file == null) {
     throw createError({
       statusCode: 404,
       statusMessage: "File not found"
     });
   }
+  const etag = buildWeakEtag(
+    lastModifiedMs,
+    getSizeBytes(meta, file),
+    Number.isFinite(lastModifiedMs) ? void 0 : getContentFingerprint(file)
+  );
+  setCachingHeaders(event, etag, lastModifiedMs);
+  if (isNotModified(event, etag, lastModifiedMs)) {
+    event.node.res.statusCode = 304;
+    return;
+  }
   return parsedFile(contentKey, file);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mktcms",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Simple CMS module for Nuxt",
   "repository": "mktcode/mktcms",
   "license": "MIT",