@playwright-orchestrator/pg 1.0.5 → 1.1.1

package/dist/create-args.d.ts

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

package/dist/create-args.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

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;
+import { CreateArgs } from './create-args.js';
+import { PostgreSQLAdapter } from './postgresql-adapter.js';
+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,18 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.description = exports.PostreSQLAdapter = void 0;
-exports.factory = factory;
-exports.createOptions = createOptions;
-const postgresql_adapter_1 = require("./postgresql-adapter");
-Object.defineProperty(exports, "PostreSQLAdapter", { enumerable: true, get: function () { return postgresql_adapter_1.PostgreSQLAdapter; } });
-function factory(args) {
-    return new postgresql_adapter_1.PostgreSQLAdapter(args);
+import { Option } from '@commander-js/extra-typings';
+import { PostgreSQLAdapter } from './postgresql-adapter.js';
+export async function factory(args) {
+    return new PostgreSQLAdapter(args);
 }
-function createOptions(command) {
+export function createOptions(command) {
     command
-        .option('--table-name-prefix <string>', 'Tables name prefix', 'playwright_orchestrator')
-        .requiredOption('--connection-string <string>', 'Connection string');
+        .addOption(new Option('--table-name-prefix <string>', 'Tables name prefix')
+        .default('playwright_orchestrator')
+        .env('TABLE_NAME_PREFIX'))
+        .addOption(new Option('--ssl-ca <string>', 'SSL CA').env('SSL_CA'))
+        .addOption(new Option('--ssl-cert <string>', 'SSL certificate').env('SSL_CERT'))
+        .addOption(new Option('--ssl-key <string>', 'SSL key').env('SSL_KEY'))
+        .addOption(new Option('--connection-string <string>', 'Connection string')
+        .makeOptionMandatory()
+        .env('CONNECTION_STRING'));
 }
-exports.description = 'PostgreSQL storage adapter';
+export const description = 'PostgreSQL storage adapter';

package/dist/postgresql-adapter.d.ts

@@ -1,10 +1,10 @@
 import { TestItem, TestRunInfo, Adapter, TestRunConfig } from '@playwright-orchestrator/core';
-import { CreateArgs } from './create-args';
+import { CreateArgs } from './create-args.js';
 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

@@ -1,14 +1,23 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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 }) {
+import { Adapter, RunStatus, TestStatus } from '@playwright-orchestrator/core';
+import pg from 'pg';
+export class PostgreSQLAdapter extends Adapter {
+    configTable;
+    testsTable;
+    pool;
+    constructor({ connectionString, tableNamePrefix, sslCa, sslCert, sslKey }) {
         super();
-        this.pool = new pg_1.Pool({ connectionString });
-        this.configTable = (0, pg_1.escapeIdentifier)(`${tableNamePrefix}_test_runs`);
-        this.testsTable = (0, pg_1.escapeIdentifier)(`${tableNamePrefix}_tests`);
+        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.Pool(config);
+        this.configTable = pg.escapeIdentifier(`${tableNamePrefix}_test_runs`);
+        this.testsTable = pg.escapeIdentifier(`${tableNamePrefix}_tests`);
     }
     async getNextTest(runId, config) {
         const client = await this.pool.connect();
@@ -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, TestStatus.Ready, TestStatus.Ongoing],
             });
             await client.query('COMMIT');
             if (result.rowCount === 0)
@@ -44,10 +53,10 @@ class PostgreSQLAdapter extends core_1.Adapter {
         }
     }
     async finishTest(runId, test) {
-        await this.updateTestStatus(runId, test, core_1.TestStatus.Passed);
+        await this.updateTestStatus(runId, test, TestStatus.Passed);
     }
     async failTest(runId, test) {
-        await this.updateTestStatus(runId, test, core_1.TestStatus.Failed);
+        await this.updateTestStatus(runId, test, TestStatus.Failed);
     }
     async updateTestStatus(runId, test, status) {
         await this.pool.query({
@@ -62,7 +71,7 @@ class PostgreSQLAdapter extends core_1.Adapter {
         await this.pool.query({
             name: 'insert-config',
             text: `INSERT INTO ${this.configTable} (id, status, config) VALUES ($1, $2, $3)`,
-            values: [runId, core_1.RunStatus.Created, JSON.stringify({ ...testRun.config, args })],
+            values: [runId, RunStatus.Created, JSON.stringify({ ...testRun.config, args })],
         });
         const tests = this.flattenTestRun(testRun.testRun);
         const fields = ['order_num', 'file', 'line', 'character', 'project', 'timeout'];
@@ -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 === RunStatus.Created || statusBefore === 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, TestStatus.Failed, 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 ${RunStatus.Run}
+                        ELSE ${RunStatus.RepeatRun}
+                    END),
+                    updated = NOW()
+                    WHERE id = $1
+                    RETURNING *;`,
+                    values: [runId, 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
@@ -142,7 +175,7 @@ class PostgreSQLAdapter extends core_1.Adapter {
             SET status = $1,
             updated = NOW()
             WHERE id = $2`,
-            values: [core_1.RunStatus.Finished, runId],
+            values: [RunStatus.Finished, runId],
         });
     }
     async dispose() {
@@ -151,4 +184,3 @@ class PostgreSQLAdapter extends core_1.Adapter {
         await this.pool.end();
     }
 }
-exports.PostgreSQLAdapter = PostgreSQLAdapter;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playwright-orchestrator/pg",
-    "version": "1.0.5",
+    "version": "1.1.1",
     "keywords": [],
     "author": "Rostyslav Kudrevatykh",
     "license": "Apache-2.0",
@@ -13,18 +13,18 @@
         "dist"
     ],
     "dependencies": {
+        "@commander-js/extra-typings": "^13.0.0",
+        "@playwright-orchestrator/core": "^1.1.0",
+        "commander": "^13.0.0",
         "pg": "^8.13.1"
     },
     "devDependencies": {
         "@types/pg": "^8.11.0"
     },
-    "peerDependencies": {
-        "@commander-js/extra-typings": "^13.0.0",
-        "@playwright-orchestrator/core": "^1.0.0"
-    },
+    "main": "dist/index.js",
+    "type": "module",
     "exports": {
         ".": {
-            "types": "./dist/index.d.ts",
             "default": "./dist/index.js"
         }
     },

package/dist/package.json

@@ -1,34 +0,0 @@
-{
-    "name": "@playwright-orchestrator/pg",
-    "version": "1.0.5",
-    "keywords": [],
-    "author": "Rostyslav Kudrevatykh",
-    "license": "Apache-2.0",
-    "description": "Playwright orchestrator PostgreSQL plugin",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/rostmanrk/playwright-orchestrator.git"
-    },
-    "files": [
-        "dist"
-    ],
-    "dependencies": {
-        "pg": "^8.13.1"
-    },
-    "devDependencies": {
-        "@types/pg": "^8.11.0"
-    },
-    "peerDependencies": {
-        "@commander-js/extra-typings": "^13.0.0",
-        "@playwright-orchestrator/core": "^1.0.0"
-    },
-    "exports": {
-        ".": {
-            "types": "./dist/index.d.ts",
-            "default": "./dist/index.js"
-        }
-    },
-    "scripts": {
-        "prepare": "cp ../../LICENSE.md ./"
-    }
-}

package/dist/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["../create-args.ts","../index.ts","../postgresql-adapter.ts","../package.json"],"version":"5.7.2"}