@jtff/miztemplate-lib 3.0.0-rc10 → 3.0.0-rc11

package/lib/mizlib.js

@@ -9,7 +9,37 @@ const lstat = promisify(fs.lstat);
 
 class Mizlib {
     constructor() {
-      // no need for initialization
+        // no need for initialization
+    }
+
+    injectLuaScriptAndUpdateWorkspace(workspacePath, folderPath, luaScriptsArray, titleString, missionObject, mapResourceObject, timing, colorString) {
+        let tuple = this.injectLuaScriptsInMissionObject(
+            missionObject['trig'],
+            missionObject['trigrules'],
+            mapResourceObject,
+            titleString,
+            luaScriptsArray,
+            timing,
+            colorString
+        );
+        for (let luaScript of luaScriptsArray) {
+            fs.copyFileSync(
+                [
+                    'node_modules/@jtff/miztemplate-lib/lua/',
+                    folderPath,
+                    '/',
+                    luaScript
+                ].join(""),
+                [
+                    workspacePath,
+                    "/",
+                    folderPath,
+                    "/",
+                    path.basename(luaScript)
+                ].join("")
+            );
+        }
+        return tuple;
     }
 
     injectLuaScriptsInMissionObject(tObject, trObject, mrObject, strTitle, scriptFilesArray, timingInSeconds, hexColor) {
@@ -177,8 +207,7 @@ class Mizlib {
         for (let file of fs.readdirSync(folderPath).filter(file => file.endsWith(".lua"))) {
             console.log('injecting up2date ' + folderPath + '/' + file + ' file in archive');
             this.injectFileIntoZipObject(zip, folderPath + "/" + file);
-        }
-        ;
+        };
     }
 
 
@@ -258,12 +287,47 @@ class Mizlib {
         if (fs.existsSync('resources/sounds') && fs.lstatSync('resources/sounds').isDirectory()) {
             const folderArray = fs.readdirSync('resources/sounds');
             for (const folder of folderArray) {
-                await this.mizUpdateSingleSoundFolder(zip, folder);
+                await this.injectSingleSoundFolderIntoZipObject(zip, folder);
             }
         }
     }
 
-    async mizUpdateSingleSoundFolder(zip, folder) {
+    async updateWorkspaceWithSingleSoundFolder(workspacePath, folderString) {
+        if (
+            fs.existsSync(
+                [
+                    workspacePath,
+                    "/resources/sounds/",
+                    folderString
+                ].join("")
+            ) &&
+            fs.lstatSync([
+                workspacePath,
+                "/resources/sounds/",
+                folderString
+            ].join("")).isDirectory()
+        ) {
+            fs.rmSync([
+                workspacePath,
+                "/resources/sounds/",
+                folderString
+            ].join(""), {recursive: true});
+        }
+        if (fs.existsSync('node_modules/@jtff/miztemplate-lib/resources/sounds/' + folderString) && fs.lstatSync('node_modules/@jtff/miztemplate-lib/resources/sounds/' + folderString).isDirectory()) {
+            fs.mkdirSync([
+                workspacePath,
+                "/resources/sounds/",
+                folderString
+            ].join(""), {recursive: true});
+            fs.cpSync('node_modules/@jtff/miztemplate-lib/resources/sounds/' + folderString,[
+                workspacePath,
+                "/resources/sounds/",
+                folderString
+            ].join(""), {recursive: true});
+        }
+    }
+
+    async injectSingleSoundFolderIntoZipObject(zip, folder) {
         if (fs.existsSync('resources/sounds/' + folder) && fs.lstatSync('resources/sounds/' + folder).isDirectory()) {
             console.log('adding sound files from resources/sounds/' + folder + ' folder...');
             zip = zip.remove(folder).folder(folder);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jtff/miztemplate-lib",
-  "version": "3.0.0-rc10",
+  "version": "3.0.0-rc11",
   "description": "JTFF mission template library",
   "main": "index.js",
   "files": [

package/scripts/inject-scripts.js

@@ -3,7 +3,7 @@ const path = require("path");
 const prompt = require('prompt');
 
 function injectScripts(jtffci, env_mission) {
-    // create mission folder in dist (general) folder
+    // create mission folder in jtffci.config.reneral.missionFolder folder
     fs.mkdirSync(jtffci.config.general.missionFolder, { recursive: true });
     if (fs.existsSync([
         jtffci.config.general.missionFolder,
@@ -13,7 +13,7 @@ function injectScripts(jtffci, env_mission) {
         // if there is a specific mission folder (dist/env_mission), clean it
         fs.rmSync([
                 jtffci.config.general.missionFolder,
-                "/",
+                '/',
                 path.parse(env_mission).name
             ].join(""),
             { recursive: true }
@@ -37,7 +37,24 @@ function injectScripts(jtffci, env_mission) {
         ].join(""),
         { recursive: true }
     );
-
+    // create a lib folder
+    fs.mkdirSync([
+            jtffci.config.general.missionFolder,
+            "/",
+            path.parse(env_mission).name,
+            "/lib"
+        ].join(""),
+        { recursive: true }
+    );
+    // create a resources folder
+    fs.mkdirSync([
+            jtffci.config.general.missionFolder,
+            "/",
+            path.parse(env_mission).name,
+            "/resources"
+        ].join(""),
+        { recursive: true }
+    );
     const prompt_properties = [
         {
             name: 'inject_tankers',
@@ -121,12 +138,65 @@ function injectScripts(jtffci, env_mission) {
 
         // open the miz input file for reading
         const mizObject = await jtffci.mizlib.getZipObjectFromMizPath(env_mission);
+        // Open the mission Object and mapResource Object for modification
+        const missionObject = await jtffci.mizlib.getMissionObjectFromZipObject(mizObject);
+        let mapResourceObject = await jtffci.mizlib.getMapResourceObjectFromZipObject(mizObject);
+        // prepare settings array
+        let settingsArray = [];
+        let scriptsArray = [];
+        let libsArray = [];
+        if (Array.isArray(mapResourceObject)) {
+            if (mapResourceObject.length === 0) {
+                mapResourceObject = {};
+            }
+        }
+        // injection des librairies externes
+        libsArray.push({
+            folder: 'lib',
+            scriptTitle: 'SplashDamage 2.0',
+            scripts: ['Splash_Damage_2_0.lua'],
+            timing: 9,
+            color: '0x008000ff'
+        });
+        libsArray.push({
+            folder: 'lib',
+            scriptTitle: 'Moose',
+            scripts: ['Moose_.lua'],
+            timing: 10,
+            color: '0x008000ff'
+        });
+        libsArray.push({
+            folder: 'lib',
+            scriptTitle: 'Mist',
+            scripts: ['mist_4_5_107.lua'],
+            timing: 12,
+            color: '0x008000ff'
+        });
+        libsArray.push({
+            folder: 'lib',
+            scriptTitle: 'Hercules',
+            scripts: ['Hercules_Cargo.lua'],
+            timing: 14,
+            color: '0x008000ff'
+        });
+        libsArray.push({
+            folder: 'lib',
+            scriptTitle: 'Skynet',
+            scripts: ['skynet-iads-compiled.lua'],
+            timing: 15,
+            color: '0x008000ff'
+        });
         // inject all the lua files in the src folder into the source zip object
-        jtffci.mizlib.injectLuaFilesFromFolderIntoZipObject(mizObject, "src");
+        // jtffci.mizlib.injectLuaFilesFromFolderIntoZipObject(mizObject, "src");
         // inject all the lua files in the lib folder into the source zip object
-        jtffci.mizlib.injectLuaFilesFromFolderIntoZipObject(mizObject, "lib");
+        // jtffci.mizlib.injectLuaFilesFromFolderIntoZipObject(mizObject, "lib");
         // injection des fichiers son Généraux si repertoire resources/sounds/General present
-        await jtffci.mizlib.mizUpdateSingleSoundFolder(mizObject, 'General');
+        await jtffci.mizlib.updateWorkspaceWithSingleSoundFolder([
+            jtffci.config.general.missionFolder,
+            "/",
+            path.parse(env_mission).name
+        ].join(""), 'General');
+        await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject, 'General');
         // On fait une sauvegarde dans le folder de destination
         // fs.writeFileSync([
         //         jtffci.config.general.missionFolder,
@@ -145,7 +215,11 @@ function injectScripts(jtffci, env_mission) {
         //     })
         // );
         // injection des fichiers son Misc si repertoire resources/sounds/Misc present
-        await jtffci.mizlib.mizUpdateSingleSoundFolder(mizObject, 'Misc');
+        await jtffci.mizlib.updateWorkspaceWithSingleSoundFolder([jtffci.config.general.missionFolder,
+            "/",
+            path.parse(env_mission).name
+        ].join(""), 'Misc');
+        await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject, 'Misc');
         // On fait une sauvegarde dans le folder de destination
         // fs.writeFileSync([
         //         jtffci.config.general.missionFolder,
@@ -163,66 +237,7 @@ function injectScripts(jtffci, env_mission) {
         //         }
         //     })
         // );
-        const missionObject = await jtffci.mizlib.getMissionObjectFromZipObject(mizObject);
-        let mapResourceObject = await jtffci.mizlib.getMapResourceObjectFromZipObject(mizObject);
-        let settingsArray = [];
-        if (Array.isArray(mapResourceObject)) {
-            if (mapResourceObject.length === 0) {
-                mapResourceObject = {};
-            }
-        }
-        // injection SplashDamage
-        let tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-            missionObject['trig'],
-            missionObject['trigrules'],
-            mapResourceObject,
-            'SplashDamage load',
-            ['Splash_Damage_2_0.lua'],
-            9,
-            '0x008000ff'
-        );
-        missionObject['trig'] = tuple.tObject;
-        missionObject['trigrules'] = tuple.trObject;
-        mapResourceObject = tuple.mrObject;
-        // injection Moose
-        tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-            missionObject['trig'],
-            missionObject['trigrules'],
-            mapResourceObject,
-            'Moose load',
-            ['Moose_.lua'],
-            10,
-            '0x008000ff'
-        );
-        missionObject['trig'] = tuple.tObject;
-        missionObject['trigrules'] = tuple.trObject;
-        mapResourceObject = tuple.mrObject;
-        // injection Mist
-        tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-            missionObject['trig'],
-            missionObject['trigrules'],
-            mapResourceObject,
-            'Mist load',
-            ['mist_4_5_107.lua'],
-            13,
-            '0x008000ff'
-        );
-        missionObject['trig'] = tuple.tObject;
-        missionObject['trigrules'] = tuple.trObject;
-        mapResourceObject = tuple.mrObject;
-        // injection Skynet
-        tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-            missionObject['trig'],
-            missionObject['trigrules'],
-            mapResourceObject,
-            'Skynet load',
-            ['skynet-iads-compiled.lua'],
-            15,
-            '0x008000ff'
-        );
-        missionObject['trig'] = tuple.tObject;
-        missionObject['trigrules'] = tuple.trObject;
-        mapResourceObject = tuple.mrObject;
+
         // injection Librairies JTFF
         settingsArray.push(
             {
@@ -232,32 +247,47 @@ function injectScripts(jtffci, env_mission) {
                 file: "settings-global.lua",
             },
         );
-        tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-            missionObject['trig'],
-            missionObject['trigrules'],
-            mapResourceObject,
-            'Load JTFF Libraries',
-            ['010-root_menus.lua', '020-mission_functions.lua', 'gemman.lua'],
-            17,
-            '0xffff00ff'
-        );
-        missionObject['trig'] = tuple.tObject;
-        missionObject['trigrules'] = tuple.trObject;
-        mapResourceObject = tuple.mrObject;
-
+        libsArray.push({
+            folder: 'lib',
+            scriptTitle: 'GemMan',
+            scripts: ['gemman.lua'],
+            timing: 17,
+            color: '0xffff00ff'
+        });
+        libsArray.push({
+            folder: 'src',
+            scriptTitle: 'JTFF Libraries',
+            scripts: ['010-root_menus.lua', '020-mission_functions.lua'],
+            timing: 18,
+            color: '0xffff00ff'
+        });
+        for ( script of libsArray) {
+            let tuple = jtffci.mizlib.injectLuaScriptAndUpdateWorkspace(
+                [
+                    jtffci.config.general.missionFolder,
+                    "/",
+                    path.parse(env_mission).name,
+                ].join(""),
+                script.folder,
+                script.scripts,
+                script.scriptTitle + ' Load',
+                missionObject,
+                mapResourceObject,
+                script.timing,
+                script.color
+            );
+            missionObject['trig'] = tuple.tObject;
+            missionObject['trigrules'] = tuple.trObject;
+            mapResourceObject = tuple.mrObject;
+        }
         // injection de la gestion des Set_Clients
-        tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-            missionObject['trig'],
-            missionObject['trigrules'],
-            mapResourceObject,
-            'Set clients',
-            ['110-set_clients.lua'],
-            21,
-            '0xff0000ff'
-        );
-        missionObject['trig'] = tuple.tObject;
-        missionObject['trigrules'] = tuple.trObject;
-        mapResourceObject = tuple.mrObject;
+        scriptsArray.push({
+            folder: 'src',
+            scriptTitle: 'Set clients',
+            scripts: ['110-set_clients.lua'],
+            timing: 21,
+            color: '0xff0000ff'
+        });
         // injection des Tankers et OndemandTankers
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_tankers)) {
             settingsArray.push(
@@ -270,22 +300,21 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "OnDemandTankersConfig"
                 },
             );
-            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-                missionObject['trig'],
-                missionObject['trigrules'],
-                mapResourceObject,
-                'Tankers',
-                ['120-tankers.lua'],
-                22,
-                '0xff0000ff'
-            );
-            missionObject['trig'] = tuple.tObject;
-            missionObject['trigrules'] = tuple.trObject;
-            mapResourceObject = tuple.mrObject;
+            scriptsArray.push({
+                folder: 'src',
+                scriptTitle: 'Tankers',
+                scripts: ['120-tankers.lua'],
+                timing: 22,
+                color: '0xff0000ff'
+            });
         }
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_airboss)) {
             // injection des fichiers son Airboss
-            // await jtffci.mizlib.mizUpdateSingleSoundFolder(mizObject, 'AIRBOSS');
+            await jtffci.mizlib.updateWorkspaceWithSingleSoundFolder([jtffci.config.general.missionFolder,
+                "/",
+                path.parse(env_mission).name
+            ].join(""), 'AIRBOSS');
+            await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject, 'AIRBOSS');
             settingsArray.push(
                 {
                     file: "settings-airboss.lua",
@@ -296,18 +325,13 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "PedrosConfig"
                 },
             );
-            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-                missionObject['trig'],
-                missionObject['trigrules'],
-                mapResourceObject,
-                'Airboss',
-                ['130-airboss.lua', '135-pedro.lua'],
-                23,
-                '0xff0000ff'
-            );
-            missionObject['trig'] = tuple.tObject;
-            missionObject['trigrules'] = tuple.trObject;
-            mapResourceObject = tuple.mrObject;
+            scriptsArray.push({
+                folder: 'src',
+                scriptTitle: 'Airboss',
+                scripts: ['130-airboss.lua', '135-pedro.lua'],
+                timing: 23,
+                color: '0xff0000ff'
+            });
         }
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_beacons)) {
             settingsArray.push(
@@ -316,18 +340,13 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "BeaconsConfig"
                 },
             );
-            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-                missionObject['trig'],
-                missionObject['trigrules'],
-                mapResourceObject,
-                'Beacons',
-                ['140-beacons.lua'],
-                24,
-                '0xff0000ff'
-            );
-            missionObject['trig'] = tuple.tObject;
-            missionObject['trigrules'] = tuple.trObject;
-            mapResourceObject = tuple.mrObject;
+            scriptsArray.push({
+                folder: 'src',
+                scriptTitle: 'Beacons',
+                scripts: ['140-beacons.lua'],
+                timing: 24,
+                color: '0xff0000ff'
+            });
         }
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_awacs)) {
             settingsArray.push(
@@ -340,18 +359,13 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "AwacsOnDemandConfig"
                 },
             );
-            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-                missionObject['trig'],
-                missionObject['trigrules'],
-                mapResourceObject,
-                'Awacs',
-                ['150-awacs.lua'],
-                25,
-                '0xff0000ff'
-            );
-            missionObject['trig'] = tuple.tObject;
-            missionObject['trigrules'] = tuple.trObject;
-            mapResourceObject = tuple.mrObject;
+            scriptsArray.push({
+                folder: 'src',
+                scriptTitle: 'Awacs',
+                scripts: ['150-awacs.lua'],
+                timing: 25,
+                color: '0xff0000ff'
+            });
         }
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_atis)) {
             // injection des fichiers son ATIS
@@ -362,18 +376,13 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "AtisConfig"
                 },
             );
-            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-                missionObject['trig'],
-                missionObject['trigrules'],
-                mapResourceObject,
-                'ATIS',
-                ['160-atis.lua'],
-                26,
-                '0xff0000ff'
-            );
-            missionObject['trig'] = tuple.tObject;
-            missionObject['trigrules'] = tuple.trObject;
-            mapResourceObject = tuple.mrObject;
+            scriptsArray.push({
+                folder: 'src',
+                scriptTitle: 'ATIS',
+                scripts: ['160-atis.lua'],
+                timing: 26,
+                color: '0xff0000ff'
+            });
         }
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_A2A)) {
             settingsArray.push(
@@ -398,40 +407,30 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "InterceptConfig"
                 },
             );
-            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-                missionObject['trig'],
-                missionObject['trigrules'],
-                mapResourceObject,
-                'Air To Air',
-                ['170-cap_zone_training.lua', '172-cap_zone_war.lua', '173-fox_zone_training.lua', '176-random_air_traffic.lua', '178-training-intercept.lua'],
-                27,
-                '0xff0000ff'
-            );
-            missionObject['trig'] = tuple.tObject;
-            missionObject['trigrules'] = tuple.trObject;
-            mapResourceObject = tuple.mrObject;
+            scriptsArray.push({
+                folder: 'src',
+                scriptTitle: 'Air To Air',
+                scripts: ['170-cap_zone_training.lua', '172-cap_zone_war.lua', '173-fox_zone_training.lua', '176-random_air_traffic.lua', '178-training-intercept.lua'],
+                timing: 27,
+                color: '0xff0000ff'
+            });
         }
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_Logistics)) {
             // injection des fichiers son CTLD
-            await jtffci.mizlib.mizUpdateSingleSoundFolder(mizObject, 'CTLD');
+            await jtffci.mizlib.injectSingleSoundFolderIntoZipObject(mizObject, 'CTLD');
             settingsArray.push(
                 {
                     file: "settings-logistics.lua",
                     objectName: "CTLDConfig"
                 },
             );
-            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-                missionObject['trig'],
-                missionObject['trigrules'],
-                mapResourceObject,
-                'Logistics',
-                ['180-logistics.lua'],
-                28,
-                '0xff0000ff'
-            );
-            missionObject['trig'] = tuple.tObject;
-            missionObject['trigrules'] = tuple.trObject;
-            mapResourceObject = tuple.mrObject;
+            scriptsArray.push({
+                folder: 'src',
+                scriptTitle: 'Logistics',
+                scripts: ['180-logistics.lua'],
+                timing: 28,
+                color: '0xff0000ff'
+            });
         }
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_A2G)) {
             // injection des fichiers son Range
@@ -462,18 +461,13 @@ function injectScripts(jtffci, env_mission) {
                     objectName: "SkynetConfig"
                 },
             );
-            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-                missionObject['trig'],
-                missionObject['trigrules'],
-                mapResourceObject,
-                'Air To Ground',
-                ['190-ranges.lua', '191-sams.lua', '193-training_ranges.lua', '195-reaper-ondemand.lua', '196-fac_ranges.lua', '199-skynet.lua'],
-                29,
-                '0xff0000ff'
-            );
-            missionObject['trig'] = tuple.tObject;
-            missionObject['trigrules'] = tuple.trObject;
-            mapResourceObject = tuple.mrObject;
+            scriptsArray.push({
+                folder: 'src',
+                scriptTitle: 'Air To Ground',
+                scripts: ['190-ranges.lua', '191-sams.lua', '193-training_ranges.lua', '195-reaper-ondemand.lua', '196-fac_ranges.lua', '199-skynet.lua'],
+                timing: 29,
+                color: '0xff0000ff'
+            });
         }
         if ((/^y\b|o\b|yes\b|oui\b/i).test(prompt_result.inject_mission)) {
             // fs.copyFileSync('templates/src/200-mission.lua',
@@ -515,14 +509,28 @@ function injectScripts(jtffci, env_mission) {
             //         path.basename(env_mission)
             //     ].join(""),
             //     inputZip);
-            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
-                missionObject['trig'],
-                missionObject['trigrules'],
+            scriptsArray.push({
+                folder: 'src',
+                scriptTitle: 'Mission specific',
+                scripts: ['200-mission.lua'],
+                timing: 30,
+                color: '0xff0000ff'
+            });
+        }
+        for ( script of scriptsArray) {
+            let tuple = jtffci.mizlib.injectLuaScriptAndUpdateWorkspace(
+                [
+                    jtffci.config.general.missionFolder,
+                    "/",
+                    path.parse(env_mission).name,
+                ].join(""),
+                script.folder,
+                script.scripts,
+                script.scriptTitle,
+                missionObject,
                 mapResourceObject,
-                'Mission specific',
-                ['200-mission.lua'],
-                30,
-                '0xff0000ff'
+                script.timing,
+                script.color
             );
             missionObject['trig'] = tuple.tObject;
             missionObject['trigrules'] = tuple.trObject;
@@ -564,7 +572,7 @@ function injectScripts(jtffci, env_mission) {
             ].join("")
         );
         if (settingsArray.length > 0) {
-            tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
+            let tuple = jtffci.mizlib.injectLuaScriptsInMissionObject(
                 missionObject['trig'],
                 missionObject['trigrules'],
                 mapResourceObject,