From 0fa93aec4a31fe0f0dd81c975535feb5706ad578 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 10:14:05 +0000 Subject: [PATCH 1/3] Bump bgutils-js from 2.2.0 to 3.1.0 in /materialious Bumps [bgutils-js](https://github.com/LuanRT/BgUtils) from 2.2.0 to 3.1.0. - [Release notes](https://github.com/LuanRT/BgUtils/releases) - [Changelog](https://github.com/LuanRT/BgUtils/blob/main/CHANGELOG.md) - [Commits](https://github.com/LuanRT/BgUtils/commits/v3.1.0) --- updated-dependencies: - dependency-name: bgutils-js dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- materialious/package-lock.json | 11 +++++------ materialious/package.json | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/materialious/package-lock.json b/materialious/package-lock.json index 4560b756..6f644b23 100644 --- a/materialious/package-lock.json +++ b/materialious/package-lock.json @@ -21,7 +21,7 @@ "@ffmpeg/ffmpeg": "^0.12.10", "@mediagrid/capacitor-native-audio": "^1.0.0", "beercss": "^3.7.10", - "bgutils-js": "^2.2.0", + "bgutils-js": "^3.1.0", "capacitor-nodejs": "https://github.com/EdenwareApps/Capacitor-NodeJS/releases/download/v1.0.0-beta.7/capacitor6-nodejs.tgz", "dashjs": "^4.7.4", "fuse.js": "^7.0.0", @@ -4330,13 +4330,12 @@ } }, "node_modules/bgutils-js": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/bgutils-js/-/bgutils-js-2.2.0.tgz", - "integrity": "sha512-6IRDTZIdHxoyfttEHlXfCVHdje8yNoxcgp8Os5pu6uaWdeZMrN7iiXFxk6EGVbcaQTDZEUcH5li8qMK7sqWS0g==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bgutils-js/-/bgutils-js-3.1.0.tgz", + "integrity": "sha512-2S80c/B4OQFubJLD5ddRRp74utrvjA70x9U0RsIVK7gJaDnaPrbw+bnXWxnEnc0euLznmO9jxOtTTC7FxGmv6w==", "funding": [ "https://github.com/sponsors/LuanRT" - ], - "license": "MIT" + ] }, "node_modules/big-integer": { "version": "1.6.52", diff --git a/materialious/package.json b/materialious/package.json index f273c2ca..f1925bef 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -55,7 +55,7 @@ "@ffmpeg/ffmpeg": "^0.12.10", "@mediagrid/capacitor-native-audio": "^1.0.0", "beercss": "^3.7.10", - "bgutils-js": "^2.2.0", + "bgutils-js": "^3.1.0", "capacitor-nodejs": "https://github.com/EdenwareApps/Capacitor-NodeJS/releases/download/v1.0.0-beta.7/capacitor6-nodejs.tgz", "dashjs": "^4.7.4", "fuse.js": "^7.0.0", From 8a2f4a36fc327812844539fc82d19ad369edbbb1 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Tue, 10 Dec 2024 21:56:48 +1300 Subject: [PATCH 2/3] Update getPo func --- materialious/src/lib/patches/youtubejs.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/materialious/src/lib/patches/youtubejs.ts b/materialious/src/lib/patches/youtubejs.ts index 4f74d5e0..42d0c361 100644 --- a/materialious/src/lib/patches/youtubejs.ts +++ b/materialious/src/lib/patches/youtubejs.ts @@ -22,24 +22,24 @@ async function getPo(identifier: string): Promise { identifier }; - const challenge = await BG.Challenge.create(bgConfig); + const bgChallenge = await BG.Challenge.create(bgConfig); - if (!challenge) + if (!bgChallenge) throw new Error('Could not get challenge'); - if (challenge.script) { - const script = challenge.script.find((sc) => sc !== null); - if (script) - new Function(script)(); - } + const interpreterJavascript = bgChallenge.interpreterJavascript.privateDoNotAccessOrElseSafeScriptWrappedValue; - const poToken = await BG.PoToken.generate({ - program: challenge.challenge, - globalName: challenge.globalName, + if (interpreterJavascript) { + new Function(interpreterJavascript)(); + } else throw new Error('Could not load VM'); + + const poTokenResult = await BG.PoToken.generate({ + program: bgChallenge.program, + globalName: bgChallenge.globalName, bgConfig }); - return poToken; + return poTokenResult.poToken; } export async function patchYoutubeJs(videoId: string): Promise { From 002ed72d43c56782b033ee5112d3ced861c61940 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Tue, 10 Dec 2024 22:00:03 +1300 Subject: [PATCH 3/3] Bump to 1.6.24 --- materialious/android/app/build.gradle | 4 ++-- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- update_versions.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 169abf9d..7f9c7486 100644 --- a/materialious/android/app/build.gradle +++ b/materialious/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "us.materialio.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 74 - versionName "1.6.23" + versionCode 75 + versionName "1.6.24" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/materialious/electron/package.json b/materialious/electron/package.json index 2202e57b..524f59fb 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.6.23", + "version": "1.6.24", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 84de51ba..2966bf2a 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.6.23", + "version": "1.6.24", "private": true, "scripts": { "dev": "vite dev", diff --git a/update_versions.py b/update_versions.py index 32f44cd8..a90cc1a3 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.6.23" +LATEST_VERSION = "1.6.24" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")