@dittolive/ditto 4.7.0-rc.1 → 4.7.0

package/README.md

@@ -3,10 +3,10 @@
 _Ditto is a cross-platform SDK that allows mobile, web, and IoT apps to sync
 with and even without connectivity._
 
-Version: **4.7.0-rc.1**
+Version: **4.7.0**
 
 For more information please visit [ditto.live](https://ditto.live), as well as the
-[API Reference](https://software.ditto.live/js/Ditto/4.7.0-rc.1/api-reference/) for this particular version.
+[API Reference](https://software.ditto.live/js/Ditto/4.7.0/api-reference/) for this particular version.
 
 ---
 

package/node/ditto.cjs.js

@@ -2218,7 +2218,7 @@ class AttachmentToken {
 
 // NOTE: this is patched up with the actual build version by Jake task
 // build:package and has to be a valid semantic version as defined here: https://semver.org.
-const fullBuildVersionString = '4.7.0-rc.1';
+const fullBuildVersionString = '4.7.0';
 
 //
 // Copyright © 2021 DittoLive Incorporated. All rights reserved.
@@ -5282,10 +5282,12 @@ class ConnectionRequest {
     /**
      * Metadata associated with the remote peer.
      *
-     * This is an empty object if the remote peer has not set any metadata.
+     * This is an empty object if the remote peer has not set any metadata, or
+     * when this request is for a WebSocket connection (which does not currently
+     * support peer metadata).
      *
-     * Set peer metadata for the local peer using {@link Presence.peerMetadata}
-     * or {@link Presence.peerMetadataJSONString}.
+     * Set peer metadata for the local peer using {@link Presence.peerMetadata} or
+     * {@link Presence.peerMetadataJSONString}.
      *
      * This is a convenience property that wraps
      * {@link peerMetadataJSONString | `peerMetadataJSONString()`}.
@@ -5297,7 +5299,8 @@ class ConnectionRequest {
      * JSON-encoded metadata associated with the remote peer.
      *
      * This is a JSON string representing an empty dictionary if the remote peer
-     * has not set any metadata.
+     * has not set any metadata or when this request is for a WebSocket
+     * connection.
      *
      * Set peer metadata for the local peer using {@link Presence.peerMetadata} or
      * {@link Presence.peerMetadataJSONString}.
@@ -7080,13 +7083,9 @@ class StoreObserver {
                     strongThis.signalNext();
                 });
             }
-            const errorContext = {
-                query,
-                queryArguments,
-            };
             mapFFIErrors(() => {
                 storeObserverID = tryExperimentalRegisterChangeObserver(dittoHandle.deref(), query, queryArgumentsCBOR, wrappedObservationHandler);
-            }, undefined, errorContext);
+            });
         });
         if (storeObserverID == null) {
             throw new DittoError('internal', 'Internal inconsistency, store observer ID is undefined after registering');
@@ -7811,9 +7810,8 @@ class Store {
                     throw new DittoError('query/arguments-invalid', `Unable to encode query arguments: ${error.message}`);
                 }
             }
-            const errorContext = { query, queryArguments };
             // prettier-ignore
-            const queryResultPointer = await mapFFIErrorsAsync(async () => await performAsyncToWorkaroundNonAsyncFFIAPI(() => tryExecStatement(dittoHandle.deref(), writeTransaction, query, queryArgumentsCBOR)), undefined, errorContext);
+            const queryResultPointer = await mapFFIErrorsAsync(async () => await performAsyncToWorkaroundNonAsyncFFIAPI(() => tryExecStatement(dittoHandle.deref(), writeTransaction, query, queryArgumentsCBOR)));
             return Bridge.queryResult.bridge(queryResultPointer, () => new QueryResult(queryResultPointer));
         });
     }
@@ -8062,11 +8060,10 @@ class Store {
                 throw new DittoError('query/arguments-invalid', `Invalid query arguments: ${error.message}`);
             }
         }
-        const errorContext = { query, queryArguments };
         const dittoHandle = Bridge.ditto.handleFor(this.ditto);
         // prettier-ignore
         return this.ditto.deferCloseAsync(async () => {
-            const webhookIDCBOR = await mapFFIErrorsAsync(async () => await tryRegisterStoreObserverWebhook(dittoHandle.deref(), query, queryArgumentsCBOR, url), undefined, errorContext);
+            const webhookIDCBOR = await mapFFIErrorsAsync(async () => await tryRegisterStoreObserverWebhook(dittoHandle.deref(), query, queryArgumentsCBOR, url));
             return new DocumentID(webhookIDCBOR, true);
         });
     }
@@ -8260,6 +8257,8 @@ class Presence {
      * and when evaluating connection requests using
      * {@link connectionRequestHandler | connectionRequestHandler()}.
      *
+     * This is not made available to peers only connected via WebSocket.
+     *
      * Uses UTF-8 encoding.
      *
      * @see {@link peerMetadata | peerMetadata()} for a convenience property that
@@ -8795,10 +8794,9 @@ class Sync {
                 throw new DittoError('query/arguments-invalid', `Unable to encode query arguments: ${error.message}`);
             }
         }
-        const errorContext = { query, queryArguments };
         const dittoHandle = Bridge.ditto.handleFor(this.ditto);
         this.ditto.deferClose(() => {
-            mapFFIErrors(() => tryAddSyncSubscription(dittoHandle.deref(), query, queryArgumentsCBOR), undefined, errorContext);
+            mapFFIErrors(() => tryAddSyncSubscription(dittoHandle.deref(), query, queryArgumentsCBOR));
         });
         const subscription = new SyncSubscription(this.ditto, query, queryArguments || null, queryArgumentsCBOR);
         // @ts-expect-error modifying readonly property

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dittolive/ditto",
-  "version": "4.7.0-rc.1",
+  "version": "4.7.0",
   "description": "Ditto is a cross-platform embeddable NoSQL database that can sync with or without an internet connection.",
   "homepage": "https://ditto.live",
   "license": "SEE LICENSE IN LICENSE.md",

package/react-native/android/.project

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>dittolive_ditto</name>
+	<comment>Project dittolive_ditto created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1710834642645</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

package/react-native/android/bin/.project

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>dittolive_ditto</name>
+	<comment>Project dittolive_ditto created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1710834642645</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

package/react-native/android/build/intermediates/cxx/abi_configuration_4i3a4k2a.json

@@ -0,0 +1,14 @@
+{
+  "allAbis": [
+    "armeabi-v7a",
+    "arm64-v8a",
+    "x86",
+    "x86_64"
+  ],
+  "validAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ]
+}

package/react-native/android/build/intermediates/cxx/abi_configuration_4i3a4k2a.log

@@ -0,0 +1 @@
+[]

package/react-native/android/build/intermediates/cxx/abi_configuration_4i3a4k2a_key.json

@@ -0,0 +1,23 @@
+{
+  "ndkHandlerSupportedAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ],
+  "ndkHandlerDefaultAbis": [
+    "ARMEABI_V7A",
+    "ARM64_V8A",
+    "X86",
+    "X86_64"
+  ],
+  "externalNativeBuildAbiFilters": [
+    "x86_64",
+    "x86",
+    "armeabi-v7a",
+    "arm64-v8a"
+  ],
+  "ndkConfigAbiFilters": [],
+  "splitsFilterAbis": [],
+  "ideBuildOnlyTargetAbi": true
+}

package/react-native/android/build/intermediates/cxx/create_cxx_tasks_371_timing.txt

@@ -0,0 +1,5 @@
+# C/C++ build system timings
+create_cxx_tasks
+  create-initial-cxx-model 24ms
+create_cxx_tasks completed in 24ms
+

package/react-native/android/build/intermediates/cxx/ndk_locator_record_4q2c3f1f.json

@@ -0,0 +1,11 @@
+{
+  "ndk": "/Users/teodorc/Library/Android/sdk/ndk/23.1.7779620",
+  "revision": {
+    "mMajor": 23,
+    "mMinor": 1,
+    "mMicro": 7779620,
+    "mPreview": 0,
+    "mPrecision": "MICRO",
+    "mPreviewSeparator": " "
+  }
+}

package/react-native/android/build/intermediates/cxx/ndk_locator_record_4q2c3f1f.log

@@ -0,0 +1,72 @@
+[
+  {
+    "level_": 0,
+    "message_": "android.ndkVersion from module build.gradle is [23.1.7779620]",
+    "file_": "",
+    "tag_": "",
+    "diagnosticCode_": 0,
+    "memoizedIsInitialized": 1,
+    "unknownFields": {
+      "fields": {},
+      "fieldsDescending": {}
+    },
+    "memoizedSize": -1,
+    "memoizedHashCode": -1880541809
+  },
+  {
+    "level_": 0,
+    "message_": "android.ndkPath from module build.gradle is not set",
+    "file_": "",
+    "tag_": "",
+    "diagnosticCode_": 0,
+    "memoizedIsInitialized": 1,
+    "unknownFields": {
+      "fields": {},
+      "fieldsDescending": {}
+    },
+    "memoizedSize": -1,
+    "memoizedHashCode": -71798567
+  },
+  {
+    "level_": 0,
+    "message_": "ndk.dir in local.properties is not set",
+    "file_": "",
+    "tag_": "",
+    "diagnosticCode_": 0,
+    "memoizedIsInitialized": 1,
+    "unknownFields": {
+      "fields": {},
+      "fieldsDescending": {}
+    },
+    "memoizedSize": -1,
+    "memoizedHashCode": 632662626
+  },
+  {
+    "level_": 0,
+    "message_": "Not considering ANDROID_NDK_HOME because support was removed after deprecation period.",
+    "file_": "",
+    "tag_": "",
+    "diagnosticCode_": 0,
+    "memoizedIsInitialized": 1,
+    "unknownFields": {
+      "fields": {},
+      "fieldsDescending": {}
+    },
+    "memoizedSize": -1,
+    "memoizedHashCode": -1799490600
+  },
+  {
+    "level_": 0,
+    "message_": "sdkFolder is /Users/teodorc/Library/Android/sdk",
+    "file_": "",
+    "tag_": "",
+    "diagnosticCode_": 0,
+    "memoizedIsInitialized": 1,
+    "unknownFields": {
+      "fields": {},
+      "fieldsDescending": {}
+    },
+    "memoizedSize": -1,
+    "memoizedHashCode": 761152749
+  }
+]

package/react-native/android/build/intermediates/cxx/ndk_locator_record_4q2c3f1f_key.json

@@ -0,0 +1,10 @@
+{
+  "ndkVersionFromDsl": "23.1.7779620",
+  "sdkFolder": "/Users/teodorc/Library/Android/sdk",
+  "sideBySideNdkFolderNames": [
+    "21.4.7075529",
+    "22.0.7026061",
+    "25.1.8937393",
+    "23.1.7779620"
+  ]
+}

package/react-native/android/build.gradle

@@ -150,7 +150,7 @@ repositories {
 
 // This can be moved to gradle.properties (minus the quotes) with no code changes
 // here since `version` is a default project property.
-version = "4.7.0-rc.1"
+version = "4.7.0"
 
 dependencies {
   // For < 0.71, this will be from the local maven repo

package/react-native/cpp/include/ConnectionRequest.h

@@ -9,7 +9,7 @@ namespace sharedjsi
 {
 Function dittoffi_connection_request_peer_key_string(Runtime &runtime);
 Function dittoffi_connection_request_peer_metadata_json(Runtime &runtime);
-Function dittoffi_connection_request_identity_service_json(Runtime &runtime);
+Function dittoffi_connection_request_identity_service_metadata_json(Runtime &runtime);
 Function dittoffi_connection_request_authorize(Runtime &runtime);
 Function dittoffi_connection_request_connection_type(Runtime &runtime);
 Function dittoffi_connection_request_free(Runtime &runtime);

package/react-native/cpp/src/ConnectionRequest.cpp

@@ -40,7 +40,7 @@ Function dittoffi_connection_request_peer_metadata_json(Runtime &runtime)
   });
 }
 
-Function dittoffi_connection_request_identity_service_json(Runtime &runtime)
+Function dittoffi_connection_request_identity_service_metadata_json(Runtime &runtime)
 {
   return Function::createFromHostFunction(runtime,
                                           PropNameID::forAscii(runtime,

package/react-native/cpp/src/main.cpp

@@ -148,7 +148,7 @@ namespace sharedjsi
     // Connection Request
     REGISTER_JS_FUNCTION(dittoffi_connection_request_peer_key_string);
     REGISTER_JS_FUNCTION(dittoffi_connection_request_peer_metadata_json);
-    REGISTER_JS_FUNCTION(dittoffi_connection_request_identity_service_json);
+    REGISTER_JS_FUNCTION(dittoffi_connection_request_identity_service_metadata_json);
     REGISTER_JS_FUNCTION(dittoffi_connection_request_authorize);
     REGISTER_JS_FUNCTION(dittoffi_connection_request_free);
     REGISTER_JS_FUNCTION(dittoffi_connection_request_connection_type);

package/react-native/src/sources/connection-request.ts

@@ -52,10 +52,12 @@ export class ConnectionRequest {
   /**
    * Metadata associated with the remote peer.
    *
-   * This is an empty object if the remote peer has not set any metadata.
+   * This is an empty object if the remote peer has not set any metadata, or
+   * when this request is for a WebSocket connection (which does not currently
+   * support peer metadata).
    *
-   * Set peer metadata for the local peer using {@link Presence.peerMetadata}
-   * or {@link Presence.peerMetadataJSONString}.
+   * Set peer metadata for the local peer using {@link Presence.peerMetadata} or
+   * {@link Presence.peerMetadataJSONString}.
    *
    * This is a convenience property that wraps
    * {@link peerMetadataJSONString | `peerMetadataJSONString()`}.
@@ -68,7 +70,8 @@ export class ConnectionRequest {
    * JSON-encoded metadata associated with the remote peer.
    *
    * This is a JSON string representing an empty dictionary if the remote peer
-   * has not set any metadata.
+   * has not set any metadata or when this request is for a WebSocket
+   * connection.
    *
    * Set peer metadata for the local peer using {@link Presence.peerMetadata} or
    * {@link Presence.peerMetadataJSONString}.

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

@@ -119,6 +119,9 @@ export type Peer = {
    * Use `ditto.presence.setPeerMetadata()` or
    * `ditto.presence.setPeerMetadataJSONData()` to set this value.
    *
+   * This will be empty when a peer is only connected via a WebSocket
+   * connection.
+   *
    * @see {@link Presence.peerMetadata | `ditto.presence.peerMetadata`} for
    * details on usage of metadata.
    */
@@ -284,6 +287,8 @@ export class Presence {
    * and when evaluating connection requests using
    * {@link connectionRequestHandler | connectionRequestHandler()}.
    *
+   * This is not made available to peers only connected via WebSocket.
+   *
    * Uses UTF-8 encoding.
    *
    * @see {@link peerMetadata | peerMetadata()} for a convenience property that
@@ -375,11 +380,6 @@ export class Presence {
     const observerToken = this.observerManager.addObserver(didChangeHandler)
     const observer = new Observer(this.observerManager, observerToken, { stopsWhenFinalized: true })
 
-    // REFACTOR: make the initial callback call async, too (othewise we'd be
-    // mixing sync with async, which is a bit problematic in general but might
-    // be OK with single-threaded JS). This is a bit tricky, simply
-    // setTimeout(..., 0) here could lead us to a situation where the initial
-    // call would be sent AFTER the regular notification.
     didChangeHandler(this.graph)
 
     return observer

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

@@ -119,18 +119,9 @@ export class StoreObserver {
         })
       }
 
-      const errorContext = {
-        query,
-        queryArguments,
-      }
-
-      mapFFIErrors(
-        () => {
-          storeObserverID = FFI.tryExperimentalRegisterChangeObserver(dittoHandle.deref(), query, queryArgumentsCBOR, wrappedObservationHandler)
-        },
-        undefined,
-        errorContext,
-      )
+      mapFFIErrors(() => {
+        storeObserverID = FFI.tryExperimentalRegisterChangeObserver(dittoHandle.deref(), query, queryArgumentsCBOR, wrappedObservationHandler)
+      })
     })
 
     if (storeObserverID == null) {

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

@@ -246,15 +246,11 @@ export class Store {
         }
       }
 
-      const errorContext = { query, queryArguments }
-
       // prettier-ignore
       const queryResultPointer: FFI.Pointer<FFI.FFIQueryResult> = await mapFFIErrorsAsync(
         async () => await performAsyncToWorkaroundNonAsyncFFIAPI(
           () => FFI.tryExecStatement(dittoHandle.deref(), writeTransaction, query, queryArgumentsCBOR)
-        ),
-        undefined,
-        errorContext
+        )
       )
 
       return Bridge.queryResult.bridge(queryResultPointer, () => new QueryResult(queryResultPointer))
@@ -508,15 +504,11 @@ export class Store {
       }
     }
 
-    const errorContext = { query, queryArguments }
-
     const dittoHandle = Bridge.ditto.handleFor(this.ditto)
     // prettier-ignore
     return this.ditto.deferCloseAsync(async () => {
       const webhookIDCBOR = await mapFFIErrorsAsync(
         async () => await FFI.tryRegisterStoreObserverWebhook(dittoHandle.deref(), query, queryArgumentsCBOR, url),
-        undefined,
-        errorContext
       )
       return new DocumentID(webhookIDCBOR, true)
     })

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

@@ -95,10 +95,9 @@ export class Sync {
       }
     }
 
-    const errorContext = { query, queryArguments }
     const dittoHandle = Bridge.ditto.handleFor(this.ditto)
     this.ditto.deferClose(() => {
-      mapFFIErrors(() => FFI.tryAddSyncSubscription(dittoHandle.deref(), query, queryArgumentsCBOR), undefined, errorContext)
+      mapFFIErrors(() => FFI.tryAddSyncSubscription(dittoHandle.deref(), query, queryArgumentsCBOR))
     })
 
     const subscription = new SyncSubscription(this.ditto, query, queryArguments || null, queryArgumentsCBOR)

package/types/ditto.d.ts

@@ -2853,10 +2853,12 @@ declare class ConnectionRequest {
     /**
      * Metadata associated with the remote peer.
      *
-     * This is an empty object if the remote peer has not set any metadata.
+     * This is an empty object if the remote peer has not set any metadata, or
+     * when this request is for a WebSocket connection (which does not currently
+     * support peer metadata).
      *
-     * Set peer metadata for the local peer using {@link Presence.peerMetadata}
-     * or {@link Presence.peerMetadataJSONString}.
+     * Set peer metadata for the local peer using {@link Presence.peerMetadata} or
+     * {@link Presence.peerMetadataJSONString}.
      *
      * This is a convenience property that wraps
      * {@link peerMetadataJSONString | `peerMetadataJSONString()`}.
@@ -2866,7 +2868,8 @@ declare class ConnectionRequest {
      * JSON-encoded metadata associated with the remote peer.
      *
      * This is a JSON string representing an empty dictionary if the remote peer
-     * has not set any metadata.
+     * has not set any metadata or when this request is for a WebSocket
+     * connection.
      *
      * Set peer metadata for the local peer using {@link Presence.peerMetadata} or
      * {@link Presence.peerMetadataJSONString}.
@@ -2986,6 +2989,9 @@ type Peer = {
      * Use `ditto.presence.setPeerMetadata()` or
      * `ditto.presence.setPeerMetadataJSONData()` to set this value.
      *
+     * This will be empty when a peer is only connected via a WebSocket
+     * connection.
+     *
      * @see {@link Presence.peerMetadata | `ditto.presence.peerMetadata`} for
      * details on usage of metadata.
      */
@@ -3091,6 +3097,8 @@ declare class Presence {
      * and when evaluating connection requests using
      * {@link connectionRequestHandler | connectionRequestHandler()}.
      *
+     * This is not made available to peers only connected via WebSocket.
+     *
      * Uses UTF-8 encoding.
      *
      * @see {@link peerMetadata | peerMetadata()} for a convenience property that