Merge pull request #10 from Shitanshukumar607/improve-generate

improve generate func, fix support for other file imgs

Author: Shitanshukumar607

app/api/upload/route.ts

@@ -3,7 +3,7 @@ import { v2 as cloudinary, UploadApiResponse } from "cloudinary";
 import ImageTracer from "imagetracerjs";
 import { NextResponse } from "next/server";
 import fetch from "node-fetch";
-import { PNG } from "pngjs";
+import sharp from "sharp";
 
 cloudinary.config({
   cloud_name: process.env.CLOUDINARY_CLOUD_NAME!,
@@ -17,44 +17,67 @@ async function cloudinaryToSVG(imageUrl: string, options = { scale: 5 }) {
     throw new Error(`Failed to fetch image: ${response.statusText}`);
   const buffer = Buffer.from(await response.arrayBuffer());
 
-  const png = PNG.sync.read(buffer);
+  const image = sharp(buffer).ensureAlpha(); // ensures RGBA format
+  const { width, height } = await image.metadata();
+
+  if (!width || !height) {
+    throw new Error("Unable to read image metadata.");
+  }
+
+  const raw = await image.raw().toBuffer();
 
   const myImageData = {
-    width: png.width,
-    height: png.height,
-    data: png.data,
+    width,
+    height,
+    data: raw,
   };
 
   const svgstring = ImageTracer.imagedataToSVG(myImageData, options);
   return svgstring;
 }
 
 export async function POST(req: Request) {
-  const formData = await req.formData();
-  const file = formData.get("image") as File;
+  try {
+    const formData = await req.formData();
+    const file = formData.get("image") as File;
 
-  if (!file) {
-    return NextResponse.json({ error: "No file uploaded" }, { status: 400 });
-  }
+    if (!file) {
+      return NextResponse.json({ error: "No file uploaded" }, { status: 400 });
+    }
 
-  // Read file as buffer
-  const bytes = await file.arrayBuffer();
-  const buffer = Buffer.from(bytes);
-
-  const cloudinaryResponse: UploadApiResponse = await new Promise(
-    (resolve, reject) => {
-      const uploadStream = cloudinary.uploader.upload_stream((err, result) => {
-        if (err || !result) return reject(err);
-        resolve(result);
-      });
-      uploadStream.end(buffer);
-    },
-  );
-
-  const svgString = await cloudinaryToSVG(cloudinaryResponse.secure_url);
-
-  return NextResponse.json(
-    { url: cloudinaryResponse.secure_url, svg: svgString, success: true },
-    { status: 201 },
-  );
+    const bytes = await file.arrayBuffer();
+    const buffer = Buffer.from(bytes);
+
+    const cloudinaryResponse: UploadApiResponse = await new Promise(
+      (resolve, reject) => {
+        const uploadStream = cloudinary.uploader.upload_stream(
+          { resource_type: "image" },
+          (err, result) => {
+            if (err || !result) return reject(err);
+            resolve(result);
+          },
+        );
+        uploadStream.end(buffer);
+      },
+    );
+
+    const svgString = await cloudinaryToSVG(cloudinaryResponse.secure_url);
+
+    return NextResponse.json(
+      {
+        url: cloudinaryResponse.secure_url,
+        svg: svgString,
+        success: true,
+      },
+      { status: 201 },
+    );
+  } catch (err: unknown) {
+    console.error("Upload error:", err);
+    const errorMessage =
+      err instanceof Error ? err.message : "Internal Server Error";
+    return NextResponse.json(
+      { success: false, error: errorMessage },
+      { status: 500 },
+    );
+  }
 }

app/generate/page.tsx

@@ -12,7 +12,6 @@ import {
   Upload,
   X,
 } from "lucide-react";
-import Image from "next/image";
 import { useCallback, useEffect, useRef, useState } from "react";
 
 interface UploadedFile {
@@ -334,10 +333,11 @@ export default function UploadPage() {
                 {/* Image Preview */}
                 <div className="mb-4">
                   <div className="bg-slate-100 dark:bg-neutral-700 rounded-lg p-4 flex items-center justify-center min-h-[200px]">
-                    <Image
+                    <img
                       src={file.preview}
                       alt={file.name}
                       className="max-w-full max-h-64 object-contain rounded-lg shadow-sm"
+                      loading="lazy"
                     />
                   </div>
                   <p className="text-xs text-slate-500 dark:text-neutral-400 mt-2 text-center">

package-lock.json

@@ -29,6 +29,7 @@
     "pngjs": "^7.0.0",
     "react": "19.1.0",
     "react-dom": "19.1.0",
+    "sharp": "^0.34.4",
     "tailwind-merge": "^3.3.1"
   },
   "devDependencies": {