Skip to content

Commit 17bced7

Browse files
Peter XiePeter Xie
Peter Xie
authored and
Peter Xie
committed
v0.8.50
1 parent a17ab47 commit 17bced7

File tree

11 files changed

+46
-31
lines changed

11 files changed

+46
-31
lines changed

‎app/proxyServer.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@ const getPac = ( hostIp: string, port: number, http: boolean, sock5: boolean ) =
375375

376376

377377
export class proxyServer {
378-
public UdpServer = new Socks.UdpDgram ()
379378
private hostLocalIpv4: { network: string, address: string } []= []
380379
private hostLocalIpv6: string = null
381380
private hostGlobalIpV4: string = null

‎app/public/scripts/home.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ const infoDefine = [
414414
detail: '当您使用我们的服务时，我们为了计费处理会自动收集非常有限的数据流量信息，并存储到服务器日志中。数据流量信息仅用于计算客户应支付通讯费用而收集的，它收集的数据是：日期，用户帐号，所使用的代理区域和代理服务器IP，数据包大小，下载或上传。例如：'
415415
}, {
416416
header: null,
417-
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
417+
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], francisco, 104.236.162.139, 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
418418
},
419419
{
420420
header: null,
@@ -947,7 +947,7 @@ const infoDefine = [
947947
detail: 'お客様がQTGateサービスをご利用になる際に、お客様のデータ通信料計算のために、ご利用データ量が自動的に収集および保存されます。限られたログは以下のようです。日付、お客様アカウント、ご利用ゲットウェーエリアとゲットウェーIPアドレス、データ量、アップ又はダウンロード。例：'
948948
}, {
949949
header: null,
950-
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
950+
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], francisco, 104.236.162.139, 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
951951
}, {
952952
header: null,
953953
detail: 'QTGateは以上の情報以外には保存することしません。QTGateは以上の情報をカナダーの裁判所命令を持つカナダの法執行機関に協力することがありえます。カナダ以外のこのログ情報を協力する要請のあなたは、まずカナダ外務省までお問い合わせ下さい：'
@@ -1364,7 +1364,7 @@ const infoDefine = [
13641364
detail: 'In connection with your use of the Services, we may send you service announcements, administrative messages, and other information. You may opt out of some of those communications. When you use our services, for calculating communication charges we automatically collect and store communication data in server logs. The logs will limited as: Date footprinting, user account, used gateway region, used gateway ip address, package byte, Ingress or Egress. For example:'
13651365
}, {
13661366
header: null,
1367-
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
1367+
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], francisco, 104.236.162.139, 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
13681368
},
13691369
{
13701370
header: null,
@@ -1773,7 +1773,7 @@ const infoDefine = [
17731773
detail: '當您使用我們的服務時，我們為了計費處理會自動收集非常有限的數據流量信息，並存儲到伺服器日誌中。數據流量信息僅用於計算客戶應支付通訊費用而收集的，它收集的數據是：日期，用戶帳號，所使用的代理服務區域和代理伺服器IP，數據包大小，下載或上傳。例如：'
17741774
}, {
17751775
header: null,
1776-
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
1776+
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], francisco, 104.236.162.139, 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
17771777
}, {
17781778
header: null,
17791779
detail: 'QTGate沒有保存除了以上信息以外的任何其他信息。我們會配合並向持有加拿大法院令的執法機構提供此日誌文件。如果您是加拿大以外地區的執法機構，有這方面信息披露的需求，請通過加拿大外交部來聯繫我們：'

‎app/public/scripts/home.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ const infoDefine = [
463463
detail: '当您使用我们的服务时，我们为了计费处理会自动收集非常有限的数据流量信息，并存储到服务器日志中。数据流量信息仅用于计算客户应支付通讯费用而收集的，它收集的数据是：日期，用户帐号，所使用的代理区域和代理服务器IP，数据包大小，下载或上传。例如：'
464464
},{
465465
header: null,
466-
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
466+
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], francisco, 104.236.162.139, 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
467467
},
468468
{
469469
header: null,
@@ -1015,7 +1015,7 @@ const infoDefine = [
10151015
detail: 'お客様がQTGateサービスをご利用になる際に、お客様のデータ通信料計算のために、ご利用データ量が自動的に収集および保存されます。限られたログは以下のようです。日付、お客様アカウント、ご利用ゲットウェーエリアとゲットウェーIPアドレス、データ量、アップ又はダウンロード。例：'
10161016
},{
10171017
header: null,
1018-
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
1018+
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], francisco, 104.236.162.139, 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
10191019
}, {
10201020
header: null,
10211021
detail: 'QTGateは以上の情報以外には保存することしません。QTGateは以上の情報をカナダーの裁判所命令を持つカナダの法執行機関に協力することがありえます。カナダ以外のこのログ情報を協力する要請のあなたは、まずカナダ外務省までお問い合わせ下さい：'
@@ -1446,7 +1446,7 @@ const infoDefine = [
14461446
detail: 'In connection with your use of the Services, we may send you service announcements, administrative messages, and other information. You may opt out of some of those communications. When you use our services, for calculating communication charges we automatically collect and store communication data in server logs. The logs will limited as: Date footprinting, user account, used gateway region, used gateway ip address, package byte, Ingress or Egress. For example:'
14471447
}, {
14481448
header: null,
1449-
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
1449+
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], francisco, 104.236.162.139, 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
14501450
},
14511451
{
14521452
header: null,
@@ -1872,7 +1872,7 @@ const infoDefine = [
18721872
detail: '當您使用我們的服務時，我們為了計費處理會自動收集非常有限的數據流量信息，並存儲到伺服器日誌中。數據流量信息僅用於計算客戶應支付通訊費用而收集的，它收集的數據是：日期，用戶帳號，所使用的代理服務區域和代理伺服器IP，數據包大小，下載或上傳。例如：'
18731873
},{
18741874
header: null,
1875-
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
1875+
detail: '<p class="tag info">06/20/2017 18:12:16, [email protected], francisco, 104.236.162.139, 300322 byte up, 482776323 byte down.</p><p class="tag info">06/21/2017 12:04:18, [email protected], francisco, 104.236.162.139, 1435226 byte up, 11782238 byte down.</p>'
18761876
},{
18771877
header: null,
18781878
detail: 'QTGate沒有保存除了以上信息以外的任何其他信息。我們會配合並向持有加拿大法院令的執法機構提供此日誌文件。如果您是加拿大以外地區的執法機構，有這方面信息披露的需求，請通過加拿大外交部來聯繫我們：'

‎app/server.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const Net = require("net");
2929
const Imap = require("./imap");
3030
const freePort = require("portastic");
3131
const Stream = require("stream");
32-
const DEBUG = false;
32+
const DEBUG = true;
3333
const openpgp = require('openpgp');
3434
const Express = require('express');
3535
const cookieParser = require('cookie-parser');

‎app/server.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import * as freePort from 'portastic'
3131
import * as prosyServer from './proxyServer'
3232
import * as Stream from 'stream'
3333

34-
const DEBUG = false
34+
const DEBUG = true
3535

3636
const openpgp = require ( 'openpgp' )
3737
const Express = require ( 'express' )

‎app/socket5ForiOpn.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,12 @@ export class socks5 {
130130

131131
})
132132
}
133-
133+
/*
134134
private udpProcess ( data: Rfc1928.Requests ) {
135135
data.REP = Rfc1928.Replies.GRANTED
136-
data.port = this.proxyServer.UdpServer.port
137136
return this.socket.write ( data.buffer )
138137
}
139-
138+
*/
140139
private connectStat2 ( data: Buffer ) {
141140

142141
const req = new Rfc1928.Requests ( data )
@@ -180,7 +179,7 @@ export class socks5 {
180179
return this.closeSocks5 ( req.buffer )
181180
}
182181
if ( this.cmd === Rfc1928.CMD.UDP_ASSOCIATE )
183-
return this.udpProcess ( req )
182+
return console.log ('')
184183
return this.connectStat2_after ( req )
185184
}
186185

@@ -329,5 +328,3 @@ export class UdpDgram {
329328
this.createDgram ()
330329
}
331330
}
332-
333-
const uu = new UdpDgram ()

‎app/util.js‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ const saveLog = (log) => {
3333
});
3434
};
3535
const hideWindowDownload = (downloadUrl, saveFilePath, Callback) => {
36+
saveLog(`hideWindowDownload downloadUrl [${downloadUrl}] saveFilePath [${saveFilePath}]`);
3637
return remote.getCurrentWindow().hideWindowDownload(downloadUrl, saveFilePath, Callback);
3738
};
3839
const checkUpdateFolder = (updateFolder, CallBack) => {
@@ -69,10 +70,18 @@ const getDownloadFiles = (name, assets, CallBack) => {
6970
const downloadFiles = [];
7071
switch (process.platform) {
7172
case 'win32': {
72-
downloadFiles.push('RELEASES');
73-
downloadFiles.push(`qtgate-${verName}-delta.nupkg`);
74-
downloadFiles.push(`qtgate.Setup.${verName}.exe`);
75-
downloadFiles.push(`qtgate-${verName}-full.nupkg`);
73+
if (Os.arch() === 'ia32') {
74+
downloadFiles.push('RELEASES.ia32');
75+
downloadFiles.push(`qtgate-${verName}-delta.ia32.nupkg`);
76+
downloadFiles.push(`qtgate.Setup.${verName}.ia32.exe`);
77+
downloadFiles.push(`qtgate-${verName}-full.ia32.nupkg`);
78+
}
79+
else {
80+
downloadFiles.push('RELEASES');
81+
downloadFiles.push(`qtgate-${verName}-delta.nupkg`);
82+
downloadFiles.push(`qtgate.Setup.${verName}.exe`);
83+
downloadFiles.push(`qtgate-${verName}-full.nupkg`);
84+
}
7685
break;
7786
}
7887
case 'darwin': {
@@ -86,7 +95,7 @@ const getDownloadFiles = (name, assets, CallBack) => {
8695
}
8796
saveLog(`downloadFiles = ${downloadFiles} `);
8897
return Async.eachSeries(downloadFiles, (n, next) => {
89-
return hideWindowDownload(getUrlFromAssets(n, assets), Path.join(updateFolder, n), next);
98+
return hideWindowDownload(getUrlFromAssets(n, assets), Path.join(updateFolder, n.replace(/.ia32/, '')), next);
9099
}, CallBack);
91100
});
92101
};

‎app/util.ts‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ const saveLog = ( log: string ) => {
3434
}
3535

3636
const hideWindowDownload = ( downloadUrl, saveFilePath, Callback ) => {
37+
saveLog (`hideWindowDownload downloadUrl [${ downloadUrl }] saveFilePath [${ saveFilePath }]`)
3738
return remote.getCurrentWindow().hideWindowDownload ( downloadUrl, saveFilePath, Callback )
3839
}
3940

@@ -63,6 +64,7 @@ const getUrlFromAssets = ( fileName: string, assets: any[] ) => {
6364
}
6465

6566
const getDownloadFiles = ( name: string, assets: any[], CallBack ) => {
67+
6668
const updateFolder = Path.join ( QTGateFolder, name )
6769
const verName = name.substr (1)
6870

@@ -74,10 +76,17 @@ const getDownloadFiles = ( name: string, assets: any[], CallBack ) => {
7476
const downloadFiles: string[] = []
7577
switch ( process.platform ) {
7678
case 'win32': {
77-
downloadFiles.push ( 'RELEASES' )
78-
downloadFiles.push ( `qtgate-${ verName }-delta.nupkg` )
79-
downloadFiles.push ( `qtgate.Setup.${ verName }.exe` )
80-
downloadFiles.push ( `qtgate-${ verName }-full.nupkg` )
79+
if ( Os.arch() === 'ia32') {
80+
downloadFiles.push ( 'RELEASES.ia32' )
81+
downloadFiles.push ( `qtgate-${ verName }-delta.ia32.nupkg` )
82+
downloadFiles.push ( `qtgate.Setup.${ verName }.ia32.exe` )
83+
downloadFiles.push ( `qtgate-${ verName }-full.ia32.nupkg` )
84+
} else {
85+
downloadFiles.push ( 'RELEASES' )
86+
downloadFiles.push ( `qtgate-${ verName }-delta.nupkg` )
87+
downloadFiles.push ( `qtgate.Setup.${ verName }.exe` )
88+
downloadFiles.push ( `qtgate-${ verName }-full.nupkg` )
89+
}
8190
break
8291
}
8392
case 'darwin': {
@@ -90,8 +99,8 @@ const getDownloadFiles = ( name: string, assets: any[], CallBack ) => {
9099
}
91100
}
92101
saveLog ( `downloadFiles = ${ downloadFiles } `)
93-
return Async.eachSeries ( downloadFiles, ( n, next ) => {
94-
return hideWindowDownload ( getUrlFromAssets ( n, assets ), Path.join ( updateFolder, n ), next )
102+
return Async.eachSeries ( downloadFiles, ( n: string, next ) => {
103+
return hideWindowDownload ( getUrlFromAssets ( n, assets ), Path.join ( updateFolder, n.replace ( /.ia32/,'' ) ), next )
95104
}, CallBack )
96105

97106
})

‎index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* limitations under the License.
1717
*/
1818
Object.defineProperty(exports, "__esModule", { value: true });
19-
const DEBUG = false;
19+
const DEBUG = true;
2020
const Fs = require("fs");
2121
const Os = require("os");
2222
const path_1 = require("path");

‎index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
const DEBUG = false
18+
const DEBUG = true
1919

2020
import * as Fs from 'fs'
2121
import * as Os from 'os'

0 commit comments

Comments
 (0)