From d5ce8f93394d4373f847254b3473156ee1d3edf0 Mon Sep 17 00:00:00 2001 From: shaoying Date: Wed, 1 Jul 2020 09:58:20 +0800 Subject: [PATCH] opt chrome --- chrome/chrome.js | 114 ++++++----------------------------------------- publish/order.js | 37 +++++++++------ 2 files changed, 38 insertions(+), 113 deletions(-) diff --git a/chrome/chrome.js b/chrome/chrome.js index 140e559f..6fb52702 100644 --- a/chrome/chrome.js +++ b/chrome/chrome.js @@ -1,12 +1,5 @@ var can = Volcanos("chrome", { - _send: function(msg, cb) {chrome.extension.sendRequest(msg, cb)}, - _open: function(url) {chrome.windows.create({url: url})}, - - open: function(msg, cmd, cb) { - chrome.windows.create({url: cmd[0]}) - typeof cb == "function" && cb(msg) - }, - wins: function(msg, cmd, cb) { + chrome: function(msg, cmd, cb) { if (cmd.length == 0) { // 窗口列表 chrome.windows.getAll(function(wins) { @@ -17,86 +10,23 @@ var can = Volcanos("chrome", { }) return } - - if (cmd.length > 1) { - // 新建标签 - chrome.tabs.create({windowId: parseInt(cmd[0]), url: cmd[1], selected: false}, function() { - can.wins(msg, [cmd[0]], cb) - }) - return - } - - // 标签列表 - chrome.tabs.getAllInWindow(parseInt(cmd[0]), function(tabs) { - can.core.List(tabs, function(tab) {tab.tid = tab.id - msg.Push(tab, ["tid", "active", "width", "height", "index", "title", "url"]) - }) - typeof cb == "function" && cb(msg) - }) - }, - tabs: function(msg, cmd, cb) { - if (cmd.length == 0) { - chrome.tabs.getAllInWindow(function(tabs) { - can.core.List(tabs, function(tab) { - msg.Push("id", tab.id) - msg.Push("active", tab.active) - msg.Push("index", tab.index) - msg.Push("title", tab.title) - msg.Push("url", tab.url) + if (cmd.length == 1) { + // 标签列表 + chrome.tabs.getAllInWindow(parseInt(cmd[0]), function(tabs) { + can.core.List(tabs, function(tab) {tab.tid = tab.id + msg.Push(tab, ["tid", "active", "width", "height", "index", "title", "url"]) }) typeof cb == "function" && cb(msg) }) return } - chrome.tabs[cmd[1]](parseInt(cmd[0]), cb) - }, - cookie: function(msg, cmd, cb) { - if (cmd[0] == "modify") {var data = {}; data[cmd[1]] = cmd[2] - chrome.bookmarks.update(cmd[4], data, function() { - typeof cb == "function" && cb(msg) - }) - return - } else if (cmd[0] == "delete") { - chrome.bookmarks.remove(cmd[2], function() { - typeof cb == "function" && cb(msg) - }) - return - } else if (cmd.length > 2) { - chrome.bookmarks.create({parentId: cmd[0], url: cmd[1], title: cmd[2], index: cmd[3]||0}, cb) - } - - chrome.cookies.getAll({name: ""}, function(cs) { - typeof cb == "function" && cb(msg) - }) - }, - history: function(msg, cmd, cb) { - chrome.tabs.getAllInWindow(function(tabs) { - can.core.List(tabs, function(tab) { - msg.Push("id", tab.id) - msg.Push("active", tab.active) - msg.Push("index", tab.index) - msg.Push("title", tab.title) - msg.Push("url", tab.url) - }) - typeof cb == "function" && cb(msg) + // 新建标签 + chrome.tabs.create({windowId: parseInt(cmd[0]), url: cmd[1], selected: false}, function() { + can.chrome(msg, [cmd[0]], cb) }) }, bookmark: function(msg, cmd, cb) { - if (cmd[0] == "modify") {var data = {}; data[cmd[1]] = cmd[2] - chrome.bookmarks.update(cmd[4], data, function() { - typeof cb == "function" && cb(msg) - }) - return - } else if (cmd[0] == "delete") { - chrome.bookmarks.remove(cmd[2], function() { - typeof cb == "function" && cb(msg) - }) - return - } else if (cmd.length > 2) { - chrome.bookmarks.create({parentId: cmd[0], url: cmd[1], title: cmd[2], index: cmd[3]||0}, cb) - } - chrome.bookmarks.getSubTree(cmd[0]||"0", function(labs) { for (var i = 0; i < labs.length; i++) {labs[i].pid = labs[i].parentId msg.Push("time", can.base.Time(labs[i].dateAdded)) @@ -111,11 +41,8 @@ var can = Volcanos("chrome", { message: message, title: title||"volcanos", iconUrl: "/favicon.ico", type: "basic", })}, - can.run = function(event, cmd, cb, silent) { var msg = can.request(event) - can.misc.Run(event, can, {names: "code/chrome/crx"}, cmd, cb) - }, can.misc.WSS(can, "ws://localhost:9020/space/", {name: "chrome", type: "chrome"}, function(event, msg) { - if (msg.Option("_handle")) {return can.user.toast(msg.result.join(""))} + if (msg.Option("_handle")) { return can.user.toast(msg.result.join("")) } can.user.toast(msg.detail.join(" ")) switch (msg.detail[0]) { @@ -128,24 +55,11 @@ var can = Volcanos("chrome", { msg.Reply(msg) }, function() {can.user.toast("wss connect", "iceberg")}) + can.run = function(event, cmd, cb, silent) { var msg = can.request(event) + can.misc.Run(event, can, {names: "code/chrome/crx"}, cmd, cb) + }, chrome.history.onVisited.addListener(function(item) { - can.run({}, ["history", item.id, item.title, item.url], function(msg) { - // can.user.toast(item.url, item.title) - }) - }) - - return - - chrome.bookmarks.onCreated.addListener(function(id, item) { - chrome.bookmarks.get(item.parentId, function(root) { - can.run(can, {cmd: ["bookmark", item.id, item.url, item.title, root[0].title]}, function(msg) { - can.user.toast(item.url, item.title) - }) - }) - }) - - chrome.extension.onRequest.addListener(function(msg, sender, cb) { - can.run(can, msg, cb) + can.run({}, ["history", item.id, item.title, item.url]) }) }) diff --git a/publish/order.js b/publish/order.js index 4c2851c1..22a54fa4 100644 --- a/publish/order.js +++ b/publish/order.js @@ -1,30 +1,41 @@ Volcanos("onengine", { river: { "main": {name: "main", storm: { - "main": {name: "main", index: [ + "inner": {name: "inner", index: [ "web.code.inner", "web.code.git.status", "web.code.git.total", ]}, - "task": {name: "task", index: [ - "web.team.plan", - "web.wiki.draw.draw", - "web.wiki.word", - ]}, - "relay": {name: "relay", index: [ - "aaa.totp.get", - "web.route", - ]}, - "性能": {name: "性能", index: [ + "pprof": {name: "pprof", index: [ "web.code.pprof", "web.code.bench", "web.favor", "web.cache", "web.share", ]}, - "wiki": {name: "wiki", index: [ - // "web.wiki.draw.draw", + "relay": {name: "relay", index: [ + "aaa.totp.get", + "web.route", + "web.space", + "web.dream", + "web.code.docker.container", + "web.code.tmux.session", + ]}, + "office": {name: "office", index: [ + "web.team.plan", "web.wiki.feel", "web.wiki.data", + "web.wiki.word", + "web.wiki.draw.draw", + ]}, + "docker": {name: "docker", index: [ + "web.code.docker.image", + "web.code.docker.container", + "web.code.docker.command", + ]}, + "tmux": {name: "tmux", index: [ + "web.code.tmux.text", + "web.code.tmux.buffer", + "web.code.tmux.session", ]}, }}, }, })