Merge pull request #907 from SISheogorath/fix/historyLZString

Some minor improvements for LZString handling

2 files changed, 19 insertions, 2 deletions

diff --git a/lib/history.js b/lib/history.js
index c7d2472c..9c389bfa 100644
--- a/lib/history.js
+++ b/lib/history.js
@@ -31,6 +31,15 @@ function getHistory (userid, callback) {
       history = JSON.parse(user.history)
       // migrate LZString encoded note id to base64url encoded note id
       for (let i = 0, l = history.length; i < l; i++) {
+        // Calculate minimal string length for an UUID that is encoded
+        // base64 encoded and optimize comparsion by using -1
+        // this should make a lot of LZ-String parsing errors obsolete
+        // as we can assume that a nodeId that is 48 chars or longer is a
+        // noteID.
+        const base64UuidLength = ((4 * 36) / 3) - 1
+        if (!(history[i].id.length > base64UuidLength)) {
+          continue
+        }
         try {
           let id = LZString.decompressFromBase64(history[i].id)
           if (id && models.Note.checkNoteIdValid(id)) {
@@ -38,7 +47,11 @@ function getHistory (userid, callback) {
           }
         } catch (err) {
           // most error here comes from LZString, ignore
-          logger.error(err)
+          if (err.message === 'Cannot read property \'charAt\' of undefined') {
+            logger.warning('Looks like we can not decode "' + history[i].id + '" with LZString. Can be ignored.')
+          } else {
+            logger.error(err)
+          }
         }
       }
       history = parseHistoryToObject(history)
diff --git a/lib/models/note.js b/lib/models/note.js
index ec7e2b13..0e8dd4dd 100644
--- a/lib/models/note.js
+++ b/lib/models/note.js
@@ -227,7 +227,11 @@ module.exports = function (sequelize, DataTypes) {
               var id = LZString.decompressFromBase64(noteId)
               if (id && Note.checkNoteIdValid(id)) { return callback(null, id) } else { return _callback(null, null) }
             } catch (err) {
-              logger.error(err)
+              if (err.message === 'Cannot read property \'charAt\' of undefined') {
+                logger.warning('Looks like we can not decode "' + noteId + '" with LZString. Can be ignored.')
+              } else {
+                logger.error(err)
+              }
               return _callback(null, null)
             }
           },