Merge branch 'master' into bfops/check-navjs

Author: bfops

Cargo.lock

@@ -265,7 +265,7 @@ tokio = { version = "1.37", features = ["full"] }
 tokio_metrics = { version = "0.4.0" }
 tokio-postgres = { version = "0.7.8", features = ["with-chrono-0_4"] }
 tokio-stream = "0.1.17"
-tokio-tungstenite = { version = "0.26.2", features = ["native-tls"] }
+tokio-tungstenite = { version = "0.27.0", features = ["native-tls"] }
 tokio-util = { version = "0.7.4", features = ["time"] }
 toml = "0.8"
 toml_edit = "0.22.22"

Cargo.toml

@@ -772,7 +772,7 @@ fn ws_recv_loop(
                     | WsError::Capacity(_)
                     | WsError::Protocol(_)
                     | WsError::WriteBufferFull(_)
-                    | WsError::Utf8
+                    | WsError::Utf8(_)
                     | WsError::AttackAttempt
                     | WsError::Url(_)
                     | WsError::Http(_)

crates/client-api/src/routes/subscribe.rs

@@ -303,6 +303,15 @@ void IRemoteTableHandle.Apply(IEventContext context, MultiDictionaryDelta<object
             // This is a local operation -- it only looks at our indices and doesn't invoke user code.
             // So we don't need to wait for other tables to be updated to do it.
             // (And we need to do it before any PostApply is called.)
+            // Reminder: We need to loop through the removed entries to delete them prior to inserting the new entries,
+            // in order to avoid keys an error with the same key already added.
+            foreach (var (_, value) in wasRemoved)
+            {
+                if (value is Row oldRow)
+                {
+                    OnInternalDeleteHandler.Invoke(oldRow);
+                }
+            }
             foreach (var (_, value) in wasInserted)
             {
                 if (value is Row newRow)
@@ -335,14 +344,6 @@ void IRemoteTableHandle.Apply(IEventContext context, MultiDictionaryDelta<object
                     throw new Exception($"Invalid row type for table {RemoteTableName}: {newValue.GetType().Name}");
                 }
             }
-
-            foreach (var (_, value) in wasRemoved)
-            {
-                if (value is Row oldRow)
-                {
-                    OnInternalDeleteHandler.Invoke(oldRow);
-                }
-            }
         }
 
         void IRemoteTableHandle.PostApply(IEventContext context)