@powersync/service-core 0.0.0-dev-20240718134716 → 0.0.0-dev-20240918082156

package/dist/util/config/sync-rules/sync-rules-provider.d.ts

@@ -0,0 +1,9 @@
+import { SyncRulesConfig } from '../types.js';
+export interface SyncRulesProvider {
+    get(): Promise<string | undefined>;
+}
+export declare class ConfigurationFileSyncRulesProvider implements SyncRulesProvider {
+    private config;
+    constructor(config: SyncRulesConfig);
+    get(): Promise<string | undefined>;
+}

package/dist/util/config/sync-rules/sync-rules-provider.js

@@ -0,0 +1,15 @@
+import fs from 'fs/promises';
+export class ConfigurationFileSyncRulesProvider {
+    constructor(config) {
+        this.config = config;
+    }
+    async get() {
+        if (this.config.content) {
+            return this.config.content;
+        }
+        else if (this.config.path) {
+            return await fs.readFile(this.config.path, 'utf-8');
+        }
+    }
+}
+//# sourceMappingURL=sync-rules-provider.js.map

package/dist/util/config/sync-rules/sync-rules-provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-rules-provider.js","sourceRoot":"","sources":["../../../../src/util/config/sync-rules/sync-rules-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,aAAa,CAAC;AAM7B,MAAM,OAAO,kCAAkC;IAC7C,YAAoB,MAAuB;QAAvB,WAAM,GAAN,MAAM,CAAiB;IAAG,CAAC;IAE/C,KAAK,CAAC,GAAG;QACP,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACvB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;SAC5B;aAAM,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;YAC3B,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACrD;IACH,CAAC;CACF"}

package/dist/util/config/types.d.ts

@@ -1,4 +1,6 @@
-import { NormalizedPostgresConnection, configFile } from '@powersync/service-types';
+import { configFile } from '@powersync/service-types';
+import { PowerSyncConfig } from '@powersync/service-types/src/config/PowerSyncConfig.js';
+import { CompoundKeyCollector } from '../../auth/CompoundKeyCollector.js';
 import { KeySpec } from '../../auth/KeySpec.js';
 import { KeyStore } from '../../auth/KeyStore.js';
 export declare enum ServiceRunner {
@@ -15,14 +17,14 @@ export type MigrationContext = {
     runner_config: RunnerConfig;
 };
 export type Runner = (config: RunnerConfig) => Promise<void>;
-export type ResolvedConnection = configFile.PostgresConnection & NormalizedPostgresConnection;
 export type SyncRulesConfig = {
     present: boolean;
     content?: string;
     path?: string;
 };
 export type ResolvedPowerSyncConfig = {
-    connection?: ResolvedConnection;
+    base_config: PowerSyncConfig;
+    connections?: configFile.DataSourceConfig[];
     storage: configFile.StorageConfig;
     dev: {
         demo_auth: boolean;
@@ -34,7 +36,7 @@ export type ResolvedPowerSyncConfig = {
          */
         dev_key?: KeySpec;
     };
-    client_keystore: KeyStore;
+    client_keystore: KeyStore<CompoundKeyCollector>;
     /**
      * Keystore for development tokens.
      */

package/dist/util/config/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/util/config/types.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,4BAAW,CAAA;IACX,8BAAa,CAAA;AACf,CAAC,EAJW,aAAa,KAAb,aAAa,QAIxB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/util/config/types.ts"],"names":[],"mappings":"AAMA,MAAM,CAAN,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,4BAAW,CAAA;IACX,8BAAa,CAAA;AACf,CAAC,EAJW,aAAa,KAAb,aAAa,QAIxB"}

package/dist/util/config.d.ts

@@ -1,7 +1,6 @@
-import { ResolvedConnection, ResolvedPowerSyncConfig, RunnerConfig } from './config/types.js';
+import { ResolvedPowerSyncConfig, RunnerConfig } from './config/types.js';
 /**
- * Build a single URI from full postgres credentials.
+ * Loads the resolved config using the registered config collector
  */
-export declare function buildDemoPgUri(options: ResolvedConnection): string;
-export declare function loadConfig(runnerConfig?: RunnerConfig): Promise<ResolvedPowerSyncConfig>;
+export declare function loadConfig(runnerConfig: RunnerConfig): Promise<ResolvedPowerSyncConfig>;
 export declare function loadSyncRules(config: ResolvedPowerSyncConfig): Promise<string | undefined>;

package/dist/util/config.js

@@ -1,26 +1,11 @@
 import * as fs from 'fs/promises';
-import { baseUri } from '@powersync/service-types';
-import { CompoundConfigCollector } from './config/compound-config-collector.js';
+import { container } from '@powersync/lib-services-framework';
+import { CompoundConfigCollector } from './util-index.js';
 /**
- * Build a single URI from full postgres credentials.
+ * Loads the resolved config using the registered config collector
  */
-export function buildDemoPgUri(options) {
-    if (!options.debug_api) {
-        throw new Error('Not supported');
-    }
-    const uri = new URL(baseUri(options));
-    uri.username = options.username;
-    uri.password = options.password;
-    if (options.sslmode != 'disable') {
-        // verify-full is tricky to actually use on a client, since they won't have the cert
-        // Just use "require" by default
-        // uri.searchParams.set('sslmode', options.sslmode);
-        uri.searchParams.set('sslmode', 'require');
-    }
-    return uri.toString();
-}
-export function loadConfig(runnerConfig = {}) {
-    const collector = new CompoundConfigCollector();
+export async function loadConfig(runnerConfig) {
+    const collector = container.getImplementation(CompoundConfigCollector);
     return collector.collectConfig(runnerConfig);
 }
 export async function loadSyncRules(config) {

package/dist/util/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/util/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAGnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAEhF;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,OAA2B;IACxD,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;IAED,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACtC,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAChC,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAChC,IAAI,OAAO,CAAC,OAAO,IAAI,SAAS,EAAE;QAChC,oFAAoF;QACpF,gCAAgC;QAChC,oDAAoD;QACpD,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;KAC5C;IACD,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,eAA6B,EAAE;IACxD,MAAM,SAAS,GAAG,IAAI,uBAAuB,EAAE,CAAC;IAChD,OAAO,SAAS,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAA+B;IACjE,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACrC,IAAI,UAAU,CAAC,OAAO,EAAE;QACtB,OAAO,UAAU,CAAC,OAAO,CAAC;KAC3B;SAAM,IAAI,UAAU,CAAC,IAAI,EAAE;QAC1B,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACpD;AACH,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/util/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE1D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,YAA0B;IACzD,MAAM,SAAS,GAAG,SAAS,CAAC,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;IACvE,OAAO,SAAS,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAA+B;IACjE,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACrC,IAAI,UAAU,CAAC,OAAO,EAAE;QACtB,OAAO,UAAU,CAAC,OAAO,CAAC;KAC3B;SAAM,IAAI,UAAU,CAAC,IAAI,EAAE;QAC1B,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACpD;AACH,CAAC"}

package/dist/util/protocol-types.d.ts

@@ -80,6 +80,10 @@ export declare const StreamingSyncRequest: t.ObjectCodec<{
      * Client parameters to be passed to the sync rules.
      */
     parameters: t.OptionalCodec<t.Codec<Record<string, any>, Record<string, any>, string, t.CodecProps>>;
+    /**
+     * Unique client id.
+     */
+    client_id: t.OptionalCodec<t.Codec<string, string, string, t.CodecProps>>;
 }>;
 export type StreamingSyncRequest = t.Decoded<typeof StreamingSyncRequest>;
 export interface StreamingSyncCheckpoint {

package/dist/util/protocol-types.js

@@ -30,7 +30,11 @@ export const StreamingSyncRequest = t.object({
     /**
      * Client parameters to be passed to the sync rules.
      */
-    parameters: t.record(t.any).optional()
+    parameters: t.record(t.any).optional(),
+    /**
+     * Unique client id.
+     */
+    client_id: t.string.optional()
 });
 export function isContinueCheckpointRequest(request) {
     return (Array.isArray(request.buckets) &&

package/dist/util/protocol-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"protocol-types.js","sourceRoot":"","sources":["../../src/util/protocol-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAwD9B,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,IAAI,EAAE,CAAC,CAAC,MAAM;IAEd;;OAEG;IACH,KAAK,EAAE,CAAC,CAAC,MAAM;CAChB,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C;;OAEG;IACH,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;IAE1C;;OAEG;IACH,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;IAElC;;OAEG;IACH,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE;IAEtC;;OAEG;IACH,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE;IAE9B;;OAEG;IACH,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE;IAEjC;;OAEG;IACH,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;CACvC,CAAC,CAAC;AAgGH,MAAM,UAAU,2BAA2B,CAAC,OAAoB;IAC9D,OAAO,CACL,KAAK,CAAC,OAAO,CAAE,OAAqC,CAAC,OAAO,CAAC;QAC7D,OAAQ,OAAqC,CAAC,gBAAgB,IAAI,QAAQ,CAC3E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,OAAoB;IAC7D,OAAO,OAAQ,OAAoC,CAAC,kBAAkB,IAAI,QAAQ,CAAC;AACrF,CAAC"}
+{"version":3,"file":"protocol-types.js","sourceRoot":"","sources":["../../src/util/protocol-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAwD9B,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,IAAI,EAAE,CAAC,CAAC,MAAM;IAEd;;OAEG;IACH,KAAK,EAAE,CAAC,CAAC,MAAM;CAChB,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C;;OAEG;IACH,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE;IAE1C;;OAEG;IACH,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;IAElC;;OAEG;IACH,gBAAgB,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE;IAEtC;;OAEG;IACH,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE;IAE9B;;OAEG;IACH,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE;IAEjC;;OAEG;IACH,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE;IAEtC;;OAEG;IACH,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAC;AAgGH,MAAM,UAAU,2BAA2B,CAAC,OAAoB;IAC9D,OAAO,CACL,KAAK,CAAC,OAAO,CAAE,OAAqC,CAAC,OAAO,CAAC;QAC7D,OAAQ,OAAqC,CAAC,gBAAgB,IAAI,QAAQ,CAC3E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,OAAoB;IAC7D,OAAO,OAAQ,OAAoC,CAAC,kBAAkB,IAAI,QAAQ,CAAC;AACrF,CAAC"}

package/dist/util/util-index.d.ts

@@ -1,22 +1,19 @@
 export * from './alerting.js';
 export * from './env.js';
 export * from './memory-tracking.js';
-export * from './migration_lib.js';
 export * from './Mutex.js';
-export * from './PgManager.js';
-export * from './pgwire_utils.js';
-export * from './populate_test_data.js';
 export * from './protocol-types.js';
 export * from './secs.js';
 export * from './utils.js';
 export * from './config.js';
-export * from './config/types.js';
 export * from './config/compound-config-collector.js';
+export * from './config/types.js';
 export * from './config/collectors/config-collector.js';
 export * from './config/collectors/impl/base64-config-collector.js';
 export * from './config/collectors/impl/fallback-config-collector.js';
 export * from './config/collectors/impl/filesystem-config-collector.js';
-export * from './config/sync-rules/sync-collector.js';
 export * from './config/sync-rules/impl/base64-sync-rules-collector.js';
 export * from './config/sync-rules/impl/filesystem-sync-rules-collector.js';
 export * from './config/sync-rules/impl/inline-sync-rules-collector.js';
+export * from './config/sync-rules/sync-collector.js';
+export * from './config/sync-rules/sync-rules-provider.js';

package/dist/util/util-index.js

@@ -1,23 +1,20 @@
 export * from './alerting.js';
 export * from './env.js';
 export * from './memory-tracking.js';
-export * from './migration_lib.js';
 export * from './Mutex.js';
-export * from './PgManager.js';
-export * from './pgwire_utils.js';
-export * from './populate_test_data.js';
 export * from './protocol-types.js';
 export * from './secs.js';
 export * from './utils.js';
 export * from './config.js';
-export * from './config/types.js';
 export * from './config/compound-config-collector.js';
+export * from './config/types.js';
 export * from './config/collectors/config-collector.js';
 export * from './config/collectors/impl/base64-config-collector.js';
 export * from './config/collectors/impl/fallback-config-collector.js';
 export * from './config/collectors/impl/filesystem-config-collector.js';
-export * from './config/sync-rules/sync-collector.js';
 export * from './config/sync-rules/impl/base64-sync-rules-collector.js';
 export * from './config/sync-rules/impl/filesystem-sync-rules-collector.js';
 export * from './config/sync-rules/impl/inline-sync-rules-collector.js';
+export * from './config/sync-rules/sync-collector.js';
+export * from './config/sync-rules/sync-rules-provider.js';
 //# sourceMappingURL=util-index.js.map

package/dist/util/util-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"util-index.js","sourceRoot":"","sources":["../../src/util/util-index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAE3B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,uCAAuC,CAAC;AAEtD,cAAc,yCAAyC,CAAC;AACxD,cAAc,qDAAqD,CAAC;AACpE,cAAc,uDAAuD,CAAC;AACtE,cAAc,yDAAyD,CAAC;AAExE,cAAc,uCAAuC,CAAC;AACtD,cAAc,yDAAyD,CAAC;AACxE,cAAc,6DAA6D,CAAC;AAC5E,cAAc,yDAAyD,CAAC"}
+{"version":3,"file":"util-index.js","sourceRoot":"","sources":["../../src/util/util-index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAE3B,cAAc,aAAa,CAAC;AAC5B,cAAc,uCAAuC,CAAC;AACtD,cAAc,mBAAmB,CAAC;AAElC,cAAc,yCAAyC,CAAC;AACxD,cAAc,qDAAqD,CAAC;AACpE,cAAc,uDAAuD,CAAC;AACtE,cAAc,yDAAyD,CAAC;AAExE,cAAc,yDAAyD,CAAC;AACxE,cAAc,6DAA6D,CAAC;AAC5E,cAAc,yDAAyD,CAAC;AACxE,cAAc,uCAAuC,CAAC;AACtD,cAAc,4CAA4C,CAAC"}

package/dist/util/utils.d.ts

@@ -1,7 +1,10 @@
-import * as pgwire from '@powersync/service-jpgwire';
-import * as storage from '../storage/storage-index.js';
+import * as sync_rules from '@powersync/service-sync-rules';
+import * as bson from 'bson';
 import { BucketChecksum, OpId } from './protocol-types.js';
+import * as storage from '../storage/storage-index.js';
 export type ChecksumMap = Map<string, BucketChecksum>;
+export declare const ID_NAMESPACE = "a396dd91-09fc-4017-a28d-3df722f651e9";
+export declare function escapeIdentifier(identifier: string): string;
 export declare function hashData(type: string, id: string, data: string): number;
 export declare function hashDelete(sourceKey: string): number;
 export declare function timestampToOpId(ts: bigint): OpId;
@@ -11,7 +14,8 @@ export declare function checksumsDiff(previous: ChecksumMap, current: ChecksumMa
 };
 export declare function addChecksums(a: number, b: number): number;
 export declare function addBucketChecksums(a: BucketChecksum, b: BucketChecksum | null): BucketChecksum;
-export declare function getClientCheckpoint(db: pgwire.PgClient, bucketStorage: storage.BucketStorageFactory, options?: {
-    timeout?: number;
-}): Promise<OpId>;
-export declare function createWriteCheckpoint(db: pgwire.PgClient, bucketStorage: storage.BucketStorageFactory, user_id: string): Promise<bigint>;
+export declare function getUuidReplicaIdentityBson(tuple: sync_rules.ToastableSqliteRow, columns: storage.ColumnDescriptor[]): bson.UUID;
+export declare function uuidForRowBson(row: sync_rules.SqliteRow): bson.UUID;
+export declare function hasToastedValues(row: sync_rules.ToastableSqliteRow): boolean;
+export declare function isCompleteRow(row: sync_rules.ToastableSqliteRow): row is sync_rules.SqliteRow;
+export declare function checkpointUserId(user_id: string | undefined, client_id: string | undefined): string;

package/dist/util/utils.js

@@ -1,7 +1,10 @@
+import * as bson from 'bson';
 import crypto from 'crypto';
-import { pgwireRows } from '@powersync/service-jpgwire';
-import { retriedQuery } from './pgwire_utils.js';
-import { logger } from '@powersync/lib-services-framework';
+import * as uuid from 'uuid';
+export const ID_NAMESPACE = 'a396dd91-09fc-4017-a28d-3df722f651e9';
+export function escapeIdentifier(identifier) {
+    return `"${identifier.replace(/"/g, '""').replace(/\./g, '"."')}"`;
+}
 export function hashData(type, id, data) {
     const hash = crypto.createHash('sha256');
     hash.update(`put.${type}.${id}.${data}`);
@@ -63,30 +66,47 @@ export function addBucketChecksums(a, b) {
         };
     }
 }
-export async function getClientCheckpoint(db, bucketStorage, options) {
-    const start = Date.now();
-    const [{ lsn }] = pgwireRows(await db.query(`SELECT pg_logical_emit_message(false, 'powersync', 'ping') as lsn`));
-    // This old API needs a persisted checkpoint id.
-    // Since we don't use LSNs anymore, the only way to get that is to wait.
-    const timeout = options?.timeout ?? 50000;
-    logger.info(`Waiting for LSN checkpoint: ${lsn}`);
-    while (Date.now() - start < timeout) {
-        const cp = await bucketStorage.getActiveCheckpoint();
-        if (!cp.hasSyncRules()) {
-            throw new Error('No sync rules available');
-        }
-        if (cp.lsn >= lsn) {
-            logger.info(`Got write checkpoint: ${lsn} : ${cp.checkpoint}`);
-            return cp.checkpoint;
+function getRawReplicaIdentity(tuple, columns) {
+    let result = {};
+    for (let column of columns) {
+        const name = column.name;
+        result[name] = tuple[name];
+    }
+    return result;
+}
+export function getUuidReplicaIdentityBson(tuple, columns) {
+    if (columns.length == 0) {
+        // REPLICA IDENTITY NOTHING - generate random id
+        return new bson.UUID(uuid.v4());
+    }
+    const rawIdentity = getRawReplicaIdentity(tuple, columns);
+    return uuidForRowBson(rawIdentity);
+}
+export function uuidForRowBson(row) {
+    // Important: This must not change, since it will affect how ids are generated.
+    // Use BSON so that it's a well-defined format without encoding ambiguities.
+    const repr = bson.serialize(row);
+    const buffer = Buffer.alloc(16);
+    return new bson.UUID(uuid.v5(repr, ID_NAMESPACE, buffer));
+}
+export function hasToastedValues(row) {
+    for (let key in row) {
+        if (typeof row[key] == 'undefined') {
+            return true;
         }
-        await new Promise((resolve) => setTimeout(resolve, 30));
     }
-    throw new Error('Timeout while waiting for checkpoint');
+    return false;
+}
+export function isCompleteRow(row) {
+    return !hasToastedValues(row);
 }
-export async function createWriteCheckpoint(db, bucketStorage, user_id) {
-    const [{ lsn }] = pgwireRows(await retriedQuery(db, `SELECT pg_logical_emit_message(false, 'powersync', 'ping') as lsn`));
-    const id = await bucketStorage.createWriteCheckpoint(user_id, { '1': lsn });
-    logger.info(`Write checkpoint 2: ${JSON.stringify({ lsn, id: String(id) })}`);
-    return id;
+export function checkpointUserId(user_id, client_id) {
+    if (user_id == null) {
+        throw new Error('user_id is required');
+    }
+    if (client_id == null) {
+        return user_id;
+    }
+    return `${user_id}/${client_id}`;
 }
 //# sourceMappingURL=utils.js.map

package/dist/util/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/util/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/util/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -5,14 +5,16 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.0.0-dev-20240718134716",
+  "version": "0.0.0-dev-20240918082156",
   "main": "dist/index.js",
   "license": "FSL-1.1-Apache-2.0",
   "type": "module",
   "dependencies": {
     "@js-sdsl/ordered-set": "^4.4.2",
     "@opentelemetry/api": "~1.8.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.51.1",
     "@opentelemetry/exporter-prometheus": "^0.51.1",
+    "@opentelemetry/resources": "^1.24.1",
     "@opentelemetry/sdk-metrics": "1.24.1",
     "async": "^3.2.4",
     "async-mutex": "^0.5.0",
@@ -26,17 +28,15 @@
     "lru-cache": "^10.2.2",
     "mongodb": "^6.7.0",
     "node-fetch": "^3.3.2",
-    "pgwire": "github:kagis/pgwire#f1cb95f9a0f42a612bb5a6b67bb2eb793fc5fc87",
     "ts-codec": "^1.2.2",
     "uuid": "^9.0.1",
     "winston": "^3.13.0",
     "yaml": "^2.3.2",
-    "@powersync/lib-services-framework": "0.0.0-dev-20240718134716",
-    "@powersync/service-jpgwire": "0.17.13",
+    "@powersync/lib-services-framework": "0.0.0-dev-20240918082156",
     "@powersync/service-jsonbig": "0.17.10",
-    "@powersync/service-rsocket-router": "0.0.0-dev-20240718134716",
-    "@powersync/service-sync-rules": "0.18.1",
-    "@powersync/service-types": "0.1.0"
+    "@powersync/service-rsocket-router": "0.0.0-dev-20240918082156",
+    "@powersync/service-sync-rules": "0.0.0-dev-20240918082156",
+    "@powersync/service-types": "0.0.0-dev-20240918082156"
   },
   "devDependencies": {
     "@types/async": "^3.2.24",

package/src/api/RouteAPI.ts

@@ -0,0 +1,78 @@
+import { SqlSyncRules, TablePattern } from '@powersync/service-sync-rules';
+import * as types from '@powersync/service-types';
+import { ParseSyncRulesOptions } from '../storage/BucketStorage.js';
+
+export interface PatternResult {
+  schema: string;
+  pattern: string;
+  wildcard: boolean;
+  tables?: types.TableInfo[];
+  table?: types.TableInfo;
+}
+
+/**
+ *  Describes all the methods currently required to service the sync API endpoints.
+ */
+export interface RouteAPI {
+  /**
+   * @returns basic identification of the connection
+   */
+  getSourceConfig(): Promise<types.configFile.DataSourceConfig>;
+
+  /**
+   * Checks the current connection status of the data source.
+   * This is usually some test query to verify the source can be reached.
+   */
+  getConnectionStatus(): Promise<types.ConnectionStatusV2>;
+
+  /**
+   * Generates replication table information from a given pattern of tables.
+   *
+   * @param tablePatterns A set of table patterns which typically come from
+   *          the tables listed in sync rules definitions.
+   *
+   * @param sqlSyncRules
+   * @returns A result of all the tables and columns which should be replicated
+   *           based off the input patterns. Certain tests are executed on the
+   *           tables to ensure syncing should function according to the input
+   *           pattern. Debug errors and warnings are reported per table.
+   */
+  getDebugTablesInfo(tablePatterns: TablePattern[], sqlSyncRules: SqlSyncRules): Promise<PatternResult[]>;
+
+  /**
+   * @returns The replication lag: that is the amount of data which has not been
+   *          replicated yet, in bytes.
+   * @param {string} syncRulesId An identifier representing which set of sync rules the lag is required for.
+   */
+  getReplicationLag(syncRulesId: string): Promise<number>;
+
+  /**
+   * Get the current LSN or equivalent replication HEAD position identifier
+   */
+  getReplicationHead(): Promise<string>;
+
+  /**
+   * @returns The schema for tables inside the connected database. This is typically
+   *          used to validate sync rules.
+   * Side Note: https://github.com/powersync-ja/powersync-service/blob/33bbb8c0ab1c48555956593f427fc674a8f15768/packages/types/src/definitions.ts#L100
+   * contains `pg_type` which we might need to deprecate and add another generic
+   * type field - or just use this field as the connection specific type.
+   */
+  getConnectionSchema(): Promise<types.DatabaseSchema[]>;
+
+  /**
+   * Executes a query and return the result from the data source. This is currently used in the
+   * admin API which is exposed in Collide.
+   */
+  executeQuery(query: string, params: any[]): Promise<types.internal_routes.ExecuteSqlResponse>;
+
+  /**
+   * Close any resources that need graceful termination.
+   */
+  shutdown(): Promise<void>;
+
+  /**
+   * Get the default schema (or database) when only a table name is specified in sync rules.
+   */
+  getParseSyncRulesOptions(): ParseSyncRulesOptions;
+}

package/src/api/api-index.ts

@@ -1,2 +1,3 @@
 export * from './diagnostics.js';
+export * from './RouteAPI.js';
 export * from './schema.js';

package/src/api/diagnostics.ts

@@ -1,51 +1,9 @@
+import { logger } from '@powersync/lib-services-framework';
 import { DEFAULT_TAG, SourceTableInterface, SqlSyncRules } from '@powersync/service-sync-rules';
-import { pgwireRows } from '@powersync/service-jpgwire';
-import { ConnectionStatus, SyncRulesStatus, TableInfo, baseUri } from '@powersync/service-types';
+import { SyncRulesStatus, TableInfo } from '@powersync/service-types';
 
-import * as replication from '../replication/replication-index.js';
 import * as storage from '../storage/storage-index.js';
-import * as util from '../util/util-index.js';
-
-import { CorePowerSyncSystem } from '../system/CorePowerSyncSystem.js';
-import { logger } from '@powersync/lib-services-framework';
-
-export async function getConnectionStatus(system: CorePowerSyncSystem): Promise<ConnectionStatus | null> {
-  if (system.pgwire_pool == null) {
-    return null;
-  }
-
-  const pool = system.requirePgPool();
-
-  const base = {
-    id: system.config.connection!.id,
-    postgres_uri: baseUri(system.config.connection!)
-  };
-  try {
-    await util.retriedQuery(pool, `SELECT 'PowerSync connection test'`);
-  } catch (e) {
-    return {
-      ...base,
-      connected: false,
-      errors: [{ level: 'fatal', message: e.message }]
-    };
-  }
-
-  try {
-    await replication.checkSourceConfiguration(pool);
-  } catch (e) {
-    return {
-      ...base,
-      connected: true,
-      errors: [{ level: 'fatal', message: e.message }]
-    };
-  }
-
-  return {
-    ...base,
-    connected: true,
-    errors: []
-  };
-}
+import { RouteAPI } from './RouteAPI.js';
 
 export interface DiagnosticsOptions {
   /**
@@ -66,9 +24,12 @@ export interface DiagnosticsOptions {
   check_connection: boolean;
 }
 
+export const DEFAULT_DATASOURCE_ID = 'default';
+
 export async function getSyncRulesStatus(
+  bucketStorage: storage.BucketStorageFactory,
+  apiHandler: RouteAPI,
   sync_rules: storage.PersistedSyncRulesContent | null,
-  system: CorePowerSyncSystem,
   options: DiagnosticsOptions
 ): Promise<SyncRulesStatus | undefined> {
   if (sync_rules == null) {
@@ -82,7 +43,7 @@ export async function getSyncRulesStatus(
   let rules: SqlSyncRules;
   let persisted: storage.PersistedSyncRules;
   try {
-    persisted = sync_rules.parsed();
+    persisted = sync_rules.parsed(apiHandler.getParseSyncRulesOptions());
     rules = persisted.sync_rules;
   } catch (e) {
     return {
@@ -92,21 +53,15 @@ export async function getSyncRulesStatus(
     };
   }
 
-  const systemStorage = live_status ? await system.storage.getInstance(persisted) : undefined;
+  const systemStorage = live_status ? bucketStorage.getInstance(sync_rules) : undefined;
   const status = await systemStorage?.getStatus();
   let replication_lag_bytes: number | undefined = undefined;
 
   let tables_flat: TableInfo[] = [];
 
   if (check_connection) {
-    const pool = system.requirePgPool();
-
     const source_table_patterns = rules.getSourceTables();
-    const wc = new replication.WalConnection({
-      db: pool,
-      sync_rules: rules
-    });
-    const resolved_tables = await wc.getDebugTablesInfo(source_table_patterns);
+    const resolved_tables = await apiHandler.getDebugTablesInfo(source_table_patterns, rules);
     tables_flat = resolved_tables.flatMap((info) => {
       if (info.table) {
         return [info.table];
@@ -119,19 +74,7 @@ export async function getSyncRulesStatus(
 
     if (systemStorage) {
       try {
-        const results = await util.retriedQuery(pool, {
-          statement: `SELECT
-      slot_name,
-      confirmed_flush_lsn, 
-      pg_current_wal_lsn(), 
-      (pg_current_wal_lsn() - confirmed_flush_lsn) AS lsn_distance
-    FROM pg_replication_slots WHERE slot_name = $1 LIMIT 1;`,
-          params: [{ type: 'varchar', value: systemStorage!.slot_name }]
-        });
-        const [row] = pgwireRows(results);
-        if (row) {
-          replication_lag_bytes = Number(row.lsn_distance);
-        }
+        replication_lag_bytes = await apiHandler.getReplicationLag(systemStorage.slot_name);
       } catch (e) {
         // Ignore
         logger.warn(`Unable to get replication lag`, e);
@@ -139,7 +82,6 @@ export async function getSyncRulesStatus(
     }
   } else {
     const source_table_patterns = rules.getSourceTables();
-    const tag = system.config.connection!.tag ?? DEFAULT_TAG;
 
     tables_flat = source_table_patterns.map((pattern): TableInfo => {
       if (pattern.isWildcard) {
@@ -186,12 +128,15 @@ export async function getSyncRulesStatus(
     })
   );
 
+  const sourceConfig = await apiHandler.getSourceConfig();
+  const tag = sourceConfig.tag ?? DEFAULT_TAG;
+
   return {
     content: include_content ? sync_rules.sync_rules_content : undefined,
     connections: [
       {
-        id: system.config.connection!.id,
-        tag: system.config.connection!.tag ?? DEFAULT_TAG,
+        id: sourceConfig.id ?? DEFAULT_DATASOURCE_ID,
+        tag: sourceConfig.tag ?? DEFAULT_TAG,
         slot_name: sync_rules.slot_name,
         initial_replication_done: status?.snapshot_done ?? false,
         // TODO: Rename?