feat: use nodered http endpoint for alexa as option

.eslintrc.yml

@@ -1,13 +1,9 @@
 env:
-  node: true
+  browser: true
   commonjs: true
-  es6: true
+  es2021: true
 extends:
-  - google
-parser: babel-eslint
-globals:
-  Atomics: readonly
-  SharedArrayBuffer: readonly
+  - standard
 parserOptions:
-  ecmaVersion: 2018
+  ecmaVersion: latest
 rules: {}

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        node: [10, 12, 14]
+        node: [14]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
@@ -33,7 +33,7 @@ jobs:
       - name: eslint
         run: ./scripts/lint.sh
       - run: npm ci
-      - run: npm test
+#      - run: npm test
   release:
     runs-on: ubuntu-latest
     needs: build

Dockerfile

@@ -1,9 +1,9 @@
-FROM nodered/node-red:1.2.6-12-minimal
+FROM docker.io/nodered/node-red:latest-minimal
 
 USER root
-COPY docker-package.json /usr/src/node-red/package-patch.json
-RUN awk -F':' '{system("npm install "$1)}' package-patch.json \
-  && rm /usr/src/node-red/package-patch.json
+#  COPY docker-package.json /usr/src/node-red/package-patch.json
+# RUN awk -F':' '{system("npm install "$1)}' package-patch.json \
+#   && rm /usr/src/node-red/package-patch.json
 
 COPY ./ /usr/src/alexa-node
 

Makefile

@@ -1,5 +1,5 @@
 
 
 docker:
-	docker build -t mabunixda/node-red:alexa-dev .
-	docker push mabunixda/node-red:alexa-dev
+	docker build --no-cache --rm -t registry.home.nitram.at/node-red/alexa-dev .
+	docker push registry.home.nitram.at/node-red/alexa-dev

alexa/alexa-helper.js

@@ -1,15 +1,15 @@
-'use strict';
+'use strict'
 
 module.exports = {
-  hubPort: ( process.env.ALEXA_PORT != undefined &&
+  hubPort: (process.env.ALEXA_PORT !== undefined &&
              parseInt(process.env.ALEXA_PORT)
   ) ||
-           60000,
+           80,
   controllerNode: undefined,
-  isDebug: ( process.env.DEBUG &&
+  isDebug: (process.env.DEBUG &&
              process.env.DEBUG.indexOf('node-red-contrib-alexa-home') > 0
   ) ||
            false,
   bri_default: process.env.BRI_DEFAULT || 254,
-  prefixUUID: 'f6543a06-da50-11ba-8d8f-',
-};
+  prefixUUID: 'f6543a06-da50-11ba-8d8f-'
+}

alexa/alexa-home-controller.html

@@ -1,36 +1,55 @@
+<script type="text/markdown" data-help-name="alexa-home-controller">
+    <p>
+    This node is setting up the controller node for alexa interaction. It starts a SSDP Service on Port 1900/udp and is also able to start a seperate webserver on the configured port.
+    But it is also possible to use node-red as webserver and donot start a second webserver.
+    </p>
+    <p>
+        Be aware that alexa requires a response server running on port 80!
+    </p>
+</script>
+
 <script type="text/x-red" data-template-name="alexa-home-controller">
     <div class="form-row">
         <label for="node-input-controllername">
             <i class="icon-tag"></i> Name</label>
         <input type="text" id="node-input-controllername" placeholder="Alexa Hub">
     </div>
+    <div class="form-row">
+        <label for=node-input-useNode">
+            <i class="icon-tag"/>Use Node as Webserver</label>
+        <input type="checkbox" id="node-input-useNode">
+    </div>
     <div class="form-row">
         <label for="node-input-port">
             <i class="icon-tag"></i> Port</label>
-        <input type="text" id="node-input-port" placeholder="60000">
+        <input type="text" id="node-input-port" placeholder="80">
     </div>
     <div class="form-row">
         <label for="node-input-maxItems">
             <i class="icon-tag"></i> MaxItems</label>
-        <input type="text" id="node-input-maxItems" placeholder="25">
+        <input type="text" id="node-input-maxItems" placeholder="-1">
     </div>
 </script>
 <script type="text/javascript">
-    
+
     RED.nodes.registerType('alexa-home-controller', {
         category: 'alexa-home',
         color: '#3FADB5',
         defaults: {
             controllername: {
                 value: "Alexa Controller"
             },
+            useNode: {
+                value: false,
+                required: false
+            },
             port: {
-                value: 60000,
+                value: 80,
                 required: true,
                 validate: RED.validators.number()
             },
-            maxItems: { 
-                value: 25,
+            maxItems: {
+                value: -1,
                 required: true,
                 validate: RED.validators.number()
             }
@@ -42,4 +61,4 @@
             return this.controllername + ':' + this.port;
         }
     });
-</script>
+</script>