Merge pull request #148 from jannis-baum/issue/147-fix-decoding-vivpath

Fix decoding VIV_PATH

src/routes/viewer.ts

@@ -6,7 +6,7 @@ import { Request, Response, Router } from 'express';
 
 import { clientsAt, messageClients } from '../app.js';
 import config from '../config.js';
-import { absPath, pcomponents, pmime, preferredPath } from '../utils/path.js';
+import { pcomponents, pmime, preferredPath, urlToPath } from '../utils/path.js';
 import { renderDirectory, renderTextFile, shouldRender } from '../parser/parser.js';
 
 export const router = Router();
@@ -81,7 +81,7 @@ router.get(/.*/, async (req: Request, res: Response) => {
             </body>
             <script>
                 window.VIV_PORT = "${config.port}";
-                window.VIV_PATH = "${absPath(req.path)}";
+                window.VIV_PATH = "${urlToPath(req.path)}";
             </script>
             ${config.scripts ? `<script type="text/javascript">${config.scripts}</script>` : ''}
             <script type="text/javascript" src="/static/client.js"></script>

src/utils/path.ts

@@ -21,10 +21,10 @@ export const pcomponents = (path: string) => {
     return components;
 };
 
-export const absPath = (path: string) => path.replace(/^\/~/, homedir()).replace(/\/+$/, '');
-
 export const urlToPath = (url: string) => {
-    const path = absPath(decodeURIComponent(url.replace(/^\/(viewer|health)/, '')));
+    const path = decodeURIComponent(url.replace(/^\/(viewer|health)/, ''))
+        .replace(/^\/~/, homedir())
+        .replace(/\/+$/, '');
     return path === '' ? '/' : path;
 };