Add a new 'reset' event from server to client before replay

[zombocom-ai] / index.js

diff --git a/index.js b/index.js
index 8dadeabec11666785f14926cc567caf15c58033f..9d4028fbd4cad5a1889ddadc037fd39949388946 100644 (file)
--- a/index.js
+++ b/index.js
@@ -5,6 +5,8 @@ const execFile = util.promisify(require('child_process').execFile);
 
 const express = require('express');
 const app = express();
+const session = require('express-session');
+const FileStore = require('session-file-store')(session);
 const http = require('http');
 const server = http.createServer(app);
 const { Server } = require("socket.io");
@@ -17,6 +19,26 @@ const state_file = 'zombocom-state.json'
 
 var state;
 
+if (!process.env.ZOMBOCOM_SESSION_SECRET) {
+    console.log("Error: Environment variable ZOMBOCOM_SESSION_SECRET not set.");
+    console.log("Please set it to a random, but persistent, value.")
+    process.exit();
+}
+
+const session_middleware =  session(
+    {store: new FileStore,
+     secret: process.env.ZOMBOCOM_SESSION_SECRET,
+     resave: false,
+     saveUninitialized: true
+    });
+
+app.use(session_middleware);
+
+// convert a connect middleware to a Socket.IO middleware
+const wrap = middleware => (socket, next) => middleware(socket.request, {}, next);
+
+io.use(wrap(session_middleware));
+
 // Load comments at server startup
 fs.readFile(state_file, (err, data) => {
     if (err)
@@ -43,15 +65,26 @@ process.on('SIGINT', () => {
 });
 
 app.get('/index.html', (req, res) => {
+    if (req.session.views) {
+        req.session.views++;
+    } else {
+        req.session.views = 1;
+    }
     res.sendFile(__dirname + '/index.html');
 });
 
 io.on('connection', (socket) => {
 
-    // Replay old comments to a newly-joining client
+    console.log("Connection from client with " + socket.request.session.views + " views.");
+
+    // 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)
+    });
 
     // When any client comments, send that to all clients (including sender)
     socket.on('comment', (comment) => {
@@ -81,7 +114,12 @@ io.on('connection', (socket) => {
             child.stderr.on('data', (data) => {
                 console.log("Error occurred during generate-image: " + data);
             });
-            const { stdout, stderr } = await promise;
+            try {
+                const { stdout, stderr } = await promise;
+            } catch(e) {
+                console.error(e);
+            }
+            socket.emit('generation-done');
         }
         generate_image(request['code'], request['prompt']);
     });