@jtff/miztemplate-lib 3.0.0-rc13 → 3.0.0-rc15

package/ci/build.js

@@ -0,0 +1,6 @@
+const templatelib = require('@jtff/miztemplate-lib');
+
+const config = require("../../config.json");
+const jtffci = new templatelib.MizTemplateCI(config);
+
+templatelib.build(jtffci);

package/ci/clean.js

@@ -0,0 +1,4 @@
+const templatelib = require('@jtff/miztemplate-lib');
+const config = require("../../config.json");
+
+templatelib.clean(config);

package/ci/ftpupload.js

@@ -0,0 +1,6 @@
+const templatelib = require('@jtff/miztemplate-lib');
+
+const config = require("../../config.json");
+const jtffci = new templatelib.MizTemplateCI(config);
+
+templatelib.ftpupload(jtffci);

package/ci/gdrive-upload.js

@@ -0,0 +1,6 @@
+const templatelib = require('@jtff/miztemplate-lib');
+
+const config = require("../../config.json");
+const jtffci = new templatelib.MizTemplateCI(config);
+
+templatelib.gdriveupload(jtffci);

package/ci/get-mizfiles.js

@@ -0,0 +1,6 @@
+const templatelib = require('@jtff/miztemplate-lib');
+
+const config = require("../../config.json");
+const jtffci = new templatelib.MizTemplateCI(config);
+
+templatelib.getmizfiles(jtffci);

package/ci/getset-version.js

@@ -0,0 +1,10 @@
+const templatelib = require('@jtff/miztemplate-lib');
+
+const config = require("../../config.json");
+const jtffci = new templatelib.MizTemplateCI(config);
+
+if (process.argv.slice(2).length > 0) {
+    templatelib.setVersion(jtffci, process.argv.slice(2)[0], "./config.json");
+} else {
+    templatelib.getVersion(jtffci);
+}

package/ci/inject-scripts.js

@@ -0,0 +1,5 @@
+const templatelib = require('@jtff/miztemplate-lib');
+const config = require("../../config.json");
+const jtffci = new templatelib.MizTemplateCI(config);
+
+templatelib.injectScripts(jtffci, process.env.npm_config_mission);

package/ci/prepare-nextversion.js

@@ -0,0 +1,5 @@
+const templatelib = require('@jtff/miztemplate-lib');
+const config = require("../../config.json");
+const jtffci = new templatelib.MizTemplateCI(config);
+
+templatelib.nextversionPrepare(jtffci, "./config.json");

package/ci/release.js

@@ -0,0 +1,5 @@
+const templatelib = require('@jtff/miztemplate-lib');
+const config = require("../../config.json");
+const jtffci = new templatelib.MizTemplateCI(config);
+
+templatelib.release(jtffci, "./config.json");

package/ci/template-update.js

@@ -0,0 +1,5 @@
+const templatelib = require('@jtff/miztemplate-lib');
+const config = require("../../config.json");
+const jtffci = new templatelib.MizTemplateCI(config);
+
+templatelib.templateUpdate(jtffci);

package/lib/jtff-lib-ci.js

@@ -187,6 +187,66 @@ class MizTemplateCI{
             }
         });
     }
+
+    async generateConfigJsonFileFromZipObject(zip,filename) {
+        let theatreString = (await this.mizlib.getMissionObjectFromZipObject(zip)).theatre;
+        return {
+            "general": {
+                "missionFolder": "dist",
+                "missionPrefix": filename,
+                "missionSuffix": "JTFF",
+                "missionVersion": "1.0.0-snapshot"
+            },
+            "google": {
+                "scopes": [
+                    "https://www.googleapis.com/auth/drive"
+                ],
+                "tokenPath": "dist/gtoken.json"
+            },
+            "missionTemplates": [
+                {
+                    "theatre": theatreString,
+                    "filename": filename,
+                    "destFolderId": "1pK_0I2iEzhEiqWicu8hsX7VPZuKGnKoW"
+                }
+            ]
+        };
+    }
+
+    async generatePackageJsonFile(missionName) {
+        return {
+            "name": missionName,
+            "version": "1.0.0-snapshot",
+            "description": "build jtff-style missions",
+            "main": "none",
+            "scripts": {
+                "build": "node src/nodejs/build.js",
+                "clean": "node src/nodejs/clean.js",
+                "template-update": "node src/nodejs/template-update.js",
+                "nextversion-prepare": "node src/nodejs/prepare-nextversion.js",
+                "version": "node src/nodejs/getset-version.js",
+                "release": "node src/nodejs/release.js",
+                "getmiz": "node src/nodejs/get-mizfiles.js",
+                "gdrive-upload": "node src/nodejs/gdrive-upload.js",
+                "ftp-upload": "node src/nodejs/ftpupload.js"
+            },
+            "author": "Sebastien LONGO",
+            "license": "GPL-3.0-or-later",
+            "dependencies": {
+                "@jtff/miztemplate-lib": "latest"
+            }
+        };
+    }
+
+    async InjectCiScriptsIntoWorkspace(workspacePath) {
+        fs.cpSync('node_modules/@jtff/miztemplate-lib/ci',workspacePath + '/src/nodejs',{recursive: true});
+    }
+
+    async deployCIScriptsFromZipObjectIntoWorkspace(workspacePath, mizObject, mizFilePath) {
+        fs.writeFileSync(workspacePath + '/config.json', JSON.stringify(await this.generateConfigJsonFileFromZipObject(mizObject, path.basename(mizFilePath)), null, 4));
+        fs.writeFileSync(workspacePath + '/package.json', JSON.stringify(await this.generatePackageJsonFile(path.parse(mizFilePath).name), null, 4));
+        await this.InjectCiScriptsIntoWorkspace(workspacePath);
+    }
 }
 
 

package/lib/mizlib.js

@@ -107,19 +107,17 @@ class Mizlib {
         return MizFile.loadAsync(mizData);
     }
 
-    async mizUpdate(mizPath, copyPath, strTheatreSettings) {
-        const zip = await this.getZipObjectFromMizPath(mizPath);
-        this.injectLuaFilesFromFolderIntoZipObject(zip, 'src');
-        this.injectLuaFilesFromFolderIntoZipObject(zip, 'lib');
-        if (strTheatreSettings === null) {
-            // TODO: Inject fake data
-            console.log("NO THEATRE SPECIFIED. RADIO PRESETS WILL NOT BE AVAILABLE !");
-        } else {
-            await this.injectRadioPresetsFromFolderIntoZipObject(zip, 'resources/radios/' + strTheatreSettings);
-        }
-        this.mizUpdateSettingsLuaFiles(zip, strTheatreSettings);
-        await this.mizUpdateSoundFolders(zip);
-        const inputZip = await zip.generateAsync({
+    async buildMizFileFromMizTemplate(mizPath, copyPath) {
+        const zipObject = await this.getZipObjectFromMizPath(mizPath);
+        const missionObject = await this.getMissionObjectFromZipObject(zipObject);
+        const strTheatreSettings = missionObject.theatre;
+        // TODO: D'abord mettre à jour les fichiers src et lib depuis la miztemplate sauf 200-mission.lua
+        this.injectLuaFilesFromFolderIntoZipObject(zipObject, 'src');
+        this.injectLuaFilesFromFolderIntoZipObject(zipObject, 'lib');
+        await this.injectRadioPresetsFromFolderIntoZipObject(zipObject, 'resources/radios/' + strTheatreSettings);
+        this.mizUpdateSettingsLuaFiles(zipObject, strTheatreSettings);
+        await this.mizUpdateSoundFolders(zipObject);
+        const inputZip = await zipObject.generateAsync({
             type: 'nodebuffer',
             streamFiles: true,
             compression: "DEFLATE",
@@ -397,31 +395,6 @@ class Mizlib {
         let luaTable = 'return { \n' + await this.getMapResourceLuaStringFromZipObject(zip) + ' }';
         return parse(luaTable).mapResource;
     }
-
-    async generateConfigJsonFile(zip) {
-        let theatreString = (await this.getMissionObjectFromZipObject(zip)).theatre;
-        return {
-            "general": {
-                "missionFolder": "dist",
-                "missionPrefix": "Theatre",
-                "missionSuffix": "JTFF",
-                "missionVersion": "1.0.0-snapshot"
-            },
-            "google": {
-                "scopes": [
-                    "https://www.googleapis.com/auth/drive"
-                ],
-                "tokenPath": "dist/gtoken.json"
-            },
-            "missionTemplates": [
-                {
-                    "theatre": theatreString,
-                    "prefix": "template",
-                    "destFolderId": "15CrplYJsmv8GNu2obuX-TuCWLrUff1NS"
-                }
-            ]
-        };
-    }
 }
 
-module.exports = Mizlib
+module.exports = Mizlib;

package/lua/src/199-skynet.lua

@@ -568,7 +568,7 @@ function manageIADSNetworkMenu(networkRootMenu, iadsconfig, IADSObjectIndex)
                     deactivateSkynet,
                     { iadsconfig, IADSObjectIndex, networkRootMenu }
             )
-            --TODO: A tweaker pour que les objets skynets seront basés sur la coalition et non sur la mission globale
+            --TODO: A tweaker pour que les objets skynets soient basés sur la coalition et non sur la mission globale
             if (type(iadsconfig.gci) == "table") then
                 local CommandGCIActivate = MENU_MISSION_COMMAND:New(
                         "GCI Activation",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jtff/miztemplate-lib",
-  "version": "3.0.0-rc13",
+  "version": "3.0.0-rc15",
   "description": "JTFF mission template library",
   "main": "index.js",
   "files": [
@@ -8,7 +8,8 @@
     "scripts",
     "lib",
     "lua",
-    "resources"
+    "resources",
+    "ci"
   ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/resources/radios/Caucasus/354th-caucasus.lua

@@ -0,0 +1,124 @@
+descriptor = {
+    aircraft = "A-10C_2",
+    group_name = "([354])"
+}
+
+radio_descriptor_table = {
+    [1] = -- ARC-210
+    {
+        ["modulations"] =
+        {
+            [1] = 0,
+            [2] = 0,
+            [3] = 0,
+            [4] = 0,
+            [5] = 0,
+            [6] = 0,
+            [7] = 0,
+            [8] = 0,
+            [9] = 0,
+            [10] = 0,
+            [11] = 0,
+            [12] = 0,
+            [13] = 0,
+            [14] = 0,
+            [15] = 0,
+            [16] = 0,
+            [17] = 0,
+            [18] = 0,
+            [19] = 0,
+            [20] = 0,
+            [21] = 1,
+            [22] = 1,
+            [23] = 1,
+            [24] = 1,
+            [25] = 1,
+        }, -- end of ["modulations"]
+        ["channels"] =
+        {
+            [1] = 133.250,
+            [2] = 133.500,
+            [3] = 133.750,
+            [4] = 133.950,
+            [5] = 126.600,
+            [6] = 134.100,
+            [7] = 132.650,
+            [8] = 131.250,
+            [9] = 131.500,
+            [10] = 135.250,
+            [11] = 135.500,
+            [12] = 139.250,
+            [13] = 139.500,
+            [14] = 136.250,
+            [15] = 136.500,
+            [16] = 137.250,
+            [17] = 137.500,
+            [18] = 125.000,
+            [19] = 130.250,
+            [20] = 121.500,
+            [21] = 54.000,
+            [22] = 32.500,
+            [23] = 42.000,
+            [24] = 37.500,
+            [25] = 54.000,
+        }, -- end of ["channels"]
+    }, -- end of [1]
+    [2] = -- ARC-164
+    {
+        ["modulations"] =
+        {
+        }, -- end of ["modulations"]
+        ["channels"] =
+        {
+            [1] = 360.100,
+            [2] = 360.200,
+            [3] = 360.300,
+            [4] = 360.400,
+            [5] = 377.800,
+            [6] = 265.800,
+            [7] = 261.000,
+            [8] = 261.500,
+            [9] = 276.200,
+            [10] = 317.500,
+            [11] = 360.200,
+            [12] = 251.200,
+            [13] = 263.100,
+            [14] = 327.100,
+            [15] = 250.250,
+            [16] = 250.500,
+            [17] = 251.750,
+            [18] = 309.000,
+            [19] = 274.500,
+            [20] = 243.000
+        }, -- end of ["channels"]
+    }, -- end of [2]
+    [3] = -- ARC-186
+    {
+        ["modulations"] =
+        {
+        }, -- end of ["modulations"]
+        ["channels"] =
+        {
+            [1] = 35.400,
+            [2] = 35.450,
+            [3] = 35.500,
+            [4] = 35.550,
+            [5] = 35.500,
+            [6] = 31.501,
+            [7] = 31.502,
+            [8] = 31.503,
+            [9] = 31.504,
+            [10] = 31.505,
+            [11] = 31.506,
+            [12] = 31.507,
+            [13] = 31.508,
+            [14] = 31.509,
+            [15] = 31.510,
+            [16] = 31.511,
+            [17] = 31.512,
+            [18] = 31.513,
+            [19] = 31.514,
+            [20] = 87.500
+        }, -- end of ["channels"]
+    }, -- end of [3]
+} -- end of ["Radio"]

package/resources/radios/Caucasus/494th-caucasus.lua

@@ -0,0 +1,91 @@
+descriptor = {
+    aircraft = "F-15ESE",
+    group_name = "(^494)",
+}
+
+radio_descriptor_table = {
+    [1] =
+    {
+        ["channelsNames"] =
+        {
+        }, -- end of ["channelsNames"]
+        ["modulations"] =
+        {
+        }, -- end of ["modulations"]
+        ["channels"] =
+        {
+            [1] = 260.000, -- Orange1
+            [2] = 260.250, -- Orange2
+            [3] = 260.500, -- Orange3
+            [4] = 260.750, -- Orange4
+            [5] = 276.200, -- Olive1
+            [6] = 261.000, -- Silver2
+            [7] = 261.500, -- Silver3
+            [8] = 309.000, -- Bronze1 CSAR
+            [9] = 274.500, -- Bronze2 JTAC1
+            [10] = 243.000, -- Bronze4 Guard
+            [11] = 360.400, -- Incirlik Approach
+            [12] = 360.300, -- Olive3 - Incirlik Tower
+            [13] = 360.200, -- Incirlik Ground
+            [14] = 250.250, -- Red1 Range Ctl 1
+            [15] = 250.500, -- Red2 Range Ctl 2
+            [16] = 225.000,
+            [17] = 262.000, -- Cherry 1 - VF84
+            [18] = 236.250, -- Pink1 EC2/5
+            [19] = 225.000,
+            [20] = 225.000,
+        }, -- end of ["channels"]
+    }, -- end of [1]
+    [2] =
+    {
+        ["channelsNames"] =
+        {
+        }, -- end of ["channelsNames"]
+        ["modulations"] =
+        {
+        }, -- end of ["modulations"]
+        ["channels"] =
+        {
+            [1] = 270.100, -- Black3 ATIS
+            [2] = 360.400, -- Incirlik Approach
+            [3] = 360.300, -- Olive3 - Incirlik Tower
+            [4] = 360.200, -- Incirlik Ground
+            [5] = 265.800, -- Silver1 AWACS IA
+            [6] = 261.000, -- Silver2 AIC1
+            [7] = 261.500, -- Silver3 AIC2
+            [8] = 276.200, -- Olive1 Tanker1
+            [9] = 317.500, -- Olive2 Tanker2
+            [10] = 309.000, -- Bronze1 CSAR
+            [11] = 274.500, -- Bronze2 JTAC1
+            [12] = 130.250, -- Bronze3 JTAC2
+            [13] = 243.000, -- Bronze4 GUARD
+            [14] = 251.750, -- Black2 CTAF Ground
+            [15] = 121.500, -- Emergency
+            [16] = 250.250, -- Red1 Range Ctl1
+            [17] = 250.500, -- Red2 Range Ctl2
+            [18] = 225.000,
+            [19] = 131.250, -- Blue1 VMFA314
+            [20] = 135.250, -- Grape1 79FS
+            [21] = 225.000,
+            [22] = 225.000,
+            [23] = 225.000,
+            [24] = 225.000,
+            [25] = 225.000,
+            [26] = 225.000,
+            [27] = 225.000,
+            [28] = 225.000,
+            [29] = 225.000,
+            [30] = 225.000,
+            [31] = 225.000,
+            [32] = 225.000,
+            [33] = 225.000,
+            [34] = 225.000,
+            [35] = 225.000,
+            [36] = 225.000,
+            [37] = 225.000,
+            [38] = 225.000,
+            [39] = 225.000,
+            [40] = 225.000,
+        }, -- end of ["channels"]
+    }, -- end of [2]
+} -- end of ["Radio"]

package/resources/radios/Caucasus/79th-SUFA-caucasus.lua

@@ -0,0 +1,65 @@
+descriptor = {
+    aircraft = "F-16D_50_NS",
+    group_name = "([79])",
+}
+
+radio_descriptor_table = {
+    [1] = 
+    {
+        ["modulations"] = 
+        {
+        }, -- end of ["modulations"]
+        ["channels"] = --UHF 
+        {
+            [1] = 270.100, --ATIS
+            [2] = 360.200, --Incirlik Ground
+            [3] = 360.300, --Incirlik Tower & A/A
+            [4] = 360.400, --Incirlik Dep/App
+            [5] = 377.800, --BlackJack
+            [6] = 265.800, --AWACS IA
+            [7] = 261.000, --AIC 1
+            [8] = 261.500, --AIC 2
+            [9] = 279.000, --Squad TAC
+            [10] = 279.250, --Squad TAC
+            [11] = 250.250, --Range ctrl 1
+            [12] = 250.500, --Range ctrl 2
+            [13] = 309.000, --CSAR
+            [14] = 276.200, --TKR 1 Boom
+            [15] = 317.500, --TKR 2 Basket
+            [16] = 236.250, --2/5 IDF Tac
+            [17] = 236.500, --2/5 IDF Tac
+            [18] = 274.500, --JTAC 1
+            [19] = 251.750, --CTAF
+            [20] = 243.000, --Guard
+        }, -- end of ["channels"]
+    }, -- end of [1]
+    [2] = 
+    {
+        ["modulations"] = 
+        {
+        }, -- end of ["modulations"]
+        ["channels"] = --VHF
+        {
+            [1] = 135.250, --Squad tac
+            [2] = 135.500, --Squad tac
+            [3] = 135.750, --Squad tac
+            [4] = 135.950, --Squad tac
+            [5] = 127.500, --BlakJack
+            [6] = 133.250, --354Th FS Tac
+            [7] = 133.500, --354Th FS Tac
+            [8] = 133.750, --354Th FS Tac
+            [9] = 133.950, --354Th FS Tac
+            [10] = 139.250, --N/A
+            [11] = 139.500, --N/A
+            [12] = 139.750, --N/A
+            [13] = 131.250, --VMFA 314 Tac
+            [14] = 131.500, --VMFA 314 Tac
+            [15] = 137.250, --N/A
+            [16] = 137.500, --N/A
+            [17] = 137.750, --N/A
+            [18] = 130.250, --JTAC 2
+            [19] = 125.000, --N/A
+            [20] = 121.500, --Emergency
+        }, -- end of ["channels"]
+    }, -- end of [2]
+} -- end of ["Radio"]

package/resources/radios/Caucasus/79th-caucasus.lua

@@ -0,0 +1,65 @@
+descriptor = {
+    aircraft = "F-16C_50",
+    group_name = "([79])",
+}
+
+radio_descriptor_table = {
+    [1] = 
+    {
+        ["modulations"] = 
+        {
+        }, -- end of ["modulations"]
+        ["channels"] = --UHF 
+        {
+            [1] = 270.100, --ATIS
+            [2] = 360.200, --Incirlik Ground
+            [3] = 360.300, --Incirlik Tower & A/A
+            [4] = 360.400, --Incirlik Dep/App
+            [5] = 377.800, --BlackJack
+            [6] = 265.800, --AWACS IA
+            [7] = 261.000, --AIC 1
+            [8] = 261.500, --AIC 2
+            [9] = 279.000, --Squad TAC
+            [10] = 279.250, --Squad TAC
+            [11] = 250.250, --Range ctrl 1
+            [12] = 250.500, --Range ctrl 2
+            [13] = 309.000, --CSAR
+            [14] = 276.200, --TKR 1 Boom
+            [15] = 317.500, --TKR 2 Basket
+            [16] = 236.250, --2/5 IDF Tac
+            [17] = 236.500, --2/5 IDF Tac
+            [18] = 274.500, --JTAC 1
+            [19] = 251.750, --CTAF
+            [20] = 243.000, --Guard
+        }, -- end of ["channels"]
+    }, -- end of [1]
+    [2] = 
+    {
+        ["modulations"] = 
+        {
+        }, -- end of ["modulations"]
+        ["channels"] = --VHF
+        {
+            [1] = 135.250, --Squad tac
+            [2] = 135.500, --Squad tac
+            [3] = 135.750, --Squad tac
+            [4] = 135.950, --Squad tac
+            [5] = 127.500, --BlakJack
+            [6] = 133.250, --354Th FS Tac
+            [7] = 133.500, --354Th FS Tac
+            [8] = 133.750, --354Th FS Tac
+            [9] = 133.950, --354Th FS Tac
+            [10] = 139.250, --N/A
+            [11] = 139.500, --N/A
+            [12] = 139.750, --N/A
+            [13] = 131.250, --VMFA 314 Tac
+            [14] = 131.500, --VMFA 314 Tac
+            [15] = 137.250, --N/A
+            [16] = 137.500, --N/A
+            [17] = 137.750, --N/A
+            [18] = 130.250, --JTAC 2
+            [19] = 125.000, --N/A
+            [20] = 121.500, --Emergency
+        }, -- end of ["channels"]
+    }, -- end of [2]
+} -- end of ["Radio"]

package/resources/radios/Caucasus/ec25-D-caucasus.lua

@@ -0,0 +1,65 @@
+descriptor = {
+    aircraft = "M-2000D",
+    group_name = "(2(.?)*5)",
+}
+
+radio_descriptor_table = {
+    [1] = 
+    {
+        ["modulations"] = 
+        {
+        }, -- end of ["modulations"]
+        ["channels"] = 
+        {
+            [1] = 236.25,
+            [2] = 236.5,
+            [3] = 236.75,
+            [4] = 236.95,
+            [5] = 251.75,
+            [6] = 265.8,
+            [7] = 261,
+            [8] = 261.5,
+            [9] = 317.5,
+            [10] = 360.2,
+            [11] = 360.3,
+            [12] = 360.4,
+            [13] = 270.1,
+            [14] = 276.2,
+            [15] = 274.5,
+            [16] = 250.25,
+            [17] = 250.5,
+            [18] = 309.0,
+            [19] = 377.8,
+            [20] = 243,
+        }, -- end of ["channels"]
+    }, -- end of [1]
+    [2] = 
+    {
+        ["modulations"] = 
+        {
+        }, -- end of ["modulations"]
+        ["channels"] = 
+        {
+            [1] = 236.25,
+            [2] = 236.5,
+            [3] = 236.75,
+            [4] = 236.95,
+            [5] = 251.75,
+            [6] = 265.8,
+            [7] = 261,
+            [8] = 261.5,
+            [9] = 317.5,
+            [10] = 360.2,
+            [11] = 360.3,
+            [12] = 360.4,
+            [13] = 270.1,
+            [14] = 276.2,
+            [15] = 135.25,
+            [16] = 133.25,
+            [17] = 130.25,
+            [18] = 125,
+            [19] = 130.25,
+            [20] = 121.5,
+        }, -- end of ["channels"]
+    }, -- end of [2]
+} -- end of ["Radio"]