Merge branch 'command-line'

4 files changed, 74 insertions, 17 deletions

diff --git a/src/background/commands.js b/src/background/commands.js
new file mode 100644
index 0000000..8bd52e5
--- /dev/null
+++ b/src/background/commands.js
@@ -0,0 +1,2 @@
+export const OPEN = 'open';
+export const TABOPEN = 'tabopen';
diff --git a/src/background/index.js b/src/background/index.js
index 604ea92..f3bd65a 100644
--- a/src/background/index.js
+++ b/src/background/index.js
@@ -1,21 +1,37 @@
 import * as actions from '../shared/actions';
 import * as tabs from './tabs';
+import * as commands from './commands';
 import KeyQueue from './key-queue';
 
 const queue = new KeyQueue();
 
-const keyDownHandle = (request) => {
-  return queue.push({
+const keyDownHandle = (request, sender, sendResponse) => {
+  let action = queue.push({
     code: request.code,
     shift: request.shift,
     ctrl: request.ctrl,
     alt: request.alt,
     meta: request.meta
-  })
-}
+  });
+  if (!action) {
+    return;
+  }
+
+  if (actions.isBackgroundAction(action[0])) {
+    doBackgroundAction(sender, action);
+  } else if (actions.isContentAction(action[0])) {
+    sendResponse(action);
+  }
+};
 
 const doBackgroundAction = (sender, action) => {
   switch(action[0]) {
+  case actions.TABS_CLOSE:
+    tabs.closeTab(sender.tab.id);
+    break;
+  case actions.TABS_REOPEN:
+    tabs.reopenTab();
+    break;
   case actions.TABS_PREV:
     tabs.selectPrevTab(sender.tab.index, actions[1] || 1);
     break;
@@ -25,22 +41,36 @@ const doBackgroundAction = (sender, action) => {
   }
 }
 
-browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
-  let action = null;
-
-  switch (request.type) {
-  case 'event.keydown':
-    action = keyDownHandle(request);
-    break;
+const normalizeUrl = (string) => {
+  try {
+    return new URL(string).href
+  } catch (e) {
+    return 'http://' + string;
   }
+}
 
-  if (action == null) {
+const cmdEnterHandle = (request, sender) => {
+  let words = request.text.split(' ').filter((s) => s.length > 0);
+  switch (words[0]) {
+  case commands.OPEN:
+    browser.tabs.update(sender.tab.id, { url: normalizeUrl(words[1]) });
+    return;
+  case commands.TABOPEN:
+    browser.tabs.create({ url: normalizeUrl(words[1]) });
     return;
   }
+};
 
-  if (actions.isBackgroundAction(action[0])) {
-    doBackgroundAction(sender, action);
-  } else if (actions.isContentAction(action[0])) {
-    sendResponse(action);
+browser.runtime.onMessage.addListener((request, sender, sendResponse) => {
+  switch (request.type) {
+  case 'event.keydown':
+    keyDownHandle(request, sender, sendResponse);
+    break;
+  case 'event.cmd.enter':
+    cmdEnterHandle(request, sender, sendResponse);
+    break;
+  case 'event.cmd.suggest':
+    // TODO make suggestion and return via sendResponse
+    break;
   }
 });
diff --git a/src/background/key-queue.js b/src/background/key-queue.js
index 666eec3..d753bc1 100644
--- a/src/background/key-queue.js
+++ b/src/background/key-queue.js
@@ -2,10 +2,15 @@ import * as keys from './keys';
 import * as actions from '../shared/actions';
 
 const DEFAULT_KEYMAP = [
+  { keys: [{ code: KeyboardEvent.DOM_VK_SEMICOLON, shift: true }], action: [ actions.CMD_OPEN ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_O }], action: [ actions.CMD_TABS_OPEN, false ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_O, shift: true }], action: [ actions.CMD_TABS_OPEN, true ]},
   { keys: [{ code: KeyboardEvent.DOM_VK_K }], action: [ actions.SCROLL_UP, 1 ]},
   { keys: [{ code: KeyboardEvent.DOM_VK_J }], action: [ actions.SCROLL_DOWN, 1 ]},
   { keys: [{ code: KeyboardEvent.DOM_VK_G }, { code: KeyboardEvent.DOM_VK_G }], action: [ actions.SCROLL_TOP ]},
   { keys: [{ code: KeyboardEvent.DOM_VK_G, shift: true }], action: [ actions.SCROLL_BOTTOM ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_D }], action: [ actions.TABS_CLOSE ]},
+  { keys: [{ code: KeyboardEvent.DOM_VK_U }], action: [ actions.TABS_REOPEN]},
   { keys: [{ code: KeyboardEvent.DOM_VK_H }], action: [ actions.TABS_PREV, 1 ]},
   { keys: [{ code: KeyboardEvent.DOM_VK_L }], action: [ actions.TABS_NEXT, 1 ]},
 ]
diff --git a/src/background/tabs.js b/src/background/tabs.js
index 000bd7d..899284d 100644
--- a/src/background/tabs.js
+++ b/src/background/tabs.js
@@ -1,3 +1,23 @@
+const closeTab = (id) => {
+  browser.tabs.remove(id);
+};
+
+const reopenTab = () => {
+  browser.sessions.getRecentlyClosed({
+    maxResults: 1
+  }).then((sessions) => {
+    if (sessions.length === 0) {
+      return;
+    }
+    let session = sessions[0];
+    if (session.tab) {
+      browser.sessions.restore(session.tab.sessionId);
+    } else {
+      browser.sessions.restore(session.window.sessionId);
+    }
+  });
+};
+
 const selectPrevTab = (current, count) => {
   chrome.tabs.query({ currentWindow: true }, (tabs) => {
     if (tabs.length < 2) {
@@ -20,4 +40,4 @@ const selectNextTab = (current, count) => {
   });
 };
 
-export { selectNextTab, selectPrevTab };
+export { closeTab, reopenTab, selectNextTab, selectPrevTab };