move settings to .env file; refactoring

Author: coding-lemur

.env

@@ -0,0 +1,13 @@
+MQTT_SERVER=mqtt://my-server.com:1883
+MQTT_USERNAME=smart-display
+MQTT_PASSWORD=*******
+
+APP_ITERATIONS=10
+
+LOCALE=de
+
+APP_CITY_WEATHER_CITY_ID=your-city-id
+APP_CITY_WEATHER_APP_ID=your-app-id
+APP_CITY_WEATHER_UNITS=metric
+APP_CITY_WEATHER_MAX_CACHE_AGE=30
+APP_CITY_WEATHER_PUBLISH_DATA=false

package-lock.json

@@ -24,6 +24,7 @@
         "color": "^3.1.2",
         "commander": "^6.2.0",
         "dayjs": "^1.10.4",
+        "dotenv": "^8.2.0",
         "exit-hook": "^2.2.1",
         "mqtt": "^4.2.6",
         "node-fetch": "^2.6.1",

package.json

@@ -6,11 +6,17 @@ import { LastUpdated } from '../../models';
 import { SmartDisplayController } from '../../smart-display-controller';
 import { StringHelper, DrawHelper } from '../../helper';
 import { OpenWeatherMapService } from './services';
-import { CityWeatherData, CityWeatherSetting } from './models';
+import { CityWeatherData } from './models';
 
 export class CityWeatherApp implements App {
     private readonly _data = new LastUpdated<CityWeatherData>();
-    private readonly _service = new OpenWeatherMapService(this.setting);
+    private readonly _service = new OpenWeatherMapService();
+    private readonly _maxCacheAgeMinutes = parseInt(
+        process.env.APP_CITY_WEATHER_MAX_CACHE_AGE || '0',
+        10
+    );
+    private readonly _publishWeatherData =
+        process.env.APP_CITY_WEATHER_PUBLISH_DATA?.toLowerCase() === 'true';
 
     readonly name = 'city-weather';
     readonly renderOnlyOneTime = true;
@@ -26,13 +32,12 @@ export class CityWeatherApp implements App {
             return true;
         }
 
-        return cacheMinutesAge >= this.setting.maxCacheAgeMinutes;
+        return cacheMinutesAge >= this._maxCacheAgeMinutes;
     }
 
     constructor(
         private controller: SmartDisplayController,
-        private client: MqttClient,
-        private setting: CityWeatherSetting
+        private client: MqttClient
     ) {}
 
     init(): void {
@@ -51,7 +56,7 @@ export class CityWeatherApp implements App {
         DrawHelper.renderPixelProgress(
             this.controller,
             this.calcCacheMinutesAge(),
-            this.setting.maxCacheAgeMinutes
+            this._maxCacheAgeMinutes
         );
     }
 
@@ -63,7 +68,7 @@ export class CityWeatherApp implements App {
         this.controller.drawText({
             hexColor: '#4CFF00',
             text: `${temperature}°`,
-            position: { x: 7, y: 1 }
+            position: { x: 7, y: 1 },
         });
     }
 
@@ -86,7 +91,7 @@ export class CityWeatherApp implements App {
 
                 this._data.value = data;
 
-                if (this.setting.publishWeatherData) {
+                if (this._publishWeatherData) {
                     this.client.publish(
                         'smartDisplay/server/out/cityWeather',
                         JSON.stringify(data)

settings.json

@@ -1,2 +1 @@
 export * from './city-weather-data';
-export * from './city-weather-setting';

src/apps/city-weather/index.ts

@@ -1,12 +1,13 @@
 import fetch from 'node-fetch';
 
-import { CityWeatherData, CityWeatherSetting } from '../models';
+import { CityWeatherData } from '../models';
 
 export class OpenWeatherMapService {
-    constructor(private settings: CityWeatherSetting) {}
-
     async loadData(): Promise<CityWeatherData> {
-        const { cityId, appId, units } = this.settings;
+        const cityId = process.env.APP_CITY_WEATHER_CITY_ID;
+        const appId = process.env.APP_CITY_WEATHER_APP_ID;
+        const units = process.env.APP_CITY_WEATHER_UNITS;
+
         const url = `http://api.openweathermap.org/data/2.5/weather?id=${cityId}&appid=${appId}&units=${units}`;
 
         const response = await fetch(url);
@@ -15,7 +16,7 @@ export class OpenWeatherMapService {
         const result: CityWeatherData = {
             temperature: data.main.temp,
             humidity: data.main.humidity,
-            windSpeed: data.wind.speed
+            windSpeed: data.wind.speed,
         };
 
         return result;

src/apps/city-weather/models/city-weather-setting.ts

@@ -1,4 +1,3 @@
 export * from './draw-helper';
 export * from './mqtt-helper';
-export * from './settings-helper';
 export * from './string-helper';