Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

refs #982 Add proxy configuration for websocket

This commit is contained in:
AkiraFukushima 2019-10-27 18:19:38 +09:00
parent e231bb3cc0
commit 0068697a7e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/index.ts
View File

@ -529,7 +529,7 @@ ipcMain.on('start-all-user-streamings', (event: IpcMainEvent, accounts: Array<Lo
} }
const proxy = await proxyConfiguration.forMastodon() const proxy = await proxyConfiguration.forMastodon()
const url = await StreamingURL(acct, proxy) const url = await StreamingURL(acct, proxy)
userStreamings[id] = new WebSocket(acct, url) userStreamings[id] = new WebSocket(acct, url, proxy)
userStreamings[id]!.startUserStreaming( userStreamings[id]!.startUserStreaming(
async (update: Status) => { async (update: Status) => {
if (!event.sender.isDestroyed()) { if (!event.sender.isDestroyed()) {
@ -640,7 +640,7 @@ ipcMain.on('start-directmessages-streaming', async (event: IpcMainEvent, obj: St
} }
const proxy = await proxyConfiguration.forMastodon() const proxy = await proxyConfiguration.forMastodon()
const url = await StreamingURL(acct, proxy) const url = await StreamingURL(acct, proxy)
directMessagesStreaming = new WebSocket(acct, url) directMessagesStreaming = new WebSocket(acct, url, proxy)
directMessagesStreaming.start( directMessagesStreaming.start(
'direct', 'direct',
(update: Status) => { (update: Status) => {
@ -689,7 +689,7 @@ ipcMain.on('start-local-streaming', async (event: IpcMainEvent, obj: StreamingSe
} }
const proxy = await proxyConfiguration.forMastodon() const proxy = await proxyConfiguration.forMastodon()
const url = await StreamingURL(acct, proxy) const url = await StreamingURL(acct, proxy)
localStreaming = new WebSocket(acct, url) localStreaming = new WebSocket(acct, url, proxy)
localStreaming.start( localStreaming.start(
'public:local', 'public:local',
(update: Status) => { (update: Status) => {
@ -738,7 +738,7 @@ ipcMain.on('start-public-streaming', async (event: IpcMainEvent, obj: StreamingS
} }
const proxy = await proxyConfiguration.forMastodon() const proxy = await proxyConfiguration.forMastodon()
const url = await StreamingURL(acct, proxy) const url = await StreamingURL(acct, proxy)
publicStreaming = new WebSocket(acct, url) publicStreaming = new WebSocket(acct, url, proxy)
publicStreaming.start( publicStreaming.start(
'public', 'public',
(update: Status) => { (update: Status) => {
@ -791,7 +791,7 @@ ipcMain.on('start-list-streaming', async (event: IpcMainEvent, obj: ListID & Str
} }
const proxy = await proxyConfiguration.forMastodon() const proxy = await proxyConfiguration.forMastodon()
const url = await StreamingURL(acct, proxy) const url = await StreamingURL(acct, proxy)
listStreaming = new WebSocket(acct, url) listStreaming = new WebSocket(acct, url, proxy)
listStreaming.start( listStreaming.start(
`list&list=${listID}`, `list&list=${listID}`,
(update: Status) => { (update: Status) => {
@ -844,7 +844,7 @@ ipcMain.on('start-tag-streaming', async (event: IpcMainEvent, obj: Tag & Streami
} }
const proxy = await proxyConfiguration.forMastodon() const proxy = await proxyConfiguration.forMastodon()
const url = await StreamingURL(acct, proxy) const url = await StreamingURL(acct, proxy)
tagStreaming = new WebSocket(acct, url) tagStreaming = new WebSocket(acct, url, proxy)
tagStreaming.start( tagStreaming.start(
`hashtag&tag=${tag}`, `hashtag&tag=${tag}`,
(update: Status) => { (update: Status) => {

4
src/main/websocket.ts
View File

@ -17,9 +17,9 @@ export default class WebSocket {
private client: Mastodon private client: Mastodon
private listener: SocketListener | null private listener: SocketListener | null
constructor(account: LocalAccount, streamingURL: string) { constructor(account: LocalAccount, streamingURL: string, proxy: ProxyConfig | false) {
const url = streamingURL.replace(/^https:\/\//, 'wss://') const url = streamingURL.replace(/^https:\/\//, 'wss://')
this.client = new Mastodon(account.accessToken!, url + '/api/v1') this.client = new Mastodon(account.accessToken!, url + '/api/v1', 'Whalebird', proxy)
this.listener = null this.listener = null
} }