@powersync/service-core 0.8.8 → 0.10.0

package/dist/routes/RouterEngine.js

@@ -0,0 +1,80 @@
+import { logger } from '@powersync/lib-services-framework';
+import { ADMIN_ROUTES } from './endpoints/admin.js';
+import { CHECKPOINT_ROUTES } from './endpoints/checkpointing.js';
+import { syncStreamReactive } from './endpoints/socket-route.js';
+import { SYNC_RULES_ROUTES } from './endpoints/sync-rules.js';
+import { SYNC_STREAM_ROUTES } from './endpoints/sync-stream.js';
+/**
+ *  Serves as a registry from which SyncAPIs can be retrieved based on Replication DataSource type
+ *  Initially only one SyncAPI per DataSource type is supported
+ */
+export class RouterEngine {
+    constructor() {
+        this.api = null;
+        this.stopHandlers = new Set();
+        this.cleanupHandler = null;
+        this.closed = false;
+        // Default routes
+        this.routes = {
+            api_routes: [...ADMIN_ROUTES, ...CHECKPOINT_ROUTES, ...SYNC_RULES_ROUTES],
+            stream_routes: [...SYNC_STREAM_ROUTES],
+            socket_routes: [syncStreamReactive]
+        };
+    }
+    registerAPI(api) {
+        if (this.api) {
+            logger.warn('A RouteAPI has already been registered. Overriding existing implementation');
+        }
+        this.api = api;
+    }
+    getAPI() {
+        if (!this.api) {
+            throw new Error('No RouteAPI adapter has been registered yet.');
+        }
+        return this.api;
+    }
+    /**
+     * Starts the router given the configuration provided
+     */
+    async start(setup) {
+        logger.info('Starting Router Engine...');
+        const { onShutdown } = await setup(this.routes);
+        this.cleanupHandler = onShutdown;
+        logger.info('Successfully started Router Engine.');
+    }
+    /**
+     * Runs all stop handlers then final cleanup.
+     */
+    async shutDown() {
+        logger.info('Shutting down Router Engine...');
+        // Close open streams, so that they don't block the server from closing.
+        // Note: This does not work well when streaming requests are queued. In that case, the server still doesn't
+        // close in the 30-second timeout.
+        this.closed = true;
+        logger.info(`Closing ${this.stopHandlers.size} streams.`);
+        for (let handler of this.stopHandlers) {
+            handler();
+        }
+        logger.info(`Running cleanup.`);
+        // Typically closes the server
+        await this.cleanupHandler?.();
+        // Close the api handlers
+        await this.api?.shutdown();
+        logger.info('Successfully shut down Router Engine.');
+    }
+    /**
+     * Add a stop handler callback to be executed when the router engine is being
+     * shutdown.
+     */
+    addStopHandler(handler) {
+        if (this.closed) {
+            handler();
+            return () => { };
+        }
+        this.stopHandlers.add(handler);
+        return () => {
+            this.stopHandlers.delete(handler);
+        };
+    }
+}
+//# sourceMappingURL=RouterEngine.js.map

package/dist/routes/RouterEngine.js.map

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

package/dist/routes/auth.d.ts

@@ -1,7 +1,7 @@
 import * as auth from '../auth/auth-index.js';
+import { ServiceContext } from '../system/ServiceContext.js';
 import * as util from '../util/util-index.js';
 import { BasicRouterRequest, Context, RequestEndpointHandlerPayload } from './router.js';
-import { CorePowerSyncSystem } from '../system/CorePowerSyncSystem.js';
 export declare function endpoint(req: BasicRouterRequest): string;
 /**
  * @deprecated
@@ -27,7 +27,7 @@ export declare function authorizeUser(context: Context, authHeader?: string): Pr
     authorized: boolean;
     errors?: undefined;
 }>;
-export declare function generateContext(system: CorePowerSyncSystem, token: string): Promise<{
+export declare function generateContext(serviceContext: ServiceContext, token: string): Promise<{
     context: {
         user_id: string;
         token_payload: auth.JwtPayload;

package/dist/routes/auth.js

@@ -81,7 +81,7 @@ export async function authorizeUser(context, authHeader = '') {
             errors: ['Authentication required']
         };
     }
-    const { context: tokenContext, errors } = await generateContext(context.system, token);
+    const { context: tokenContext, errors } = await generateContext(context.service_context, token);
     if (!tokenContext) {
         return {
             authorized: false,
@@ -91,13 +91,13 @@ export async function authorizeUser(context, authHeader = '') {
     Object.assign(context, tokenContext);
     return { authorized: true };
 }
-export async function generateContext(system, token) {
-    const config = system.config;
+export async function generateContext(serviceContext, token) {
+    const { configuration } = serviceContext;
     let tokenPayload;
     try {
-        const maxAge = config.token_max_expiration;
-        tokenPayload = await system.client_keystore.verifyJwt(token, {
-            defaultAudiences: config.jwt_audiences,
+        const maxAge = configuration.token_max_expiration;
+        tokenPayload = await configuration.client_keystore.verifyJwt(token, {
+            defaultAudiences: configuration.jwt_audiences,
             maxAge: maxAge
         });
         return {
@@ -118,9 +118,9 @@ export async function generateContext(system, token) {
  * @deprecated
  */
 export const authDevUser = async (payload) => {
-    const context = payload.context;
+    const { context: { service_context: { configuration } } } = payload;
     const token = getTokenFromHeader(payload.request.headers.authorization);
-    if (!context.system.config.dev.demo_auth) {
+    if (!configuration.dev.demo_auth) {
         return {
             authorized: false,
             errors: ['Authentication disabled']
@@ -137,7 +137,7 @@ export const authDevUser = async (payload) => {
     const audience = [devAudience(payload.request)];
     let tokenPayload;
     try {
-        tokenPayload = await context.system.dev_client_keystore.verifyJwt(token, {
+        tokenPayload = await configuration.dev_client_keystore.verifyJwt(token, {
             defaultAudiences: audience,
             maxAge: '31d'
         });
@@ -152,8 +152,8 @@ export const authDevUser = async (payload) => {
     return { authorized: true };
 };
 export const authApi = (payload) => {
-    const context = payload.context;
-    const api_keys = context.system.config.api_tokens;
+    const { context: { service_context: { configuration } } } = payload;
+    const api_keys = configuration.api_tokens;
     if (api_keys.length == 0) {
         return {
             authorized: false,

package/dist/routes/auth.js.map

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

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

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type fastify from 'fastify';
 import * as system from '../system/system-index.js';
 import { CreateRequestQueueParams } from './hooks.js';
@@ -9,7 +8,7 @@ import { RouteDefinition } from './router.js';
  */
 export type RouteRegistrationOptions = {
     routes: RouteDefinition[];
-    queueOptions: CreateRequestQueueParams;
+    queue_options: CreateRequestQueueParams;
 };
 /**
  * HTTP routes separated by API and Sync stream categories.
@@ -17,10 +16,10 @@ export type RouteRegistrationOptions = {
  */
 export type RouteDefinitions = {
     api?: Partial<RouteRegistrationOptions>;
-    syncStream?: Partial<RouteRegistrationOptions>;
+    sync_stream?: Partial<RouteRegistrationOptions>;
 };
 export type FastifyServerConfig = {
-    system: system.CorePowerSyncSystem;
+    service_context: system.ServiceContext;
     routes?: RouteDefinitions;
 };
 export declare const DEFAULT_ROUTE_OPTIONS: {
@@ -324,12 +323,17 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
                         columns: {
                             type: string;
                             name: string;
+                            sqlite_type: number | import("@powersync/service-types").SqliteSchemaTypeText;
+                            internal_type: string;
                             pg_type: string;
+                            description?: string | undefined;
                         }[];
                     }[];
                 }[];
                 id?: string | undefined;
             }[];
+            defaultConnectionTag: string;
+            defaultSchema: string;
         }, import("./router.js").Context, import("./router.js").RequestEndpointHandlerPayload<{}, import("./router.js").Context, import("./router.js").BasicRouterRequest>, import("@powersync/lib-services-framework").EndpointHandler<import("./router.js").RequestEndpointHandlerPayload<{}, import("./router.js").Context, import("./router.js").BasicRouterRequest>, {
             connections: {
                 tag: string;
@@ -340,12 +344,17 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
                         columns: {
                             type: string;
                             name: string;
+                            sqlite_type: number | import("@powersync/service-types").SqliteSchemaTypeText;
+                            internal_type: string;
                             pg_type: string;
+                            description?: string | undefined;
                         }[];
                     }[];
                 }[];
                 id?: string | undefined;
             }[];
+            defaultConnectionTag: string;
+            defaultSchema: string;
         }>> & {
             path: string;
             method: import("@powersync/lib-services-framework").HTTPMethod.POST;
@@ -367,12 +376,17 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
                             columns: {
                                 type: string;
                                 name: string;
+                                sqlite_type: number | import("@powersync/service-types").SqliteSchemaTypeText;
+                                internal_type: string;
                                 pg_type: string;
+                                description?: string | undefined;
                             }[];
                         }[];
                     }[];
                     id?: string | undefined;
                 }[];
+                defaultConnectionTag: string;
+                defaultSchema: string;
             }>;
         }) | (import("@powersync/lib-services-framework").Endpoint<{}, {
             connections: {
@@ -566,22 +580,6 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
             }, import("./router.js").Context, import("./router.js").BasicRouterRequest>) => Promise<{
                 write_checkpoint: string;
             }>;
-        }) | (import("@powersync/lib-services-framework").Endpoint<unknown, import("@powersync/lib-services-framework").RouterResponse<{
-            ready: boolean;
-            started: boolean;
-            touched_at: Date;
-        }>, import("./router.js").Context, import("./router.js").RequestEndpointHandlerPayload<unknown, import("./router.js").Context, import("./router.js").BasicRouterRequest>, import("@powersync/lib-services-framework").EndpointHandler<import("./router.js").RequestEndpointHandlerPayload<unknown, import("./router.js").Context, import("./router.js").BasicRouterRequest>, import("@powersync/lib-services-framework").RouterResponse<{
-            ready: boolean;
-            started: boolean;
-            touched_at: Date;
-        }>>> & {
-            path: import("./endpoints/probes.js").ProbeRoutes;
-            method: import("@powersync/lib-services-framework").HTTPMethod.GET;
-            handler: () => Promise<import("@powersync/lib-services-framework").RouterResponse<{
-                ready: boolean;
-                started: boolean;
-                touched_at: Date;
-            }>>;
         }) | (import("@powersync/lib-services-framework").Endpoint<{
             content: string;
         }, {
@@ -665,13 +663,29 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
             handler: (payload: import("./router.js").RequestEndpointHandlerPayload<{}, import("./router.js").Context, import("./router.js").BasicRouterRequest>) => Promise<{
                 slot_name: string;
             }>;
+        }) | (import("@powersync/lib-services-framework").Endpoint<unknown, import("@powersync/lib-services-framework").RouterResponse<{
+            ready: boolean;
+            started: boolean;
+            touched_at: Date;
+        }>, import("./router.js").Context, import("./router.js").RequestEndpointHandlerPayload<unknown, import("./router.js").Context, import("./router.js").BasicRouterRequest>, import("@powersync/lib-services-framework").EndpointHandler<import("./router.js").RequestEndpointHandlerPayload<unknown, import("./router.js").Context, import("./router.js").BasicRouterRequest>, import("@powersync/lib-services-framework").RouterResponse<{
+            ready: boolean;
+            started: boolean;
+            touched_at: Date;
+        }>>> & {
+            path: import("./endpoints/probes.js").ProbeRoutes;
+            method: import("@powersync/lib-services-framework").HTTPMethod.GET;
+            handler: () => Promise<import("@powersync/lib-services-framework").RouterResponse<{
+                ready: boolean;
+                started: boolean;
+                touched_at: Date;
+            }>>;
         }))[];
-        queueOptions: {
+        queue_options: {
             concurrency: number;
             max_queue_depth: number;
         };
     };
-    syncStream: {
+    sync_stream: {
         routes: (import("@powersync/lib-services-framework").Endpoint<{
             parameters?: Record<string, any> | undefined;
             buckets?: {
@@ -740,7 +754,7 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
                 client_id?: string | undefined;
             }, import("./router.js").Context, import("./router.js").BasicRouterRequest>) => Promise<import("@powersync/lib-services-framework").RouterResponse<import("stream").Readable> | undefined>;
         })[];
-        queueOptions: {
+        queue_options: {
             concurrency: number;
             max_queue_depth: number;
         };

package/dist/routes/configure-fastify.js

@@ -8,14 +8,14 @@ import { createRequestQueueHook } from './hooks.js';
 export const DEFAULT_ROUTE_OPTIONS = {
     api: {
         routes: [...ADMIN_ROUTES, ...CHECKPOINT_ROUTES, ...SYNC_RULES_ROUTES, ...PROBES_ROUTES],
-        queueOptions: {
+        queue_options: {
             concurrency: 10,
             max_queue_depth: 20
         }
     },
-    syncStream: {
+    sync_stream: {
         routes: [...SYNC_STREAM_ROUTES],
-        queueOptions: {
+        queue_options: {
             concurrency: 200,
             max_queue_depth: 0
         }
@@ -26,7 +26,17 @@ export const DEFAULT_ROUTE_OPTIONS = {
  * concurrency queue limits or override routes.
  */
 export function configureFastifyServer(server, options) {
-    const { system, routes = DEFAULT_ROUTE_OPTIONS } = options;
+    const { service_context, routes = DEFAULT_ROUTE_OPTIONS } = options;
+    const generateContext = async () => {
+        const { routerEngine } = service_context;
+        if (!routerEngine) {
+            throw new Error(`RouterEngine has not been registered`);
+        }
+        return {
+            user_id: undefined,
+            service_context: service_context
+        };
+    };
     /**
      * Fastify creates an encapsulated context for each `.register` call.
      * Creating a separate context here to separate the concurrency limits for Admin APIs
@@ -34,25 +44,15 @@ export function configureFastifyServer(server, options) {
      * https://github.com/fastify/fastify/blob/main/docs/Reference/Encapsulation.md
      */
     server.register(async function (childContext) {
-        registerFastifyRoutes(childContext, async () => {
-            return {
-                user_id: undefined,
-                system: system
-            };
-        }, routes.api?.routes ?? DEFAULT_ROUTE_OPTIONS.api.routes);
+        registerFastifyRoutes(childContext, generateContext, routes.api?.routes ?? DEFAULT_ROUTE_OPTIONS.api.routes);
         // Limit the active concurrent requests
-        childContext.addHook('onRequest', createRequestQueueHook(routes.api?.queueOptions ?? DEFAULT_ROUTE_OPTIONS.api.queueOptions));
+        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,
-                system: system
-            };
-        }, routes.syncStream?.routes ?? DEFAULT_ROUTE_OPTIONS.syncStream.routes);
+        registerFastifyRoutes(childContext, generateContext, routes.sync_stream?.routes ?? DEFAULT_ROUTE_OPTIONS.sync_stream.routes);
         // Limit the active concurrent requests
-        childContext.addHook('onRequest', createRequestQueueHook(routes.syncStream?.queueOptions ?? DEFAULT_ROUTE_OPTIONS.syncStream.queueOptions));
+        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

@@ -1 +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,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,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,EAAE,GAAG,aAAa,CAAC;QACvF,YAAY,EAAE;YACZ,WAAW,EAAE,EAAE;YACf,eAAe,EAAE,EAAE;SACpB;KACF;IACD,UAAU,EAAE;QACV,MAAM,EAAE,CAAC,GAAG,kBAAkB,CAAC;QAC/B,YAAY,EAAE;YACZ,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,MAAM,EAAE,MAAM,GAAG,qBAAqB,EAAE,GAAG,OAAO,CAAC;IAC3D;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW,YAAY;QAC1C,qBAAqB,CACnB,YAAY,EACZ,KAAK,IAAI,EAAE;YACT,OAAO;gBACL,OAAO,EAAE,SAAS;gBAClB,MAAM,EAAE,MAAM;aACf,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,YAAY,IAAI,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,CAC3F,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,MAAM,EAAE,MAAM;aACf,CAAC;QACJ,CAAC,EACD,MAAM,CAAC,UAAU,EAAE,MAAM,IAAI,qBAAqB,CAAC,UAAU,CAAC,MAAM,CACrE,CAAC;QACF,uCAAuC;QACvC,YAAY,CAAC,OAAO,CAClB,WAAW,EACX,sBAAsB,CAAC,MAAM,CAAC,UAAU,EAAE,YAAY,IAAI,qBAAqB,CAAC,UAAU,CAAC,YAAY,CAAC,CACzG,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"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,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,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,EAAE,GAAG,aAAa,CAAC;QACvF,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;IAEpE,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;QACjC,MAAM,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC;QACzC,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO;YACL,OAAO,EAAE,SAAS;YAClB,eAAe,EAAE,eAAuC;SACzD,CAAC;IACJ,CAAC,CAAC;IAEF;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,CAAC,KAAK,WAAW,YAAY;QAC1C,qBAAqB,CAAC,YAAY,EAAE,eAAe,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7G,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,eAAe,EACf,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

@@ -1,13 +1,12 @@
-/// <reference types="node" resolution-mode="require"/>
 import * as http from 'http';
 import { ReactiveSocketRouter } from '@powersync/service-rsocket-router';
-import { CorePowerSyncSystem } from '../system/CorePowerSyncSystem.js';
+import { ServiceContext } from '../system/ServiceContext.js';
 import { SocketRouteGenerator } from './router-socket.js';
 import { Context } from './router.js';
 export type RSockerRouterConfig = {
-    system: CorePowerSyncSystem;
+    service_context: ServiceContext;
     server: http.Server;
-    routeGenerators?: SocketRouteGenerator[];
+    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

@@ -6,7 +6,7 @@ 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 { routeGenerators = DEFAULT_SOCKET_ROUTES, server, system } = 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));
@@ -16,16 +16,19 @@ export function configureRSocket(router, options) {
             try {
                 const extracted_token = getTokenFromHeader(token);
                 if (extracted_token != null) {
-                    const { context, errors: token_errors } = await generateContext(system, extracted_token);
+                    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');
                     }
+                    if (!service_context.routerEngine) {
+                        throw new Error(`RouterEngine has not been registered`);
+                    }
                     return {
                         token,
                         user_agent,
                         ...context,
                         token_errors: token_errors,
-                        system
+                        service_context: service_context
                     };
                 }
                 else {
@@ -37,7 +40,7 @@ export function configureRSocket(router, options) {
                 throw ex;
             }
         },
-        endpoints: routeGenerators.map((generator) => generator(router)),
+        endpoints: route_generators.map((generator) => generator(router)),
         metaDecoder: async (meta) => {
             return RSocketRequestMeta.decode(deserialize(meta));
         },

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

@@ -1 +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,eAAe,GAAG,qBAAqB,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE5E,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,MAAM,EAAE,eAAe,CAAC,CAAC;oBACzF,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,MAAM;qBACP,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,eAAe,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAChE,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"}
+{"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,CAAC;gBACX,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;YAC3D,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,eAAe,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAClD,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;oBAC5B,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,CAAC;wBACnC,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,YAAY,IAAI,yBAAyB,CAAC,CAAC;oBACjF,CAAC;oBAED,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC;wBAClC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;oBAC1D,CAAC;oBAED,OAAO;wBACL,KAAK;wBACL,UAAU;wBACV,GAAG,OAAO;wBACV,YAAY,EAAE,YAAY;wBAC1B,eAAe,EAAE,eAAuC;qBACzD,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,MAAM,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;gBACZ,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACjB,MAAM,EAAE,CAAC;YACX,CAAC;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

@@ -300,12 +300,17 @@ export declare const getSchema: router.Endpoint<{}, {
                 columns: {
                     type: string;
                     name: string;
+                    sqlite_type: number | import("@powersync/service-types").SqliteSchemaTypeText;
+                    internal_type: string;
                     pg_type: string;
+                    description?: string | undefined;
                 }[];
             }[];
         }[];
         id?: string | undefined;
     }[];
+    defaultConnectionTag: string;
+    defaultSchema: 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>, {
     connections: {
         tag: string;
@@ -316,12 +321,17 @@ export declare const getSchema: router.Endpoint<{}, {
                 columns: {
                     type: string;
                     name: string;
+                    sqlite_type: number | import("@powersync/service-types").SqliteSchemaTypeText;
+                    internal_type: string;
                     pg_type: string;
+                    description?: string | undefined;
                 }[];
             }[];
         }[];
         id?: string | undefined;
     }[];
+    defaultConnectionTag: string;
+    defaultSchema: string;
 }>> & {
     path: string;
     method: router.HTTPMethod.POST;
@@ -343,12 +353,17 @@ export declare const getSchema: router.Endpoint<{}, {
                     columns: {
                         type: string;
                         name: string;
+                        sqlite_type: number | import("@powersync/service-types").SqliteSchemaTypeText;
+                        internal_type: string;
                         pg_type: string;
+                        description?: string | undefined;
                     }[];
                 }[];
             }[];
             id?: string | undefined;
         }[];
+        defaultConnectionTag: string;
+        defaultSchema: string;
     }>;
 };
 export declare const reprocess: router.Endpoint<{}, {
@@ -788,12 +803,17 @@ export declare const ADMIN_ROUTES: ((router.Endpoint<{
                 columns: {
                     type: string;
                     name: string;
+                    sqlite_type: number | import("@powersync/service-types").SqliteSchemaTypeText;
+                    internal_type: string;
                     pg_type: string;
+                    description?: string | undefined;
                 }[];
             }[];
         }[];
         id?: string | undefined;
     }[];
+    defaultConnectionTag: string;
+    defaultSchema: 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>, {
     connections: {
         tag: string;
@@ -804,12 +824,17 @@ export declare const ADMIN_ROUTES: ((router.Endpoint<{
                 columns: {
                     type: string;
                     name: string;
+                    sqlite_type: number | import("@powersync/service-types").SqliteSchemaTypeText;
+                    internal_type: string;
                     pg_type: string;
+                    description?: string | undefined;
                 }[];
             }[];
         }[];
         id?: string | undefined;
     }[];
+    defaultConnectionTag: string;
+    defaultSchema: string;
 }>> & {
     path: string;
     method: router.HTTPMethod.POST;
@@ -831,12 +856,17 @@ export declare const ADMIN_ROUTES: ((router.Endpoint<{
                     columns: {
                         type: string;
                         name: string;
+                        sqlite_type: number | import("@powersync/service-types").SqliteSchemaTypeText;
+                        internal_type: string;
                         pg_type: string;
+                        description?: string | undefined;
                     }[];
                 }[];
             }[];
             id?: string | undefined;
         }[];
+        defaultConnectionTag: string;
+        defaultSchema: string;
     }>;
 }) | (router.Endpoint<{}, {
     connections: {