@mxtommy/kip 1.2.3 → 2.0.0

package/src/app/settings-zones/settings-zones.component.ts

@@ -1,154 +0,0 @@
-import { Component, OnInit, Inject, Input, ViewChild, ChangeDetectorRef, AfterViewInit } from '@angular/core';
-import { FormGroup, FormControl, Validators }    from '@angular/forms';
-import { MatTableDataSource } from '@angular/material/table';
-import { Subscription, Observable } from 'rxjs';
-import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatSort } from '@angular/material/sort';
-
-import { AppSettingsService, IZone, ZoneState } from '../app-settings.service';
-import { IPathAndMetaObjects } from "../signalk-interfaces";
-
-@Component({
-  selector: 'app-settings-zones',
-  templateUrl: './settings-zones.component.html',
-  styleUrls: ['./settings-zones.component.css']
-})
-export class SettingsZonesComponent implements OnInit, AfterViewInit {
-
-  @ViewChild(MatPaginator) paginator: MatPaginator;
-  @ViewChild(MatSort) sort: MatSort;
-
-  tableData = new MatTableDataSource([]);
-
-  displayedColumns: string[] = ['path', 'unit', 'lower', 'upper', 'state', "actions"];
-
-
-
-  zonesSub: Subscription;
-
-  constructor(
-    private appSettingsService: AppSettingsService,
-    public dialog: MatDialog,
-    private cdRef: ChangeDetectorRef,
-    ) { }
-
-  ngOnInit() {
-    this.zonesSub = this.appSettingsService.getZonesAsO().subscribe(zones => {
-      this.tableData.data = zones;
-    });
-  }
-
-  ngAfterViewInit() {
-    this.tableData.paginator = this.paginator;
-    this.tableData.sort = this.sort;
-    this.tableData.filter = "";
-    this.cdRef.detectChanges();
-  }
-
-  private newUuid() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-        var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
-        return v.toString(16);
-    });
-  }
-
-  delZone(uuid: string) {
-    let zones = this.appSettingsService.getZones();
-    //find index
-    let index = zones.findIndex(zone => (zone.uuid == uuid));
-    if (index >= 0) {
-      zones.splice(index,1);
-      this.appSettingsService.saveZones(zones);
-    }
-  }
-
-  trackByUuid(index: number, item: IZone): string {
-    return `${item.uuid}`;
-  }
-
-  applyFilter(event: Event) {
-    const filterValue = (event.target as HTMLInputElement).value;
-    this.tableData.filter = filterValue.trim().toLowerCase();
-
-    if (this.tableData.paginator) {
-      this.tableData.paginator.firstPage();
-    }
-  }
-
-  openDialog(): void {
-    const dialogRef = this.dialog.open(DialogNewZone, {
-      width: '80%',
-      data: {}
-    });
-
-    dialogRef.afterClosed().subscribe(result => {
-      if (result) {
-        console.log(result);
-        let zones = this.appSettingsService.getZones();
-        zones.push({
-          uuid: this.newUuid(),
-          upper: result.upper,
-          lower: result.lower,
-          path: result.path.path,
-          unit: result.path.convertUnitTo,
-          state: parseInt(result.state)
-        });
-        console.log(zones);
-        this.appSettingsService.saveZones(zones);
-      }
-    });
-  }
-
-
-}
-
-
-
-@Component({
-  selector: 'dialog-new-zone',
-  templateUrl: 'settings-zones.modal.html',
-  styleUrls: ['./settings-zones.modal.css']
-})
-export class DialogNewZone {
-
-  newZoneForm: FormGroup = new FormGroup({
-    upper: new FormControl(null),
-    lower: new FormControl(null),
-    state: new FormControl('0', Validators.required),
-    filterSelfPaths: new FormControl(true),
-    path: new FormGroup({
-      description: new FormControl("Numeric Data"),
-      path: new FormControl(null),
-      isPathConfigurable: new FormControl(true),
-      convertUnitTo: new FormControl("unitless"),
-      pathType: new FormControl("number"),
-      source: new FormControl(null)
-    })
-  }, this.rangeValidationFunction);
-
-  @Input() filterSelfPaths: boolean;
-  availablePaths: IPathAndMetaObjects[];
-  filteredPaths: Observable<IPathAndMetaObjects[]> = new Observable;
-
-  selectedUnit = null;
-
-  constructor(
-    public dialogRef: MatDialogRef<DialogNewZone>,
-    @Inject(MAT_DIALOG_DATA) public data) {
-    }
-
-
-  rangeValidationFunction(formGroup: FormGroup): any {
-      let upper = formGroup.get('upper').value;
-      let lower = formGroup.get('lower').value;
-      return ((upper === null) && (lower === null)) ? { needUpperLower: true } : null;
-   }
-
-  onNoClick(): void {
-    this.dialogRef.close();
-  }
-  submitConfig() {
-    this.dialogRef.close(this.newZoneForm.value);
-  }
-}

package/src/app/settings-zones/settings-zones.modal.css

@@ -1,14 +0,0 @@
-.full-width {
-  width: 100%;
-}
-
-.leftThirdField {
-  display: inline-block;
-  width: calc(30% - 15px);
-  padding-right: 30px;
-}
-
-.rightThirdField {
-  display: inline-block;
-  width: calc(30% - 15px);
-}

package/src/app/settings-zones/settings-zones.modal.html

@@ -1,39 +0,0 @@
-<form (ngSubmit)="submitConfig()" [formGroup]="newZoneForm">
-  <div mat-dialog-content >
-    <mat-checkbox name="filterSelfPaths" formControlName="filterSelfPaths">Restrict to own vessel</mat-checkbox>
-    <modal-path-selector class="full-width"
-    [formGroup]="newZoneForm.controls.path"
-    [filterSelfPaths]="newZoneForm.value.filterSelfPaths">
-    </modal-path-selector>
-
-    <mat-form-field class="leftThirdField"  appearance="outline" floatLabel="always">
-      <mat-label>Lower value</mat-label>
-      <input type="number" matInput placeholder="Enter or select number..." name="lower"  formControlName="lower">
-    </mat-form-field>
-
-    <mat-form-field class="leftThirdField" appearance="outline" floatLabel="always">
-      <mat-label>Upper value</mat-label>
-      <input type="number" matInput placeholder="Enter or select number..." name="upper"  formControlName="upper">
-    </mat-form-field>
-
-    <mat-form-field class="rightThirdField"  appearance="outline" floatLabel="always">
-      <mat-label>State</mat-label>
-      <mat-select
-      placeholder="Value State"
-      formControlName="state"
-      name="state">
-        <mat-option value='0'>Normal</mat-option>
-        <mat-option value='1'>Warning</mat-option>
-        <mat-option value='2'>Alarm</mat-option>
-      </mat-select>
-    </mat-form-field>
-  </div>
-  <mat-error *ngIf="newZoneForm.hasError('needUpperLower')">
-    At least one value is required (lower / upper)
-  </mat-error>
-  <div mat-dialog-actions>
-    <button mat-raised-button mat-dialog-close>Cancel</button>
-    <button mat-raised-button color="accent" type="submit" [disabled]="!newZoneForm.valid">Add</button>
-  </div>
-
-</form>

package/src/app/signalk-connection.service.ts

@@ -1,344 +0,0 @@
-import { Injectable } from '@angular/core';
-import { of , Observable , BehaviorSubject } from 'rxjs';
-import { catchError, tap } from 'rxjs/operators';
-import { HttpClient, HttpErrorResponse, HttpHeaders } from '@angular/common/http';
-
-import { AppSettingsService, SignalKToken, SignalKUrl } from './app-settings.service';
-import { SignalKService } from './signalk.service';
-import { SignalKDeltaService } from './signalk-delta.service';
-import { SignalKFullService } from './signalk-full.service';
-import { NotificationsService } from './notifications.service';
-
-
-interface SignalKEndpointResponse {
-    endpoints: {
-        v1: {
-            version: string;
-            "signalk-http"?: string;
-            "signalk-ws"?: string;
-            "signalk-tcp"?: string;
-        }
-    }
-    server: {
-        id: string;
-        version: string;
-    }
-}
-
-/**
-   * Represent SignalK connection's statuses.
-   * @usageNotes `operation` field describes the type of operation being
-   * performed on the connections.
-   * `0 = Never Stated` (app just started),
-   * `1 = Connecting to server`,
-   * `2 = Active connection being reset` (issues on client, server killing client connection or network issue),
-   * `3 = App URL Changed` - reconnecting,
-   * `4 = adding R/W authorization token to WebSock`
-   */
-export interface SignalKStatus {
-    server: {
-      version: string;
-    },
-    endpoint: {
-        status: boolean;
-        message: string;
-    },
-    rest: {
-        status: boolean;
-        message: string;
-    },
-    websocket: {
-        status: boolean;
-        message: string;
-    },
-  operation: number;
-}
-
-@Injectable()
-export class SignalKConnectionService {
-
-    // Main URL Variables
-    signalKURL: SignalKUrl;
-    signalKToken: SignalKToken;
-    endpointREST: string;
-    endpointWS: string;
-
-    // Websocket
-    webSocket: WebSocket = null;
-
-    // SignalK connections current status initialization
-    currentSkStatus: SignalKStatus = {
-      server: {
-          version: "",
-      },
-      endpoint: {
-          status: false,
-          message: 'Not yet connected'
-      },
-      rest: {
-          status: false,
-          message: 'Not yet connected'
-      },
-      websocket: {
-          status: false,
-          message: 'Not yet connected'
-      },
-      operation: 0
-    };
-
-    signalKStatus: BehaviorSubject<SignalKStatus> = new BehaviorSubject<SignalKStatus>(this.currentSkStatus);
-
-    //////////////////////////////////////////////////////////////////////////////////////////////////
-    //// constructor, mostly sub to stuff for changes.
-    constructor(
-        private signalKService: SignalKService,
-        private signalKDeltaService: SignalKDeltaService,
-        private SignalKFullService: SignalKFullService,
-        private appSettingsService: AppSettingsService,
-        private notificationsService: NotificationsService,
-        private http: HttpClient)
-    {
-        // when signalKUrl changes, do stuff
-        this.appSettingsService.getSignalKURLAsO().subscribe(
-          newURL => {
-            this.signalKURL = newURL;
-
-            if (this.signalKURL.new) {
-              this.currentSkStatus.operation = 3; // URL Changed
-              this.resetSignalK();
-            } else {
-              this.currentSkStatus.operation = 1; // Startup connection
-            }
-          }
-        );
-        // when token changes, do stuff
-        this.appSettingsService.getSignalKTokenAsO().subscribe(
-          newToken => {
-            this.signalKToken = newToken;
-
-            if (this.signalKToken.new) {
-              this.currentSkStatus.operation = 4; // Token update
-              this.resetSignalK();
-            } else {
-              this.currentSkStatus.operation = 1; // Token update
-              this.resetSignalK();
-            }
-          }
-        );
-    }
-
-    resetSignalK() {
-      // TODO close current connections/reset data, check api version... assuming v1
-      console.debug("Resetting URL: " + this.signalKURL.url);
-
-      // clean close if open
-      if (this.webSocket != null && this.webSocket.readyState < 2) { // 0 = connecting, 1 = open, 2 = closing, 3 = closed
-        console.debug("Closing existing WS Connection")
-        this.webSocket.close();
-      }
-
-      this.currentSkStatus.endpoint.message = "Connecting...";
-      this.currentSkStatus.endpoint.status = false;
-      this.currentSkStatus.rest.message = "Connecting...";
-      this.currentSkStatus.rest.status = false;
-      this.currentSkStatus.websocket.message = "Connecting...";
-      this.currentSkStatus.websocket.status = false;
-      this.signalKStatus.next(this.currentSkStatus);
-
-      this.notificationsService.resetAlarms();
-
-      let fullURL = this.signalKURL.url;
-      let re = new RegExp("signalk/?$");
-      if (!re.test(fullURL)) {
-          fullURL = fullURL + "/signalk/";
-      }
-
-      // this.signalKDeltaService.resetSignalKData(); // can't find this in our code.
-      this.endpointREST = null;
-      this.endpointWS = null;
-
-      this.http.get<SignalKEndpointResponse>(fullURL, {observe: 'response'}).subscribe(
-        // when we go ok, this runs
-        response => {
-          this.endpointREST = response.body.endpoints.v1["signalk-http"];
-          this.endpointWS = response.body.endpoints.v1["signalk-ws"];
-
-          this.currentSkStatus.endpoint.status = true;
-          this.currentSkStatus.endpoint.message = response.status.toString();
-          this.currentSkStatus.server.version = response.body.server.id + " " + response.body.server.version;
-
-          this.callREST();
-          this.connectEndpointWS();
-
-          this.signalKStatus.next(this.currentSkStatus);
-        },
-        // When not ok, this runs...
-        (err: HttpErrorResponse) => {
-          if (err.error instanceof Error) {
-              // A client-side or network error occurred. Handle it accordingly.
-              console.log('An HTTP connection error occurred:', err.error.message);
-            } else {
-              // The backend returned an unsuccessful response code.
-              // The response body may contain clues as to what went wrong,
-              console.log(err);
-            }
-          this.currentSkStatus.endpoint.status = false;
-          this.currentSkStatus.endpoint.message = err.message;
-          this.signalKStatus.next(this.currentSkStatus);
-        }
-      );
-    }
-
-    callREST() {
-        this.http.get(this.endpointREST, {observe: 'response'}).subscribe(
-            // when we go ok, this runs
-            response => {
-              this.currentSkStatus.rest.status = true;
-              this.currentSkStatus.rest.message = response.status.toString();
-              this.SignalKFullService.processFullUpdate(response.body);
-            },
-            // When not ok, this runs...
-            (err: HttpErrorResponse) => {
-                if (err.error instanceof Error) {
-                  // A client-side or network error occurred. Handle it accordingly.
-                  this.currentSkStatus.rest.message = err.error.message;
-                  console.log('A REST error occurred:', err.error.message);
-                } else {
-                    // The backend returned an unsuccessful response code.
-                    // The response body may contain clues as to what went wrong,
-                    this.currentSkStatus.rest.message = "Unspecified REST error";
-                    console.log(err);
-                }
-                this.currentSkStatus.rest.status = false;
-            }
-        );
-    }
-
-    connectEndpointWS() {
-      if (this.endpointWS === null) {
-        //no endpoint, try again later....
-        setTimeout(()=>{ this.connectEndpointWS();}, 3000);
-        return;
-      }
-
-      // don't reopen an existing connection
-      if (this.webSocket != null && this.webSocket.readyState < 2) { // 0 = connecting, 1 = open, 2 = closing, 3 = closed
-        return;
-      }
-
-      let endpointArgs = "?subscribe=all";
-
-      if ((this.signalKToken.token !== null)&&(this.signalKToken.token != "")) {
-        endpointArgs += "&token="+this.signalKToken.token;
-      }
-
-      this.webSocket = new WebSocket(this.endpointWS+endpointArgs);
-      this.webSocket.onopen = function (event){
-        this.currentSkStatus.websocket.message = "Connected";
-        this.currentSkStatus.websocket.status = true;
-      }.bind(this);
-
-      this.webSocket.onerror = function (event) {
-        this.currentSkStatus.websocket.message = "Unspecified WebSocket error";
-        this.currentSkStatus.websocket.status = false;
-        setTimeout(()=>{ this.connectEndpointWS();}, 3000);
-      }.bind(this);
-
-      this.webSocket.onclose = function (event) {
-        this.currentSkStatus.websocket.message = "WebSocket closed";
-        this.currentSkStatus.websocket.status = false;
-        setTimeout(()=>{ this.connectEndpointWS();}, 3000);
-      }.bind(this);
-
-      this.webSocket.onmessage = function(message) {
-          this.signalKDeltaService.processWebsocketMessage(JSON.parse(message.data));
-      }.bind(this);
-    }
-
-    publishDelta(message: string) {
-
-      if (!this.currentSkStatus.websocket.status) {
-        console.log("Tried to publish delta while not connected to Websocket");
-        return;
-      }
-      console.log(message);
-      this.webSocket.send(message);
-    }
-
-    postApplicationData(scope: string, configName: string, data: Object): Observable<string[]> {
-
-
-      let url = this.endpointREST.substring(0,this.endpointREST.length - 4); // this removes 'api/' from the end
-      url += "applicationData/" + scope +"/kip/1.0/"+ configName;
-
-      let options = {};
-
-      if ((this.signalKToken.token !== null)&&(this.signalKToken.token != "")) {
-        options['headers'] = new HttpHeaders().set("authorization", "JWT "+this.signalKToken.token);
-      }
-      return this.http.post<any>(url, data, options).pipe(
-        catchError(this.handleError<string[]>('postApplicationData', []))
-      );
-
-    }
-
-    getApplicationDataKeys(scope: string): Observable<string[]> {
-      let url = this.endpointREST.substring(0,this.endpointREST.length - 4); // this removes 'api/' from the end
-      url += "applicationData/" + scope +"/kip/1.0/?keys=true";
-
-      let options = {};
-
-      if ((this.signalKToken.token !== null)&&(this.signalKToken.token != "")) {
-        options['headers'] = new HttpHeaders().set("authorization", "JWT "+this.signalKToken.token);
-      }
-
-      return this.http.get<string[]>(url, options).pipe(
-        tap(_ => {
-          console.log("Server Stored Configs for "+ scope +": "); console.log(_)
-        }),
-        catchError(this.handleError<string[]>('getApplicationDataKeys', []))
-      );
-
-    }
-
-    getApplicationData(scope: string, configName: string): Observable<any>{
-      let url = this.endpointREST.substring(0,this.endpointREST.length - 4); // this removes 'api/' from the end
-      url += "applicationData/" + scope +"/kip/1.0/" + configName;
-      let options = {};
-
-      if ((this.signalKToken.token !== null) && (this.signalKToken.token != "")) {
-        options['headers'] = new HttpHeaders().set("authorization", "JWT "+this.signalKToken.token);
-      }
-      return this.http.get<any>(url, options).pipe(
-        tap(_ => {
-          console.log("Fetched Stored Configs for "+ scope +" / "+ configName);
-        }),
-        catchError(this.handleError<any>('getApplicationData'))
-      );
-    }
-    /**
-     * Handle Http operation that failed.
-     * Let the app continue.
-     * @param operation - name of the operation that failed
-     * @param result - optional value to return as the observable result
-     */
-    private handleError<T>(operation = 'operation', result?: T) {
-      return (error: any): Observable<T> => {
-
-        // TODO: send the error to remote logging infrastructure
-        console.error(error); // log to console instead
-
-        // TODO: better job of transforming error for user consumption
-        console.log(`${operation} failed: ${error.message}`);
-
-        // Let the app keep running by returning an empty result.
-        return of(result as T);
-      };
-    }
-
-    // SignalK Connections Status observable
-    getSignalKConnectionsStatus() {
-      return this.signalKStatus.asObservable();
-    }
-
-}

package/src/app/signalk-delta.service.spec.ts

@@ -1,15 +0,0 @@
-import { TestBed, inject } from '@angular/core/testing';
-
-import { SignalKDeltaService } from './signalk-delta.service';
-
-describe('SignalkDeltaService', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [SignalKDeltaService]
-    });
-  });
-
-  it('should be created', inject([SignalKDeltaService], (service: SignalKDeltaService) => {
-    expect(service).toBeTruthy();
-  }));
-});

package/src/app/signalk-delta.service.ts

@@ -1,97 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Observable ,  Subject, Subscription } from 'rxjs';
-import { SignalKService } from './signalk.service';
-import { IDeltaMessage } from './signalk-interfaces';
-import { NotificationsService } from './notifications.service';
-import { AppSettingsService } from "./app-settings.service";
-
-
-@Injectable()
-export class SignalKDeltaService {
-
-  signalKRequests = new Subject<IDeltaMessage>();      // requests service subs to this (avoids circular dependency in services)
-
-  constructor(
-    private SignalKService: SignalKService,
-    private notificationsService: NotificationsService,
-    ) { }
-
-  processWebsocketMessage(message: IDeltaMessage) {
-    // Read raw message and route to appropriate sub
-    if (typeof(message.self) != 'undefined') {  // is Hello message
-      this.SignalKService.setSelf(message.self);
-      this.SignalKService.setServerVersion(message.version);
-      return;
-    }
-
-
-    if (typeof(message.updates) != 'undefined') {
-      this.processUpdateDelta(message); // is Data Update process further
-    }
-
-    if (typeof(message.requestId) != 'undefined') {
-      this.signalKRequests.next(message); // is a Request, send to signalk-request service.
-    }
-
-  }
-
-  public processUpdateDelta(message:IDeltaMessage) {
-    let context: string;
-    if (typeof(message.context) == 'undefined') {
-      context = 'self'; //default if not defined
-    } else {
-      context = message.context;
-    }
-
-    // process message Updates
-    for (let update of message.updates) {
-      // get source identifier. 'src' is nmea2k and 'talker' is nmea0183
-      let source = '';
-      if ((update.source !== undefined) && (update.source.type !== undefined) && update.source.label !== undefined) {
-        if (update.source.type == 'NMEA2000') {
-          source = update.source.label + '.' + update.source.src;
-        } else if (update.source.type == 'NMEA0183') {
-          source = update.source.label + '.' + update.source.talker;
-        } else {
-          // donno what it is...
-          source = update.source.label;
-        }
-      } else if (update['$source'] !== undefined) {
-        source = update['$source'];
-      } else if ((update.source !== undefined) && (update.source.src !== undefined) && (update.source.label !== undefined)) {
-        source = update.source.label + '.' + update.source.src;
-      } else if (update.source.label !== undefined) {
-        source = update.source.label;
-      } else {
-        source = "unknown";
-      }
-
-      // process message values
-      let timestamp = Date.parse(update.timestamp); //TODO, supposedly not reliable
-      for (let value of update.values) {
-        if (/^notifications./.test(value.path)) {   // is a notification message, pass to notification service
-          this.notificationsService.processNotificationDelta(value.path, value.value);
-        } else {
-          // it's a data update. Update local tree
-          let fullPath = context + '.' + value.path;
-          if (value.path == '') { fullPath = context; } // if path is empty we shouldn't have a . at the end
-          if ( (typeof(value.value) == 'object') && (value.value !== null)) {
-            // compound data
-            let keys = Object.keys(value.value);
-            for (let i = 0; i < keys.length; i++) {
-              this.SignalKService.updatePathData(fullPath + '.' + keys[i], source, timestamp, value.value[keys[i]]);
-            }
-          } else {
-            // simple data
-            this.SignalKService.updatePathData(fullPath, source, timestamp, value.value);
-          }
-        }
-      }
-    }
-  }
-
-  public subscribeRequest(): Observable<IDeltaMessage> {
-    return this.signalKRequests.asObservable();
-  }
-
- }

package/src/app/signalk-full.service.spec.ts

@@ -1,15 +0,0 @@
-import { TestBed, inject } from '@angular/core/testing';
-
-import { SignalkFullService } from './signalk-full.service';
-
-describe('SignalkFullService', () => {
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [SignalkFullService]
-    });
-  });
-
-  it('should be created', inject([SignalkFullService], (service: SignalkFullService) => {
-    expect(service).toBeTruthy();
-  }));
-});