Merge pull request #331 from swrlab/dev/update-fixes

Dev/update fixes

.github/workflows/ingest-pull.yml

@@ -29,7 +29,7 @@ jobs:
       uses: actions/[email protected]
 
     - name: ⛺️ Install Node.js
-      uses: actions/setup-node@v3.1.1
+      uses: actions/setup-node@v3.2.0
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'yarn'
@@ -64,7 +64,7 @@ jobs:
       uses: actions/[email protected]
 
     - name: ⛺️ Install Node.js
-      uses: actions/setup-node@v3.1.1
+      uses: actions/setup-node@v3.2.0
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'yarn'

.github/workflows/ingest-push.yml

@@ -34,7 +34,7 @@ jobs:
       uses: actions/[email protected]
 
     - name: ⛺️ Install Node.js
-      uses: actions/setup-node@v3.1.1
+      uses: actions/setup-node@v3.2.0
       with:
         node-version: ${{ env.NODE_VERSION }}
         cache: 'yarn'

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.4] - 2022-06-07
+
+- security: fix `CVE-2022-25878`
+- update:
+  - actions/setup-node to `v3.2.0`
+  - @google-cloud/pubsub to `v3.0.1`
+
 ## [1.3.3] - 2022-05-10
 
 - add: BR channel `BR Heimat`

README.md

@@ -19,15 +19,15 @@ These ARD broadcasters are currently sending live metadata via ARD Eventhub:
 
 | Broadcaster      | TEST | PROD |
 | ---------------- | ---- | ---- |
-| BR               | ⌛️    | ⌛️    |
+| BR               | ✅    | ✅    |
 | HR               | ✅    | ✅    |
 | MDR              | ✅    | ✅    |
 | NDR              | ✅    | ✅    |
 | Radio Bremen     | ✅    | ✅    |
-| RBB              | ⌛️    | -    |
+| RBB              | ✅    | ✅    |
 | SR               | ⌛️    | -    |
 | SWR              | ✅    | ✅    |
-| WDR              | ✅    | ⌛️    |
+| WDR              | ⌛️    | ⌛️    |
 | Deutschlandradio | -    | -    |
 
 ## Get Started and Documentation

openapi.json

@@ -11,7 +11,7 @@
       "name": "European Union Public License 1.2",
       "url": "https://spdx.org/licenses/EUPL-1.2.html"
     },
-    "version": "1.3.3"
+    "version": "1.3.4"
   },
   "externalDocs": {
     "description": "ARD-Eventhub Documentation",

openapi.yaml

@@ -10,7 +10,7 @@ info:
   license:
     name: European Union Public License 1.2
     url: 'https://spdx.org/licenses/EUPL-1.2.html'
-  version: 1.3.3
+  version: 1.3.4
 externalDocs:
   description: ARD-Eventhub Documentation
   url: 'https://swrlab.github.io/ard-eventhub/'

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ard-eventhub",
-	"version": "1.3.3",
+	"version": "1.3.4",
 	"description": "ARD system to distribute real-time (live) metadata for primarily radio broadcasts.",
 	"main": "./src/ingest/index.js",
 	"engines": {
@@ -25,21 +25,21 @@
 	"license": "EUPL-1.2",
 	"dependencies": {
 		"@google-cloud/datastore": "^6.6.2",
-		"@google-cloud/pubsub": "^2.19.4",
+		"@google-cloud/pubsub": "^3.0.1",
 		"@google-cloud/secret-manager": "^3.12.0",
 		"@swrlab/utils": "swrlab/node-utils#1.0.4-beta",
 		"compression": "^1.7.4",
-		"dd-trace": "^2.7.0",
-		"dotenv": "^16.0.0",
+		"dd-trace": "^2.8.0",
+		"dotenv": "^16.0.1",
 		"express": "4.18.1",
-		"express-openapi-validator": "^4.13.7",
+		"express-openapi-validator": "^4.13.8",
 		"firebase-admin": "^10.2.0",
 		"google-auth-library": "^8.0.2",
 		"jsonwebtoken": "^8.5.1",
 		"moment": "^2.29.3",
-		"node-crc": "^2.0.11",
+		"node-crc": "^2.0.13",
 		"slug": "^5.3.0",
-		"swagger-ui-express": "^4.3.0",
+		"swagger-ui-express": "^4.4.0",
 		"uuid": "^8.3.2",
 		"winston": "^3.7.2"
 	},
@@ -49,13 +49,13 @@
 		"chai": "^4.3.6",
 		"chai-http": "^4.3.0",
 		"docsify-cli": "^4.4.4",
-		"eslint": "^8.15.0",
+		"eslint": "^8.17.0",
 		"eslint-plugin-chai-friendly": "^0.7.2",
 		"license-compliance": "^1.2.3",
 		"mocha": "^10.0.0",
 		"nodemon": "^2.0.16",
 		"prettier": "^2.6.2",
-		"typescript": "^4.6.4"
+		"typescript": "^4.7.3"
 	},
 	"resolutions": {
 		"ansi-regex": "^5.0.1",

src/utils/plugins/dts/event.js

@@ -168,11 +168,6 @@ module.exports = async (job) => {
 			media.url || media.templateUrl.replace('{width}', 512).replace('{height}', 512)
 	}
 
-	// DEV TEMP workaround
-	if (liveRadioEvent.imageURL.indexOf('http://rdz-dev:4001') !== -1) {
-		liveRadioEvent.imageURL = liveRadioEvent.imageURL.replace('http://rdz-dev:4001', 'https://onair.swr.de')
-	}
-
 	// handle exclusions
 	if (checkIfArrayHasContent(plugin.excludeFields)) {
 		for (const field of plugin.excludeFields) {