@powersync/service-module-postgres-storage 0.0.0-dev-20250825132649 → 0.0.0-dev-20250827091123

package/dist/@types/migrations/scripts/1756282360128-connection-reporting.d.ts

@@ -0,0 +1,3 @@
+import { migrations } from '@powersync/service-core';
+export declare const up: migrations.PowerSyncMigrationFunction;
+export declare const down: migrations.PowerSyncMigrationFunction;

package/dist/@types/types/models/SyncRules.d.ts

@@ -33,13 +33,13 @@ export declare const SyncRules: t.ObjectCodec<{
      *
      * This may be old if no data is incoming.
      */
-    last_checkpoint_ts: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<Date, string, string, t.CodecProps>>;
+    last_checkpoint_ts: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<Date, string | import("@powersync/service-sync-rules").DateTimeValue, string, t.CodecProps>>;
     /**
      * Last time we persisted a checkpoint or keepalive.
      *
      * This should stay fairly current while replicating.
      */
-    last_keepalive_ts: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<Date, string, string, t.CodecProps>>;
+    last_keepalive_ts: t.Union<t.Codec<null, null, string, t.CodecProps>, t.Codec<Date, string | import("@powersync/service-sync-rules").DateTimeValue, string, t.CodecProps>>;
     /**
      * If an error is stopping replication, it will be stored here.
      */

package/dist/migrations/scripts/1756282360128-connection-reporting.js

@@ -0,0 +1,107 @@
+var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
+    if (value !== null && value !== void 0) {
+        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+        var dispose, inner;
+        if (async) {
+            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+            dispose = value[Symbol.asyncDispose];
+        }
+        if (dispose === void 0) {
+            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+            dispose = value[Symbol.dispose];
+            if (async) inner = dispose;
+        }
+        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
+        env.stack.push({ value: value, dispose: dispose, async: async });
+    }
+    else if (async) {
+        env.stack.push({ async: true });
+    }
+    return value;
+};
+var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
+    return function (env) {
+        function fail(e) {
+            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
+            env.hasError = true;
+        }
+        var r, s = 0;
+        function next() {
+            while (r = env.stack.pop()) {
+                try {
+                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
+                    if (r.dispose) {
+                        var result = r.dispose.call(r.value);
+                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
+                    }
+                    else s |= 1;
+                }
+                catch (e) {
+                    fail(e);
+                }
+            }
+            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
+            if (env.hasError) throw env.error;
+        }
+        return next();
+    };
+})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+});
+import { openMigrationDB } from '../migration-utils.js';
+export const up = async (context) => {
+    const env_1 = { stack: [], error: void 0, hasError: false };
+    try {
+        const { service_context: { configuration } } = context;
+        const client = __addDisposableResource(env_1, openMigrationDB(configuration.storage), true);
+        await client.transaction(async (db) => {
+            await db.sql `
+      CREATE TABLE IF NOT EXISTS connection_report_events (
+        id TEXT PRIMARY KEY,
+        user_agent TEXT NOT NULL,
+        client_id TEXT NOT NULL,
+        user_id TEXT NOT NULL,
+        sdk TEXT NOT NULL,
+        jwt_exp TIMESTAMP WITH TIME ZONE,
+        connected_at TIMESTAMP WITH TIME ZONE NOT NULL,
+        disconnected_at TIMESTAMP WITH TIME ZONE
+      )
+    `.execute();
+            await db.sql `
+      CREATE INDEX IF NOT EXISTS sdk_list_index ON connection_report_events (connected_at, jwt_exp, disconnected_at)
+    `.execute();
+            await db.sql `CREATE INDEX IF NOT EXISTS sdk_user_id_index ON connection_report_events (user_id)`.execute();
+            await db.sql `CREATE INDEX IF NOT EXISTS sdk_client_id_index ON connection_report_events (client_id)`.execute();
+            await db.sql `CREATE INDEX IF NOT EXISTS sdk_index ON connection_report_events (sdk)`.execute();
+        });
+    }
+    catch (e_1) {
+        env_1.error = e_1;
+        env_1.hasError = true;
+    }
+    finally {
+        const result_1 = __disposeResources(env_1);
+        if (result_1)
+            await result_1;
+    }
+};
+export const down = async (context) => {
+    const env_2 = { stack: [], error: void 0, hasError: false };
+    try {
+        const { service_context: { configuration } } = context;
+        const client = __addDisposableResource(env_2, openMigrationDB(configuration.storage), true);
+        await client.sql `DROP TABLE IF EXISTS connection_report_events`.execute();
+    }
+    catch (e_2) {
+        env_2.error = e_2;
+        env_2.hasError = true;
+    }
+    finally {
+        const result_2 = __disposeResources(env_2);
+        if (result_2)
+            await result_2;
+    }
+};
+//# sourceMappingURL=1756282360128-connection-reporting.js.map

package/dist/migrations/scripts/1756282360128-connection-reporting.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"1756282360128-connection-reporting.js","sourceRoot":"","sources":["../../../src/migrations/scripts/1756282360128-connection-reporting.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,MAAM,CAAC,MAAM,EAAE,GAA0C,KAAK,EAAE,OAAO,EAAE,EAAE;;;QACzE,MAAM,EACJ,eAAe,EAAE,EAAE,aAAa,EAAE,EACnC,GAAG,OAAO,CAAC;QACZ,MAAY,MAAM,kCAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,OAAA,CAAC;QAC5D,MAAM,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YACpC,MAAM,EAAE,CAAC,GAAG,CAAA;;;;;;;;;;;KAWX,CAAC,OAAO,EAAE,CAAC;YAEZ,MAAM,EAAE,CAAC,GAAG,CAAA;;KAEX,CAAC,OAAO,EAAE,CAAC;YAEZ,MAAM,EAAE,CAAC,GAAG,CAAA,oFAAoF,CAAC,OAAO,EAAE,CAAC;YAE3G,MAAM,EAAE,CAAC,GAAG,CAAA,wFAAwF,CAAC,OAAO,EAAE,CAAC;YAE/G,MAAM,EAAE,CAAC,GAAG,CAAA,wEAAwE,CAAC,OAAO,EAAE,CAAC;QACjG,CAAC,CAAC,CAAC;;;;;;;;;;;CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAA0C,KAAK,EAAE,OAAO,EAAE,EAAE;;;QAC3E,MAAM,EACJ,eAAe,EAAE,EAAE,aAAa,EAAE,EACnC,GAAG,OAAO,CAAC;QACZ,MAAY,MAAM,kCAAG,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,OAAA,CAAC;QAC5D,MAAM,MAAM,CAAC,GAAG,CAAA,+CAA+C,CAAC,OAAO,EAAE,CAAC;;;;;;;;;;;CAC3E,CAAC"}

package/dist/storage/PostgresReportStorageFactory.js

@@ -54,7 +54,7 @@ export class PostgresReportStorageFactory {
             connection_report_events
           WHERE
             disconnected_at IS NULL
-            AND jwt_exp > NOW() AT TIME ZONE 'UTC'
+            AND jwt_exp > NOW()
         ),
         unique_users AS (
           SELECT

package/dist/utils/db.js

@@ -19,7 +19,6 @@ export const dropTables = async (client) => {
         await db.sql `DROP TABLE IF EXISTS custom_write_checkpoints`.execute();
         await db.sql `DROP SEQUENCE IF EXISTS op_id_sequence`.execute();
         await db.sql `DROP SEQUENCE IF EXISTS sync_rules_id_sequence`.execute();
-        await db.sql `DROP TABLE IF EXISTS connection_report_events`.execute();
     });
 };
 //# sourceMappingURL=db.js.map

package/dist/utils/db.js.map

@@ -1 +1 @@
-{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/utils/db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,iCAAiC,CAAC;AAEhE,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC;AAE/C,MAAM,CAAC,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AAE3D;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;AAEpC,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,MAAmC,EAAE,EAAE;IACtE,sDAAsD;IACtD,MAAM,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACvC,MAAM,EAAE,CAAC,GAAG,CAAA,kCAAkC,CAAC,OAAO,EAAE,CAAC;QACzD,MAAM,EAAE,CAAC,GAAG,CAAA,wCAAwC,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,EAAE,CAAC,GAAG,CAAA,iCAAiC,CAAC,OAAO,EAAE,CAAC;QACxD,MAAM,EAAE,CAAC,GAAG,CAAA,+BAA+B,CAAC,OAAO,EAAE,CAAC;QACtD,MAAM,EAAE,CAAC,GAAG,CAAA,kCAAkC,CAAC,OAAO,EAAE,CAAC;QACzD,MAAM,EAAE,CAAC,GAAG,CAAA,mCAAmC,CAAC,OAAO,EAAE,CAAC;QAC1D,MAAM,EAAE,CAAC,GAAG,CAAA,oCAAoC,CAAC,OAAO,EAAE,CAAC;QAC3D,MAAM,EAAE,CAAC,GAAG,CAAA,wCAAwC,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,EAAE,CAAC,GAAG,CAAA,+CAA+C,CAAC,OAAO,EAAE,CAAC;QACtE,MAAM,EAAE,CAAC,GAAG,CAAA,wCAAwC,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,EAAE,CAAC,GAAG,CAAA,gDAAgD,CAAC,OAAO,EAAE,CAAC;QACvE,MAAM,EAAE,CAAC,GAAG,CAAA,+CAA+C,CAAC,OAAO,EAAE,CAAC;IACxE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/utils/db.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,iCAAiC,CAAC;AAEhE,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC;AAE/C,MAAM,CAAC,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AAE3D;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;AAEpC,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,MAAmC,EAAE,EAAE;IACtE,sDAAsD;IACtD,MAAM,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QACvC,MAAM,EAAE,CAAC,GAAG,CAAA,kCAAkC,CAAC,OAAO,EAAE,CAAC;QACzD,MAAM,EAAE,CAAC,GAAG,CAAA,wCAAwC,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,EAAE,CAAC,GAAG,CAAA,iCAAiC,CAAC,OAAO,EAAE,CAAC;QACxD,MAAM,EAAE,CAAC,GAAG,CAAA,+BAA+B,CAAC,OAAO,EAAE,CAAC;QACtD,MAAM,EAAE,CAAC,GAAG,CAAA,kCAAkC,CAAC,OAAO,EAAE,CAAC;QACzD,MAAM,EAAE,CAAC,GAAG,CAAA,mCAAmC,CAAC,OAAO,EAAE,CAAC;QAC1D,MAAM,EAAE,CAAC,GAAG,CAAA,oCAAoC,CAAC,OAAO,EAAE,CAAC;QAC3D,MAAM,EAAE,CAAC,GAAG,CAAA,wCAAwC,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,EAAE,CAAC,GAAG,CAAA,+CAA+C,CAAC,OAAO,EAAE,CAAC;QACtE,MAAM,EAAE,CAAC,GAAG,CAAA,wCAAwC,CAAC,OAAO,EAAE,CAAC;QAC/D,MAAM,EAAE,CAAC,GAAG,CAAA,gDAAgD,CAAC,OAAO,EAAE,CAAC;IACzE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@powersync/service-module-postgres-storage",
   "repository": "https://github.com/powersync-ja/powersync-service",
   "types": "dist/@types/index.d.ts",
-  "version": "0.0.0-dev-20250825132649",
+  "version": "0.0.0-dev-20250827091123",
   "main": "dist/index.js",
   "type": "module",
   "publishConfig": {
@@ -28,14 +28,14 @@
     "p-defer": "^4.0.1",
     "ts-codec": "^1.3.0",
     "uuid": "^11.1.0",
-    "@powersync/lib-service-postgres": "0.0.0-dev-20250825132649",
-    "@powersync/lib-services-framework": "0.0.0-dev-20250825132649",
-    "@powersync/service-core": "0.0.0-dev-20250825132649",
-    "@powersync/service-types": "0.0.0-dev-20250825132649",
-    "@powersync/service-core-tests": "0.0.0-dev-20250825132649",
-    "@powersync/service-jpgwire": "0.0.0-dev-20250825132649",
-    "@powersync/service-jsonbig": "0.0.0-dev-20250825132649",
-    "@powersync/service-sync-rules": "0.0.0-dev-20250825132649"
+    "@powersync/lib-service-postgres": "0.0.0-dev-20250827091123",
+    "@powersync/lib-services-framework": "0.0.0-dev-20250827091123",
+    "@powersync/service-core": "0.0.0-dev-20250827091123",
+    "@powersync/service-types": "0.0.0-dev-20250827091123",
+    "@powersync/service-core-tests": "0.0.0-dev-20250827091123",
+    "@powersync/service-jpgwire": "0.0.0-dev-20250827091123",
+    "@powersync/service-jsonbig": "0.0.0-dev-20250827091123",
+    "@powersync/service-sync-rules": "0.0.0-dev-20250827091123"
   },
   "devDependencies": {
     "typescript": "^5.7.3"

package/src/migrations/scripts/1756282360128-connection-reporting.ts

@@ -0,0 +1,41 @@
+import { migrations } from '@powersync/service-core';
+import { openMigrationDB } from '../migration-utils.js';
+
+export const up: migrations.PowerSyncMigrationFunction = async (context) => {
+  const {
+    service_context: { configuration }
+  } = context;
+  await using client = openMigrationDB(configuration.storage);
+  await client.transaction(async (db) => {
+    await db.sql`
+      CREATE TABLE IF NOT EXISTS connection_report_events (
+        id TEXT PRIMARY KEY,
+        user_agent TEXT NOT NULL,
+        client_id TEXT NOT NULL,
+        user_id TEXT NOT NULL,
+        sdk TEXT NOT NULL,
+        jwt_exp TIMESTAMP WITH TIME ZONE,
+        connected_at TIMESTAMP WITH TIME ZONE NOT NULL,
+        disconnected_at TIMESTAMP WITH TIME ZONE
+      )
+    `.execute();
+
+    await db.sql`
+      CREATE INDEX IF NOT EXISTS sdk_list_index ON connection_report_events (connected_at, jwt_exp, disconnected_at)
+    `.execute();
+
+    await db.sql`CREATE INDEX IF NOT EXISTS sdk_user_id_index ON connection_report_events (user_id)`.execute();
+
+    await db.sql`CREATE INDEX IF NOT EXISTS sdk_client_id_index ON connection_report_events (client_id)`.execute();
+
+    await db.sql`CREATE INDEX IF NOT EXISTS sdk_index ON connection_report_events (sdk)`.execute();
+  });
+};
+
+export const down: migrations.PowerSyncMigrationFunction = async (context) => {
+  const {
+    service_context: { configuration }
+  } = context;
+  await using client = openMigrationDB(configuration.storage);
+  await client.sql`DROP TABLE IF EXISTS connection_report_events`.execute();
+};

package/src/storage/PostgresReportStorageFactory.ts

@@ -66,7 +66,7 @@ export class PostgresReportStorageFactory implements storage.ReportStorage {
             connection_report_events
           WHERE
             disconnected_at IS NULL
-            AND jwt_exp > NOW() AT TIME ZONE 'UTC'
+            AND jwt_exp > NOW()
         ),
         unique_users AS (
           SELECT

package/src/utils/db.ts

@@ -23,6 +23,5 @@ export const dropTables = async (client: lib_postgres.DatabaseClient) => {
     await db.sql`DROP TABLE IF EXISTS custom_write_checkpoints`.execute();
     await db.sql`DROP SEQUENCE IF EXISTS op_id_sequence`.execute();
     await db.sql`DROP SEQUENCE IF EXISTS sync_rules_id_sequence`.execute();
-    await db.sql`DROP TABLE IF EXISTS connection_report_events`.execute();
   });
 };

package/test/src/__snapshots__/connection-report-storage.test.ts.snap

@@ -55,43 +55,29 @@ exports[`Connection report storage > Should delete rows older than specified ran
 }
 `;
 
-exports[`Connection report storage > Should show connected users with start range 1`] = `
-{
-  "sdks": [
-    {
-      "clients": 1,
-      "sdk": "powersync-dart/1.6.4",
-      "users": 1,
-    },
-    {
-      "clients": 1,
-      "sdk": "powersync-js/1.21.1",
-      "users": 1,
-    },
-    {
-      "clients": 1,
-      "sdk": "unknown",
-      "users": 1,
-    },
-  ],
-  "users": 2,
-}
+exports[`Connection report storage > Should update a connection event and make it disconnected 1`] = `
+[
+  {
+    "client_id": "client_three",
+    "sdk": "powersync-js/1.21.2",
+    "user_agent": "powersync-js/1.21.0 powersync-web Firefox/141 linux",
+    "user_id": "user_three",
+  },
+]
 `;
 
-exports[`Connection report storage > Should show connected users with start range and end range 1`] = `
-{
-  "sdks": [
-    {
-      "clients": 1,
-      "sdk": "powersync-js/1.21.1",
-      "users": 1,
-    },
-  ],
-  "users": 1,
-}
+exports[`Connection report storage > Should update a connection event if its within a day 1`] = `
+[
+  {
+    "client_id": "client_one",
+    "sdk": "powersync-dart/1.6.4",
+    "user_agent": "powersync-dart/1.6.4 Dart (flutter-web) Chrome/128 android",
+    "user_id": "user_one",
+  },
+]
 `;
 
-exports[`Connection report storage > Should show connection report data for user over the past day 1`] = `
+exports[`Report storage tests > Should show connection report data for user over the past day 1`] = `
 {
   "sdks": [
     {
@@ -119,7 +105,7 @@ exports[`Connection report storage > Should show connection report data for user
 }
 `;
 
-exports[`Connection report storage > Should show connection report data for user over the past month 1`] = `
+exports[`Report storage tests > Should show connection report data for user over the past month 1`] = `
 {
   "sdks": [
     {
@@ -167,7 +153,7 @@ exports[`Connection report storage > Should show connection report data for user
 }
 `;
 
-exports[`Connection report storage > Should show connection report data for user over the past week 1`] = `
+exports[`Report storage tests > Should show connection report data for user over the past week 1`] = `
 {
   "sdks": [
     {
@@ -205,46 +191,25 @@ exports[`Connection report storage > Should show connection report data for user
 }
 `;
 
-exports[`Connection report storage > Should update a connected sdk event and make it disconnected 1`] = `
-[
-  {
-    "client_id": "client_three",
-    "sdk": "powersync-js/1.21.2",
-    "user_agent": "powersync-js/1.21.0 powersync-web Firefox/141 linux",
-    "user_id": "user_three",
-  },
-]
-`;
-
-exports[`Connection report storage > Should update a connection event and make it disconnected 1`] = `
-[
-  {
-    "client_id": "client_three",
-    "sdk": "powersync-js/1.21.2",
-    "user_agent": "powersync-js/1.21.0 powersync-web Firefox/141 linux",
-    "user_id": "user_three",
-  },
-]
-`;
-
-exports[`Connection report storage > Should update a connection event if its within a day 1`] = `
-[
-  {
-    "client_id": "client_one",
-    "sdk": "powersync-dart/1.6.4",
-    "user_agent": "powersync-dart/1.6.4 Dart (flutter-web) Chrome/128 android",
-    "user_id": "user_one",
-  },
-]
-`;
-
-exports[`Connection report storage > Should update a sdk event if its within a day 1`] = `
-[
-  {
-    "client_id": "client_one",
-    "sdk": "powersync-dart/1.6.4",
-    "user_agent": "powersync-dart/1.6.4 Dart (flutter-web) Chrome/128 android",
-    "user_id": "user_one",
-  },
-]
+exports[`Report storage tests > Should show currently connected users 1`] = `
+{
+  "sdks": [
+    {
+      "clients": 1,
+      "sdk": "powersync-dart/1.6.4",
+      "users": 1,
+    },
+    {
+      "clients": 1,
+      "sdk": "powersync-js/1.21.1",
+      "users": 1,
+    },
+    {
+      "clients": 1,
+      "sdk": "unknown",
+      "users": 1,
+    },
+  ],
+  "users": 2,
+}
 `;