Merge pull request #63 from reportportal/develop

Release 5.1.1

.github/workflows/CI-pipeline.yml

@@ -1,4 +1,4 @@
-# Copyright 2021 EPAM Systems
+# Copyright 2024 EPAM Systems
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -28,9 +28,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
       - name: Install of node dependencies

.github/workflows/publish.yml

@@ -1,4 +1,4 @@
-# Copyright 2021 EPAM Systems
+# Copyright 2024 EPAM Systems
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -22,9 +22,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
       - name: Install of node dependencies
@@ -41,9 +41,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           registry-url: 'https://registry.npmjs.org'
@@ -59,7 +59,7 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           registry-url: 'https://npm.pkg.github.com'

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-# Copyright 2021 EPAM Systems
+# Copyright 2024 EPAM Systems
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -33,7 +33,7 @@ jobs:
       releaseVersion: ${{ steps.exposeVersion.outputs.releaseVersion }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Read version
         id: readVersion
         run: |
@@ -78,9 +78,9 @@ jobs:
       versionInfo: ${{ steps.readChangelogEntry.outputs.log_entry }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '12'
       - name: Configure git
@@ -139,7 +139,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Create Release
         id: createRelease
         uses: actions/create-release@v1

CHANGELOG.md

@@ -1,3 +1,7 @@
+### Changed
+- `@reportportal/client-javascript` bumped to version `5.1.4`.
+### Security
+- Updated versions of vulnerable packages (braces, ws).
 
 ## [5.1.0] - 2024-02-06
 ### Added

VERSION

@@ -1 +1 @@
-5.1.0
+5.1.1-SNAPSHOT

package.json

@@ -13,7 +13,7 @@
     "test:coverage": "jest --coverage"
   },
   "dependencies": {
-    "@reportportal/client-javascript": "^5.1.1",
+    "@reportportal/client-javascript": "~5.1.4",
     "@wdio/reporter": "^7.31.1",
     "json-stringify-safe": "^5.0.1"
   },

src/reporter.ts

@@ -57,13 +57,14 @@ export class Reporter extends WDIOReporter {
 
   constructor(options: Partial<Reporters.Options>) {
     super(options);
-
-    const agentInfo = getAgentInfo();
-    const clientConfig = getClientConfig(options);
     this.options = {
       seleniumCommandsLogLevel: 'info',
+      launchId: process.env.RP_LAUNCH_ID || options.launchId,
       ...options,
     };
+    const agentInfo = getAgentInfo();
+    const clientConfig = getClientConfig(this.options);
+
     this.syncReporting = false;
     this.client = new RPClient(clientConfig, agentInfo);
     this.storage = new Storage();
@@ -240,11 +241,13 @@ export class Reporter extends WDIOReporter {
   async onRunnerEnd(): Promise<void> {
     try {
       await this.client.getPromiseFinishAllItems(this.tempLaunchId);
-      const { promise } = await this.client.finishLaunch(this.tempLaunchId, {
-        ...(this.customLaunchStatus && { status: this.customLaunchStatus }),
-      });
-      promiseErrorHandler(promise);
-      await promise;
+      if (!this.options.launchId) {
+        const { promise } = await this.client.finishLaunch(this.tempLaunchId, {
+          ...(this.customLaunchStatus && { status: this.customLaunchStatus }),
+        });
+        promiseErrorHandler(promise);
+        await promise;
+      }
       this.tempLaunchId = null;
       this.customLaunchStatus = null;
     } catch (e) {
@@ -358,7 +361,9 @@ export class Reporter extends WDIOReporter {
   }
 
   sendLaunchLog(log: LogRQ): void {
-    this.sendLog(this.tempLaunchId, log);
+    if (this.tempLaunchId) {
+      this.sendLog(this.tempLaunchId, log);
+    }
   }
 
   sendLog(tempId: string, { level, message = '', file }: LogRQ): void {

version_fragment

@@ -1 +1 @@
-minor
+patch