use a more readable url scheme for the redirect mode; fix two small b…

…ugs in server.js and redirect.js
hgGeorg · Jul 22, 2014 · 6e5ebbd · 6e5ebbd
1 parent 98b7568
commit 6e5ebbd
Show file tree

Hide file tree

Showing 17 changed files with 11 additions and 27 deletions.
diff --git a/chrome/config.js b/chrome/config.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify
@@ -27,8 +26,9 @@
 var unblock_youku = unblock_youku || {};  // namespace
 
 // only for redirect mode
-unblock_youku.default_server = 'www.yōukù.com/proxy.php';
-unblock_youku.backup_server = 'bak.yōukù.com/proxy.php';
+unblock_youku.default_server = 'www.yōukù.com/proxy';
+// unblock_youku.default_server = '127.0.0.1:8888/proxy';
+unblock_youku.backup_server = 'bak.yōukù.com/proxy';
 
 unblock_youku.normal_url_list = unblock_youku.common_urls.concat(unblock_youku.chrome_extra_urls);
 unblock_youku.redirect_url_list = unblock_youku.common_urls;

diff --git a/chrome/content/links.js b/chrome/content/links.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/chrome/content/play.baidu.css b/chrome/content/play.baidu.css
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/chrome/content/play.baidu.js b/chrome/content/play.baidu.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/chrome/content/tudou.js b/chrome/content/tudou.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/chrome/header.js b/chrome/header.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/chrome/pages/css/popup.css b/chrome/pages/css/popup.css
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/chrome/pages/js/analytics.js b/chrome/pages/js/analytics.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/chrome/pages/js/options.js b/chrome/pages/js/options.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/chrome/pages/js/popup.js b/chrome/pages/js/popup.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/chrome/proxy.js b/chrome/proxy.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/chrome/redirect.js b/chrome/redirect.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify
@@ -18,15 +17,10 @@
 
 /*jslint browser: true */
 /*global chrome: false, unblock_youku: false, btoa: false */
-/*global ga_report_error */
+/*global ga_report_error: false, string_starts_with: false */
 "use strict";
 
 
-function urlsafe_b64encode(str) {
-    return btoa(str).replace('+', '-').replace('/', '_');
-}
-
-
 function http_redirector(details) {
     console.log('original url: ' + details.url);
     if (details.url.slice(-15) === 'crossdomain.xml') {
@@ -59,7 +53,11 @@ function http_redirector(details) {
     }
 
     //var redirect_url = 'http://127.0.0.1.xip.io:8080/?url=' + urlsafe_b64encode(details.url);
-    redirect_url = 'http://' + backend_server + '?url=' + urlsafe_b64encode(details.url);
+    if (string_starts_with(details.url, 'http://')) {
+        redirect_url = 'http://' + backend_server + '/http/' + details.url.substring('http://'.length);
+    } else if (string_starts_with(details.url, 'https://')) {
+        redirect_url = 'http://' + backend_server + '/https/' + details.url.substring('https://'.length);
+    }
     console.log('redirect url: ' + redirect_url);
 
     if (redirect_url !== null) {
@@ -79,7 +77,7 @@ function check_redirect_server(server_addr, success_callback, failure_callback)
         failure_callback('Timeout');
     }, 10000);  // 10s
 
-    xhr.open('GET', 'http://' + server_addr.match(/^(.[^:\/]+)/)[1] + '/status', true);
+    xhr.open('GET', 'http://' + server_addr.match(/^(.[^\/]+)/)[1] + '/status', true);
     xhr.timeout = 12000; // 12s
     xhr.onreadystatechange = function() {
         if (xhr.readyState === 4) {

diff --git a/chrome/storage.js b/chrome/storage.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/server/server.js b/server/server.js
@@ -247,7 +247,7 @@ if (cluster.isMaster) {
         console.log(('Using the backup proxy: ' + opts.bak_proxy).green);
     }
     if (opts.pac_proxy) {
-        console.log(('The PAC file uses the proxy: ' + opts.bak_proxy).green);
+        console.log(('The PAC file uses the proxy: ' + opts.pac_proxy).green);
     }
 
 } else if (cluster.isWorker) {

diff --git a/server/utils.js b/server/utils.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/shared/tools.js b/shared/tools.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2014  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify

diff --git a/shared/urls.js b/shared/urls.js
@@ -1,5 +1,4 @@
 /*
- * Allow you smoothly surf on many websites blocking non-mainland visitors.
  * Copyright (C) 2012 - 2013  Bo Zhu  http://zhuzhu.org
  *
  * This program is free software: you can redistribute it and/or modify