@powersync/service-module-postgres 0.2.4 → 0.4.0

package/dist/types/types.js

@@ -1,108 +1,24 @@
+import * as lib_postgres from '@powersync/lib-service-postgres';
 import * as service_types from '@powersync/service-types';
 import * as t from 'ts-codec';
-import * as urijs from 'uri-js';
-export const POSTGRES_CONNECTION_TYPE = 'postgresql';
-export const PostgresConnectionConfig = service_types.configFile.DataSourceConfig.and(t.object({
-    type: t.literal(POSTGRES_CONNECTION_TYPE),
-    /** Unique identifier for the connection - optional when a single connection is present. */
-    id: t.string.optional(),
-    /** Tag used as reference in sync rules. Defaults to "default". Does not have to be unique. */
-    tag: t.string.optional(),
-    uri: t.string.optional(),
-    hostname: t.string.optional(),
-    port: service_types.configFile.portCodec.optional(),
-    username: t.string.optional(),
-    password: t.string.optional(),
-    database: t.string.optional(),
-    /** Defaults to verify-full */
-    sslmode: t.literal('verify-full').or(t.literal('verify-ca')).or(t.literal('disable')).optional(),
-    /** Required for verify-ca, optional for verify-full */
-    cacert: t.string.optional(),
-    client_certificate: t.string.optional(),
-    client_private_key: t.string.optional(),
-    /** Expose database credentials */
-    demo_database: t.boolean.optional(),
-    /**
-     * Prefix for the slot name. Defaults to "powersync_"
-     */
-    slot_name_prefix: t.string.optional()
+// Maintain backwards compatibility by exporting these
+export const validatePort = lib_postgres.validatePort;
+export const baseUri = lib_postgres.baseUri;
+export const POSTGRES_CONNECTION_TYPE = lib_postgres.POSTGRES_CONNECTION_TYPE;
+export const PostgresConnectionConfig = service_types.configFile.DataSourceConfig.and(lib_postgres.BasePostgresConnectionConfig).and(t.object({
+// Add any replication connection specific config here in future
 }));
+export function isPostgresConfig(config) {
+    return config.type == lib_postgres.POSTGRES_CONNECTION_TYPE;
+}
 /**
  * Validate and normalize connection options.
  *
  * Returns destructured options.
  */
 export function normalizeConnectionConfig(options) {
-    let uri;
-    if (options.uri) {
-        uri = urijs.parse(options.uri);
-        if (uri.scheme != 'postgresql' && uri.scheme != 'postgres') {
-            `Invalid URI - protocol must be postgresql, got ${uri.scheme}`;
-        }
-        else if (uri.scheme != 'postgresql') {
-            uri.scheme = 'postgresql';
-        }
-    }
-    else {
-        uri = urijs.parse('postgresql:///');
-    }
-    const hostname = options.hostname ?? uri.host ?? '';
-    const port = validatePort(options.port ?? uri.port ?? 5432);
-    const database = options.database ?? uri.path?.substring(1) ?? '';
-    const [uri_username, uri_password] = (uri.userinfo ?? '').split(':');
-    const username = options.username ?? uri_username ?? '';
-    const password = options.password ?? uri_password ?? '';
-    const sslmode = options.sslmode ?? 'verify-full'; // Configuration not supported via URI
-    const cacert = options.cacert;
-    if (sslmode == 'verify-ca' && cacert == null) {
-        throw new Error('Explicit cacert is required for sslmode=verify-ca');
-    }
-    if (hostname == '') {
-        throw new Error(`hostname required`);
-    }
-    if (username == '') {
-        throw new Error(`username required`);
-    }
-    if (password == '') {
-        throw new Error(`password required`);
-    }
-    if (database == '') {
-        throw new Error(`database required`);
-    }
     return {
-        id: options.id ?? 'default',
-        tag: options.tag ?? 'default',
-        hostname,
-        port,
-        database,
-        username,
-        password,
-        sslmode,
-        cacert,
-        client_certificate: options.client_certificate ?? undefined,
-        client_private_key: options.client_private_key ?? undefined
+        ...lib_postgres.normalizeConnectionConfig(options)
     };
 }
-/**
- * Check whether the port is in a "safe" range.
- *
- * We do not support connecting to "privileged" ports.
- */
-export function validatePort(port) {
-    if (typeof port == 'string') {
-        port = parseInt(port);
-    }
-    if (port < 1024) {
-        throw new Error(`Port ${port} not supported`);
-    }
-    return port;
-}
-/**
- * Construct a postgres URI, without username, password or ssl options.
- *
- * Only contains hostname, port, database.
- */
-export function baseUri(options) {
-    return `postgresql://${options.hostname}:${options.port}/${options.database}`;
-}
 //# sourceMappingURL=types.js.map

package/dist/types/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,aAAa,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAE9B,sDAAsD;AACtD,MAAM,CAAC,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC;AACtD,MAAM,CAAC,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;AAE5C,MAAM,CAAC,MAAM,wBAAwB,GAAG,YAAY,CAAC,wBAAwB,CAAC;AAE9E,MAAM,CAAC,MAAM,wBAAwB,GAAG,aAAa,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CACnF,YAAY,CAAC,4BAA4B,CAC1C,CAAC,GAAG,CACH,CAAC,CAAC,MAAM,CAAC;AACP,gEAAgE;CACjE,CAAC,CACH,CAAC;AAYF,MAAM,UAAU,gBAAgB,CAC9B,MAAiD;IAEjD,OAAO,MAAM,CAAC,IAAI,IAAI,YAAY,CAAC,wBAAwB,CAAC;AAC9D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAiC;IACzE,OAAO;QACL,GAAG,YAAY,CAAC,yBAAyB,CAAC,OAAO,CAAC;KACN,CAAC;AACjD,CAAC"}

package/dist/utils/pgwire_utils.d.ts

@@ -1,5 +1,5 @@
 import * as pgwire from '@powersync/service-jpgwire';
-import { SqliteJsonValue, SqliteRow } from '@powersync/service-sync-rules';
+import { SqliteRow } from '@powersync/service-sync-rules';
 /**
  * pgwire message -> SQLite row.
  * @param message
@@ -10,7 +10,3 @@ export declare function constructAfterRecord(message: pgwire.PgoutputInsert | pg
  * @param message
  */
 export declare function constructBeforeRecord(message: pgwire.PgoutputDelete | pgwire.PgoutputUpdate): SqliteRow | undefined;
-export declare function escapeIdentifier(identifier: string): string;
-export declare function autoParameter(arg: SqliteJsonValue | boolean): pgwire.StatementParam;
-export declare function retriedQuery(db: pgwire.PgClient, ...statements: pgwire.Statement[]): Promise<pgwire.PgResult>;
-export declare function retriedQuery(db: pgwire.PgClient, query: string): Promise<pgwire.PgResult>;

package/dist/utils/pgwire_utils.js

@@ -1,7 +1,6 @@
 // Adapted from https://github.com/kagis/pgwire/blob/0dc927f9f8990a903f238737326e53ba1c8d094f/mod.js#L2218
 import * as pgwire from '@powersync/service-jpgwire';
 import { toSyncRulesRow } from '@powersync/service-sync-rules';
-import { logger } from '@powersync/lib-services-framework';
 /**
  * pgwire message -> SQLite row.
  * @param message
@@ -23,48 +22,4 @@ export function constructBeforeRecord(message) {
     const record = pgwire.decodeTuple(message.relation, rawData);
     return toSyncRulesRow(record);
 }
-export function escapeIdentifier(identifier) {
-    return `"${identifier.replace(/"/g, '""').replace(/\./g, '"."')}"`;
-}
-export function autoParameter(arg) {
-    if (arg == null) {
-        return { type: 'varchar', value: null };
-    }
-    else if (typeof arg == 'string') {
-        return { type: 'varchar', value: arg };
-    }
-    else if (typeof arg == 'number') {
-        if (Number.isInteger(arg)) {
-            return { type: 'int8', value: arg };
-        }
-        else {
-            return { type: 'float8', value: arg };
-        }
-    }
-    else if (typeof arg == 'boolean') {
-        return { type: 'bool', value: arg };
-    }
-    else if (typeof arg == 'bigint') {
-        return { type: 'int8', value: arg };
-    }
-    else {
-        throw new Error(`Unsupported query parameter: ${typeof arg}`);
-    }
-}
-/**
- * Retry a simple query - up to 2 attempts total.
- */
-export async function retriedQuery(db, ...args) {
-    for (let tries = 2;; tries--) {
-        try {
-            return await db.query(...args);
-        }
-        catch (e) {
-            if (tries == 1) {
-                throw e;
-            }
-            logger.warn('Query error, retrying', e);
-        }
-    }
-}
 //# sourceMappingURL=pgwire_utils.js.map

package/dist/utils/pgwire_utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"pgwire_utils.js","sourceRoot":"","sources":["../../src/utils/pgwire_utils.ts"],"names":[],"mappings":"AAAA,0GAA0G;AAE1G,OAAO,KAAK,MAAM,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAA8B,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE3F,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAE3D;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAsD;IACzF,MAAM,OAAO,GAAI,OAAe,CAAC,QAAQ,CAAC;IAE1C,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7D,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAsD;IAC1F,MAAM,OAAO,GAAI,OAAe,CAAC,SAAS,CAAC;IAC3C,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7D,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,UAAkB;IACjD,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAA8B;IAC1D,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAChB,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;SAAM,IAAI,OAAO,GAAG,IAAI,QAAQ,EAAE,CAAC;QAClC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACzC,CAAC;SAAM,IAAI,OAAO,GAAG,IAAI,QAAQ,EAAE,CAAC;QAClC,IAAI,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;QACxC,CAAC;IACH,CAAC;SAAM,IAAI,OAAO,GAAG,IAAI,SAAS,EAAE,CAAC;QACnC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACtC,CAAC;SAAM,IAAI,OAAO,GAAG,IAAI,QAAQ,EAAE,CAAC;QAClC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;IACtC,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,gCAAgC,OAAO,GAAG,EAAE,CAAC,CAAC;IAChE,CAAC;AACH,CAAC;AAKD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,EAAmB,EAAE,GAAG,IAAW;IACpE,KAAK,IAAI,KAAK,GAAG,CAAC,GAAI,KAAK,EAAE,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,OAAO,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gBACf,MAAM,CAAC,CAAC;YACV,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"pgwire_utils.js","sourceRoot":"","sources":["../../src/utils/pgwire_utils.ts"],"names":[],"mappings":"AAAA,0GAA0G;AAE1G,OAAO,KAAK,MAAM,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAa,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE1E;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAsD;IACzF,MAAM,OAAO,GAAI,OAAe,CAAC,QAAQ,CAAC;IAE1C,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7D,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAsD;IAC1F,MAAM,OAAO,GAAI,OAAe,CAAC,SAAS,CAAC;IAC3C,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7D,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC"}

package/package.json

@@ -5,7 +5,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.2.4",
+  "version": "0.4.0",
   "main": "dist/index.js",
   "license": "FSL-1.1-Apache-2.0",
   "type": "module",
@@ -24,18 +24,22 @@
   "dependencies": {
     "pgwire": "github:kagis/pgwire#f1cb95f9a0f42a612bb5a6b67bb2eb793fc5fc87",
     "jose": "^4.15.1",
-    "ts-codec": "^1.2.2",
+    "ts-codec": "^1.3.0",
     "uuid": "^9.0.1",
     "uri-js": "^4.4.1",
-    "@powersync/service-core": "0.13.0",
-    "@powersync/service-jpgwire": "0.18.4",
-    "@powersync/service-sync-rules": "0.23.0",
-    "@powersync/service-types": "0.6.0",
+    "@powersync/lib-services-framework": "0.4.0",
+    "@powersync/lib-service-postgres": "0.1.0",
+    "@powersync/service-core": "0.15.0",
+    "@powersync/service-jpgwire": "0.18.5",
     "@powersync/service-jsonbig": "0.17.10",
-    "@powersync/lib-services-framework": "0.2.0"
+    "@powersync/service-sync-rules": "0.23.1",
+    "@powersync/service-types": "0.7.0"
   },
   "devDependencies": {
-    "@types/uuid": "^9.0.4"
+    "@types/uuid": "^9.0.4",
+    "@powersync/service-core-tests": "0.3.0",
+    "@powersync/service-module-mongodb-storage": "0.3.0",
+    "@powersync/service-module-postgres-storage": "0.1.0"
   },
   "scripts": {
     "build": "tsc -b",

package/src/api/PostgresRouteAPIAdapter.ts

@@ -1,13 +1,12 @@
+import * as lib_postgres from '@powersync/lib-service-postgres';
 import { api, ParseSyncRulesOptions } from '@powersync/service-core';
 import * as pgwire from '@powersync/service-jpgwire';
-
 import * as sync_rules from '@powersync/service-sync-rules';
 import * as service_types from '@powersync/service-types';
 import * as replication_utils from '../replication/replication-utils.js';
-import * as types from '../types/types.js';
-import * as pg_utils from '../utils/pgwire_utils.js';
 import { getDebugTableInfo } from '../replication/replication-utils.js';
 import { PUBLICATION_NAME } from '../replication/WalStream.js';
+import * as types from '../types/types.js';
 
 export class PostgresRouteAPIAdapter implements api.RouteAPI {
   connectionTag: string;
@@ -53,7 +52,7 @@ export class PostgresRouteAPIAdapter implements api.RouteAPI {
     };
 
     try {
-      await pg_utils.retriedQuery(this.pool, `SELECT 'PowerSync connection test'`);
+      await lib_postgres.retriedQuery(this.pool, `SELECT 'PowerSync connection test'`);
     } catch (e) {
       return {
         ...base,
@@ -94,7 +93,7 @@ export class PostgresRouteAPIAdapter implements api.RouteAPI {
     try {
       const result = await this.pool.query({
         statement: query,
-        params: params.map(pg_utils.autoParameter)
+        params: params.map(lib_postgres.autoParameter)
       });
 
       return service_types.internal_routes.ExecuteSqlResponse.encode({
@@ -146,7 +145,7 @@ export class PostgresRouteAPIAdapter implements api.RouteAPI {
       if (tablePattern.isWildcard) {
         patternResult.tables = [];
         const prefix = tablePattern.tablePrefix;
-        const results = await pg_utils.retriedQuery(this.pool, {
+        const results = await lib_postgres.retriedQuery(this.pool, {
           statement: `SELECT c.oid AS relid, c.relname AS table_name
         FROM pg_class c
         JOIN pg_namespace n ON n.oid = c.relnamespace
@@ -169,7 +168,7 @@ export class PostgresRouteAPIAdapter implements api.RouteAPI {
           patternResult.tables.push(details);
         }
       } else {
-        const results = await pg_utils.retriedQuery(this.pool, {
+        const results = await lib_postgres.retriedQuery(this.pool, {
           statement: `SELECT c.oid AS relid, c.relname AS table_name
         FROM pg_class c
         JOIN pg_namespace n ON n.oid = c.relnamespace
@@ -215,7 +214,7 @@ export class PostgresRouteAPIAdapter implements api.RouteAPI {
   async getReplicationLag(options: api.ReplicationLagOptions): Promise<number | undefined> {
     const { bucketStorage } = options;
     const slotName = bucketStorage.slot_name;
-    const results = await pg_utils.retriedQuery(this.pool, {
+    const results = await lib_postgres.retriedQuery(this.pool, {
       statement: `SELECT
   slot_name,
   confirmed_flush_lsn, 
@@ -237,7 +236,7 @@ FROM pg_replication_slots WHERE slot_name = $1 LIMIT 1;`,
     // However, on Aurora (Postgres compatible), it can return an entirely different LSN,
     // causing the write checkpoints to never be replicated back to the client.
     // For those, we need to use pg_current_wal_lsn() instead.
-    const { results } = await pg_utils.retriedQuery(
+    const { results } = await lib_postgres.retriedQuery(
       this.pool,
       { statement: `SELECT pg_current_wal_lsn() as lsn` },
       { statement: `SELECT pg_logical_emit_message(false, 'powersync', 'ping')` }
@@ -250,7 +249,7 @@ FROM pg_replication_slots WHERE slot_name = $1 LIMIT 1;`,
 
   async getConnectionSchema(): Promise<service_types.DatabaseSchema[]> {
     // https://github.com/Borvik/vscode-postgres/blob/88ec5ed061a0c9bced6c5d4ec122d0759c3f3247/src/language/server.ts
-    const results = await pg_utils.retriedQuery(
+    const results = await lib_postgres.retriedQuery(
       this.pool,
       `SELECT
 tbl.schemaname,

package/src/auth/SupabaseKeyCollector.ts

@@ -1,9 +1,9 @@
+import * as lib_postgres from '@powersync/lib-service-postgres';
 import { auth } from '@powersync/service-core';
 import * as pgwire from '@powersync/service-jpgwire';
 import * as jose from 'jose';
 
 import * as types from '../types/types.js';
-import * as pgwire_utils from '../utils/pgwire_utils.js';
 
 /**
  * Fetches key from the Supabase database.
@@ -39,7 +39,7 @@ export class SupabaseKeyCollector implements auth.KeyCollector {
     let row: { jwt_secret: string };
     try {
       const rows = pgwire.pgwireRows(
-        await pgwire_utils.retriedQuery(this.pool, `SELECT current_setting('app.settings.jwt_secret') as jwt_secret`)
+        await lib_postgres.retriedQuery(this.pool, `SELECT current_setting('app.settings.jwt_secret') as jwt_secret`)
       );
       row = rows[0] as any;
     } catch (e) {

package/src/index.ts

@@ -1 +1,3 @@
 export * from './module/PostgresModule.js';
+
+export * as pg_utils from './utils/pgwire_utils.js';

package/src/module/PostgresModule.ts

@@ -6,10 +6,10 @@ import { ConnectionManagerFactory } from '../replication/ConnectionManagerFactor
 import { PgManager } from '../replication/PgManager.js';
 import { PostgresErrorRateLimiter } from '../replication/PostgresErrorRateLimiter.js';
 import { checkSourceConfiguration, cleanUpReplicationSlot } from '../replication/replication-utils.js';
+import { PUBLICATION_NAME } from '../replication/WalStream.js';
 import { WalStreamReplicator } from '../replication/WalStreamReplicator.js';
 import * as types from '../types/types.js';
 import { PostgresConnectionConfig } from '../types/types.js';
-import { PUBLICATION_NAME } from '../replication/WalStream.js';
 
 export class PostgresModule extends replication.ReplicationModule<types.PostgresConnectionConfig> {
   constructor() {

package/src/replication/WalStream.ts

@@ -1,8 +1,10 @@
+import * as lib_postgres from '@powersync/lib-service-postgres';
 import { container, errors, logger } from '@powersync/lib-services-framework';
 import { getUuidReplicaIdentityBson, Metrics, SourceEntityDescriptor, storage } from '@powersync/service-core';
 import * as pgwire from '@powersync/service-jpgwire';
 import { DatabaseInputRow, SqliteRow, SqlSyncRules, TablePattern, toSyncRulesRow } from '@powersync/service-sync-rules';
 import * as pg_utils from '../utils/pgwire_utils.js';
+
 import { PgManager } from './PgManager.js';
 import { getPgOutputRelation, getRelId } from './PgRelation.js';
 import { checkSourceConfiguration, getReplicationIdentityColumns } from './replication-utils.js';
@@ -63,7 +65,7 @@ export class WalStream {
           // Ping to speed up cancellation of streaming replication
           // We're not using pg_snapshot here, since it could be in the middle of
           // an initial replication transaction.
-          const promise = pg_utils.retriedQuery(
+          const promise = lib_postgres.retriedQuery(
             this.connections.pool,
             `SELECT * FROM pg_logical_emit_message(false, 'powersync', 'ping')`
           );

package/src/replication/replication-utils.ts

@@ -1,13 +1,11 @@
 import * as pgwire from '@powersync/service-jpgwire';
 
+import * as lib_postgres from '@powersync/lib-service-postgres';
+import { logger } from '@powersync/lib-services-framework';
 import { PatternResult, storage } from '@powersync/service-core';
-import * as pgwire_utils from '../utils/pgwire_utils.js';
-import { ReplicationIdentity } from './PgRelation.js';
 import * as sync_rules from '@powersync/service-sync-rules';
 import * as service_types from '@powersync/service-types';
-import * as pg_utils from '../utils/pgwire_utils.js';
-import * as util from '../utils/pgwire_utils.js';
-import { logger } from '@powersync/lib-services-framework';
+import { ReplicationIdentity } from './PgRelation.js';
 
 export interface ReplicaIdentityResult {
   replicationColumns: storage.ColumnDescriptor[];
@@ -20,7 +18,7 @@ export async function getPrimaryKeyColumns(
   mode: 'primary' | 'replident'
 ): Promise<storage.ColumnDescriptor[]> {
   const indexFlag = mode == 'primary' ? `i.indisprimary` : `i.indisreplident`;
-  const attrRows = await pgwire_utils.retriedQuery(db, {
+  const attrRows = await lib_postgres.retriedQuery(db, {
     statement: `SELECT a.attname as name, a.atttypid as typeid, t.typname as type, a.attnum as attnum
                                     FROM pg_index i
                                     JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY (i.indkey)
@@ -41,7 +39,7 @@ export async function getPrimaryKeyColumns(
 }
 
 export async function getAllColumns(db: pgwire.PgClient, relationId: number): Promise<storage.ColumnDescriptor[]> {
-  const attrRows = await pgwire_utils.retriedQuery(db, {
+  const attrRows = await lib_postgres.retriedQuery(db, {
     statement: `SELECT a.attname as name, a.atttypid as typeid, t.typname as type, a.attnum as attnum
                                     FROM pg_attribute a
                                     JOIN pg_type t ON a.atttypid = t.oid
@@ -62,7 +60,7 @@ export async function getReplicationIdentityColumns(
   db: pgwire.PgClient,
   relationId: number
 ): Promise<ReplicaIdentityResult> {
-  const rows = await pgwire_utils.retriedQuery(db, {
+  const rows = await lib_postgres.retriedQuery(db, {
     statement: `SELECT CASE relreplident
         WHEN 'd' THEN 'default'
         WHEN 'n' THEN 'nothing'
@@ -95,7 +93,7 @@ WHERE oid = $1::oid LIMIT 1`,
 
 export async function checkSourceConfiguration(db: pgwire.PgClient, publicationName: string): Promise<void> {
   // Check basic config
-  await pgwire_utils.retriedQuery(
+  await lib_postgres.retriedQuery(
     db,
     `DO $$
 BEGIN
@@ -113,7 +111,7 @@ $$ LANGUAGE plpgsql;`
   );
 
   // Check that publication exists
-  const rs = await pgwire_utils.retriedQuery(db, {
+  const rs = await lib_postgres.retriedQuery(db, {
     statement: `SELECT * FROM pg_publication WHERE pubname = $1`,
     params: [{ type: 'varchar', value: publicationName }]
   });
@@ -158,7 +156,7 @@ export async function getDebugTablesInfo(options: GetDebugTablesInfoOptions): Pr
     if (tablePattern.isWildcard) {
       patternResult.tables = [];
       const prefix = tablePattern.tablePrefix;
-      const results = await util.retriedQuery(db, {
+      const results = await lib_postgres.retriedQuery(db, {
         statement: `SELECT c.oid AS relid, c.relname AS table_name
         FROM pg_class c
         JOIN pg_namespace n ON n.oid = c.relnamespace
@@ -189,7 +187,7 @@ export async function getDebugTablesInfo(options: GetDebugTablesInfoOptions): Pr
         patternResult.tables.push(details);
       }
     } else {
-      const results = await util.retriedQuery(db, {
+      const results = await lib_postgres.retriedQuery(db, {
         statement: `SELECT c.oid AS relid, c.relname AS table_name
         FROM pg_class c
         JOIN pg_namespace n ON n.oid = c.relnamespace
@@ -284,14 +282,14 @@ export async function getDebugTableInfo(options: GetDebugTableInfoOptions): Prom
 
   let selectError = null;
   try {
-    await pg_utils.retriedQuery(db, `SELECT * FROM ${sourceTable.escapedIdentifier} LIMIT 1`);
+    await lib_postgres.retriedQuery(db, `SELECT * FROM ${sourceTable.escapedIdentifier} LIMIT 1`);
   } catch (e) {
     selectError = { level: 'fatal', message: e.message };
   }
 
   let replicateError = null;
 
-  const publications = await pg_utils.retriedQuery(db, {
+  const publications = await lib_postgres.retriedQuery(db, {
     statement: `SELECT tablename FROM pg_publication_tables WHERE pubname = $1 AND schemaname = $2 AND tablename = $3`,
     params: [
       { type: 'varchar', value: publicationName },

package/src/types/types.ts

@@ -1,56 +1,18 @@
+import * as lib_postgres from '@powersync/lib-service-postgres';
 import * as service_types from '@powersync/service-types';
 import * as t from 'ts-codec';
-import * as urijs from 'uri-js';
 
-export const POSTGRES_CONNECTION_TYPE = 'postgresql' as const;
-
-export interface NormalizedPostgresConnectionConfig {
-  id: string;
-  tag: string;
-
-  hostname: string;
-  port: number;
-  database: string;
-
-  username: string;
-  password: string;
-
-  sslmode: 'verify-full' | 'verify-ca' | 'disable';
-  cacert: string | undefined;
-
-  client_certificate: string | undefined;
-  client_private_key: string | undefined;
-}
+// Maintain backwards compatibility by exporting these
+export const validatePort = lib_postgres.validatePort;
+export const baseUri = lib_postgres.baseUri;
+export type NormalizedPostgresConnectionConfig = lib_postgres.NormalizedBasePostgresConnectionConfig;
+export const POSTGRES_CONNECTION_TYPE = lib_postgres.POSTGRES_CONNECTION_TYPE;
 
 export const PostgresConnectionConfig = service_types.configFile.DataSourceConfig.and(
+  lib_postgres.BasePostgresConnectionConfig
+).and(
   t.object({
-    type: t.literal(POSTGRES_CONNECTION_TYPE),
-    /** Unique identifier for the connection - optional when a single connection is present. */
-    id: t.string.optional(),
-    /** Tag used as reference in sync rules. Defaults to "default". Does not have to be unique. */
-    tag: t.string.optional(),
-    uri: t.string.optional(),
-    hostname: t.string.optional(),
-    port: service_types.configFile.portCodec.optional(),
-    username: t.string.optional(),
-    password: t.string.optional(),
-    database: t.string.optional(),
-
-    /** Defaults to verify-full */
-    sslmode: t.literal('verify-full').or(t.literal('verify-ca')).or(t.literal('disable')).optional(),
-    /** Required for verify-ca, optional for verify-full */
-    cacert: t.string.optional(),
-
-    client_certificate: t.string.optional(),
-    client_private_key: t.string.optional(),
-
-    /** Expose database credentials */
-    demo_database: t.boolean.optional(),
-
-    /**
-     * Prefix for the slot name. Defaults to "powersync_"
-     */
-    slot_name_prefix: t.string.optional()
+    // Add any replication connection specific config here in future
   })
 );
 
@@ -64,95 +26,19 @@ export type PostgresConnectionConfig = t.Decoded<typeof PostgresConnectionConfig
  */
 export type ResolvedConnectionConfig = PostgresConnectionConfig & NormalizedPostgresConnectionConfig;
 
+export function isPostgresConfig(
+  config: service_types.configFile.DataSourceConfig
+): config is PostgresConnectionConfig {
+  return config.type == lib_postgres.POSTGRES_CONNECTION_TYPE;
+}
+
 /**
  * Validate and normalize connection options.
  *
  * Returns destructured options.
  */
-export function normalizeConnectionConfig(options: PostgresConnectionConfig): NormalizedPostgresConnectionConfig {
-  let uri: urijs.URIComponents;
-  if (options.uri) {
-    uri = urijs.parse(options.uri);
-    if (uri.scheme != 'postgresql' && uri.scheme != 'postgres') {
-      `Invalid URI - protocol must be postgresql, got ${uri.scheme}`;
-    } else if (uri.scheme != 'postgresql') {
-      uri.scheme = 'postgresql';
-    }
-  } else {
-    uri = urijs.parse('postgresql:///');
-  }
-
-  const hostname = options.hostname ?? uri.host ?? '';
-  const port = validatePort(options.port ?? uri.port ?? 5432);
-
-  const database = options.database ?? uri.path?.substring(1) ?? '';
-
-  const [uri_username, uri_password] = (uri.userinfo ?? '').split(':');
-
-  const username = options.username ?? uri_username ?? '';
-  const password = options.password ?? uri_password ?? '';
-
-  const sslmode = options.sslmode ?? 'verify-full'; // Configuration not supported via URI
-  const cacert = options.cacert;
-
-  if (sslmode == 'verify-ca' && cacert == null) {
-    throw new Error('Explicit cacert is required for sslmode=verify-ca');
-  }
-
-  if (hostname == '') {
-    throw new Error(`hostname required`);
-  }
-
-  if (username == '') {
-    throw new Error(`username required`);
-  }
-
-  if (password == '') {
-    throw new Error(`password required`);
-  }
-
-  if (database == '') {
-    throw new Error(`database required`);
-  }
-
+export function normalizeConnectionConfig(options: PostgresConnectionConfig) {
   return {
-    id: options.id ?? 'default',
-    tag: options.tag ?? 'default',
-
-    hostname,
-    port,
-    database,
-
-    username,
-    password,
-    sslmode,
-    cacert,
-
-    client_certificate: options.client_certificate ?? undefined,
-    client_private_key: options.client_private_key ?? undefined
-  };
-}
-
-/**
- * Check whether the port is in a "safe" range.
- *
- * We do not support connecting to "privileged" ports.
- */
-export function validatePort(port: string | number): number {
-  if (typeof port == 'string') {
-    port = parseInt(port);
-  }
-  if (port < 1024) {
-    throw new Error(`Port ${port} not supported`);
-  }
-  return port;
-}
-
-/**
- * Construct a postgres URI, without username, password or ssl options.
- *
- * Only contains hostname, port, database.
- */
-export function baseUri(options: NormalizedPostgresConnectionConfig) {
-  return `postgresql://${options.hostname}:${options.port}/${options.database}`;
+    ...lib_postgres.normalizeConnectionConfig(options)
+  } satisfies NormalizedPostgresConnectionConfig;
 }