-
Notifications
You must be signed in to change notification settings - Fork 67
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
experimenting: seeding worker #218
Open
hlolli
wants to merge
2
commits into
develop
Choose a base branch
from
feature/PE-6874_webtorrent
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
/** | ||
* AR.IO Gateway | ||
* Copyright (C) 2022-2023 Permanent Data Solutions, Inc. All Rights Reserved. | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
import { Logger } from 'winston'; | ||
import WebTorrent from 'webtorrent'; | ||
import { FsDataStore } from '../store/fs-data-store.js'; | ||
import { ContiguousDataSource } from '../types.js'; | ||
|
||
export class SeedingWorker { | ||
private log: Logger; | ||
private contiguousDataSource: ContiguousDataSource; | ||
private fsDataStore: FsDataStore; | ||
|
||
public webTorrentClient: WebTorrent.Instance; | ||
|
||
constructor({ | ||
log, | ||
contiguousDataSource, | ||
fsDataStore, | ||
}: { | ||
log: Logger; | ||
contiguousDataSource: ContiguousDataSource; | ||
fsDataStore: FsDataStore; | ||
}) { | ||
this.webTorrentClient = new WebTorrent(); | ||
this.contiguousDataSource = contiguousDataSource; | ||
this.fsDataStore = fsDataStore; | ||
this.log = log.child({ class: 'SeedingWorker' }); | ||
} | ||
|
||
async seed(txId: string) { | ||
this.log.debug(`Seeding ${txId}`); | ||
await this.contiguousDataSource.getData({ id: txId }); | ||
const dataPath = this.fsDataStore.dataPath(txId); | ||
await new Promise<void>((resolve) => | ||
this.webTorrentClient.seed( | ||
dataPath, | ||
{ | ||
announce: [ | ||
'wss://tracker.btorrent.xyz', | ||
'wss://tracker.openwebtorrent.com', | ||
'wss://tracker.webtorrent.io', | ||
], | ||
}, | ||
(torrent: WebTorrent.Torrent) => { | ||
this.log.debug(`Seeding ${txId} started: ${torrent.magnetURI}`); | ||
resolve(); | ||
}, | ||
), | ||
); | ||
} | ||
Comment on lines
+46
to
+66
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Improve error handling and Promise management in the seed method. While the seed method implements the core functionality, there are several areas for improvement:
Consider refactoring the method as follows: async seed(txId: string): Promise<void> {
this.log.debug(`Seeding ${txId}`);
try {
await this.contiguousDataSource.getData({ id: txId });
const dataPath = this.fsDataStore.dataPath(txId);
return new Promise<void>((resolve, reject) => {
this.webTorrentClient.seed(
dataPath,
{
announce: [
'wss://tracker.btorrent.xyz',
'wss://tracker.openwebtorrent.com',
'wss://tracker.webtorrent.io',
],
},
(torrent: WebTorrent.Torrent) => {
this.log.debug(`Seeding ${txId} started: ${torrent.magnetURI}`);
resolve();
}
).on('error', (error) => {
this.log.error(`Error seeding ${txId}`, { error });
reject(error);
});
});
} catch (error) {
this.log.error(`Error preparing data for seeding ${txId}`, { error });
throw error;
}
} This refactored version:
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Consider adding seedingWorker to the shutdown process.
The
seedingWorker
has been correctly initialized and integrated into the system. However, it's not included in the shutdown process. To ensure proper cleanup and resource management, consider adding theseedingWorker
to theshutdown
function.Add the following line to the
shutdown
function, along with the other worker shutdown calls:This will ensure that the
seedingWorker
is properly stopped when the system is shutting down.