@powersync/service-core 0.2.1 → 0.2.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @powersync/service-core
 
+## 0.2.2
+
+### Patch Changes
+
+- 8245912: Fix teardown command not terminating after some errors.
+- 7587a74: Fix date parsing in replication for dates further back than 100 AD.
+- Updated dependencies [7587a74]
+  - @powersync/service-jpgwire@0.17.13
+
 ## 0.2.1
 
 ### Patch Changes

package/dist/runner/teardown.js

@@ -26,9 +26,9 @@ async function terminateReplicator(storageFactory, connection, syncRules) {
             source_db: connection,
             lock
         });
-        console.log('terminating', stream.slot_name);
+        micro.logger.info(`Terminating replication slot ${stream.slot_name}`);
         await stream.terminate();
-        console.log('terminated', stream.slot_name);
+        micro.logger.info(`Terminated replication slot ${stream.slot_name}`);
     }
     finally {
         await lock.release();
@@ -66,14 +66,29 @@ async function terminateReplicators(storageFactory, connection) {
 export async function teardown(runnerConfig) {
     const config = await utils.loadConfig(runnerConfig);
     const mongoDB = storage.createPowerSyncMongo(config.storage);
-    await db.mongo.waitForAuth(mongoDB.db);
-    const bucketStorage = new storage.MongoBucketStorage(mongoDB, { slot_name_prefix: config.slot_name_prefix });
-    const connection = config.connection;
-    if (connection) {
-        await terminateReplicators(bucketStorage, connection);
+    try {
+        micro.logger.info(`Waiting for auth`);
+        await db.mongo.waitForAuth(mongoDB.db);
+        const bucketStorage = new storage.MongoBucketStorage(mongoDB, { slot_name_prefix: config.slot_name_prefix });
+        const connection = config.connection;
+        micro.logger.info(`Terminating replication slots`);
+        if (connection) {
+            await terminateReplicators(bucketStorage, connection);
+        }
+        const database = mongoDB.db;
+        micro.logger.info(`Dropping database ${database.namespace}`);
+        await database.dropDatabase();
+        micro.logger.info(`Done`);
+        await mongoDB.client.close();
+        // If there was an error connecting to postgress, the process may stay open indefinitely.
+        // This forces an exit.
+        // We do not consider those errors a teardown failure.
+        process.exit(0);
+    }
+    catch (e) {
+        micro.logger.error(`Teardown failure`, e);
+        await mongoDB.client.close();
+        process.exit(1);
     }
-    const database = mongoDB.db;
-    await database.dropDatabase();
-    await mongoDB.client.close();
 }
 //# sourceMappingURL=teardown.js.map

package/dist/runner/teardown.js.map

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

package/package.json

@@ -5,7 +5,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.2.1",
+  "version": "0.2.2",
   "main": "dist/index.js",
   "license": "FSL-1.1-Apache-2.0",
   "type": "module",
@@ -33,10 +33,10 @@
     "ts-codec": "^1.2.2",
     "uuid": "^9.0.1",
     "yaml": "^2.3.2",
-    "@powersync/service-jpgwire": "0.17.12",
+    "@powersync/service-jpgwire": "0.17.13",
     "@powersync/service-jsonbig": "0.17.10",
-    "@powersync/service-rsocket-router": "0.0.7",
     "@powersync/service-sync-rules": "0.17.10",
+    "@powersync/service-rsocket-router": "0.0.7",
     "@powersync/service-types": "0.1.0"
   },
   "devDependencies": {

package/src/runner/teardown.ts

@@ -33,9 +33,10 @@ async function terminateReplicator(
       source_db: connection,
       lock
     });
-    console.log('terminating', stream.slot_name);
+
+    micro.logger.info(`Terminating replication slot ${stream.slot_name}`);
     await stream.terminate();
-    console.log('terminated', stream.slot_name);
+    micro.logger.info(`Terminated replication slot ${stream.slot_name}`);
   } finally {
     await lock.release();
   }
@@ -76,16 +77,32 @@ async function terminateReplicators(
 export async function teardown(runnerConfig: utils.RunnerConfig) {
   const config = await utils.loadConfig(runnerConfig);
   const mongoDB = storage.createPowerSyncMongo(config.storage);
-  await db.mongo.waitForAuth(mongoDB.db);
+  try {
+    micro.logger.info(`Waiting for auth`);
+    await db.mongo.waitForAuth(mongoDB.db);
 
-  const bucketStorage = new storage.MongoBucketStorage(mongoDB, { slot_name_prefix: config.slot_name_prefix });
-  const connection = config.connection;
+    const bucketStorage = new storage.MongoBucketStorage(mongoDB, { slot_name_prefix: config.slot_name_prefix });
+    const connection = config.connection;
 
-  if (connection) {
-    await terminateReplicators(bucketStorage, connection);
-  }
+    micro.logger.info(`Terminating replication slots`);
 
-  const database = mongoDB.db;
-  await database.dropDatabase();
-  await mongoDB.client.close();
+    if (connection) {
+      await terminateReplicators(bucketStorage, connection);
+    }
+
+    const database = mongoDB.db;
+    micro.logger.info(`Dropping database ${database.namespace}`);
+    await database.dropDatabase();
+    micro.logger.info(`Done`);
+    await mongoDB.client.close();
+
+    // If there was an error connecting to postgress, the process may stay open indefinitely.
+    // This forces an exit.
+    // We do not consider those errors a teardown failure.
+    process.exit(0);
+  } catch (e) {
+    micro.logger.error(`Teardown failure`, e);
+    await mongoDB.client.close();
+    process.exit(1);
+  }
 }

package/test/src/pg_test.test.ts

@@ -86,6 +86,12 @@ VALUES(6, 'epoch'::timestamp, 'epoch'::timestamptz);
 
 INSERT INTO test_data(id, timestamp, timestamptz)
 VALUES(7, 'infinity'::timestamp, 'infinity'::timestamptz);
+
+INSERT INTO test_data(id, timestamptz)
+VALUES(8, '0022-02-03 12:13:14+03'::timestamptz);
+
+INSERT INTO test_data(id, timestamptz)
+VALUES(9, '10022-02-03 12:13:14+03'::timestamptz);
     `);
   }
 
@@ -186,6 +192,18 @@ VALUES(10, ARRAY['null']::TEXT[]);
       timestamp: '9999-12-31 23:59:59',
       timestamptz: '9999-12-31 23:59:59Z'
     });
+
+    expect(transformed[7]).toMatchObject({
+      id: 8n,
+      timestamptz: '0022-02-03 09:13:14Z'
+    });
+
+    expect(transformed[8]).toMatchObject({
+      id: 9n,
+      // 10022-02-03 12:13:14+03 - out of range of both our date parsing logic, and sqlite's date functions
+      // We can consider just preserving the source string as an alternative if this causes issues.
+      timestamptz: null
+    });
   }
 
   function checkResultArrays(transformed: Record<string, any>[]) {