feat: add prepend-package.js script for modifying mission build

 - update README with new script execution instructions
 - update build script with prepend-package.js
 - modify DCS user callbacks for simulation start to not start mission server to late

Author: 🎲

.prettierignore

@@ -1,2 +1,3 @@
 /node_modules/
 /tsconfig.mission.json
+/scripts/prepend-package.js

README.md

@@ -15,49 +15,34 @@ This repository contains two HTTP servers designed to execute LUA scripts in DCS
 - **RESTful API:** Interact via POST requests for seamless integration with tools and scripts.
 - **Swagger Integration:** View and test API endpoints with OpenAPI specifications.
 
-## 🔒 Prerequisites
+## ⚡️ Installation
 
-To enable script execution, update your `MissionScripting.lua` file to allow access to `require` and `package` modules. Additionally, configure the LuaSocket package path as follows:
+[![dropzone](https://dcs-dropzone-registry-viewer.pages.dev/download.svg)](https://dcs-dropzone-registry-viewer.pages.dev/#/dcs-fiddle)
 
-### 🔧 Updating `MissionScripting.lua`
+## Manual Installation
 
-Replace your `MissionScripting.lua` file content with the following code:
+Download the latest release from the [GitHub repository](https://github.com/flying-dice/dcsfiddle-server/releases).
 
-```lua
--- Initialization script for the Mission lua Environment (SSE)
+- Add the `dcs-fiddle-main.lua` file to your DCS World `%USERPROFILE%\Saved Games\DCS\Scripts\Hooks` folder.
+- Add the `dcs-fiddle-mission.lua` file to your DCS World `%USERPROFILE%\Saved Games\DCS\Scripts` folder.
 
-dofile('Scripts/ScriptingSystem.lua')
+### 🔧 Updating `MissionScripting.lua`
 
--- Sanitize Mission Scripting environment
--- WARNING: The following configuration makes some functions available, potentially exposing risks.
--- Proceed with caution if using downloaded missions.
-
-local function sanitizeModule(name)
-    _G[name] = nil
-    package.loaded[name] = nil
-end
-
-do
-    sanitizeModule('os')
-    sanitizeModule('io')
-    sanitizeModule('lfs')
-    -- _G['require'] = nil
-    _G['loadlib'] = nil
-    -- _G['package'] = nil
-end
-
-package.path = package.path .. ";.\\LuaSocket\\?.lua"
-package.cpath = package.cpath .. ";.\\LuaSocket\\?.dll"
-```
+To enable script execution, update your `MissionScripting.lua` file to run the mission server before sanitizing the environment.
 
-## ⚡️ Installation
+The GUI script will automatically run when DCS starts.
 
-Download the latest release from the [GitHub repository](https://github.com/flying-dice/dcsfiddle-server/releases).
+Add to the top of the `MissionScripting.lua` file content with the following code:
 
-- Add the `dcs-fiddle-main.lua` file to your DCS World `%USERPROFILE%\Saved Games\DCS\Scripts\Hooks` folder.
-- Add the `dcs-fiddle-mission.lua` file to your DCS World `%USERPROFILE%\Saved Games\DCS\Scripts` folder.
+```lua
+-- MissionScripting.lua
+dofile(lfs.writedir()..'Scripts/dcs-fiddle-mission.lua')
 
-[![dropzone](https://dcs-dropzone-registry-viewer.pages.dev/download.svg)](https://dcs-dropzone-registry-viewer.pages.dev/#/dcs-fiddle)
+-- Initialization script for the Mission lua Environment (SSE)
+
+dofile('Scripts/ScriptingSystem.lua')
+...
+```
 
 ## 🚀 Usage
 

package-lock.json

@@ -8,17 +8,17 @@
   "scripts": {
     "build": "rimraf dist && npm run build:main && npm run build:mission",
     "build:main": "tstl -p tsconfig.tstl-main.json",
-    "build:mission": "tstl -p tsconfig.tstl-mission.json",
+    "build:mission": "tstl -p tsconfig.tstl-mission.json && node scripts/prepend-package.js",
     "deploy": "npm run deploy:main && npm run deploy:mission",
     "deploy:main": "node scripts/deploy-main.js",
     "deploy:mission": "node scripts/deploy-mission.js"
   },
   "dependencies": {
-    "@flying-dice/tslua-base64": "^0.32.11",
-    "@flying-dice/tslua-common": "^0.32.11",
-    "@flying-dice/tslua-dcs-gui-types": "^0.32.11",
-    "@flying-dice/tslua-dcs-mission-types": "^0.32.11",
-    "@flying-dice/tslua-http-api": "^0.32.11"
+    "@flying-dice/tslua-base64": "^0.32.12",
+    "@flying-dice/tslua-common": "^0.32.12",
+    "@flying-dice/tslua-dcs-gui-types": "^0.32.12",
+    "@flying-dice/tslua-dcs-mission-types": "^0.32.12",
+    "@flying-dice/tslua-http-api": "^0.32.12"
   },
   "devDependencies": {
     "@semantic-release/changelog": "^6.0.3",

package.json

@@ -0,0 +1,24 @@
+const { readFileSync, writeFileSync } = require("fs");
+const { join } = require("path");
+
+const buildPath = join(__dirname, "../dist/dcs-fiddle-mission.lua");
+const header = `\
+local _path = [[;.\\\\LuaSocket\\\\?.lua]]
+local _cpath = [[;.\\\\LuaSocket\\\\?.dll]]
+if not string.find(package.path, _path) then
+  package.path = package.path .. _path
+end
+if not string.find(package.cpath, _cpath) then
+  package.cpath = package.cpath .. _cpath
+end
+
+`;
+
+const missionScript = readFileSync(
+  buildPath,
+  "utf8",
+);
+writeFileSync(
+  buildPath,
+  header + missionScript,
+);

scripts/prepend-package.js

@@ -10,21 +10,7 @@ if (__dcs_fiddle_app !== undefined) {
 logger.info("Starting app");
 __dcs_fiddle_app = app;
 
-DCS?.setUserCallbacks({
-  onSimulationStart() {
-    logger.info("Simulation Started");
-
-    logger.info("Starting DCS Fiddle Mission Server");
-    const fiddleFile = `${lfs.writedir()}\\Scripts\\dcs-fiddle-mission.lua`;
-    const [result] = string.gsub(fiddleFile, "\\", "/");
-    const fiddleFileCommand = string.format(
-      `a_do_script("dofile('%s')")`,
-      result,
-    );
-    log.info(`Loading fiddle mission from ${fiddleFileCommand}`);
-
-    net.dostring_in("mission", fiddleFileCommand);
-  },
+DCS.setUserCallbacks({
   onSimulationFrame() {
     __dcs_fiddle_app.acceptNextClient();
   },