@playwright-orchestrator/pg 1.0.5 → 1.1.0

package/dist/create-args.d.ts

@@ -1,4 +1,7 @@
 export interface CreateArgs {
     connectionString: string;
     tableNamePrefix: string;
+    sslCa?: string | Buffer;
+    sslCert?: string | Buffer;
+    sslKey?: string | Buffer;
 }

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import { Command } from '@commander-js/extra-typings';
 import { CreateArgs } from './create-args';
 import { PostgreSQLAdapter } from './postgresql-adapter';
-export { PostgreSQLAdapter as PostreSQLAdapter };
-export declare function factory(args: CreateArgs): PostgreSQLAdapter;
+export declare function factory(args: CreateArgs): Promise<PostgreSQLAdapter>;
 export declare function createOptions(command: Command): void;
 export declare const description = "PostgreSQL storage adapter";

package/dist/index.js

@@ -1,16 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.description = exports.PostreSQLAdapter = void 0;
+exports.description = void 0;
 exports.factory = factory;
 exports.createOptions = createOptions;
+const extra_typings_1 = require("@commander-js/extra-typings");
 const postgresql_adapter_1 = require("./postgresql-adapter");
-Object.defineProperty(exports, "PostreSQLAdapter", { enumerable: true, get: function () { return postgresql_adapter_1.PostgreSQLAdapter; } });
-function factory(args) {
+const promises_1 = require("node:fs/promises");
+async function factory(args) {
+    const { sslCa, sslCert, sslKey } = args;
+    if (sslCa) {
+        args.sslCa = await (0, promises_1.readFile)(sslCa);
+    }
+    if (sslCert && sslKey) {
+        args.sslCert = await (0, promises_1.readFile)(sslCert);
+        args.sslKey = await (0, promises_1.readFile)(sslKey);
+    }
     return new postgresql_adapter_1.PostgreSQLAdapter(args);
 }
 function createOptions(command) {
     command
-        .option('--table-name-prefix <string>', 'Tables name prefix', 'playwright_orchestrator')
-        .requiredOption('--connection-string <string>', 'Connection string');
+        .addOption(new extra_typings_1.Option('--table-name-prefix <string>', 'Tables name prefix')
+        .default('playwright_orchestrator')
+        .env('TABLE_NAME_PREFIX'))
+        .addOption(new extra_typings_1.Option('--ssl-ca <string>', 'SSL CA file').env('SSL_CA'))
+        .addOption(new extra_typings_1.Option('--ssl-cert <string>', 'SSL certificate file').env('SSL_CERT'))
+        .addOption(new extra_typings_1.Option('--ssl-key <string>', 'SSL key file').env('SSL_KEY'))
+        .addOption(new extra_typings_1.Option('--connection-string <string>', 'Connection string')
+        .makeOptionMandatory()
+        .env('CONNECTION_STRING'));
 }
 exports.description = 'PostgreSQL storage adapter';

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playwright-orchestrator/pg",
-    "version": "1.0.5",
+    "version": "1.1.0",
     "keywords": [],
     "author": "Rostyslav Kudrevatykh",
     "license": "Apache-2.0",

package/dist/postgresql-adapter.d.ts

@@ -4,7 +4,7 @@ export declare class PostgreSQLAdapter extends Adapter {
     private readonly configTable;
     private readonly testsTable;
     private readonly pool;
-    constructor({ connectionString, tableNamePrefix }: CreateArgs);
+    constructor({ connectionString, tableNamePrefix, sslCa, sslCert, sslKey }: CreateArgs);
     getNextTest(runId: string, config: TestRunConfig): Promise<TestItem | undefined>;
     finishTest(runId: string, test: TestItem): Promise<void>;
     failTest(runId: string, test: TestItem): Promise<void>;

package/dist/postgresql-adapter.js

@@ -4,9 +4,18 @@ exports.PostgreSQLAdapter = void 0;
 const core_1 = require("@playwright-orchestrator/core");
 const pg_1 = require("pg");
 class PostgreSQLAdapter extends core_1.Adapter {
-    constructor({ connectionString, tableNamePrefix }) {
+    constructor({ connectionString, tableNamePrefix, sslCa, sslCert, sslKey }) {
         super();
-        this.pool = new pg_1.Pool({ connectionString });
+        const config = { connectionString };
+        config.ssl = sslCa || sslCert || sslKey ? {} : undefined;
+        if (sslCa) {
+            config.ssl.ca = sslCa;
+        }
+        if (sslCert && sslKey) {
+            config.ssl.cert = sslCert;
+            config.ssl.key = sslKey;
+        }
+        this.pool = new pg_1.Pool(config);
         this.configTable = (0, pg_1.escapeIdentifier)(`${tableNamePrefix}_test_runs`);
         this.testsTable = (0, pg_1.escapeIdentifier)(`${tableNamePrefix}_tests`);
     }
@@ -28,7 +37,7 @@ class PostgreSQLAdapter extends core_1.Adapter {
                 FROM next_test
                 WHERE t.run_id = $1 AND t.order_num = next_test.order_num
                 RETURNING *`,
-                values: [runId, core_1.TestStatus.Ready, core_1.TestStatus.Running],
+                values: [runId, core_1.TestStatus.Ready, core_1.TestStatus.Ongoing],
             });
             await client.query('COMMIT');
             if (result.rowCount === 0)
@@ -103,35 +112,59 @@ class PostgreSQLAdapter extends core_1.Adapter {
                 updated TIMESTAMP NOT NULL DEFAULT NOW(),
                 PRIMARY KEY (run_id, order_num),
                 FOREIGN KEY (run_id) REFERENCES ${this.configTable}(id)
-            );`);
+            );
+            CREATE INDEX IF NOT EXISTS status_idx ON ${this.testsTable}(status);`);
     }
     async startShard(runId) {
-        // Avoid updating updated field as shard can be started multiple times in uncertain order and time.
-        const result = await this.pool.query({
-            name: 'update-start-config',
-            text: `UPDATE ${this.configTable}
-            SET status = 
-                CASE 
-                WHEN status IN ($1, $2) THEN $2
-                ELSE $3
-                END
-            WHERE id = $4 
-            RETURNING *`,
-            values: [core_1.RunStatus.Finished, core_1.RunStatus.Rerun, core_1.RunStatus.Run, runId],
-        });
-        if (result.rowCount === 0) {
-            throw new Error(`Run ${runId} not found`);
+        const client = await this.pool.connect();
+        try {
+            await client.query('BEGIN');
+            let result = await client.query({
+                text: `
+                    SELECT *
+                    FROM ${this.configTable}
+                    WHERE id = $1
+                    FOR UPDATE`,
+                values: [runId],
+            });
+            if (result.rowCount === 0) {
+                throw new Error(`Run ${runId} not found`);
+            }
+            const { updated: updatedBefore, status: statusBefore } = result.rows[0];
+            if (statusBefore === core_1.RunStatus.Created || statusBefore === core_1.RunStatus.Finished) {
+                await client.query({
+                    text: `
+                    UPDATE ${this.testsTable}
+                    SET updated = NOW(), status = $3
+                    WHERE run_id = $1 AND status = $2 AND updated <= $4;`,
+                    values: [runId, core_1.TestStatus.Failed, core_1.TestStatus.Ready, updatedBefore],
+                });
+                // using str interpolation for case statement to avoid casting ints to strings
+                result = await client.query({
+                    text: `
+                    UPDATE ${this.configTable}
+                    SET status = (CASE
+                        WHEN status = $2 THEN ${core_1.RunStatus.Run}
+                        ELSE ${core_1.RunStatus.RepeatRun}
+                    END),
+                    updated = NOW()
+                    WHERE id = $1
+                    RETURNING *;`,
+                    values: [runId, core_1.RunStatus.Created],
+                });
+            }
+            await client.query('COMMIT');
+            const { updated, status, config } = result.rows[0];
+            const mappedConfig = { ...config, updated: updated.getTime(), status };
+            return mappedConfig;
+        }
+        catch (e) {
+            await client.query('ROLLBACK');
+            throw e;
+        }
+        finally {
+            client.release();
         }
-        const { updated, status, config } = result.rows[0];
-        const mappedConfig = { ...config, updated: updated.getTime(), status };
-        await this.pool.query({
-            name: 'update-tests-status',
-            text: `UPDATE ${this.testsTable}
-            SET status = $1
-            WHERE run_id = $2 AND status = $3 AND updated < $4`,
-            values: [core_1.TestStatus.Ready, runId, core_1.TestStatus.Failed, updated],
-        });
-        return mappedConfig;
     }
     async finishShard(runId) {
         // set 'updated' field to current time as test run exhausted all tests

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playwright-orchestrator/pg",
-    "version": "1.0.5",
+    "version": "1.1.0",
     "keywords": [],
     "author": "Rostyslav Kudrevatykh",
     "license": "Apache-2.0",