@aj-archipelago/cortex 1.3.7 → 1.3.9

package/helper-apps/cortex-file-handler/blobHandler.js

@@ -191,7 +191,7 @@ async function deleteBlob(requestId) {
   return result;
 }
 
-async function uploadBlob(context, req, saveToLocal = false, useGoogle = false, filePath=null) {
+async function uploadBlob(context, req, saveToLocal = false, useGoogle = false, filePath=null, hash=null) {
   return new Promise((resolve, reject) => {
     try {
       let requestId = uuidv4();
@@ -201,7 +201,7 @@ async function uploadBlob(context, req, saveToLocal = false, useGoogle = false,
       if (filePath) {
         const file = fs.createReadStream(filePath);
         const filename = path.basename(filePath);
-        uploadFile(context, requestId, body, saveToLocal, useGoogle, file, filename, resolve)
+        uploadFile(context, requestId, body, saveToLocal, useGoogle, file, filename, resolve, hash);
       } else {
         // Otherwise, continue working with form-data
         const busboy = Busboy({ headers: req.headers });
@@ -215,7 +215,7 @@ async function uploadBlob(context, req, saveToLocal = false, useGoogle = false,
         });
 
         busboy.on("file", async (fieldname, file, filename) => {
-          uploadFile(context, requestId, body, saveToLocal, useGoogle, file, filename?.filename || filename, resolve)
+          uploadFile(context, requestId, body, saveToLocal, useGoogle, file, filename?.filename || filename, resolve, hash);
         });
 
         busboy.on("error", (error) => {
@@ -240,7 +240,7 @@ async function uploadBlob(context, req, saveToLocal = false, useGoogle = false,
   });
 }
 
-async function uploadFile(context, requestId, body, saveToLocal, useGoogle, file, filename, resolve) {
+async function uploadFile(context, requestId, body, saveToLocal, useGoogle, file, filename, resolve, hash=null) {
   // do not use Google if the file is not an image or video
   const ext = path.extname(filename).toLowerCase();
   const canUseGoogle = IMAGE_EXTENSIONS.includes(ext) || VIDEO_EXTENSIONS.includes(ext) || AUDIO_EXTENSIONS.includes(ext);
@@ -306,16 +306,29 @@ async function uploadFile(context, requestId, body, saveToLocal, useGoogle, file
     const { url } = body;
     const gcsFile = gcs.bucket(GCS_BUCKETNAME).file(encodedFilename);
     const writeStream = gcsFile.createWriteStream();
-
+    
     const response = await axios({
       method: "get",
       url: url,
       responseType: "stream",
     });
-
-    // pipe the Axios response stream directly into the GCS Write Stream
+    
+    // // Get the total file size from the response headers
+    // const totalSize = Number(response.headers["content-length"]);
+    // let downloadedSize = 0;
+    
+    // // Listen to the 'data' event to track the progress
+    // response.data.on("data", (chunk) => {
+    //   downloadedSize += chunk.length;
+    
+    //   // Calculate and display the progress
+    //   const progress = (downloadedSize / totalSize) * 100;
+    //   console.log(`Progress gsc of ${encodedFilename}: ${progress.toFixed(2)}%`);
+    // });
+    
+    // Pipe the Axios response stream directly into the GCS Write Stream
     response.data.pipe(writeStream);
-
+    
     await new Promise((resolve, reject) => {
       writeStream.on("finish", resolve);
       writeStream.on("error", reject);
@@ -324,6 +337,12 @@ async function uploadFile(context, requestId, body, saveToLocal, useGoogle, file
     body.gcs = `gs://${GCS_BUCKETNAME}/${encodedFilename}`;
   }
   
+  if(!body.filename) {
+    body.filename = filename;
+  }
+  if(hash && !body.hash) {
+    body.hash = hash;
+  }
   resolve(body); // Resolve the promise
 }
 

package/helper-apps/cortex-file-handler/index.js

@@ -120,7 +120,7 @@ async function main(context, req) {
         return;
     }
 
-    const { uri, requestId, save, hash, checkHash, fetch, load, restore } = req.body?.params || req.query;
+    const { uri, requestId, save, hash, checkHash, clearHash, fetch, load, restore } = req.body?.params || req.query;
 
     const filepond = fetch || restore || load;
     if (req.method.toLowerCase() === `get` && filepond) {
@@ -163,6 +163,24 @@ async function main(context, req) {
         return;
     }
 
+    if(hash && clearHash){
+        try {
+            const hashValue = await getFileStoreMap(hash);
+            await removeFromFileStoreMap(hash);
+            context.res = {
+                status: 200,
+                body: hashValue ? `Hash ${hash} removed` : `Hash ${hash} not found`
+            };
+        } catch (error) {
+            context.res = {
+                status: 500,
+                body: `Error occurred during hash cleanup: ${error}`
+            };
+            console.log('Error occurred during hash cleanup:', error);
+        }
+        return
+    }
+
     if(hash && checkHash){ //check if hash exists
         context.log(`Checking hash: ${hash}`);
         const result = await getFileStoreMap(hash);
@@ -188,7 +206,7 @@ async function main(context, req) {
 
     if (req.method.toLowerCase() === `post`) {
         const { useGoogle } = req.body?.params || req.query;
-        const { url } = await uploadBlob(context, req, !useAzure, useGoogle);
+        const { url } = await uploadBlob(context, req, !useAzure, useGoogle, null, hash);
         context.log(`File url: ${url}`);
         if(hash && context?.res?.body){ //save hash after upload
             await setFileStoreMap(hash, context.res.body);

package/helper-apps/cortex-realtime-voice-server/client/src/chat/Chat.tsx

@@ -82,16 +82,35 @@ export default function Chat({
     logger.log('Stopping conversation');
     const wavRecorder = wavRecorderRef.current;
     const wavStreamPlayer = wavStreamPlayerRef.current;
+    const socket = socketRef.current;
 
-    if (wavRecorder.getStatus() === "recording") {
-      await wavRecorder.end();
-      await wavStreamPlayer.interrupt();
-      await SoundEffects.playDisconnect();
-      socketRef.current.emit('conversationCompleted');
-      socketRef.current.removeAllListeners();
-      socketRef.current.disconnect();
+    try {
+      // First stop recording and audio playback
+      if (wavRecorder.getStatus() === "recording") {
+        await wavRecorder.end();
+      }
+      if (wavStreamPlayer) {
+        await wavStreamPlayer.interrupt();
+      }
+
+      // Clean up socket connection first
+      if (socket) {
+        // Only emit if we're still connected
+        if (socket.connected) {
+          socket.emit('conversationCompleted');
+          // Wait a bit to ensure the message is sent
+          await new Promise(resolve => setTimeout(resolve, 100));
+        }
+        socket.removeAllListeners();
+        socket.disconnect();
+        // Create a new socket instance to ensure clean state
+        socketRef.current = io(`/?userId=${userId}&userName=${userName}&aiName=${aiName}&voice=${voice}&aiStyle=${aiStyle}&language=${language}`, {
+          autoConnect: false,
+          reconnection: false
+        });
+      }
 
-      // Clean up audio nodes
+      // Then clean up audio nodes
       if (sourceNodeRef.current) {
         sourceNodeRef.current.disconnect();
         sourceNodeRef.current = null;
@@ -109,15 +128,36 @@ export default function Chat({
       wavRecorderRef.current = new WavRecorder({sampleRate: 24000});
       wavStreamPlayerRef.current = new WavStreamPlayer({sampleRate: 24000});
 
+      // Play disconnect sound last
+      await SoundEffects.playDisconnect();
+
+      // Reset state
+      setIsRecording(false);
+      setIsMuted(false);
+      setImageUrls([]);
+      setIsAudioPlaying(false);
+    } catch (error) {
+      logger.error('Error stopping conversation:', error);
+      // Even if there's an error, try to reset critical state
       setIsRecording(false);
-      setIsMuted(false);  // Reset mute state
-      setImageUrls([]); // Clear images on disconnect
+      setIsAudioPlaying(false);
     }
-  }, []);
+  }, [userId, userName, aiName, voice, aiStyle, language]);
 
   const startConversation = useCallback(() => {
     logger.log('Starting conversation');
     
+    // Clean up any existing socket connection first
+    if (socketRef.current?.connected) {
+      socketRef.current.disconnect();
+    }
+    
+    // Create a new socket instance
+    socketRef.current = io(`/?userId=${userId}&userName=${userName}&aiName=${aiName}&voice=${voice}&aiStyle=${aiStyle}&language=${language}`, {
+      autoConnect: false,
+      timeout: 10000 // 10 second connection timeout
+    });
+
     const socket = socketRef.current;
 
     // Remove ALL existing listeners before adding new ones