Merge pull request #506 from share/normalize-error

🥅 Catch `json0` normalization errors
share · Aug 10, 2021 · 99ea28e · 99ea28e
2 parents 6d9afcb + e199a68
commit 99ea28e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/error.js b/lib/error.js
@@ -38,6 +38,7 @@ ShareDBError.CODES = {
   ERR_OP_VERSION_MISMATCH_AFTER_TRANSFORM: 'ERR_OP_VERSION_MISMATCH_AFTER_TRANSFORM',
   ERR_OP_VERSION_MISMATCH_DURING_TRANSFORM: 'ERR_OP_VERSION_MISMATCH_DURING_TRANSFORM',
   ERR_OP_VERSION_NEWER_THAN_CURRENT_SNAPSHOT: 'ERR_OP_VERSION_NEWER_THAN_CURRENT_SNAPSHOT',
+  ERR_OT_LEGACY_JSON0_OP_CANNOT_BE_NORMALIZED: 'ERR_OT_LEGACY_JSON0_OP_CANNOT_BE_NORMALIZED',
   ERR_OT_OP_BADLY_FORMED: 'ERR_OT_OP_BADLY_FORMED',
   ERR_OT_OP_NOT_APPLIED: 'ERR_OT_OP_NOT_APPLIED',
   ERR_OT_OP_NOT_PROVIDED: 'ERR_OT_OP_NOT_PROVIDED',

diff --git a/lib/ot.js b/lib/ot.js
@@ -164,7 +164,16 @@ exports.applyOps = function(snapshot, ops, options) {
   options = options || {};
   for (var index = 0; index < ops.length; index++) {
     var op = ops[index];
-    if (options._normalizeLegacyJson0Ops) normalizeLegacyJson0Ops(snapshot, op);
+    if (options._normalizeLegacyJson0Ops) {
+      try {
+        normalizeLegacyJson0Ops(snapshot, op);
+      } catch (error) {
+        return new ShareDBError(
+          ERROR_CODE.ERR_OT_LEGACY_JSON0_OP_CANNOT_BE_NORMALIZED,
+          'Cannot normalize legacy json0 op'
+        );
+      }
+    }
     snapshot.v = op.v;
     var error = exports.apply(snapshot, op);
     if (error) return error;