zoriya/flood
1
0
Fork 0
mirror of https://github.com/zoriya/flood.git synced 2025-12-06 07:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

server: add the created torrent after creation

Browse Source
This commit is contained in:
Jesse Chan
2020-10-19 22:41:23 +08:00
parent 9cefa85f71
commit 409fcee3e4
3 changed files with 119 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/.jest/test.setup.js
View File

@@ -34,6 +34,7 @@ process.argv = ['node', 'flood'];
process.argv.push('--rundir', temporaryRuntimeDirectory);
process.argv.push('--noauth');
process.argv.push('--rtsocket', rTorrentSocket);
process.argv.push('--allowedpath', temporaryRuntimeDirectory);
afterAll((done) => {
rTorrentProcess.on('close', () => {

128
server/routes/api/torrents.test.ts
View File

@@ -13,10 +13,11 @@ import paths from '../../../shared/config/paths';
import type {
AddTorrentByFileOptions,
AddTorrentByURLOptions,
CreateTorrentOptions,
SetTorrentsTrackersOptions,
} from '../../../shared/types/api/torrents';
import type {TorrentContent} from '../../../shared/types/TorrentContent';
import type {TorrentList, TorrentProperties} from '../../../shared/types/Torrent';
import type {TorrentList} from '../../../shared/types/Torrent';
import type {TorrentStatus} from '../../../shared/constants/torrentStatusMap';
import type {TorrentTracker} from '../../../shared/types/TorrentTracker';
@@ -37,6 +38,12 @@ const torrentFiles = [
const torrentURLs = ['https://releases.ubuntu.com/20.04/ubuntu-20.04.1-live-server-amd64.iso.torrent'];
const testTrackers = [
`https://${crypto.randomBytes(8).toString('hex')}.com/announce`,
`http://${crypto.randomBytes(8).toString('hex')}.com/announce?key=test`,
`http://${crypto.randomBytes(8).toString('hex')}.com/announce.php?key=test`,
];
let torrentHash = '';
const activityStream = new stream.PassThrough();
@@ -47,7 +54,7 @@ describe('POST /api/torrents/add-urls', () => {
const addTorrentByURLOptions: AddTorrentByURLOptions = {
urls: torrentURLs,
destination: tempDirectory,
tags: ['test'],
tags: ['testURLs'],
isBasePath: false,
start: false,
};
@@ -84,23 +91,30 @@ describe('POST /api/torrents/add-urls', () => {
.set('Accept', 'application/json')
.expect(200)
.expect('Content-Type', /json/)
.end((err, res) => {
.end(async (err, res) => {
if (err) done(err);
expect(res.body.torrents == null).toBe(false);
expect(res.body.torrents).not.toBeNull();
const torrentList: TorrentList = res.body.torrents;
const [torrent]: Array<TorrentProperties> = Object.values(torrentList);
const addedTorrents = Object.values(torrentList).filter((torrent) =>
addTorrentByURLOptions.tags?.every((tag) => torrent.tags.includes(tag)),
);
expect(torrent.baseDirectory).toBe(addTorrentByURLOptions.destination);
expect(torrent.tags).toStrictEqual(addTorrentByURLOptions.tags);
expect(addedTorrents).toHaveLength(addTorrentByURLOptions.urls.length);
const expectedStatuses: Array<TorrentStatus> = addTorrentByURLOptions.start
? ['downloading']
: ['stopped', 'inactive'];
expect(torrent.status).toEqual(expect.arrayContaining(expectedStatuses));
await Promise.all(
addedTorrents.map(async (torrent) => {
expect(torrent.baseDirectory).toBe(addTorrentByURLOptions.destination);
torrentHash = torrent.hash;
const expectedStatuses: Array<TorrentStatus> = addTorrentByURLOptions.start
? ['downloading']
: ['stopped', 'inactive'];
expect(torrent.status).toEqual(expect.arrayContaining(expectedStatuses));
torrentHash = torrent.hash;
}),
);
done();
});
@@ -112,7 +126,7 @@ describe('POST /api/torrents/add-files', () => {
const addTorrentByFileOptions: AddTorrentByFileOptions = {
files: torrentFiles,
destination: tempDirectory,
tags: ['test'],
tags: ['testAddFiles'],
isBasePath: false,
start: false,
};
@@ -149,14 +163,90 @@ describe('POST /api/torrents/add-files', () => {
.set('Accept', 'application/json')
.expect(200)
.expect('Content-Type', /json/)
.end((err, res) => {
.end(async (err, res) => {
if (err) done(err);
expect(res.body.torrents == null).toBe(false);
const torrentList: TorrentList = res.body.torrents;
expect(Object.keys(torrentList).length).toBeGreaterThanOrEqual(
torrentFiles.length + (torrentHash !== '' ? 1 : 0),
const addedTorrents = Object.values(torrentList).filter((torrent) =>
addTorrentByFileOptions.tags?.every((tag) => torrent.tags.includes(tag)),
);
expect(addedTorrents).toHaveLength(addTorrentByFileOptions.files.length);
await Promise.all(
addedTorrents.map(async (torrent) => {
expect(torrent.directory.startsWith(addTorrentByFileOptions.destination)).toBe(true);
}),
);
done();
});
});
});
});
describe('POST /api/torrents/create', () => {
const createTorrentOptions: CreateTorrentOptions = {
sourcePath: tempDirectory,
tags: ['testCreate'],
trackers: testTrackers,
start: false,
isPrivate: false,
};
const torrentAdded = new Promise((resolve) => {
rl.on('line', (input) => {
if (input.includes('TORRENT_LIST_ACTION_TORRENT_ADDED')) {
resolve();
}
});
});
it('Creates a torrent', (done) => {
fs.writeFileSync(path.join(tempDirectory, 'dummy'), 'test');
request
.post('/api/torrents/create')
.send(createTorrentOptions)
.set('Cookie', [authToken])
.set('Accept', 'application/x-bittorrent')
.expect(200)
.expect('Content-Type', /x-bittorrent/)
.end((err, _res) => {
if (err) done(err);
torrentAdded.then(() => {
done();
});
});
});
it('GET /api/torrents to verify torrents are added via creation', (done) => {
torrentAdded.then(() => {
request
.get('/api/torrents')
.send()
.set('Cookie', [authToken])
.set('Accept', 'application/json')
.expect(200)
.expect('Content-Type', /json/)
.end(async (err, res) => {
if (err) done(err);
expect(res.body.torrents == null).toBe(false);
const torrentList: TorrentList = res.body.torrents;
const addedTorrents = Object.values(torrentList).filter((torrent) =>
createTorrentOptions.tags?.every((tag) => torrent.tags.includes(tag)),
);
expect(addedTorrents).toHaveLength(1);
await Promise.all(
addedTorrents.map(async (torrent) => {
expect(torrent.isPrivate).toBe(createTorrentOptions.isPrivate);
}),
);
done();
@@ -166,12 +256,6 @@ describe('POST /api/torrents/add-files', () => {
});
describe('PATCH /api/torrents/trackers', () => {
const testTrackers = [
`https://${crypto.randomBytes(8).toString('hex')}.com/announce`,
`http://${crypto.randomBytes(8).toString('hex')}.com/announce?key=test`,
`http://${crypto.randomBytes(8).toString('hex')}.com/announce.php?key=test`,
];
it('Sets single tracker', (done) => {
const setTrackersOptions: SetTorrentsTrackersOptions = {
hashes: [torrentHash],

14
server/routes/api/torrents.ts
View File

@@ -104,7 +104,7 @@ router.post<unknown, unknown, AddTorrentByFileOptions>('/add-files', (req, res)
* @return {Error} 500 - failure response - application/json
*/
router.post<unknown, unknown, CreateTorrentOptions>('/create', async (req, res) => {
const {name, sourcePath, trackers, comment, infoSource, isPrivate} = req.body;
const {name, sourcePath, trackers, comment, infoSource, isPrivate, tags, start} = req.body;
const callback = ajaxUtil.getResponseFn(res);
if (typeof sourcePath !== 'string') {
@@ -150,7 +150,17 @@ router.post<unknown, unknown, CreateTorrentOptions>('/create', async (req, res)
res.attachment(torrentFileName);
res.download(torrentPath);
// TODO: add created torrent.
req.services?.clientGatewayService
?.addTorrentsByFile({
files: [torrent.toString('base64')],
destination: sourcePath,
tags,
isBasePath: true,
start: start || false,
})
.catch(() => {
// do nothing.
});
});
},
);