Merge branch 'master' into feature/websockets

.env.sample

@@ -1,69 +1,74 @@
-# Export config
-EXPORT_DEFAULT_TYPE = png
-EXPORT_DEFAULT_CONSTR = chart
-EXPORT_DEFAULT_HEIGHT = 400
-EXPORT_DEFAULT_WIDTH = 600
-EXPORT_DEFAULT_SCALE = 1
-EXPORT_RASTERIZATION_TIMEOUT = 1500
+# NODE ENVIRONMENT CONFIG
+NODE_ENV = development
 
-# Highcharts config
+# HIGHCHARTS CONFIG
 HIGHCHARTS_VERSION = latest
-HIGHCHARTS_CDN = https://code.highcharts.com/
-HIGHCHARTS_FORCE_FETCH = false
+HIGHCHARTS_CDN_URL = https://code.highcharts.com/
 HIGHCHARTS_CORE_SCRIPTS =
 HIGHCHARTS_MODULES =
 HIGHCHARTS_INDICATORS =
+HIGHCHARTS_FORCE_FETCH = false
+HIGHCHARTS_ADMIN_TOKEN =
+
+# EXPORT CONFIG
+EXPORT_TYPE = png
+EXPORT_CONSTR = chart
+EXPORT_DEFAULT_HEIGHT = 400
+EXPORT_DEFAULT_WIDTH = 600
+EXPORT_DEFAULT_SCALE = 1
+EXPORT_RASTERIZATION_TIMEOUT = 1500
 
-# Custom code config
-HIGHCHARTS_ALLOW_CODE_EXECUTION = false
-HIGHCHARTS_ALLOW_FILE_RESOURCES = false
+# CUSTOM LOGIC CONFIG
+CUSTOM_LOGIC_ALLOW_CODE_EXECUTION = false
+CUSTOM_LOGIC_ALLOW_FILE_RESOURCES = false
 
-# Server config
-HIGHCHARTS_SERVER_ENABLE = false
-HIGHCHARTS_SERVER_HOST = 0.0.0.0
-HIGHCHARTS_SERVER_PORT = 7801
+# SERVER CONFIG
+SERVER_ENABLE = false
+SERVER_HOST = 0.0.0.0
+SERVER_PORT = 7801
+SERVER_BENCHMARKING = false
 
-# Server SSL config
-HIGHCHARTS_SERVER_SSL_ENABLE = false
-HIGHCHARTS_SERVER_SSL_FORCE = false
-HIGHCHARTS_SERVER_SSL_PORT = 443
-HIGHCHARTS_SERVER_SSL_CERT_PATH =
+# SERVER SSL CONFIG
+SERVER_SSL_ENABLE = false
+SERVER_SSL_FORCE = false
+SERVER_SSL_PORT = 443
+SERVER_SSL_CERT_PATH =
 
-# Server rate limiting config
-HIGHCHARTS_RATE_LIMIT_ENABLE = false
-HIGHCHARTS_RATE_LIMIT_MAX = 10
-HIGHCHARTS_RATE_LIMIT_WINDOW = false
-HIGHCHARTS_RATE_LIMIT_DELAY = 0
-HIGHCHARTS_RATE_LIMIT_TRUST_PROXY = false
-HIGHCHARTS_RATE_LIMIT_SKIP_KEY =
-HIGHCHARTS_RATE_LIMIT_SKIP_TOKEN =
+# SERVER RATE LIMITING CONFIG
+SERVER_RATE_LIMITING_ENABLE = false
+SERVER_RATE_LIMITING_MAX_REQUESTS = 10
+SERVER_RATE_LIMITING_WINDOW = 1
+SERVER_RATE_LIMITING_DELAY = 0
+SERVER_RATE_LIMITING_TRUST_PROXY = false
+SERVER_RATE_LIMITING_SKIP_KEY =
+SERVER_RATE_LIMITING_SKIP_TOKEN =
 
-# Pool config
-HIGHCHARTS_POOL_MIN_WORKERS = 8
-HIGHCHARTS_POOL_MAX_WORKERS = 8
-HIGHCHARTS_POOL_WORK_LIMIT = 40
-HIGHCHARTS_POOL_ACQUIRE_TIMEOUT = 5000
-HIGHCHARTS_POOL_CREATE_TIMEOUT = 5000
-HIGHCHARTS_POOL_DESTROY_TIMEOUT = 5000
-HIGHCHARTS_POOL_IDLE_TIMEOUT = 30000
-HIGHCHARTS_POOL_CREATE_RETRY_INTERVAL = 200
-HIGHCHARTS_POOL_REAPER_INTERVAL = 1000
-HIGHCHARTS_POOL_BENCHMARKING = false
-HIGHCHARTS_POOL_LISTEN_TO_PROCESS_EXITS = true
+# POOL CONFIG
+POOL_MIN_WORKERS = 4
+POOL_MAX_WORKERS = 8
+POOL_WORK_LIMIT = 40
+POOL_ACQUIRE_TIMEOUT = 5000
+POOL_CREATE_TIMEOUT = 5000
+POOL_DESTROY_TIMEOUT = 5000
+POOL_IDLE_TIMEOUT = 30000
+POOL_CREATE_RETRY_INTERVAL = 200
+POOL_REAPER_INTERVAL = 1000
+POOL_BENCHMARKING = false
+POOL_LISTEN_TO_PROCESS_EXITS = true
 
-# Logging config
-HIGHCHARTS_LOG_LEVEL = 4
-HIGHCHARTS_LOG_FILE = highcharts-export-server.log
-HIGHCHARTS_LOG_DEST = log/
+# LOGGING CONFIG
+LOGGING_LEVEL = 4
+LOGGING_FILE = highcharts-export-server.log
+LOGGING_DEST = log/
 
-# UI config
-HIGHCHARTS_UI_ENABLE = true
-HIGHCHARTS_UI_ROUTE = /
+# UI CONFIG
+UI_ENABLE = true
+UI_ROUTE = /
 
-# Other config
-HIGHCHARTS_NO_LOGO = false
+# OTHER CONFIG
+OTHER_NO_LOGO = false
 
-# Proxy config
+# PROXY CONFIG
 PROXY_SERVER_HOST =
 PROXY_SERVER_PORT =
 PROXY_SERVER_TIMEOUT =

.eslintrc.cjs

@@ -16,7 +16,7 @@ module.exports = {
     'plugin:prettier/recommended'
   ],
   rules: {
-    'no-unused-vars': 'off',
+    'no-unused-vars': 0,
     'import/no-cycle': 2,
     'prettier/prettier': [
       'error',

.prettierrc

@@ -1,7 +1,7 @@
 {
-  "trailingComma": "none",
   "semi": true,
   "singleQuote": true,
   "tabWidth": 2,
-  "printWidth": 80
+  "printWidth": 80,
+  "trailingComma": "none"
 }