fix: Extra error handler for 500 responses, possible fix

refactor: Use static folder for extension provided themes

Author: colin969

src/back/extensions/ExtensionsScanner.ts

@@ -171,6 +171,7 @@ async function parseExtensionManifest(data: any) {
   parser.prop('main',             v => parsed.main            = str(v), true);
   // Don't change this to v. Probably happens because it's a map.
   parser.prop('contributes',      v => parsed.contributes     = parseContributions(parser.prop('contributes')), true);
+  parser.prop('category',         v => parsed.category        = str(v), true);
   return parsed;
 }
 

src/back/index.ts

@@ -699,9 +699,14 @@ async function prepForInit(initConfig: BackInitArgs): Promise<void> {
     for (const theme of c.value) {
       const ext = await state.extensionsService.getExtension(c.extId);
       if (ext) {
-        const realPath = path.join(ext.extensionPath, theme.path);
+        const basePath = path.resolve(ext.extensionPath, 'static');
+        const realPath = path.resolve(basePath, theme.path);
+        if (!realPath.startsWith(basePath)) {
+          log.error('Extensions', `[${ext.manifest.displayName || ext.manifest.name}] Error loading theme, it must be inside the 'static' directory "${theme.id}"\n`);
+          continue;
+        }
         try {
-          await newThemeWatcher(theme.id, ext.extensionPath, realPath, state.themeState, state.registry, state.socketServer, ext.manifest.displayName || ext.manifest.name, theme.logoSet);
+          await newThemeWatcher(theme.id, basePath, realPath, state.themeState, state.registry, state.socketServer, ext.manifest.displayName || ext.manifest.name, theme.logoSet);
         } catch (error) {
           log.error('Extensions', `[${ext.manifest.displayName || ext.manifest.name}] Error loading theme "${theme.id}"\n${error}`);
         }

src/back/util/FileServer.ts

@@ -1,8 +1,8 @@
 import * as http from 'http';
-import * as fs from 'node:fs';
 import * as mime from 'mime';
-import * as path from 'node:path';
 import { Socket } from 'net';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
 
 type HandlerFunc = (relativePathname: string, url: URL, req: http.IncomingMessage, res: http.ServerResponse) => any;
 
@@ -75,8 +75,12 @@ export function serveFile(req: http.IncomingMessage, res: http.ServerResponse, f
     req.on('error', (err: any) => {
       log.error('Launcher', `Error serving file - ${err}`);
       if (err.code !== 'ECONNRESET') {
-        res.writeHead(500);
-        res.end();
+        try {
+          res.writeHead(500);
+          res.end();
+        } catch (err) {
+          log.error('Launcher', 'Cannot write header after the above file server error');
+        }
       }
     });
     fs.stat(filePath, (error, stats) => {

typings/flashpoint-launcher.d.ts

@@ -2801,6 +2801,7 @@ declare module 'flashpoint-launcher' {
     description?: string;
     icon?: string;
     main?: string;
+    category?: string;
     contributes?: Contributions;
   }