Fix

Author: devdotnetorg

src/Configuration/IotConfiguration.ts

@@ -7,7 +7,7 @@ import { IotResult,StatusResult } from '../IotResult';
 import { IotConfigurationFolder } from './IotConfigurationFolder';
 import { IotBuiltInConfig } from './IotBuiltInConfig';
 import { IoTHelper } from '../Helper/IoTHelper';
-import { LogLevel } from '../LogLevel';
+import { LogLevel } from '../shared/LogLevel';
 import { Constants } from "../Constants"
 
 export class IotConfiguration {

src/Configuration/IotConfigurationFolder.ts

@@ -5,7 +5,7 @@ import * as path from 'path';
 import * as os from 'os';
 import { IoTHelper } from '../Helper/IoTHelper';
 import { IotResult,StatusResult } from '../IotResult';
-import { EntityType } from '..//Entity/EntityType';
+import { EntityType } from '../Entity/EntityType';
 import { Constants } from "../Constants"
 
 export class IotConfigurationFolder {

src/Entity/EntityBase.ts

@@ -8,7 +8,8 @@ import { IoTHelper } from '../Helper/IoTHelper';
 import { IotResult,StatusResult } from '../IotResult';
 
 export abstract class EntityBase<T extends EntityBaseAttribute> {
-  protected _entityIntLabel:string; //for understandable log
+  protected readonly _entityLabel:string; //for understandable log
+  protected readonly _entitiesLabel:string; //for understandable log
   private _yamlFilePath:string=""; //YAML file
   public get YAMLFilePath(): string {
     return this._yamlFilePath;}
@@ -39,11 +40,12 @@ export abstract class EntityBase<T extends EntityBaseAttribute> {
 
   protected _pathFolderSchemas: string;
 
-  constructor(entityIntLabel:string,
+  constructor( entityLabel:string, entitiesLabel:string,
     TCreator: new(pathFolderSchemas?: string) => T,
     pathFolderSchemas: string
     ){
-      this._entityIntLabel=entityIntLabel;
+      this._entityLabel=entityLabel;
+      this._entitiesLabel=entitiesLabel;
       this.Attributes=new TCreator(pathFolderSchemas);
       //
       this._pathFolderSchemas=pathFolderSchemas;
@@ -52,24 +54,28 @@ export abstract class EntityBase<T extends EntityBaseAttribute> {
 
   public Init(type:EntityType,yamlFilePath:string,recoverySourcePath?:string)
   {
-    this.Type= type;
-    this._recoverySourcePath=recoverySourcePath;
-    this._yamlFilePath=yamlFilePath;
-    this.ValidateEntityBase();
-    if(!this.IsValid) return;
-    //if(this.IsValid) this.Parse(path);
-    let attributes = this.Attributes as any; 
-    attributes.Init(this.YAMLFilePath);
-    if(attributes.IsValid) {
-      //ok
-      //check if folder matches entity and id
-      if(this.RootNameDir!=attributes.Id)
-        this._validationErrors.push(`${this._entityIntLabel} folder name ${this.RootNameDir} `+
-          `does not match id value ${attributes.Id}.`+
-          `You need to rename the folder or change the ${this._entityIntLabel} id.`);
-    }else{
-      //error
-      this._validationErrors = attributes.ValidationErrors.slice();
+    try {
+      this.Type= type;
+      this._recoverySourcePath=recoverySourcePath;
+      this._yamlFilePath=yamlFilePath;
+      this.ValidateEntityBase();
+      if(!this.IsValid) return;
+      //if(this.IsValid) this.Parse(path);
+      let attributes = this.Attributes as any; 
+      attributes.Init(this.YAMLFilePath);
+      if(attributes.IsValid) {
+        //ok
+        //check if folder matches entity and id
+        if(this.RootNameDir!=attributes.Id)
+          this._validationErrors.push(`${this._entityLabel} folder name ${this.RootNameDir} `+
+            `does not match id value ${attributes.Id}.`+
+            `You need to rename the folder or change the ${this._entityLabel} id.`);
+      }else{
+        //error
+        this._validationErrors = attributes.ValidationErrors.slice();
+      }
+    } catch (err: any){
+      this._validationErrors.push(`Error Init ${this._entitiesLabel}. Error: ${err}`);
     }
   }
 
@@ -92,9 +98,9 @@ export abstract class EntityBase<T extends EntityBaseAttribute> {
       //replace fields
       const fileName=this.YAMLFilePath.substring(this.RootDir.length+1);
       this._yamlFilePath= path.join(destDir, fileName);
-      result = new IotResult(StatusResult.Ok,`${this._entityIntLabel}. ${this.RootDir} folder successfully moved to ${destDir} folder`);
+      result = new IotResult(StatusResult.Ok,`${this._entityLabel}. ${this.RootDir} folder successfully moved to ${destDir} folder`);
     } catch (err: any){
-      result = new IotResult(StatusResult.Error,`Unable to move ${this._entityIntLabel} from folder ${this.RootDir} to folder ${destDir}`,err);
+      result = new IotResult(StatusResult.Error,`Unable to move ${this._entityLabel} from folder ${this.RootDir} to folder ${destDir}`,err);
     }
     //result
     return result;
@@ -104,14 +110,13 @@ export abstract class EntityBase<T extends EntityBaseAttribute> {
     let result:IotResult;
     try {
       //delete
-      if (fs.existsSync(this.RootDir))
-      {
+      if (fs.existsSync(this.RootDir)) {
         fs.emptyDirSync(this.RootDir);
         fs.removeSync(this.RootDir);
       } 
       result = new IotResult(StatusResult.Ok,`Folder has been deleted: ${this.RootDir}`);
     } catch (err: any){
-      result = new IotResult(StatusResult.Error,`Unable to delete ${this._entityIntLabel} folder: ${this.RootDir}`,err);
+      result = new IotResult(StatusResult.Error,`Unable to delete ${this._entityLabel} folder: ${this.RootDir}`,err);
     }
     //result
     return result;
@@ -136,14 +141,13 @@ export abstract class EntityBase<T extends EntityBaseAttribute> {
     let result:IotResult;
     const fileZipPath=`${this.RecoverySourcePath}\\${this.RootNameDir}.zip`;
     result= IoTHelper.UnpackFromZip(fileZipPath,path.dirname(this.RootDir));
-    if(result.Status==StatusResult.Error) result.AddMessage(`${this._entityIntLabel} restore error`);
+    if(result.Status==StatusResult.Error) result.AddMessage(`${this._entityLabel} restore error`);
     //result
     return result;
   }
 
-  public IsCompatibleByEndDeviceArchitecture(endDeviceArchitecture?:string):boolean
+  public IsCompatibleByEndDeviceArchitecture(endDeviceArchitecture:string):boolean
   {
-    if(!endDeviceArchitecture) return false;
     const result=this.Attributes.EndDeviceArchitecture.find(x=>x==endDeviceArchitecture);
     if(result) return true; else  return false;
   }

src/Entity/EntityCollection.ts

@@ -7,13 +7,14 @@ import { EntityBaseAttribute } from './EntityBaseAttribute';
 import { EntityType } from './EntityType';
 import { EntityRecovery } from './EntityRecovery';
 import { IotResult,StatusResult } from '../IotResult';
-import { EventDispatcher,Handler } from '../EventDispatcher';
-import { LogLevel } from '../LogLevel';
+import { LogLevel } from '../shared/LogLevel';
 import { IoTHelper } from '../Helper/IoTHelper';
 import { EntityDownload, EntityDownloader } from './EntityDownloader';
 import { IotBuiltInConfig } from '../Configuration/IotBuiltInConfig';
+import { ClassWithEvent } from '../Shared/ClassWithEvent';
+import { ContainsType } from '../Shared/ContainsType';
 
-export abstract class EntityCollection <A extends EntityBaseAttribute, T extends EntityBase<A>> {
+export abstract class EntityCollection <A extends EntityBaseAttribute, T extends EntityBase<A>> extends ClassWithEvent {
 
   protected _items:Map<string,T>;
   protected readonly _entityLabel:string; //for understandable log
@@ -25,26 +26,11 @@ export abstract class EntityCollection <A extends EntityBaseAttribute, T extends
   public get Count(): number {
       return this._items.size;}
 
-  //Event--------------------------------------
-  protected ChangedStateDispatcher = new EventDispatcher<IChangedStateEvent>();
-
-  public OnChangedStateSubscribe(handler: Handler<IChangedStateEvent>):Handler<IChangedStateEvent> {
-        this.ChangedStateDispatcher.Register(handler);
-        return handler;
-  }
-
-  public OnChangedStateUnsubscribe (handler: Handler<IChangedStateEvent>) {
-    this.ChangedStateDispatcher.Unregister(handler);
-  }
-
-  protected FireChangedState(event: IChangedStateEvent) { 
-      this.ChangedStateDispatcher.Fire(event);
-  }
-  //-------------------------------------------
   constructor(
     entityLabel:string, entitiesLabel:string, TCreator: new(pathFolderSchemas: string) => T,
     getDirEntitiesCallback:(type:EntityType) =>string, config:IConfigEntityCollection
     ){
+      super();
       this._items = new Map<string,T>(); 
       this._entityLabel=entityLabel;
       this._entitiesLabel=entitiesLabel;
@@ -65,12 +51,7 @@ export abstract class EntityCollection <A extends EntityBaseAttribute, T extends
 
   public Remove(id:string):boolean
   {
-    try {
-      this._items.delete(id);
-      return true;
-    } catch (err: any){
-      return false;
-    }
+    return this._items.delete(id);
   }
 
   public Update(newValue:T):boolean
@@ -414,23 +395,9 @@ export abstract class EntityCollection <A extends EntityBaseAttribute, T extends
     if (fs.existsSync(dir)) fs.emptyDirSync(dir);
   }
 
-  protected CreateEvent(message?:string|IotResult,logLevel?:LogLevel,increment?:number)
-  {
-    //Event
-    this.FireChangedState({
-      message:message,
-      logLevel:logLevel,
-      increment:increment
-    });
-  }
-
 }
 
-export interface IChangedStateEvent {
-  message?:string|IotResult,
-  logLevel?:LogLevel,
-  increment?:number
-}
+//TODO убрать, заменить на Interface IConfig
 
 export interface IConfigEntityCollection {
   extVersion: string;
@@ -444,10 +411,3 @@ export interface IConfigEntityCollection {
   urlsUpdateEntitiesCommunity:string[];
   urlUpdateEntitiesSystem:string;
 }
-
-export enum ContainsType {
-	no = "no",
-	yesSameVersion  = "yes same version",
-	yesMoreVersion = "yes more version",
-	yesVersionSmaller = "yes version smaller"
-}

src/Entity/EntityDownloader.ts

@@ -22,8 +22,7 @@ export class EntityDownloader {
       //unpack
       let unpackPath=`${destPath}\\${item.Id}`;
       //delete
-      if (fs.existsSync(unpackPath))
-      {
+      if (fs.existsSync(unpackPath)) {
         fs.emptyDirSync(unpackPath);
         fs.removeSync(unpackPath);
       }
@@ -61,7 +60,7 @@ export class EntityDownloader {
             let item=obj.entitys[index];
             if(item) {
               const downloadEntity=this.ParseEntityDownload(item,url);
-              listDownload.push(downloadEntity);
+              if (downloadEntity) listDownload.push(downloadEntity);
               //next position
               index=index+1;
             }else break;
@@ -77,30 +76,34 @@ export class EntityDownloader {
     return Promise.resolve(result);
   }
 
-  protected ParseEntityDownload(obj:any,url:string):EntityDownload
+  protected ParseEntityDownload(obj:any,url:string):EntityDownload|undefined
   {
-    const objId=obj.id;
-    const objVersion=obj.version;
-    const objforVersionExt=obj.forVersionExt;
-    const objUrl=url.substring(0,url.lastIndexOf('/'))+"/"+objId+".zip";
-    //const filename = uri.split('/').pop()?.substring(0,uri.split('/').pop()?.lastIndexOf('.'));
-    //const fileZipPath=this._config.Folder.Temp+"\\"+filename+".zip";
-    //arrays
-    let platform:Array<string>=[];  
-    let index=0; 
-    //platform
-    index=0;
-    do { 				
-          let item=obj.platform[index];
-          if(item) {
-            platform.push(<string>item);            
-            //next position
-            index=index+1;
-          }else break;      
-    } 
-    while(true)
-    const downloadEntity=new EntityDownload(objId,objVersion,objUrl,
-        objforVersionExt,platform);
+    let downloadEntity:EntityDownload|undefined;
+    try {
+      const objId=obj.id;
+      const objVersion=obj.version;
+      const objforVersionExt=obj.forVersionExt;
+      const objUrl=url.substring(0,url.lastIndexOf('/'))+"/"+objId+".zip";
+      //const filename = uri.split('/').pop()?.substring(0,uri.split('/').pop()?.lastIndexOf('.'));
+      //const fileZipPath=this._config.Folder.Temp+"\\"+filename+".zip";
+      //arrays
+      let platform:Array<string>=[];  
+      let index=0; 
+      //platform
+      index=0;
+      do { 				
+            let item=obj.platform[index];
+            if(item) {
+              platform.push(<string>item);            
+              //next position
+              index=index+1;
+            }else break;      
+      } 
+      while(true)
+      downloadEntity=new EntityDownload(objId,objVersion,objUrl,
+          objforVersionExt,platform);
+    } catch (err: any){}
+    //result
     return downloadEntity;
   }
 }

src/Entity/EntityRecovery.ts

@@ -29,6 +29,7 @@ export class EntityRecovery {
   {
     let listNames:Array<string>=[];
     //getting a list of entity files
+    if (!fs.existsSync(sourceDir)) return listNames;
     const files = fs.readdirSync(sourceDir);
     files.forEach(name => {
       //file

src/EventDispatcher.ts

@@ -215,7 +215,8 @@ export class IoTHelper {
     return listFiles;
   }
 
-  static SetTimeFiles(filesPath:string[],timestamp:number):IotResult
+  static SetTimeFiles(filesPath:string[],
+    timestamp:number=Date.now() /*Unix epoch, i.e. Unix timestamp*/):IotResult
   {
     let result:IotResult;
     let lastFile:string|undefined;
@@ -232,13 +233,6 @@ export class IoTHelper {
     return result;
   }
 
-  static SetCurrentTimeToFiles(dirPath:string)
-  {
-    //Unix epoch, i.e. Unix timestamp:
-    const dateNow=Date.now();
-    this.SetTimeFiles(this.GetAllFile(dirPath),dateNow);
-  }
-
   static SetLineEnding(content:string):string
   {
     //https://github.com/Neoklosch/crlf-helper/

src/Helper/IoTHelper.ts

@@ -77,6 +77,7 @@ export class dotnetHelper {
   static GetTargetFrameworkFromCsprojFile(filePath:string): string|undefined {
     try {
       //read *.csproj for get TargetFramework
+      if (!fs.existsSync(filePath)) return undefined;
       const xmlFile:string= fs.readFileSync(filePath, 'utf8');
       let xpath = require('xpath');
       let dom = require('xmldom').DOMParser;
@@ -85,7 +86,8 @@ export class dotnetHelper {
       const targetFramework=nodes[0].firstChild.data;
       return targetFramework;
     } catch (err: any){
-      return undefined;
-    } 
+      
+    }
+    return undefined;
   }
 }

src/Helper/dotnetHelper.ts

@@ -77,8 +77,7 @@ export class launchHelper {
     let checklabel=newLabel;
     if(increment) checklabel=`${newLabel} ${suffix}${increment}`;    
     const item = arrayName.find(x=>x==checklabel);
-    if(item)
-    {
+    if(item) {
       if(!increment) increment=0; 
       increment++;      
       checklabel=launchHelper.GetUniqueLabel(newLabel,suffix,increment,arrayName);