@powersync/service-core 0.2.2 → 0.3.0

package/dist/routes/endpoints/route-endpoints-index.d.ts

@@ -0,0 +1,6 @@
+export * from './admin.js';
+export * from './checkpointing.js';
+export * from './dev.js';
+export * from './socket-route.js';
+export * from './sync-rules.js';
+export * from './sync-stream.js';

package/dist/routes/endpoints/route-endpoints-index.js

@@ -0,0 +1,7 @@
+export * from './admin.js';
+export * from './checkpointing.js';
+export * from './dev.js';
+export * from './socket-route.js';
+export * from './sync-rules.js';
+export * from './sync-stream.js';
+//# sourceMappingURL=route-endpoints-index.js.map

package/dist/routes/endpoints/route-endpoints-index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-endpoints-index.js","sourceRoot":"","sources":["../../../src/routes/endpoints/route-endpoints-index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}

package/dist/routes/endpoints/socket-route.d.ts

@@ -0,0 +1,2 @@
+import { SocketRouteGenerator } from '../router-socket.js';
+export declare const syncStreamReactive: SocketRouteGenerator;

package/dist/routes/{socket-route.js → endpoints/socket-route.js}

@@ -1,22 +1,22 @@
 import { serialize } from 'bson';
 import { normalizeTokenParameters } from '@powersync/service-sync-rules';
-import * as micro from '@journeyapps-platform/micro';
-import * as util from '../util/util-index.js';
-import { streamResponse } from '../sync/sync.js';
+import { errors, logger, schema } from '@powersync/lib-services-framework';
+import * as util from '../../util/util-index.js';
+import { streamResponse } from '../../sync/sync.js';
 import { SyncRoutes } from './sync-stream.js';
-import { Metrics } from '../metrics/Metrics.js';
-export const sync_stream_reactive = (router) => router.reactiveStream(SyncRoutes.STREAM, {
+import { Metrics } from '../../metrics/Metrics.js';
+export const syncStreamReactive = (router) => router.reactiveStream(SyncRoutes.STREAM, {
     authorize: ({ context }) => {
         return {
             authorized: !!context.token_payload,
             errors: ['Authentication required'].concat(context.token_errors ?? [])
         };
     },
-    validator: micro.schema.createTsCodecValidator(util.StreamingSyncRequest, { allowAdditional: true }),
+    validator: schema.createTsCodecValidator(util.StreamingSyncRequest, { allowAdditional: true }),
     handler: async ({ context, params, responder, observer, initialN }) => {
         const { system } = context;
         if (system.closed) {
-            responder.onError(new micro.errors.JourneyError({
+            responder.onError(new errors.JourneyError({
                 status: 503,
                 code: 'SERVICE_UNAVAILABLE',
                 description: 'Service temporarily unavailable'
@@ -30,7 +30,7 @@ export const sync_stream_reactive = (router) => router.reactiveStream(SyncRoutes
         // Sanity check before we start the stream
         const cp = await storage.getActiveCheckpoint();
         if (!cp.hasSyncRules()) {
-            responder.onError(new micro.errors.JourneyError({
+            responder.onError(new errors.JourneyError({
                 status: 500,
                 code: 'NO_SYNC_RULES',
                 description: 'No sync rules available'
@@ -104,8 +104,8 @@ export const sync_stream_reactive = (router) => router.reactiveStream(SyncRoutes
         catch (ex) {
             // Convert to our standard form before responding.
             // This ensures the error can be serialized.
-            const error = new micro.errors.InternalServerError(ex);
-            micro.logger.error('Sync stream error', error);
+            const error = new errors.InternalServerError(ex);
+            logger.error('Sync stream error', error);
             responder.onError(error);
         }
         finally {

package/dist/routes/endpoints/socket-route.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"socket-route.js","sourceRoot":"","sources":["../../../src/routes/endpoints/socket-route.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAkB,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzF,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAE3E,OAAO,KAAK,IAAI,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,MAAM,CAAC,MAAM,kBAAkB,GAAyB,CAAC,MAAM,EAAE,EAAE,CACjE,MAAM,CAAC,cAAc,CAAiC,UAAU,CAAC,MAAM,EAAE;IACvE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;QACzB,OAAO;YACL,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa;YACnC,MAAM,EAAE,CAAC,yBAAyB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;SACvE,CAAC;IACJ,CAAC;IACD,SAAS,EAAE,MAAM,CAAC,sBAAsB,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;IAC9F,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAE3B,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,SAAS,CAAC,OAAO,CACf,IAAI,MAAM,CAAC,YAAY,CAAC;gBACtB,MAAM,EAAE,GAAG;gBACX,IAAI,EAAE,qBAAqB;gBAC3B,WAAW,EAAE,iCAAiC;aAC/C,CAAC,CACH,CAAC;YACF,SAAS,CAAC,UAAU,EAAE,CAAC;YACvB,OAAO;SACR;QAED,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QAEzC,MAAM,UAAU,GAAmB,wBAAwB,CACzD,OAAO,CAAC,aAAa,EAAE,UAAU,IAAI,EAAE,EACvC,MAAM,CAAC,UAAU,IAAI,EAAE,CACxB,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC/B,0CAA0C;QAC1C,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAC/C,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE;YACtB,SAAS,CAAC,OAAO,CACf,IAAI,MAAM,CAAC,YAAY,CAAC;gBACtB,MAAM,EAAE,GAAG;gBACX,IAAI,EAAE,eAAe;gBACrB,WAAW,EAAE,yBAAyB;aACvC,CAAC,CACH,CAAC;YACF,SAAS,CAAC,UAAU,EAAE,CAAC;YACvB,OAAO;SACR;QAED,IAAI,UAAU,GAAG,QAAQ,CAAC;QAC1B,MAAM,QAAQ,GAAG,QAAQ,CAAC,gBAAgB,CAAC;YACzC,OAAO,CAAC,CAAC;gBACP,UAAU,IAAI,CAAC,CAAC;YAClB,CAAC;YACD,MAAM,EAAE,GAAG,EAAE;gBACX,UAAU,CAAC,KAAK,EAAE,CAAC;YACrB,CAAC;SACF,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE;YACnD,QAAQ,CAAC,aAAa,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,WAAW,EAAE,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACpD,IAAI;YACF,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,cAAc,CAAC;gBACtC,OAAO;gBACP,MAAM,EAAE;oBACN,GAAG,MAAM;oBACT,WAAW,EAAE,IAAI,CAAC,8BAA8B;iBACjD;gBACD,UAAU;gBACV,KAAK,EAAE,OAAQ,CAAC,aAAc;gBAC9B,kBAAkB,EAAE;oBAClB,8CAA8C;oBAC9C,UAAU,EAAE,KAAK;iBAClB;gBACD,MAAM,EAAE,UAAU,CAAC,MAAM;aAC1B,CAAC,EAAE;gBACF,IAAI,IAAI,IAAI,IAAI,EAAE;oBAChB,4CAA4C;oBAC5C,SAAS;iBACV;qBAAM,IAAI,OAAO,IAAI,IAAI,QAAQ,EAAE;oBAClC,2CAA2C;oBAC3C,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;iBACpD;gBAED;oBACE,+CAA+C;oBAC/C,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAW,CAAC;oBAC7C,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,KAAK,CAAC,CAAC;oBAC9C,UAAU,EAAE,CAAC;oBACb,OAAO,CAAC,WAAW,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;iBAChE;gBAED,IAAI,UAAU,IAAI,CAAC,EAAE;oBACnB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;wBAClC,MAAM,CAAC,GAAG,QAAQ,CAAC,gBAAgB,CAAC;4BAClC,OAAO;gCACL,IAAI,UAAU,GAAG,CAAC,EAAE;oCAClB,iEAAiE;oCACjE,OAAO,EAAE,CAAC;oCACV,CAAC,EAAE,CAAC;iCACL;4BACH,CAAC;4BACD,MAAM,EAAE,GAAG,EAAE;gCACX,8CAA8C;gCAC9C,OAAO,EAAE,CAAC;gCACV,CAAC,EAAE,CAAC;4BACN,CAAC;yBACF,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;iBACJ;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,kDAAkD;YAClD,4CAA4C;YAC5C,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;YACjD,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;YACzC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SAC1B;gBAAS;YACR,SAAS,CAAC,UAAU,EAAE,CAAC;YACvB,iBAAiB,EAAE,CAAC;YACpB,QAAQ,EAAE,CAAC;YACX,OAAO,CAAC,WAAW,EAAE,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SACtD;IACH,CAAC;CACF,CAAC,CAAC"}

package/dist/routes/endpoints/sync-rules.d.ts

@@ -0,0 +1,174 @@
+import type { FastifyPluginAsync } from 'fastify';
+import { router, schema } from '@powersync/lib-services-framework';
+export declare const yamlPlugin: FastifyPluginAsync;
+export declare const deploySyncRules: router.Endpoint<{
+    content: string;
+}, {
+    slot_name: string;
+}, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{
+    content: string;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{
+    content: string;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, {
+    slot_name: string;
+}>> & {
+    path: string;
+    method: router.HTTPMethod.POST;
+    authorize: (payload: import("../router.js").RequestEndpointHandlerPayload) => {
+        authorized: boolean;
+        errors: string[];
+    } | {
+        authorized: boolean;
+        errors?: undefined;
+    };
+    parse: boolean;
+    plugins: FastifyPluginAsync[];
+    validator: schema.MicroValidator<{
+        content: string;
+    }, string[]>;
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{
+        content: string;
+    }, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
+        slot_name: string;
+    }>;
+};
+export declare const validateSyncRules: router.Endpoint<{
+    content: string;
+}, router.RouterResponse<string>, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{
+    content: string;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{
+    content: string;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.RouterResponse<string>>> & {
+    path: string;
+    method: router.HTTPMethod.POST;
+    authorize: (payload: import("../router.js").RequestEndpointHandlerPayload) => {
+        authorized: boolean;
+        errors: string[];
+    } | {
+        authorized: boolean;
+        errors?: undefined;
+    };
+    parse: boolean;
+    plugins: FastifyPluginAsync[];
+    validator: schema.MicroValidator<{
+        content: string;
+    }, string[]>;
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{
+        content: string;
+    }, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<router.RouterResponse<string>>;
+};
+export declare const currentSyncRules: router.Endpoint<any, router.RouterResponse<string>, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<any, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<any, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.RouterResponse<string>>> & {
+    path: string;
+    method: router.HTTPMethod.GET;
+    authorize: (payload: import("../router.js").RequestEndpointHandlerPayload) => {
+        authorized: boolean;
+        errors: string[];
+    } | {
+        authorized: boolean;
+        errors?: undefined;
+    };
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<any, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<router.RouterResponse<string>>;
+};
+export declare const reprocessSyncRules: router.Endpoint<{}, {
+    slot_name: 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>, {
+    slot_name: string;
+}>> & {
+    path: string;
+    method: router.HTTPMethod.POST;
+    authorize: (payload: import("../router.js").RequestEndpointHandlerPayload) => {
+        authorized: boolean;
+        errors: string[];
+    } | {
+        authorized: boolean;
+        errors?: undefined;
+    };
+    validator: schema.MicroValidator<{}, string[]>;
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
+        slot_name: string;
+    }>;
+};
+export declare const SYNC_RULES_ROUTES: ((router.Endpoint<{
+    content: string;
+}, {
+    slot_name: string;
+}, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{
+    content: string;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{
+    content: string;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, {
+    slot_name: string;
+}>> & {
+    path: string;
+    method: router.HTTPMethod.POST;
+    authorize: (payload: import("../router.js").RequestEndpointHandlerPayload) => {
+        authorized: boolean;
+        errors: string[];
+    } | {
+        authorized: boolean;
+        errors?: undefined;
+    };
+    parse: boolean;
+    plugins: FastifyPluginAsync[];
+    validator: schema.MicroValidator<{
+        content: string;
+    }, string[]>;
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{
+        content: string;
+    }, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
+        slot_name: string;
+    }>;
+}) | (router.Endpoint<{
+    content: string;
+}, router.RouterResponse<string>, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{
+    content: string;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{
+    content: string;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.RouterResponse<string>>> & {
+    path: string;
+    method: router.HTTPMethod.POST;
+    authorize: (payload: import("../router.js").RequestEndpointHandlerPayload) => {
+        authorized: boolean;
+        errors: string[];
+    } | {
+        authorized: boolean;
+        errors?: undefined;
+    };
+    parse: boolean;
+    plugins: FastifyPluginAsync[];
+    validator: schema.MicroValidator<{
+        content: string;
+    }, string[]>;
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{
+        content: string;
+    }, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<router.RouterResponse<string>>;
+}) | (router.Endpoint<any, router.RouterResponse<string>, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<any, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<any, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.RouterResponse<string>>> & {
+    path: string;
+    method: router.HTTPMethod.GET;
+    authorize: (payload: import("../router.js").RequestEndpointHandlerPayload) => {
+        authorized: boolean;
+        errors: string[];
+    } | {
+        authorized: boolean;
+        errors?: undefined;
+    };
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<any, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<router.RouterResponse<string>>;
+}) | (router.Endpoint<{}, {
+    slot_name: 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>, {
+    slot_name: string;
+}>> & {
+    path: string;
+    method: router.HTTPMethod.POST;
+    authorize: (payload: import("../router.js").RequestEndpointHandlerPayload) => {
+        authorized: boolean;
+        errors: string[];
+    } | {
+        authorized: boolean;
+        errors?: undefined;
+    };
+    validator: schema.MicroValidator<{}, string[]>;
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{}, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<{
+        slot_name: string;
+    }>;
+}))[];

package/dist/routes/{sync-rules.js → endpoints/sync-rules.js}

@@ -1,26 +1,39 @@
 import * as t from 'ts-codec';
-import * as micro from '@journeyapps-platform/micro';
+import { errors, router, schema } from '@powersync/lib-services-framework';
 import { SqlSyncRules, SyncRulesErrors } from '@powersync/service-sync-rules';
-import * as replication from '../replication/replication-index.js';
-import { authApi } from './auth.js';
+import * as replication from '../../replication/replication-index.js';
+import { authApi } from '../auth.js';
+import { routeDefinition } from '../router.js';
 const DeploySyncRulesRequest = t.object({
     content: t.string
 });
-const yamlPlugin = async (fastify) => {
+export const yamlPlugin = async (fastify) => {
     fastify.addContentTypeParser('application/yaml', async (request, payload, _d) => {
-        const data = await micro.streaming.drain(payload);
+        const data = [];
+        for await (const chunk of payload) {
+            data.push(chunk);
+        }
         request.params = { content: Buffer.concat(data).toString('utf8') };
     });
 };
-export const deploySyncRules = (router) => router.post('/api/sync-rules/v1/deploy', {
+/**
+ * Declares the plugin should be available on the same scope
+ * without requiring the `fastify-plugin` package as a dependency.
+ * https://fastify.dev/docs/latest/Reference/Plugins/#handle-the-scope
+ */
+//@ts-expect-error
+yamlPlugin[Symbol.for('skip-override')] = true;
+export const deploySyncRules = routeDefinition({
+    path: '/api/sync-rules/v1/deploy',
+    method: router.HTTPMethod.POST,
     authorize: authApi,
     parse: true,
     plugins: [yamlPlugin],
-    validator: micro.schema.createTsCodecValidator(DeploySyncRulesRequest, { allowAdditional: true }),
+    validator: schema.createTsCodecValidator(DeploySyncRulesRequest, { allowAdditional: true }),
     handler: async (payload) => {
         if (payload.context.system.config.sync_rules.present) {
             // If sync rules are configured via the config, disable deploy via the API.
-            throw new micro.errors.JourneyError({
+            throw new errors.JourneyError({
                 status: 422,
                 code: 'API_DISABLED',
                 description: 'Sync rules API disabled',
@@ -32,7 +45,7 @@ export const deploySyncRules = (router) => router.post('/api/sync-rules/v1/deplo
             SqlSyncRules.fromYaml(payload.params.content);
         }
         catch (e) {
-            throw new micro.errors.JourneyError({
+            throw new errors.JourneyError({
                 status: 422,
                 code: 'INVALID_SYNC_RULES',
                 description: 'Sync rules parsing failed',
@@ -50,24 +63,28 @@ export const deploySyncRules = (router) => router.post('/api/sync-rules/v1/deplo
 const ValidateSyncRulesRequest = t.object({
     content: t.string
 });
-export const validateSyncRules = (router) => router.post('/api/sync-rules/v1/validate', {
+export const validateSyncRules = routeDefinition({
+    path: '/api/sync-rules/v1/validate',
+    method: router.HTTPMethod.POST,
     authorize: authApi,
     parse: true,
     plugins: [yamlPlugin],
-    validator: micro.schema.createTsCodecValidator(ValidateSyncRulesRequest, { allowAdditional: true }),
+    validator: schema.createTsCodecValidator(ValidateSyncRulesRequest, { allowAdditional: true }),
     handler: async (payload) => {
         const content = payload.params.content;
         const info = await debugSyncRules(payload.context.system.requirePgPool(), content);
-        replyPrettyJson(payload.reply, info);
+        return replyPrettyJson(info);
     }
 });
-export const currentSyncRules = (router) => router.get('/api/sync-rules/v1/current', {
+export const currentSyncRules = routeDefinition({
+    path: '/api/sync-rules/v1/current',
+    method: router.HTTPMethod.GET,
     authorize: authApi,
     handler: async (payload) => {
         const storage = payload.context.system.storage;
         const sync_rules = await storage.getActiveSyncRulesContent();
         if (!sync_rules) {
-            throw new micro.errors.JourneyError({
+            throw new errors.JourneyError({
                 status: 422,
                 code: 'NO_SYNC_RULES',
                 description: 'No active sync rules'
@@ -92,18 +109,20 @@ export const currentSyncRules = (router) => router.get('/api/sync-rules/v1/curre
                     ...next_info
                 }
         };
-        replyPrettyJson(payload.reply, { data: response });
+        return replyPrettyJson({ data: response });
     }
 });
 const ReprocessSyncRulesRequest = t.object({});
-export const reprocessSyncRules = (router) => router.post('/api/sync-rules/v1/reprocess', {
+export const reprocessSyncRules = routeDefinition({
+    path: '/api/sync-rules/v1/reprocess',
+    method: router.HTTPMethod.POST,
     authorize: authApi,
-    validator: micro.schema.createTsCodecValidator(ReprocessSyncRulesRequest),
+    validator: schema.createTsCodecValidator(ReprocessSyncRulesRequest),
     handler: async (payload) => {
         const storage = payload.context.system.storage;
         const sync_rules = await storage.getActiveSyncRules();
         if (sync_rules == null) {
-            throw new micro.errors.JourneyError({
+            throw new errors.JourneyError({
                 status: 422,
                 code: 'NO_SYNC_RULES',
                 description: 'No active sync rules'
@@ -117,12 +136,13 @@ export const reprocessSyncRules = (router) => router.post('/api/sync-rules/v1/re
         };
     }
 });
-export const syncRulesRoutes = [validateSyncRules, deploySyncRules, reprocessSyncRules, currentSyncRules];
-function replyPrettyJson(reply, payload) {
-    reply
-        .status(200)
-        .header('Content-Type', 'application/json')
-        .send(JSON.stringify(payload, null, 2) + '\n');
+export const SYNC_RULES_ROUTES = [validateSyncRules, deploySyncRules, reprocessSyncRules, currentSyncRules];
+function replyPrettyJson(payload) {
+    return new router.RouterResponse({
+        status: 200,
+        data: JSON.stringify(payload, null, 2) + '\n',
+        headers: { 'Content-Type': 'application/json' }
+    });
 }
 async function debugSyncRules(db, sync_rules) {
     try {

package/dist/routes/endpoints/sync-rules.js.map

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

package/dist/routes/endpoints/sync-stream.d.ts

@@ -0,0 +1,132 @@
+/// <reference types="node" resolution-mode="require"/>
+import { Readable } from 'stream';
+import { router, schema } from '@powersync/lib-services-framework';
+export declare enum SyncRoutes {
+    STREAM = "/sync/stream"
+}
+export declare const syncStreamed: router.Endpoint<{
+    parameters?: Record<string, any> | undefined;
+    buckets?: {
+        name: string;
+        after: string;
+    }[] | undefined;
+    only?: string[] | undefined;
+    include_checksum?: boolean | undefined;
+    raw_data?: boolean | undefined;
+    binary_data?: boolean | undefined;
+}, router.RouterResponse<Readable> | undefined, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{
+    parameters?: Record<string, any> | undefined;
+    buckets?: {
+        name: string;
+        after: string;
+    }[] | undefined;
+    only?: string[] | undefined;
+    include_checksum?: boolean | undefined;
+    raw_data?: boolean | undefined;
+    binary_data?: boolean | undefined;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{
+    parameters?: Record<string, any> | undefined;
+    buckets?: {
+        name: string;
+        after: string;
+    }[] | undefined;
+    only?: string[] | undefined;
+    include_checksum?: boolean | undefined;
+    raw_data?: boolean | undefined;
+    binary_data?: boolean | undefined;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.RouterResponse<Readable> | undefined>> & {
+    path: SyncRoutes;
+    method: router.HTTPMethod.POST;
+    authorize: (payload: import("../router.js").RequestEndpointHandlerPayload) => Promise<{
+        authorized: boolean;
+        errors: any[];
+    } | {
+        authorized: boolean;
+        errors?: undefined;
+    }>;
+    validator: schema.MicroValidator<{
+        parameters?: Record<string, any> | undefined;
+        buckets?: {
+            name: string;
+            after: string;
+        }[] | undefined;
+        only?: string[] | undefined;
+        include_checksum?: boolean | undefined;
+        raw_data?: boolean | undefined;
+        binary_data?: boolean | undefined;
+    }, string[]>;
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{
+        parameters?: Record<string, any> | undefined;
+        buckets?: {
+            name: string;
+            after: string;
+        }[] | undefined;
+        only?: string[] | undefined;
+        include_checksum?: boolean | undefined;
+        raw_data?: boolean | undefined;
+        binary_data?: boolean | undefined;
+    }, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<router.RouterResponse<Readable> | undefined>;
+};
+export declare const SYNC_STREAM_ROUTES: (router.Endpoint<{
+    parameters?: Record<string, any> | undefined;
+    buckets?: {
+        name: string;
+        after: string;
+    }[] | undefined;
+    only?: string[] | undefined;
+    include_checksum?: boolean | undefined;
+    raw_data?: boolean | undefined;
+    binary_data?: boolean | undefined;
+}, router.RouterResponse<Readable> | undefined, import("../router.js").Context, import("../router.js").RequestEndpointHandlerPayload<{
+    parameters?: Record<string, any> | undefined;
+    buckets?: {
+        name: string;
+        after: string;
+    }[] | undefined;
+    only?: string[] | undefined;
+    include_checksum?: boolean | undefined;
+    raw_data?: boolean | undefined;
+    binary_data?: boolean | undefined;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.EndpointHandler<import("../router.js").RequestEndpointHandlerPayload<{
+    parameters?: Record<string, any> | undefined;
+    buckets?: {
+        name: string;
+        after: string;
+    }[] | undefined;
+    only?: string[] | undefined;
+    include_checksum?: boolean | undefined;
+    raw_data?: boolean | undefined;
+    binary_data?: boolean | undefined;
+}, import("../router.js").Context, import("../router.js").BasicRouterRequest>, router.RouterResponse<Readable> | undefined>> & {
+    path: SyncRoutes;
+    method: router.HTTPMethod.POST;
+    authorize: (payload: import("../router.js").RequestEndpointHandlerPayload) => Promise<{
+        authorized: boolean;
+        errors: any[];
+    } | {
+        authorized: boolean;
+        errors?: undefined;
+    }>;
+    validator: schema.MicroValidator<{
+        parameters?: Record<string, any> | undefined;
+        buckets?: {
+            name: string;
+            after: string;
+        }[] | undefined;
+        only?: string[] | undefined;
+        include_checksum?: boolean | undefined;
+        raw_data?: boolean | undefined;
+        binary_data?: boolean | undefined;
+    }, string[]>;
+    handler: (payload: import("../router.js").RequestEndpointHandlerPayload<{
+        parameters?: Record<string, any> | undefined;
+        buckets?: {
+            name: string;
+            after: string;
+        }[] | undefined;
+        only?: string[] | undefined;
+        include_checksum?: boolean | undefined;
+        raw_data?: boolean | undefined;
+        binary_data?: boolean | undefined;
+    }, import("../router.js").Context, import("../router.js").BasicRouterRequest>) => Promise<router.RouterResponse<Readable> | undefined>;
+})[];

package/dist/routes/{sync-stream.js → endpoints/sync-stream.js}

@@ -1,22 +1,24 @@
 import { Readable } from 'stream';
-import * as micro from '@journeyapps-platform/micro';
 import { normalizeTokenParameters } from '@powersync/service-sync-rules';
-import * as sync from '../sync/sync-index.js';
-import * as util from '../util/util-index.js';
-import { authUser } from './auth.js';
-import { Metrics } from '../metrics/Metrics.js';
+import { errors, logger, router, schema } from '@powersync/lib-services-framework';
+import * as sync from '../../sync/sync-index.js';
+import * as util from '../../util/util-index.js';
+import { authUser } from '../auth.js';
+import { routeDefinition } from '../router.js';
+import { Metrics } from '../../metrics/Metrics.js';
 export var SyncRoutes;
 (function (SyncRoutes) {
     SyncRoutes["STREAM"] = "/sync/stream";
 })(SyncRoutes || (SyncRoutes = {}));
-export const syncStreamed = (router) => router.post(SyncRoutes.STREAM, {
+export const syncStreamed = routeDefinition({
+    path: SyncRoutes.STREAM,
+    method: router.HTTPMethod.POST,
     authorize: authUser,
-    validator: micro.schema.createTsCodecValidator(util.StreamingSyncRequest, { allowAdditional: true }),
+    validator: schema.createTsCodecValidator(util.StreamingSyncRequest, { allowAdditional: true }),
     handler: async (payload) => {
-        const userId = payload.context.user_id;
         const system = payload.context.system;
         if (system.closed) {
-            throw new micro.errors.JourneyError({
+            throw new errors.JourneyError({
                 status: 503,
                 code: 'SERVICE_UNAVAILABLE',
                 description: 'Service temporarily unavailable'
@@ -28,14 +30,12 @@ export const syncStreamed = (router) => router.post(SyncRoutes.STREAM, {
         // Sanity check before we start the stream
         const cp = await storage.getActiveCheckpoint();
         if (!cp.hasSyncRules()) {
-            throw new micro.errors.JourneyError({
+            throw new errors.JourneyError({
                 status: 500,
                 code: 'NO_SYNC_RULES',
                 description: 'No sync rules available'
             });
         }
-        const res = payload.reply;
-        res.status(200).header('Content-Type', 'application/x-ndjson');
         const controller = new AbortController();
         try {
             Metrics.getInstance().concurrent_connections.add(1);
@@ -58,17 +58,26 @@ export const syncStreamed = (router) => router.post(SyncRoutes.STREAM, {
                 controller.abort();
                 // Note: This appears as a 200 response in the logs.
                 if (error.message != 'Shutting down system') {
-                    micro.logger.error('Streaming sync request failed', error);
+                    logger.error('Streaming sync request failed', error);
+                }
+            });
+            return new router.RouterResponse({
+                status: 200,
+                headers: {
+                    'Content-Type': 'application/x-ndjson'
+                },
+                data: stream,
+                afterSend: async () => {
+                    controller.abort();
+                    Metrics.getInstance().concurrent_connections.add(-1);
                 }
             });
-            await res.send(stream);
         }
-        finally {
+        catch (ex) {
             controller.abort();
             Metrics.getInstance().concurrent_connections.add(-1);
-            // Prevent double-send
-            res.hijack();
         }
     }
 });
+export const SYNC_STREAM_ROUTES = [syncStreamed];
 //# sourceMappingURL=sync-stream.js.map

package/dist/routes/endpoints/sync-stream.js.map

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

package/dist/routes/hooks.d.ts

@@ -0,0 +1,10 @@
+import type fastify from 'fastify';
+export type CreateRequestQueueParams = {
+    max_queue_depth: number;
+    concurrency: number;
+};
+/**
+ * Creates a request queue which limits the amount of concurrent connections which
+ * are active at any time.
+ */
+export declare const createRequestQueueHook: (params: CreateRequestQueueParams) => fastify.onRequestHookHandler;