From 368bcaca4601590aa3e772013e711eff23c5a3a1 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Tue, 9 Jun 2020 16:09:17 +0000
Subject: [PATCH] Link remixd websocket plugin apis

---
 .../remix-ide/src/app/files/remixDProvider.js | 36 ++++++++-----------
 apps/remix-ide/src/app/files/remixd-handle.js |  6 ++--
 apps/remix-ide/src/app/panels/file-panel.js   |  3 --
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/apps/remix-ide/src/app/files/remixDProvider.js b/apps/remix-ide/src/app/files/remixDProvider.js
index c3ea6ee3cf..979b67af98 100644
--- a/apps/remix-ide/src/app/files/remixDProvider.js
+++ b/apps/remix-ide/src/app/files/remixDProvider.js
@@ -59,12 +59,10 @@ module.exports = class RemixDProvider {
     cb()
   }
 
-  async init (cb) {
-    await this._appManager.call('remixd', 'sharedFolder', { currentSharedFolder })
+  init (cb) {
     this._appManager.call('remixd', 'folderIsReadOnly', {}).then((result) => {
       this._isReady = true
       this._readOnlyMode = result
-      console.log('this._readOnlyMode: ', this._readOnlyMode)
       cb && cb()
     }).catch((error) => {
       cb && cb(error)
@@ -81,13 +79,13 @@ module.exports = class RemixDProvider {
   //
   // this.remixd.exists(path, (error, isValid) => {})
 
-  async exists (path, cb) {
+  exists (path, cb) {
     const unprefixedpath = this.removePrefix(path)
 
-    this._appManager.call('remixd', 'exists', {path: unprefixedpath}).then((result) => {
-      return cb && cb(null, result)
+    return this._appManager.call('remixd', 'exists', { path: unprefixedpath }).then((result) => {
+      return cb(null, result)
     }).catch((error) => {
-      return cb && cb(error)
+      return cb(error)
     })
   }
 
@@ -101,16 +99,14 @@ module.exports = class RemixDProvider {
 
   get (path, cb) {
     var unprefixedpath = this.removePrefix(path)
-    this._appManager.call('remixd', 'get', {path: unprefixedpath}, (error, file) => {
-      if (!error) {
-        this.filesContent[path] = file.content
-        if (file.readonly) { this._readOnlyFiles[path] = 1 }
-        cb(error, file.content)
-      } else {
-        // display the last known content.
-        // TODO should perhaps better warn the user that the file is not synced.
-        cb(null, this.filesContent[path])
-      }
+    this._appManager.call('remixd', 'get', { path: unprefixedpath }).then((file) => {
+      this.filesContent[path] = file.content
+      if (file.readonly) { this._readOnlyFiles[path] = 1 }
+      cb(error, file.content)
+    }).catch((error) => {
+      // display the last known content.
+      // TODO should perhaps better warn the user that the file is not synced.
+      cb(null, this.filesContent[path])
     })
   }
 
@@ -190,9 +186,8 @@ module.exports = class RemixDProvider {
 
   async isFile (path) {
     const unprefixedpath = this.removePrefix(path)
-    const callId = await this._appManager.call('remixd', 'isFile', {path: unprefixedpath})
 
-    return await this._remixd.receiveResponse(callId)
+    return await this._appManager.call('remixd', 'isFile', { path: unprefixedpath })
   }
 }
 
@@ -220,8 +215,7 @@ function remixapi (appManager, self) {
   const dir = (path, callback) => {
     path = '' + (path || '')
     path = pathtool.join('./', path)
-    appManager.call('remixd', 'resolveDirectory', { path }).then((filesList) => { 
-      console.log('filesList: ', filesList)
+    appManager.call('remixd', 'resolveDirectory', { path }).then((filesList) => {
       callback(null, filesList)
     }).catch((error) => {
       callback(error)
diff --git a/apps/remix-ide/src/app/files/remixd-handle.js b/apps/remix-ide/src/app/files/remixd-handle.js
index 8148c969b1..b3a2fdd7de 100644
--- a/apps/remix-ide/src/app/files/remixd-handle.js
+++ b/apps/remix-ide/src/app/files/remixd-handle.js
@@ -21,7 +21,7 @@ var css = csjs`
 const profile = {
   name: 'remixd',
   url: 'ws://127.0.0.1:65520',
-  methods: ['folderIsReadOnly', 'resolveDirectory'],
+  methods: ['folderIsReadOnly', 'resolveDirectory', 'get', 'exists', 'isFile'],
   events: [],
   description: 'Using Remixd daemon, allow to access file system',
   kind: 'other',
@@ -82,7 +82,7 @@ export class RemixdHandle extends WebsocketPlugin {
           fn: () => {
             try {
               super.activate()
-              setTimeout(() => { connection() }, 3000)
+              setTimeout(() => { connection() }, 2000)
             } catch(error) {
               connection(error)
             }
@@ -97,7 +97,7 @@ export class RemixdHandle extends WebsocketPlugin {
     } else {
       try {
         super.activate()
-        setTimeout(() => { connection() }, 3000)
+        setTimeout(() => { connection() }, 2000)
       } catch(error) {
         connection(error)
       }
diff --git a/apps/remix-ide/src/app/panels/file-panel.js b/apps/remix-ide/src/app/panels/file-panel.js
index 8a03a2bbc4..e0c42c749e 100644
--- a/apps/remix-ide/src/app/panels/file-panel.js
+++ b/apps/remix-ide/src/app/panels/file-panel.js
@@ -60,9 +60,6 @@ module.exports = class Filepanel extends ViewPlugin {
     var fileExplorer = createProvider('browser', ['createNewFile', 'publishToGist', canUpload ? 'uploadFile' : ''])
     var fileSystemExplorer = createProvider('localhost')
 
-    console.log('fileSystemExplorer: ', fileSystemExplorer)
-    console.log('self._deps.fileProviders: ', self._deps.fileProviders['localhost'])
-    console.log('appManager: ', appManager)
     self.remixdHandle = new RemixdHandle(fileSystemExplorer, self._deps.fileProviders['localhost'], appManager)
 
     const explorers = yo`