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

package/dist/routes/configure-fastify.js

@@ -0,0 +1,57 @@
+import { registerFastifyRoutes } from './route-register.js';
+import { ADMIN_ROUTES } from './endpoints/admin.js';
+import { CHECKPOINT_ROUTES } from './endpoints/checkpointing.js';
+import { SYNC_RULES_ROUTES } from './endpoints/sync-rules.js';
+import { SYNC_STREAM_ROUTES } from './endpoints/sync-stream.js';
+import { createRequestQueueHook } from './hooks.js';
+export const DEFAULT_ROUTE_OPTIONS = {
+    api: {
+        routes: [...ADMIN_ROUTES, ...CHECKPOINT_ROUTES, ...SYNC_RULES_ROUTES],
+        queue_options: {
+            concurrency: 10,
+            max_queue_depth: 20
+        }
+    },
+    sync_stream: {
+        routes: [...SYNC_STREAM_ROUTES],
+        queue_options: {
+            concurrency: 200,
+            max_queue_depth: 0
+        }
+    }
+};
+/**
+ * Registers default routes on a Fastify server. Consumers can optionally configure
+ * concurrency queue limits or override routes.
+ */
+export function configureFastifyServer(server, options) {
+    const { service_context, routes = DEFAULT_ROUTE_OPTIONS } = options;
+    /**
+     * Fastify creates an encapsulated context for each `.register` call.
+     * Creating a separate context here to separate the concurrency limits for Admin APIs
+     * and Sync Streaming routes.
+     * https://github.com/fastify/fastify/blob/main/docs/Reference/Encapsulation.md
+     */
+    server.register(async function (childContext) {
+        registerFastifyRoutes(childContext, async () => {
+            return {
+                user_id: undefined,
+                service_context
+            };
+        }, routes.api?.routes ?? DEFAULT_ROUTE_OPTIONS.api.routes);
+        // Limit the active concurrent requests
+        childContext.addHook('onRequest', createRequestQueueHook(routes.api?.queue_options ?? DEFAULT_ROUTE_OPTIONS.api.queue_options));
+    });
+    // Create a separate context for concurrency queueing
+    server.register(async function (childContext) {
+        registerFastifyRoutes(childContext, async () => {
+            return {
+                user_id: undefined,
+                service_context
+            };
+        }, routes.sync_stream?.routes ?? DEFAULT_ROUTE_OPTIONS.sync_stream.routes);
+        // Limit the active concurrent requests
+        childContext.addHook('onRequest', createRequestQueueHook(routes.sync_stream?.queue_options ?? DEFAULT_ROUTE_OPTIONS.sync_stream.queue_options));
+    });
+}
+//# sourceMappingURL=configure-fastify.js.map

package/dist/routes/configure-fastify.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configure-fastify.js","sourceRoot":"","sources":["../../src/routes/configure-fastify.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAI5D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAA4B,MAAM,YAAY,CAAC;AA0B9E,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,GAAG,EAAE;QACH,MAAM,EAAE,CAAC,GAAG,YAAY,EAAE,GAAG,iBAAiB,EAAE,GAAG,iBAAiB,CAAC;QACrE,aAAa,EAAE;YACb,WAAW,EAAE,EAAE;YACf,eAAe,EAAE,EAAE;SACpB;KACF;IACD,WAAW,EAAE;QACX,MAAM,EAAE,CAAC,GAAG,kBAAkB,CAAC;QAC/B,aAAa,EAAE;YACb,WAAW,EAAE,GAAG;YAChB,eAAe,EAAE,CAAC;SACnB;KACF;CACF,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAA+B,EAAE,OAA4B;IAClG,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,qBAAqB,EAAE,GAAG,OAAO,CAAC;IACpE;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW,YAAY;QAC1C,qBAAqB,CACnB,YAAY,EACZ,KAAK,IAAI,EAAE;YACT,OAAO;gBACL,OAAO,EAAE,SAAS;gBAClB,eAAe;aAChB,CAAC;QACJ,CAAC,EACD,MAAM,CAAC,GAAG,EAAE,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CACvD,CAAC;QACF,uCAAuC;QACvC,YAAY,CAAC,OAAO,CAClB,WAAW,EACX,sBAAsB,CAAC,MAAM,CAAC,GAAG,EAAE,aAAa,IAAI,qBAAqB,CAAC,GAAG,CAAC,aAAa,CAAC,CAC7F,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,qDAAqD;IACrD,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW,YAAY;QAC1C,qBAAqB,CACnB,YAAY,EACZ,KAAK,IAAI,EAAE;YACT,OAAO;gBACL,OAAO,EAAE,SAAS;gBAClB,eAAe;aAChB,CAAC;QACJ,CAAC,EACD,MAAM,CAAC,WAAW,EAAE,MAAM,IAAI,qBAAqB,CAAC,WAAW,CAAC,MAAM,CACvE,CAAC;QACF,uCAAuC;QACvC,YAAY,CAAC,OAAO,CAClB,WAAW,EACX,sBAAsB,CAAC,MAAM,CAAC,WAAW,EAAE,aAAa,IAAI,qBAAqB,CAAC,WAAW,CAAC,aAAa,CAAC,CAC7G,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/routes/configure-rsocket.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="node" resolution-mode="require"/>
+import * as http from 'http';
+import { ReactiveSocketRouter } from '@powersync/service-rsocket-router';
+import { ServiceContext } from '../system/ServiceContext.js';
+import { SocketRouteGenerator } from './router-socket.js';
+import { Context } from './router.js';
+export type RSockerRouterConfig = {
+    service_context: ServiceContext;
+    server: http.Server;
+    route_generators?: SocketRouteGenerator[];
+};
+export declare const DEFAULT_SOCKET_ROUTES: SocketRouteGenerator[];
+export declare function configureRSocket(router: ReactiveSocketRouter<Context>, options: RSockerRouterConfig): void;

package/dist/routes/configure-rsocket.js

@@ -0,0 +1,47 @@
+import { deserialize } from 'bson';
+import { errors, logger } from '@powersync/lib-services-framework';
+import { RSocketRequestMeta } from '@powersync/service-rsocket-router';
+import { generateContext, getTokenFromHeader } from './auth.js';
+import { syncStreamReactive } from './endpoints/socket-route.js';
+import { RSocketContextMeta } from './router-socket.js';
+export const DEFAULT_SOCKET_ROUTES = [syncStreamReactive];
+export function configureRSocket(router, options) {
+    const { route_generators = DEFAULT_SOCKET_ROUTES, server, service_context } = options;
+    router.applyWebSocketEndpoints(server, {
+        contextProvider: async (data) => {
+            const { token, user_agent } = RSocketContextMeta.decode(deserialize(data));
+            if (!token) {
+                throw new errors.AuthorizationError('No token provided');
+            }
+            try {
+                const extracted_token = getTokenFromHeader(token);
+                if (extracted_token != null) {
+                    const { context, errors: token_errors } = await generateContext(options.service_context, extracted_token);
+                    if (context?.token_payload == null) {
+                        throw new errors.AuthorizationError(token_errors ?? 'Authentication required');
+                    }
+                    return {
+                        token,
+                        user_agent,
+                        ...context,
+                        token_errors: token_errors,
+                        service_context
+                    };
+                }
+                else {
+                    throw new errors.AuthorizationError('No token provided');
+                }
+            }
+            catch (ex) {
+                logger.error(ex);
+                throw ex;
+            }
+        },
+        endpoints: route_generators.map((generator) => generator(router)),
+        metaDecoder: async (meta) => {
+            return RSocketRequestMeta.decode(deserialize(meta));
+        },
+        payloadDecoder: async (rawData) => rawData && deserialize(rawData)
+    });
+}
+//# sourceMappingURL=configure-rsocket.js.map

package/dist/routes/configure-rsocket.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configure-rsocket.js","sourceRoot":"","sources":["../../src/routes/configure-rsocket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAwB,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAG7F,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAwB,MAAM,oBAAoB,CAAC;AAS9E,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAE1D,MAAM,UAAU,gBAAgB,CAAC,MAAqC,EAAE,OAA4B;IAClG,MAAM,EAAE,gBAAgB,GAAG,qBAAqB,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IAEtF,MAAM,CAAC,uBAAuB,CAAC,MAAM,EAAE;QACrC,eAAe,EAAE,KAAK,EAAE,IAAY,EAAE,EAAE;YACtC,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAQ,CAAC,CAAC;YAElF,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;aAC1D;YAED,IAAI;gBACF,MAAM,eAAe,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAClD,IAAI,eAAe,IAAI,IAAI,EAAE;oBAC3B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;oBAC1G,IAAI,OAAO,EAAE,aAAa,IAAI,IAAI,EAAE;wBAClC,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,YAAY,IAAI,yBAAyB,CAAC,CAAC;qBAChF;oBACD,OAAO;wBACL,KAAK;wBACL,UAAU;wBACV,GAAG,OAAO;wBACV,YAAY,EAAE,YAAY;wBAC1B,eAAe;qBAChB,CAAC;iBACH;qBAAM;oBACL,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;iBAC1D;aACF;YAAC,OAAO,EAAE,EAAE;gBACX,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACjB,MAAM,EAAE,CAAC;aACV;QACH,CAAC;QACD,SAAS,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACjE,WAAW,EAAE,KAAK,EAAE,IAAY,EAAE,EAAE;YAClC,OAAO,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAQ,CAAC,CAAC;QAC7D,CAAC;QACD,cAAc,EAAE,KAAK,EAAE,OAAgB,EAAE,EAAE,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC;KAC5E,CAAC,CAAC;AACL,CAAC"}

package/dist/routes/endpoints/admin.d.ts

@@ -490,40 +490,6 @@ export declare const validate: router.Endpoint<{
     }>;
 };
 export declare const ADMIN_ROUTES: ((router.Endpoint<{
-    connection_id?: string | undefined;
-}, {
-    credentials?: {
-        postgres_uri: string;
-    } | undefined;
-}, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{
-    connection_id?: string | undefined;
-}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{
-    connection_id?: string | undefined;
-}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, {
-    credentials?: {
-        postgres_uri: string;
-    } | undefined;
-}>> & {
-    path: string;
-    method: router.HTTPMethod.POST;
-    authorize: (payload: import("../router.js").RequestEndpointHandlerPayload) => {
-        authorized: boolean;
-        errors: string[];
-    } | {
-        authorized: boolean;
-        errors?: undefined;
-    };
-    validator: schema.MicroValidator<{
-        connection_id?: string | undefined;
-    }, string[]>;
-    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{
-        connection_id?: string | undefined;
-    }, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
-        credentials?: {
-            postgres_uri: string;
-        } | undefined;
-    }>;
-}) | (router.Endpoint<{
     sql: {
         query: string;
         args: (string | number | boolean)[];

package/dist/routes/endpoints/admin.js

@@ -1,38 +1,19 @@
 import { errors, router, schema } from '@powersync/lib-services-framework';
-import { SqlSyncRules, StaticSchema, isJsonValue, toSyncRulesValue } from '@powersync/service-sync-rules';
+import { SqlSyncRules, StaticSchema } from '@powersync/service-sync-rules';
 import { internal_routes } from '@powersync/service-types';
 import * as api from '../../api/api-index.js';
-import * as util from '../../util/util-index.js';
-import { routeDefinition } from '../router.js';
 import { authApi } from '../auth.js';
-const demoCredentials = routeDefinition({
-    path: '/api/admin/v1/demo-credentials',
-    method: router.HTTPMethod.POST,
-    authorize: authApi,
-    validator: schema.createTsCodecValidator(internal_routes.DemoCredentialsRequest, {
-        allowAdditional: true
-    }),
-    handler: async (payload) => {
-        const connection = payload.context.system.config.connection;
-        if (connection == null || !connection.demo_database) {
-            return internal_routes.DemoCredentialsResponse.encode({});
-        }
-        const uri = util.buildDemoPgUri(connection);
-        return internal_routes.DemoCredentialsResponse.encode({
-            credentials: {
-                postgres_uri: uri
-            }
-        });
-    }
-});
+import { routeDefinition } from '../router.js';
 export const executeSql = routeDefinition({
     path: '/api/admin/v1/execute-sql',
     method: router.HTTPMethod.POST,
     authorize: authApi,
     validator: schema.createTsCodecValidator(internal_routes.ExecuteSqlRequest, { allowAdditional: true }),
     handler: async (payload) => {
-        const connection = payload.context.system.config.connection;
-        if (connection == null || !connection.debug_api) {
+        const { params: { sql: { query, args } } } = payload;
+        const apiHandler = payload.context.service_context.routerEngine.getAPI();
+        const sourceConfig = await apiHandler.getSourceConfig();
+        if (!sourceConfig.debug_api) {
             return internal_routes.ExecuteSqlResponse.encode({
                 results: {
                     columns: [],
@@ -42,33 +23,7 @@ export const executeSql = routeDefinition({
                 error: 'SQL querying is not enabled'
             });
         }
-        const pool = payload.context.system.requirePgPool();
-        const { query, args } = payload.params.sql;
-        try {
-            const result = await pool.query({
-                statement: query,
-                params: args.map(util.autoParameter)
-            });
-            return internal_routes.ExecuteSqlResponse.encode({
-                success: true,
-                results: {
-                    columns: result.columns.map((c) => c.name),
-                    rows: result.rows.map((row) => {
-                        return row.map((value) => mapColumnValue(toSyncRulesValue(value)));
-                    })
-                }
-            });
-        }
-        catch (e) {
-            return internal_routes.ExecuteSqlResponse.encode({
-                results: {
-                    columns: [],
-                    rows: []
-                },
-                success: false,
-                error: e.message
-            });
-        }
+        return internal_routes.ExecuteSqlResponse.encode(await apiHandler.executeQuery(query, args));
     }
 });
 export const diagnostics = routeDefinition({
@@ -77,29 +32,37 @@ export const diagnostics = routeDefinition({
     authorize: authApi,
     validator: schema.createTsCodecValidator(internal_routes.DiagnosticsRequest, { allowAdditional: true }),
     handler: async (payload) => {
+        const { context } = payload;
+        const { service_context } = context;
         const include_content = payload.params.sync_rules_content ?? false;
-        const system = payload.context.system;
-        const status = await api.getConnectionStatus(system);
-        if (status == null) {
+        const apiHandler = service_context.routerEngine.getAPI();
+        const status = await apiHandler.getConnectionStatus();
+        if (!status) {
             return internal_routes.DiagnosticsResponse.encode({
                 connections: []
             });
         }
-        const { storage } = system;
-        const active = await storage.getActiveSyncRulesContent();
-        const next = await storage.getNextSyncRulesContent();
-        const active_status = await api.getSyncRulesStatus(active, system, {
+        const { storageEngine: { activeBucketStorage } } = service_context;
+        const active = await activeBucketStorage.getActiveSyncRulesContent();
+        const next = await activeBucketStorage.getNextSyncRulesContent();
+        const active_status = await api.getSyncRulesStatus(activeBucketStorage, apiHandler, active, {
             include_content,
             check_connection: status.connected,
             live_status: true
         });
-        const next_status = await api.getSyncRulesStatus(next, system, {
+        const next_status = await api.getSyncRulesStatus(activeBucketStorage, apiHandler, next, {
             include_content,
             check_connection: status.connected,
             live_status: true
         });
         return internal_routes.DiagnosticsResponse.encode({
-            connections: [status],
+            connections: [
+                {
+                    ...status,
+                    // TODO update this in future
+                    postgres_uri: status.uri
+                }
+            ],
             active_sync_rules: active_status,
             deploying_sync_rules: next_status
         });
@@ -111,8 +74,8 @@ export const getSchema = routeDefinition({
     authorize: authApi,
     validator: schema.createTsCodecValidator(internal_routes.GetSchemaRequest, { allowAdditional: true }),
     handler: async (payload) => {
-        const system = payload.context.system;
-        return internal_routes.GetSchemaResponse.encode(await api.getConnectionsSchema(system));
+        const apiHandler = payload.context.service_context.routerEngine.getAPI();
+        return internal_routes.GetSchemaResponse.encode(await api.getConnectionsSchema(apiHandler));
     }
 });
 export const reprocess = routeDefinition({
@@ -121,13 +84,14 @@ export const reprocess = routeDefinition({
     authorize: authApi,
     validator: schema.createTsCodecValidator(internal_routes.ReprocessRequest, { allowAdditional: true }),
     handler: async (payload) => {
-        const system = payload.context.system;
-        const storage = system.storage;
-        const next = await storage.getNextSyncRules();
+        const { context: { service_context } } = payload;
+        const { storageEngine: { activeBucketStorage } } = service_context;
+        const apiHandler = service_context.routerEngine.getAPI();
+        const next = await activeBucketStorage.getNextSyncRules(apiHandler.getParseSyncRulesOptions());
         if (next != null) {
             throw new Error(`Busy processing sync rules - cannot reprocess`);
         }
-        const active = await storage.getActiveSyncRules();
+        const active = await activeBucketStorage.getActiveSyncRules(apiHandler.getParseSyncRulesOptions());
         if (active == null) {
             throw new errors.JourneyError({
                 status: 422,
@@ -135,14 +99,16 @@ export const reprocess = routeDefinition({
                 description: 'No active sync rules'
             });
         }
-        const new_rules = await storage.updateSyncRules({
+        const new_rules = await activeBucketStorage.updateSyncRules({
             content: active.sync_rules.content
         });
+        const baseConfig = await apiHandler.getSourceConfig();
         return internal_routes.ReprocessResponse.encode({
             connections: [
                 {
-                    tag: system.config.connection.tag,
-                    id: system.config.connection.id,
+                    // Previously the connection was asserted with `!`
+                    tag: baseConfig.tag,
+                    id: baseConfig.id,
                     slot_name: new_rules.slot_name
                 }
             ]
@@ -155,9 +121,10 @@ export const validate = routeDefinition({
     authorize: authApi,
     validator: schema.createTsCodecValidator(internal_routes.ValidateRequest, { allowAdditional: true }),
     handler: async (payload) => {
-        const system = payload.context.system;
+        const { context: { service_context } } = payload;
         const content = payload.params.sync_rules;
-        const schemaData = await api.getConnectionsSchema(system);
+        const apiHandler = service_context.routerEngine.getAPI();
+        const schemaData = await api.getConnectionsSchema(apiHandler);
         const schema = new StaticSchema(schemaData.connections);
         const sync_rules = {
             // Dummy values
@@ -166,7 +133,10 @@ export const validate = routeDefinition({
             parsed() {
                 return {
                     ...this,
-                    sync_rules: SqlSyncRules.fromYaml(content, { throwOnError: false, schema })
+                    sync_rules: SqlSyncRules.fromYaml(content, {
+                        ...apiHandler.getParseSyncRulesOptions(),
+                        schema
+                    })
                 };
             },
             sync_rules_content: content,
@@ -174,16 +144,16 @@ export const validate = routeDefinition({
                 throw new Error('Lock not implemented');
             }
         };
-        const connectionStatus = await api.getConnectionStatus(system);
-        if (connectionStatus == null) {
+        const connectionStatus = await apiHandler.getConnectionStatus();
+        if (!connectionStatus) {
             return internal_routes.ValidateResponse.encode({
                 errors: [{ level: 'fatal', message: 'No connection configured' }],
                 connections: []
             });
         }
-        const status = (await api.getSyncRulesStatus(sync_rules, system, {
+        const status = (await api.getSyncRulesStatus(service_context.storageEngine.activeBucketStorage, apiHandler, sync_rules, {
             include_content: false,
-            check_connection: connectionStatus?.connected,
+            check_connection: connectionStatus.connected,
             live_status: false
         }));
         if (connectionStatus == null) {
@@ -192,16 +162,5 @@ export const validate = routeDefinition({
         return internal_routes.ValidateResponse.encode(status);
     }
 });
-function mapColumnValue(value) {
-    if (typeof value == 'bigint') {
-        return Number(value);
-    }
-    else if (isJsonValue(value)) {
-        return value;
-    }
-    else {
-        return null;
-    }
-}
-export const ADMIN_ROUTES = [demoCredentials, executeSql, diagnostics, getSchema, reprocess, validate];
+export const ADMIN_ROUTES = [executeSql, diagnostics, getSchema, reprocess, validate];
 //# sourceMappingURL=admin.js.map

package/dist/routes/endpoints/admin.js.map

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

package/dist/routes/endpoints/checkpointing.d.ts

@@ -1,7 +1,13 @@
 import { router, schema } from '@powersync/lib-services-framework';
-export declare const writeCheckpoint: router.Endpoint<{}, {
+export declare const writeCheckpoint: router.Endpoint<{
+    client_id?: string | undefined;
+}, {
     checkpoint: string;
-}, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, {
+}, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{
+    client_id?: string | undefined;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{
+    client_id?: string | undefined;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, {
     checkpoint: string;
 }>> & {
     path: string;
@@ -13,14 +19,24 @@ export declare const writeCheckpoint: router.Endpoint<{}, {
         authorized: boolean;
         errors?: undefined;
     }>;
-    validator: schema.MicroValidator<{}, string[]>;
-    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
+    validator: schema.MicroValidator<{
+        client_id?: string | undefined;
+    }, string[]>;
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{
+        client_id?: string | undefined;
+    }, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
         checkpoint: string;
     }>;
 };
-export declare const writeCheckpoint2: router.Endpoint<{}, {
+export declare const writeCheckpoint2: router.Endpoint<{
+    client_id?: string | undefined;
+}, {
     write_checkpoint: string;
-}, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, {
+}, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{
+    client_id?: string | undefined;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{
+    client_id?: string | undefined;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, {
     write_checkpoint: string;
 }>> & {
     path: string;
@@ -32,14 +48,24 @@ export declare const writeCheckpoint2: router.Endpoint<{}, {
         authorized: boolean;
         errors?: undefined;
     }>;
-    validator: schema.MicroValidator<{}, string[]>;
-    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
+    validator: schema.MicroValidator<{
+        client_id?: string | undefined;
+    }, string[]>;
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{
+        client_id?: string | undefined;
+    }, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
         write_checkpoint: string;
     }>;
 };
-export declare const CHECKPOINT_ROUTES: ((router.Endpoint<{}, {
+export declare const CHECKPOINT_ROUTES: ((router.Endpoint<{
+    client_id?: string | undefined;
+}, {
     checkpoint: string;
-}, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, {
+}, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{
+    client_id?: string | undefined;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{
+    client_id?: string | undefined;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, {
     checkpoint: string;
 }>> & {
     path: string;
@@ -51,13 +77,23 @@ export declare const CHECKPOINT_ROUTES: ((router.Endpoint<{}, {
         authorized: boolean;
         errors?: undefined;
     }>;
-    validator: schema.MicroValidator<{}, string[]>;
-    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
+    validator: schema.MicroValidator<{
+        client_id?: string | undefined;
+    }, string[]>;
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{
+        client_id?: string | undefined;
+    }, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
         checkpoint: string;
     }>;
-}) | (router.Endpoint<{}, {
+}) | (router.Endpoint<{
+    client_id?: string | undefined;
+}, {
     write_checkpoint: string;
-}, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, {
+}, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{
+    client_id?: string | undefined;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{
+    client_id?: string | undefined;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, {
     write_checkpoint: string;
 }>> & {
     path: string;
@@ -69,8 +105,12 @@ export declare const CHECKPOINT_ROUTES: ((router.Endpoint<{}, {
         authorized: boolean;
         errors?: undefined;
     }>;
-    validator: schema.MicroValidator<{}, string[]>;
-    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
+    validator: schema.MicroValidator<{
+        client_id?: string | undefined;
+    }, string[]>;
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{
+        client_id?: string | undefined;
+    }, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
         write_checkpoint: string;
     }>;
 }))[];

package/dist/routes/endpoints/checkpointing.js

@@ -1,21 +1,37 @@
 import * as t from 'ts-codec';
-import { router, schema } from '@powersync/lib-services-framework';
+import { logger, router, schema } from '@powersync/lib-services-framework';
 import * as util from '../../util/util-index.js';
 import { authUser } from '../auth.js';
 import { routeDefinition } from '../router.js';
-const WriteCheckpointRequest = t.object({});
+const WriteCheckpointRequest = t.object({
+    client_id: t.string.optional()
+});
 export const writeCheckpoint = routeDefinition({
     path: '/write-checkpoint.json',
     method: router.HTTPMethod.GET,
     authorize: authUser,
     validator: schema.createTsCodecValidator(WriteCheckpointRequest, { allowAdditional: true }),
     handler: async (payload) => {
-        const system = payload.context.system;
-        const storage = system.storage;
-        const checkpoint = await util.getClientCheckpoint(system.requirePgPool(), storage);
-        return {
-            checkpoint
-        };
+        const { context: { service_context } } = payload;
+        const apiHandler = service_context.routerEngine.getAPI();
+        // 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 start = Date.now();
+        const head = await apiHandler.getReplicationHead();
+        const timeout = 50000;
+        logger.info(`Waiting for LSN checkpoint: ${head}`);
+        while (Date.now() - start < timeout) {
+            const cp = await service_context.storageEngine.activeBucketStorage.getActiveCheckpoint();
+            if (!cp.hasSyncRules()) {
+                throw new Error('No sync rules available');
+            }
+            if (cp.lsn && cp.lsn >= head) {
+                logger.info(`Got write checkpoint: ${head} : ${cp.checkpoint}`);
+                return { checkpoint: cp.checkpoint };
+            }
+            await new Promise((resolve) => setTimeout(resolve, 30));
+        }
+        throw new Error('Timeout while waiting for checkpoint');
     }
 });
 export const writeCheckpoint2 = routeDefinition({
@@ -24,11 +40,16 @@ export const writeCheckpoint2 = routeDefinition({
     authorize: authUser,
     validator: schema.createTsCodecValidator(WriteCheckpointRequest, { allowAdditional: true }),
     handler: async (payload) => {
-        const { user_id, system } = payload.context;
-        const storage = system.storage;
-        const write_checkpoint = await util.createWriteCheckpoint(system.requirePgPool(), storage, user_id);
+        const { user_id, service_context } = payload.context;
+        const apiHandler = service_context.routerEngine.getAPI();
+        const client_id = payload.params.client_id;
+        const full_user_id = util.checkpointUserId(user_id, client_id);
+        const currentCheckpoint = await apiHandler.getReplicationHead();
+        const { storageEngine: { activeBucketStorage } } = service_context;
+        const writeCheckpoint = await activeBucketStorage.createWriteCheckpoint(full_user_id, { '1': currentCheckpoint });
+        logger.info(`Write checkpoint 2: ${JSON.stringify({ currentCheckpoint, id: String(full_user_id) })}`);
         return {
-            write_checkpoint: String(write_checkpoint)
+            write_checkpoint: String(writeCheckpoint)
         };
     }
 });