set XDG_CONFIG_HOME and XDG_CACHE_HOME directly in the puppeteer node…

… file
sni · Sep 4, 2024 · 9c7e7a6 · 9c7e7a6
1 parent d7eef24
commit 9c7e7a6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/script/grafana_export.sh b/script/grafana_export.sh
@@ -25,16 +25,12 @@ export PATH=$PATH:$DIR
 INPUT="$INPUT&from=$START&to=$END"
 
 NODE="node"
-export XDG_CONFIG_HOME=/tmp/.thruk_chromium
-export XDG_CACHE_HOME=/tmp/.thruk_chromium
 if [ -n "$OMD_ROOT" ]; then
     if [ -d "$OMD_ROOT/node_modules/" ]; then
         export NODE_PATH=$OMD_ROOT/node_modules/
     elif [ -d "$OMD_ROOT/lib/node_modules/" ]; then
         export NODE_PATH=$OMD_ROOT/lib/node_modules/
     fi
-    export XDG_CONFIG_HOME=~/tmp/.thruk_chromium
-    export XDG_CACHE_HOME=~/tmp/.thruk_chromium
 fi
 if [ -z "$NODE_PATH" ] && [ -d "/var/lib/thruk/puppeteer/node_modules" ]; then
     export NODE_PATH="/var/lib/thruk/puppeteer/node_modules"

diff --git a/script/html2pdf.sh b/script/html2pdf.sh
@@ -25,16 +25,12 @@ IS_REPORT=$4
 
 
 NODE="node"
-export XDG_CONFIG_HOME=/tmp/.thruk_chromium
-export XDG_CACHE_HOME=/tmp/.thruk_chromium
 if [ -n "$OMD_ROOT" ]; then
     if [ -d "$OMD_ROOT/node_modules/" ]; then
         export NODE_PATH=$OMD_ROOT/node_modules/
     elif [ -d "$OMD_ROOT/lib/node_modules/" ]; then
         export NODE_PATH=$OMD_ROOT/lib/node_modules/
     fi
-    export XDG_CONFIG_HOME=~/tmp/.thruk_chromium
-    export XDG_CACHE_HOME=~/tmp/.thruk_chromium
 fi
 if [ -z "$NODE_PATH" ] && [ -d "/var/lib/thruk/puppeteer/node_modules" ]; then
     export NODE_PATH="/var/lib/thruk/puppeteer/node_modules"

diff --git a/script/puppeteer.js b/script/puppeteer.js
@@ -8,6 +8,9 @@
  */
 
 const puppeteer = require('puppeteer');
+const os        = require('os');
+const path      = require('path');
+
 
 var url       = process.argv[2];
 var output    = process.argv[3];
@@ -17,6 +20,17 @@ var sessionid = process.argv[6];
 var is_report = process.argv[7];
 var waitTimeout = 20000;
 
+// Set XDG_CONFIG_HOME and XDG_CACHE_HOME if not already set (chrome >= ~ 128 does not start otherwise)
+var tempDir = "";
+if(process.env['OMD_ROOT']) {
+  tempDir = path.join(process.env['OMD_ROOT'], 'tmp', 'thruk' `puppeteer.cache.${userId}`);
+} else {
+  const userId  = process.getuid ? process.getuid() : '0000';
+  tempDir = path.join(os.tmpdir(), `puppeteer.cache.${userId}`);
+}
+if (!process.env['XDG_CONFIG_HOME']) { process.env['XDG_CONFIG_HOME'] = tempDir; }
+if (!process.env['XDG_CACHE_HOME'])  { process.env['XDG_CACHE_HOME']  = tempDir; }
+
 (async () => {
   const browser = await puppeteer.launch({
           headless: "1", // keep old headless mode for now but disabled deprecation warning