some fixes in core, migration support for config, disable sp with error in loader

Author: SaltyMonkey

index.js

@@ -4,10 +4,10 @@
 //In theory a bit slower with bunch of modules than old loader
 //but can detect copypasted SP instances
 //------------------------------------
-
-const { lstatSync, readdirSync } = require('fs');
+const { lstatSync, readdirSync, existsSync} = require('fs');
 const path = require('path');
 const sysmsg = require('tera-data-parser').sysmsg,
+	migration = require('./lib/migration'),
 	childModules = [
 		require('./lib/core'),
 		require('./lib/cooldowns')
@@ -36,6 +36,9 @@ let blockedModules = ['cooldowns', 'lockons', 'lockons-master', 'fastfire', 'fas
 	'sp', 'cooldowns-master', 'fast-block-master', 'skillprediction', 'pinkie-sp', 'sp-pinkie'];
 let errorState = false;
 let installedModules = null;
+
+let migrationConfigPath = path.resolve(__dirname, './migration/partial-config.json');
+let originalConfigPath = path.resolve(__dirname, './config/config.json');
 //------------------------------------------------------------------------
 
 //all installed modules except current dir
@@ -52,13 +55,21 @@ if (!installedModules.includes('command') && !installedModules.includes('command
 	errorState = true
 }
 
+//config migration
+if (existsSync(migrationConfigPath)) {
+	let migrationHelper = new migration.ConfigMigrationHelper(migrationConfigPath, originalConfigPath)
+	if (!migrationHelper.CompareJsons()) {
+		migrationHelper.ApplyMigration();
+	}
+}
+
 module.exports = function SkillPredictionCore(dispatch) {
-	if (errorState) return;
+	if (errorState) return
 
 	dispatch.hookOnce('C_CHECK_VERSION', 1, () => {
 		if (!sysmsg.maps.get(dispatch.base.protocolVersion) || sysmsg.maps.get(dispatch.base.protocolVersion).name.size === 0) {
 			console.error('ERROR: Your version of tera-proxy is too old to run Skill Prediction');
-			process.exit()
+			return
 		}
 	});
 

lib/core.js

@@ -8,11 +8,11 @@ const { protocol, sysmsg } = require('tera-data-parser'),
     silence = require('../config/data/basicCC').reduce((map, value) => {
         map[value] = true;
         return map
-    }, {});
+    }, {}),
     evasivecc = require('../config/data/evasiveCC').reduce((map, value) => {
         map[value] = true;
         return map
-    }, {});
+    }, {}),
     extcc = require('../config/data/extendedCC').reduce((map, value) => {
         map[value] = true;
         return map
@@ -108,7 +108,7 @@ module.exports = function SkillPrediction(dispatch) {
     //Config file write
     //-------------
     function SaveConfiguration() {
-        fs.writeFile(configFile, JSON.stringify(config, "\t"), (err) => {
+        fs.writeFile(configFile, JSON.stringify(config, null, "\t"), (err) => {
             if (err)
                 console.log('[Skill Prediction] Error!')
         })
@@ -266,13 +266,13 @@ module.exports = function SkillPrediction(dispatch) {
                 command.message(`Ping: Min=${ping.min} Max=${ping.max} Jitter=${ping.max - ping.min} Samples=${ping.history.length}`);
                 break;
             //case 'clearskills':
-                //if (!currentAction && !serverAction && !mounted && alive && !inCombat && !sending) {
-                //    skillsCache = {};
-                //    command.message('[Skill Prediction] Cache cleared');
-                //} else {
-                //    command.message('[Skill Prediction] OwO!');
-                //}
-               //break;
+            //if (!currentAction && !serverAction && !mounted && alive && !inCombat && !sending) {
+            //    skillsCache = {};
+            //    command.message('[Skill Prediction] Cache cleared');
+            //} else {
+            //    command.message('[Skill Prediction] OwO!');
+            //}
+            //break;
             default:
                 command.message('[Skill Prediction] Wrong command');
                 break;
@@ -1516,7 +1516,7 @@ module.exports = function SkillPrediction(dispatch) {
         let group = Math.floor(id / 10000),
             level = (Math.floor(id / 100) % 100) - 1,
             sub = id % 100
-            
+
         // preset.js support
         if (!get(preset, job, "enabled") || !get(preset, job, group))
             return skillsCache[id] = null

lib/migration.js

@@ -0,0 +1,59 @@
+//------------------------------------
+//by SaltyMonkey 
+//Migration helper
+//Can compare download partial json with current config
+//and update config with new data from server 
+//same with abnormalitiest.js (soon)
+//------------------------------------
+
+const fs = require('fs');
+
+exports.ConfigMigrationHelper = class ConfigMigrationHelper {
+    constructor(updatedConfigFullPath, originalConfigFullPath) {
+
+        this.updatedConfigFullPath = updatedConfigFullPath;
+        this.originalConfigFullPath = originalConfigFullPath;
+        this.originalData = this.LoadJson(this.originalConfigFullPath);
+        this.updateData = this.LoadJson(this.updatedConfigFullPath);
+        this.diff = {};
+    }
+
+    LoadJson(path) {
+        try {
+            return JSON.parse(fs.readFileSync(path, 'utf8'))
+        }
+        catch (err) {
+            console.error(`[Skill Prediction] Migration error! ${err}`);
+        }
+    }
+
+    SaveJson(obj, path) {
+        try {
+            fs.writeFileSync(path, JSON.stringify(obj, null, "\t"))
+            console.info(`[Skill Prediction] Done.`);
+        }
+        catch (err) {
+            console.error(`[Skill Prediction] Migration error! ${err}`);
+        }
+    }
+
+    CompareJsons() {
+        if (this.originalData.version === this.updateData.version) return;
+        let flag = true;
+
+        for (let [key, value] of Object.entries(this.updateData)) {
+            if (!this.originalData[key] || this.originalData[key] !== value) {
+                flag = false;
+                this.diff[key] = value;
+            }
+        }
+        if (!flag) console.log(`[Skill Prediction] Config file outdated. Migration will start soon...`)
+        return flag;
+    }
+
+    ApplyMigration() {
+        for (let [key, value] of Object.entries(this.diff))
+            this.originalData[key] = value;
+        this.SaveJson(this.originalData, this.originalConfigFullPath);
+    }
+}

manifest.json

@@ -1,6 +1,6 @@
 {
   "files": {
-    "index.js": "f7e63991df3cf64ecb468579fe9dab3877d6f2de49f67caec75b142cb2434fe3",
+    "index.js": "159f922b9ccb7e2b61ddb93034b903135fee9f34f0b456b61e97a483302cd986",
     "LICENSE": "53927bd0b739d38c87a0a82236fd9b070c2dfff11c0c119be50372005d5047ad",
     "module.json": "8e73f7575ee71a68f91647c386adf75df8d4c4a24ccc8f7627bfc76291f28a34",
     "package.json": "36a402d8fd02464deba0c986205aba993fd2b1c958bec0f2068da51b26edabba",
@@ -26,10 +26,11 @@
     "docs/config.md": "b6baaf9ef0d77dc8ddc4f364891bf2d63332e083b3b952f1ca82e12966753935",
     "lib/abnormalities.js": "3f322174d3b1176f09161f433fc879cf55b65554bb1f50e8d04c1b17ee39ee4e",
     "lib/cooldowns.js": "59312e5d7426884b1f2ab28def4ff27ee33b55ceadbe0a32689629686511abf3",
-    "lib/core.js": "e199e842322b77e73ca34f447309f463e480092dd99787a0c952322682aa42ed",
+    "lib/core.js": "a647b0fefd6691f0b3f80efeaea0c4a2a3fda406b907f25e481a54d0cdcea839",
     "lib/ping.js": {
       "overwrite": false,
       "hash": "1909de04fc9c01db4bfc53c36c866613582ad4942c9afe87709c57f1b650fbcd"
-    }
+    },
+    "lib/migration.js": "7c425da0c3d8ff1bb650680d55896fc9f93fb3885b31e7ff668221df298af99e"
   }
 }