Inject document script using raw HTML to be fast enough to still be able to hijack listener when visiting YouTube channel page directly

This commit is contained in:
Ajay
2023-03-17 21:10:26 -04:00
parent 758f0b7526
commit 5d610a342f
4 changed files with 172 additions and 101 deletions

14
package-lock.json generated
View File

@@ -27,7 +27,7 @@
], ],
"license": "LGPL-3.0-or-later", "license": "LGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@ajayyy/maze-utils": "^1.1.8", "@ajayyy/maze-utils": "^1.1.9",
"content-scripts-register-polyfill": "^4.0.2", "content-scripts-register-polyfill": "^4.0.2",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0" "react-dom": "^18.2.0"
@@ -67,9 +67,9 @@
} }
}, },
"node_modules/@ajayyy/maze-utils": { "node_modules/@ajayyy/maze-utils": {
"version": "1.1.8", "version": "1.1.9",
"resolved": "https://registry.npmjs.org/@ajayyy/maze-utils/-/maze-utils-1.1.8.tgz", "resolved": "https://registry.npmjs.org/@ajayyy/maze-utils/-/maze-utils-1.1.9.tgz",
"integrity": "sha512-0LwL+i/JvQZYBu6BadYX77XUoU0QVJZXCaElihVTO7suuZ9rracJX7w7A/p12whR/bQ2pO2bCqIvXuWoOiln0Q==", "integrity": "sha512-fU85QRrSBAP31ppFs+Gzfm9vHx+4wFFDr8pSoT747+w6L6cMPlubWG0lFquRTjffStfZlw33kGJOSuwXNiYbAA==",
"funding": [ "funding": [
{ {
"type": "individual", "type": "individual",
@@ -13858,9 +13858,9 @@
}, },
"dependencies": { "dependencies": {
"@ajayyy/maze-utils": { "@ajayyy/maze-utils": {
"version": "1.1.8", "version": "1.1.9",
"resolved": "https://registry.npmjs.org/@ajayyy/maze-utils/-/maze-utils-1.1.8.tgz", "resolved": "https://registry.npmjs.org/@ajayyy/maze-utils/-/maze-utils-1.1.9.tgz",
"integrity": "sha512-0LwL+i/JvQZYBu6BadYX77XUoU0QVJZXCaElihVTO7suuZ9rracJX7w7A/p12whR/bQ2pO2bCqIvXuWoOiln0Q==" "integrity": "sha512-fU85QRrSBAP31ppFs+Gzfm9vHx+4wFFDr8pSoT747+w6L6cMPlubWG0lFquRTjffStfZlw33kGJOSuwXNiYbAA=="
}, },
"@ampproject/remapping": { "@ampproject/remapping": {
"version": "2.2.0", "version": "2.2.0",

View File

@@ -4,7 +4,7 @@
"description": "", "description": "",
"main": "background.js", "main": "background.js",
"dependencies": { "dependencies": {
"@ajayyy/maze-utils": "^1.1.8", "@ajayyy/maze-utils": "^1.1.9",
"content-scripts-register-polyfill": "^4.0.2", "content-scripts-register-polyfill": "^4.0.2",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0" "react-dom": "^18.2.0"

View File

@@ -45,6 +45,7 @@ import { getHash, HashedValue } from "@ajayyy/maze-utils/lib/hash";
import { generateUserID } from "@ajayyy/maze-utils/lib/setup"; import { generateUserID } from "@ajayyy/maze-utils/lib/setup";
import { setThumbnailListener, updateAll } from "@ajayyy/maze-utils/lib/thumbnailManagement"; import { setThumbnailListener, updateAll } from "@ajayyy/maze-utils/lib/thumbnailManagement";
import { labelThumbnails, setupThumbnailPageLoadListener } from "./utils/thumbnails"; import { labelThumbnails, setupThumbnailPageLoadListener } from "./utils/thumbnails";
import * as documentScript from "../dist/js/document.js";
const utils = new Utils(); const utils = new Utils();
@@ -111,7 +112,8 @@ setupVideoModule({
updatePreviewBar(); updatePreviewBar();
updateVisibilityOfPlayerControlsButton(); updateVisibilityOfPlayerControlsButton();
}, },
resetValues resetValues,
documentScript
}, () => Config); }, () => Config);
setThumbnailListener(labelThumbnails); setThumbnailListener(labelThumbnails);
setupThumbnailPageLoadListener(); setupThumbnailPageLoadListener();

View File

@@ -25,37 +25,103 @@ const edgeLanguages = [
"zh_CN" "zh_CN"
] ]
module.exports = env => ({
module.exports = env => {
const documentScriptBuild = webpack({
entry: { entry: {
popup: path.join(__dirname, srcDir + 'popup.ts'), document: {
background: path.join(__dirname, srcDir + 'background.ts'), import: path.join(__dirname, srcDir + 'document.ts'),
content: path.join(__dirname, srcDir + 'content.ts'), },
options: path.join(__dirname, srcDir + 'options.ts'),
help: path.join(__dirname, srcDir + 'help.ts'),
permissions: path.join(__dirname, srcDir + 'permissions.ts'),
document: path.join(__dirname, srcDir + 'document.ts'),
upsell: path.join(__dirname, srcDir + 'upsell.ts')
}, },
output: { output: {
path: path.join(__dirname, '../dist/js'), path: path.join(__dirname, '../dist/js'),
}, },
optimization: {
splitChunks: {
name: 'vendor',
chunks: "initial"
}
},
module: { module: {
rules: [ rules: [
{ {
test: /\.tsx?$/, test: /\.tsx?$/,
loader: 'ts-loader', loader: 'ts-loader',
exclude: /node_modules/, exclude: /node_modules/,
resourceQuery: { not: [/raw/] },
options: { options: {
// disable type checker for user in fork plugin // disable type checker for user in fork plugin
transpileOnly: true, transpileOnly: true,
configFile: env.mode === "production" ? "tsconfig-production.json" : "tsconfig.json" configFile: env.mode === "production" ? "tsconfig-production.json" : "tsconfig.json"
} }
},
]
},
resolve: {
extensions: ['.ts', '.tsx', '.js']
},
plugins: [
// Don't fork TS checker for document script to speed up
// new ForkTsCheckerWebpackPlugin()
]
});
class DocumentScriptCompiler {
currentWatching = null;
/**
*
* @param {webpack.Compiler} compiler
*/
apply(compiler) {
compiler.hooks.beforeCompile.tapAsync({ name: 'DocumentScriptCompiler' }, (compiler, callback) => {
if (env.WEBPACK_WATCH) {
let first = true;
if (!this.currentWatching) {
this.currentWatching = documentScriptBuild.watch({}, () => {
if (first) {
first = false;
callback();
}
});
} else {
callback();
}
} else {
documentScriptBuild.close(() => {
documentScriptBuild.run(() => {
callback();
});
});
}
});
}
}
return {
entry: {
popup: path.join(__dirname, srcDir + 'popup.ts'),
background: path.join(__dirname, srcDir + 'background.ts'),
content: path.join(__dirname, srcDir + 'content.ts'),
options: path.join(__dirname, srcDir + 'options.ts'),
help: path.join(__dirname, srcDir + 'help.ts'),
permissions: path.join(__dirname, srcDir + 'permissions.ts'),
upsell: path.join(__dirname, srcDir + 'upsell.ts')
},
output: {
path: path.join(__dirname, '../dist/js'),
},
module: {
rules: [
{
test: /\.tsx?$/,
loader: 'ts-loader',
exclude: /node_modules/,
resourceQuery: { not: [/raw/] },
options: {
// disable type checker for user in fork plugin
transpileOnly: true,
configFile: env.mode === "production" ? "tsconfig-production.json" : "tsconfig.json"
}
},
{
test: /js\/document\.js$/,
type: 'asset/source'
} }
] ]
}, },
@@ -63,6 +129,8 @@ module.exports = env => ({
extensions: ['.ts', '.tsx', '.js'] extensions: ['.ts', '.tsx', '.js']
}, },
plugins: [ plugins: [
// Prehook to start building document script before normal build
new DocumentScriptCompiler(),
// fork TS checker // fork TS checker
new ForkTsCheckerWebpackPlugin(), new ForkTsCheckerWebpackPlugin(),
// exclude locale files in moment // exclude locale files in moment
@@ -120,4 +188,5 @@ module.exports = env => ({
}), }),
new configDiffPlugin() new configDiffPlugin()
] ]
}); };
};