Clean up and better documentation.

Readme.md

@@ -47,7 +47,7 @@ PS: You can get this file from firebase -> settings -> Service Account -> Fireba
 now you're ready to start the server
 
 ```
-docker-compose up
+sudo docker-compose up -d
 ```
 
 ### From scratch

docker/docker-compose.yml

@@ -8,7 +8,9 @@ services:
         firebase_sdk_admin_json: "firebase_admin_sdk.json" # firebase authentication (optional) If not needed, set an empty file instead.
     restart: "always"
     ports:
-      - "5511:5511"
+      - "5511:5511" # websocket server
+      - "3500:3500" # ZMQ
     environment:
-      - "VERSION=1.0.0"
-      - "FIREBASE_DATABASE_URL=null" # if you want to use firebase push notifications
+      - "ZMQ_ADDRESS=null" # change to tcp://0.0.0.0:3500 for remote access otherwise it will be accessed only locally.
+      - "VERSION=1.0"
+      - "FIREBASE_DATABASE_URL=null" # if you want to use firebase push notifications. Check Readme.md.

docker/scripts/entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # fetch new updates on docker restarts
- git pull
+git pull
 ls -a
 
 yarn install --save --no-progress

server.js

@@ -1,14 +1,15 @@
 const { Server } = require('./lib/Server');
 const fs = require('fs');
 
-const { version, FIREBASE_DATABASE_URL } = process.env;
+const { VERSION, FIREBASE_DATABASE_URL, ZMQ_ADDRESS } = process.env;
 const firebaseSdkPath = '/etc/easy-chat-pushjs/config/firebase_admin_sdk.json';
 const jwtPublicKey = '/etc/easy-chat-pushjs/config/jwtRS256.key.pub';
 
 const config = {
     // zmqServerAddress: 'tcp://0.0.0.0:3500', // in case you want to connect to the server from another machine.
     // Not secure. Use firewall to allow access only from private/trusted IP addresses to the port.
-    version: version ? version : '1.0',
+    zmqServerAddress: ZMQ_ADDRESS !== 'null' ? ZMQ_ADDRESS : 'tcp://127.0.0.1:3500',
+    version: VERSION ? VERSION : 1.0,
     jwtPublicKey: jwtPublicKey,
     wsPort: 5511,
     onUserDisconnects: (userInfo) => { console.log('user disconnected', { userInfo }) },