From 1e5706208ccb5fc5187d65f20d98811a3e3e2870 Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Tue, 1 Nov 2022 15:44:15 -0700
Subject: [PATCH 1/5] KASM-3512 adding select dropdown during installation to
 force a GPU on all containers

---
 index.js           | 23 ++++++++++++++++++++++-
 public/js/index.js | 12 ++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 46778a2..cd7c119 100644
--- a/index.js
+++ b/index.js
@@ -19,6 +19,7 @@ var arch = os.arch().replace('x64', 'amd64');
 var baseUrl = process.env.SUBFOLDER || '/';
 var version = process.env.VERSION || 'stable';
 var port = process.env.KASM_PORT || '443';
+const { spawn } = require('node:child_process');
 var EULA;
 var images;
 // Grab installer variables
@@ -68,6 +69,15 @@ io.on('connection', async function (socket) {
         imagesD.images[image].hidden = true;
       }
     }
+    if (installSettings.forceGpu !== 'disabled') {
+      let card = installSettings.forceGpu.slice(-1);
+      let render = (Number(card) + 128).toString();
+      console.log(card, render);
+      for await (let image of Object.keys(images.images)) {
+        imagesD.images[image]['run_config'] = '{"environment":{"KASM_EGL_CARD":"/dev/dri/card' + card + '","KASM_RENDERD":"/dev/dri/renderD' + render + '"},"devices":["/dev/dri/card' + card + ':/dev/dri/card' + card + ':rwm","/dev/dri/renderD' + render + ':/dev/dri/renderD' + render + ':rwm"]}'
+        imagesD.images[image]['exec_config'] = '{"first_launch":{"user":"root","cmd": "bash -c \'chown -R kasm-user:kasm-user /dev/dri/*\'"}}'
+      }
+    }
     let yamlStr = yaml.dump(imagesD);
     await fsw.writeFile('/kasm_release/conf/database/seed_data/default_images_' + arch + '.yaml', yamlStr);
     let cmd = pty.spawn('/bin/bash', installFlags);
@@ -92,7 +102,18 @@ io.on('connection', async function (socket) {
       dashinfo['port'] = port;
       socket.emit('renderdash', dashinfo);
     } else {
-      socket.emit('renderinstall', [EULA, images]);
+      let gpuData = [];
+      let gpuCmd = spawn('/gpuinfo.sh');
+      gpuCmd.stdout.on('data', function(data) {
+        gpuData.push(data);
+      });
+      gpuCmd.on('close', function(code) {
+        if (code == 0) {
+          socket.emit('renderinstall', [EULA, images, JSON.parse(gpuData.join(''))]);
+        } else {
+          socket.emit('renderinstall', [EULA, images, {}]);
+        }
+      });
     }
   }
   // Disable wizard
diff --git a/public/js/index.js b/public/js/index.js
index d908e91..f22ce80 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1,6 +1,7 @@
 // Variables
 var EULA;
 var images;
+var gpus;
 var term;
 var installImages = [];
 var installSettings = {};
@@ -73,6 +74,7 @@ function renderInstall(data) {
   titleChange('EULA');
   EULA = data[0];
   images = data[1];
+  gpus = data[2];
   let EULADiv = $('<div>', {id: 'EULA'}).text(EULA);
   $('#container').append(EULADiv);
   let EULAButton = $('<button>', {id: 'EULAButton', onclick: 'pickSettings()', class: 'btn btn-default btn-ghost'}).text('Accept and continue');
@@ -195,6 +197,14 @@ async function pickSettings() {
     $('<label>', {for: 'noDownload'}).text('Skip Image Download: '),
     $('<input>', {name: 'noDownload', id: 'noDownload', type: 'checkbox'})
   ]);
+  let gpuOptions = [$('<option>', {value: 'disabled'}).text('Disabled')];
+  for await (let card of Object.keys(gpus)) {
+    gpuOptions.push($('<option>', {value: card}).text(card + ' - ' + gpus[card]));
+  }
+  let forceGpu = $('<div>', {class: 'form-group'}).append([
+    $('<label>', {for: 'forceGpu'}).text('Use GPU on all images: '),
+    $('<select>', {name: 'forceGpu', id: 'forceGpu',}).append(gpuOptions)
+  ]);
   let submit = $('<div>', {class: 'form-group'}).append([
     $('<input>', {name: 'submit', type: 'submit', value: 'Next', class: 'btn btn-default btn-ghost'})
   ]);
@@ -203,6 +213,7 @@ async function pickSettings() {
     userPass,
     useRolling,
     noDownload,
+    forceGpu,
     submit
   ]);
   form.append(fieldset);
@@ -214,6 +225,7 @@ async function pickSettings() {
     installSettings.userPass = $('#userPass').val();
     installSettings.useRolling = $('#useRolling').is(":checked");
     installSettings.noDownload = $('#noDownload').is(":checked");
+    installSettings.forceGpu = $('#forceGpu').val();
     pickImages();
   });
 }

From 64bd739f1da1bd415b86f4a6afd9d5f57cc4e4ab Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Sat, 5 Nov 2022 14:57:43 -0700
Subject: [PATCH 2/5] KASM-3512 use deep merge on the exec and run configs to
 load the default values alongside the gpu modifications

---
 index.js     | 18 +++++++++++++++---
 package.json |  1 +
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/index.js b/index.js
index cd7c119..d0bd09c 100644
--- a/index.js
+++ b/index.js
@@ -6,6 +6,7 @@ var fsw = require('fs').promises;
 var fs = require('fs');
 var os = require('os');
 var yaml = require('js-yaml');
+var _ = require('lodash');
 var si = require('systeminformation');
 var express = require('express');
 var app = require('express')();
@@ -72,10 +73,21 @@ io.on('connection', async function (socket) {
     if (installSettings.forceGpu !== 'disabled') {
       let card = installSettings.forceGpu.slice(-1);
       let render = (Number(card) + 128).toString();
-      console.log(card, render);
+      let baseRun = JSON.parse('{"environment":{"KASM_EGL_CARD":"/dev/dri/card' + card + '","KASM_RENDERD":"/dev/dri/renderD' + render + '"},"devices":["/dev/dri/card' + card + ':/dev/dri/card' + card + ':rwm","/dev/dri/renderD' + render + ':/dev/dri/renderD' + render + ':rwm"]}');
+      let baseExec = JSON.parse('{"first_launch":{"user":"root","cmd": "bash -c \'chown -R kasm-user:kasm-user /dev/dri/*\'"}}');
       for await (let image of Object.keys(images.images)) {
-        imagesD.images[image]['run_config'] = '{"environment":{"KASM_EGL_CARD":"/dev/dri/card' + card + '","KASM_RENDERD":"/dev/dri/renderD' + render + '"},"devices":["/dev/dri/card' + card + ':/dev/dri/card' + card + ':rwm","/dev/dri/renderD' + render + ':/dev/dri/renderD' + render + ':rwm"]}'
-        imagesD.images[image]['exec_config'] = '{"first_launch":{"user":"root","cmd": "bash -c \'chown -R kasm-user:kasm-user /dev/dri/*\'"}}'
+        if (imagesD.images[image]['run_config']) {
+          finalRun = _.merge(JSON.parse(imagesD.images[image]['run_config']), baseRun)
+        } else {
+          finalRun = baseRun;
+        }
+        if (imagesD.images[image]['exec_config']) {
+          finalExec = _.merge(JSON.parse(imagesD.images[image]['exec_config']), baseExec)
+        } else {
+          finalExec = baseExec;
+        }
+        imagesD.images[image]['run_config'] = JSON.stringify(finalRun);
+        imagesD.images[image]['exec_config'] = JSON.stringify(finalExec);
       }
     }
     let yamlStr = yaml.dump(imagesD);
diff --git a/package.json b/package.json
index 730cde5..1b39770 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "dockerode": "^3.3.2",
     "express": "^4.18.1",
     "js-yaml": "^4.1.0",
+    "lodash": "^4.17.21",
     "node-pty": "^0.10.1",
     "socket.io": "^4.5.1",
     "systeminformation": "^5.11.16"

From 37dbb06b8c0c370c6d6e2ddf4116bc9685c605a8 Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Wed, 16 Nov 2022 16:05:03 -0800
Subject: [PATCH 3/5] KASM-3512 make lossless install default

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index d0bd09c..13dd401 100644
--- a/index.js
+++ b/index.js
@@ -50,7 +50,7 @@ io.on('connection', async function (socket) {
     installSettings = data[0];
     let imagesI = data[1];
     let imagesD = images;
-    installFlags = ['/kasm_release/install.sh', '-B' ,'-H', '-e', '-L', port, '-P', installSettings.adminPass, '-U', installSettings.userPass];
+    installFlags = ['/kasm_release/install.sh', '-A', '-B' ,'-H', '-e', '-L', port, '-P', installSettings.adminPass, '-U', installSettings.userPass];
     if (installSettings.useRolling == true) {
       installFlags.push('-O');
     }

From 0aa9746d3ba2396bb9f99c26a103ee354c9bca9f Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Thu, 17 Nov 2022 16:33:15 -0500
Subject: [PATCH 4/5] KASM-3512 add support for nvidia GPUS

---
 index.js           | 11 +++++++++--
 public/js/index.js |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/index.js b/index.js
index 13dd401..9fb5de3 100644
--- a/index.js
+++ b/index.js
@@ -71,9 +71,16 @@ io.on('connection', async function (socket) {
       }
     }
     if (installSettings.forceGpu !== 'disabled') {
-      let card = installSettings.forceGpu.slice(-1);
+      let gpu = installSettings.forceGpu.split('|')[0];
+      let gpuName = installSettings.forceGpu.split('|')[1];
+      let card = gpu.slice(-1);
       let render = (Number(card) + 128).toString();
-      let baseRun = JSON.parse('{"environment":{"KASM_EGL_CARD":"/dev/dri/card' + card + '","KASM_RENDERD":"/dev/dri/renderD' + render + '"},"devices":["/dev/dri/card' + card + ':/dev/dri/card' + card + ':rwm","/dev/dri/renderD' + render + ':/dev/dri/renderD' + render + ':rwm"]}');
+      // Handle NVIDIA Gpus
+      if (gpuName.indexOf('NVIDIA') !== -1) {
+        let baseRun = JSON.parse('{"environment":{"KASM_EGL_CARD":"/dev/dri/card' + card + '","KASM_RENDERD":"/dev/dri/renderD' + render + '"},"devices":["/dev/dri/card' + card + ':/dev/dri/card' + card + ':rwm","/dev/dri/renderD' + render + ':/dev/dri/renderD' + render + ':rwm"],"device_requests":[{"driver": "","count": -1,"device_ids": null,"capabilities":[["gpu"]],"options":{}}]}');
+      } else {
+        let baseRun = JSON.parse('{"environment":{"KASM_EGL_CARD":"/dev/dri/card' + card + '","KASM_RENDERD":"/dev/dri/renderD' + render + '"},"devices":["/dev/dri/card' + card + ':/dev/dri/card' + card + ':rwm","/dev/dri/renderD' + render + ':/dev/dri/renderD' + render + ':rwm"]}');
+      }
       let baseExec = JSON.parse('{"first_launch":{"user":"root","cmd": "bash -c \'chown -R kasm-user:kasm-user /dev/dri/*\'"}}');
       for await (let image of Object.keys(images.images)) {
         if (imagesD.images[image]['run_config']) {
diff --git a/public/js/index.js b/public/js/index.js
index f22ce80..52fd96a 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -199,7 +199,7 @@ async function pickSettings() {
   ]);
   let gpuOptions = [$('<option>', {value: 'disabled'}).text('Disabled')];
   for await (let card of Object.keys(gpus)) {
-    gpuOptions.push($('<option>', {value: card}).text(card + ' - ' + gpus[card]));
+    gpuOptions.push($('<option>', {value: card + '|' + gpus[card]}).text(card + ' - ' + gpus[card]));
   }
   let forceGpu = $('<div>', {class: 'form-group'}).append([
     $('<label>', {for: 'forceGpu'}).text('Use GPU on all images: '),

From c51cbe881d24e9179c37a1b3251d0e38a3378375 Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Thu, 17 Nov 2022 17:05:13 -0500
Subject: [PATCH 5/5] KASM-3512 nvidia bugfix

---
 index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 9fb5de3..8965606 100644
--- a/index.js
+++ b/index.js
@@ -76,10 +76,11 @@ io.on('connection', async function (socket) {
       let card = gpu.slice(-1);
       let render = (Number(card) + 128).toString();
       // Handle NVIDIA Gpus
+      var baseRun;
       if (gpuName.indexOf('NVIDIA') !== -1) {
-        let baseRun = JSON.parse('{"environment":{"KASM_EGL_CARD":"/dev/dri/card' + card + '","KASM_RENDERD":"/dev/dri/renderD' + render + '"},"devices":["/dev/dri/card' + card + ':/dev/dri/card' + card + ':rwm","/dev/dri/renderD' + render + ':/dev/dri/renderD' + render + ':rwm"],"device_requests":[{"driver": "","count": -1,"device_ids": null,"capabilities":[["gpu"]],"options":{}}]}');
+        baseRun = JSON.parse('{"environment":{"KASM_EGL_CARD":"/dev/dri/card' + card + '","KASM_RENDERD":"/dev/dri/renderD' + render + '"},"devices":["/dev/dri/card' + card + ':/dev/dri/card' + card + ':rwm","/dev/dri/renderD' + render + ':/dev/dri/renderD' + render + ':rwm"],"device_requests":[{"driver": "","count": -1,"device_ids": null,"capabilities":[["gpu"]],"options":{}}]}');
       } else {
-        let baseRun = JSON.parse('{"environment":{"KASM_EGL_CARD":"/dev/dri/card' + card + '","KASM_RENDERD":"/dev/dri/renderD' + render + '"},"devices":["/dev/dri/card' + card + ':/dev/dri/card' + card + ':rwm","/dev/dri/renderD' + render + ':/dev/dri/renderD' + render + ':rwm"]}');
+        baseRun = JSON.parse('{"environment":{"KASM_EGL_CARD":"/dev/dri/card' + card + '","KASM_RENDERD":"/dev/dri/renderD' + render + '"},"devices":["/dev/dri/card' + card + ':/dev/dri/card' + card + ':rwm","/dev/dri/renderD' + render + ':/dev/dri/renderD' + render + ':rwm"]}');
       }
       let baseExec = JSON.parse('{"first_launch":{"user":"root","cmd": "bash -c \'chown -R kasm-user:kasm-user /dev/dri/*\'"}}');
       for await (let image of Object.keys(images.images)) {