@dittolive/ditto 4.7.0 → 4.7.1-rc.3

package/react-native/src/sources/live-query.ts

@@ -136,7 +136,8 @@ export class LiveQuery {
           })
         }
 
-        handler(documents, event, signalNext)
+        // We discard the return promise because error-handling is not supported.
+        void handler(documents, event, signalNext)
       })
     })
 

package/react-native/src/sources/pending-collections-operation.ts

@@ -10,6 +10,7 @@ import { PendingCursorOperation } from './pending-cursor-operation'
 import { CollectionsEvent } from './collections-event'
 import { LiveQuery } from './live-query'
 
+import type { QueryObservationHandler } from './pending-cursor-operation'
 import type { SortDirection } from './essentials'
 import type { Store } from './store'
 // -----------------------------------------------------------------------------
@@ -54,7 +55,9 @@ export class PendingCollectionsOperation implements PromiseLike<Collection[]> {
    * function calls to.
    */
   sort(propertyPath: string, direction: SortDirection = 'ascending'): PendingCollectionsOperation {
-    this.pendingCursorOperation.sort(propertyPath, direction)
+    // The return value is ignored here because we don't want to await the
+    // completion of the operation at this point.
+    void this.pendingCursorOperation.sort(propertyPath, direction)
     return this
   }
 
@@ -73,7 +76,9 @@ export class PendingCollectionsOperation implements PromiseLike<Collection[]> {
    * function calls to.
    */
   offset(offset: number): PendingCollectionsOperation {
-    this.pendingCursorOperation.offset(offset)
+    // The return value is ignored here because we don't want to await the
+    // completion of the operation at this point.
+    void this.pendingCursorOperation.offset(offset)
     return this
   }
 
@@ -86,7 +91,9 @@ export class PendingCollectionsOperation implements PromiseLike<Collection[]> {
    * function calls to.
    */
   limit(limit: number): PendingCollectionsOperation {
-    this.pendingCursorOperation.limit(limit)
+    // The return value is ignored here because we don't want to await the
+    // completion of the operation at this point.
+    void this.pendingCursorOperation.limit(limit)
     return this
   }
 
@@ -180,7 +187,7 @@ export class PendingCollectionsOperation implements PromiseLike<Collection[]> {
   /** @internal */
   _observe(handler: CollectionsObservationHandler, waitForNextSignal: boolean): LiveQuery {
     const weakStore = new WeakRef(this.store)
-    const collectionsObservationHandler = function (documents, event, nextSignal) {
+    const collectionsObservationHandler: QueryObservationHandler = function (documents, event, nextSignal) {
       const strongStore = weakStore.deref()
       if (!strongStore) {
         return
@@ -204,10 +211,12 @@ export class PendingCollectionsOperation implements PromiseLike<Collection[]> {
         })
       }
 
+      // The handler return promises are ignored here because we are not
+      // handling errors during handler execution.
       if (waitForNextSignal) {
-        handler(collEvent, nextSignal)
+        void handler(collEvent, nextSignal)
       } else {
-        handler(collEvent)
+        void handler(collEvent)
       }
     }
 

package/react-native/src/sources/pending-cursor-operation.ts

@@ -202,9 +202,9 @@ export class PendingCursorOperation extends BasePendingCursorOperation {
 
   /** @internal */
   _observe(handler: QueryObservationHandler, waitForNextSignal: boolean): LiveQuery {
-    function wrappedHandler(documents, event, nextSignal) {
+    async function wrappedHandler(documents, event, nextSignal) {
       try {
-        return handler.call(this, documents, event)
+        return await handler.call(this, documents, event)
       } finally {
         nextSignal()
       }

package/react-native/src/sources/pending-id-specific-operation.ts

@@ -181,7 +181,7 @@ export class PendingIDSpecificOperation extends BasePendingIDSpecificOperation {
 
   /** @internal */
   _observe(handler: SingleObservationHandler, waitForNextSignal: boolean): LiveQuery {
-    const liveQuery = new LiveQuery(this.query, null, null, [], -1, 0, this.collection as Collection, (documents, event, signalNext) => {
+    const liveQuery = new LiveQuery(this.query, null, null, [], -1, 0, this.collection as Collection, async (documents, event, signalNext) => {
       if (documents.length > 1) {
         throw new Error(`Internal inconsistency, single document live query returned more than one document. Query: ${this.query}}.`)
       }
@@ -202,10 +202,10 @@ export class PendingIDSpecificOperation extends BasePendingIDSpecificOperation {
 
       const singleDocumentEvent = new SingleDocumentLiveQueryEvent(event.isInitial, oldDocument)
       if (waitForNextSignal) {
-        handler(document, singleDocumentEvent, signalNext)
+        void handler(document, singleDocumentEvent, signalNext)
       } else {
         try {
-          handler(document, singleDocumentEvent)
+          await handler(document, singleDocumentEvent)
         } finally {
           signalNext()
         }

package/react-native/src/sources/presence-manager.ts

@@ -52,7 +52,7 @@ export class PresenceManager {
   }
 
   /** @internal */
-  removeObserver(token: PresenceToken) {
+  async removeObserver(token: PresenceToken): Promise<void> {
     const callback = this.callbacksByPresenceToken[token]
 
     if (typeof callback === 'undefined') {
@@ -71,7 +71,7 @@ export class PresenceManager {
       // the observer objects themselves and remove it from the table
       // as soon as the observer object is garbage collected.
       this.callbacksByPresenceToken[token] = null
-      this.unregisterIfNeeded()
+      return this.unregisterIfNeeded()
     }
   }
 
@@ -81,11 +81,10 @@ export class PresenceManager {
   }
 
   /** @internal */
-  close() {
+  async close() {
     this.isClosed = true
-    for (const token in this.callbacksByPresenceToken) {
-      this.removeObserver(token)
-    }
+    const tokens = Object.keys(this.callbacksByPresenceToken)
+    return Promise.all(tokens.map((token) => this.removeObserver(token)))
   }
 
   // ------------------------------------------------------------ Private ------
@@ -113,14 +112,14 @@ export class PresenceManager {
     })
   }
 
-  private unregisterIfNeeded() {
+  private unregisterIfNeeded(): Promise<void> {
     const ditto = this.ditto
     const dittoHandle = Bridge.ditto.handleFor(ditto)
-    ditto.deferClose(() => {
+    return this.ditto.deferCloseAsync(async () => {
       const needsToUnregister = !this.hasObservers() && this.isRegistered
       if (needsToUnregister) {
         this.isRegistered = false
-        FFI.dittoClearPresenceCallback(dittoHandle.deref())
+        await FFI.dittoClearPresenceCallback(dittoHandle.deref())
         this.currentRemotePeers = []
       }
     })

package/react-native/src/sources/presence.ts

@@ -322,11 +322,11 @@ export class Presence {
    * @see {@link peerMetadataJSONString | peerMetadataJSONString()} for details
    * on usage of metadata.
    */
-  async setPeerMetadataJSONString(jsonString: string) {
+  async setPeerMetadataJSONString(jsonString: string): Promise<void> {
     const dittoHandle = Bridge.ditto.handleFor(this.ditto)
-    await this.ditto.deferClose(() => {
+    await this.ditto.deferCloseAsync(async () => {
       return mapFFIErrorsAsync(async () => {
-        await FFI.presenceTrySetPeerMetadataJSON(dittoHandle.deref(), jsonString)
+        return FFI.presenceTrySetPeerMetadataJSON(dittoHandle.deref(), jsonString)
       })
     })
   }
@@ -357,7 +357,7 @@ export class Presence {
    * @see {@link setPeerMetadataJSONString | setPeerMetadataJSONString()} for
    * details.
    */
-  async setPeerMetadata(peerMetadata: Record<string, any>) {
+  async setPeerMetadata(peerMetadata: Record<string, any>): Promise<void> {
     let jsonString: string
     try {
       jsonString = JSON.stringify(peerMetadata)
@@ -405,8 +405,8 @@ export class Presence {
       unregister: () => {
         const ditto = this.ditto
         const dittoHandle = Bridge.ditto.handleFor(ditto)
-        ditto.deferClose(() => {
-          FFI.dittoClearPresenceV3Callback(dittoHandle.deref())
+        void ditto.deferCloseAsync(async () => {
+          return FFI.dittoClearPresenceV3Callback(dittoHandle.deref())
         })
       },
 

package/react-native/src/sources/small-peer-info.ts

@@ -56,8 +56,8 @@ export class SmallPeerInfo {
     }
 
     const dittoHandle = Bridge.ditto.handleFor(this.ditto)
-    this.ditto.deferClose(() => {
-      FFI.dittoSmallPeerInfoSetEnabled(dittoHandle.deref(), newValue)
+    void this.ditto.deferCloseAsync(async () => {
+      return FFI.dittoSmallPeerInfoSetEnabled(dittoHandle.deref(), newValue)
     })
   }
 

package/react-native/src/sources/store-observer.ts

@@ -115,7 +115,7 @@ export class StoreObserver {
 
         Logger.debug(`Invoking user event handler with new event for store observer ${storeObserverID}`)
         observationHandler(result, () => {
-          strongThis.signalNext()
+          return strongThis.signalNext()
         })
       }
 

package/react-native/src/sources/store.ts

@@ -152,9 +152,9 @@ export class Store {
     // the method call that started the observer.
 
     const dittoHandle = Bridge.ditto.handleFor(this.ditto)
-    this.ditto.deferCloseAsync(async () => {
+    void this.ditto.deferCloseAsync(async () => {
       return new Promise<void>((resolve) => {
-        step(async () => {
+        void step(async () => {
           try {
             // prettier-ignore
             await mapFFIErrorsAsync(
@@ -464,6 +464,7 @@ export class Store {
       const attachmentFetcher = new AttachmentFetcher(ditto, attachmentToken, null, eventHandler)
 
       // @ts-expect-error modifying readonly property
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.attachmentFetchers = Object.freeze([...this.attachmentFetchers, attachmentFetcher])
 
       return attachmentFetcher
@@ -590,8 +591,10 @@ export class Store {
     }
 
     const newAttachmentFetchers = [...this.attachmentFetchers]
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     newAttachmentFetchers.splice(indexToDelete, 1)
     // @ts-expect-error modifying readonly property
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.attachmentFetchers = Object.freeze(newAttachmentFetchers)
 
     return true

package/react-native/src/sources/subscription-manager.ts

@@ -36,12 +36,13 @@ export class SubscriptionManager {
   /**
    * Begin tracking a subscription instance and start it.
    *
-   * @internal */
+   * @internal
+   */
   add(subscription: Subscription) {
     const ditto = this.ditto
     const dittoHandle = Bridge.ditto.handleFor(ditto)
     const contextInfo = subscription.contextInfo
-    ditto.deferClose(async () => {
+    ditto.deferClose(() => {
       this.subscriptions[contextInfo.id] = new WeakRef(subscription)
       this.finalizationRegistry.register(subscription, subscription.contextInfo, subscription)
       FFI.addSubscription(dittoHandle.deref(), contextInfo.collectionName, contextInfo.query, contextInfo.queryArgsCBOR, contextInfo.orderBys, contextInfo.limit, contextInfo.offset)
@@ -51,8 +52,9 @@ export class SubscriptionManager {
   /**
    * Stop tracking a subscription instance and cancel it.
    *
-   * @internal */
-  remove(subscription: Subscription) {
+   * @internal
+   */
+  remove(subscription: Subscription): void {
     if (this.subscriptions[subscription.contextInfo.id] == null) {
       throw new Error(`Internal inconsistency, tried to remove a subscription that is not tracked: ${subscription.contextInfo.id}`)
     }
@@ -63,16 +65,13 @@ export class SubscriptionManager {
   /**
    * Stop tracking all subscriptions and cancel them.
    *
-   * @internal */
+   * @internal
+   */
   close() {
-    this.ditto.deferClose(async () => {
+    this.ditto.deferClose(() => {
       for (const subscriptionID in this.subscriptions) {
         const subscription = this.subscriptions[subscriptionID].deref()
-        if (subscription != null) {
-          // This doesn't call `Subscription.cancel()` because that is not
-          // async and we want to wait for all subscriptions to be removed.
-          this.remove(subscription)
-        }
+        subscription?.cancel()
       }
     })
   }
@@ -87,7 +86,8 @@ export class SubscriptionManager {
    * Remove tracked subscription without unregistering from finalization
    * registry.
    *
-   * @internal */
+   * @internal
+   */
   private removeWithContextInfo(contextInfo: SubscriptionContextInfo) {
     const ditto = this.ditto
     const dittoHandle = Bridge.ditto.handleFor(ditto)

package/react-native/src/sources/subscription.ts

@@ -33,14 +33,14 @@ export class Subscription {
   /**
    * The name of the collection that the subscription is based on.
    */
-  get collectionName() {
+  get collectionName(): string {
     return this.collection.name
   }
 
   /**
    * Cancels a subscription and releases all associated resources.
    */
-  cancel() {
+  cancel(): void {
     if (!this.isCancelled) {
       this._isCancelled = true
       this.manager.remove(this)

package/types/ditto.d.ts

@@ -756,17 +756,20 @@ declare class SubscriptionManager {
     /**
      * Begin tracking a subscription instance and start it.
      *
-     * @internal */
+     * @internal
+     */
     add(subscription: Subscription): void;
     /**
      * Stop tracking a subscription instance and cancel it.
      *
-     * @internal */
+     * @internal
+     */
     remove(subscription: Subscription): void;
     /**
      * Stop tracking all subscriptions and cancel them.
      *
-     * @internal */
+     * @internal
+     */
     close(): void;
     private ditto;
     private subscriptions;
@@ -775,7 +778,8 @@ declare class SubscriptionManager {
      * Remove tracked subscription without unregistering from finalization
      * registry.
      *
-     * @internal */
+     * @internal
+     */
     private removeWithContextInfo;
 }