arona/destreamer-mirror
1
0
Fork 0
mirror of https://github.com/snobu/destreamer.git synced 2026-03-23 20:27:47 +00:00
Code Issues Projects Releases Wiki Activity

workaround for listeners not removed

Browse Source 
fixed typo
This commit is contained in:
Luca Armaroli
2020-09-27 22:48:05 +02:00
parent 331efd9773
commit b89e04156f
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/DownloadManager.ts
View File

@@ -106,6 +106,8 @@ export class DownloadManager {
logger.info('Now trying to send configs...'); logger.info('Now trying to send configs...');
this.setOptions(options); this.setOptions(options);
} }
logger.debug('[DownloadMangaer] Setup listener count on "message": ' + this.webSocket.listenerCount('message'));
} }
public async close(): Promise<void> { public async close(): Promise<void> {
@@ -220,7 +222,8 @@ export class DownloadManager {
this.webSocket.send(this.createMessage('aria2.getGlobalStat', null, 'getSpeed')); this.webSocket.send(this.createMessage('aria2.getGlobalStat', null, 'getSpeed'));
if (this.queue.size === 0) { if (this.queue.size === 0) {
this.webSocket.removeListener('message', handleResponse); this.webSocket.off('message', handleResponse);
logger.debug('[DownloadMangaer] End download listener count on "message": ' + this.webSocket.listenerCount('message'));
resolve(); resolve();
} }
} }
@@ -264,13 +267,28 @@ export class DownloadManager {
if (!barStarted) { if (!barStarted) {
barStarted = true; barStarted = true;
logger.debug(`[DownloadMangaer] Starting queue size: ${this.queue.size}`); logger.debug(`[DownloadMangaer] Starting download queue size: ${this.queue.size}`);
this.progresBar.start(this.queue.size, 0, { speed: 0}); this.progresBar.start(this.queue.size, 0, { speed: 0});
} }
} }
} }
}; };
// FIXME: terrible workaround for 'https://github.com/snobu/destreamer/issues/232#issuecomment-699642770' :/
this.webSocket.removeAllListeners('message');
this.webSocket.on('message', (data: WebSocket.Data) => {
const parsed = JSON.parse(data.toString());
if (parsed.method !== 'aria2.onDownloadComplete' &&
parsed.method !== 'aria2.onDownloadStart' &&
parsed.method !== 'aria2.onDownloadError' &&
parsed.id !== 'getSpeed' &&
parsed.id !== 'addUrl' &&
parsed.id !== 'shutdown' &&
parsed.id !== 'getUrlForRetry') {
logger.info('[INCOMING] \n' + JSON.stringify(parsed, null, 4) + '\n\n');
}
});
logger.debug('[DownloadMangaer] Start download listener count on "message": ' + this.webSocket.listenerCount('message'));
this.webSocket.on('message', data => handleResponse(data)); this.webSocket.on('message', data => handleResponse(data));
const paramsForDownload: Array<any> = urls.map(url => { const paramsForDownload: Array<any> = urls.map(url => {

2
src/destreamer.ts
View File

@@ -170,7 +170,7 @@ async function downloadVideo(videoGUIDs: Array<string>,
process.exit(ERROR_CODE.ARIA2C_CRASH); process.exit(ERROR_CODE.ARIA2C_CRASH);
} }
else { else {
logger.verbose('Aria2c proces exited'); logger.verbose('Aria2c process exited');
arai2cExited = true; arai2cExited = true;
} }
} }