diff --git a/client/public/vnc/error-handler.js b/client/public/vnc/app/error-handler.js similarity index 100% rename from client/public/vnc/error-handler.js rename to client/public/vnc/app/error-handler.js diff --git a/client/public/vnc/images/alt.svg b/client/public/vnc/app/images/alt.svg similarity index 100% rename from client/public/vnc/images/alt.svg rename to client/public/vnc/app/images/alt.svg diff --git a/client/public/vnc/images/clipboard.svg b/client/public/vnc/app/images/clipboard.svg similarity index 100% rename from client/public/vnc/images/clipboard.svg rename to client/public/vnc/app/images/clipboard.svg diff --git a/client/public/vnc/images/connect.svg b/client/public/vnc/app/images/connect.svg similarity index 100% rename from client/public/vnc/images/connect.svg rename to client/public/vnc/app/images/connect.svg diff --git a/client/public/vnc/images/ctrl.svg b/client/public/vnc/app/images/ctrl.svg similarity index 100% rename from client/public/vnc/images/ctrl.svg rename to client/public/vnc/app/images/ctrl.svg diff --git a/client/public/vnc/images/ctrlaltdel.svg b/client/public/vnc/app/images/ctrlaltdel.svg similarity index 100% rename from client/public/vnc/images/ctrlaltdel.svg rename to client/public/vnc/app/images/ctrlaltdel.svg diff --git a/client/public/vnc/images/disconnect.svg b/client/public/vnc/app/images/disconnect.svg similarity index 100% rename from client/public/vnc/images/disconnect.svg rename to client/public/vnc/app/images/disconnect.svg diff --git a/client/public/vnc/images/drag.svg b/client/public/vnc/app/images/drag.svg similarity index 100% rename from client/public/vnc/images/drag.svg rename to client/public/vnc/app/images/drag.svg diff --git a/client/public/vnc/images/error.svg b/client/public/vnc/app/images/error.svg similarity index 100% rename from client/public/vnc/images/error.svg rename to client/public/vnc/app/images/error.svg diff --git a/client/public/vnc/images/esc.svg b/client/public/vnc/app/images/esc.svg similarity index 100% rename from client/public/vnc/images/esc.svg rename to client/public/vnc/app/images/esc.svg diff --git a/client/public/vnc/images/expander.svg b/client/public/vnc/app/images/expander.svg similarity index 100% rename from client/public/vnc/images/expander.svg rename to client/public/vnc/app/images/expander.svg diff --git a/client/public/vnc/images/fullscreen.svg b/client/public/vnc/app/images/fullscreen.svg similarity index 100% rename from client/public/vnc/images/fullscreen.svg rename to client/public/vnc/app/images/fullscreen.svg diff --git a/client/public/vnc/images/handle.svg b/client/public/vnc/app/images/handle.svg similarity index 100% rename from client/public/vnc/images/handle.svg rename to client/public/vnc/app/images/handle.svg diff --git a/client/public/vnc/images/handle_bg.svg b/client/public/vnc/app/images/handle_bg.svg similarity index 100% rename from client/public/vnc/images/handle_bg.svg rename to client/public/vnc/app/images/handle_bg.svg diff --git a/client/public/vnc/images/icons/Makefile b/client/public/vnc/app/images/icons/Makefile similarity index 100% rename from client/public/vnc/images/icons/Makefile rename to client/public/vnc/app/images/icons/Makefile diff --git a/client/public/vnc/images/icons/novnc-icon-35x21.svg b/client/public/vnc/app/images/icons/novnc-icon-35x21.svg similarity index 100% rename from client/public/vnc/images/icons/novnc-icon-35x21.svg rename to client/public/vnc/app/images/icons/novnc-icon-35x21.svg diff --git a/client/public/vnc/images/icons/novnc-icon-sm.svg b/client/public/vnc/app/images/icons/novnc-icon-sm.svg similarity index 100% rename from client/public/vnc/images/icons/novnc-icon-sm.svg rename to client/public/vnc/app/images/icons/novnc-icon-sm.svg diff --git a/client/public/vnc/images/icons/novnc-icon.svg b/client/public/vnc/app/images/icons/novnc-icon.svg similarity index 100% rename from client/public/vnc/images/icons/novnc-icon.svg rename to client/public/vnc/app/images/icons/novnc-icon.svg diff --git a/client/public/vnc/images/icons/novnc-ios-120.png b/client/public/vnc/app/images/icons/novnc-ios-120.png similarity index 100% rename from client/public/vnc/images/icons/novnc-ios-120.png rename to client/public/vnc/app/images/icons/novnc-ios-120.png diff --git a/client/public/vnc/images/icons/novnc-ios-152.png b/client/public/vnc/app/images/icons/novnc-ios-152.png similarity index 100% rename from client/public/vnc/images/icons/novnc-ios-152.png rename to client/public/vnc/app/images/icons/novnc-ios-152.png diff --git a/client/public/vnc/images/icons/novnc-ios-167.png b/client/public/vnc/app/images/icons/novnc-ios-167.png similarity index 100% rename from client/public/vnc/images/icons/novnc-ios-167.png rename to client/public/vnc/app/images/icons/novnc-ios-167.png diff --git a/client/public/vnc/images/icons/novnc-ios-180.png b/client/public/vnc/app/images/icons/novnc-ios-180.png similarity index 100% rename from client/public/vnc/images/icons/novnc-ios-180.png rename to client/public/vnc/app/images/icons/novnc-ios-180.png diff --git a/client/public/vnc/images/icons/novnc-ios-40.png b/client/public/vnc/app/images/icons/novnc-ios-40.png similarity index 100% rename from client/public/vnc/images/icons/novnc-ios-40.png rename to client/public/vnc/app/images/icons/novnc-ios-40.png diff --git a/client/public/vnc/images/icons/novnc-ios-58.png b/client/public/vnc/app/images/icons/novnc-ios-58.png similarity index 100% rename from client/public/vnc/images/icons/novnc-ios-58.png rename to client/public/vnc/app/images/icons/novnc-ios-58.png diff --git a/client/public/vnc/images/icons/novnc-ios-60.png b/client/public/vnc/app/images/icons/novnc-ios-60.png similarity index 100% rename from client/public/vnc/images/icons/novnc-ios-60.png rename to client/public/vnc/app/images/icons/novnc-ios-60.png diff --git a/client/public/vnc/images/icons/novnc-ios-80.png b/client/public/vnc/app/images/icons/novnc-ios-80.png similarity index 100% rename from client/public/vnc/images/icons/novnc-ios-80.png rename to client/public/vnc/app/images/icons/novnc-ios-80.png diff --git a/client/public/vnc/images/icons/novnc-ios-87.png b/client/public/vnc/app/images/icons/novnc-ios-87.png similarity index 100% rename from client/public/vnc/images/icons/novnc-ios-87.png rename to client/public/vnc/app/images/icons/novnc-ios-87.png diff --git a/client/public/vnc/images/icons/novnc-ios-icon.svg b/client/public/vnc/app/images/icons/novnc-ios-icon.svg similarity index 100% rename from client/public/vnc/images/icons/novnc-ios-icon.svg rename to client/public/vnc/app/images/icons/novnc-ios-icon.svg diff --git a/client/public/vnc/images/icons/novnc.ico b/client/public/vnc/app/images/icons/novnc.ico similarity index 100% rename from client/public/vnc/images/icons/novnc.ico rename to client/public/vnc/app/images/icons/novnc.ico diff --git a/client/public/vnc/images/info.svg b/client/public/vnc/app/images/info.svg similarity index 100% rename from client/public/vnc/images/info.svg rename to client/public/vnc/app/images/info.svg diff --git a/client/public/vnc/images/keyboard.svg b/client/public/vnc/app/images/keyboard.svg similarity index 100% rename from client/public/vnc/images/keyboard.svg rename to client/public/vnc/app/images/keyboard.svg diff --git a/client/public/vnc/images/power.svg b/client/public/vnc/app/images/power.svg similarity index 100% rename from client/public/vnc/images/power.svg rename to client/public/vnc/app/images/power.svg diff --git a/client/public/vnc/images/settings.svg b/client/public/vnc/app/images/settings.svg similarity index 100% rename from client/public/vnc/images/settings.svg rename to client/public/vnc/app/images/settings.svg diff --git a/client/public/vnc/images/tab.svg b/client/public/vnc/app/images/tab.svg similarity index 100% rename from client/public/vnc/images/tab.svg rename to client/public/vnc/app/images/tab.svg diff --git a/client/public/vnc/images/toggleextrakeys.svg b/client/public/vnc/app/images/toggleextrakeys.svg similarity index 100% rename from client/public/vnc/images/toggleextrakeys.svg rename to client/public/vnc/app/images/toggleextrakeys.svg diff --git a/client/public/vnc/images/warning.svg b/client/public/vnc/app/images/warning.svg similarity index 100% rename from client/public/vnc/images/warning.svg rename to client/public/vnc/app/images/warning.svg diff --git a/client/public/vnc/images/windows.svg b/client/public/vnc/app/images/windows.svg similarity index 100% rename from client/public/vnc/images/windows.svg rename to client/public/vnc/app/images/windows.svg diff --git a/client/public/vnc/locale/README b/client/public/vnc/app/locale/README similarity index 100% rename from client/public/vnc/locale/README rename to client/public/vnc/app/locale/README diff --git a/client/public/vnc/locale/cs.json b/client/public/vnc/app/locale/cs.json similarity index 100% rename from client/public/vnc/locale/cs.json rename to client/public/vnc/app/locale/cs.json diff --git a/client/public/vnc/locale/de.json b/client/public/vnc/app/locale/de.json similarity index 100% rename from client/public/vnc/locale/de.json rename to client/public/vnc/app/locale/de.json diff --git a/client/public/vnc/locale/el.json b/client/public/vnc/app/locale/el.json similarity index 100% rename from client/public/vnc/locale/el.json rename to client/public/vnc/app/locale/el.json diff --git a/client/public/vnc/locale/es.json b/client/public/vnc/app/locale/es.json similarity index 100% rename from client/public/vnc/locale/es.json rename to client/public/vnc/app/locale/es.json diff --git a/client/public/vnc/locale/fr.json b/client/public/vnc/app/locale/fr.json similarity index 100% rename from client/public/vnc/locale/fr.json rename to client/public/vnc/app/locale/fr.json diff --git a/client/public/vnc/locale/hu.json b/client/public/vnc/app/locale/hu.json similarity index 100% rename from client/public/vnc/locale/hu.json rename to client/public/vnc/app/locale/hu.json diff --git a/client/public/vnc/locale/it.json b/client/public/vnc/app/locale/it.json similarity index 100% rename from client/public/vnc/locale/it.json rename to client/public/vnc/app/locale/it.json diff --git a/client/public/vnc/locale/ja.json b/client/public/vnc/app/locale/ja.json similarity index 100% rename from client/public/vnc/locale/ja.json rename to client/public/vnc/app/locale/ja.json diff --git a/client/public/vnc/locale/ko.json b/client/public/vnc/app/locale/ko.json similarity index 100% rename from client/public/vnc/locale/ko.json rename to client/public/vnc/app/locale/ko.json diff --git a/client/public/vnc/locale/nl.json b/client/public/vnc/app/locale/nl.json similarity index 100% rename from client/public/vnc/locale/nl.json rename to client/public/vnc/app/locale/nl.json diff --git a/client/public/vnc/locale/pl.json b/client/public/vnc/app/locale/pl.json similarity index 100% rename from client/public/vnc/locale/pl.json rename to client/public/vnc/app/locale/pl.json diff --git a/client/public/vnc/locale/pt_BR.json b/client/public/vnc/app/locale/pt_BR.json similarity index 100% rename from client/public/vnc/locale/pt_BR.json rename to client/public/vnc/app/locale/pt_BR.json diff --git a/client/public/vnc/locale/ru.json b/client/public/vnc/app/locale/ru.json similarity index 100% rename from client/public/vnc/locale/ru.json rename to client/public/vnc/app/locale/ru.json diff --git a/client/public/vnc/locale/sv.json b/client/public/vnc/app/locale/sv.json similarity index 100% rename from client/public/vnc/locale/sv.json rename to client/public/vnc/app/locale/sv.json diff --git a/client/public/vnc/locale/tr.json b/client/public/vnc/app/locale/tr.json similarity index 100% rename from client/public/vnc/locale/tr.json rename to client/public/vnc/app/locale/tr.json diff --git a/client/public/vnc/locale/uk.json b/client/public/vnc/app/locale/uk.json similarity index 100% rename from client/public/vnc/locale/uk.json rename to client/public/vnc/app/locale/uk.json diff --git a/client/public/vnc/locale/zh_CN.json b/client/public/vnc/app/locale/zh_CN.json similarity index 100% rename from client/public/vnc/locale/zh_CN.json rename to client/public/vnc/app/locale/zh_CN.json diff --git a/client/public/vnc/locale/zh_TW.json b/client/public/vnc/app/locale/zh_TW.json similarity index 100% rename from client/public/vnc/locale/zh_TW.json rename to client/public/vnc/app/locale/zh_TW.json diff --git a/client/public/vnc/localization.js b/client/public/vnc/app/localization.js similarity index 100% rename from client/public/vnc/localization.js rename to client/public/vnc/app/localization.js diff --git a/client/public/vnc/sounds/CREDITS b/client/public/vnc/app/sounds/CREDITS similarity index 100% rename from client/public/vnc/sounds/CREDITS rename to client/public/vnc/app/sounds/CREDITS diff --git a/client/public/vnc/sounds/bell.mp3 b/client/public/vnc/app/sounds/bell.mp3 similarity index 100% rename from client/public/vnc/sounds/bell.mp3 rename to client/public/vnc/app/sounds/bell.mp3 diff --git a/client/public/vnc/sounds/bell.oga b/client/public/vnc/app/sounds/bell.oga similarity index 100% rename from client/public/vnc/sounds/bell.oga rename to client/public/vnc/app/sounds/bell.oga diff --git a/client/public/vnc/styles/Orbitron700.ttf b/client/public/vnc/app/styles/Orbitron700.ttf similarity index 100% rename from client/public/vnc/styles/Orbitron700.ttf rename to client/public/vnc/app/styles/Orbitron700.ttf diff --git a/client/public/vnc/styles/Orbitron700.woff b/client/public/vnc/app/styles/Orbitron700.woff similarity index 100% rename from client/public/vnc/styles/Orbitron700.woff rename to client/public/vnc/app/styles/Orbitron700.woff diff --git a/client/public/vnc/styles/base.css b/client/public/vnc/app/styles/base.css similarity index 100% rename from client/public/vnc/styles/base.css rename to client/public/vnc/app/styles/base.css diff --git a/client/public/vnc/styles/constants.css b/client/public/vnc/app/styles/constants.css similarity index 100% rename from client/public/vnc/styles/constants.css rename to client/public/vnc/app/styles/constants.css diff --git a/client/public/vnc/styles/input.css b/client/public/vnc/app/styles/input.css similarity index 100% rename from client/public/vnc/styles/input.css rename to client/public/vnc/app/styles/input.css diff --git a/client/public/vnc/ui.js b/client/public/vnc/app/ui.js similarity index 100% rename from client/public/vnc/ui.js rename to client/public/vnc/app/ui.js diff --git a/client/public/vnc/wakelock.js b/client/public/vnc/app/wakelock.js similarity index 100% rename from client/public/vnc/wakelock.js rename to client/public/vnc/app/wakelock.js diff --git a/client/public/vnc/webutil.js b/client/public/vnc/app/webutil.js similarity index 100% rename from client/public/vnc/webutil.js rename to client/public/vnc/app/webutil.js diff --git a/client/public/vnc.html b/client/public/vnc/vnc.html similarity index 100% rename from client/public/vnc.html rename to client/public/vnc/vnc.html diff --git a/client/src/services/vnc.mjs b/client/src/services/vnc.mjs index 8a086d5..5341c4f 100644 --- a/client/src/services/vnc.mjs +++ b/client/src/services/vnc.mjs @@ -5,16 +5,17 @@ import { fileURLToPath } from 'node:url'; import { registerSocket } from './websocket.mjs'; const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const NOVNC = path.join(__dirname, '../../node_modules/@novnc/novnc'); +const NOVNC_PKG = path.join(__dirname, '../../node_modules/@novnc/novnc'); +const NOVNC_APP = path.join(__dirname, '../../public/vnc'); const VNC_HOST = process.env.VNC_HOST || '127.0.0.1'; const VNC_PORT = process.env.VNC_PORT || 5900; export const vncRouter = express.Router(); -vncRouter.get('/novnc/vnc.html', (req, res) => - res.sendFile(path.join(__dirname, '../../public/vnc.html')) -); -vncRouter.use('/novnc/app', express.static(path.join(__dirname, '../../public/vnc'))); -vncRouter.use('/novnc', express.static(NOVNC)); +vncRouter.use('/novnc', express.static(NOVNC_APP)); +vncRouter.use('/novnc', express.static(NOVNC_PKG)); + +vncRouter.get('/novnc/defaults.json', (req, res) => res.json({})); +vncRouter.get('/novnc/mandatory.json', (req, res) => res.json({})); vncRouter.get('/', (req, res) => res.redirect('/vnc/novnc/vnc.html?path=ws/vnc&autoconnect=true&resize=scale')