Merge pull request #106 from rolldone/working

Working
rolldone · Mar 30, 2022 · 0cb06fb · 0cb06fb
2 parents 6f4dedb + e27ac65
commit 0cb06fb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/app/devsync/services/DevSyncService.ts b/src/app/devsync/services/DevSyncService.ts
@@ -423,6 +423,9 @@ const DevSyncService = BaseService.extend<DevSyncServiceInterface>({
           console.clear();
           process.stdout.write(chalk.green('Devsync | ') + 'Watch Mode' + '\r');
           // this.uploader._consoleAction = "watch";
+          if(this.uploader == null){
+            this.uploader = new Uploader(currentConf, this._cli);
+          }
           this.uploader.startConsole(false);
           for (var i = 0; i < total_tab; i++) {
             if (this.uploader.getConsoleMode(i) == "local") {

diff --git a/src/app/devsync2/compute/HttpEvent.ts b/src/app/devsync2/compute/HttpEvent.ts
@@ -454,6 +454,8 @@ const HttpEvent = BaseModel.extend<Omit<HttpEventInterface, 'model'>>({
         case data.includes('total size'):
           _ptyProcess.write('exit' + '\r')
           break;
+        case data.includes('WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!'):
+        case data.includes('Someone could be eavesdropping on you right now (man-in-the-middle attack)!'):
         case data.includes('No such file or directory'):
         case data.includes('rsync error:'):
           _ptyProcess.write('exit' + '\r')

diff --git a/src/app/devsync2/services/DevRsyncService.ts b/src/app/devsync2/services/DevRsyncService.ts
@@ -529,6 +529,10 @@ const DevRsyncService = BaseService.extend<DevRsyncServiceInterface>({
           console.clear();
           process.stdout.write(chalk.green('Devsync | ') + 'Watch Mode' + '\r');
           // this.uploader._consoleAction = "watch";
+          // Check if the uploader suddenly null
+          if(this.uploader == null){
+            this.uploader = new Uploader(currentConf, this._cli);
+          }
           this.uploader.startConsole(false);
           for (var i = 0; i < total_tab; i++) {
             if (this.uploader.getConsoleMode(i) == "local") {