Add support of saving note revision and improve app start and stop procedure to ensure data integrity

Author: jackycute

app.js

@@ -484,16 +484,26 @@ function startListen() {
     if (config.usessl) {
         server.listen(config.port, function () {
             logger.info('HTTPS Server listening at port %d', config.port);
+            config.maintenance = false;
         });
     } else {
         server.listen(config.port, function () {
             logger.info('HTTP Server listening at port %d', config.port);
+            config.maintenance = false;
         });
     }
 }
 
 // sync db then start listen
-models.sequelize.sync().then(startListen);
+models.sequelize.sync().then(function () {
+    // check if realtime is ready
+    if (realtime.isReady()) {
+        models.Revision.checkAllNotesRevision(function (err, notes) {
+            if (err) return new Error(err);
+            if (notes.length <= 0) return startListen();
+        });
+    }
+});
 
 // log uncaught exception
 process.on('uncaughtException', function (err) {
@@ -510,21 +520,18 @@ process.on('SIGINT', function () {
     Object.keys(io.sockets.sockets).forEach(function (key) {
         var socket = io.sockets.sockets[key];
         // notify client server going into maintenance status
-        socket.emit('maintenance', config.version);
+        socket.emit('maintenance');
         socket.disconnect(true);
     });
     var checkCleanTimer = setInterval(function () {
-        var usersCount = Object.keys(realtime.users).length;
-        var notesCount = Object.keys(realtime.notes).length;
-        // check if all users and notes array are empty
-        if (usersCount == 0 && notesCount == 0) {
-            // close db connection
-            models.sequelize.close();
-            clearInterval(checkCleanTimer);
-            // wait for a while before exit
-            setTimeout(function () {
-                process.exit(0);
-            }, 100);
+        if (realtime.isReady()) {
+            models.Revision.checkAllNotesRevision(function (err, notes) {
+                if (err) return new Error(err);
+                if (notes.length <= 0) {
+                    clearInterval(checkCleanTimer);
+                    return process.exit(0);
+                }
+            });
         }
     }, 100);
 });

lib/config.js

@@ -78,7 +78,7 @@ function getserverurl() {
 }
 
 var version = '0.4.2';
-var maintenance = config.maintenance || false;
+var maintenance = true;
 var cwd = path.join(__dirname, '..');
 
 module.exports = {

lib/migrations/20160607060246-support-revision.js

@@ -0,0 +1,24 @@
+'use strict';
+
+module.exports = {
+  up: function (queryInterface, Sequelize) {
+    queryInterface.addColumn('Notes', 'savedAt', Sequelize.DATE);
+    queryInterface.createTable('Revisions', {
+      id: Sequelize.UUID,
+      noteId: Sequelize.UUID,
+      patch: Sequelize.TEXT,
+      lastContent: Sequelize.TEXT,
+      content: Sequelize.TEXT,
+      length: Sequelize.INTEGER,
+      createdAt: Sequelize.DATE,
+      updatedAt: Sequelize.DATE
+    });
+    return;
+  },
+
+  down: function (queryInterface, Sequelize) {
+    queryInterface.dropTable('Revisions');
+    queryInterface.removeColumn('Notes', 'savedAt');
+    return;
+  }
+};

lib/models/note.js

@@ -52,6 +52,9 @@ module.exports = function (sequelize, DataTypes) {
         },
         lastchangeAt: {
             type: DataTypes.DATE
+        },
+        savedAt: {
+            type: DataTypes.DATE
         }
     }, {
         classMethods: {
@@ -66,6 +69,10 @@ module.exports = function (sequelize, DataTypes) {
                     as: "lastchangeuser",
                     constraints: false
                 });
+                Note.hasMany(models.Revision, {
+                    foreignKey: "noteId",
+                    constraints: false
+                });
             },
             checkFileExist: function (filePath) {
                 try {
@@ -100,11 +107,15 @@ module.exports = function (sequelize, DataTypes) {
                                     var dbModifiedTime = moment(note.lastchangeAt || note.createdAt);
                                     if (fsModifiedTime.isAfter(dbModifiedTime)) {
                                         var body = fs.readFileSync(filePath, 'utf8');
-                                        note.title = LZString.compressToBase64(Note.parseNoteTitle(body));
-                                        note.content = LZString.compressToBase64(body);
-                                        note.lastchangeAt = fsModifiedTime;
-                                        note.save().then(function (note) {
-                                            return callback(null, note.id);
+                                        note.update({
+                                            title: LZString.compressToBase64(Note.parseNoteTitle(body)),
+                                            content: LZString.compressToBase64(body),
+                                            lastchangeAt: fsModifiedTime
+                                        }).then(function (note) {
+                                            sequelize.models.Revision.saveNoteRevision(note, function (err, revision) {
+                                                if (err) return _callback(err, null);
+                                                return callback(null, note.id);
+                                            });
                                         }).catch(function (err) {
                                             return _callback(err, null);
                                         });
@@ -224,6 +235,11 @@ module.exports = function (sequelize, DataTypes) {
                     }
                 }
                 return callback(null, note);
+            },
+            afterCreate: function (note, options, callback) {
+                sequelize.models.Revision.saveNoteRevision(note, function (err, revision) {
+                    callback(err, note);
+                });
             }
         }
     });