diff --git a/.gitignore b/.gitignore index 5ffced6..b3bf8e7 100755 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ /cache /.MUSIC_CACHE /.prettierrc -.idea \ No newline at end of file +.idea +credentials.json \ No newline at end of file diff --git a/lib/newstruct/audioPlayer.js b/lib/newstruct/audioPlayer.js index 743f82c..00e842e 100755 --- a/lib/newstruct/audioPlayer.js +++ b/lib/newstruct/audioPlayer.js @@ -52,7 +52,7 @@ class AudioPlayer { const current = this.queue[__classPrivateFieldGet(this, _AudioPlayer_modes, "f").currentTrack]; let stream; //@ts-ignore - stream = await (0, request_1.requestStream)(current, current.formattedPlatforms, this.options.manager); + stream = await (0, request_1.requestStream)(current, current?.formattedPlatforms ?? "Youtube", this.options.manager); let s; if (this.options.manager.plugins.has(enums_1.PluginName.Cacher)) { const Cacher = (this.options.manager.plugins.get(enums_1.PluginName.Cacher)); @@ -64,7 +64,6 @@ class AudioPlayer { __classPrivateFieldGet(this, _AudioPlayer_modes, "f").filters.length) { const f = this.options.manager.plugins.get(enums_1.PluginName.Filter); const ffmpeg = f.createFFmpeg("-af", __classPrivateFieldGet(this, _AudioPlayer_modes, "f").filters.join(",")); - // @ts-expect-error type errors s = stream.pipe(ffmpeg); resource = (0, voice_1.createAudioResource)(s, { inlineVolume: true, diff --git a/lib/newstruct/audioPlayer.js.map b/lib/newstruct/audioPlayer.js.map index 31557b6..a5d271e 100755 --- a/lib/newstruct/audioPlayer.js.map +++ b/lib/newstruct/audioPlayer.js.map @@ -1 +1 @@ -{"version":3,"file":"audioPlayer.js","sourceRoot":"","sources":["../../src/newstruct/audioPlayer.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"audioPlayer.js","sourceRoot":"","sources":["../../src/newstruct/audioPlayer.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/newstruct/cacher.js b/lib/newstruct/cacher.js index b1b8f2b..78a83c8 100755 --- a/lib/newstruct/cacher.js +++ b/lib/newstruct/cacher.js @@ -89,7 +89,6 @@ class Cacher { if (stream instanceof web_1.ReadableStream) { stream = stream_1.Readable.from(stream); } - // @ts-expect-error type errors await __classPrivateFieldGet(this, _Cacher_instances, "m", _Cacher_doCompressionSave).call(this, stream, hash); __classPrivateFieldGet(this, _Cacher_map, "f").set(metaData.id, hash); } @@ -110,9 +109,7 @@ class Cacher { return (0, fs_1.createReadStream)(hash); const file = (0, fs_1.createReadStream)(hash); const unzip = (0, zlib_1.createUnzip)(); - // @ts-expect-error type errors const stream = file.pipe(unzip); - // @ts-expect-error type errors return stream_1.Readable.from(stream); } } @@ -156,7 +153,6 @@ _Cacher_type = new WeakMap(), _Cacher_map = new WeakMap(), _Cacher_limit = new W const gzip = (0, zlib_1.createGzip)(); await (0, promises_1.writeFile)(hash, ""); const file = (0, fs_1.createWriteStream)(hash); - // @ts-expect-error type errors await (0, promises_2.pipeline)(stream, gzip, file); }; //# sourceMappingURL=cacher.js.map \ No newline at end of file diff --git a/lib/newstruct/cacher.js.map b/lib/newstruct/cacher.js.map index eeeeacb..56a9a3a 100755 --- a/lib/newstruct/cacher.js.map +++ b/lib/newstruct/cacher.js.map @@ -1 +1 @@ -{"version":3,"file":"cacher.js","sourceRoot":"","sources":["../../src/newstruct/cacher.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"cacher.js","sourceRoot":"","sources":["../../src/newstruct/cacher.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/lib/newstruct/filter.js b/lib/newstruct/filter.js index c9287ed..5087740 100755 --- a/lib/newstruct/filter.js +++ b/lib/newstruct/filter.js @@ -67,7 +67,6 @@ class Filter { const stream = await (0, request_1.requestStream)(track, track.formattedPlatforms, player.options.manager); let str; if (stream instanceof web_1.ReadableStream) { - // @ts-expect-error type errors str = stream_1.Readable.from(stream).pipe(ffmpeg); } else @@ -125,7 +124,6 @@ _Filter_config = new WeakMap(), _Filter_instances = new WeakSet(), _Filter_apply }); let str; if (stream instanceof web_1.ReadableStream) { - // @ts-expect-error type errors str = stream_1.Readable.from(stream).pipe(ffmpeg); } else diff --git a/lib/newstruct/filter.js.map b/lib/newstruct/filter.js.map index 4931337..d1a8297 100755 --- a/lib/newstruct/filter.js.map +++ b/lib/newstruct/filter.js.map @@ -1 +1 @@ -{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../src/newstruct/filter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAkF;AAElF,6CAAqC;AACrC,mCAAkC;AAClC,oCAA4C;AAC5C,qDAAoD;AACpD,iDAAoD;AAIpD,MAAa,MAAM;IAEf,YAAY,MAAoB;;QADhC,iCAAsB;QAElB,uBAAA,IAAI,kBAAW,MAAM,MAAA,CAAC;IAC1B,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,OAA4C,EAAE,MAAmB;QACvE,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;QACzB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;YACjC,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,KAAK,EAAE,CAAC,CAAC;QACjC,CAAC;QACD,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,uBAAA,IAAI,wCAAO,MAAX,IAAI,EAAQ,MAAM,CAAC,CAAC;IAC9B,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,MAAmB;QAC5C,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,uBAAA,IAAI,wCAAO,MAAX,IAAI,EAAQ,MAAM,CAAC,CAAC;IAC9B,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,OAA4C,EAAE,MAAmB;QACvE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAChE,MAAM,uBAAA,IAAI,wCAAO,MAAX,IAAI,EAAQ,MAAM,CAAC,CAAC;IAC9B,CAAC;IACD,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,MAAmB;QACjD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QACpE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;YACzB,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACnB,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACrB,MAAM,uBAAA,IAAI,wCAAO,MAAX,IAAI,EAAQ,MAAM,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,MAAmB;QAC/B,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,MAAM,uBAAA,IAAI,wCAAO,MAAX,IAAI,EAAQ,MAAM,CAAC,CAAC;IAC9B,CAAC;IA2CD,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,MAAmB;QACxC,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,GAAG,IAAI,IAAI,EAAE,GAAG,uBAAW,CAAC,CAAC;QAClD,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM;YAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC;YACtB,IAAI;SACP,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAa,EAAC,KAAK,EAAE,KAAK,CAAC,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5F,IAAI,GAAsB,CAAC;QAC3B,IAAI,MAAM,YAAY,oBAAc,EAAE,CAAC;YACnC,+BAA+B;YAC/B,GAAG,GAAW,iBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC;;YAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,WAAW,GAAG,IAAA,2BAAmB,EAAC,GAAG,EAAE;YACzC,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,kBAAU,CAAC,GAAG;SAC5B,CAAC,CAAC;QACH,WAAW,CAAC,gBAAgB,GAAG,IAAI,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,YAAY,CAAC,GAAG,IAAc;QAC1B,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC;YACtB,IAAI,EAAE,CAAC,GAAG,uBAAW,EAAE,GAAG,IAAI,CAAC;SAClC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;IACD,yBAAyB,CAAC,KAAa,EAAE,GAAG,IAAc;QACtD,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC;YACtB,IAAI,EAAE,CAAC,GAAG,uBAAW,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;SAC/C,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAhHD,wBAgHC;mFA5EG,KAAK,wBAAQ,MAAmB;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC;IAClC,YAAY;IACZ,MAAM,CAAC,GAA2B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC/D,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAa,EAAC,KAAK,EAAE,KAAK,CAAC,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5F,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC;QACtB,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;YACvB,CAAC,CAAC,uBAAA,IAAI,sBAAQ,CAAC,eAAe;gBAC1B,CAAC,CAAC,CAAC,GAAG,uBAAW,EAAE,AAAD,EAAG,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACrD,CAAC,CAAC;oBACI,KAAK;oBACL,YAAY;oBACZ,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,IAAI;oBACpD,GAAG,uBAAW;oBACd,KAAK;oBACL,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;iBAC3B;YACP,CAAC,CAAC,CAAC,uBAAA,IAAI,sBAAQ,CAAC,eAAe;gBAC7B,CAAC,CAAC;oBACI,KAAK;oBACL,YAAY;oBACZ,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,IAAI;oBACpD,GAAG,uBAAW;iBACjB;gBACH,CAAC,CAAC,CAAC,GAAG,uBAAW,CAAC;KAC3B,CAAC,CAAC;IACH,IAAI,GAAsB,CAAC;IAC3B,IAAI,MAAM,YAAY,oBAAc,EAAE,CAAC;QACnC,+BAA+B;QAC/B,GAAG,GAAW,iBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC;;QAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEjC,MAAM,WAAW,GAAG,IAAA,2BAAmB,EAAC,GAAG,EAAE;QACzC,YAAY,EAAE,IAAI;QAClB,SAAS,EAAE,kBAAU,CAAC,GAAG;KAC5B,CAAC,CAAC;IACH,WAAW,CAAC,gBAAgB,GAAG,uBAAA,IAAI,sBAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;IACrF,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;IAClD,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACpC,CAAC"} \ No newline at end of file +{"version":3,"file":"filter.js","sourceRoot":"","sources":["../../src/newstruct/filter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAkF;AAElF,6CAAqC;AACrC,mCAAkC;AAClC,oCAA4C;AAC5C,qDAAoD;AACpD,iDAAoD;AAIpD,MAAa,MAAM;IAEf,YAAY,MAAoB;;QADhC,iCAAsB;QAElB,uBAAA,IAAI,kBAAW,MAAM,MAAA,CAAC;IAC1B,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,OAA4C,EAAE,MAAmB;QACvE,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;QACzB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;YACjC,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,KAAK,EAAE,CAAC,CAAC;QACjC,CAAC;QACD,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,uBAAA,IAAI,wCAAO,MAAX,IAAI,EAAQ,MAAM,CAAC,CAAC;IAC9B,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,MAAmB;QAC5C,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,uBAAA,IAAI,wCAAO,MAAX,IAAI,EAAQ,MAAM,CAAC,CAAC;IAC9B,CAAC;IACD,KAAK,CAAC,GAAG,CAAC,OAA4C,EAAE,MAAmB;QACvE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAChE,MAAM,uBAAA,IAAI,wCAAO,MAAX,IAAI,EAAQ,MAAM,CAAC,CAAC;IAC9B,CAAC;IACD,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,MAAmB;QACjD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QACpE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC;YACzB,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACnB,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACrB,MAAM,uBAAA,IAAI,wCAAO,MAAX,IAAI,EAAQ,MAAM,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC;IACD,KAAK,CAAC,SAAS,CAAC,MAAmB;QAC/B,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,MAAM,uBAAA,IAAI,wCAAO,MAAX,IAAI,EAAQ,MAAM,CAAC,CAAC;IAC9B,CAAC;IA0CD,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,MAAmB;QACxC,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,GAAG,IAAI,IAAI,EAAE,GAAG,uBAAW,CAAC,CAAC;QAClD,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM;YAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC;YACtB,IAAI;SACP,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAa,EAAC,KAAK,EAAE,KAAK,CAAC,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5F,IAAI,GAAsB,CAAC;QAC3B,IAAI,MAAM,YAAY,oBAAc,EAAE,CAAC;YACnC,GAAG,GAAW,iBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrD,CAAC;;YAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,WAAW,GAAG,IAAA,2BAAmB,EAAC,GAAG,EAAE;YACzC,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,kBAAU,CAAC,GAAG;SAC5B,CAAC,CAAC;QACH,WAAW,CAAC,gBAAgB,GAAG,IAAI,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,YAAY,CAAC,GAAG,IAAc;QAC1B,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC;YACtB,IAAI,EAAE,CAAC,GAAG,uBAAW,EAAE,GAAG,IAAI,CAAC;SAClC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;IACD,yBAAyB,CAAC,KAAa,EAAE,GAAG,IAAc;QACtD,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC;YACtB,IAAI,EAAE,CAAC,GAAG,uBAAW,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;SAC/C,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA9GD,wBA8GC;mFA1EG,KAAK,wBAAQ,MAAmB;IAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,CAAC;IAClC,YAAY;IACZ,MAAM,CAAC,GAA2B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC/D,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAa,EAAC,KAAK,EAAE,KAAK,CAAC,kBAAkB,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5F,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC;QACtB,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;YACvB,CAAC,CAAC,uBAAA,IAAI,sBAAQ,CAAC,eAAe;gBAC1B,CAAC,CAAC,CAAC,GAAG,uBAAW,EAAE,AAAD,EAAG,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACrD,CAAC,CAAC;oBACI,KAAK;oBACL,YAAY;oBACZ,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,IAAI;oBACpD,GAAG,uBAAW;oBACd,KAAK;oBACL,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC;iBAC3B;YACP,CAAC,CAAC,CAAC,uBAAA,IAAI,sBAAQ,CAAC,eAAe;gBAC7B,CAAC,CAAC;oBACI,KAAK;oBACL,YAAY;oBACZ,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,IAAI;oBACpD,GAAG,uBAAW;iBACjB;gBACH,CAAC,CAAC,CAAC,GAAG,uBAAW,CAAC;KAC3B,CAAC,CAAC;IACH,IAAI,GAAsB,CAAC;IAC3B,IAAI,MAAM,YAAY,oBAAc,EAAE,CAAC;QACnC,GAAG,GAAW,iBAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC;;QAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEjC,MAAM,WAAW,GAAG,IAAA,2BAAmB,EAAC,GAAG,EAAE;QACzC,YAAY,EAAE,IAAI;QAClB,SAAS,EAAE,kBAAU,CAAC,GAAG;KAC5B,CAAC,CAAC;IACH,WAAW,CAAC,gBAAgB,GAAG,uBAAA,IAAI,sBAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;IACrF,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;IAClD,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC1B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AACpC,CAAC"} \ No newline at end of file diff --git a/lib/newstruct/manager.js b/lib/newstruct/manager.js index f65a20e..e59b917 100755 --- a/lib/newstruct/manager.js +++ b/lib/newstruct/manager.js @@ -46,14 +46,18 @@ class Manager extends index_1.TypedEmitter { * */ async function generateYoutubePoToken() { - const visitorData = youtubei_js_1.Proto.encodeVisitorData(youtubei_js_1.Utils.generateRandomString(11), Math.floor(Date.now() / 1000)); + let innertube = await youtubei_js_1.Innertube.create({ retrieve_player: false }); + const requestKey = "O43z0dpjhgX20SCx4KAo"; + const visitorData = innertube.session.context.client.visitorData; const dom = new jsdom_1.JSDOM(); - globalThis.window = dom.window; - globalThis.document = dom.window.document; + Object.assign(globalThis, { + window: dom.window, + document: dom.window.document, + }); const bgConfig = { fetch: (url, options) => (0, undici_1.fetch)(url, options), globalObj: globalThis, - identity: visitorData, + identifier: visitorData, requestKey, }; // @ts-expect-error @@ -145,7 +149,11 @@ class Manager extends index_1.TypedEmitter { const updateCredentials = (credentials) => { const current = JSON.parse((0, fs_1.readFileSync)(authPath, "utf-8")); const { visitorData, poToken } = current; - const newCredentials = { visitorData, poToken, ...credentials }; + const newCredentials = { + visitorData, + poToken, + ...credentials, + }; (0, fs_1.writeFileSync)(authPath, JSON.stringify(newCredentials)); }; yt.session.on("auth", ({ credentials }) => { @@ -191,6 +199,7 @@ class Manager extends index_1.TypedEmitter { soundcloudClientId: undefined, youtubeCookie: undefined, youtubeAuth: true, + youtubeToken: true, youtubegl: "US", youtubeClient: "TV_EMBEDDED", spotifyAuth: { diff --git a/lib/newstruct/manager.js.map b/lib/newstruct/manager.js.map index 09e6d82..13abe82 100755 --- a/lib/newstruct/manager.js.map +++ b/lib/newstruct/manager.js.map @@ -1 +1 @@ -{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/newstruct/manager.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../src/newstruct/manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wEAAgD;AAChD,gFAAiD;AACjD,4CAK0B;AAE1B,wDAA4D;AAC5D,6CAA+D;AAQ/D,+CAA4C;AAC5C,kFAAyC;AAEzC,mCAA+B;AAC/B,4CAA4D;AAG5D,iCAA8B;AAC9B,2CAAgC;AAChC,2BAA6D;AAC7D,+BAA4B;AAE5B,MAAa,OAAQ,SAAQ,oBAA2B;IAUtD,YAAY,MAA8B;QACxC,KAAK,EAAE,CAAC;;QAPV,YAAO,GAAwC,IAAI,GAAG,EAGnD,CAAC;QAKF,uBAAA,IAAI,mDAAgB,MAApB,IAAI,EAAiB,MAAM,CAAC,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,MAAM,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QACjD,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QACzB,MAAM,SAAS,GAQX,EAAE,CAAC;QACP,IAAI,MAAM,CAAC,aAAa,EAAE,aAAa,EAAE,CAAC;YACxC,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC;QACzD,CAAC;QACD,IAAI,MAAM,CAAC,aAAa,EAAE,SAAS,EAAE,CAAC;YACpC,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,aAAa,EAAE,SAAS,IAAI,IAAI,CAAC;QAC7D,CAAC;QACD,IAAI,MAAM,CAAC,aAAa,EAAE,YAAY,EAAE,CAAC;YACvC,MAAM,UAAU,GAAG,sBAAsB,CAAC;YAE1C;;;;eAIG;YACH,KAAK,UAAU,sBAAsB;gBACnC,IAAI,SAAS,GAAG,MAAM,uBAAS,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;gBAEnE,MAAM,UAAU,GAAG,sBAAsB,CAAC;gBAC1C,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;gBAEjE,MAAM,GAAG,GAAG,IAAI,aAAK,EAAE,CAAC;gBAExB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE;oBACxB,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ;iBAC9B,CAAC,CAAC;gBAEH,MAAM,QAAQ,GAAG;oBACf,KAAK,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,IAAA,cAAK,EAAC,GAAG,EAAE,OAAO,CAAC;oBAC5C,SAAS,EAAE,UAAU;oBACrB,UAAU,EAAE,WAAW;oBACvB,UAAU;iBACX,CAAC;gBAEF,mBAAmB;gBACnB,OAAO,eAAE,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC;qBACjC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;oBAClB,IAAI,CAAC,SAAS;wBACZ,MAAM,IAAI,KAAK,CACb,oGAAoG,CACrG,CAAC;oBAEJ,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;wBACrB,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC;wBAC1D,IAAI,MAAM;4BAAE,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBACrC,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;oBAC/D,CAAC;oBAED,OAAO,eAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;wBACzB,OAAO,EAAE,SAAS,CAAC,SAAS;wBAC5B,UAAU,EAAE,SAAS,CAAC,UAAU;wBAChC,aAAa;wBACb,QAAQ;qBACT,CAAC,CAAC;gBACL,CAAC,CAAC;qBACD,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;oBAChB,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;oBACvD,IAAI,CAAC,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE,CAAC;wBAC1B,IAAA,kBAAa,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;oBAChC,CAAC;oBACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;oBAChE,WAAW,CAAC,OAAO,GAAG,OAAO,CAAC;oBAC9B,WAAW,CAAC,WAAW,GAAG,WAAW,CAAC;oBACtC,IAAA,kBAAa,EAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;oBACrD,IAAI,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;wBAC7B,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;wBACxC,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,WAAW,CAAC,CAAC;oBAClD,CAAC;oBACD,SAAS,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;gBACtD,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACf,OAAO,CAAC,KAAK,CACX,yDAAyD,EACzD,KAAK,CACN,CAAC;gBACJ,CAAC,CAAC,CAAC;YACP,CAAC;YAED,sBAAsB,EAAE,CAAC;QAC3B,CAAC;QACD,MAAM,cAAc,GAAQ;YAC1B,KAAK,EAAE,IAAI,4BAAc,CAAC,IAAI,CAAC;SAChC,CAAC;QACF,IAAI,SAAS,CAAC,OAAO,EAAE,KAAK,IAAI,SAAS,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC;YAC/D,cAAc,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC;YAClD,cAAc,CAAC,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;QAC9D,CAAC;QACD,IAAI,CAAC,SAAS,GAAG;YACf,OAAO,EAAE,uBAAS,CAAC,MAAM,CAAC,cAAc,CAAC;YACzC,UAAU,EAAE,+BAAI;YAChB,OAAO,EAAE,IAAA,0BAAG,EAAC,cAAK,CAAC;SACpB,CAAC;QACF,IACE,MAAM,CAAC,aAAa,EAAE,WAAW,EAAE,QAAQ;YAC3C,MAAM,CAAC,aAAa,EAAE,WAAW,EAAE,YAAY,EAC/C,CAAC;YACD,IAAI,CAAC,UAAU,GAAG,IAAI,8BAAa,CAAC;gBAClC,QAAQ,EAAE,MAAM,CAAC,aAAa,EAAE,WAAW,EAAE,QAAQ;gBACrD,YAAY,EAAE,MAAM,CAAC,aAAa,EAAE,WAAW,EAAE,YAAY;aAC9D,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACrD,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;YAEH,WAAW,CAAC,GAAG,EAAE;gBACf,IAAI,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;oBACrD,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACzD,CAAC,CAAC,CAAC;YACL,CAAC,EAAE,IAAI,CAAC,CAAC;QACX,CAAC;QAED,IAAI,MAAM,CAAC,aAAa,EAAE,kBAAkB,EAAE,CAAC;YAC7C,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,WAAW,CACnC,MAAM,CAAC,aAAa,CAAC,kBAAkB,CACxC,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,CAAC,aAAa,EAAE,WAAW,KAAK,IAAI,EAAE,CAAC;YAC/C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACvC,mCAAmC;gBACnC,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;gBACvD,IAAI,QAAQ,GAAG,EAAE,CAAC;gBAElB,IAAI,CAAC,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE,CAAC;oBAC1B,IAAA,kBAAa,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;gBAChC,CAAC;gBAED,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE,CAAC;oBACzB,MAAM,WAAW,GAAG,IAAA,iBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;oBACnD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBACrC,CAAC;gBAED,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;oBACrC,OAAO,CAAC,GAAG,CACT,8CAA8C,IAAI,CAAC,gBAAgB,cAAc,IAAI,CAAC,SAAS,cAAc,CAC9G,CAAC;gBACJ,CAAC,CAAC,CAAC;gBAEH,MAAM,iBAAiB,GAAG,CAAC,WAAiC,EAAE,EAAE;oBAC9D,MAAM,OAAO,GAAgB,IAAI,CAAC,KAAK,CACrC,IAAA,iBAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAChC,CAAC;oBAEF,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;oBACzC,MAAM,cAAc,GAAgB;wBAClC,WAAW;wBACX,OAAO;wBACP,GAAG,WAAW;qBACf,CAAC;oBAEF,IAAA,kBAAa,EAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;gBAC1D,CAAC,CAAC;gBAEF,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;oBACxC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;oBACpC,iBAAiB,CAAC,WAAW,CAAC,CAAC;oBAC/B,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;gBAC7D,CAAC,CAAC,CAAC;gBAEH,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE;oBACtD,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;oBACpC,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBACjC,CAAC,CAAC,CAAC;gBAEH,8DAA8D;gBAC9D,IACE,IAAA,eAAU,EAAC,QAAQ,CAAC;oBACpB,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,YAAY,EACxD,CAAC;oBACD,IAAI,CAAC;wBACH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;wBAChE,uBAAuB;wBACvB,OAAO,WAAW,CAAC,WAAW,CAAC;wBAC/B,OAAO,WAAW,CAAC,OAAO,CAAC;wBAC3B,OAAO,CAAC,GAAG,CACT,oEAAoE,CACrE,CAAC;wBACF,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;oBACvC,CAAC;oBAAC,MAAM,CAAC;wBACP,OAAO,CAAC,IAAI,CACV,uFAAuF,CACxF,CAAC;wBACF,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CACzC,IAAA,iBAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAChC,CAAC;wBACF,IAAA,kBAAa,EACX,QAAQ,EACR,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAClD,CAAC;wBACF,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;wBAC/B,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;oBAC5B,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBACtB,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,CAAC,aAAa;QAClB,OAAO;YACL,UAAU,EAAE;gBACV,KAAK,EAAE,KAAK;aACb;YACD,aAAa,EAAE;gBACb,kBAAkB,EAAE,SAAS;gBAC7B,aAAa,EAAE,SAAS;gBACxB,WAAW,EAAE,IAAI;gBACjB,YAAY,EAAE,IAAI;gBAClB,SAAS,EAAE,IAAI;gBACf,aAAa,EAAE,aAAa;gBAC5B,WAAW,EAAE;oBACX,QAAQ,EAAE,SAAS;oBACnB,YAAY,EAAE,SAAS;iBACxB;aACF;YACD,cAAc,EAAE;gBACd,aAAa,EAAE,GAAG;gBAClB,wBAAwB,EAAE,CAAC,CAAC;gBAC5B,oBAAoB,EAAE,CAAC,CAAC;gBACxB,oBAAoB,EAAE,CAAC,CAAC;aACzB;SACF,CAAC;IACJ,CAAC;IAgDD,KAAK,CAAC,MAAM,CAAC,EACX,IAAI,GAAG,SAAS,EAChB,YAAY,EACZ,QAAQ,GAAG,IAAI,EACf,QAAQ,GAAG,KAAK,EAChB,OAAO,GAOR;QACC,MAAM,IAAI,GAAG;YACX,SAAS,EAAE,YAAY,CAAC,EAAE;YAC1B,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE;YAC9B,QAAQ;YACR,QAAQ;YACR,cAAc,EAEb,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAU,YAAY,CAAC,KAAK,EAAE,mBAAmB,IAAI,OAAO,CAAC;YAClF,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;SACnC,CAAC;QACF,MAAM,UAAU,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,CAAC;QAC1C,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,CAAC;YACH,MAAM,IAAA,mBAAW,EAAC,UAAU,EAAE,6BAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAClE,IAAI,CAAC,OAAO,CAAC,GAAG,CACd,YAAY,CAAC,OAAO,EACpB,IAAI,yBAAW,CAAC;gBACd,IAAI;gBACJ,UAAU;gBACV,YAAY,EAAE,YAAY,CAAC,EAAE;gBAC7B,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,IAAI,KAAK;aAC/C,CAAC,CACH,CAAC;YACF,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;gBACnC,OAAO,CAAC,GAAG,CACT,qFAAqF,YAAY,CAAC,IAAI,aAAa,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,CAC7I,CAAC;YACJ,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,OAAO,EAAE,CAAC;YACrB,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;gBACnC,OAAO,CAAC,GAAG,CACT,6FAA6F,YAAY,CAAC,IAAI,aAAa,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,CACrJ,CAAC;YACJ,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAyB,IAAO,EAAE,KAAa,EAAE,KAAK,GAAG,CAAC;QACpE,IAAI,IAAI,KAAK,oBAAY,CAAC,OAAO,EAAE,CAAC;YAClC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACxC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;gBACjC,IAAI,EAAE,OAAO;aACd,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACpC,CAAC;aAAM,IAAI,IAAI,KAAK,oBAAY,CAAC,UAAU,EAAE,CAAC;YAC5C,MAAM,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;YACrC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC;gBAC1B,KAAK;gBACL,KAAK;gBACL,MAAM,EAAE,CAAC;gBACT,YAAY,EAAE,QAAQ;aACvB,CAAC,CAAC;YACH,OAAoB,GAAG,CAAC,UAAU,CAAC;QACrC,CAAC;aAAM,IAAI,IAAI,KAAK,oBAAY,CAAC,OAAO,EAAE,CAAC;YACzC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,EAAE;gBACpD,KAAK;aACN,CAAC,CAAC;YACH,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,SAAS,CAAuB,IAAO,EAAE,MAAiB;QACxD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/B,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;YACnC,OAAO,CAAC,GAAG,CACT,gFAAgF,MAAM,CAAC,WAAW,CAAC,IAAI,gBAAgB,IAAI,GAAG,CAC/H,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,CAAC,OAAe;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,EAAE,QAAQ,EAAE,CAAC;QACnB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7B,OAAO,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;IAC7C,CAAC;CACF;AApYD,0BAoYC;+FA1IiB,MAA6B;IAC3C,IACE,MAAM,CAAC,cAAc,EAAE,aAAa;QACpC,CAAC,OAAO,MAAM,CAAC,cAAc,CAAC,aAAa,KAAK,QAAQ;YACtD,MAAM,CAAC,cAAc,CAAC,aAAa,GAAG,CAAC,CAAC,EAC1C,CAAC;QACD,MAAM,IAAI,KAAK,CACb,wEAAwE,CACzE,CAAC;IACJ,CAAC;SAAM,IACL,MAAM,CAAC,cAAc,EAAE,wBAAwB;QAC/C,CAAC,OAAO,MAAM,CAAC,cAAc,CAAC,wBAAwB,KAAK,QAAQ;YACjE,MAAM,CAAC,cAAc,CAAC,wBAAwB,GAAG,CAAC,CAAC,CAAC,EACtD,CAAC;QACD,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;IACJ,CAAC;SAAM,IACL,MAAM,CAAC,cAAc,EAAE,oBAAoB;QAC3C,CAAC,OAAO,MAAM,CAAC,cAAc,CAAC,oBAAoB,KAAK,QAAQ;YAC7D,MAAM,CAAC,cAAc,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC,EAClD,CAAC;QACD,MAAM,IAAI,KAAK,CACb,gFAAgF,CACjF,CAAC;IACJ,CAAC;SAAM,IACL,MAAM,CAAC,cAAc,EAAE,oBAAoB;QAC3C,CAAC,OAAO,MAAM,CAAC,cAAc,CAAC,oBAAoB,KAAK,QAAQ;YAC7D,MAAM,CAAC,cAAc,CAAC,oBAAoB,GAAG,CAAC,CAAC,CAAC,EAClD,CAAC;QACD,MAAM,IAAI,KAAK,CACb,gFAAgF,CACjF,CAAC;IACJ,CAAC;SAAM,IACL,MAAM,CAAC,UAAU,EAAE,KAAK;QACxB,OAAO,MAAM,CAAC,UAAU,CAAC,KAAK,KAAK,SAAS,EAC5C,CAAC;QACD,MAAM,IAAI,KAAK,CACb,oEAAoE,CACrE,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACpC,CAAC;AACH,CAAC"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 5899eaf..57172c0 100755 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,18 @@ { "name": "@aoijs/aoi.music", - "version": "1.1.1", + "version": "1.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@aoijs/aoi.music", - "version": "1.1.1", + "version": "1.2.1", "license": "Apache-2.0", "dependencies": { "@discordjs/voice": "^0.17.0", "@ffprobe-installer/ffprobe": "^2.1.2", - "bgutils-js": "^1.0.1", - "discord.js": "^14.15.3", + "bgutils-js": "^2.1.0", + "discord.js": "^14.16.2", "get-audio-duration": "^4.0.1", "hidefile": "^3.0.0", "jsdom": "^24.1.1", @@ -24,9 +24,9 @@ "spotify-web-api-node": "^5.0.2", "tiny-typed-emitter": "^2.1.0", "tweetnacl": "^1.0.3", - "undici": "^6.19.5", + "undici": "^6.19.8", "youtube-scrapper": "^1.4.0", - "youtubei.js": "^10.4.0" + "youtubei.js": "^10.5.0" }, "devDependencies": { "@discordjs/opus": "^0.9.0", @@ -52,6 +52,11 @@ "node": ">=6.9.0" } }, + "node_modules/@bufbuild/protobuf": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.1.0.tgz", + "integrity": "sha512-+2Mx67Y3skJ4NCD/qNSdBJNWtu6x6Qr53jeNg+QcwiL6mt0wK+3jwHH2x1p7xaYH6Ve2JKOVn0OxU35WsmqI9A==" + }, "node_modules/@derhuerst/http-basic": { "version": "8.2.4", "devOptional": true, @@ -67,25 +72,30 @@ } }, "node_modules/@discordjs/builders": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.8.2.tgz", - "integrity": "sha512-6wvG3QaCjtMu0xnle4SoOIeFB4y6fKMN6WZfy3BMKJdQQtPLik8KGzDwBVL/+wTtcE/ZlFjgEk74GublyEVZ7g==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.9.0.tgz", + "integrity": "sha512-0zx8DePNVvQibh5ly5kCEei5wtPBIUbSoE9n+91Rlladz4tgtFbJ36PZMxxZrTEOQ7AHMZ/b0crT/0fCy6FTKg==", "dependencies": { - "@discordjs/formatters": "^0.4.0", - "@discordjs/util": "^1.1.0", - "@sapphire/shapeshift": "^3.9.7", - "discord-api-types": "0.37.83", + "@discordjs/formatters": "^0.5.0", + "@discordjs/util": "^1.1.1", + "@sapphire/shapeshift": "^4.0.0", + "discord-api-types": "0.37.97", "fast-deep-equal": "^3.1.3", "ts-mixer": "^6.0.4", - "tslib": "^2.6.2" + "tslib": "^2.6.3" }, "engines": { - "node": ">=16.11.0" + "node": ">=18" }, "funding": { "url": "https://github.com/discordjs/discord.js?sponsor" } }, + "node_modules/@discordjs/builders/node_modules/discord-api-types": { + "version": "0.37.97", + "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.97.tgz", + "integrity": "sha512-No1BXPcVkyVD4ZVmbNgDKaBoqgeQ+FJpzZ8wqHkfmBnTZig1FcH3iPPersiK1TUIAzgClh2IvOuVUYfcWLQAOA==" + }, "node_modules/@discordjs/collection": { "version": "1.5.3", "license": "Apache-2.0", @@ -94,19 +104,24 @@ } }, "node_modules/@discordjs/formatters": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.4.0.tgz", - "integrity": "sha512-fJ06TLC1NiruF35470q3Nr1bi95BdvKFAF+T5bNfZJ4bNdqZ3VZ+Ttg6SThqTxm6qumSG3choxLBHMC69WXNXQ==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.5.0.tgz", + "integrity": "sha512-98b3i+Y19RFq1Xke4NkVY46x8KjJQjldHUuEbCqMvp1F5Iq9HgnGpu91jOi/Ufazhty32eRsKnnzS8n4c+L93g==", "dependencies": { - "discord-api-types": "0.37.83" + "discord-api-types": "0.37.97" }, "engines": { - "node": ">=16.11.0" + "node": ">=18" }, "funding": { "url": "https://github.com/discordjs/discord.js?sponsor" } }, + "node_modules/@discordjs/formatters/node_modules/discord-api-types": { + "version": "0.37.97", + "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.97.tgz", + "integrity": "sha512-No1BXPcVkyVD4ZVmbNgDKaBoqgeQ+FJpzZ8wqHkfmBnTZig1FcH3iPPersiK1TUIAzgClh2IvOuVUYfcWLQAOA==" + }, "node_modules/@discordjs/node-pre-gyp": { "version": "0.4.5", "devOptional": true, @@ -141,31 +156,31 @@ } }, "node_modules/@discordjs/rest": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.3.0.tgz", - "integrity": "sha512-C1kAJK8aSYRv3ZwMG8cvrrW4GN0g5eMdP8AuN8ODH5DyOCbHgJspze1my3xHOAgwLJdKUbWNVyAeJ9cEdduqIg==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.4.0.tgz", + "integrity": "sha512-Xb2irDqNcq+O8F0/k/NaDp7+t091p+acb51iA4bCKfIn+WFWd6HrNvcsSbMMxIR9NjcMZS6NReTKygqiQN+ntw==", "dependencies": { - "@discordjs/collection": "^2.1.0", - "@discordjs/util": "^1.1.0", - "@sapphire/async-queue": "^1.5.2", + "@discordjs/collection": "^2.1.1", + "@discordjs/util": "^1.1.1", + "@sapphire/async-queue": "^1.5.3", "@sapphire/snowflake": "^3.5.3", - "@vladfrangu/async_event_emitter": "^2.2.4", - "discord-api-types": "0.37.83", + "@vladfrangu/async_event_emitter": "^2.4.6", + "discord-api-types": "0.37.97", "magic-bytes.js": "^1.10.0", - "tslib": "^2.6.2", - "undici": "6.13.0" + "tslib": "^2.6.3", + "undici": "6.19.8" }, "engines": { - "node": ">=16.11.0" + "node": ">=18" }, "funding": { "url": "https://github.com/discordjs/discord.js?sponsor" } }, "node_modules/@discordjs/rest/node_modules/@discordjs/collection": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-2.1.0.tgz", - "integrity": "sha512-mLcTACtXUuVgutoznkh6hS3UFqYirDYAg5Dc1m8xn6OvPjetnUlf/xjtqnnc47OwWdaoCQnHmHh9KofhD6uRqw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-2.1.1.tgz", + "integrity": "sha512-LiSusze9Tc7qF03sLCujF5iZp7K+vRNEDBZ86FT9aQAv3vxMLihUvKvpsCWiQ2DJq1tVckopKm1rxomgNUc9hg==", "engines": { "node": ">=18" }, @@ -173,20 +188,17 @@ "url": "https://github.com/discordjs/discord.js?sponsor" } }, - "node_modules/@discordjs/rest/node_modules/undici": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.13.0.tgz", - "integrity": "sha512-Q2rtqmZWrbP8nePMq7mOJIN98M0fYvSgV89vwl/BQRT4mDOeY2GXZngfGpcBBhtky3woM7G24wZV3Q304Bv6cw==", - "engines": { - "node": ">=18.0" - } + "node_modules/@discordjs/rest/node_modules/discord-api-types": { + "version": "0.37.97", + "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.97.tgz", + "integrity": "sha512-No1BXPcVkyVD4ZVmbNgDKaBoqgeQ+FJpzZ8wqHkfmBnTZig1FcH3iPPersiK1TUIAzgClh2IvOuVUYfcWLQAOA==" }, "node_modules/@discordjs/util": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-1.1.0.tgz", - "integrity": "sha512-IndcI5hzlNZ7GS96RV3Xw1R2kaDuXEp7tRIy/KlhidpN/BQ1qh1NZt3377dMLTa44xDUNKT7hnXkA/oUAzD/lg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-1.1.1.tgz", + "integrity": "sha512-eddz6UnOBEB1oITPinyrB2Pttej49M9FZQY8NxgEvc3tq6ZICZ19m70RsmzRdDHk80O9NoYN/25AqJl8vPVf/g==", "engines": { - "node": ">=16.11.0" + "node": ">=18" }, "funding": { "url": "https://github.com/discordjs/discord.js?sponsor" @@ -282,18 +294,18 @@ ] }, "node_modules/@sapphire/async-queue": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.2.tgz", - "integrity": "sha512-7X7FFAA4DngXUl95+hYbUF19bp1LGiffjJtu7ygrZrbdCSsdDDBaSjB7Akw0ZbOu6k0xpXyljnJ6/RZUvLfRdg==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.3.tgz", + "integrity": "sha512-x7zadcfJGxFka1Q3f8gCts1F0xMwCKbZweM85xECGI0hBTeIZJGGCrHgLggihBoprlQ/hBmDR5LKfIPqnmHM3w==", "engines": { "node": ">=v14.0.0", "npm": ">=7.0.0" } }, "node_modules/@sapphire/shapeshift": { - "version": "3.9.7", - "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-3.9.7.tgz", - "integrity": "sha512-4It2mxPSr4OGn4HSQWGmhFMsNFGfFVhWeRPCRwbH972Ek2pzfGRZtb0pJ4Ze6oIzcyh2jw7nUDa6qGlWofgd9g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-4.0.0.tgz", + "integrity": "sha512-d9dUmWVA7MMiKobL3VpLF8P2aeanRTu6ypG2OIaEv/ZHH/SUQ2iHOVyi5wAPjQ+HmnMuL0whK9ez8I/raWbtIg==", "dependencies": { "fast-deep-equal": "^3.1.3", "lodash": "^4.17.21" @@ -312,21 +324,61 @@ } }, "node_modules/@shikijs/core": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.10.3.tgz", - "integrity": "sha512-D45PMaBaeDHxww+EkcDQtDAtzv00Gcsp72ukBtaLSmqRvh0WgGMq3Al0rl1QQBZfuneO75NXMIzEZGFitThWbg==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.18.0.tgz", + "integrity": "sha512-VK4BNVCd2leY62Nm2JjyxtRLkyrZT/tv104O81eyaCjHq4Adceq2uJVFJJAIof6lT1mBwZrEo2qT/T+grv3MQQ==", + "dev": true, + "dependencies": { + "@shikijs/engine-javascript": "1.18.0", + "@shikijs/engine-oniguruma": "1.18.0", + "@shikijs/types": "1.18.0", + "@shikijs/vscode-textmate": "^9.2.2", + "@types/hast": "^3.0.4", + "hast-util-to-html": "^9.0.3" + } + }, + "node_modules/@shikijs/engine-javascript": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.18.0.tgz", + "integrity": "sha512-qoP/aO/ATNwYAUw1YMdaip/YVEstMZEgrwhePm83Ll9OeQPuxDZd48szZR8oSQNQBT8m8UlWxZv8EA3lFuyI5A==", + "dev": true, + "dependencies": { + "@shikijs/types": "1.18.0", + "@shikijs/vscode-textmate": "^9.2.2", + "oniguruma-to-js": "0.4.3" + } + }, + "node_modules/@shikijs/engine-oniguruma": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.18.0.tgz", + "integrity": "sha512-B9u0ZKI/cud+TcmF8Chyh+R4V5qQVvyDOqXC2l2a4x73PBSBc6sZ0JRAX3eqyJswqir6ktwApUUGBYePdKnMJg==", + "dev": true, + "dependencies": { + "@shikijs/types": "1.18.0", + "@shikijs/vscode-textmate": "^9.2.2" + } + }, + "node_modules/@shikijs/types": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.18.0.tgz", + "integrity": "sha512-O9N36UEaGGrxv1yUrN2nye7gDLG5Uq0/c1LyfmxsvzNPqlHzWo9DI0A4+fhW2y3bGKuQu/fwS7EPdKJJCowcVA==", "dev": true, - "license": "MIT", "dependencies": { + "@shikijs/vscode-textmate": "^9.2.2", "@types/hast": "^3.0.4" } }, + "node_modules/@shikijs/vscode-textmate": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-9.2.2.tgz", + "integrity": "sha512-TMp15K+GGYrWlZM8+Lnj9EaHEFmOen0WJBrfa17hF7taDOYthuPPV0GWzfd/9iMij0akS/8Yw2ikquH7uVi/fg==", + "dev": true + }, "node_modules/@types/hast": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz", "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/unist": "*" } @@ -339,20 +391,28 @@ "@types/node": "*" } }, + "node_modules/@types/mdast": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz", + "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==", + "dev": true, + "dependencies": { + "@types/unist": "*" + } + }, "node_modules/@types/node": { - "version": "22.0.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.0.2.tgz", - "integrity": "sha512-yPL6DyFwY5PiMVEwymNeqUTKsDczQBJ/5T7W/46RwLU/VH+AA8aT5TZkvBviLKLbbm0hlfftEkGrNzfRk/fofQ==", + "version": "22.5.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.5.tgz", + "integrity": "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==", "dependencies": { - "undici-types": "~6.11.1" + "undici-types": "~6.19.2" } }, "node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true, - "license": "MIT" + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true }, "node_modules/@types/ws": { "version": "8.5.10", @@ -361,10 +421,16 @@ "@types/node": "*" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "node_modules/@vladfrangu/async_event_emitter": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.4.3.tgz", - "integrity": "sha512-wn15EJHUk2RDtCw6wVJndUhFbfJYwyNhSD9s+yiQi5c2MmXDy3KLWvZ5LrcOzt3CHdscoAnaJrxIRKBI1QQgGw==", + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/@vladfrangu/async_event_emitter/-/async_event_emitter-2.4.6.tgz", + "integrity": "sha512-RaI5qZo6D2CVS6sTHFKg1v5Ohq/+Bo2LZ5gzUEwZ/WkHhwtGTCB/sVLw8ijOkAUxasZ+WshN/Rzj4ywsABJ5ZA==", "engines": { "node": ">=v14.0.0", "npm": ">=7.0.0" @@ -446,9 +512,12 @@ "license": "MIT" }, "node_modules/bgutils-js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bgutils-js/-/bgutils-js-1.0.1.tgz", - "integrity": "sha512-onAYO5FZ4fSNOtnC6qxQXNFbR03t/wxBrOAwBpUcw2eUpXgcaUncQ386QTV2RrFTK4KB6vustc7SHeCbM+40fA==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/bgutils-js/-/bgutils-js-2.1.0.tgz", + "integrity": "sha512-QCUUE/N9NT7zasJahxYdXLixAoxrK+mb6GmQBc9SvAixgeFt+GPW7wJ5Wk0/7JIxcWaKXa/p96CCYWuXyWlUkg==", + "funding": [ + "https://github.com/sponsors/LuanRT" + ] }, "node_modules/brace-expansion": { "version": "1.1.11", @@ -486,6 +555,36 @@ "devOptional": true, "license": "Apache-2.0" }, + "node_modules/ccount": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz", + "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/character-entities-html4": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz", + "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/character-entities-legacy": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz", + "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/chownr": { "version": "2.0.0", "devOptional": true, @@ -512,6 +611,16 @@ "node": ">= 0.8" } }, + "node_modules/comma-separated-tokens": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz", + "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/component-emitter": { "version": "1.3.1", "license": "MIT", @@ -665,6 +774,15 @@ "devOptional": true, "license": "MIT" }, + "node_modules/dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/detect-libc": { "version": "2.0.3", "devOptional": true, @@ -673,43 +791,53 @@ "node": ">=8" } }, + "node_modules/devlop": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz", + "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==", + "dev": true, + "dependencies": { + "dequal": "^2.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/discord-api-types": { "version": "0.37.83", "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.83.tgz", "integrity": "sha512-urGGYeWtWNYMKnYlZnOnDHm8fVRffQs3U0SpE8RHeiuLKb/u92APS8HoQnPTFbnXmY1vVnXjXO4dOxcAn3J+DA==" }, "node_modules/discord.js": { - "version": "14.15.3", - "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.15.3.tgz", - "integrity": "sha512-/UJDQO10VuU6wQPglA4kz2bw2ngeeSbogiIPx/TsnctfzV/tNf+q+i1HlgtX1OGpeOBpJH9erZQNO5oRM2uAtQ==", - "license": "Apache-2.0", + "version": "14.16.2", + "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.16.2.tgz", + "integrity": "sha512-VGNi9WE2dZIxYM8/r/iatQQ+3LT8STW4hhczJOwm+DBeHq66vsKDCk8trChNCB01sMO9crslYuEMeZl2d7r3xw==", "dependencies": { - "@discordjs/builders": "^1.8.2", + "@discordjs/builders": "^1.9.0", "@discordjs/collection": "1.5.3", - "@discordjs/formatters": "^0.4.0", - "@discordjs/rest": "^2.3.0", - "@discordjs/util": "^1.1.0", - "@discordjs/ws": "^1.1.1", + "@discordjs/formatters": "^0.5.0", + "@discordjs/rest": "^2.4.0", + "@discordjs/util": "^1.1.1", + "@discordjs/ws": "1.1.1", "@sapphire/snowflake": "3.5.3", - "discord-api-types": "0.37.83", + "discord-api-types": "0.37.97", "fast-deep-equal": "3.1.3", "lodash.snakecase": "4.1.1", - "tslib": "2.6.2", - "undici": "6.13.0" + "tslib": "^2.6.3", + "undici": "6.19.8" }, "engines": { - "node": ">=16.11.0" + "node": ">=18" }, "funding": { "url": "https://github.com/discordjs/discord.js?sponsor" } }, - "node_modules/discord.js/node_modules/undici": { - "version": "6.13.0", - "license": "MIT", - "engines": { - "node": ">=18.0" - } + "node_modules/discord.js/node_modules/discord-api-types": { + "version": "0.37.97", + "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.37.97.tgz", + "integrity": "sha512-No1BXPcVkyVD4ZVmbNgDKaBoqgeQ+FJpzZ8wqHkfmBnTZig1FcH3iPPersiK1TUIAzgClh2IvOuVUYfcWLQAOA==" }, "node_modules/dotenv": { "version": "8.6.0", @@ -1026,6 +1154,42 @@ "node": ">= 0.4" } }, + "node_modules/hast-util-to-html": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.3.tgz", + "integrity": "sha512-M17uBDzMJ9RPCqLMO92gNNUDuBSq10a25SDBI08iCCxmorf4Yy6sYHK57n9WAbRAAaU+DuR4W6GN9K4DFZesYg==", + "dev": true, + "dependencies": { + "@types/hast": "^3.0.0", + "@types/unist": "^3.0.0", + "ccount": "^2.0.0", + "comma-separated-tokens": "^2.0.0", + "hast-util-whitespace": "^3.0.0", + "html-void-elements": "^3.0.0", + "mdast-util-to-hast": "^13.0.0", + "property-information": "^6.0.0", + "space-separated-tokens": "^2.0.0", + "stringify-entities": "^4.0.0", + "zwitch": "^2.0.4" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/hast-util-whitespace": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz", + "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==", + "dev": true, + "dependencies": { + "@types/hast": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/hidefile": { "version": "3.0.0", "license": "MIT", @@ -1051,6 +1215,16 @@ "node": ">=18" } }, + "node_modules/html-void-elements": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz", + "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/http-proxy-agent": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", @@ -1169,9 +1343,9 @@ } }, "node_modules/jsdom": { - "version": "24.1.1", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.1.tgz", - "integrity": "sha512-5O1wWV99Jhq4DV7rCLIoZ/UIhyQeDR7wHVyZAHAshbrvZsLs+Xzz7gtwnlJTJDjleiTKh54F4dXrX70vJQTyJQ==", + "version": "24.1.3", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.3.tgz", + "integrity": "sha512-MyL55p3Ut3cXbeBEG7Hcv0mVM8pp8PBNWxRqchZnSfAiES1v1mRnMeFfaHWIPULpwsYfvO+ZmMZz5tGCnjzDUQ==", "dependencies": { "cssstyle": "^4.0.1", "data-urls": "^5.0.0", @@ -1354,6 +1528,27 @@ "markdown-it": "bin/markdown-it.mjs" } }, + "node_modules/mdast-util-to-hast": { + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz", + "integrity": "sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==", + "dev": true, + "dependencies": { + "@types/hast": "^3.0.0", + "@types/mdast": "^4.0.0", + "@ungap/structured-clone": "^1.0.0", + "devlop": "^1.0.0", + "micromark-util-sanitize-uri": "^2.0.0", + "trim-lines": "^3.0.0", + "unist-util-position": "^5.0.0", + "unist-util-visit": "^5.0.0", + "vfile": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/mdurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", @@ -1372,6 +1567,95 @@ "node": ">= 0.6" } }, + "node_modules/micromark-util-character": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.0.tgz", + "integrity": "sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "dependencies": { + "micromark-util-symbol": "^2.0.0", + "micromark-util-types": "^2.0.0" + } + }, + "node_modules/micromark-util-encode": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.0.tgz", + "integrity": "sha512-pS+ROfCXAGLWCOc8egcBvT0kf27GoWMqtdarNfDcjb6YLuV5cM3ioG45Ys2qOVqeqSbjaKg72vU+Wby3eddPsA==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ] + }, + "node_modules/micromark-util-sanitize-uri": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.0.tgz", + "integrity": "sha512-WhYv5UEcZrbAtlsnPuChHUAsu/iBPOVaEVsntLBIdpibO0ddy8OzavZz3iL2xVvBZOpolujSliP65Kq0/7KIYw==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ], + "dependencies": { + "micromark-util-character": "^2.0.0", + "micromark-util-encode": "^2.0.0", + "micromark-util-symbol": "^2.0.0" + } + }, + "node_modules/micromark-util-symbol": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz", + "integrity": "sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ] + }, + "node_modules/micromark-util-types": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.0.tgz", + "integrity": "sha512-oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w==", + "dev": true, + "funding": [ + { + "type": "GitHub Sponsors", + "url": "https://github.com/sponsors/unifiedjs" + }, + { + "type": "OpenCollective", + "url": "https://opencollective.com/unified" + } + ] + }, "node_modules/mime": { "version": "2.6.0", "license": "MIT", @@ -1570,6 +1854,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/oniguruma-to-js": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/oniguruma-to-js/-/oniguruma-to-js-0.4.3.tgz", + "integrity": "sha512-X0jWUcAlxORhOqqBREgPMgnshB7ZGYszBNspP+tS9hPD3l13CdaXcHbgImoHUHlrvGx/7AvFEkTRhAGYh+jzjQ==", + "dev": true, + "dependencies": { + "regex": "^4.3.2" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, "node_modules/opusscript": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/opusscript/-/opusscript-0.0.8.tgz", @@ -1639,6 +1935,16 @@ "node": ">=0.4.0" } }, + "node_modules/property-information": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/property-information/-/property-information-6.5.0.tgz", + "integrity": "sha512-PgTgs/BlvHxOu8QuEN7wi5A0OmXaBcHpmCSTehcs6Uuu9IkDIEo13Hy7n898RHfrQ49vKCoGeWZSaAK01nwVig==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", @@ -1696,6 +2002,12 @@ "version": "0.14.1", "license": "MIT" }, + "node_modules/regex": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/regex/-/regex-4.3.2.tgz", + "integrity": "sha512-kK/AA3A9K6q2js89+VMymcboLOlF5lZRCYJv3gzszXFHBr6kO6qLGzbm+UIugBEV8SMMKCTR59txoY6ctRHYVw==", + "dev": true + }, "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -1806,13 +2118,16 @@ } }, "node_modules/shiki": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.10.3.tgz", - "integrity": "sha512-eneCLncGuvPdTutJuLyUGS8QNPAVFO5Trvld2wgEq1e002mwctAhJKeMGWtWVXOIEzmlcLRqcgPSorR6AVzOmQ==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.18.0.tgz", + "integrity": "sha512-8jo7tOXr96h9PBQmOHVrltnETn1honZZY76YA79MHheGQg55jBvbm9dtU+MI5pjC5NJCFuA6rvVTLVeSW5cE4A==", "dev": true, - "license": "MIT", "dependencies": { - "@shikijs/core": "1.10.3", + "@shikijs/core": "1.18.0", + "@shikijs/engine-javascript": "1.18.0", + "@shikijs/engine-oniguruma": "1.18.0", + "@shikijs/types": "1.18.0", + "@shikijs/vscode-textmate": "^9.2.2", "@types/hast": "^3.0.4" } }, @@ -1852,6 +2167,16 @@ "version": "1.0.13", "license": "ISC" }, + "node_modules/space-separated-tokens": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz", + "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/spotify-uri": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/spotify-uri/-/spotify-uri-4.1.0.tgz", @@ -1901,6 +2226,20 @@ "node": ">=8" } }, + "node_modules/stringify-entities": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz", + "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==", + "dev": true, + "dependencies": { + "character-entities-html4": "^2.0.0", + "character-entities-legacy": "^3.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/strip-ansi": { "version": "6.0.1", "devOptional": true, @@ -1987,14 +2326,25 @@ "devOptional": true, "license": "MIT" }, + "node_modules/trim-lines": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz", + "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/ts-mixer": { "version": "6.0.4", "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.4.tgz", "integrity": "sha512-ufKpbmrugz5Aou4wcr5Wc1UUFWOLhq+Fm6qa6P0w0K5Qw2yhaUoiWszhCVuNQyNwrlGiscHOmqYoAox1PtvgjA==" }, "node_modules/tslib": { - "version": "2.6.2", - "license": "0BSD" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "node_modules/tweetnacl": { "version": "1.0.3", @@ -2006,16 +2356,16 @@ "license": "MIT" }, "node_modules/typedoc": { - "version": "0.26.5", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.26.5.tgz", - "integrity": "sha512-Vn9YKdjKtDZqSk+by7beZ+xzkkr8T8CYoiasqyt4TTRFy5+UHzL/mF/o4wGBjRF+rlWQHDb0t6xCpA3JNL5phg==", + "version": "0.26.7", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.26.7.tgz", + "integrity": "sha512-gUeI/Wk99vjXXMi8kanwzyhmeFEGv1LTdTQsiyIsmSYsBebvFxhbcyAx7Zjo4cMbpLGxM4Uz3jVIjksu/I2v6Q==", "dev": true, "dependencies": { "lunr": "^2.3.9", "markdown-it": "^14.1.0", "minimatch": "^9.0.5", - "shiki": "^1.9.1", - "yaml": "^2.4.5" + "shiki": "^1.16.2", + "yaml": "^2.5.1" }, "bin": { "typedoc": "bin/typedoc" @@ -2024,7 +2374,7 @@ "node": ">= 18" }, "peerDependencies": { - "typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x" + "typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x" } }, "node_modules/typedoc-plugin-extras": { @@ -2064,9 +2414,9 @@ } }, "node_modules/typescript": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", - "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz", + "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -2084,17 +2434,85 @@ "license": "MIT" }, "node_modules/undici": { - "version": "6.19.5", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.5.tgz", - "integrity": "sha512-LryC15SWzqQsREHIOUybavaIHF5IoL0dJ9aWWxL/PgT1KfqAW5225FZpDUFlt9xiDMS2/S7DOKhFWA7RLksWdg==", + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.8.tgz", + "integrity": "sha512-U8uCCl2x9TK3WANvmBavymRzxbfFYG+tAu+fgx3zxQy3qdagQqBLwJVrdyO1TBfUXvfKveMKJZhpvUYoOjM+4g==", "engines": { "node": ">=18.17" } }, "node_modules/undici-types": { - "version": "6.11.1", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.11.1.tgz", - "integrity": "sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ==" + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==" + }, + "node_modules/unist-util-is": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz", + "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==", + "dev": true, + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-position": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz", + "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==", + "dev": true, + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-stringify-position": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz", + "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==", + "dev": true, + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-visit": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz", + "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==", + "dev": true, + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0", + "unist-util-visit-parents": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/unist-util-visit-parents": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz", + "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==", + "dev": true, + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } }, "node_modules/universalify": { "version": "0.2.0", @@ -2117,6 +2535,34 @@ "version": "1.0.2", "license": "MIT" }, + "node_modules/vfile": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz", + "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==", + "dev": true, + "dependencies": { + "@types/unist": "^3.0.0", + "vfile-message": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/vfile-message": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz", + "integrity": "sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==", + "dev": true, + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-stringify-position": "^4.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/w3c-xmlserializer": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", @@ -2236,11 +2682,10 @@ "license": "ISC" }, "node_modules/yaml": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz", - "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz", + "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==", "dev": true, - "license": "ISC", "bin": { "yaml": "bin.mjs" }, @@ -2264,13 +2709,14 @@ } }, "node_modules/youtubei.js": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/youtubei.js/-/youtubei.js-10.4.0.tgz", - "integrity": "sha512-FZahkkg5ROyH/FgJ4czy/xDNkqHbJTCUQzumQlnR+2Q7m6HaWghAFWWJUTcexemGuu7t/5EuyQz98eBgKQRMog==", + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/youtubei.js/-/youtubei.js-10.5.0.tgz", + "integrity": "sha512-iyA+VF28c15tCCKH9ExM2RKC3zYiHzA/eixGlJ3vERANkuI+xYKzAZ4vtOhmyqwrAddu88R/DkzEsmpph5NWjg==", "funding": [ "https://github.com/sponsors/LuanRT" ], "dependencies": { + "@bufbuild/protobuf": "^2.0.0", "jintr": "^2.1.1", "tslib": "^2.5.0", "undici": "^5.19.1" @@ -2286,6 +2732,16 @@ "engines": { "node": ">=14.0" } + }, + "node_modules/zwitch": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz", + "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==", + "dev": true, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } } } } diff --git a/package.json b/package.json index c055288..64a93ef 100755 --- a/package.json +++ b/package.json @@ -34,8 +34,8 @@ "dependencies": { "@discordjs/voice": "^0.17.0", "@ffprobe-installer/ffprobe": "^2.1.2", - "bgutils-js": "^1.0.1", - "discord.js": "^14.15.3", + "bgutils-js": "^2.1.0", + "discord.js": "^14.16.2", "get-audio-duration": "^4.0.1", "hidefile": "^3.0.0", "jsdom": "^24.1.1", @@ -47,9 +47,9 @@ "spotify-web-api-node": "^5.0.2", "tiny-typed-emitter": "^2.1.0", "tweetnacl": "^1.0.3", - "undici": "^6.19.5", + "undici": "^6.19.8", "youtube-scrapper": "^1.4.0", - "youtubei.js": "^10.4.0" + "youtubei.js": "^10.5.0" }, "devDependencies": { "@discordjs/opus": "^0.9.0", @@ -62,6 +62,6 @@ "typescript": "^5.5.4" }, "engines": { - "node": ">=16.6.0" + "node": ">=18.6.0" } } diff --git a/src/newstruct/audioPlayer.ts b/src/newstruct/audioPlayer.ts index fbc28cb..90609dc 100755 --- a/src/newstruct/audioPlayer.ts +++ b/src/newstruct/audioPlayer.ts @@ -81,7 +81,7 @@ export class AudioPlayer { //@ts-ignore stream = await requestStream( current, - current.formattedPlatforms, + current?.formattedPlatforms ?? "Youtube", this.options.manager ); let s: Readable | FFmpeg; @@ -98,8 +98,6 @@ export class AudioPlayer { ) { const f = this.options.manager.plugins.get(PluginName.Filter); const ffmpeg = f.createFFmpeg("-af", this.#modes.filters.join(",")); - // @ts-expect-error type errors - s = stream.pipe(ffmpeg); resource = createAudioResource(s, { inlineVolume: true, diff --git a/src/newstruct/cacher.ts b/src/newstruct/cacher.ts index edf6892..421ef5a 100755 --- a/src/newstruct/cacher.ts +++ b/src/newstruct/cacher.ts @@ -60,7 +60,6 @@ export class Cacher { const gzip = createGzip(); await writeFile(hash, ""); const file = createWriteStream(hash); - // @ts-expect-error type errors await pipeline(stream, gzip, file); } async write( @@ -93,7 +92,6 @@ export class Cacher { if (stream instanceof ReadableStream) { stream = Readable.from(stream); } - // @ts-expect-error type errors await this.#doCompressionSave(stream, hash); this.#map.set(metaData.id, hash); } @@ -111,9 +109,7 @@ export class Cacher { if (!hash.endsWith(".gz")) return createReadStream(hash); const file = createReadStream(hash); const unzip = createUnzip(); - // @ts-expect-error type errors const stream = file.pipe(unzip); - // @ts-expect-error type errors return Readable.from(stream); } } diff --git a/src/newstruct/filter.ts b/src/newstruct/filter.ts index b1d4ebb..bff775a 100755 --- a/src/newstruct/filter.ts +++ b/src/newstruct/filter.ts @@ -73,7 +73,6 @@ export class Filter { }); let str: Readable | FFmpeg; if (stream instanceof ReadableStream) { - // @ts-expect-error type errors str = Readable.from(stream).pipe(ffmpeg); } else str = stream.pipe(ffmpeg); @@ -96,7 +95,6 @@ export class Filter { const stream = await requestStream(track, track.formattedPlatforms, player.options.manager); let str: Readable | FFmpeg; if (stream instanceof ReadableStream) { - // @ts-expect-error type errors str = Readable.from(stream).pipe(ffmpeg); } else str = stream.pipe(ffmpeg); const newResource = createAudioResource(str, { diff --git a/src/newstruct/manager.ts b/src/newstruct/manager.ts index f534564..50c46b7 100755 --- a/src/newstruct/manager.ts +++ b/src/newstruct/manager.ts @@ -8,7 +8,7 @@ import { } from "@discordjs/voice"; import { Snowflake, VoiceBasedChannel } from "discord.js"; import { TypedEmitter } from "tiny-typed-emitter/lib/index"; -import { Innertube, UniversalCache, Proto, Utils } from "youtubei.js"; +import { Innertube, UniversalCache, Utils } from "youtubei.js"; import IT from "youtubei.js"; import { Credentials, @@ -67,20 +67,22 @@ export class Manager extends TypedEmitter { * */ async function generateYoutubePoToken(): Promise { - const visitorData = Proto.encodeVisitorData( - Utils.generateRandomString(11), - Math.floor(Date.now() / 1000) - ); + let innertube = await Innertube.create({ retrieve_player: false }); + + const requestKey = "O43z0dpjhgX20SCx4KAo"; + const visitorData = innertube.session.context.client.visitorData; const dom = new JSDOM(); - globalThis.window = dom.window; - globalThis.document = dom.window.document; + Object.assign(globalThis, { + window: dom.window, + document: dom.window.document, + }); const bgConfig = { fetch: (url, options) => fetch(url, options), globalObj: globalThis, - identity: visitorData, + identifier: visitorData, requestKey, }; @@ -190,11 +192,17 @@ export class Manager extends TypedEmitter { }); const updateCredentials = (credentials: Partial) => { - const current: Credentials = JSON.parse(readFileSync(authPath, "utf-8")); - + const current: Credentials = JSON.parse( + readFileSync(authPath, "utf-8") + ); + const { visitorData, poToken } = current; - const newCredentials: Credentials = { visitorData, poToken, ...credentials }; - + const newCredentials: Credentials = { + visitorData, + poToken, + ...credentials, + }; + writeFileSync(authPath, JSON.stringify(newCredentials)); }; @@ -253,6 +261,7 @@ export class Manager extends TypedEmitter { soundcloudClientId: undefined, youtubeCookie: undefined, youtubeAuth: true, + youtubeToken: true, youtubegl: "US", youtubeClient: "TV_EMBEDDED", spotifyAuth: {