Merge pull request #673 from Materialious/dependabot/npm_and_yarn/materialious/bgutils-js-3.1.0

Bump bgutils-js from 2.2.0 to 3.1.0 in /materialious

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.

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",

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",

materialious/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.6.23",
+	"version": "1.6.24",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
@@ -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",

materialious/src/lib/patches/youtubejs.ts

@@ -22,24 +22,24 @@ async function getPo(identifier: string): Promise<string | undefined> {
     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<VideoPlay> {

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")