ZNP Adapter Manager/Backup Refactor

.vscode/settings.json

@@ -4,4 +4,16 @@
         "javascript",
         "typescript",
     ],
+    "javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": false,
+    "javascript.format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": false,
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBraces": false,
+    "javascript.preferences.importModuleSpecifier": "relative",
+    "eslint.format.enable": true,
+    "typescript.preferences.importModuleSpecifier": "relative",
+    "[typescript]": {
+        "editor.codeActionsOnSave": {
+            "source.organizeImports": false
+        }
+    },
 }

package.json

@@ -30,6 +30,7 @@
     "fast-deep-equal": "^3.1.3",
     "mixin-deep": "^2.0.1",
     "@serialport/bindings": "9.0.4",
+    "mz": "^2.7.0",
     "serialport": "9.0.6",
     "slip": "^1.0.2"
   },
@@ -45,6 +46,7 @@
     "@types/debounce": "^1.2.0",
     "@types/debug": "*",
     "@types/jest": "*",
+    "@types/mz": "^2.7.3",
     "@types/nedb": "*",
     "@types/node": "*",
     "@types/serialport": "*",

src/adapter/adapter.ts

@@ -3,6 +3,8 @@ import {ZclDataPayload} from './events';
 import events from 'events';
 import {ZclFrame, FrameType, Direction} from '../zcl';
 import Debug from "debug";
+import {LoggerStub} from "../controller/logger-stub";
+import * as Models from "../models";
 
 const debug = Debug("zigbee-herdsman:adapter");
 
@@ -12,16 +14,18 @@ abstract class Adapter extends events.EventEmitter {
     protected adapterOptions: TsType.AdapterOptions;
     protected serialPortOptions: TsType.SerialPortOptions;
     protected backupPath: string;
+    protected logger?: LoggerStub;
 
     protected constructor(
         networkOptions: TsType.NetworkOptions, serialPortOptions: TsType.SerialPortOptions, backupPath: string,
-        adapterOptions: TsType.AdapterOptions)
+        adapterOptions: TsType.AdapterOptions, logger?: LoggerStub)
     {
         super();
         this.networkOptions = networkOptions;
         this.adapterOptions = adapterOptions;
         this.serialPortOptions = serialPortOptions;
         this.backupPath = backupPath;
+        this.logger = logger;
     }
 
     /**
@@ -33,6 +37,7 @@ abstract class Adapter extends events.EventEmitter {
         serialPortOptions: TsType.SerialPortOptions,
         backupPath: string,
         adapterOptions: TsType.AdapterOptions,
+        logger?: LoggerStub,
     ): Promise<Adapter> {
         const {ZStackAdapter} = await import('./z-stack/adapter');
         const {DeconzAdapter} = await import('./deconz/adapter');
@@ -90,7 +95,7 @@ abstract class Adapter extends events.EventEmitter {
             }
         }
 
-        return new adapter(networkOptions, serialPortOptions, backupPath, adapterOptions);
+        return new adapter(networkOptions, serialPortOptions, backupPath, adapterOptions, logger);
     }
 
     public abstract start(): Promise<TsType.StartResult>;
@@ -109,7 +114,7 @@ abstract class Adapter extends events.EventEmitter {
 
     public abstract supportsBackup(): Promise<boolean>;
 
-    public abstract backup(): Promise<TsType.Backup>;
+    public abstract backup(): Promise<Models.Backup>;
 
     public abstract getNetworkParameters(): Promise<TsType.NetworkParameters>;
 

src/adapter/deconz/adapter/deconzAdapter.ts

@@ -17,6 +17,8 @@ import processFrame from '../driver/frameParser';
 import {Queue, Waitress, Wait} from '../../../utils';
 import PARAM from '../driver/constants';
 import { Command, WaitForDataRequest, ApsDataRequest, ReceivedDataResponse, DataStateResponse, gpDataInd } from '../driver/constants';
+import {LoggerStub} from "../../../controller/logger-stub";
+import * as Models from "../../../models";
 
 var frameParser = require('../driver/frameParser');
 
@@ -41,9 +43,9 @@ class DeconzAdapter extends Adapter {
     private waitress: Waitress<Events.ZclDataPayload, WaitressMatcher>;
 
     public constructor(networkOptions: NetworkOptions,
-        serialPortOptions: SerialPortOptions, backupPath: string, adapterOptions: AdapterOptions) {
+        serialPortOptions: SerialPortOptions, backupPath: string, adapterOptions: AdapterOptions, logger?: LoggerStub) {
 
-        super(networkOptions, serialPortOptions, backupPath, adapterOptions);
+        super(networkOptions, serialPortOptions, backupPath, adapterOptions, logger);
 
         const concurrent = this.adapterOptions && this.adapterOptions.concurrent ?
             this.adapterOptions.concurrent : 2;
@@ -853,8 +855,8 @@ class DeconzAdapter extends Adapter {
         return false;
     }
 
-    public async backup(): Promise<BackupType> {
-        return Promise.reject();
+    public async backup(): Promise<Models.Backup> {
+        throw new Error("This adapter does not support backup");
     }
 
     public async getNetworkParameters(): Promise<NetworkParameters> {

src/adapter/ezsp/adapter/ezspAdapter.ts

@@ -14,6 +14,7 @@ import {EmberZDOCmd, EmberApsOption, uint16_t, EmberEUI64, EmberStatus} from '..
 import {ZclFrame, FrameType, Direction, Foundation} from '../../../zcl';
 import * as Events from '../../events';
 import {Waitress, Wait} from '../../../utils';
+import * as Models from "../../../models";
 
 
 interface WaitressMatcher {
@@ -453,9 +454,8 @@ class EZSPAdapter extends Adapter {
         return false;
     }
 
-    public async backup(): Promise<BackupType> {
-        // todo
-        return Promise.reject();
+    public async backup(): Promise<Models.Backup> {
+        throw new Error("This adapter does not support backup");
     }
 
     public async restoreChannelInterPAN(): Promise<void> {