@playwright-orchestrator/pg 1.4.3 → 1.5.0

package/dist/pg-shard-handler.d.ts

@@ -13,4 +13,8 @@ export declare class PgShardHandler implements ShardHandler {
     private claimNextTest;
     startShard(): Promise<TestRunConfig>;
     finishShard(): Promise<void>;
+    getRemainingCounters(_config: TestRunConfig): Promise<{
+        remainingCount: number;
+        remainingTime: number;
+    }>;
 }

package/dist/pg-shard-handler.js

@@ -57,10 +57,20 @@ let PgShardHandler = class PgShardHandler {
                 RETURNING *`,
                 values,
             });
-            await client.query('COMMIT');
-            if (result.rowCount === 0)
+            if (result.rowCount === 0) {
+                await client.query('COMMIT');
                 return undefined;
+            }
             const { file, line, character, projects, timeout, ema, order_num, children, test_id } = result.rows[0];
+            await client.query({
+                text: `UPDATE ${this.configTable}
+                SET config = jsonb_set(jsonb_set(config,
+                    '{remainingCount}', ((config->>'remainingCount')::bigint - 1)::text::jsonb),
+                    '{remainingTime}', ((config->>'remainingTime')::float - $2)::text::jsonb)
+                WHERE id = $1`,
+                values: [runId, ema],
+            });
+            await client.query('COMMIT');
             return {
                 file,
                 position: `${line}:${character}`,
@@ -110,6 +120,16 @@ let PgShardHandler = class PgShardHandler {
                     WHERE id = $1;`,
                     values: [runId, RunStatus.Created],
                 });
+                if (statusBefore === RunStatus.Finished) {
+                    await client.query({
+                        text: `UPDATE ${this.configTable}
+                        SET config = jsonb_set(jsonb_set(config,
+                            '{remainingCount}', (SELECT COUNT(*) FROM ${this.testsTable} WHERE run_id = $1 AND status = ${TestStatus.Ready})::text::jsonb),
+                            '{remainingTime}', (SELECT COALESCE(SUM(ema), 0) FROM ${this.testsTable} WHERE run_id = $1 AND status = ${TestStatus.Ready})::text::jsonb)
+                        WHERE id = $1`,
+                        values: [runId],
+                    });
+                }
             }
             await client.query({
                 text: `UPDATE ${this.configTable}
@@ -140,6 +160,20 @@ let PgShardHandler = class PgShardHandler {
             shards = jsonb_set(shards, $3, to_jsonb((EXTRACT(EPOCH FROM NOW()) * 1000)::bigint))
             WHERE id = $1 AND shards #>> $3::text[] IS NULL;`, [runId, RunStatus.Finished, `{${shardId},finished}`]);
     }
+    async getRemainingCounters(_config) {
+        const { runId } = this.runContext;
+        const result = await this.pool.query({
+            text: `SELECT config->>'remainingCount' AS remaining_count, config->>'remainingTime' AS remaining_time FROM ${this.configTable} WHERE id = $1`,
+            values: [runId],
+        });
+        if (result.rowCount === 0)
+            return { remainingCount: 0, remainingTime: 0 };
+        const { remaining_count, remaining_time } = result.rows[0];
+        return {
+            remainingCount: Math.max(0, Number(remaining_count ?? 0)),
+            remainingTime: Math.max(0, Number(remaining_time ?? 0)),
+        };
+    }
 };
 PgShardHandler = __decorate([
     injectable(),

package/dist/pg-test-run-creator.js

@@ -73,6 +73,8 @@ let PgTestRunCreator = class PgTestRunCreator extends BaseTestRunCreator {
         const client = await this.pool.connect();
         try {
             await client.query('BEGIN');
+            run.config.remainingCount = tests.length;
+            run.config.remainingTime = tests.reduce((sum, t) => sum + t.ema, 0);
             await client.query({
                 text: `INSERT INTO ${this.configTable} (id, status, config, shards) VALUES ($1, $2, $3, '{}')`,
                 values: [runId, RunStatus.Created, JSON.stringify(run.config)],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playwright-orchestrator/pg",
-  "version": "1.4.3",
+  "version": "1.5.0",
   "keywords": [],
   "author": "Rostyslav Kudrevatykh",
   "license": "Apache-2.0",
@@ -17,7 +17,7 @@
     "commander": "^13.0.0",
     "inversify": "^8.0.0-beta.0",
     "pg": "^8.13.1",
-    "@playwright-orchestrator/core": "1.4.3"
+    "@playwright-orchestrator/core": "1.5.0"
   },
   "devDependencies": {
     "@types/pg": "^8.11.0"