Merge branch 'development' into tray

Author: Devenor

package.json

@@ -67,7 +67,7 @@
     "path-browserify": "^1.0.1",
     "portal-vue": "^2.1.7",
     "process": "^0.11.10",
-    "shaka-player": "^4.13.4",
+    "shaka-player": "^4.13.6",
     "swiper": "^11.2.4",
     "vue": "^2.7.16",
     "vue-i18n": "^8.28.2",
@@ -83,11 +83,11 @@
     "@double-great/stylelint-a11y": "^3.0.4",
     "@eslint/js": "^9.21.0",
     "@intlify/eslint-plugin-vue-i18n": "^3.2.0",
-    "babel-loader": "^9.2.1",
-    "copy-webpack-plugin": "^12.0.2",
+    "babel-loader": "^10.0.0",
+    "copy-webpack-plugin": "^13.0.0",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
-    "electron": "^34.2.0",
+    "electron": "^34.3.0",
     "electron-builder": "^25.1.8",
     "eslint": "^9.21.0",
     "eslint-plugin-jsdoc": "^50.6.3",
@@ -100,15 +100,15 @@
     "html-webpack-plugin": "^5.6.3",
     "js-yaml": "^4.1.0",
     "json-minimizer-webpack-plugin": "^5.0.0",
-    "lefthook": "^1.11.0",
+    "lefthook": "^1.11.2",
     "mini-css-extract-plugin": "^2.9.2",
     "neostandard": "^0.12.1",
     "npm-run-all2": "^7.0.2",
     "postcss": "^8.5.3",
     "postcss-scss": "^4.0.9",
-    "sass": "^1.85.0",
+    "sass": "^1.85.1",
     "sass-loader": "^16.0.5",
-    "stylelint": "^16.14.1",
+    "stylelint": "^16.15.0",
     "stylelint-config-sass-guidelines": "^12.1.0",
     "stylelint-config-standard": "^37.0.0",
     "stylelint-high-performance-animation": "^1.11.0",
@@ -120,6 +120,6 @@
     "webpack": "^5.98.0",
     "webpack-cli": "^6.0.1",
     "webpack-dev-server": "^5.2.0",
-    "yaml-eslint-parser": "^1.2.3"
+    "yaml-eslint-parser": "^1.3.0"
   }
 }

src/constants.js

@@ -4,7 +4,6 @@ const IpcChannels = {
   DISABLE_PROXY: 'disable-proxy',
   OPEN_EXTERNAL_LINK: 'open-external-link',
   GET_SYSTEM_LOCALE: 'get-system-locale',
-  GET_PICTURES_PATH: 'get-pictures-path',
   GET_NAVIGATION_HISTORY: 'get-navigation-history',
   SHOW_SAVE_DIALOG: 'show-save-dialog',
   STOP_POWER_SAVE_BLOCKER: 'stop-power-save-blocker',
@@ -48,6 +47,7 @@ const IpcChannels = {
 
   GENERATE_PO_TOKEN: 'generate-po-token',
 
+  GET_SCREENSHOT_FALLBACK_FOLDER: 'get-screenshot-fallback-folder',
   CHOOSE_DEFAULT_FOLDER: 'choose-default-folder',
   WRITE_SCREENSHOT: 'write-screenshot',
 }

src/main/index.js

@@ -293,6 +293,8 @@ function runApp() {
     })
   }
 
+  let proxyUrl
+
   app.on('ready', async (_, __) => {
     if (process.env.NODE_ENV === 'production') {
       protocol.handle('app', async (request) => {
@@ -412,8 +414,10 @@ function runApp() {
     }
 
     if (useProxy) {
+      proxyUrl = `${proxyProtocol}://${proxyHostname}:${proxyPort}`
+
       session.defaultSession.setProxy({
-        proxyRules: `${proxyProtocol}://${proxyHostname}:${proxyPort}`
+        proxyRules: proxyUrl
       })
     }
 
@@ -960,18 +964,20 @@ function runApp() {
   })
 
   ipcMain.handle(IpcChannels.GENERATE_PO_TOKEN, (_, visitorData) => {
-    return generatePoToken(visitorData)
+    return generatePoToken(visitorData, proxyUrl)
   })
 
   ipcMain.on(IpcChannels.ENABLE_PROXY, (_, url) => {
     session.defaultSession.setProxy({
       proxyRules: url
     })
+    proxyUrl = url
     session.defaultSession.closeAllConnections()
   })
 
   ipcMain.on(IpcChannels.DISABLE_PROXY, () => {
     session.defaultSession.setProxy({})
+    proxyUrl = undefined
     session.defaultSession.closeAllConnections()
   })
 
@@ -1048,10 +1054,6 @@ function runApp() {
     return app.getSystemLocale()
   })
 
-  ipcMain.handle(IpcChannels.GET_PICTURES_PATH, () => {
-    return app.getPath('pictures')
-  })
-
   // Allows programmatic toggling of fullscreen without accompanying user interaction.
   // See: https://developer.mozilla.org/en-US/docs/Web/Security/User_activation#transient_activation
   ipcMain.on(IpcChannels.REQUEST_FULLSCREEN, ({ sender }) => {
@@ -1078,6 +1080,14 @@ function runApp() {
     })
   }
 
+  ipcMain.handle(IpcChannels.GET_SCREENSHOT_FALLBACK_FOLDER, (event) => {
+    if (!isFreeTubeUrl(event.senderFrame.url)) {
+      return
+    }
+
+    return path.join(app.getPath('pictures'), 'Freetube')
+  })
+
   ipcMain.on(IpcChannels.CHOOSE_DEFAULT_FOLDER, async (event, kind) => {
     if (!isFreeTubeUrl(event.senderFrame.url) || (kind !== DefaultFolderKind.DOWNLOADS && kind !== DefaultFolderKind.SCREENSHOTS)) {
       return

src/main/poTokenGenerator.js

@@ -10,9 +10,10 @@ import { join } from 'path'
  * as the BotGuard stuff accesses the global `document` and `window` objects and also requires making some requests.
  * So we definitely don't want it running in the same places as the rest of the FreeTube code with the user data.
  * @param {string} visitorData
+ * @param {string|undefined} proxyUrl
  * @returns {Promise<string>}
  */
-export async function generatePoToken(visitorData) {
+export async function generatePoToken(visitorData, proxyUrl) {
   const sessionUuid = crypto.randomUUID()
 
   const theSession = session.fromPartition(`potoken-${sessionUuid}`, { cache: false })
@@ -28,6 +29,12 @@ export async function generatePoToken(visitorData) {
       .join(' ')
   )
 
+  if (proxyUrl) {
+    await theSession.setProxy({
+      proxyRules: proxyUrl
+    })
+  }
+
   const webContentsView = new WebContentsView({
     webPreferences: {
       backgroundThrottling: false,

src/renderer/components/ChannelDetails/ChannelDetails.vue

@@ -240,7 +240,7 @@ import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import FtCard from '../ft-card/ft-card.vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
-import FtShareButton from '../ft-share-button/ft-share-button.vue'
+import FtShareButton from '../FtShareButton/FtShareButton.vue'
 import FtSubscribeButton from '../FtSubscribeButton/FtSubscribeButton.vue'
 import FtInput from '../ft-input/ft-input.vue'