qiguo_ganther - npm Package Compare versions

Comparing version 0.1.3 to 0.1.4

demo/tmall.js

@@ -7,3 +7,3 @@ var handle = require('../lib/handle.js');
 
-var rule = 'http://manage.tvall.cn:8888/api/manage/fetch_rule/list?skip=0&limit=10&keywords=&searchkey=&category=%7B%7D';
+// var rule = 'http://127.0.0.1:3000/api/mock/tb';
 var url = 'https://item.taobao.com/item.htm?id=520003539079';
@@ -15,3 +15,4 @@
 
-h.addRule({off:{type:"dom",args:["#J_RateCounter","text"]}});
+h.addRule({iiiiiiii:{type:"dom",args:["#J_RateCounter","text"]}});
+// h.addRule({on:{type:"dom",args:["#J_RateCounter","text"]}});
 // h.addRule({type:"dom",args:["#btn","text"]}, 'in');
@@ -18,0 +19,0 @@

lib/handle.js

@@ -23,3 +23,2 @@ var Rule = require('./rule.js')
   this.rule = rule || {};
-
   this.preProcessValue = null;
@@ -48,14 +47,28 @@ }
   },
+  _handleRule: function(){
+    var self = this;
+
+    if(/^http[s]*/.test(this.rule)){
+      console.log('http====');
+      var r = new Rule(this.rule);
+      return r._getRules();
+    }else{
+      return new Promise(function(resolve, reject){
+        resolve(self.rule);
+      });
+    }
+  },
   _mapHandle: function(value){
-    // try {
-    //   var valueObj = JSON.parse(value);
-    //   var type = valueObj.type;
-    // } catch (err) {
-    //   // console.log('err --->' , err);
-    //   return null;
-    // }
-    // if(!type) return null;
-    var valueObj = value;
-    var type = value.type;
-
+    if(util.isString(value)){
+      try {
+        var valueObj = JSON.parse(value);
+        var type = valueObj.type;
+      } catch (err) {
+        // console.log('err --->' , err);
+        return null;
+      }
+    }else{
+      var valueObj = value;
+      var type = value.type;
+    }
     for(var k in analyMap){
@@ -78,3 +91,5 @@ if(k === type){
     // console.log(rule);
-    this.rule = rule;
+    for(var key in rule){
+      this.rule[key] = rule[key];
+    }
   }
@@ -91,2 +106,3 @@ }
       // console.log(analy);
+      g.rule = yield g._handleRule();
       var api = {};
@@ -93,0 +109,0 @@ for(var key in g.rule){

lib/rule.js

@@ -5,3 +5,3 @@ var CurlHelp = require('./curl.js');
 
-function Rule(keywords, searchkey){
+function Rule(url){
   this.url = url;
@@ -15,2 +15,3 @@ }
       curl._get(self.url, function(err, res, body){
+        console.log(body);
         if(err) reject(err);
@@ -17,0 +18,0 @@ else resolve(JSON.parse(body));

package.json

 {
   "name": "qiguo_ganther",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "main": "./lib/handle.js",
@@ -5,0 +5,0 @@ "scripts": {

No alert changes

Improved metrics

Total package byte prevSize

124736

increased by0.32%

Lines of code

1228

increased by1.57%

No dependency changes