Add support for castlabs / [email protected] (#1559)

Author: quanglam2807

main-src/libs/app-management/install-app-async/install-app-forked-electron-v2.js

@@ -27,7 +27,7 @@ const fetch = process.env.NODE_ENV === 'production' ? require('node-fetch').defa
 
 const execAsync = require('../../exec-async');
 const checkPathInUseAsync = require('../check-path-in-use-async');
-const getWvvmpElectronVersion = require('../../get-wvvmp-electron-version');
+const getCastlabsElectronVersion = require('../../get-castlabs-electron-version');
 
 // id, name, username might only contain numbers
 // causing yargsParser to parse them correctly as Number instead of String
@@ -297,7 +297,7 @@ Promise.resolve()
 
     // support widevine cdm on mac or linux x64
     if (process.platform === 'darwin' || (process.platform === 'linux' && process.arch === 'x64')) {
-      packagerOpts.electronVersion = getWvvmpElectronVersion(electronVersion);
+      packagerOpts.electronVersion = getCastlabsElectronVersion(electronVersion);
       packagerOpts.download = {
         cacheRoot: electronCachePath,
         mirrorOptions: {

main-src/libs/app-management/prepare-electron-async/prepare-electron-forked.js

@@ -27,7 +27,7 @@ const path = require('path');
 const { downloadArtifact } = require('@electron/get/dist/cjs');
 
 const formatBytes = require('../../format-bytes');
-const getWvvmpElectronVersion = require('../../get-wvvmp-electron-version');
+const getCastlabsElectronVersion = require('../../get-castlabs-electron-version');
 
 const argv = yargsParser(process.argv.slice(1));
 const {
@@ -73,7 +73,7 @@ Promise.resolve()
 
     // support widevine cdm on mac or linux x64
     if (process.platform === 'darwin' || (process.platform === 'linux' && process.arch === 'x64')) {
-      downloadOpts.version = getWvvmpElectronVersion(electronVersion);
+      downloadOpts.version = getCastlabsElectronVersion(electronVersion);
       downloadOpts.mirrorOptions = {
         mirror: 'https://github.com/castlabs/electron-releases/releases/download/',
       };

main-src/libs/get-castlabs-electron-version.js

@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+// The v16 series of Electron for Content Security, labeled wvcus,
+// moves to using the Component Updater Service to handle installation
+// of the Widevine CDM, and has incompatible API updates compared to the previous wvvmp releases.
+const semver = require('semver');
+
+const getCastlabsElectronVersion = (electronVersion) => {
+  // '14.0.0-beta.9' to '14.0.0-beta.9+wvcus'
+  // '14.0.0' to '14.0.0+wvcus'
+  if (semver.gte(electronVersion, '16.0.0-beta.6')) {
+    return `${electronVersion}+wvcus`;
+  }
+
+  // '14.0.0-beta.9' to '14.0.0-wvvmp-beta.9'
+  // '14.0.0' to '14.0.0-wvvmp'
+  const versionParts = electronVersion.split('-');
+  versionParts.splice(1, 0, 'wvvmp');
+  return versionParts.join('-');
+};
+
+module.exports = getCastlabsElectronVersion;

main-src/libs/get-wvvmp-electron-version.js

@@ -38,7 +38,7 @@
     "@material-ui/core": "4.12.3",
     "@material-ui/icons": "4.11.2",
     "@sentry/electron": "2.5.4",
-    "amplitude-js": "8.9.0",
+    "amplitude-js": "8.9.1",
     "auto-launch": "5.0.5",
     "axios": "0.22.0",
     "babel-loader": "8.1.0",
@@ -70,7 +70,7 @@
     "eslint-plugin-react": "7.26.1",
     "eslint-plugin-react-hooks": "1.7.0",
     "file-saver": "2.0.5",
-    "firebase": "9.2.0",
+    "firebase": "9.3.0",
     "follow-redirects": "1.14.5",
     "fs-extra": "10.0.0",
     "gravatar": "1.8.2",
@@ -81,7 +81,7 @@
     "jszip": "3.7.1",
     "menubar": "9.1.0",
     "node-cache": "5.1.2",
-    "node-fetch": "2.6.5",
+    "node-fetch": "2.6.6",
     "node-machine-id": "1.1.12",
     "notistack": "1.0.10",
     "original-fs": "1.1.0",

package.json

@@ -4033,7 +4033,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 -----
 
-The following software may be included in this product: asn1. A copy of the source code may be downloaded from git://github.com/joyent/node-asn1.git. This software contains the following license and notice below:
+The following software may be included in this product: asn1. A copy of the source code may be downloaded from https://github.com/joyent/node-asn1.git. This software contains the following license and notice below:
 
 Copyright (c) 2011 Mark Cavage, All rights reserved.