SeleniumHQ
diff --git a/‎docs/api/plugins/system.md‎
Lines changed: 9 additions & 1 deletion b/‎docs/api/plugins/system.md‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎docs/introduction/code-export.md‎
Lines changed: 1 addition & 1 deletion b/‎docs/introduction/code-export.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/selenium-ide/src/api/v1/index.js‎
Lines changed: 153 additions & 32 deletions b/‎packages/selenium-ide/src/api/v1/index.js‎
Lines changed: 153 additions & 32 deletions
diff --git a/‎packages/selenium-ide/src/background/background.js‎
Lines changed: 67 additions & 2 deletions b/‎packages/selenium-ide/src/background/background.js‎
Lines changed: 67 additions & 2 deletions
@@ -4,7 +4,7 @@ title: Plugins System API
 sidebar_label: System
 ---
 
-The System API is the most basic API which Selenium IDE provides. It is not prefixed and can be called with `/`. 
+The System API is the most basic API which Selenium IDE provides. It is not prefixed and can be called with `/`.
 
 #### Opening Selenium IDE
 If the extension is installed, a request could be made by a plugin to open Selenium IDE.
@@ -62,4 +62,12 @@ Loads a project into the IDE, as if the user opened it, if the user has unsaved
   project: JSON parsed side file
 }
 ```
+### `POST /control`
 
+Start a connection from another chrome extension. When this connection is accepted by the user, Selenium IDE restarts and registers the caller, and the extension takes exclusive control of Selenium IDE until user closes Selenium IDE or another connection is accepted. When this mode is on, the save to computer functionality gets overwritten by sending the side file to the extension controlling Selenium IDE.
+
+The payload of this call is identical to the payload of `POST /register` call.
+
+### `POST /close`
+
+When Selenium IDE is controlled by another chrome extension, the controller extension can use this API to close the IDE window. If user have any unsaved changes, it will prompt user to whether give up the changes or ignore the close. No payload is needed.
@@ -157,7 +157,7 @@ You can see an example of this being implemented in `packages/code-export-java-j
 
 Once you've got everything else in place, it's time to wire it up for use in the UI.
 
-This is possible in [`packages/code-export/src/index.js`](https://github.com/SeleniumHQ/selenium-ide/blob/v3/packages/code-export/src/index.js). 
+This is possible in [`packages/code-export/src/index.js`](https://github.com/SeleniumHQ/selenium-ide/blob/v3/packages/code-export/src/index.js).
 
 You will need to add your language to `availableLanguages`.
 
 
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+import browser from 'webextension-polyfill'
 import Router from '../../router'
 import Manager from '../../plugin/manager'
 import logger from '../../neo/stores/view/Logs'
@@ -24,79 +25,199 @@ import recordRouter from './record'
 import exportRouter from './export'
 import popupRouter from './popup'
 import UiState from '../../neo/stores/view/UiState'
+import WindowSession from '../../neo/IO/window-session'
 import ModalState from '../../neo/stores/view/ModalState'
 import { loadJSProject } from '../../neo/IO/filesystem'
+import manager from '../../plugin/manager'
 
 const router = new Router()
 
+const errors = {
+  cannotAccessInControlMode: {
+    errorCode: 'CannotAccessInControlMode',
+    error: 'Selenium IDE is controlled by a different extension.',
+  },
+  missingPlugin: {
+    errorCode: 'MissingPlugin',
+    error: 'Plugin is not registered.',
+  },
+  missingController: {
+    errorCode: 'missingController',
+    error: 'No controller specified.',
+  },
+  missingProject: {
+    errorCode: 'MissingProject',
+    error: 'Project is missing.',
+  },
+}
+
+function isFromController(req) {
+  return Manager.controller && manager.controller.id === req.sender
+}
+
+function controlledOnly(req, res) {
+  if (!Manager.controller || isFromController(req)) {
+    return Promise.resolve()
+  } else {
+    res(errors.cannotAccessInControlMode)
+    return Promise.reject()
+  }
+}
+
+function tryOverrideControl(req) {
+  if (!ModalState.welcomeState.completed) {
+    ModalState.hideWelcome()
+  }
+  WindowSession.focusIDEWindow()
+  return ModalState.showAlert({
+    title: 'Assisted Control',
+    description: `${req.name} is trying to control Selenium IDE`,
+    confirmLabel: 'Restart and Allow access',
+    cancelLabel: 'Deny access',
+  }).then(r => {
+    if (r) {
+      const plugin = {
+        id: req.sender,
+        name: req.name,
+        version: req.version,
+        commands: req.commands,
+        dependencies: req.dependencies,
+        jest: req.jest,
+        exports: req.exports,
+      }
+      return browser.runtime.sendMessage({ restart: true, controller: plugin })
+    } else {
+      return Promise.reject()
+    }
+  })
+}
+
 router.get('/health', (req, res) => {
   res(Manager.hasPlugin(req.sender))
 })
 
 router.post('/register', (req, res) => {
-  const plugin = {
-    id: req.sender,
-    name: req.name,
-    version: req.version,
-    commands: req.commands,
-    dependencies: req.dependencies,
-    jest: req.jest,
-    exports: req.exports,
-  }
-  Manager.registerPlugin(plugin)
-  res(true)
+  controlledOnly(req, res).then(() => {
+    const plugin = {
+      id: req.sender,
+      name: req.name,
+      version: req.version,
+      commands: req.commands,
+      dependencies: req.dependencies,
+      jest: req.jest,
+      exports: req.exports,
+    }
+    Manager.registerPlugin(plugin)
+    res(true)
+  })
 })
 
 router.post('/log', (req, res) => {
-  if (req.type === LogTypes.Error) {
-    logger.error(`${Manager.getPlugin(req.sender).name}: ${req.message}`)
-  } else if (req.type === LogTypes.Warning) {
-    logger.warn(`${Manager.getPlugin(req.sender).name}: ${req.message}`)
-  } else {
-    logger.log(`${Manager.getPlugin(req.sender).name}: ${req.message}`)
-  }
-  res(true)
+  controlledOnly(req, res).then(() => {
+    if (req.type === LogTypes.Error) {
+      logger.error(`${Manager.getPlugin(req.sender).name}: ${req.message}`)
+    } else if (req.type === LogTypes.Warning) {
+      logger.warn(`${Manager.getPlugin(req.sender).name}: ${req.message}`)
+    } else {
+      logger.log(`${Manager.getPlugin(req.sender).name}: ${req.message}`)
+    }
+    res(true)
+  })
 })
 
 router.get('/project', (_req, res) => {
-  res({ id: UiState.project.id, name: UiState.project.name })
+  controlledOnly(_req, res).then(() => {
+    res({ id: UiState.project.id, name: UiState.project.name })
+  })
 })
 
-router.post('/project', (req, res) => {
-  if (req.project) {
+router.post('/control', (req, res) => {
+  if (isFromController(req)) {
+    res(true)
+  } else {
+    tryOverrideControl(req)
+      .then(() => res(true))
+      .catch(() => res(false))
+  }
+})
+
+router.post('/close', (req, res) => {
+  controlledOnly(req, res).then(() => {
+    // Not allow close if is not control mode.
+    if (!UiState.isControlled) {
+      return res(false)
+    }
     const plugin = Manager.getPlugin(req.sender)
+    if (!plugin) return res(errors.missingPlugin)
     if (!UiState.isSaved()) {
       ModalState.showAlert({
-        title: 'Open project without saving',
+        title: 'Close project without saving',
         description: `${
           plugin.name
-        } is trying to load a project, are you sure you want to load this project and lose all unsaved changes?`,
+        } is trying to close a project, are you sure you want to load this project and lose all unsaved changes?`,
         confirmLabel: 'proceed',
         cancelLabel: 'cancel',
       }).then(result => {
         if (result) {
-          loadJSProject(UiState.project, req.project)
-          ModalState.completeWelcome()
+          window.close()
+          res(true)
         }
       })
-      res(true)
+      res(false)
     } else {
-      ModalState.hideWelcome()
+      window.close()
+      res(true)
+    }
+  })
+})
+
+//Using '/private/' as a prefix for internal APIs
+router.post('/private/close', res => {
+  window.close()
+  res(true)
+})
+
+router.post('/private/connect', (req, res) => {
+  if (req.controller && req.controller.id) {
+    Manager.controller = req.controller
+    UiState.startConnection()
+    Manager.registerPlugin(req.controller)
+    return res(true)
+  } else {
+    return res(errors.missingController)
+  }
+})
+
+router.post('/project', (req, res) => {
+  controlledOnly(req, res).then(() => {
+    const plugin = Manager.getPlugin(req.sender)
+    if (!plugin) return res(errors.missingPlugin)
+    if (!req.project) return res(errors.missingProject)
+
+    if (!UiState.isSaved()) {
+      WindowSession.focusIDEWindow()
       ModalState.showAlert({
-        title: 'Open project',
-        description: `${plugin.name} is trying to load a project`,
+        title: 'Open project without saving',
+        description: `${
+          plugin.name
+        } is trying to load a project, are you sure you want to load this project and lose all unsaved changes?`,
         confirmLabel: 'proceed',
         cancelLabel: 'cancel',
       }).then(result => {
         if (result) {
           loadJSProject(UiState.project, req.project)
           ModalState.completeWelcome()
+          res(true)
         }
       })
+    } else {
+      WindowSession.focusIDEWindow()
+      loadJSProject(UiState.project, req.project)
+      ModalState.completeWelcome()
       res(true)
     }
-  }
-  res(false)
+    res(false)
+  })
 })
 
 router.use('/playback', playbackRouter)
 
@@ -181,17 +181,82 @@ browser.runtime.onConnect.addListener(function(m) {
   port = m
 })
 
+browser.runtime.onMessage.addListener(handleInternalMessage)
+
+function handleInternalMessage(message) {
+  if (message.restart && message.controller && message.controller.id) {
+    ideWindowId = undefined
+
+    browser.runtime
+      .sendMessage({
+        uri: '/private/close',
+        verb: 'post',
+        payload: null,
+      })
+      .then(() => {
+        openPanel({ windowId: 0 }).then(() => {
+          var payload = { ...message }
+          delete payload.restart
+
+          const newMessage = {
+            uri: '/private/connect',
+            verb: 'post',
+            payload: payload,
+          }
+          browser.runtime
+            .sendMessage(newMessage)
+            .then(
+              browser.runtime.sendMessage(message.controller.id, {
+                connected: true,
+              })
+            )
+            .catch(() => {
+              browser.runtime.sendMessage(
+                message.controller.id,
+                'Error Connecting to Selenium IDE'
+              )
+            })
+        })
+      })
+  }
+}
+
 browser.runtime.onMessageExternal.addListener(
   (message, sender, sendResponse) => {
     if (!message.payload) {
       message.payload = {}
     }
-    message.payload.sender = sender.id
+
+    let payload = message.payload
+
+    payload.sender = sender.id
+    if (message.uri.startsWith('/private/')) {
+      return sendResponse(false)
+    }
     browser.runtime
       .sendMessage(message)
       .then(sendResponse)
       .catch(() => {
-        if (message.openSeleniumIDEIfClosed) {
+        if (message.uri == '/control' && message.verb == 'post') {
+          return openPanel({ windowId: 0 }).then(() => {
+            const newMessage = {
+              uri: '/private/connect',
+              verb: 'post',
+              payload: {
+                controller: {
+                  id: payload.sender,
+                  name: payload.name,
+                  version: payload.version,
+                  commands: payload.commands,
+                  dependencies: payload.dependencies,
+                  jest: payload.jest,
+                  exports: payload.exports,
+                },
+              },
+            }
+            browser.runtime.sendMessage(newMessage).then(sendResponse)
+          })
+        } else if (message.openSeleniumIDEIfClosed) {
           return openPanel({ windowId: 0 }).then(() => {
             sendResponse(true)
           })