vdj 1.4.0 → 1.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/default_implementations/youtube/song.js +1 -1
- package/dist/default_implementations/youtubedl/service.js +2 -2
- package/dist/default_implementations/youtubedl/song.js +1 -1
- package/package.json +1 -1
- package/src/default_implementations/youtube/song.ts +15 -16
- package/src/default_implementations/youtubedl/service.ts +2 -2
- package/src/default_implementations/youtubedl/song.ts +1 -2
|
@@ -62,7 +62,7 @@ class YouTubeSong extends core_1.Song {
|
|
|
62
62
|
stream() {
|
|
63
63
|
const stream = youtube_dl_exec_1.exec(this.streamURL, {
|
|
64
64
|
output: '-',
|
|
65
|
-
format: 'bestaudio
|
|
65
|
+
format: 'bestaudio/best',
|
|
66
66
|
limitRate: '1M',
|
|
67
67
|
rmCacheDir: true,
|
|
68
68
|
verbose: true,
|
|
@@ -31,13 +31,13 @@ class YoutubedlService {
|
|
|
31
31
|
}
|
|
32
32
|
canFetch(target, logger) {
|
|
33
33
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
|
-
var res = yield youtube_dl_exec_1.default(target, {
|
|
34
|
+
var res = yield youtube_dl_exec_1.default(target, { dumpSingleJson: true }, {});
|
|
35
35
|
return !!res;
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
38
|
getSongInfo(url, logger) {
|
|
39
39
|
return __awaiter(this, void 0, void 0, function* () {
|
|
40
|
-
var res = yield youtube_dl_exec_1.default(url, {
|
|
40
|
+
var res = yield youtube_dl_exec_1.default(url, { dumpSingleJson: true, noCheckCertificate: true, addMetadata: true }, {});
|
|
41
41
|
return {
|
|
42
42
|
full: true,
|
|
43
43
|
metadataType: "youtubedl",
|
|
@@ -35,7 +35,7 @@ class YoutubedlSong extends core_1.Song {
|
|
|
35
35
|
stream() {
|
|
36
36
|
const stream = youtube_dl_exec_1.exec(this.streamURL, {
|
|
37
37
|
output: '-',
|
|
38
|
-
format: 'bestaudio
|
|
38
|
+
format: 'bestaudio/best',
|
|
39
39
|
limitRate: '1M',
|
|
40
40
|
rmCacheDir: true,
|
|
41
41
|
verbose: true,
|
package/package.json
CHANGED
|
@@ -41,23 +41,23 @@ export default class YouTubeSong extends Song {
|
|
|
41
41
|
this.info = await this.service.getSongInfo(this.URL);
|
|
42
42
|
return this.info;
|
|
43
43
|
}
|
|
44
|
-
|
|
44
|
+
|
|
45
45
|
public static extractSeek(url: string): number {
|
|
46
46
|
var lookFor = ["&t=", "?t="];
|
|
47
47
|
for (var i in lookFor) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
48
|
+
var key = lookFor[i];
|
|
49
|
+
var start = url.indexOf(key);
|
|
50
|
+
if (start === -1) continue;
|
|
51
|
+
start += key.length;
|
|
52
|
+
var time = "";
|
|
53
|
+
var char = "";
|
|
54
|
+
for (var j = start; j < url.length; j++) {
|
|
55
|
+
char = url[j];
|
|
56
|
+
if (isNaN(Number(char)))
|
|
57
|
+
break;
|
|
58
|
+
time += char;
|
|
59
|
+
}
|
|
60
|
+
return Number(time);
|
|
61
61
|
}
|
|
62
62
|
return 0;
|
|
63
63
|
}
|
|
@@ -67,8 +67,7 @@ export default class YouTubeSong extends Song {
|
|
|
67
67
|
this.streamURL,
|
|
68
68
|
{
|
|
69
69
|
output: '-',
|
|
70
|
-
format:
|
|
71
|
-
'bestaudio[ext=webm+acodec=opus+tbr>100]/bestaudio[ext=webm+acodec=opus]/bestaudio/best',
|
|
70
|
+
format: 'bestaudio/best',
|
|
72
71
|
limitRate: '1M',
|
|
73
72
|
rmCacheDir: true,
|
|
74
73
|
verbose: true,
|
|
@@ -15,12 +15,12 @@ export default class YoutubedlService implements IService {
|
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
public async canFetch(target: string, logger?: Logger): Promise<boolean> {
|
|
18
|
-
var res = await youtubedl(target, {
|
|
18
|
+
var res = await youtubedl(target, { dumpSingleJson: true }, {});
|
|
19
19
|
return !!res;
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
public async getSongInfo(url: string, logger?: Logger): Promise<SongInfo> {
|
|
23
|
-
var res = await youtubedl(url, {
|
|
23
|
+
var res = await youtubedl(url, { dumpSingleJson: true, noCheckCertificate: true, addMetadata: true }, {});
|
|
24
24
|
return {
|
|
25
25
|
full: true,
|
|
26
26
|
metadataType: "youtubedl",
|
|
@@ -34,8 +34,7 @@ export default class YoutubedlSong extends Song {
|
|
|
34
34
|
this.streamURL,
|
|
35
35
|
{
|
|
36
36
|
output: '-',
|
|
37
|
-
format:
|
|
38
|
-
'bestaudio[ext=webm+acodec=opus+tbr>100]/bestaudio[ext=webm+acodec=opus]/bestaudio/best',
|
|
37
|
+
format: 'bestaudio/best',
|
|
39
38
|
limitRate: '1M',
|
|
40
39
|
rmCacheDir: true,
|
|
41
40
|
verbose: true,
|