@powersync/service-core 0.0.0-dev-20240725112650 → 0.0.0-dev-20240918092408

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":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAO7B,MAAM,UAAU,QAAQ,CAAC,GAAuB;IAC9C,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC;IAClE,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC;IAC1B,OAAO,GAAG,QAAQ,MAAM,IAAI,EAAE,CAAC;AACjC,CAAC;AAED,SAAS,WAAW,CAAC,GAAuB;IAC1C,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;AAChC,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,GAAuB,EAAE,OAAe,EAAE,MAAoC;IAChH,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAE7B,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC;IAC/B,IAAI,GAAG,IAAI,IAAI,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;IAED,OAAO,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;SAC9B,kBAAkB,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,GAAI,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;SAC1D,UAAU,CAAC,OAAO,CAAC;SACnB,WAAW,EAAE;SACb,SAAS,CAAC,GAAG,CAAC;SACd,WAAW,CAAC,GAAG,CAAC;SAChB,iBAAiB,CAAC,KAAK,CAAC;SACxB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACnB,CAAC;AAED,kBAAkB;AAClB,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,GAAuB,EACvB,OAAe,EACf,MAAoC;IAEpC,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,GAAG,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAEpC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC;IAC/B,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;IAED,OAAO,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;SAC9B,kBAAkB,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,GAAI,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;SAC1D,UAAU,CAAC,OAAO,CAAC;SACnB,WAAW,EAAE;SACb,SAAS,CAAC,GAAG,CAAC;SACd,WAAW,CAAC,GAAG,CAAC;SAChB,iBAAiB,CAAC,KAAK,CAAC;SACxB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,GAAuB,EACvB,OAAe,EACf,MAAoC;IAEpC,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,GAAG,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACpC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC;IAC/B,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE;QAC9B,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;IAED,MAAM,GAAG,GAAG,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;SACnC,kBAAkB,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,GAAI,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;SAC1D,UAAU,CAAC,OAAO,CAAC;SACnB,WAAW,EAAE;SACb,SAAS,CAAC,GAAG,CAAC;SACd,WAAW,CAAC,GAAG,CAAC;SAChB,iBAAiB,CAAC,IAAI,CAAC;SACvB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjB,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,aAAqB,EAAE;IACxD,MAAM,UAAU,GAAG,wBAAwB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC7D,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,IAAI,CAAC;KACb;IACD,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC5B,OAAO,KAAK,IAAI,IAAI,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAsC,EAAE,EAAE;IACvE,OAAO,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAuB,CAAC,CAAC;AACzF,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAAgB,EAAE,aAAqB,EAAE;IAC3E,MAAM,KAAK,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAC7C,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,CAAC,yBAAyB,CAAC;SACpC,CAAC;KACH;IAED,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;IAEhG,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,MAAM;SACP,CAAC;KACH;IAED,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACrC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,cAA8B,EAAE,KAAa;IACjF,MAAM,EAAE,aAAa,EAAE,GAAG,cAAc,CAAC;IAEzC,IAAI,YAA6B,CAAC;IAClC,IAAI;QACF,MAAM,MAAM,GAAG,aAAa,CAAC,oBAAoB,CAAC;QAClD,YAAY,GAAG,MAAM,aAAa,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,EAAE;YAClE,gBAAgB,EAAE,aAAa,CAAC,aAAa;YAC7C,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;QACH,OAAO;YACL,OAAO,EAAE;gBACP,OAAO,EAAE,YAAY,CAAC,GAAG;gBACzB,aAAa,EAAE,YAAY;aAC5B;SACF,CAAC;KACH;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO;YACL,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;SACtB,CAAC;KACH;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,OAAsC,EAAE,EAAE;IAC1E,MAAM,EACJ,OAAO,EAAE,EACP,eAAe,EAAE,EAAE,aAAa,EAAE,EACnC,EACF,GAAG,OAAO,CAAC;IAEZ,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAuB,CAAC,CAAC;IAClF,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE;QAChC,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,CAAC,yBAAyB,CAAC;SACpC,CAAC;KACH;IACD,IAAI,KAAK,IAAI,IAAI,EAAE;QACjB,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,CAAC,yBAAyB,CAAC;SACpC,CAAC;KACH;IAED,0CAA0C;IAC1C,qCAAqC;IACrC,MAAM,QAAQ,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAEhD,IAAI,YAA6B,CAAC;IAClC,IAAI;QACF,YAAY,GAAG,MAAM,aAAa,CAAC,mBAAmB,CAAC,SAAS,CAAC,KAAK,EAAE;YACtE,gBAAgB,EAAE,QAAQ;YAC1B,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;SACtB,CAAC;KACH;IAED,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC;IAC3C,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,OAAsC,EAAE,EAAE;IAChE,MAAM,EACJ,OAAO,EAAE,EACP,eAAe,EAAE,EAAE,aAAa,EAAE,EACnC,EACF,GAAG,OAAO,CAAC;IACZ,MAAM,QAAQ,GAAG,aAAa,CAAC,UAAU,CAAC;IAC1C,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE;QACxB,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,CAAC,yBAAyB,CAAC;SACpC,CAAC;KACH;IACD,MAAM,IAAI,GAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAwB,IAAI,EAAE,CAAC;IAErE,MAAM,UAAU,GAAG,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,CAAC,yBAAyB,CAAC;SACpC,CAAC;KACH;IACD,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC5B,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;KAC7B;SAAM;QACL,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,CAAC,uBAAuB,CAAC;SAClC,CAAC;KACH;AACH,CAAC,CAAC"}

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

@@ -9,7 +9,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,49 +17,15 @@ 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: {
     api: {
         routes: ((import("@powersync/lib-services-framework").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>, import("@powersync/lib-services-framework").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: import("@powersync/lib-services-framework").HTTPMethod.POST;
-            authorize: (payload: import("./router.js").RequestEndpointHandlerPayload) => {
-                authorized: boolean;
-                errors: string[];
-            } | {
-                authorized: boolean;
-                errors?: undefined;
-            };
-            validator: import("@powersync/lib-services-framework").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;
-            }>;
-        }) | (import("@powersync/lib-services-framework").Endpoint<{
             sql: {
                 query: string;
                 args: (string | number | boolean)[];
@@ -544,9 +510,15 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
                 }[];
                 content?: string | undefined;
             }>;
-        }) | (import("@powersync/lib-services-framework").Endpoint<{}, {
+        }) | (import("@powersync/lib-services-framework").Endpoint<{
+            client_id?: string | undefined;
+        }, {
             checkpoint: 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>, {
+        }, import("./router.js").Context, import("./router.js").RequestEndpointHandlerPayload<{
+            client_id?: string | undefined;
+        }, import("./router.js").Context, import("./router.js").BasicRouterRequest>, import("@powersync/lib-services-framework").EndpointHandler<import("./router.js").RequestEndpointHandlerPayload<{
+            client_id?: string | undefined;
+        }, import("./router.js").Context, import("./router.js").BasicRouterRequest>, {
             checkpoint: string;
         }>> & {
             path: string;
@@ -558,139 +530,27 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
                 authorized: boolean;
                 errors?: undefined;
             }>;
-            validator: import("@powersync/lib-services-framework").MicroValidator<{}, string[]>;
-            handler: (payload: import("./router.js").RequestEndpointHandlerPayload<{}, import("./router.js").Context, import("./router.js").BasicRouterRequest>) => Promise<{
-                checkpoint: string;
-            }>;
-        }) | (import("@powersync/lib-services-framework").Endpoint<{}, {
-            write_checkpoint: 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>, {
-            write_checkpoint: string;
-        }>> & {
-            path: string;
-            method: import("@powersync/lib-services-framework").HTTPMethod.GET;
-            authorize: (payload: import("./router.js").RequestEndpointHandlerPayload) => Promise<{
-                authorized: boolean;
-                errors: any[];
-            } | {
-                authorized: boolean;
-                errors?: undefined;
-            }>;
-            validator: import("@powersync/lib-services-framework").MicroValidator<{}, string[]>;
-            handler: (payload: import("./router.js").RequestEndpointHandlerPayload<{}, import("./router.js").Context, import("./router.js").BasicRouterRequest>) => Promise<{
-                write_checkpoint: string;
-            }>;
-        }) | (import("@powersync/lib-services-framework").Endpoint<{
-            password: string;
-            user: string;
-        }, {
-            token: string;
-            user_id: string;
-        }, import("./router.js").Context, import("./router.js").RequestEndpointHandlerPayload<{
-            password: string;
-            user: string;
-        }, import("./router.js").Context, import("./router.js").BasicRouterRequest>, import("@powersync/lib-services-framework").EndpointHandler<import("./router.js").RequestEndpointHandlerPayload<{
-            password: string;
-            user: string;
-        }, import("./router.js").Context, import("./router.js").BasicRouterRequest>, {
-            token: string;
-            user_id: string;
-        }>> & {
-            path: string;
-            method: import("@powersync/lib-services-framework").HTTPMethod.POST;
             validator: import("@powersync/lib-services-framework").MicroValidator<{
-                password: string;
-                user: string;
+                client_id?: string | undefined;
             }, string[]>;
             handler: (payload: import("./router.js").RequestEndpointHandlerPayload<{
-                password: string;
-                user: string;
+                client_id?: string | undefined;
             }, import("./router.js").Context, import("./router.js").BasicRouterRequest>) => Promise<{
-                token: string;
-                user_id: string;
-            }>;
-        }) | (import("@powersync/lib-services-framework").Endpoint<{}, {
-            token: string;
-            user_id: string | undefined;
-            endpoint: 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>, {
-            token: string;
-            user_id: string | undefined;
-            endpoint: string;
-        }>> & {
-            path: string;
-            method: import("@powersync/lib-services-framework").HTTPMethod.POST;
-            validator: import("@powersync/lib-services-framework").MicroValidator<{}, string[]>;
-            authorize: (payload: import("./router.js").RequestEndpointHandlerPayload) => Promise<{
-                authorized: boolean;
-                errors: any[];
-            } | {
-                authorized: boolean;
-                errors?: undefined;
-            }>;
-            handler: (payload: import("./router.js").RequestEndpointHandlerPayload<{}, import("./router.js").Context, import("./router.js").BasicRouterRequest>) => Promise<{
-                token: string;
-                user_id: string | undefined;
-                endpoint: string;
+                checkpoint: string;
             }>;
         }) | (import("@powersync/lib-services-framework").Endpoint<{
-            data: {
-                type: string;
-                id: string;
-                op: string;
-                data?: any;
-                op_id?: number | undefined;
-            }[];
-            write_checkpoint?: boolean | undefined;
+            client_id?: string | undefined;
         }, {
             write_checkpoint: string;
-            checkpoint?: undefined;
-        } | {
-            write_checkpoint?: undefined;
-            checkpoint?: undefined;
-        } | {
-            checkpoint: string;
-            write_checkpoint?: undefined;
         }, import("./router.js").Context, import("./router.js").RequestEndpointHandlerPayload<{
-            data: {
-                type: string;
-                id: string;
-                op: string;
-                data?: any;
-                op_id?: number | undefined;
-            }[];
-            write_checkpoint?: boolean | undefined;
+            client_id?: string | undefined;
         }, import("./router.js").Context, import("./router.js").BasicRouterRequest>, import("@powersync/lib-services-framework").EndpointHandler<import("./router.js").RequestEndpointHandlerPayload<{
-            data: {
-                type: string;
-                id: string;
-                op: string;
-                data?: any;
-                op_id?: number | undefined;
-            }[];
-            write_checkpoint?: boolean | undefined;
+            client_id?: string | undefined;
         }, import("./router.js").Context, import("./router.js").BasicRouterRequest>, {
             write_checkpoint: string;
-            checkpoint?: undefined;
-        } | {
-            write_checkpoint?: undefined;
-            checkpoint?: undefined;
-        } | {
-            checkpoint: string;
-            write_checkpoint?: undefined;
         }>> & {
             path: string;
-            method: import("@powersync/lib-services-framework").HTTPMethod.POST;
-            validator: import("@powersync/lib-services-framework").MicroValidator<{
-                data: {
-                    type: string;
-                    id: string;
-                    op: string;
-                    data?: any;
-                    op_id?: number | undefined;
-                }[];
-                write_checkpoint?: boolean | undefined;
-            }, string[]>;
+            method: import("@powersync/lib-services-framework").HTTPMethod.GET;
             authorize: (payload: import("./router.js").RequestEndpointHandlerPayload) => Promise<{
                 authorized: boolean;
                 errors: any[];
@@ -698,24 +558,13 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
                 authorized: boolean;
                 errors?: undefined;
             }>;
+            validator: import("@powersync/lib-services-framework").MicroValidator<{
+                client_id?: string | undefined;
+            }, string[]>;
             handler: (payload: import("./router.js").RequestEndpointHandlerPayload<{
-                data: {
-                    type: string;
-                    id: string;
-                    op: string;
-                    data?: any;
-                    op_id?: number | undefined;
-                }[];
-                write_checkpoint?: boolean | undefined;
+                client_id?: string | undefined;
             }, import("./router.js").Context, import("./router.js").BasicRouterRequest>) => Promise<{
                 write_checkpoint: string;
-                checkpoint?: undefined;
-            } | {
-                write_checkpoint?: undefined;
-                checkpoint?: undefined;
-            } | {
-                checkpoint: string;
-                write_checkpoint?: undefined;
             }>;
         }) | (import("@powersync/lib-services-framework").Endpoint<{
             content: string;
@@ -801,12 +650,12 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
                 slot_name: string;
             }>;
         }))[];
-        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?: {
@@ -817,6 +666,7 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
             include_checksum?: boolean | undefined;
             raw_data?: boolean | undefined;
             binary_data?: boolean | undefined;
+            client_id?: string | undefined;
         }, import("@powersync/lib-services-framework").RouterResponse<import("stream").Readable> | undefined, import("./router.js").Context, import("./router.js").RequestEndpointHandlerPayload<{
             parameters?: Record<string, any> | undefined;
             buckets?: {
@@ -827,6 +677,7 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
             include_checksum?: boolean | undefined;
             raw_data?: boolean | undefined;
             binary_data?: boolean | undefined;
+            client_id?: string | undefined;
         }, import("./router.js").Context, import("./router.js").BasicRouterRequest>, import("@powersync/lib-services-framework").EndpointHandler<import("./router.js").RequestEndpointHandlerPayload<{
             parameters?: Record<string, any> | undefined;
             buckets?: {
@@ -837,6 +688,7 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
             include_checksum?: boolean | undefined;
             raw_data?: boolean | undefined;
             binary_data?: boolean | undefined;
+            client_id?: string | undefined;
         }, import("./router.js").Context, import("./router.js").BasicRouterRequest>, import("@powersync/lib-services-framework").RouterResponse<import("stream").Readable> | undefined>> & {
             path: import("./endpoints/sync-stream.js").SyncRoutes;
             method: import("@powersync/lib-services-framework").HTTPMethod.POST;
@@ -857,6 +709,7 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
                 include_checksum?: boolean | undefined;
                 raw_data?: boolean | undefined;
                 binary_data?: boolean | undefined;
+                client_id?: string | undefined;
             }, string[]>;
             handler: (payload: import("./router.js").RequestEndpointHandlerPayload<{
                 parameters?: Record<string, any> | undefined;
@@ -868,9 +721,10 @@ export declare const DEFAULT_ROUTE_OPTIONS: {
                 include_checksum?: boolean | undefined;
                 raw_data?: boolean | undefined;
                 binary_data?: boolean | undefined;
+                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

@@ -1,21 +1,20 @@
 import { registerFastifyRoutes } from './route-register.js';
 import { ADMIN_ROUTES } from './endpoints/admin.js';
 import { CHECKPOINT_ROUTES } from './endpoints/checkpointing.js';
-import { DEV_ROUTES } from './endpoints/dev.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, ...DEV_ROUTES, ...SYNC_RULES_ROUTES],
-        queueOptions: {
+        routes: [...ADMIN_ROUTES, ...CHECKPOINT_ROUTES, ...SYNC_RULES_ROUTES],
+        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 +25,7 @@ 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;
     /**
      * Fastify creates an encapsulated context for each `.register` call.
      * Creating a separate context here to separate the concurrency limits for Admin APIs
@@ -37,22 +36,22 @@ export function configureFastifyServer(server, options) {
         registerFastifyRoutes(childContext, async () => {
             return {
                 user_id: undefined,
-                system: system
+                service_context
             };
         }, 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
+                service_context
             };
-        }, routes.syncStream?.routes ?? DEFAULT_ROUTE_OPTIONS.syncStream.routes);
+        }, 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,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,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,UAAU,EAAE,GAAG,iBAAiB,CAAC;QACpF,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,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

@@ -1,13 +1,13 @@
 /// <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,25 +6,26 @@ 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 } = RSocketContextMeta.decode(deserialize(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(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');
                     }
                     return {
                         token,
+                        user_agent,
                         ...context,
                         token_errors: token_errors,
-                        system
+                        service_context
                     };
                 }
                 else {
@@ -36,7 +37,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,GAAG,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAQ,CAAC,CAAC;YAEtE,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,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;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)[];