@powersync/service-core 0.8.8 → 0.10.0

package/CHANGELOG.md

@@ -1,5 +1,48 @@
 # @powersync/service-core
 
+## 0.10.0
+
+### Minor Changes
+
+- 35c267f: Add "supabase_jwt_secret" config option to simplify static Supabase auth.
+
+### Patch Changes
+
+- 2c18ad2: Fix compact action
+- Updated dependencies [35c267f]
+  - @powersync/service-types@0.4.0
+
+## 0.9.0
+
+### Minor Changes
+
+- 57bd18b: Added ability to emit data replication events
+- 57bd18b: Introduced alpha support for MySQL as a datasource for replication.
+  Bunch of cleanup
+- 57bd18b: Moved Write Checkpoint APIs to SyncBucketStorage
+- 57bd18b: - Introduced modules to the powersync service architecture
+  - Core functionality has been moved to "engine" classes. Modules can register additional functionality with these engines.
+  - The sync API functionality used by the routes has been abstracted to an interface. API routes are now managed by the RouterEngine.
+  - Replication is managed by the ReplicationEngine and new replication data sources can be registered to the engine by modules.
+  - Refactored existing Postgres replication as a module.
+  - Removed Postgres specific code from the core service packages.
+
+### Patch Changes
+
+- 57bd18b: Improved sync rules storage cached parsed sync rules, accommodating different parsing options where necessary.
+- 57bd18b: Moved tag variable initialization in diagnostics route to ensure it is initialized before usage
+- Updated dependencies [57bd18b]
+- Updated dependencies [57bd18b]
+- Updated dependencies [57bd18b]
+- Updated dependencies [57bd18b]
+- Updated dependencies [57bd18b]
+- Updated dependencies [57bd18b]
+- Updated dependencies [57bd18b]
+  - @powersync/lib-services-framework@0.2.0
+  - @powersync/service-sync-rules@0.21.0
+  - @powersync/service-rsocket-router@0.0.14
+  - @powersync/service-types@0.3.0
+
 ## 0.8.8
 
 ### Patch Changes

package/dist/api/RouteAPI.d.ts

@@ -0,0 +1,67 @@
+import { SqlSyncRules, TablePattern } from '@powersync/service-sync-rules';
+import * as types from '@powersync/service-types';
+import { ParseSyncRulesOptions, SyncRulesBucketStorage } from '../storage/BucketStorage.js';
+export interface PatternResult {
+    schema: string;
+    pattern: string;
+    wildcard: boolean;
+    tables?: types.TableInfo[];
+    table?: types.TableInfo;
+}
+export interface ReplicationLagOptions {
+    bucketStorage: SyncRulesBucketStorage;
+}
+/**
+ *  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.ResolvedDataSourceConfig>;
+    /**
+     * 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.
+     */
+    getReplicationLag(options: ReplicationLagOptions): Promise<number | undefined>;
+    /**
+     * 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.
+     */
+    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/dist/api/RouteAPI.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=RouteAPI.js.map

package/dist/api/RouteAPI.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RouteAPI.js","sourceRoot":"","sources":["../../src/api/RouteAPI.ts"],"names":[],"mappings":""}

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

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

package/dist/api/api-index.js

@@ -1,3 +1,4 @@
 export * from './diagnostics.js';
+export * from './RouteAPI.js';
 export * from './schema.js';
 //# sourceMappingURL=api-index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"api-index.js","sourceRoot":"","sources":["../../src/api/api-index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC"}
+{"version":3,"file":"api-index.js","sourceRoot":"","sources":["../../src/api/api-index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC"}

package/dist/api/diagnostics.d.ts

@@ -1,7 +1,6 @@
-import { ConnectionStatus, SyncRulesStatus } from '@powersync/service-types';
+import { SyncRulesStatus } from '@powersync/service-types';
 import * as storage from '../storage/storage-index.js';
-import { CorePowerSyncSystem } from '../system/CorePowerSyncSystem.js';
-export declare function getConnectionStatus(system: CorePowerSyncSystem): Promise<ConnectionStatus | null>;
+import { RouteAPI } from './RouteAPI.js';
 export interface DiagnosticsOptions {
     /**
      * Include sync rules content in response.
@@ -18,4 +17,5 @@ export interface DiagnosticsOptions {
      */
     check_connection: boolean;
 }
-export declare function getSyncRulesStatus(sync_rules: storage.PersistedSyncRulesContent | null, system: CorePowerSyncSystem, options: DiagnosticsOptions): Promise<SyncRulesStatus | undefined>;
+export declare const DEFAULT_DATASOURCE_ID = "default";
+export declare function getSyncRulesStatus(bucketStorage: storage.BucketStorageFactory, apiHandler: RouteAPI, sync_rules: storage.PersistedSyncRulesContent | null, options: DiagnosticsOptions): Promise<SyncRulesStatus | undefined>;

package/dist/api/diagnostics.js

@@ -1,171 +1,183 @@
-import { DEFAULT_TAG } from '@powersync/service-sync-rules';
-import { pgwireRows } from '@powersync/service-jpgwire';
-import { baseUri } from '@powersync/service-types';
-import * as replication from '../replication/replication-index.js';
-import * as util from '../util/util-index.js';
-import { logger } from '@powersync/lib-services-framework';
-export async function getConnectionStatus(system) {
-    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);
+var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose, inner;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+            if (async) inner = dispose;
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
+        env.stack.push({ value: value, dispose: dispose, async: async });
     }
-    catch (e) {
-        return {
-            ...base,
-            connected: true,
-            errors: [{ level: 'fatal', message: e.message }]
-        };
+    else if (async) {
+        env.stack.push({ async: true });
     }
-    return {
-        ...base,
-        connected: true,
-        errors: []
+    return value;
+};
+var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
+    return function (env) {
+        function fail(e) {
+            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        var r, s = 0;
+        function next() {
+            while (r = env.stack.pop()) {
+                try {
+                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                    if (r.dispose) {
+                        var result = r.dispose.call(r.value);
+                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                    }
+                    else s |= 1;
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+            if (env.hasError) throw env.error;
+        }
+        return next();
     };
-}
-export async function getSyncRulesStatus(sync_rules, system, options) {
-    if (sync_rules == null) {
-        return undefined;
-    }
-    const include_content = options.include_content ?? false;
-    const live_status = options.live_status ?? false;
-    const check_connection = options.check_connection ?? false;
-    let rules;
-    let persisted;
+})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+});
+import { logger } from '@powersync/lib-services-framework';
+import { DEFAULT_TAG } from '@powersync/service-sync-rules';
+export const DEFAULT_DATASOURCE_ID = 'default';
+export async function getSyncRulesStatus(bucketStorage, apiHandler, sync_rules, options) {
+    const env_1 = { stack: [], error: void 0, hasError: false };
     try {
-        persisted = sync_rules.parsed();
-        rules = persisted.sync_rules;
-    }
-    catch (e) {
-        return {
-            content: include_content ? sync_rules.sync_rules_content : undefined,
-            connections: [],
-            errors: [{ level: 'fatal', message: e.message }]
-        };
-    }
-    const systemStorage = live_status ? await system.storage.getInstance(persisted) : undefined;
-    const status = await systemStorage?.getStatus();
-    let replication_lag_bytes = undefined;
-    let tables_flat = [];
-    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);
-        tables_flat = resolved_tables.flatMap((info) => {
-            if (info.table) {
-                return [info.table];
-            }
-            else if (info.tables) {
-                return info.tables;
-            }
-            else {
-                return [];
-            }
-        });
-        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);
+        if (sync_rules == null) {
+            return undefined;
+        }
+        const include_content = options.include_content ?? false;
+        const live_status = options.live_status ?? false;
+        const check_connection = options.check_connection ?? false;
+        let rules;
+        let persisted;
+        try {
+            persisted = sync_rules.parsed(apiHandler.getParseSyncRulesOptions());
+            rules = persisted.sync_rules;
+        }
+        catch (e) {
+            return {
+                content: include_content ? sync_rules.sync_rules_content : undefined,
+                connections: [],
+                errors: [{ level: 'fatal', message: e.message }]
+            };
+        }
+        const sourceConfig = await apiHandler.getSourceConfig();
+        // This method can run under some situations if no connection is configured yet.
+        // It will return a default tag in such a case. This default tag is not module specific.
+        const tag = sourceConfig.tag ?? DEFAULT_TAG;
+        const systemStorage = __addDisposableResource(env_1, live_status ? bucketStorage.getInstance(sync_rules) : undefined, false);
+        const status = await systemStorage?.getStatus();
+        let replication_lag_bytes = undefined;
+        let tables_flat = [];
+        if (check_connection) {
+            const source_table_patterns = rules.getSourceTables();
+            const resolved_tables = await apiHandler.getDebugTablesInfo(source_table_patterns, rules);
+            tables_flat = resolved_tables.flatMap((info) => {
+                if (info.table) {
+                    return [info.table];
+                }
+                else if (info.tables) {
+                    return info.tables;
+                }
+                else {
+                    return [];
+                }
+            });
+            if (systemStorage) {
+                try {
+                    replication_lag_bytes = await apiHandler.getReplicationLag({
+                        bucketStorage: systemStorage
+                    });
+                }
+                catch (e) {
+                    // Ignore
+                    logger.warn(`Unable to get replication lag`, e);
                 }
             }
-            catch (e) {
-                // Ignore
-                logger.warn(`Unable to get replication lag`, e);
-            }
         }
+        else {
+            const source_table_patterns = rules.getSourceTables();
+            tables_flat = source_table_patterns.map((pattern) => {
+                if (pattern.isWildcard) {
+                    return {
+                        schema: pattern.schema,
+                        name: pattern.tablePrefix,
+                        pattern: pattern.isWildcard ? pattern.tablePattern : undefined,
+                        data_queries: false,
+                        parameter_queries: false,
+                        replication_id: [],
+                        errors: [{ level: 'fatal', message: 'connection failed' }]
+                    };
+                }
+                else {
+                    const source = {
+                        connectionTag: tag,
+                        schema: pattern.schema,
+                        table: pattern.tablePattern
+                    };
+                    const syncData = rules.tableSyncsData(source);
+                    const syncParameters = rules.tableSyncsParameters(source);
+                    return {
+                        schema: pattern.schema,
+                        name: pattern.name,
+                        data_queries: syncData,
+                        parameter_queries: syncParameters,
+                        replication_id: [],
+                        errors: [{ level: 'fatal', message: 'connection failed' }]
+                    };
+                }
+            });
+        }
+        const errors = tables_flat.flatMap((info) => info.errors);
+        if (sync_rules.last_fatal_error) {
+            errors.push({ level: 'fatal', message: sync_rules.last_fatal_error });
+        }
+        errors.push(...rules.errors.map((e) => {
+            return {
+                level: e.type,
+                message: e.message
+            };
+        }));
+        return {
+            content: include_content ? sync_rules.sync_rules_content : undefined,
+            connections: [
+                {
+                    id: sourceConfig.id ?? DEFAULT_DATASOURCE_ID,
+                    tag: tag,
+                    slot_name: sync_rules.slot_name,
+                    initial_replication_done: status?.snapshot_done ?? false,
+                    // TODO: Rename?
+                    last_lsn: status?.checkpoint_lsn ?? undefined,
+                    last_checkpoint_ts: sync_rules.last_checkpoint_ts?.toISOString(),
+                    last_keepalive_ts: sync_rules.last_keepalive_ts?.toISOString(),
+                    replication_lag_bytes: replication_lag_bytes,
+                    tables: tables_flat
+                }
+            ],
+            errors: deduplicate(errors)
+        };
     }
-    else {
-        const source_table_patterns = rules.getSourceTables();
-        const tag = system.config.connection.tag ?? DEFAULT_TAG;
-        tables_flat = source_table_patterns.map((pattern) => {
-            if (pattern.isWildcard) {
-                return {
-                    schema: pattern.schema,
-                    name: pattern.tablePrefix,
-                    pattern: pattern.isWildcard ? pattern.tablePattern : undefined,
-                    data_queries: false,
-                    parameter_queries: false,
-                    replication_id: [],
-                    errors: [{ level: 'fatal', message: 'connection failed' }]
-                };
-            }
-            else {
-                const source = {
-                    connectionTag: tag,
-                    schema: pattern.schema,
-                    table: pattern.tablePattern
-                };
-                const syncData = rules.tableSyncsData(source);
-                const syncParameters = rules.tableSyncsParameters(source);
-                return {
-                    schema: pattern.schema,
-                    name: pattern.name,
-                    data_queries: syncData,
-                    parameter_queries: syncParameters,
-                    replication_id: [],
-                    errors: [{ level: 'fatal', message: 'connection failed' }]
-                };
-            }
-        });
+    catch (e_1) {
+        env_1.error = e_1;
+        env_1.hasError = true;
     }
-    const errors = tables_flat.flatMap((info) => info.errors);
-    if (sync_rules.last_fatal_error) {
-        errors.push({ level: 'fatal', message: sync_rules.last_fatal_error });
+    finally {
+        __disposeResources(env_1);
     }
-    errors.push(...rules.errors.map((e) => {
-        return {
-            level: e.type,
-            message: e.message
-        };
-    }));
-    return {
-        content: include_content ? sync_rules.sync_rules_content : undefined,
-        connections: [
-            {
-                id: system.config.connection.id,
-                tag: system.config.connection.tag ?? DEFAULT_TAG,
-                slot_name: sync_rules.slot_name,
-                initial_replication_done: status?.snapshot_done ?? false,
-                // TODO: Rename?
-                last_lsn: status?.checkpoint_lsn ?? undefined,
-                last_checkpoint_ts: sync_rules.last_checkpoint_ts?.toISOString(),
-                last_keepalive_ts: sync_rules.last_keepalive_ts?.toISOString(),
-                replication_lag_bytes: replication_lag_bytes,
-                tables: tables_flat
-            }
-        ],
-        errors: deduplicate(errors)
-    };
 }
 function deduplicate(errors) {
     let seen = new Set();

package/dist/api/diagnostics.js.map

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

package/dist/api/schema.d.ts

@@ -1,5 +1,3 @@
-import type * as pgwire from '@powersync/service-jpgwire';
-import { DatabaseSchema, internal_routes } from '@powersync/service-types';
-import { CorePowerSyncSystem } from '../system/CorePowerSyncSystem.js';
-export declare function getConnectionsSchema(system: CorePowerSyncSystem): Promise<internal_routes.GetSchemaResponse>;
-export declare function getConnectionSchema(db: pgwire.PgClient): Promise<DatabaseSchema[]>;
+import { internal_routes } from '@powersync/service-types';
+import * as api from '../api/api-index.js';
+export declare function getConnectionsSchema(api: api.RouteAPI): Promise<internal_routes.GetSchemaResponse>;

package/dist/api/schema.js

@@ -1,88 +1,22 @@
-import { pgwireRows } from '@powersync/service-jpgwire';
-import * as util from '../util/util-index.js';
-export async function getConnectionsSchema(system) {
-    if (system.config.connection == null) {
-        return { connections: [] };
+export async function getConnectionsSchema(api) {
+    if (!api) {
+        return {
+            connections: [],
+            defaultConnectionTag: 'default',
+            defaultSchema: ''
+        };
     }
-    const schemas = await getConnectionSchema(system.requirePgPool());
+    const baseConfig = await api.getSourceConfig();
     return {
         connections: [
             {
-                schemas,
-                tag: system.config.connection.tag,
-                id: system.config.connection.id
+                id: baseConfig.id,
+                tag: baseConfig.tag,
+                schemas: await api.getConnectionSchema()
             }
-        ]
+        ],
+        defaultConnectionTag: baseConfig.tag,
+        defaultSchema: api.getParseSyncRulesOptions().defaultSchema
     };
 }
-export async function getConnectionSchema(db) {
-    var _a;
-    // https://github.com/Borvik/vscode-postgres/blob/88ec5ed061a0c9bced6c5d4ec122d0759c3f3247/src/language/server.ts
-    const results = await util.retriedQuery(db, `SELECT
-  tbl.schemaname,
-  tbl.tablename,
-  tbl.quoted_name,
-  json_agg(a ORDER BY attnum) as columns
-FROM
-  (
-    SELECT
-      n.nspname as schemaname,
-      c.relname as tablename,
-      (quote_ident(n.nspname) || '.' || quote_ident(c.relname)) as quoted_name
-    FROM
-      pg_catalog.pg_class c
-      JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
-    WHERE
-      c.relkind = 'r'
-      AND n.nspname not in ('information_schema', 'pg_catalog', 'pg_toast')
-      AND n.nspname not like 'pg_temp_%'
-      AND n.nspname not like 'pg_toast_temp_%'
-      AND c.relnatts > 0
-      AND has_schema_privilege(n.oid, 'USAGE') = true
-      AND has_table_privilege(quote_ident(n.nspname) || '.' || quote_ident(c.relname), 'SELECT, INSERT, UPDATE, DELETE, TRUNCATE, REFERENCES, TRIGGER') = true
-  ) as tbl
-  LEFT JOIN (
-    SELECT
-      attrelid,
-      attname,
-      format_type(atttypid, atttypmod) as data_type,
-      (SELECT typname FROM pg_catalog.pg_type WHERE oid = atttypid) as pg_type,
-      attnum,
-      attisdropped
-    FROM
-      pg_attribute
-  ) as a ON (
-    a.attrelid = tbl.quoted_name::regclass
-    AND a.attnum > 0
-    AND NOT a.attisdropped
-    AND has_column_privilege(tbl.quoted_name, a.attname, 'SELECT, INSERT, UPDATE, REFERENCES')
-  )
-GROUP BY schemaname, tablename, quoted_name`);
-    const rows = pgwireRows(results);
-    let schemas = {};
-    for (let row of rows) {
-        const schema = (schemas[_a = row.schemaname] ?? (schemas[_a] = {
-            name: row.schemaname,
-            tables: []
-        }));
-        const table = {
-            name: row.tablename,
-            columns: []
-        };
-        schema.tables.push(table);
-        const columnInfo = JSON.parse(row.columns);
-        for (let column of columnInfo) {
-            let pg_type = column.pg_type;
-            if (pg_type.startsWith('_')) {
-                pg_type = `${pg_type.substring(1)}[]`;
-            }
-            table.columns.push({
-                name: column.attname,
-                type: column.data_type,
-                pg_type: pg_type
-            });
-        }
-    }
-    return Object.values(schemas);
-}
 //# sourceMappingURL=schema.js.map