feat(new): 新增weibo/twitter的去除跳转，以及重构一些代码

axetroy · Nov 17, 2016 · cb07843 · cb07843
1 parent e60f34f
commit cb07843
Show file tree

Hide file tree

Showing 13 changed files with 631 additions and 293 deletions.
diff --git a/dist/anti-redirect.min.user.js b/dist/anti-redirect.min.user.js
diff --git a/dist/anti-redirect.user.js b/dist/anti-redirect.user.js
diff --git a/index.ts b/index.ts
@@ -7,6 +7,7 @@ import 'rxjs/add/operator/throttle';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/filter';
 import 'rxjs/add/operator/debounce';
+import 'rxjs/add/operator/debounceTime';
 import 'rxjs/add/operator/do';
 import 'rxjs/add/operator/mergeMap';
 import 'rxjs/add/operator/retry';
@@ -15,12 +16,16 @@ import 'rxjs/add/operator/delay';
 
 import baiduRedirect from './src/baidu';
 import googleRedirect from './src/google';
+import weboRedirect from './src/weibo';
+import twitterRedirect from './src/twitter';
 import soRedirect from './src/so';
 import zhihuRedirect from './src/zhihu';
 import zhihuDailyRedirect from './src/zhihu-daily';
 
 baiduRedirect.bootstrap();
 googleRedirect.bootstrap();
+weboRedirect.bootstrap();
+twitterRedirect.bootstrap();
 soRedirect.bootstrap();
 zhihuRedirect.bootstrap();
 zhihuDailyRedirect.bootstrap();

diff --git a/src/baidu.ts b/src/baidu.ts
@@ -11,18 +11,52 @@ function getText(htmlElement: HTMLElement): string {
   return htmlElement.innerText || htmlElement.textContent;
 }
 
+class Query {
+  object: any = {};
+
+  constructor(public queryStr: String) {
+    this.object = this.toObject(queryStr.replace(/^\?+/, ''));
+  }
+
+  toObject(queryStr: String) {
+    let obj = {};
+    queryStr.split('&').forEach((item)=> {
+      let arr = item.split('=') || [];
+      let key = arr[0] || '';
+      obj[key] = arr[1] || '';
+    });
+    return obj;
+  }
+
+  public toString(): String {
+    let arr = [];
+    for (let key in this.object) {
+      if (this.object.hasOwnProperty(key)) {
+        let value = this.object[key];
+        arr.push(key + '=' + value);
+      }
+    }
+    return '?' + arr.join('&');
+  }
+
+}
+
 class BaiduRedirect extends RedirectOnRequest {
   constructor(domainTester, urlTester, matcher, ASelector = 'a') {
     super(domainTester, urlTester, matcher, ASelector);
   }
 
   handlerAll(): void {
-    let skipArray: any[] = location.search.match(/pn=(\d+)/) || [''];
-    let skip: number = skipArray.length === 2 ? +skipArray[1] : 0;
-    const href: string = window.top.location.href;
-    if (!/www\.baidu\.com\/s/.test(href)) return;
-    let url: string = href.replace(/(\&)(tn=\w+)(\&)/img, '$1' + 'tn=baidulocal' + '$3') + `&timestamp=${new Date().getTime()}`;
-    if (url.indexOf('tn=baidulocal') === -1) url += '&tn=baidulocal';
+    if (!/www\.baidu\.com\/s/.test(window.top.location.href)) return;
+    const query = new Query(window.top.location.search);
+    const skip = query.object.pn || 0;
+
+    query.object.tn = 'baidulocal';
+    query.object.timestamp = new Date().getTime();
+    query.object.rn = 50;
+
+    const url: string = `${location.protocol}://${location.host + location.pathname + query}`;
+
     Observable.forkJoin(
       http.get(url),
       http.get(url.replace(/pn=(\d+)/, `pn=${skip + 10}`))
@@ -58,10 +92,6 @@ class BaiduRedirect extends RedirectOnRequest {
       });
   }
 
-  log(): void {
-    console.log('bootstrap baidu');
-  }
-
 }
 
 export default new BaiduRedirect(

diff --git a/src/google.ts b/src/google.ts
@@ -23,10 +23,6 @@ class GoogleRedirect extends RedirectOnUrl {
       });
   }
 
-  log() {
-    console.log('bootstrap google');
-  }
-
 }
 
 export default new GoogleRedirect(

diff --git a/src/redirect-on-request.ts b/src/redirect-on-request.ts
@@ -1,4 +1,5 @@
 import {Observable} from 'rxjs/Observable';
+import * as _ from 'underscore';
 import {http, Response$, timeout} from './http';
 import {CONFIG} from './config';
 
@@ -14,6 +15,7 @@ class RedirectOnRequest {
   public match: boolean;
   public DEBUG = DEBUG;
   public status: any = status;
+  public logCount: number = 0;
 
   constructor(public domainTester, public urlTester, public matcher, public ASelector = 'a') {
     this.match = domainTester.test(document.domain);
@@ -80,8 +82,17 @@ class RedirectOnRequest {
       .filter((ele: HTMLAnchorElement)=>ele.nodeName === 'A');
   }
 
-  log(str?: string): void {
-    console.log(str || 'boostrap anti-redirect');
+  log(project?: string): void {
+    if (this.logCount < 1) {
+      console.log(
+        "%c Anti-Redirect %c Copyright \xa9 2015-%s %s",
+        'font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;font-size:64px;color:#00bbee;-webkit-text-fill-color:#00bbee;-webkit-text-stroke: 1px #00bbee;',
+        "font-size:12px;color:#999999;",
+        (new Date).getFullYear(),
+        '\n' + (project || '')
+      );
+      this.logCount++;
+    }
   }
 
   bootstrap(): void {
@@ -107,8 +118,6 @@ class RedirectOnRequest {
       })
       .subscribe(()=> {
 
-        this.log();
-
         this.scroll().subscribe(()=> {
           this.handlerOneEleOneByOne();
         });
@@ -120,6 +129,8 @@ class RedirectOnRequest {
         this.handlerAll();
         this.handlerOneEleOneByOne();
 
+        this.log();
+
       });
   }
 }

diff --git a/src/redirect-on-url.ts b/src/redirect-on-url.ts
@@ -4,8 +4,10 @@ const DEBUG = CONFIG.debug;
 
 class RedirectOnUrl {
   public match: boolean = false;
+  public DEBUG: boolean = DEBUG;
+  public logCount: number = 0;
 
-  constructor(private domainTester, private urlTester, private matcher, private ASelector = 'a') {
+  constructor(public domainTester, public urlTester, public matcher, public ASelector = 'a') {
     this.match = domainTester.test(document.domain);
   }
 
@@ -25,48 +27,54 @@ class RedirectOnUrl {
       })
   }
 
-  scroll(): Observable<any> {
-    return Observable.fromEvent(document, 'mousemove')
-      .debounce(()=>Observable.timer(500))
+  scroll() {
+    return Observable.fromEvent(document, 'scroll')
+      .debounceTime(500)
       .flatMap(()=>Observable.from([].slice.call(document.querySelectorAll(this.ASelector))))
-      .do((aEle: HTMLAnchorElement)=> {
+      .subscribe((aEle: HTMLAnchorElement)=> {
         this.handlerOneEle(aEle).subscribe(function () {
         });
-      })
+      });
   }
 
   mouseover(): Observable<HTMLAnchorElement> {
     return Observable.fromEvent(document, 'mousemove')
-      .throttle(()=>Observable.timer(100))
+      .debounce(()=>Observable.timer(100))
       .map(function (event: any): HTMLElement {
         let target = event.target;
         return target.nodeName === 'A' ? target : target.parentNode.nodeName === 'A' ? target.parentNode : target;
       })
       .filter(function (ele: HTMLElement) {
-        return ele.nodeName === 'A'
-      })
-      .flatMap((aEle: HTMLAnchorElement)=>this.handlerOneEle(aEle))
+        return ele.nodeName === 'A';
+      });
   }
 
-  log(str?: string): void {
-    console.log(str || 'boostrap anti-redirect');
+  log(project?: string): void {
+    if (this.logCount < 1) {
+      console.log(
+        "%c Anti-Redirect %c Copyright \xa9 2015-%s %s",
+        'font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;font-size:64px;color:#00bbee;-webkit-text-fill-color:#00bbee;-webkit-text-stroke: 1px #00bbee;',
+        "font-size:12px;color:#999999;",
+        (new Date).getFullYear(),
+        '\n' + (project || '')
+      );
+      this.logCount++;
+    }
   }
 
   bootstrap(): void {
     if (!this.match) return;
     Observable.fromEvent(document, 'DOMContentLoaded')
-      .flatMap(()=>Observable.timer(1000))
+      .delay(300)
       .subscribe(()=> {
 
-        this.log();
-
-        this.scroll().subscribe(function () {
+        this.scroll();
 
+        this.mouseover().subscribe((aEle: HTMLAnchorElement)=> {
+          this.handlerOneEle(aEle)
         });
 
-        this.mouseover().subscribe(function () {
-
-        })
+        this.log();
 
       });
   }

diff --git a/src/so.ts b/src/so.ts
@@ -4,9 +4,6 @@ class SoRedirect extends RedirectOnUrl {
   constructor(domainTester, urlTester, matcher) {
     super(domainTester, urlTester, matcher);
   }
-  log() {
-    console.log('bootstrap 360 so');
-  }
 }
 
 export default new SoRedirect(

diff --git a/src/twitter.ts b/src/twitter.ts
@@ -0,0 +1,29 @@
+import {Observable} from 'rxjs/Observable';
+import {RedirectOnUrl} from './redirect-on-url';
+
+class TwitterRedirect extends RedirectOnUrl {
+  constructor(domainTester, urlTester, matcher) {
+    super(domainTester, urlTester, matcher);
+  }
+
+  handlerOneEle(aEle: HTMLAnchorElement): Observable<any> {
+    return Observable.of(aEle)
+      .filter((ele: HTMLAnchorElement)=> {
+        return this.urlTester.test(ele.href) && /^https?:\/\//.test(ele.title);
+      })
+      .do((aEle: HTMLAnchorElement)=> {
+        let url: string = decodeURIComponent(aEle.title);
+        if (url) {
+          aEle.href = url;
+          this.DEBUG && (aEle.style.backgroundColor = 'green');
+        }
+      })
+  }
+
+}
+
+export default new TwitterRedirect(
+  /twitter\.com/,
+  /t\.co\/\w+/,
+  null
+)
diff --git a/src/weibo.ts b/src/weibo.ts
@@ -0,0 +1,29 @@
+import {Observable} from 'rxjs/Observable';
+import {RedirectOnUrl} from './redirect-on-url';
+
+class WeiboRedirect extends RedirectOnUrl {
+  constructor(domainTester, urlTester, matcher) {
+    super(domainTester, urlTester, matcher);
+  }
+
+  handlerOneEle(aEle: HTMLAnchorElement): Observable<any> {
+    return Observable.of(aEle)
+      .filter((ele: HTMLAnchorElement)=> {
+        return this.urlTester.test(ele.href) && /^https?:\/\//.test(ele.title);
+      })
+      .do((aEle: HTMLAnchorElement)=> {
+        let url: string = decodeURIComponent(aEle.title);
+        if (url) {
+          aEle.href = url;
+          this.DEBUG && (aEle.style.backgroundColor = 'green');
+        }
+      })
+  }
+
+}
+
+export default new WeiboRedirect(
+  /weibo\.com/,
+  /t\.cn\/\w+/,
+  null
+)
diff --git a/src/zhihu-daily.ts b/src/zhihu-daily.ts
@@ -4,9 +4,6 @@ class ZhihuDailyRedirect extends RedirectOnUrl {
   constructor(domainTester, urlTester, matcher) {
     super(domainTester, urlTester, matcher);
   }
-  log() {
-    console.log('bootstrap zhihu daily');
-  }
 }
 
 export default new ZhihuDailyRedirect(

diff --git a/src/zhihu.ts b/src/zhihu.ts
@@ -4,9 +4,6 @@ class ZhihuRedirect extends RedirectOnUrl {
   constructor(domainTester, urlTester, matcher) {
     super(domainTester, urlTester, matcher);
   }
-  log() {
-    console.log('bootstrap zhihu');
-  }
 }
 
 export default new ZhihuRedirect(

diff --git a/webpack.config.js b/webpack.config.js
@@ -48,6 +48,8 @@ module.exports = {
 // @include           *www.so.com*
 // @include           *www.zhihu.com*
 // @include           *daily.zhihu.com*
+// @include           *weibo.com*
+// @include           *twitter.com*
 // @connect           *
 // @compatible        chrome  完美运行
 // @compatible        firefox  完美运行