feat: updated to try and fix issues with query rendering and status messages from replicator

Author: biozal

expo-example/android/build.gradle

@@ -39,4 +39,4 @@ allprojects {
         maven { url 'https://www.jitpack.io' }
     }
 }
-apply from: "../../android/build.gradle"apply from: "../../android/build.gradle"apply from: "../../android/build.gradle"
+apply from: "../../android/build.gradle"apply from: "../../android/build.gradle"

expo-example/app/replication/status.tsx

@@ -2,13 +2,27 @@ import React, { useContext, useState } from 'react';
 import { Replicator } from 'cbl-reactnative';
 import ReplicatorStatusChangeContext from '@/providers/ReplicatorStatusChangeContext';
 import ReplicatorStatusTokenContext from '@/providers/ReplicatorStatusTokenContext';
-import replicationStatusChange from '@/service/replicator/replicationStatusChange';
+import start from '@/service/replicator/start';
+import stop from '@/service/replicator/stop';
 import ReplicatorIdActionForm from '@/components/ReplicatorIdActionForm/ReplicatorIdActionForm';
 import { useStyleScheme } from '@/components/Themed/Themed';
-import { SafeAreaView } from 'react-native';
+import { NativeEventEmitter, NativeModules, SafeAreaView } from 'react-native';
 import ResultListView from '@/components/ResultsListView/ResultsListView';
+//debug the message queue
+import MessageQueue from 'react-native/Libraries/BatchedBridge/MessageQueue';
 
 export default function ReplicatorStatusScreen() {
+  //debug the message queue
+  const spyMessageQueue = (message: any) => {
+    if (
+      message.type === 0 &&
+      message.method === 'emit' &&
+      message.module === 'RCTDeviceEventEmitter'
+    ) {
+      console.log(`::MESSAGE-QUEUE:: ${message}`);
+    }
+  };
+
   const styles = useStyleScheme();
   const { statusChangeMessages, setStatusChangeMessages } = useContext(
     ReplicatorStatusChangeContext
@@ -27,17 +41,37 @@ export default function ReplicatorStatusScreen() {
       const replicatorId = replId.toString();
       setSelectedReplicatorId(replicatorId);
       try {
+        //debug the message queue
+        //MessageQueue.spy(spyMessageQueue);
         const token = statusToken[replicatorId];
         if (token === undefined) {
           setInformationMessages((prev) => [
             ...prev,
             `::Information: Replicator <${replicatorId}> Starting Status Change listener...`,
           ]);
-          await replicationStatusChange(
-            replicator,
-            setStatusChangeMessages,
-            setStatusToken
-          );
+          const date = new Date().toISOString();
+          const changeToken = await replicator.addChangeListener((change) => {
+            const newMessage = [
+              `${date}::Status:: Replicator <${replicator.getId()}> status changed: ${change.status}`,
+            ];
+            setStatusChangeMessages((prev) => {
+              return {
+                ...prev,
+                [replicatorId]: [...(prev[replicatorId] || []), ...newMessage],
+              };
+            });
+          });
+          setStatusToken((prev) => {
+            return {
+              ...prev,
+              [replicatorId]: changeToken,
+            };
+          });
+          setInformationMessages((prev) => [
+            ...prev,
+            `::Information: Replicator <${replicatorId}> Starting Replicator...`,
+          ]);
+          await start(replicator, false);
         } else {
           setInformationMessages((prev) => [
             ...prev,
@@ -58,6 +92,52 @@ export default function ReplicatorStatusScreen() {
       ]);
     }
   }
+
+  async function stopReplicator(replicator: Replicator): Promise<void> {
+    try {
+      const replId = replicator.getId();
+      if (replId !== undefined) {
+        const replicatorId = replId.toString();
+        setInformationMessages((prev) => [
+          ...prev,
+          `::Information: Stopping Replicator with replicatorId: <${replicatorId}>.`,
+        ]);
+        await stop(replicator);
+        setStatusToken((prev) => {
+          const newStatusToken = { ...prev };
+          delete newStatusToken[replicatorId];
+          return newStatusToken;
+        });
+        setInformationMessages((prev) => [
+          ...prev,
+          `::Information: Stopped Replicator with replicatorId: <${replicatorId}>.`,
+        ]);
+
+        const token = statusToken[replicatorId];
+        setInformationMessages((prev) => [
+          ...prev,
+          `::Information: Removing change listener with token <${token}> from Replicator with replicatorId: <${replicatorId}>.`,
+        ]);
+        await replicator.removeChangeListener(token);
+        setInformationMessages((prev) => [
+          ...prev,
+          `::Information: Removed change listener with token <${token}> from Replicator with replicatorId: <${replicatorId}>.`,
+        ]);
+      } else {
+        setInformationMessages((prev) => [
+          ...prev,
+          `::Error: Couldn't get replicatorId from replicator.`,
+        ]);
+      }
+    } catch (error) {
+      setInformationMessages((prev) => [
+        ...prev,
+        // @ts-ignore
+        `::ERROR: ${error.message}`,
+      ]);
+    }
+  }
+
   const filteredStatusChangeMessages =
     statusChangeMessages[selectedReplicatorId] || [];
   const combinedMessages = [
@@ -69,6 +149,7 @@ export default function ReplicatorStatusScreen() {
       <ReplicatorIdActionForm
         handleUpdatePressed={update}
         handleResetPressed={reset}
+        handleStopPressed={stopReplicator}
         screenTitle="Replicator Status"
       />
       <ResultListView useScrollView={true} messages={combinedMessages} />

expo-example/components/CBLDatabaseQueryActionContainer/CBLDatabaseQueryActionContainer.tsx

@@ -118,7 +118,7 @@ export default function CBLDatabaseQueryActionContainer({
         />
         {children && children}
       </View>
-      <ResultListView messages={resultMessage} />
+      <ResultListView messages={resultMessage} style={localStyles.results} />
     </SafeAreaView>
   );
 }
@@ -130,4 +130,7 @@ const localStyles = StyleSheet.create({
     marginTop: 5,
     marginBottom: 15,
   },
+  results: {
+    marginBottom: 280,
+  },
 });

expo-example/components/ReplicatorIdActionForm/ReplicatorIdActionForm.tsx

@@ -11,6 +11,7 @@ export default function ReplicatorIdActionForm({
   screenTitle,
   handleUpdatePressed,
   handleResetPressed,
+  handleStopPressed,
 }: ReplicatorIdActionFormProps) {
   const { replicatorIds } = useContext(ReplicatorContext)!;
   const [replicatorId, setReplicatorId] = useState<string>('');
@@ -27,6 +28,12 @@ export default function ReplicatorIdActionForm({
       onPress: update,
     },
   ];
+  if (handleStopPressed !== undefined) {
+    icons.push({
+      iconName: 'stop',
+      onPress: stop,
+    });
+  }
 
   async function update() {
     if (replicatorId in replicatorIds) {
@@ -39,6 +46,17 @@ export default function ReplicatorIdActionForm({
     }
   }
 
+  async function stop() {
+    if (replicatorId in replicatorIds && handleStopPressed !== undefined) {
+      const replicator = replicatorIds[replicatorId];
+      await handleStopPressed(replicator);
+    } else {
+      throw new Error(
+        `Error: Replicator <${replicatorId}> not found in context or no handle to stop the replicator. Make sure replicator was created first prior to trying to stop it.`
+      );
+    }
+  }
+
   function reset() {
     setReplicatorId('');
     handleResetPressed();

expo-example/components/ReplicatorIdActionForm/ReplicatorIdActionFormProps.type.ts

@@ -4,4 +4,5 @@ export type ReplicatorIdActionFormProps = {
   screenTitle: string;
   handleUpdatePressed: (replicator: Replicator) => Promise<void>;
   handleResetPressed: () => void;
+  handleStopPressed?: (replicator: Replicator) => Promise<void>;
 };

expo-example/ios/Podfile.lock

@@ -2143,9 +2143,9 @@ SPEC CHECKSUMS:
   EXUpdatesInterface: 996527fd7d1a5d271eb523258d603f8f92038f24
   FBLazyVector: 38bb611218305c3bc61803e287b8a81c6f63b619
   fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
-  glog: fdfdfe5479092de0c4bdbebedd9056951f092c4f
+  glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
   hermes-engine: 3b6e0717ca847e2fc90a201e59db36caf04dee88
-  RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
+  RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740
   RCTDeprecation: 34cbf122b623037ea9facad2e92e53434c5c7422
   RCTRequired: 24c446d7bcd0f517d516b6265d8df04dc3eb1219
   RCTTypeSafety: ef5e91bd791abd3a99b2c75fd565791102a66352