From 2cbcae69512b711f4801898d1426f1704f64c64d Mon Sep 17 00:00:00 2001
From: jebbs <qjebbs@gmail.com>
Date: Wed, 23 May 2018 11:28:17 +0800
Subject: [PATCH] message identities optimize

---
 scripts/background.js |  2 +-
 scripts/content.js    | 16 ++++++----------
 scripts/extract.js    |  8 ++++----
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/scripts/background.js b/scripts/background.js
index 294ee46..1de7855 100644
--- a/scripts/background.js
+++ b/scripts/background.js
@@ -1,5 +1,5 @@
 chrome.runtime.onMessage.addListener(function (message, sender, sendResponse) {
-    if (message.from === "doExtractRequest")
+    if (message.from === "DataExtracter:Extract")
         extract(...message.args).catch(
             err => {
                 console.log(err);
diff --git a/scripts/content.js b/scripts/content.js
index f7fce18..03c9385 100644
--- a/scripts/content.js
+++ b/scripts/content.js
@@ -1,19 +1,14 @@
 chrome.runtime.onMessage.addListener(
     function (request, sender, sendResponse) {
         // console.log(request);
-        if (request.from == "doExtractRequest") {
-            // console.log(request);
+        if (request.from == "DataExtracter:Extract") {
             let data = extractData(request.itemsSelector, request.fieldSelectors);
-            // console.log(data);
             if (sendResponse) sendResponse(data);
-        } else if (request.from == "doExtractGotoUrl") {
-            // console.log(request);
+        } else if (request.from == "DataExtracter:GotoUrl") {
             window.location.replace(request.url);
-        } else if (request.from == "doExtractReportIn") {
-            // console.log("doExtractReportIn");
+        } else if (request.from == "DataExtracter:ReportIn") {
             if (sendResponse) sendResponse(request.from);
-        } else if (request.from == "doExtractQueryUrl") {
-            // console.log("doExtractReportIn");
+        } else if (request.from == "DataExtracter:QueryUrl") {
             if (sendResponse) sendResponse(window.location.href);
         }
     }
@@ -29,6 +24,7 @@ function extractData(itemsSelector, fieldSelectors) {
 
 function extract(...args) {
     let sig = `Invalid call args.
+
 function extract(itemsSelector:string, fieldSelectors:string[])
 function extract(itemsSelector:string, fieldSelectors:string[], url:string, from:number, to:number, interval:number)
 function extract(itemsSelector:string, fieldSelectors:string, url:string, pages:number[])`;
@@ -41,7 +37,7 @@ function extract(itemsSelector:string, fieldSelectors:string, url:string, pages:
         return;
     }
     let message = {
-        from: "doExtractRequest",
+        from: "DataExtracter:Extract",
         args: args
     }
     chrome.runtime.sendMessage(message, r => {
diff --git a/scripts/extract.js b/scripts/extract.js
index 7fe670e..4f8f23b 100644
--- a/scripts/extract.js
+++ b/scripts/extract.js
@@ -55,7 +55,7 @@ function redirectTab(tab, url) {
             if (url !== u) {
                 curUrl = u;
                 let req = {
-                    from: "doExtractGotoUrl",
+                    from: "DataExtracter:GotoUrl",
                     url: url
                 }
                 chrome.tabs.sendMessage(tab.id, req);
@@ -67,7 +67,7 @@ function redirectTab(tab, url) {
 
 function extractData(tab, itemsSelector, fieldSelectors) {
     let req = {
-        from: "doExtractRequest",
+        from: "DataExtracter:Extract",
         itemsSelector: itemsSelector,
         fieldSelectors: fieldSelectors
     }
@@ -78,7 +78,7 @@ function extractData(tab, itemsSelector, fieldSelectors) {
 
 function reportIn(tab) {
     let req = {
-        from: "doExtractReportIn"
+        from: "DataExtracter:ReportIn"
     }
     let failMsg = "reportIn failed after 10 second.";
     let cond = r => r == req.from;
@@ -87,7 +87,7 @@ function reportIn(tab) {
 
 function queryUrl(tab, urlExcluded) {
     let req = {
-        from: "doExtractQueryUrl"
+        from: "DataExtracter:QueryUrl"
     }
     let failMsg = "queryUrl failed after 10 second.";
     let cond = url => url && (!urlExcluded || (urlExcluded && urlExcluded != url));