Merge remote-tracking branch 'origin/dev' into dev

Author: bhasher

src/app.js

@@ -28,12 +28,16 @@ nunjucks.configure(path.join(__dirname, 'views'), {
 });
 
 // Adding middleware
-// TODO change logger for production mode
-app.use(logger('dev'));
-app.use(compression());
-app.use(minify());
+if (config.PRODUCTION) {
+    app.use(logger('combined'));
+    app.use(compression());
+    app.use(minify());
+}
+else {
+    app.use(logger('dev'));
+}
 
-// Prometheus
+// Prometheus middleware
 if(config.METRICS){
     app.use(promBundle({
         includeMethod: true,

src/socket/socket.js

@@ -53,11 +53,13 @@ module.exports = function (wss) {
 						Object.entries(rooms[data.room]).forEach(([, sock]) => {
 							sock.send(JSON.stringify(data));
 						});
-						let documentContent = (await db.getDocument(data["room"])).content;
-						documentContent = JSON.parse(documentContent);
-						let document = new Document(documentContent);
-						document.applyRequests(data.data);
-						db.updateDocument(data["room"], JSON.stringify(document.documentContent));
+						if (Object.entries(data.data).filter(([,el]) => el.type !== 'cursor-moves').length > 0) {
+							let documentContent = (await db.getDocument(data["room"])).content;
+							documentContent = JSON.parse(documentContent);
+							let document = new Document(documentContent);
+							document.applyRequests(data.data);
+							db.updateDocument(data["room"], JSON.stringify(document.documentContent));
+						}
 					} catch (err) {
 						throw new Error(err);
 					}