Merge branch 'main' into capacitor-ios-stream

Author: stevensJourney

.changeset/cuddly-bobcats-hang.md

@@ -0,0 +1,5 @@
+---
+'@powersync/common': patch
+---
+
+Fix warnings about leaked subscriptions even though `unsubscribe()` was called.

.changeset/hungry-cycles-clean.md

@@ -0,0 +1,5 @@
+---
+'@powersync/common': patch
+---
+
+Make `js-logger` a regular dependency to avoid type issues.

.changeset/strange-items-fly.md

@@ -0,0 +1,10 @@
+---
+'@powersync/react-native': minor
+'@powersync/common': minor
+'@powersync/web': minor
+'@powersync/diagnostics-app': patch
+'@powersync/node': patch
+'@powersync/nuxt': patch
+---
+
+Remove support for the JavaScript sync client. The default Rust client is the only option starting from this version.

packages/common/legacy/sync_protocol.d.ts

@@ -0,0 +1,103 @@
+// TypeScript definitions for sync lines sent by the PowerSync service. These aren't used in the implementation of
+// PowerSync SDKs, but we keep them around for:
+//
+//  1. Tests mocking the PowerSync service.
+//  2. The diagnostic app tracking schema updates and bucket sizes by decoding protocol messages.
+//  3. The nuxt SDK offering DevTools doing the same.
+//
+// Uses 2 and 3 should be replaced with the builtin diagnostic collection of the core extension eventually.
+
+export type SyncDataBucketJSON = {
+  bucket: string;
+  has_more?: boolean;
+  after?: string;
+  next_after?: string;
+  data: OplogEntryJSON[];
+};
+export interface OplogEntryJSON {
+  checksum: number;
+  data?: string;
+  object_id?: string;
+  object_type?: string;
+  op_id: string;
+  op: OpTypeJSON;
+  subkey?: string;
+}
+export type OpTypeJSON = 'CLEAR' | 'MOVE' | 'PUT' | 'REMOVE';
+
+/**
+ * 64-bit unsigned integer stored as a string in base-10.
+ *
+ * Not sortable as a string.
+ */
+export type OpId = string;
+
+export interface BucketChecksum {
+  bucket: string;
+  priority?: number;
+  /**
+   * 32-bit unsigned hash.
+   */
+  checksum: number;
+
+  /**
+   * Count of operations - informational only.
+   */
+  count?: number;
+  /**
+   * The JavaScript client does not use this field, which is why it's defined to be `any`. We rely on the structure of
+   * this interface to pass custom `BucketChecksum`s to the Rust client in unit tests, which so all fields need to be
+   * present.
+   */
+  subscriptions?: any;
+}
+
+export interface Checkpoint {
+  last_op_id: OpId;
+  buckets: BucketChecksum[];
+  write_checkpoint?: string;
+  streams?: any[];
+}
+
+export interface StreamingSyncCheckpoint {
+  checkpoint: Checkpoint;
+}
+
+export interface StreamingSyncCheckpointDiff {
+  checkpoint_diff: {
+    last_op_id: OpId;
+    updated_buckets: BucketChecksum[];
+    removed_buckets: string[];
+    write_checkpoint?: string;
+  };
+}
+
+export interface StreamingSyncDataJSON {
+  data: SyncDataBucketJSON;
+}
+
+export interface StreamingSyncCheckpointComplete {
+  checkpoint_complete: {
+    last_op_id: OpId;
+  };
+}
+
+export interface StreamingSyncCheckpointPartiallyComplete {
+  partial_checkpoint_complete: {
+    priority: number;
+    last_op_id: OpId;
+  };
+}
+
+export interface StreamingSyncKeepalive {
+  /** If specified, token expires in this many seconds. */
+  token_expires_in: number;
+}
+
+export type StreamingSyncLine =
+  | StreamingSyncDataJSON
+  | StreamingSyncCheckpoint
+  | StreamingSyncCheckpointDiff
+  | StreamingSyncCheckpointComplete
+  | StreamingSyncCheckpointPartiallyComplete
+  | StreamingSyncKeepalive;

packages/common/package.json

@@ -30,14 +30,18 @@
         "types": "./dist/index.d.cts",
         "require": "./dist/bundle.cjs"
       }
+    },
+    "./internal/sync_protocol": {
+      "types": "./legacy/sync_protocol.d.ts"
     }
   },
   "author": "PowerSync",
   "license": "Apache-2.0",
   "files": [
     "lib",
     "dist",
-    "src"
+    "src",
+    "legacy"
   ],
   "repository": {
     "type": "git",
@@ -52,10 +56,11 @@
     "build:prod": "tsc -b && rollup -c rollup.config.mjs",
     "clean": "rm -rf lib dist tsconfig.tsbuildinfo",
     "test": "vitest",
-    "test:exports": "attw --pack ."
+    "test:exports": "attw --pack . --exclude-entrypoints internal/sync_protocol"
   },
   "dependencies": {
-    "event-iterator": "^2.0.0"
+    "event-iterator": "^2.0.0",
+    "js-logger": "catalog:"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "catalog:",
@@ -64,11 +69,9 @@
     "@rollup/plugin-node-resolve": "catalog:",
     "@types/node": "catalog:",
     "@types/uuid": "catalog:",
-    "bson": "catalog:",
     "buffer": "^6.0.3",
     "cross-fetch": "^4.1.0",
     "estree-walker": "^3.0.3",
-    "js-logger": "catalog:",
     "magic-string": "^0.30.21",
     "rollup": "catalog:",
     "rollup-plugin-dts": "catalog:",

packages/common/rollup.config.mjs

@@ -37,7 +37,7 @@ function defineBuild(isNode) {
       }
     ],
     plugins,
-    external: ['bson', isNode ? 'event-iterator' : undefined]
+    external: [isNode ? 'event-iterator' : undefined]
   };
 }
 

packages/common/src/client/ConnectionManager.ts

@@ -368,7 +368,7 @@ class SyncStreamSubscriptionHandle implements SyncStreamSubscription {
 
   constructor(readonly subscription: ActiveSubscription) {
     subscription.refcount++;
-    _finalizer?.register(this, subscription);
+    _finalizer?.register(this, subscription, this);
   }
 
   get name() {

packages/common/src/client/sync/bucket/BucketStorageAdapter.ts

@@ -1,62 +1,6 @@
 import { BaseListener, BaseObserverInterface, Disposable } from '../../../utils/BaseObserver.js';
 import { CrudBatch } from './CrudBatch.js';
-import { CrudEntry, OpId } from './CrudEntry.js';
-import { SyncDataBatch } from './SyncDataBatch.js';
-
-export interface BucketDescription {
-  name: string;
-  priority: number;
-}
-
-export interface Checkpoint {
-  last_op_id: OpId;
-  buckets: BucketChecksum[];
-  write_checkpoint?: string;
-  streams?: any[];
-}
-
-export interface BucketState {
-  bucket: string;
-  op_id: string;
-}
-
-export interface ChecksumCache {
-  checksums: Map<string, { checksum: BucketChecksum; last_op_id: OpId }>;
-  lastOpId: OpId;
-}
-
-export interface SyncLocalDatabaseResult {
-  ready: boolean;
-  checkpointValid: boolean;
-  checkpointFailures?: string[];
-}
-
-export type SavedProgress = {
-  atLast: number;
-  sinceLast: number;
-};
-
-export type BucketOperationProgress = Record<string, SavedProgress>;
-
-export interface BucketChecksum {
-  bucket: string;
-  priority?: number;
-  /**
-   * 32-bit unsigned hash.
-   */
-  checksum: number;
-
-  /**
-   * Count of operations - informational only.
-   */
-  count?: number;
-  /**
-   * The JavaScript client does not use this field, which is why it's defined to be `any`. We rely on the structure of
-   * this interface to pass custom `BucketChecksum`s to the Rust client in unit tests, which so all fields need to be
-   * present.
-   */
-  subscriptions?: any;
-}
+import { CrudEntry } from './CrudEntry.js';
 
 export enum PSInternalTable {
   DATA = 'ps_data',
@@ -82,27 +26,14 @@ export interface BucketStorageListener extends BaseListener {
 
 export interface BucketStorageAdapter extends BaseObserverInterface<BucketStorageListener>, Disposable {
   init(): Promise<void>;
-  saveSyncData(batch: SyncDataBatch, fixedKeyFormat?: boolean): Promise<void>;
-  removeBuckets(buckets: string[]): Promise<void>;
-  setTargetCheckpoint(checkpoint: Checkpoint): Promise<void>;
 
-  startSession(): void;
-
-  getBucketStates(): Promise<BucketState[]>;
-  getBucketOperationProgress(): Promise<BucketOperationProgress>;
   hasMigratedSubkeys(): Promise<boolean>;
   migrateToFixedSubkeys(): Promise<void>;
 
-  syncLocalDatabase(
-    checkpoint: Checkpoint,
-    priority?: number
-  ): Promise<{ checkpointValid: boolean; ready: boolean; failures?: any[] }>;
-
   nextCrudItem(): Promise<CrudEntry | undefined>;
   hasCrud(): Promise<boolean>;
   getCrudBatch(limit?: number): Promise<CrudBatch | null>;
 
-  hasCompletedSync(): Promise<boolean>;
   updateLocalTarget(cb: () => Promise<string>): Promise<boolean>;
   getMaxOpId(): string;