@zodic/shared 0.0.345 → 0.0.347

package/app/api/index.ts

@@ -1,4 +1,5 @@
 import OpenAI from 'openai';
+import { v4 } from 'uuid';
 import {
   BackendBindings,
   BatchInputItem,
@@ -785,46 +786,115 @@ export const Api = (env: BackendBindings) => ({
         'x-api-key': `${env.PIAPI_API_KEY}`,
         'Content-Type': 'application/json',
       };
-    
+
       // Validate image URLs before making the request
-      const validateImageUrl = async (url: string, label: string): Promise<void> => {
+      const validateImageUrl = async (
+        url: string,
+        label: string
+      ): Promise<void> => {
         try {
           const response = await fetch(url, { method: 'HEAD' });
           if (!response.ok) {
-            throw new Error(`${label} is inaccessible: ${response.status} ${response.statusText}`);
+            throw new Error(
+              `${label} is inaccessible: ${response.status} ${response.statusText}`
+            );
           }
           const contentType = response.headers.get('Content-Type');
           if (!contentType || !contentType.startsWith('image/')) {
-            throw new Error(`${label} is not a valid image: Content-Type is ${contentType}`);
+            throw new Error(
+              `${label} is not a valid image: Content-Type is ${contentType}`
+            );
           }
         } catch (err: any) {
           console.error(`Error validating ${label}:`, err.message);
           throw new Error(`Invalid ${label}: ${err.message}`);
         }
       };
-    
-      // Helper function to generate a resized image URL using Cloudflare Image Transformations
-      const getResizedImageUrl = (originalUrl: string, label: string): string => {
-        // Use your Cloudflare Worker domain
-        const zone = 'https://zodic-backend.lucdelbel.workers.dev';
-        
-        // Construct the Cloudflare Image Transformation URL
-        // Resize to fit within 2048x2048 while maintaining proportions
-        const resizedUrl = `${zone}/cdn-cgi/image/width=2048,height=2048,fit=scale-down/${encodeURIComponent(originalUrl)}`;
-        
-        console.log(`${label} resized URL:`, resizedUrl);
-        return resizedUrl;
+
+      // Helper function to resize an image by calling the Express server
+      const resizeImage = async (
+        url: string,
+        label: string
+      ): Promise<ArrayBuffer> => {
+        const resizeEndpoint = `https://zodiako-image-mounter.onrender.com/resize-image?url=${encodeURIComponent(
+          url
+        )}`; // Replace with your Express server URL
+        try {
+          const response = await fetch(resizeEndpoint);
+          if (!response.ok) {
+            throw new Error(
+              `${label} resize failed: ${response.status} ${response.statusText}`
+            );
+          }
+          const contentType = response.headers.get('Content-Type');
+          if (!contentType || !contentType.startsWith('image/')) {
+            throw new Error(
+              `${label} resize response is not an image: Content-Type is ${contentType}`
+            );
+          }
+          return await response.arrayBuffer();
+        } catch (err: any) {
+          console.error(`Error resizing ${label}:`, err.message);
+          throw new Error(`Failed to resize ${label}: ${err.message}`);
+        }
       };
-    
+
+      const getKey = (filePath: string) => {
+        const fileNameParts = filePath.split('.');
+        const extension = fileNameParts.pop();
+        const fileNameWithoutExtension = fileNameParts.join('.');
+
+        const newFileName = `${fileNameWithoutExtension}-${v4()}.${extension}`;
+        const key = `${newFileName.replace(/ /g, '_')}`;
+
+        return key;
+      };
+
+      // Helper function to upload an image to storage and get a public URL
+      const uploadImageToStorage = async (
+        imageData: ArrayBuffer,
+        label: string
+      ): Promise<string> => {
+        const key = getKey(label);
+        await env.PHOTOS_BUCKET.put(key, imageData);
+        const imageUrl = `https://pub-c4bb4b3e4ccd46b59eed7fa434c59b60.r2.dev/${key}`;
+        return imageUrl;
+        // Replace this with your actual storage service implementation (e.g., Cloudflare R2, AWS S3)
+        // Example for Cloudflare R2:
+        // const r2Response = await env.R2_BUCKET.put(fileName, imageData, {
+        //   httpMetadata: { contentType: 'image/jpeg' },
+        // });
+        // return `https://your-r2-bucket-url/${fileName}`;
+
+        // For now, we'll throw an error if this isn't implemented
+        throw new Error(`Storage service not implemented for ${label}`);
+      };
+
       try {
         // Validate image URLs
         await validateImageUrl(sourceImageUrl, 'Source image URL');
         await validateImageUrl(targetImageUrl, 'Target image URL');
-    
-        // Generate resized URLs using Cloudflare Image Transformations
-        const resizedSourceUrl = getResizedImageUrl(sourceImageUrl, 'Source image');
-        const resizedTargetUrl = getResizedImageUrl(targetImageUrl, 'Target image');
-    
+
+        // Resize images by calling the Express server
+        const resizedSourceData = await resizeImage(
+          sourceImageUrl,
+          'Source image'
+        );
+        const resizedTargetData = await resizeImage(
+          targetImageUrl,
+          'Target image'
+        );
+
+        // Upload resized images to storage to get public URLs
+        const resizedSourceUrl = await uploadImageToStorage(
+          resizedSourceData,
+          'Source image'
+        );
+        const resizedTargetUrl = await uploadImageToStorage(
+          resizedTargetData,
+          'Target image'
+        );
+
         const body = JSON.stringify({
           model: 'Qubico/image-toolkit',
           type: 'face-swap',
@@ -834,28 +904,34 @@ export const Api = (env: BackendBindings) => ({
           },
           config: {
             webhook_config: {
-              endpoint: 'https://zodic-backend.lucdelbel.workers.dev/api/webhook/faceswap',
+              endpoint:
+                'https://zodic-backend.lucdelbel.workers.dev/api/webhook/faceswap',
               // secret: '',
             },
           },
         });
-    
-        console.log('Sending FaceSwap request:', { resizedSourceUrl, resizedTargetUrl });
-    
+
+        console.log('Sending FaceSwap request:', {
+          resizedSourceUrl,
+          resizedTargetUrl,
+        });
+
         const response = await fetch(endpoint, {
           method: 'POST',
           headers,
           body,
         });
-    
+
         // Log the HTTP status and headers for debugging
         console.log('PiAPI FaceSwap Response Status:', response.status);
-        console.log('PiAPI FaceSwap Response Headers:', [...response.headers.entries()]);
-    
+        console.log('PiAPI FaceSwap Response Headers:', [
+          ...response.headers.entries(),
+        ]);
+
         // Read the response body as text first to inspect it
         const responseText = await response.text();
         console.log('PiAPI FaceSwap Raw Response Body:', responseText);
-    
+
         // Check for the expected 201 Created status
         if (response.status !== 201) {
           let errorData;
@@ -865,32 +941,45 @@ export const Api = (env: BackendBindings) => ({
             errorData = { message: responseText || 'Unknown error' };
           }
           console.error('Error from PiAPI FaceSwap:', errorData);
-          throw new Error(`PiAPI FaceSwap Error: ${response.status} - ${errorData.message || 'Unknown error'}`);
+          throw new Error(
+            `PiAPI FaceSwap Error: ${response.status} - ${
+              errorData.message || 'Unknown error'
+            }`
+          );
         }
-    
+
         // Check if the response body is empty
         if (!responseText) {
           console.error('PiAPI FaceSwap response body is empty');
           throw new Error('PiAPI FaceSwap Error: Empty response body');
         }
-    
+
         // Try to parse the response as JSON
         let data;
         try {
-          data = JSON.parse(responseText) as { task_id: string; message: string };
+          data = JSON.parse(responseText) as {
+            task_id: string;
+            message: string;
+          };
         } catch (err) {
-          console.error('Failed to parse PiAPI FaceSwap response as JSON:', responseText);
+          console.error(
+            'Failed to parse PiAPI FaceSwap response as JSON:',
+            responseText
+          );
           throw new Error('PiAPI FaceSwap Error: Invalid JSON response');
         }
-    
+
         // Validate the response structure
         if (!data.task_id || !data.message) {
-          console.error('PiAPI FaceSwap response missing required fields:', data);
+          console.error(
+            'PiAPI FaceSwap response missing required fields:',
+            data
+          );
           throw new Error('PiAPI FaceSwap Error: Invalid response structure');
         }
-    
+
         console.log('FaceSwap task created successfully:', data);
-    
+
         return {
           taskId: data.task_id,
           message: data.message,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zodic/shared",
-  "version": "0.0.345",
+  "version": "0.0.347",
   "module": "index.ts",
   "type": "module",
   "publishConfig": {