Merge branch 'add-deployment' into dev

Signed-off-by: Michael Krug <[email protected]>

.github/release-drafter.yml

@@ -0,0 +1,20 @@
+name-template: '$RESOLVED_VERSION'
+tag-template: '$RESOLVED_VERSION'
+categories:
+  - title: '🚀 Features'
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'fix'
+      - 'bugfix'
+      - 'bug'
+  - title: '🧰 Maintenance'
+    labels:
+      - 'maintenance'
+      - 'dependencies'
+template: |
+  ## Changes
+
+  $CHANGES

.github/workflows/ci-cd.yml

@@ -3,9 +3,11 @@ name: CI/CD
 on:
   push:
     branches: [ main ]
-    tags: [ v* ]
+    tags: [ "*" ]
   pull_request:
     branches: [ main ]
+  release:
+    types: [ published ]
 
 jobs:
   unit-testing:
@@ -36,12 +38,6 @@ jobs:
         name: coverage
         path: coverage/
 
-    - name: Comment Test Coverage
-      if: ${{ github.event_name == 'pull_request' }}
-      uses: romeovs/[email protected]
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-
   code-analysis:
     name: Code Analysis
     runs-on: ubuntu-latest
@@ -59,7 +55,7 @@ jobs:
       uses: github/codeql-action/analyze@v1
 
   deployment:
-    if: startsWith(github.ref, 'refs/tags/v')
+    if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'release'
     name: Install and Deploy
     runs-on: ubuntu-latest
     needs: [unit-testing, code-analysis]
@@ -81,7 +77,7 @@ jobs:
         uses: google-github-actions/deploy-cloud-functions@main
         with:
           credentials: ${{ secrets.GCP_SA_KEY }}
-          name: openhab-google-assistant
+          name: ${{ github.event_name == 'release' && 'openhabGoogleAssistant_prod' || 'openhabGoogleAssistant_test' }}
           runtime: nodejs12
           source_dir: ./functions
           entry_point: openhabGoogleAssistant

.github/workflows/draft-release.yml

@@ -0,0 +1,14 @@
+name: Draft Release
+
+on:
+  push:
+    tags: [ "*" ]
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Draft Release
+        uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

functions/config.js

@@ -33,8 +33,8 @@
  *
  **/
 module.exports = {
-  //userpass: '[email protected]:Password1',
-  host: '<YOUR-CLOUD-HOST>',
-  port: 443,
-  path: '/YOUR/REST/ENDPOINT'
+  //userpass: process.env.OH_USERPASS || '[email protected]:Password1',
+  host: process.env.OH_HOST || '<YOUR-CLOUD-HOST>',
+  port: process.env.OH_PORT || 443,
+  path: process.env.OH_PATH || '/YOUR/REST/ENDPOINT'
 };

functions/devices/camera.js

@@ -12,7 +12,9 @@ class Camera extends DefaultDevice {
   static getAttributes(item) {
     const config = this.getConfig(item);
     return {
-      cameraStreamSupportedProtocols: (config.protocols || 'hls,dash').split(',').map((s) => s.trim()),
+      cameraStreamSupportedProtocols: (config.protocols || 'hls,dash,smooth_stream,progressive_mp4')
+        .split(',')
+        .map((s) => s.trim()),
       cameraStreamNeedAuthToken: config.token ? true : false,
       cameraStreamNeedDrmEncryption: false
     };

package.json

@@ -16,15 +16,22 @@
     "test": "jest --silent --coverage",
     "test-ci": "jest --silent --coverage --ci",
     "lint": "eslint --ext .js --cache .",
-    "fix": "eslint --fix --ext .js --cache ."
+    "fix": "eslint --fix --ext .js --cache .",
+    "release-major": "npm version major -m \":bookmark: Release (major): %s\"",
+    "release-minor": "npm version minor -m \":bookmark: Release (minor): %s\"",
+    "release-patch": "npm version patch -m \":bookmark: Release (patch): %s\""
+  },
+  "jest": {
+    "setupFiles": [
+      "./tests/setenv.js"
+    ]
   },
   "license": "EPL-2.0",
   "bugs": {
     "url": "https://github.com/openhab/openhab-google-assistant/issues"
   },
   "homepage": "https://github.com/openhab/openhab-google-assistant",
   "dependencies": {
-    "body-parser": "^1.19.0",
     "express": "^4.17.1"
   },
   "devDependencies": {

testServer.js

@@ -1,14 +1,14 @@
 const express = require('express');
 const app = express();
-const bodyParser = require('body-parser');
 const openhabGA = require('./functions/index.js');
 
-app.use(bodyParser.json());
+app.use(express.json());
 
 app.use('/', (req, res) => {
   openhabGA.openhabGoogleAssistant(req, res);
 });
 
-app.listen(3000, () => {
-  console.log('Server is listening on port 3000');
+const port = process.env.OH_SERVER_PORT || 3000;
+app.listen(port, () => {
+  console.log('Server is listening on port %s', port);
 });

tests/config.test.js

@@ -1,7 +1,13 @@
 const Config = require('../functions/config.js');
 
 describe('Config', () => {
-  test('Config all properties', () => {
+  test('All properties available', () => {
     expect(Object.keys(Config)).toStrictEqual(['host', 'port', 'path']);
   });
+
+  test('Properties used from ENV', () => {
+    expect(Config.host).toBe('test.host');
+    expect(Config.port).toBe('1234');
+    expect(Config.path).toBe('/test/items');
+  });
 });

tests/devices/camera.test.js

@@ -30,7 +30,7 @@ describe('Camera Device', () => {
         }
       };
       expect(Device.getAttributes(item)).toStrictEqual({
-        cameraStreamSupportedProtocols: ['hls', 'dash'],
+        cameraStreamSupportedProtocols: ['hls', 'dash', 'smooth_stream', 'progressive_mp4'],
         cameraStreamNeedAuthToken: false,
         cameraStreamNeedDrmEncryption: false
       });

tests/setenv.js

@@ -0,0 +1,3 @@
+process.env.OH_HOST = 'test.host';
+process.env.OH_PORT = '1234';
+process.env.OH_PATH = '/test/items';