refactorings

Author: coding-lemur

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "smart-display-server",
-    "version": "0.45.0",
+    "version": "1.0.0",
     "description": "Server which controlles the smart display.",
     "repository": {
         "type": "git",
@@ -22,21 +22,20 @@
     "dependencies": {
         "clear": "^0.1.0",
         "color": "^4.2.1",
-        "commander": "^9.0.0",
-        "dayjs": "^1.10.8",
+        "dayjs": "^1.11.0",
         "dotenv": "^16.0.0",
-        "exit-hook": "^3.0.0",
-        "mqtt": "^4.3.6",
-        "node-fetch": "^3.2.1",
+        "mqtt": "^4.3.7",
+        "node-fetch": "^3.2.3",
         "path": "^0.12.7"
     },
     "devDependencies": {
+        "@types/clear": "^0.1.2",
         "@types/color": "^3.0.3",
         "@types/mqtt": "^2.5.0",
-        "@types/node": "^17.0.21",
+        "@types/node": "^17.0.23",
         "@types/node-fetch": "^2.6.1",
-        "@types/ws": "^8.5.1",
-        "ts-node": "^10.6.0",
-        "typescript": "^4.6.2"
+        "@types/ws": "^8.5.3",
+        "ts-node": "^10.7.0",
+        "typescript": "^4.6.3"
     }
 }

package.json

@@ -8,12 +8,11 @@ import {
     roundToFixed,
     secondaryColor,
 } from '../../helper';
-import { OpenWeatherMapService } from './services';
+import { loadData } from './services/open-weather-map.service';
 import { CityWeatherData } from './models';
 
 export class CityWeatherApp implements App {
     private readonly _data = new LastUpdated<CityWeatherData>();
-    private readonly _service = new OpenWeatherMapService();
     private readonly _maxCacheAgeMinutes = parseInt(
         process.env.APP_CITY_WEATHER_MAX_CACHE_AGE || '0',
         10
@@ -81,7 +80,7 @@ export class CityWeatherApp implements App {
 
     private async _refreshWeatherData(): Promise<void> {
         try {
-            const data = await this._service.loadData();
+            const data = await loadData();
             console.log('city weather', data);
 
             this._data.value = data;

src/apps/city-weather/index.ts

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

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

@@ -0,0 +1,6 @@
+export interface OpenWeatherResponse {
+    main: { temp: number; humidity: number };
+    wind: {
+        speed: number;
+    };
+}

src/apps/city-weather/models/open-weather-response.ts

@@ -1,24 +1,21 @@
 import fetch from 'node-fetch';
 
-import { CityWeatherData } from '../models';
+import { CityWeatherData, OpenWeatherResponse } from '../models';
 
-export class OpenWeatherMapService {
-    async loadData(): Promise<CityWeatherData> {
-        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 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 = `https://api.openweathermap.org/data/2.5/weather?id=${cityId}&appid=${appId}&units=${units}`;
+export const loadData = async () => {
+    const url = `https://api.openweathermap.org/data/2.5/weather?id=${cityId}&appid=${appId}&units=${units}`;
+    const response = await fetch(url);
+    const data = (await response.json()) as OpenWeatherResponse;
 
-        const response = await fetch(url);
-        const data = await response.json();
+    const result: CityWeatherData = {
+        temperature: data.main.temp,
+        humidity: data.main.humidity,
+        windSpeed: data.wind.speed,
+    };
 
-        const result: CityWeatherData = {
-            temperature: data.main.temp,
-            humidity: data.main.humidity,
-            windSpeed: data.wind.speed,
-        };
-
-        return result;
-    }
-}
+    return result;
+};

src/apps/city-weather/services/index.ts

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 
 import { App } from '../app';
 import { SmartDisplayController } from '../../smart-display-controller';
-import { DrawHelper } from '../../helper';
+import { primaryColor, renderWeekday } from '../../helper';
 
 export class DateApp implements App {
     readonly name = 'date';
@@ -13,14 +13,14 @@ export class DateApp implements App {
     render(): void {
         this._renderDate();
 
-        DrawHelper.renderWeekday(this._controller);
+        renderWeekday(this._controller);
     }
 
     private _renderDate(): void {
         const date = dayjs().format('DD.MM.');
 
         this._controller.drawText({
-            hexColor: DrawHelper.PrimaryColor,
+            hexColor: primaryColor,
             text: date,
             position: { x: 7, y: 1 },
         });

src/apps/city-weather/services/open-weather-map.service.ts

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';
 
 import { App } from '../app';
 import { SmartDisplayController } from '../../smart-display-controller';
-import { DrawHelper } from '../../helper';
+import { primaryColor, renderWeekday } from '../../helper';
 
 export class TimeApp implements App {
     private _showColon = true;
@@ -15,7 +15,7 @@ export class TimeApp implements App {
     render(): void {
         this._renderTime();
 
-        DrawHelper.renderWeekday(this._controller);
+        renderWeekday(this._controller);
 
         // toggle colon
         //this.showColon = !this.showColon;
@@ -26,7 +26,7 @@ export class TimeApp implements App {
         const time = dayjs().format(format);
 
         this._controller.drawText({
-            hexColor: DrawHelper.PrimaryColor,
+            hexColor: primaryColor,
             text: time,
             position: { x: 7, y: 1 },
         });

src/apps/date/index.ts

@@ -1,21 +1,14 @@
 #!/usr/bin/env ts-node
 
-const clear = require('clear');
-require('dotenv').config();
-
-import process from 'process';
-import { program } from 'commander';
-import exitHook from 'exit-hook';
-
-import packageJson from '../package.json';
+import clear from 'clear';
+//import process from 'process';
+//import exitHook from 'exit-hook';
+import dayjs from 'dayjs';
+import weekday from 'dayjs/plugin/weekday';
+import 'dotenv/config';
 
 import { Server } from './server';
 
-program
-    .description(packageJson.description)
-    .version(packageJson.version)
-    .parse(process.argv);
-
 clear();
 console.log('SmartDisplay');
 
@@ -28,16 +21,13 @@ let server: Server;
 
 //process.stdin.resume(); // so the program will not close instantly
 
-exitHook(() => {
+/*exitHook(() => {
     console.debug('Exiting');
 
     if (server != null) {
         server.shutdown();
     }
-});
-
-import dayjs from 'dayjs';
-import weekday from 'dayjs/plugin/weekday';
+});*/
 
 const locale = process.env.LOCALE;
 

src/apps/time/index.ts

@@ -33,7 +33,7 @@ export class Server {
         };
 
         this._client = mqtt
-            .connect(process.env.MQTT_SERVER, clientOptions)
+            .connect(process.env.MQTT_SERVER!, clientOptions)
             .subscribe('smartDisplay/server/in/#')
             .on('message', (topic, message) => {
                 const command = getLastTopicPart(topic);

src/index.ts

@@ -1,15 +1,3 @@
 {
-    "compilerOptions": {
-        "baseUrl": "src",
-        "outDir": "dist",
-        "target": "ES6",
-        "module": "commonjs",
-        "lib": ["es6", "es2015", "DOM"],
-        "declaration": true,
-        "strict": true,
-        "types": ["node"],
-        "esModuleInterop": true,
-        "resolveJsonModule": true
-    },
-    "exclude": ["node_modules", "dist"]
+    "extends": "ts-node/node16/tsconfig.json"
 }