Merge branch 'master' of https://github.com/wirewirewirewire/browser

Author: smarthomeagentur

Dockerfile.raspberrypi5

@@ -11,6 +11,20 @@ RUN install_packages \
     lsb-release \
     scrot 
 
+RUN install_packages \
+    libgles2-mesa \
+    mesa-vdpau-drivers \
+    xserver-xorg-video-fbdev \
+    libgl1-mesa-dri \
+    libglx-mesa0 \
+    mesa-vulkan-drivers \
+    mesa-va-drivers \
+    alsa-utils \
+    libasound2-dev \
+    pulseaudio \
+    xterm \
+    wget
+
 WORKDIR /usr/src/app
 
 # install node dependencies
@@ -38,9 +52,7 @@ RUN usermod -a -G audio,video,tty chromium
 
 RUN ln -s /usr/bin/chromium /usr/bin/chromium-browser || true
 
-# Set up the audio block. This won't have any effect if the audio block is not being used.
-RUN curl -skL https://raw.githubusercontent.com/balena-labs-projects/audio/master/scripts/alsa-bridge/debian-setup.sh| sh
-ENV PULSE_SERVER=tcp:audio:4317
+COPY ./asound.conf /etc/asound.conf
 
 COPY VERSION .
 ENV DISPLAY=:0

Dockerfile.template

@@ -36,9 +36,6 @@ RUN usermod -a -G audio,video,tty chromium
 
 RUN ln -s /usr/bin/chromium /usr/bin/chromium-browser || true
 
-# Set up the audio block. This won't have any effect if the audio block is not being used.
-RUN curl -skL https://raw.githubusercontent.com/balena-labs-projects/audio/master/scripts/alsa-bridge/debian-setup.sh| sh
-ENV PULSE_SERVER=tcp:audio:4317
 
 COPY VERSION .
 ENV DISPLAY=:0

asound.conf

@@ -0,0 +1,27 @@
+pcm.!default {
+    type plug
+    slave {
+        pcm "hw:2,0"
+        # Optional: Force output to stereo (2 channels) if the ReSpeaker Lite supports it
+        channels 2
+        # Optional: Force output to a common sample rate like 48000 Hz if the ReSpeaker Lite supports it
+        # If not, let 'plug' convert to the ReSpeaker's native rate.
+        rate 16000 
+    }
+}
+
+ctl.!default {
+    type hw           
+    card 2
+}
+
+capture.!pcm {
+    type plug
+    slave {
+        pcm {
+            type hw
+            card 0
+            device 0
+            }
+    }
+}

src/server.js

@@ -143,8 +143,14 @@ let launchChromium = async function (url) {
 
   flags = flags.concat(["--no-sandbox", "--test-type", "--disable-features=Translate"]);
 
+  if (USER_FLAGS != null) {
+    var userFlagsArray = USER_FLAGS.split(" ");
+    flags = flags.concat(userFlagsArray);
+  }
+
   console.log(`Starting Chromium with flags: ${flags}`);
   console.log(`Displaying URL: ${startingUrl}`);
+  console.log(flags);
 
   setTimeout(function () {
     console.log("[MAIN] --- Container set Ready state ---");
@@ -157,6 +163,8 @@ let launchChromium = async function (url) {
     ignoreDefaultFlags: true,
     chromeFlags: flags,
     port: REMOTE_DEBUG_PORT,
+    connectionPollInterval: 1000,
+    maxConnectionRetries: 120,
     userDataDir: "1" === PERSISTENT_DATA ? "/data/chromium" : undefined,
   });