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

package/CHANGELOG.md

@@ -1,17 +1,100 @@
 # @powersync/service-core
 
-## 0.0.0-dev-20240718134716
+## 0.0.0-dev-20240918082156
 
 ### Minor Changes
 
-- 6f90ba2: Optimized metrics initialization and configuration for extensibility.
-- 6f90ba2: Added ability to extend configuration collection process.
+- d51921f: - 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
 
-- Updated dependencies [6f90ba2]
-  - @powersync/lib-services-framework@0.0.0-dev-20240718134716
-  - @powersync/service-rsocket-router@0.0.0-dev-20240718134716
+- Updated dependencies [d51921f]
+  - @powersync/service-sync-rules@0.0.0-dev-20240918082156
+  - @powersync/lib-services-framework@0.0.0-dev-20240918082156
+  - @powersync/service-types@0.0.0-dev-20240918082156
+  - @powersync/service-rsocket-router@0.0.0-dev-20240918082156
+
+## 0.8.4
+
+### Patch Changes
+
+- Updated dependencies [f6b678a]
+  - @powersync/service-sync-rules@0.18.3
+
+## 0.8.3
+
+### Patch Changes
+
+- 306b6d8: Fix hanging streams
+- Updated dependencies [306b6d8]
+  - @powersync/service-rsocket-router@0.0.13
+
+## 0.8.2
+
+### Patch Changes
+
+- Updated dependencies [0d4432d]
+  - @powersync/service-rsocket-router@0.0.12
+
+## 0.8.1
+
+### Patch Changes
+
+- 8b3a9b9: Added `client_id` log to WebSocket `sync/stream` endpoint.
+
+## 0.8.0
+
+### Minor Changes
+
+- da04865: Support client_id parameter and User-Agent headers.
+
+### Patch Changes
+
+- fcd54a9: Log stats on sync lock when reaching concurrency limit
+- Updated dependencies [3291a2c]
+  - @powersync/service-rsocket-router@0.0.11
+
+## 0.7.1
+
+### Patch Changes
+
+- Updated dependencies [2ae8711]
+  - @powersync/service-sync-rules@0.18.2
+
+## 0.7.0
+
+### Minor Changes
+
+- c9ad713: Removed unused development routes
+
+### Patch Changes
+
+- Updated dependencies [c9ad713]
+  - @powersync/service-types@0.2.0
+  - @powersync/service-jpgwire@0.17.14
+
+## 0.6.0
+
+### Minor Changes
+
+- 3f994ae: Added utility functions for registering routes
+
+## 0.5.1
+
+### Patch Changes
+
+- bfe0e64: Fix compact command to use the correct database
+
+## 0.5.0
+
+### Minor Changes
+
+- 1c1a3bf: Implement a compact command
 
 ## 0.4.2
 

package/dist/api/RouteAPI.d.ts

@@ -0,0 +1,68 @@
+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/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,45 +1,7 @@
-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);
-    }
-    catch (e) {
-        return {
-            ...base,
-            connected: true,
-            errors: [{ level: 'fatal', message: e.message }]
-        };
-    }
-    return {
-        ...base,
-        connected: true,
-        errors: []
-    };
-}
-export async function getSyncRulesStatus(sync_rules, system, options) {
+import { DEFAULT_TAG } from '@powersync/service-sync-rules';
+export const DEFAULT_DATASOURCE_ID = 'default';
+export async function getSyncRulesStatus(bucketStorage, apiHandler, sync_rules, options) {
     if (sync_rules == null) {
         return undefined;
     }
@@ -49,7 +11,7 @@ export async function getSyncRulesStatus(sync_rules, system, options) {
     let rules;
     let persisted;
     try {
-        persisted = sync_rules.parsed();
+        persisted = sync_rules.parsed(apiHandler.getParseSyncRulesOptions());
         rules = persisted.sync_rules;
     }
     catch (e) {
@@ -59,18 +21,13 @@ export async function getSyncRulesStatus(sync_rules, system, options) {
             errors: [{ level: 'fatal', message: e.message }]
         };
     }
-    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 = 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);
+        const resolved_tables = await apiHandler.getDebugTablesInfo(source_table_patterns, rules);
         tables_flat = resolved_tables.flatMap((info) => {
             if (info.table) {
                 return [info.table];
@@ -84,19 +41,7 @@ export async function getSyncRulesStatus(sync_rules, system, options) {
         });
         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
@@ -106,7 +51,6 @@ export async function getSyncRulesStatus(sync_rules, system, options) {
     }
     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 {
@@ -148,12 +92,14 @@ export async function getSyncRulesStatus(sync_rules, system, options) {
             message: e.message
         };
     }));
+    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?

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,18 @@
-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: []
+        };
     }
-    const schemas = await getConnectionSchema(system.requirePgPool());
+    const baseConfig = await api.getSourceConfig();
     return {
         connections: [
             {
-                schemas,
-                tag: system.config.connection.tag,
-                id: system.config.connection.id
+                schemas: await api.getConnectionSchema(),
+                tag: baseConfig.tag,
+                id: baseConfig.id
             }
         ]
     };
 }
-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

package/dist/api/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/api/schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAGxD,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAG9C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAA2B;IACpE,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,EAAE;QACpC,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;KAC5B;IACD,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;IAClE,OAAO;QACL,WAAW,EAAE;YACX;gBACE,OAAO;gBACP,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,UAAW,CAAC,GAAG;gBAClC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,UAAW,CAAC,EAAE;aACjC;SACF;KACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EAAmB;;IAC3D,iHAAiH;IACjH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CACrC,EAAE,EACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4CAuCwC,CACzC,CAAC;IACF,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAEjC,IAAI,OAAO,GAAwB,EAAE,CAAC;IAEtC,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;QACpB,MAAM,MAAM,GAAG,CAAC,OAAO,MAAC,GAAG,CAAC,UAAU,MAAtB,OAAO,OAAqB;YAC1C,IAAI,EAAE,GAAG,CAAC,UAAU;YACpB,MAAM,EAAE,EAAE;SACX,EAAC,CAAC;QACH,MAAM,KAAK,GAAG;YACZ,IAAI,EAAE,GAAG,CAAC,SAAS;YACnB,OAAO,EAAE,EAAW;SACrB,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE1B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3C,KAAK,IAAI,MAAM,IAAI,UAAU,EAAE;YAC7B,IAAI,OAAO,GAAG,MAAM,CAAC,OAAiB,CAAC;YACvC,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAC3B,OAAO,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;aACvC;YACD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,MAAM,CAAC,OAAO;gBACpB,IAAI,EAAE,MAAM,CAAC,SAAS;gBACtB,OAAO,EAAE,OAAO;aACjB,CAAC,CAAC;SACJ;KACF;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/api/schema.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,GAAiB;IAC1D,IAAI,CAAC,GAAG,EAAE;QACR,OAAO;YACL,WAAW,EAAE,EAAE;SAChB,CAAC;KACH;IAED,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,eAAe,EAAE,CAAC;IAE/C,OAAO;QACL,WAAW,EAAE;YACX;gBACE,OAAO,EAAE,MAAM,GAAG,CAAC,mBAAmB,EAAE;gBACxC,GAAG,EAAE,UAAU,CAAC,GAAI;gBACpB,EAAE,EAAE,UAAU,CAAC,EAAE;aAClB;SACF;KACF,CAAC;AACJ,CAAC"}

package/dist/auth/KeyStore.d.ts

@@ -1,5 +1,5 @@
-import { KeyCollector } from './KeyCollector.js';
 import { JwtPayload } from './JwtPayload.js';
+import { KeyCollector } from './KeyCollector.js';
 /**
  * KeyStore to get keys and verify tokens.
  *
@@ -27,9 +27,12 @@ import { JwtPayload } from './JwtPayload.js';
  * If we have a matching kid, we can generally get a detailed error (e.g. signature verification failed, invalid algorithm, etc).
  * If we don't have a matching kid, we'll generally just get an error "Could not find an appropriate key...".
  */
-export declare class KeyStore {
-    private collector;
-    constructor(collector: KeyCollector);
+export declare class KeyStore<Collector extends KeyCollector = KeyCollector> {
+    /**
+     * @internal
+     */
+    collector: Collector;
+    constructor(collector: Collector);
     verifyJwt(token: string, options: {
         defaultAudiences: string[];
         maxAge: string;

package/dist/auth/KeyStore.js

@@ -1,7 +1,7 @@
+import { logger } from '@powersync/lib-services-framework';
 import * as jose from 'jose';
 import secs from '../util/secs.js';
 import { SUPPORTED_ALGORITHMS } from './KeySpec.js';
-import { logger } from '@powersync/lib-services-framework';
 /**
  * KeyStore to get keys and verify tokens.
  *

package/dist/auth/KeyStore.js.map

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

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

@@ -7,4 +7,3 @@ export * from './KeyStore.js';
 export * from './LeakyBucket.js';
 export * from './RemoteJWKSCollector.js';
 export * from './StaticKeyCollector.js';
-export * from './SupabaseKeyCollector.js';

package/dist/auth/auth-index.js

@@ -7,5 +7,4 @@ export * from './KeyStore.js';
 export * from './LeakyBucket.js';
 export * from './RemoteJWKSCollector.js';
 export * from './StaticKeyCollector.js';
-export * from './SupabaseKeyCollector.js';
 //# sourceMappingURL=auth-index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"auth-index.js","sourceRoot":"","sources":["../../src/auth/auth-index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"auth-index.js","sourceRoot":"","sources":["../../src/auth/auth-index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC"}

package/dist/entry/cli-entry.js

@@ -1,8 +1,9 @@
 import { Command } from 'commander';
+import { logger } from '@powersync/lib-services-framework';
+import { registerCompactAction } from './commands/compact-action.js';
 import { registerMigrationAction } from './commands/migrate-action.js';
+import { registerStartAction } from './commands/start-action.js';
 import { registerTearDownAction } from './commands/teardown-action.js';
-import { registerStartAction } from './entry-index.js';
-import { logger } from '@powersync/lib-services-framework';
 /**
  * Generates a Commander program which serves as the entry point
  * for the PowerSync service.
@@ -14,6 +15,7 @@ export function generateEntryProgram(startHandlers) {
     entryProgram.name('powersync-runner').description('CLI to initiate a PowerSync service runner');
     registerTearDownAction(entryProgram);
     registerMigrationAction(entryProgram);
+    registerCompactAction(entryProgram);
     if (startHandlers) {
         registerStartAction(entryProgram, startHandlers);
     }

package/dist/entry/cli-entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli-entry.js","sourceRoot":"","sources":["../../src/entry/cli-entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAE3D;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,aAAyD;IAC5F,MAAM,YAAY,GAAG,IAAI,OAAO,EAAE,CAAC;IACnC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,WAAW,CAAC,4CAA4C,CAAC,CAAC;IAEhG,sBAAsB,CAAC,YAAY,CAAC,CAAC;IACrC,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAEtC,IAAI,aAAa,EAAE;QACjB,mBAAmB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;KAClD;IAED,OAAO;QACL,OAAO,EAAE,YAAY;QACrB;;WAEG;QACH,OAAO,EAAE,KAAK,UAAU,UAAU;YAChC,IAAI;gBACF,MAAM,YAAY,CAAC,UAAU,EAAE,CAAC;aACjC;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;gBAC/B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"cli-entry.js","sourceRoot":"","sources":["../../src/entry/cli-entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAE3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAEvE;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,aAAyD;IAC5F,MAAM,YAAY,GAAG,IAAI,OAAO,EAAE,CAAC;IACnC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,WAAW,CAAC,4CAA4C,CAAC,CAAC;IAEhG,sBAAsB,CAAC,YAAY,CAAC,CAAC;IACrC,uBAAuB,CAAC,YAAY,CAAC,CAAC;IACtC,qBAAqB,CAAC,YAAY,CAAC,CAAC;IAEpC,IAAI,aAAa,EAAE;QACjB,mBAAmB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;KAClD;IAED,OAAO;QACL,OAAO,EAAE,YAAY;QACrB;;WAEG;QACH,OAAO,EAAE,KAAK,UAAU,UAAU;YAChC,IAAI;gBACF,MAAM,YAAY,CAAC,UAAU,EAAE,CAAC;aACjC;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;gBAC/B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/entry/commands/compact-action.d.ts

@@ -0,0 +1,2 @@
+import { Command } from 'commander';
+export declare function registerCompactAction(program: Command): Command;

package/dist/entry/commands/compact-action.js

@@ -0,0 +1,52 @@
+import { logger } from '@powersync/lib-services-framework';
+import * as v8 from 'v8';
+import * as storage from '../../storage/storage-index.js';
+import * as utils from '../../util/util-index.js';
+import { extractRunnerOptions, wrapConfigCommand } from './config-command.js';
+const COMMAND_NAME = 'compact';
+/**
+ * Approximately max-old-space-size + 64MB.
+ */
+const HEAP_LIMIT = v8.getHeapStatistics().heap_size_limit;
+/**
+ * Subtract 128MB for process overhead.
+ *
+ * Limit to 1024MB overall.
+ */
+const COMPACT_MEMORY_LIMIT_MB = Math.min(HEAP_LIMIT / 1024 / 1024 - 128, 1024);
+export function registerCompactAction(program) {
+    const compactCommand = program.command(COMMAND_NAME);
+    wrapConfigCommand(compactCommand);
+    return compactCommand.description('Compact storage').action(async (options) => {
+        logger.info('Compacting storage...');
+        const runnerConfig = extractRunnerOptions(options);
+        const configuration = await utils.loadConfig(runnerConfig);
+        logger.info('Successfully loaded configuration...');
+        const { storage: storageConfig } = configuration;
+        logger.info('Connecting to storage...');
+        const psdb = storage.createPowerSyncMongo(storageConfig);
+        const client = psdb.client;
+        await client.connect();
+        try {
+            const bucketStorage = new storage.MongoBucketStorage(psdb, { slot_name_prefix: configuration.slot_name_prefix });
+            const active = await bucketStorage.getActiveSyncRulesContent();
+            if (active == null) {
+                logger.info('No active instance to compact');
+                return;
+            }
+            const p = bucketStorage.getInstance(active);
+            logger.info('Performing compaction...');
+            await p.compact({ memoryLimitMB: COMPACT_MEMORY_LIMIT_MB });
+            logger.info('Successfully compacted storage.');
+        }
+        catch (e) {
+            logger.error(`Failed to compact: ${e.toString()}`);
+            process.exit(1);
+        }
+        finally {
+            await client.close();
+            process.exit(0);
+        }
+    });
+}
+//# sourceMappingURL=compact-action.js.map

package/dist/entry/commands/compact-action.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compact-action.js","sourceRoot":"","sources":["../../../src/entry/commands/compact-action.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,OAAO,MAAM,gCAAgC,CAAC;AAC1D,OAAO,KAAK,KAAK,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,MAAM,YAAY,GAAG,SAAS,CAAC;AAE/B;;GAEG;AACH,MAAM,UAAU,GAAG,EAAE,CAAC,iBAAiB,EAAE,CAAC,eAAe,CAAC;AAE1D;;;;GAIG;AACH,MAAM,uBAAuB,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,IAAI,GAAG,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;AAE/E,MAAM,UAAU,qBAAqB,CAAC,OAAgB;IACpD,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAErD,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAElC,OAAO,cAAc,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QAC5E,MAAM,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACrC,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAC3D,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QACpD,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,aAAa,CAAC;QACjD,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,IAAI;YACF,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,gBAAgB,EAAE,aAAa,CAAC,gBAAgB,EAAE,CAAC,CAAC;YACjH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,yBAAyB,EAAE,CAAC;YAC/D,IAAI,MAAM,IAAI,IAAI,EAAE;gBAClB,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;gBAC7C,OAAO;aACR;YACD,MAAM,CAAC,GAAG,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACxC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,aAAa,EAAE,uBAAuB,EAAE,CAAC,CAAC;YAC5D,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;SAChD;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;gBAAS;YACR,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}