Tell server a name at first connection

[zombocom-ai] / index.js

diff --git a/index.js b/index.js
index 0b854a66bcd9643590393b418a8f3125c61241f1..20e79d04e52e9207cebc1c0c93ac05dfb95e3663 100644 (file)
--- a/index.js
+++ b/index.js
@@ -77,12 +77,12 @@ io.on('connection', (socket) => {
 
     // Replay old comments and images to a newly-joining client
     socket.emit('reset');
-    state.comments.forEach((comment) => {
-        socket.emit('comment', comment)
-    });
     state.images.forEach((image) => {
         socket.emit('image', image)
     });
+    state.comments.forEach((comment) => {
+        socket.emit('comment', comment)
+    });
 
     socket.on('set-name', (name) => {
         console.log("Received set-name event: " + name);
@@ -92,13 +92,14 @@ io.on('connection', (socket) => {
 
     // When any client comments, send that to all clients (including sender)
     socket.on('comment', (comment) => {
+        comment.name = socket.request.session.name;
         io.emit('comment', comment);
         state.comments.push(comment);
     });
 
     // Generate an image when requested
     socket.on('generate', (request) => {
-        console.log(`Generating image with code=${request['code']} and prompt=${request['prompt']}`);
+        console.log(`Generating image for ${socket.request.session.name} with code=${request['code']} and prompt=${request['prompt']}`);
         async function generate_image(code, prompt) {
             var promise;
             if (code) {
@@ -110,7 +111,7 @@ io.on('connection', (socket) => {
             child.stdout.on('data', (data) => {
                 const images = JSON.parse(data);
                 images.forEach((image) => {
-                    console.log(`Emitting image to clients: ${image}`);
+                    image.index = state.images.length;
                     io.emit('image', image);
                     state.images.push(image);
                 });