Skip to content

Commit faea7d3

Browse files
committed
blocked youtube temporarily to add life time of siteproxy.herkoapp.com
1 parent f551b49 commit faea7d3

File tree

7 files changed

+22
-13
lines changed

7 files changed

+22
-13
lines changed

Proxy.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ let getHostFromReq = (req) => { //return target
7979
}
8080

8181

82-
let Proxy = ({urlModify, httpprefix, serverName, port, cookieDomainRewrite, locationReplaceMap302, regReplaceMap, siteSpecificReplace, pathReplace}) => {
82+
let Proxy = ({blockedSites, urlModify, httpprefix, serverName, port, cookieDomainRewrite, locationReplaceMap302, regReplaceMap, siteSpecificReplace, pathReplace}) => {
8383
let handleRespond = ({req, res, body, gbFlag}) => {
8484
// logSave("res from proxied server:", body);
8585
let myRe
@@ -330,6 +330,13 @@ let Proxy = ({urlModify, httpprefix, serverName, port, cookieDomainRewrite, loca
330330
let fwdStr = req.headers['X-Forwarded-For'] || req.headers['x-forwarded-for']
331331

332332
let {host, httpType} = getHostFromReq(req)
333+
for (let i=0; i<blockedSites.length; i++) {
334+
let site = blockedSites[i]
335+
if (site === host) {
336+
res.status(404).send(`{"blockedSite":true}`)
337+
return
338+
}
339+
}
333340
console.log(`httpType:${httpType}, host:${host}`)
334341
if (host.indexOf(serverName) !== -1 || // we cannot request resource from proxy itself
335342
host == '' || host.indexOf('.') === -1 || (fwdStr && fwdStr.split(',').length > 3)) { // too many forwardings

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ user browser +-------------->+ siteproxy +-------> wikipedia
4747
5. now
4848
6. find your domain name from now cli, then replace serverName in 'config.js', like:
4949
serverName: 'siteproxy.herokuapp.com' ====> 'your-domain-name.now.sh'
50-
7. now --prod
51-
8. done
50+
7. change "blockedSites = ['www.youtube.com', 'm.youtube.com']" ====> "blockedSites = []" if you want to support youtube
51+
8. now --prod
52+
9. done
5253
```
5354
## Telegram群: @siteproxy
5455

api/main.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ const fs = require('fs')
22
const path = require('path')
33
var Proxy = require('../Proxy')
44

5-
let { urlModify, httpprefix, serverName, port, locationReplaceMap302, regReplaceMap, siteSpecificReplace, pathReplace } = require('../config')
5+
let { blockedSites, urlModify, httpprefix, serverName, port, locationReplaceMap302, regReplaceMap, siteSpecificReplace, pathReplace } = require('../config')
66

77
let cookieDomainRewrite = serverName
88

9-
let proxy = Proxy({ urlModify, httpprefix, serverName, port, cookieDomainRewrite, locationReplaceMap302, regReplaceMap, siteSpecificReplace, pathReplace })
9+
let proxy = Proxy({ blockedSites, urlModify, httpprefix, serverName, port, cookieDomainRewrite, locationReplaceMap302, regReplaceMap, siteSpecificReplace, pathReplace })
1010
export default (req, res) => {
1111
const dirPath = path.join(__dirname + '/..', req.url)
1212
console.log(`x-forward-for:${req.headers['x-forwarded-for']}, req.url:${req.url}`)

config.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ let config = {
1111
httpprefix: 'https', port: 443,
1212
serverName: 'siteproxy.herokuapp.com',
1313
}
14+
let blockedSites = ['www.youtube.com', 'm.youtube.com', 'merlinblog.xyz']
15+
1416
if (process.env.herokuAddr) {
1517
config.serverName = process.env.herokuAddr
1618
}
@@ -209,4 +211,4 @@ const siteSpecificReplace = {
209211
}
210212
}
211213

212-
module.exports = { urlModify, httpprefix, serverName, port, locationReplaceMap302, regReplaceMap, siteSpecificReplace, pathReplace }
214+
module.exports = { blockedSites, urlModify, httpprefix, serverName, port, locationReplaceMap302, regReplaceMap, siteSpecificReplace, pathReplace }

index.html

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,9 @@
3232
<br />
3333
<div class="descriptionSeg">4.由于从本代理发出的Google请求过多, google会自动限制搜索流量; 如果google不能用,请使用bing和yahoo搜索引擎. </div>
3434
<br />
35-
<div class="descriptionSeg">5.使用手机打开youtube时, 页面顶端有一个搜索条, 可以中文搜索. </div>
35+
<div class="descriptionSeg">5. Youtube的代理暂时关闭了, 以尽量延长本代理生命时间</div>
3636
<br />
37-
<div class="descriptionSeg">6.请降低youtube视频的分辨率,因为免费服务器每月的流量非常非常有限, 超过的话其他人都无法使用了 </div>
38-
<br />
39-
<div class="descriptionSeg">7.请登录telegram,加群@siteproxy,以便及时获取更新</div>
37+
<div class="descriptionSeg">6.请登录telegram,加群@siteproxy,以便及时获取更新</div>
4038
<form class="lead-title">
4139
<p>指定网址:<input class="lead-title" type="text" id="address" value="https://www.google.com">
4240
<input id="addrAccess" class="lead-title button1" type="button" onclick="onsubmit" value="访问网站"/>

index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ const path = require('path')
33
const fs = require('fs')
44
let app = express()
55
var Proxy = require('./Proxy')
6-
let { urlModify, httpprefix, serverName, port, locationReplaceMap302, regReplaceMap, siteSpecificReplace, pathReplace } = require('./config')
6+
let { blockedSites, urlModify, httpprefix, serverName, port, locationReplaceMap302, regReplaceMap, siteSpecificReplace, pathReplace } = require('./config')
77

88
let cookieDomainRewrite = serverName
9-
let proxy = Proxy({ urlModify, httpprefix, serverName, port, cookieDomainRewrite, locationReplaceMap302, regReplaceMap, siteSpecificReplace, pathReplace})
9+
let proxy = Proxy({ blockedSites, urlModify, httpprefix, serverName, port, cookieDomainRewrite, locationReplaceMap302, regReplaceMap, siteSpecificReplace, pathReplace})
1010

1111
const middle1 = (req, res, next) => {
1212
console.log(`req.url:${req.url}`)

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"test": "jest",
88
"localtest": "localFlag=true jest",
99
"start": "node --tls-min-v1.0 index.js",
10-
"localstart": "localFlag=true node --tls-min-v1.0 index.js"
10+
"localstartNow": "localFlag=true node --tls-min-v1.0 index.js",
11+
"localstart": "PORT=8011 localFlag=true heroku local web"
1112
},
1213
"keywords": [],
1314
"author": "netptop",

0 commit comments

Comments
 (0)