NodeJS version and dependencies upgrade

devicehive · Jul 21, 2022 · ef06954 · ef06954
1 parent d4f0a3c
commit ef06954
Show file tree

Hide file tree

Showing 18 changed files with 10,628 additions and 3,113 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10.1.0-alpine
+FROM node:18.5-alpine
 
 MAINTAINER devicehive
 
@@ -16,10 +16,7 @@ WORKDIR ${WORK_DIR}
 
 COPY . ${WORK_DIR}
 
-RUN apk add --no-cache --virtual .gyp \
-        python make  g++ \
-  && npm install \
-  && apk del .gyp \
+RUN npm install \
   && npm install pm2 -g \
   && npm cache clean --force
 

diff --git a/config/index.js b/config/index.js
@@ -4,4 +4,4 @@ const configurator = require(`json-evn-configurator`);
 
 module.exports = {
     broker: configurator(path.join(__dirname, `../src/config.json`), `BROKER`)
-};
+};
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -41,8 +41,10 @@ services:
     container_name: redis
     networks:
       - redis
+    ports:
+      - "6379:6379"
 networks:
   redis:
     driver: bridge
   cote:
-    driver: bridge
+    driver: bridge
diff --git a/lib/SubscriptionEntry.js b/lib/SubscriptionEntry.js
@@ -11,22 +11,18 @@ class SubscriptionEntry {
      * @param subscriptionId
      */
     constructor (subscriber, subscriptionId) {
-        const me = this;
+        this.subscriptionIdMap = new Map();
 
-        me.subscriptionIdMap = new Map();
-
-        me.subscriptionIdMap.set(subscriber, subscriptionId);
-        me.subscriptionCounter = 1;
+        this.subscriptionIdMap.set(subscriber, subscriptionId);
+        this.subscriptionCounter = 1;
     }
 
     /**
      * Get subscription counter
      * @returns {number}
      */
     getSubscriptionCounter () {
-        const me = this;
-
-        return me.subscriptionCounter;
+        return this.subscriptionCounter;
     }
 
     /**
@@ -35,21 +31,17 @@ class SubscriptionEntry {
      * @param subscriptionId
      */
     addSubscriber (subscriber, subscriptionId) {
-        const me = this;
-
-        me.subscriptionIdMap.set(subscriber, subscriptionId);
-        me.subscriptionCounter++;
+        this.subscriptionIdMap.set(subscriber, subscriptionId);
+        this.subscriptionCounter++;
     }
 
     /**
      * Remove subscriber
      * @param subscriber
      */
     removeSubscriber (subscriber) {
-        const me = this;
-
-        me.subscriptionIdMap.delete(subscriber);
-        me.subscriptionCounter--;
+        this.subscriptionIdMap.delete(subscriber);
+        this.subscriptionCounter--;
     }
 
     /**
@@ -58,10 +50,9 @@ class SubscriptionEntry {
      * @returns {string}
      */
     getSubscriber (subscriptionId) {
-        const me = this;
         let resultOwner = ``;
 
-        me.subscriptionIdMap.forEach((subscriptionIdItem, ownerItem) => {
+        this.subscriptionIdMap.forEach((subscriptionIdItem, ownerItem) => {
             if (subscriptionIdItem === subscriptionId) {
                 resultOwner = ownerItem;
             }
@@ -75,10 +66,9 @@ class SubscriptionEntry {
      * @returns {Array}
      */
     getSubscribers () {
-        const me = this;
         const subscribers = [];
 
-        me.subscriptionIdMap.forEach((subscriptionIdItem, ownerItem) => {
+        this.subscriptionIdMap.forEach((subscriptionIdItem, ownerItem) => {
             subscribers.push(ownerItem);
         });
 
@@ -91,9 +81,7 @@ class SubscriptionEntry {
      * @returns {string}
      */
     getSubscriptionId (subscriber) {
-        const me = this;
-
-        return me.subscriptionIdMap.get(subscriber);
+        return this.subscriptionIdMap.get(subscriber);
     }
 
     /**
@@ -102,9 +90,7 @@ class SubscriptionEntry {
      * @returns {boolean}
      */
     hasSubscriber (subscriber) {
-        const me = this;
-
-        return me.subscriptionIdMap.has(subscriber);
+        return this.subscriptionIdMap.has(subscriber);
     }
 
     /**
@@ -113,10 +99,9 @@ class SubscriptionEntry {
      * @returns {boolean}
      */
     hasSubscriptionId (subscriptionId) {
-        const me = this;
         let result = false;
 
-        me.subscriptionIdMap.forEach((subscriptionIdItem) => {
+        this.subscriptionIdMap.forEach((subscriptionIdItem) => {
             if (subscriptionId === subscriptionIdItem) {
                 result = true;
             }
@@ -126,4 +111,4 @@ class SubscriptionEntry {
     }
 }
 
-module.exports = SubscriptionEntry;
+module.exports = SubscriptionEntry;
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,4 @@ const configurator = require(`json-evn-configurator`); @@
     module.exports = {
         broker: configurator(path.join(__dirname, `../src/config.json`), `BROKER`)
-    };
+    };