mktcms 0.1.27 → 0.1.29

package/dist/module.json

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

package/dist/module.mjs

@@ -84,6 +84,11 @@ const module$1 = defineNuxtModule({
       route: "/api/admin/blob",
       handler: resolver.resolve("./runtime/server/api/admin/blob")
     });
+    addServerHandler({
+      route: "/api/admin/import",
+      method: "post",
+      handler: resolver.resolve("./runtime/server/api/admin/import")
+    });
     addServerHandler({
       route: "/api/admin/upload",
       handler: resolver.resolve("./runtime/server/api/admin/upload")

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

@@ -3,10 +3,12 @@ import { useFetch } from "#app";
 import Files from "./files.vue";
 import Dirs from "./dirs.vue";
 import usePathParam from "../../composables/usePathParam";
+import useImport from "../../composables/useImport";
 const { path } = usePathParam();
-const { data: list } = await useFetch("/api/admin/list", {
+const { data: list, refresh } = await useFetch("/api/admin/list", {
   query: { path }
 });
+const { fileInput, uploadFile } = useImport();
 </script>
 
 <template>
@@ -21,5 +23,28 @@ const { data: list } = await useFetch("/api/admin/list", {
       :dirs="list.dirs"
       style="margin-top: 8px;"
     />
+
+    <div
+      v-if="list?.files.length === 0 && list.dirs.length === 0"
+      class="flex flex-col gap-4"
+    >
+      <p>Keine Dateien oder Verzeichnisse gefunden.</p>
+      <button
+        class="button"
+        @click="fileInput?.click()"
+      >
+        Dateien importieren
+      </button>
+      <input
+        ref="fileInput"
+        type="file"
+        class="hidden"
+        accept=".zip"
+        @change="async (e) => {
+  await uploadFile(e);
+  await refresh();
+}"
+      >
+    </div>
   </div>
 </template>

package/dist/runtime/app/composables/useImport.d.ts

@@ -0,0 +1,6 @@
+export default function useImport(): {
+    uploadError: import("vue").Ref<string | null, string | null>;
+    isUploading: import("vue").Ref<boolean, boolean>;
+    fileInput: import("vue").Ref<HTMLInputElement | null, HTMLInputElement | null>;
+    uploadFile: (event: Event) => Promise<void>;
+};

package/dist/runtime/app/composables/useImport.js

@@ -0,0 +1,37 @@
+import { ref } from "vue";
+export default function useImport() {
+  const uploadError = ref(null);
+  const fileInput = ref(null);
+  const isUploading = ref(false);
+  async function uploadFile(event) {
+    if (isUploading.value) return;
+    isUploading.value = true;
+    uploadError.value = null;
+    const input = event.target;
+    if (!input.files) {
+      return;
+    }
+    const file = input.files[0];
+    if (!file) {
+      return;
+    }
+    const formData = new FormData();
+    formData.append("file", file);
+    try {
+      await $fetch("/api/admin/import", {
+        method: "POST",
+        body: formData
+      });
+    } catch (error) {
+      uploadError.value = error.data?.statusMessage || "Fehler beim Hochladen der Datei";
+      input.value = "";
+    }
+    isUploading.value = false;
+  }
+  return {
+    uploadError,
+    isUploading,
+    fileInput,
+    uploadFile
+  };
+}

package/dist/runtime/server/api/admin/blob.d.ts

@@ -1,2 +1,2 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<any>>;
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void>>;
 export default _default;

package/dist/runtime/server/api/admin/blob.js

@@ -1,6 +1,7 @@
 import { z } from "zod";
-import { createError, defineEventHandler, getValidatedQuery } from "h3";
+import { createError, defineEventHandler, getValidatedQuery, send } from "h3";
 import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import { toNodeBuffer } from "../../utils/toNodeBuffer.js";
 const querySchema = z.object({
   path: z.string().min(1)
 });
@@ -33,5 +34,7 @@ export default defineEventHandler(async (event) => {
   };
   const contentType = mimeTypes[extension] || "application/octet-stream";
   event.node.res.setHeader("Content-Type", contentType);
-  return file;
+  const body = toNodeBuffer(file);
+  event.node.res.setHeader("Content-Length", String(body.byteLength));
+  return send(event, body);
 });

package/dist/runtime/server/api/admin/import.d.ts

@@ -0,0 +1,5 @@
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<{
+    success: boolean;
+    count: number;
+}>>;
+export default _default;

package/dist/runtime/server/api/admin/import.js

@@ -0,0 +1,91 @@
+import { createError, defineEventHandler, readMultipartFormData } from "h3";
+import { useRuntimeConfig, useStorage } from "nitropack/runtime";
+import path from "node:path";
+import unzipper from "unzipper";
+function sanitizePathSegment(segment) {
+  return segment.replace(/[/:\\]/g, "_").replace(/\0/g, "");
+}
+function zipPathToColonKey(entryPath) {
+  const original = entryPath.replace(/\\/g, "/");
+  if (original.startsWith("/")) {
+    return "";
+  }
+  let p = original.replace(/^\.\//, "");
+  if (/^[a-z]:\//i.test(p)) {
+    return "";
+  }
+  if (!p || p.includes("\0")) {
+    return "";
+  }
+  p = path.posix.normalize(p);
+  if (p === "." || p === ".." || p.startsWith("../") || p.includes("/../")) {
+    return "";
+  }
+  const parts = p.split("/").filter(Boolean);
+  if (parts.some((part) => part === "." || part === "..")) {
+    return "";
+  }
+  const sanitizedParts = parts.map(sanitizePathSegment);
+  return sanitizedParts.join(":");
+}
+function withPrefix(s3Prefix, colonKey) {
+  return [s3Prefix, colonKey].filter(Boolean).join(":");
+}
+export default defineEventHandler(async (event) => {
+  const form = await readMultipartFormData(event);
+  const { mktcms: { s3Prefix } } = useRuntimeConfig();
+  if (!form) {
+    throw createError({
+      statusCode: 400,
+      statusMessage: "No form data received"
+    });
+  }
+  const file = form.find((item) => item.name === "file");
+  if (!file) {
+    throw createError({
+      statusCode: 400,
+      statusMessage: "Missing file"
+    });
+  }
+  if (!file.filename || !file.data) {
+    throw createError({
+      statusCode: 400,
+      statusMessage: "Invalid file upload"
+    });
+  }
+  const allowedExtensions = [".zip"];
+  const fileExtension = file.filename.toLowerCase().slice(file.filename.lastIndexOf("."));
+  if (!allowedExtensions.includes(fileExtension)) {
+    throw createError({
+      statusCode: 400,
+      statusMessage: "Invalid file type. Only ZIP files are allowed for import."
+    });
+  }
+  const zipBuffer = Buffer.isBuffer(file.data) ? file.data : Buffer.from(file.data);
+  let zip;
+  try {
+    zip = await unzipper.Open.buffer(zipBuffer);
+  } catch {
+    throw createError({ statusCode: 400, statusMessage: "Invalid ZIP file" });
+  }
+  const storage = useStorage("content");
+  const written = /* @__PURE__ */ new Set();
+  for (const entry of zip.files) {
+    if (!entry.path) {
+      continue;
+    }
+    if (entry.type === "Directory") continue;
+    const fileColonKey = zipPathToColonKey(entry.path);
+    if (!fileColonKey) {
+      throw createError({
+        statusCode: 400,
+        statusMessage: `Invalid ZIP entry path: ${entry.path}`
+      });
+    }
+    const fullKey = withPrefix(s3Prefix, fileColonKey);
+    const data = await entry.buffer();
+    await storage.setItemRaw(fullKey, data);
+    written.add(fullKey);
+  }
+  return { success: true, count: written.size };
+});

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

@@ -1,9 +1,10 @@
 import { z } from "zod";
-import { createError, defineEventHandler, getValidatedRouterParams } from "h3";
+import { createError, defineEventHandler, getValidatedRouterParams, send } from "h3";
 import { useRuntimeConfig, useStorage } from "nitropack/runtime";
 import { parse } from "csv-parse/sync";
 import { marked } from "marked";
 import { parseFrontmatter } from "../../utils/parseFrontmatter.js";
+import { toNodeBuffer } from "../../utils/toNodeBuffer.js";
 function parsedFile(fullPath, file) {
   if (fullPath.endsWith(".json") && typeof file === "string") {
     try {
@@ -61,7 +62,14 @@ export default defineEventHandler(async (event) => {
   const isCSV = decodedPath.endsWith(".csv");
   const isMarkdown = decodedPath.endsWith(".md");
   if (isImage) {
-    event.node.res.setHeader("Content-Type", "image/" + decodedPath.split(".").pop()?.toLowerCase());
+    const ext = decodedPath.split(".").pop()?.toLowerCase();
+    if (ext === "svg") {
+      event.node.res.setHeader("Content-Type", "image/svg+xml");
+    } else if (ext === "jpg") {
+      event.node.res.setHeader("Content-Type", "image/jpeg");
+    } else {
+      event.node.res.setHeader("Content-Type", "image/" + ext);
+    }
   } else if (isPdf) {
     event.node.res.setHeader("Content-Type", "application/pdf");
   } else if (isJson || isCSV || isMarkdown) {
@@ -70,7 +78,19 @@ export default defineEventHandler(async (event) => {
     event.node.res.setHeader("Content-Type", "text/plain; charset=utf-8");
   }
   const storage = useStorage("content");
-  const file = isImage || isPdf ? await storage.getItemRaw(fullPath) : await storage.getItem(fullPath);
+  if (isImage || isPdf) {
+    const raw = await storage.getItemRaw(fullPath);
+    if (!raw) {
+      throw createError({
+        statusCode: 404,
+        statusMessage: "File not found"
+      });
+    }
+    const body = toNodeBuffer(raw);
+    event.node.res.setHeader("Content-Length", String(body.byteLength));
+    return send(event, body);
+  }
+  const file = await storage.getItem(fullPath);
   if (!file) {
     throw createError({
       statusCode: 404,

package/dist/runtime/server/utils/toNodeBuffer.d.ts

@@ -0,0 +1 @@
+export declare function toNodeBuffer(raw: unknown): Buffer;

package/dist/runtime/server/utils/toNodeBuffer.js

@@ -0,0 +1,19 @@
+import { createError } from "h3";
+export function toNodeBuffer(raw) {
+  if (Buffer.isBuffer(raw)) {
+    return raw;
+  }
+  if (typeof raw === "string") {
+    return Buffer.from(raw);
+  }
+  if (raw instanceof ArrayBuffer) {
+    return Buffer.from(raw);
+  }
+  if (ArrayBuffer.isView(raw)) {
+    return Buffer.from(raw.buffer, raw.byteOffset, raw.byteLength);
+  }
+  throw createError({
+    statusCode: 500,
+    statusMessage: "Invalid binary file"
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mktcms",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Simple CMS module for Nuxt",
   "repository": "mktcode/mktcms",
   "license": "MIT",
@@ -45,6 +45,7 @@
     "defu": "^6.1.4",
     "marked": "^17.0.1",
     "nodemailer": "^7.0.12",
+    "unzipper": "^0.12.3",
     "yaml": "^2.8.2",
     "zod": "^4.3.5"
   },
@@ -58,6 +59,7 @@
     "@tailwindcss/typography": "^0.5.19",
     "@types/node": "latest",
     "@types/nodemailer": "^7.0.5",
+    "@types/unzipper": "^0.10.11",
     "changelogen": "^0.6.2",
     "eslint": "^9.39.2",
     "nuxt": "^4.2.2",