tea/browsertrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define websocket host in common webpack config (#195)

Browse Source 
* move websocket host var to common config, better fix for #193
This commit is contained in:
sua yoo 2022-03-15 18:34:49 -07:00 committed by GitHub
parent e6467c3374
commit 8863776c54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/screencast.ts
View File

@ -233,7 +233,7 @@ export class Screencast extends LitElement {
} }
const baseURL = `${window.location.protocol === "https:" ? "wss" : "ws"}:${ const baseURL = `${window.location.protocol === "https:" ? "wss" : "ws"}:${
window.location.host process.env.WEBSOCKET_HOST || window.location.host
}/watch/${this.archiveId}/${this.crawlId}`; }/watch/${this.archiveId}/${this.crawlId}`;
this.watchIPs.forEach((ip: string) => { this.watchIPs.forEach((ip: string) => {

26
frontend/webpack.config.js
View File

@ -1,5 +1,6 @@
// webpack.config.js // webpack.config.js
const path = require("path"); const path = require("path");
const webpack = require("webpack");
const ESLintPlugin = require("eslint-webpack-plugin"); const ESLintPlugin = require("eslint-webpack-plugin");
const HtmlWebpackPlugin = require("html-webpack-plugin"); const HtmlWebpackPlugin = require("html-webpack-plugin");
const CopyPlugin = require("copy-webpack-plugin"); const CopyPlugin = require("copy-webpack-plugin");
@ -7,9 +8,22 @@ const childProcess = require("child_process");
const isDevServer = process.env.WEBPACK_SERVE; const isDevServer = process.env.WEBPACK_SERVE;
const dotEnvPath = path.resolve(
process.cwd(),
`.env${isDevServer ? `.local` : ""}`
);
require("dotenv").config({
path: dotEnvPath,
});
// for testing: for prod, the Dockerfile should have the official prod version used // for testing: for prod, the Dockerfile should have the official prod version used
const RWP_BASE_URL = process.env.RWP_BASE_URL || "https://replayweb.page/"; const RWP_BASE_URL = process.env.RWP_BASE_URL || "https://replayweb.page/";
const WEBSOCKET_HOST =
isDevServer && process.env.API_BASE_URL
? new URL(process.env.API_BASE_URL).host
: process.env.WEBSOCKET_HOST || "";
// Get git info to use as Glitchtip release version // Get git info to use as Glitchtip release version
const execCommand = (cmd, defValue) => { const execCommand = (cmd, defValue) => {
@ -30,14 +44,6 @@ const commitHash =
process.env.GIT_COMMIT_HASH || process.env.GIT_COMMIT_HASH ||
execCommand("git rev-parse --short HEAD", "unknown"); execCommand("git rev-parse --short HEAD", "unknown");
const dotEnvPath = path.resolve(
process.cwd(),
`.env${isDevServer ? `.local` : ""}`
);
require("dotenv").config({
path: dotEnvPath,
});
const shoelaceAssetsSrcPath = path.resolve( const shoelaceAssetsSrcPath = path.resolve(
__dirname, __dirname,
"node_modules/@shoelace-style/shoelace/dist/assets" "node_modules/@shoelace-style/shoelace/dist/assets"
@ -81,6 +87,10 @@ module.exports = {
}, },
plugins: [ plugins: [
new webpack.DefinePlugin({
"process.env.WEBSOCKET_HOST": JSON.stringify(WEBSOCKET_HOST),
}),
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: "src/index.ejs", template: "src/index.ejs",
templateParameters: { templateParameters: {

11
frontend/webpack.dev.js
View File

@ -1,5 +1,4 @@
const path = require("path"); const path = require("path");
const webpack = require("webpack");
const { merge } = require("webpack-merge"); const { merge } = require("webpack-merge");
const common = require("./webpack.config.js"); const common = require("./webpack.config.js");
@ -8,7 +7,9 @@ const common = require("./webpack.config.js");
const RWP_BASE_URL = process.env.RWP_BASE_URL || "https://replayweb.page/"; const RWP_BASE_URL = process.env.RWP_BASE_URL || "https://replayweb.page/";
if (!process.env.API_BASE_URL) { if (!process.env.API_BASE_URL) {
throw new Error("To run a dev frontend server, please set the API_BASE_URL pointing to your backend api server in '.env.local'") throw new Error(
"To run a dev frontend server, please set the API_BASE_URL pointing to your backend api server in '.env.local'"
);
} }
const devBackendUrl = new URL(process.env.API_BASE_URL); const devBackendUrl = new URL(process.env.API_BASE_URL);
@ -55,10 +56,4 @@ module.exports = merge(common, {
}, },
port: 9870, port: 9870,
}, },
plugins: [
new webpack.DefinePlugin({
"process.env.WEBSOCKET_HOST": JSON.stringify(devBackendUrl.host),
}),
],
}); });