From eb35ea6da5a0e7bb4e2092fa1628bf3a6ac9a618 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 22 Nov 2024 14:07:14 +0100
Subject: [PATCH] Re-apply merge changes

---
 src/worker/async-store.js       | 6 ++++++
 src/worker/modules/messenger.js | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/worker/async-store.js b/src/worker/async-store.js
index f4ea0347a..cb05d8b7e 100644
--- a/src/worker/async-store.js
+++ b/src/worker/async-store.js
@@ -2309,6 +2309,12 @@ const factory = (ApiConfig = {}, Sortify, UserObject, ProxyManager,
                 if (completed) { return; }
                 var parsed = parse(msg);
                 if (parsed[1] !== txid) { console.log('bad txid'); return; }
+                if (parsed[0] === 'HISTORY_RANGE_ERROR') {
+                    cb({
+                        error: parsed[2]
+                    });
+                    return;
+                }
                 if (parsed[0] === 'HISTORY_RANGE_END') {
                     cb({
                         messages: msgs,
diff --git a/src/worker/modules/messenger.js b/src/worker/modules/messenger.js
index 74b454186..eebce5d2c 100644
--- a/src/worker/modules/messenger.js
+++ b/src/worker/modules/messenger.js
@@ -376,7 +376,8 @@ const factory = (Crypto, Hash, Util, Realtime, Messaging,
             }
             // History cleared while we were offline
             // ==> we asked for an invalid last known hash
-            if (parsed.error && parsed.error === "EINVAL") {
+            if (parsed.error && (parsed.error === "EINVAL"
+                              || parsed.error === "EUNKNOWN")) {
                 setChannelHead(ctx, parsed.channel, '', function () {
                     getChannelMessagesSince(ctx, channel, {}, {});
                 });