hoffmation-base 0.1.1 → 0.1.5

package/server/ioBroker/ioBroker.main.ts

@@ -1,99 +1,99 @@
-import { LogLevel } from '../../models/logLevel';
-import { Devices } from '../devices/devices';
-import { DeviceUpdater } from '../devices/deviceUpdater';
-import { IDeviceUpdater } from '../devices/iDeviceUpdater';
-import { ServerLogService } from '../services/log-service';
-import { TimeCallbackService } from '../services/time-callback-service';
-import { IOBrokerConnection } from './connection';
-import { ConnectionCallbacks } from '../../models/connectionCallbacks';
-import { RoomBase } from '../../models/rooms/RoomBase';
-import { Utils } from '../services/utils/utils';
-import { SettingsService } from "../services/settings-service";
-
-export class ioBrokerMain {
-  private static roomConstructors: { [roomName: string]: { new (): RoomBase } } = {};
-  private servConn: IOBrokerConnection;
-  private deviceUpdater: IDeviceUpdater;
-  private states: Record<string, ioBroker.State> = {};
-  private connectionCallbacks: ConnectionCallbacks;
-
-  public static addRoomConstructor(roomName: string, constr: { new (): RoomBase }): void {
-    if (ioBrokerMain.roomConstructors[roomName] !== undefined) {
-      ServerLogService.writeLog(LogLevel.Error, `Konstruktor für Raum mit Namen "${roomName}" bereits hinzugefügt`);
-      return;
-    }
-    ioBrokerMain.roomConstructors[roomName] = constr;
-  }
-
-  public constructor(pDeviceUpdater: DeviceUpdater) {
-    this.deviceUpdater = pDeviceUpdater;
-    this.connectionCallbacks = new ConnectionCallbacks();
-    this.initConnCallbacks();
-
-    this.servConn = new IOBrokerConnection(
-      {
-        name: '', // optional - default 'vis.0'
-        connLink: SettingsService.settings.ioBrokerUrl, // optional URL of the socket.io adapter
-        socketSession: '', // optional - used by authentication
-      },
-      this.connectionCallbacks,
-    );
-
-    Devices.addIoConnection(this.servConn);
-    ioBrokerMain.initRooms();
-  }
-
-  private static initRooms(): void {
-    for (const key in ioBrokerMain.roomConstructors) {
-      new ioBrokerMain.roomConstructors[key]();
-    }
-  }
-
-  private initConnCallbacks(): void {
-    this.connectionCallbacks.onObjectChange = (pId: string, pObj: ioBroker.Object) => {
-      Utils.guardedNewThread(() => {
-        this.deviceUpdater.updateObject(pId, pObj);
-      }, this);
-    };
-
-    this.connectionCallbacks.onConnChange = (isConnected: boolean) => {
-      if (!isConnected) {
-        console.log('disconnected');
-        return;
-      }
-
-      console.log('connected');
-      this.servConn.getStates(null, (err, _states) => {
-        if (_states === undefined) {
-          return;
-        }
-        ServerLogService.writeLog(LogLevel.Debug, `Im initialen GetStates Callback`);
-
-        let count = 0;
-        for (const id in _states) {
-          this.deviceUpdater.updateState(id, _states[id], true);
-          count++;
-        }
-        console.log('Received ' + count + ' states.');
-        this.states = _states;
-        TimeCallbackService.performCheck();
-        TimeCallbackService.performCheck();
-      });
-    };
-    this.connectionCallbacks.onRefresh = () => {
-      //
-    };
-
-    this.connectionCallbacks.onUpdate = (id: string, state: ioBroker.State) => {
-      Utils.guardedNewThread(() => {
-        // console.log('NEW VALUE of ' + id + ': ' + JSON.stringify(state));
-        this.states[id] = state;
-        this.deviceUpdater.updateState(id, state);
-      }, this);
-    };
-
-    this.connectionCallbacks.onError = (err: any) => {
-      console.log(`Cannot execute ${err.command} for ${err.arg}, because of insufficient permissions`);
-    };
-  }
-}
+import { LogLevel } from '../../models/logLevel';
+import { Devices } from '../devices/devices';
+import { DeviceUpdater } from '../devices/deviceUpdater';
+import { IDeviceUpdater } from '../devices/iDeviceUpdater';
+import { ServerLogService } from '../services/log-service';
+import { TimeCallbackService } from '../services/time-callback-service';
+import { IOBrokerConnection } from './connection';
+import { ConnectionCallbacks } from '../../models/connectionCallbacks';
+import { RoomBase } from '../../models/rooms/RoomBase';
+import { Utils } from '../services/utils/utils';
+import { SettingsService } from '../services/settings-service';
+
+export class ioBrokerMain {
+  private static roomConstructors: { [roomName: string]: { new (): RoomBase } } = {};
+  private servConn: IOBrokerConnection;
+  private deviceUpdater: IDeviceUpdater;
+  private states: Record<string, ioBroker.State> = {};
+  private connectionCallbacks: ConnectionCallbacks;
+
+  public static addRoomConstructor(roomName: string, constr: { new (): RoomBase }): void {
+    if (ioBrokerMain.roomConstructors[roomName] !== undefined) {
+      ServerLogService.writeLog(LogLevel.Error, `Konstruktor für Raum mit Namen "${roomName}" bereits hinzugefügt`);
+      return;
+    }
+    ioBrokerMain.roomConstructors[roomName] = constr;
+  }
+
+  public constructor(pDeviceUpdater: DeviceUpdater) {
+    this.deviceUpdater = pDeviceUpdater;
+    this.connectionCallbacks = new ConnectionCallbacks();
+    this.initConnCallbacks();
+
+    this.servConn = new IOBrokerConnection(
+      {
+        name: '', // optional - default 'vis.0'
+        connLink: SettingsService.settings.ioBrokerUrl, // optional URL of the socket.io adapter
+        socketSession: '', // optional - used by authentication
+      },
+      this.connectionCallbacks,
+    );
+
+    Devices.addIoConnection(this.servConn);
+    ioBrokerMain.initRooms();
+  }
+
+  private static initRooms(): void {
+    for (const key in ioBrokerMain.roomConstructors) {
+      new ioBrokerMain.roomConstructors[key]();
+    }
+  }
+
+  private initConnCallbacks(): void {
+    this.connectionCallbacks.onObjectChange = (pId: string, pObj: ioBroker.Object) => {
+      Utils.guardedNewThread(() => {
+        this.deviceUpdater.updateObject(pId, pObj);
+      }, this);
+    };
+
+    this.connectionCallbacks.onConnChange = (isConnected: boolean) => {
+      if (!isConnected) {
+        console.log('disconnected');
+        return;
+      }
+
+      console.log('connected');
+      this.servConn.getStates(null, (err, _states) => {
+        if (_states === undefined) {
+          return;
+        }
+        ServerLogService.writeLog(LogLevel.Debug, `Im initialen GetStates Callback`);
+
+        let count = 0;
+        for (const id in _states) {
+          this.deviceUpdater.updateState(id, _states[id], true);
+          count++;
+        }
+        console.log('Received ' + count + ' states.');
+        this.states = _states;
+        TimeCallbackService.performCheck();
+        TimeCallbackService.performCheck();
+      });
+    };
+    this.connectionCallbacks.onRefresh = () => {
+      //
+    };
+
+    this.connectionCallbacks.onUpdate = (id: string, state: ioBroker.State) => {
+      Utils.guardedNewThread(() => {
+        // console.log('NEW VALUE of ' + id + ': ' + JSON.stringify(state));
+        this.states[id] = state;
+        this.deviceUpdater.updateState(id, state);
+      }, this);
+    };
+
+    this.connectionCallbacks.onError = (err: any) => {
+      console.log(`Cannot execute ${err.command} for ${err.arg}, because of insufficient permissions`);
+    };
+  }
+}

package/server/ioBroker/socketIOAuthInfo.ts

@@ -1,5 +1,5 @@
-export class SocketIOAuthInfo {
-  public user: any;
-  public hash: any;
-  public salt: any;
-}
+export class SocketIOAuthInfo {
+  public user: any;
+  public hash: any;
+  public salt: any;
+}

package/server/ioBroker/socketIOConnectOptions.ts

@@ -1,6 +1,6 @@
-export class SocketIOConnectOpts {
-  public name?: string;
-  public connLink?: any;
-  public socketSession?: any;
-  public socketForceWebSockets?: boolean;
-}
+export class SocketIOConnectOpts {
+  public name?: string;
+  public connLink?: any;
+  public socketSession?: any;
+  public socketForceWebSockets?: boolean;
+}

package/server/ioBroker/socketIOLogging.ts

@@ -1,29 +1,29 @@
-export class SocketIoLogging {
-  public static LogLevel = 5;
-  public static writeLog(pLevel: SocketIoLogLevel, pMessage: string): void {
-    if (pLevel > SocketIoLogging.LogLevel) {
-      return;
-    }
-
-    switch (pLevel) {
-      case SocketIoLogLevel.Error:
-        console.error(pMessage);
-        break;
-      case SocketIoLogLevel.Error:
-        console.warn(pMessage);
-        break;
-      default:
-        console.log(pMessage);
-        break;
-    }
-  }
-}
-
-export enum SocketIoLogLevel {
-  Error = 1,
-  Warn = 2,
-  Info = 3,
-  Debug = 4,
-  Trace = 5,
-  DeepTrace = 6,
-}
+export class SocketIoLogging {
+  public static LogLevel = 5;
+  public static writeLog(pLevel: SocketIoLogLevel, pMessage: string): void {
+    if (pLevel > SocketIoLogging.LogLevel) {
+      return;
+    }
+
+    switch (pLevel) {
+      case SocketIoLogLevel.Error:
+        console.error(pMessage);
+        break;
+      case SocketIoLogLevel.Error:
+        console.warn(pMessage);
+        break;
+      default:
+        console.log(pMessage);
+        break;
+    }
+  }
+}
+
+export enum SocketIoLogLevel {
+  Error = 1,
+  Warn = 2,
+  Info = 3,
+  Debug = 4,
+  Trace = 5,
+  DeepTrace = 6,
+}

package/server/ioBroker/socketIOVisCommand.ts

@@ -1,11 +1,11 @@
-export class SocketIOVisCommand {
-  public command: string;
-  public data: string;
-  public instance: string;
-
-  constructor(pObject: any) {
-    this.command = pObject.command;
-    this.data = pObject.data;
-    this.instance = pObject.instance;
-  }
-}
+export class SocketIOVisCommand {
+  public command: string;
+  public data: string;
+  public instance: string;
+
+  constructor(pObject: any) {
+    this.command = pObject.command;
+    this.data = pObject.data;
+    this.instance = pObject.instance;
+  }
+}

package/server/services/HTTPSOptions.ts

@@ -1,14 +1,14 @@
-import { ServerLogService } from './log-service';
-import { LogLevel } from '../../models/logLevel';
-
-export class HTTPSOptions {
-  constructor(
-    public hostname: string,
-    public path: string,
-    public headers: { [id: string]: string } = {},
-    public method: string = 'POST',
-    public port: number = 443,
-  ) {
-    ServerLogService.writeLog(LogLevel.Debug, `${method} Request at '${hostname}' for '${path}'`);
-  }
-}
+import { ServerLogService } from './log-service';
+import { LogLevel } from '../../models/logLevel';
+
+export class HTTPSOptions {
+  constructor(
+    public hostname: string,
+    public path: string,
+    public headers: { [id: string]: string } = {},
+    public method: string = 'POST',
+    public port: number = 443,
+  ) {
+    ServerLogService.writeLog(LogLevel.Debug, `${method} Request at '${hostname}' for '${path}'`);
+  }
+}

package/server/services/Sonos/OwnSonosDevices.ts

@@ -0,0 +1,9 @@
+import { OwnSonosDevice } from './sonos-service';
+
+export class OwnSonosDevices {
+  public static ownDevices: { [name: string]: OwnSonosDevice } = {};
+
+  public static addDevice(device: OwnSonosDevice) {
+    this.ownDevices[device.name] = device;
+  }
+}

package/server/services/Sonos/mp3-server.ts

@@ -1,75 +1,75 @@
-import * as http from 'http';
-import * as url from 'url';
-import * as fs from 'fs';
-import { ServerLogService } from '../log-service';
-import { LogLevel } from '../../../models/logLevel';
-import { iMp3Settings } from '../../config/iConfig';
-
-export class MP3Server {
-  public static active: boolean = false;
-  public count: number = 0;
-  private mp3Path: string = '';
-
-  public constructor(settings: iMp3Settings) {
-    if (!settings) {
-      return;
-    }
-
-    this.mp3Path = settings.path;
-    MP3Server.active = true;
-    http
-      .createServer((req, response) => {
-        if (req.url === undefined) {
-          response.writeHead(500);
-          response.end('ungültige Anfrage', 'utf-8');
-          return;
-        }
-        const q = url.parse(req.url, true).query;
-
-        const fName = q.fname;
-
-        if (!fName || fName.indexOf('.') >= 0) {
-          response.writeHead(500);
-          response.end('ungültiger Dateiname', 'utf-8');
-          return;
-        }
-
-        ServerLogService.writeLog(LogLevel.DeepTrace, `Anfrage für ${fName}`);
-        const fPath: string = this.mp3Path + fName + '.mp3';
-        try {
-          if (!fs.existsSync(fPath)) {
-            ServerLogService.writeLog(LogLevel.Error, `Die angefragte Datei existiert nicht ${fName}`);
-            return;
-          }
-        } catch (err) {
-          console.error(err);
-        }
-
-        const filestream = fs.createReadStream(fPath);
-        response.writeHead(200, { 'Content-Type': 'audio/mpeg3' });
-        filestream.pipe(response, { end: true });
-
-        /*
-      fs.readFile(fPath, (error, data) => {
-          if (error) {
-            if(error.code == 'ENOENT'){
-                fs.readFile('./404.html', (err, cont) => {
-                    response.writeHead(200, { 'Content-Type': "audio/mpeg3" });
-                    response.end(cont, 'utf-8');
-                });
-            }
-            else {
-                response.writeHead(500);
-                response.end('Sorry, check with the site admin for error: '+error.code+' ..\n');
-            }
-        }
-        else {
-            response.writeHead(200, { 'Content-Type': "audio/mpeg3" });
-            response.end(data, 'utf-8');
-        }
-      })
-      */
-      })
-      .listen(8081);
-  }
-}
+import * as http from 'http';
+import * as url from 'url';
+import * as fs from 'fs';
+import { ServerLogService } from '../log-service';
+import { LogLevel } from '../../../models/logLevel';
+import { iMp3Settings } from '../../config/iConfig';
+
+export class MP3Server {
+  public static active: boolean = false;
+  public count: number = 0;
+  private mp3Path: string = '';
+
+  public constructor(settings: iMp3Settings) {
+    if (!settings) {
+      return;
+    }
+
+    this.mp3Path = settings.path;
+    MP3Server.active = true;
+    http
+      .createServer((req, response) => {
+        if (req.url === undefined) {
+          response.writeHead(500);
+          response.end('ungültige Anfrage', 'utf-8');
+          return;
+        }
+        const q = url.parse(req.url, true).query;
+
+        const fName = q.fname;
+
+        if (!fName || fName.indexOf('.') >= 0) {
+          response.writeHead(500);
+          response.end('ungültiger Dateiname', 'utf-8');
+          return;
+        }
+
+        ServerLogService.writeLog(LogLevel.DeepTrace, `Anfrage für ${fName}`);
+        const fPath: string = this.mp3Path + fName + '.mp3';
+        try {
+          if (!fs.existsSync(fPath)) {
+            ServerLogService.writeLog(LogLevel.Error, `Die angefragte Datei existiert nicht ${fName}`);
+            return;
+          }
+        } catch (err) {
+          console.error(err);
+        }
+
+        const filestream = fs.createReadStream(fPath);
+        response.writeHead(200, { 'Content-Type': 'audio/mpeg3' });
+        filestream.pipe(response, { end: true });
+
+        /*
+      fs.readFile(fPath, (error, data) => {
+          if (error) {
+            if(error.code == 'ENOENT'){
+                fs.readFile('./404.html', (err, cont) => {
+                    response.writeHead(200, { 'Content-Type': "audio/mpeg3" });
+                    response.end(cont, 'utf-8');
+                });
+            }
+            else {
+                response.writeHead(500);
+                response.end('Sorry, check with the site admin for error: '+error.code+' ..\n');
+            }
+        }
+        else {
+            response.writeHead(200, { 'Content-Type': "audio/mpeg3" });
+            response.end(data, 'utf-8');
+        }
+      })
+      */
+      })
+      .listen(8081);
+  }
+}