Просмотр исходного кода

optimized CI, some smol changes

SaltyMonkey лет назад: 6
Родитель
Сommit
93dd371cdb
3 измененных файлов с 88 добавлено и 199 удалено
  1. 40 158
      .manifest.js
  2. 2 1
      fpsManager.js
  3. 46 40
      manifest.json

+ 40 - 158
.manifest.js

@@ -1,169 +1,51 @@
-/* eslint-disable no-param-reassign */
-/* eslint-disable global-require */
-/* eslint-disable no-magic-numbers */
 "use strict";
 "use strict";
+const crypto = require("crypto");
+const fs = require("fs");
+const path = require("path");
 
 
-// ignore these files for making manifest
-const IGNORED_FILES = [
-	"package-lock.json",
-	"manifest.json",
-	"settings.json",
-	"manifest-generator.js",
-	"manifest-generator.bat",
-	"manifest-generator.exe",
-	"node.exe"
-];
+const IGNORED_FILES = ["manifest.json", "settings.json", "manifest-generator.js", "manifest-generator.bat", "manifest-generator.exe", "node.exe"];
+const IGNORED_START_SYMBOL = [".", "_"];
 
 
-// ignore files/folders which start with these characters: i.e. ".git" or "_old"
-const IGNORED_CHARACTERS = [
-	".",
-	"_"
-];
-
-////////////////////
-//  CODE          //
-////////////////////
-
-const crypto = require("crypto"),
-	fs = require("fs"),
-	path = require("path");
-
-// set directory to launch argument or local directory
-let directory = __dirname;
-if (process.argv[2]) {
-	directory = process.argv[2];
-	// check if valid directory
-	try {
-		fs.readdirSync(directory, "utf8");
-	}
-	catch (err) {
-		return;
-	}
-}
-
-// read existing module.json
-let modulejson = null;
-try {
-	modulejson = require(path.join(directory, "module.json"));
-}
-catch (error) {
-	modulejson = {};
-}
-
-modulejson.disableAutoUpdate = false;
-
-
-modulejson.name = "fps-manager";
-modulejson.options = {
-	"niceName": "FPM",
-	"guiName": "FPS Manager",
-	"settingsVersion": 1,
-	"settingsFile": "./settings.json",
-	"settingsMigrator": "./data/migrationData.js"
-};
-modulejson.author = "SaltyMonkey";
-modulejson.description = "FPS Manager is modern and extremely customizable module for Tera Toolbox which can help to solve annoyance by some ingame messages and fps drops.";
-modulejson.servers = ["https://raw.githubusercontent.com/SaltyMonkey/fps-manager/master/"];
-modulejson.supportUrl = ["https://github.com/SaltyMonkey/fps-manager/issues"];
-
-fs.writeFileSync(path.join(directory, "module.json"), jsonify(modulejson), "utf8");
-
-// read existing manifest.json
-let manifest = null;
+//load predefined manifest
+let manifest = undefined;
 try {
 try {
-	// sanitize input
-	manifest = require(path.join(directory, "manifest.json"));
-	if (manifest && typeof manifest === "object") {
+	manifest = require("manifest.json");
+	if (manifest && typeof manifest === "object")
 		if (!manifest.files) manifest.files = {};
 		if (!manifest.files) manifest.files = {};
-	}
-	else {
-		manifest = {
-			"files": {}
-		};
-	}
-}
-catch (error) {
-	// make new manifest
-	manifest = {
-		"files": {}
-	};
-}
-
-// delete removed file entries
-let checking = 0;
-for (let entry of Object.keys(manifest.files)) {
-	// check if file exists
-	checking += 1;
-	fs.access(path.join(directory, entry), fs.constants.F_OK, (err) => {
-		checking -= 1;
-		if (err) delete manifest.files[entry];
-		checkProg();
-		return;
-	});
-}
-
-let reading = 0;
-getFiles();
-
-// get all files in folder and subfolder
-function getFiles(relativePath = "", files) {
-	let dir = path.join(directory, relativePath);
-	if (!files) files = fs.readdirSync(dir, "utf8");
-	for (let file of files) {
-		// if not ignored file or begins with ignored character
-		if (!IGNORED_FILES.includes(file) && !IGNORED_CHARACTERS.includes(file[0])) {
-			reading += 1;
-			fs.readdir(path.join(dir, file), "utf8", (err, moreFiles) => {
-				if (moreFiles) {
-					getFiles(path.join(relativePath, file), moreFiles);
-				}
-				else {
-					getHash(path.join(relativePath, file));
-				}
-				reading -= 1;
-				checkProg();
-			});
+	else manifest = { "files": {} };
+}
+catch (err) { manifest = { "files": {} };}
+
+//cleanup manifest
+Object.keys(manifest.files).forEach(entry => {
+	try { fs.accessSync(path.join(__dirname, entry), fs.constants.F_OK) }
+	catch (err) { delete manifest.files[entry]; }
+});
+
+//recursive file gather
+function findInDirRelative(dir, fileList = []) {
+	const files = fs.readdirSync(dir);
+	files.forEach((file) => {
+		const filePath = path.join(dir, file);
+		const fileStat = fs.lstatSync(filePath);
+		if (!IGNORED_FILES.includes(file) && !IGNORED_START_SYMBOL.includes(file[0])) {
+			if (fileStat.isDirectory()) findInDirRelative(filePath, fileList);
+			else fileList.push(path.relative(__dirname, filePath));
 		}
 		}
-	}
+	});
+	return fileList;
 }
 }
 
 
-// get sha256 hash
-function getHash(file, type = "sha256") {
-	file = file.replace(/\\/g, "/");
+//generate hash
+const files = findInDirRelative(__dirname);
+files.forEach(filePath => {
+	let file = filePath.replace(/\\/g, "/");
 	if (manifest.files[file] && typeof manifest.files[file] === "object") {
 	if (manifest.files[file] && typeof manifest.files[file] === "object") {
-		manifest.files[file].hash = crypto.createHash(type).update(fs.readFileSync(path.join(directory, file))).digest("hex");
-	}
-	else {
-		manifest.files[file] = crypto.createHash(type).update(fs.readFileSync(path.join(directory, file))).digest("hex");
+		manifest.files[file].hash = crypto.createHash("sha256").update(fs.readFileSync(path.join(__dirname, file))).digest("hex");
 	}
 	}
-}
-
-
-// JSON.stringify but make lists single line
-function jsonify(obj) {
-	obj = JSON.stringify(obj, null, "    ");
-	let lists = obj.match(/\[[^]+?\].*/igm);
-	if (lists) for (let list of lists) {
-		obj = obj.substring(0, obj.indexOf(list)) + list.replace(/[ \n\t]*/igm, "") + obj.substring(obj.indexOf(list) + list.length);
-	}
-	return obj;
-}
+	else
+		manifest.files[file] = crypto.createHash("sha256").update(fs.readFileSync(path.join(__dirname, file))).digest("hex");
+})
 
 
-// alphabetize object keys
-function alphabetizeObject(obj) {
-	let keys = Object.keys(obj);
-	keys.sort();
-	let newObj = {};
-	for (let key of keys) {
-		newObj[key] = obj[key];
-	}
-	return newObj;
-}
-
-// check if process completed
-function checkProg() {
-	if (reading === 0 && checking === 0) {
-		manifest.files = alphabetizeObject(manifest.files);
-		fs.writeFileSync(path.join(directory, "manifest.json"), jsonify(manifest), "utf8");
-	}
-}
+//save file
+fs.writeFileSync(path.join(__dirname, "manifest.json"), JSON.stringify(manifest, null, "\t"), "utf8");

+ 2 - 1
fpsManager.js

@@ -21,6 +21,7 @@
 const msg = {
 const msg = {
 	"proxyWarning": "Proxy runtime detected. Proper work not guaranteed.",
 	"proxyWarning": "Proxy runtime detected. Proper work not guaranteed.",
 	"runtimeWarning": "Outdated runtime detected. Proper work not guaranteed."
 	"runtimeWarning": "Outdated runtime detected. Proper work not guaranteed."
+	"runtimeOld": "Runtime is so old"
 };
 };
 
 
 const units = [
 const units = [
@@ -47,7 +48,7 @@ class FpsManager {
 			mod.error(msg.proxyWarning);
 			mod.error(msg.proxyWarning);
 		// eslint-disable-next-line node/no-missing-require
 		// eslint-disable-next-line node/no-missing-require
 		else if(!require("tera-data-parser").types)
 		else if(!require("tera-data-parser").types)
-			mod.error(msg.runtimeWarning);
+			mod.error(msg.runtimeOld);
 		
 		
 		mod.game.initialize("me");
 		mod.game.initialize("me");
 
 

+ 46 - 40
manifest.json

@@ -1,42 +1,48 @@
 {
 {
-    "files": {
-        "LICENSE": "90f8c7dacbf501cfda5f9545c85d705e6cecf6b8f21885e4c5e1f5f9d97dc837",
-        "README.md": "be86e5aacb62a725f5cb49aaeebde0f21a9077c0b3ba270af3927a6fbb500899",
-        "data/migrationData.js": "2a5b00c748f0ce04e23800d04b053f005bad58b327f31317d2e58fd3340aba1e",
-        "data/protoData.json": "25f1579d4d485047ce796042ba7e14bd29451eb3a5faff866eba99dfcaa7758e",
-        "data/staticData.json": "58d4d156ee20e5542be97580f935d4616aa06937c38ce416c2a13f92aba71752",
-        "docs/commands.md": "447f8f5b7092d98bf4338f724ab431006864c282c7ef5cc888592124b310b1d6",
-        "docs/presets.md": "469a2b0870651ecc1af4e66d236e1d74e08eb699cc0a8f29d9eee5a91909ebee",
-        "docs/settings.md": "e4dc5e4a18deaae6936d9ed8b46b3f70d3de32139d4c0f95f9afea046486d68e",
-        "fpsManager.js": "9e460c4bbf1de314f10b780e3797d41a8f163612aec8526cf04330d184a94e98",
-        "lib/helpers/enums.js": "2a6109100af91c24d8f638e5652a3ab74315c972c4daba0834cc3ed97fa57112",
-        "lib/helpers/utils.js": "e413a0354242071c873f2615a7668b27bdc9209fe78770cf8d5607d58011c120",
-        "lib/helpers/watchdog.js": "0d0fd2f7c3e9bfff3630e6ee376979e5215bb9fda4dfee4e617a8b88289811ba",
-        "lib/unitControl.js": "84b165b46d2712dcd6f6dadb4ddb551458aa0334714ac0d47453946fd7a7f262",
-        "lib/unitFps.js": "e945807c0ca6afffc5d590e0d6cdc5b8b7be45bc1219c6b08a58fa91a005b50a",
-        "lib/unitProto.js": "eb5df2672912f68d52ea1bf183be9814612ab45ac662ba38b6687ce5bd4d6138",
-        "lib/unitState.js": "de851d84676816da652def9d3bac364a79acc46e570aeb5f989942d8822d57fc",
-        "lib/unitTracker.js": "7ef7c771171b50ad3c3d9041f7d5b50c2c4a8e3037279ba8e3772d1b5d5ecccb",
-        "manifest.json": "63dc2bbeeed10832595e7fbe3ee3f68b62553125769ce29781eeda5a8a1f13fa",
-        "module.json": "04697bdbf294c8178c0d2ad7cb54188f829c165c0ca04a6608e832ab6bb88122",
-        "node_modules/fast-deep-equal/LICENSE": "7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a",
-        "node_modules/fast-deep-equal/README.md": "ada32c1b53bd74640a22806e99b25c2b8ab2946eed338f325114be87bd5b9fce",
-        "node_modules/fast-deep-equal/es6/index.d.ts": "6088db10b4d7657ea7c69e46c9ef7c6bb507afc2d1c210c6934e31c638cfc500",
-        "node_modules/fast-deep-equal/es6/index.js": "d7f027497048c75e17268dbc66b670579d4f70f2dc0e019cdc9edf5078c247d6",
-        "node_modules/fast-deep-equal/es6/react.d.ts": "6088db10b4d7657ea7c69e46c9ef7c6bb507afc2d1c210c6934e31c638cfc500",
-        "node_modules/fast-deep-equal/es6/react.js": "366779cbb7821d26d18b9eaa12b6788cbb101cdbbabcae36f2919a5f48534ef0",
-        "node_modules/fast-deep-equal/index.d.ts": "37ffe3c12813b6a6d512f7c27b71f3388d03dafa10555ad5094cea393ed3d1f6",
-        "node_modules/fast-deep-equal/index.js": "eb469e206280321a3878f2335ec98aa2104a155079d8ed83a23029098dccd215",
-        "node_modules/fast-deep-equal/package.json": "d4b0257263006fcb1738df074d66307d2aafb9a0359d9ac70dcaacaf29946d02",
-        "node_modules/fast-deep-equal/react.d.ts": "6088db10b4d7657ea7c69e46c9ef7c6bb507afc2d1c210c6934e31c638cfc500",
-        "node_modules/fast-deep-equal/react.js": "37cbd168dbd42c73119ce7326556bddef40b3a5fbd2e215cf81a7c78fb73ff9a",
-        "node_modules/rfdc/LICENSE": "1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd",
-        "node_modules/rfdc/index.js": "b1e2abd3238c080ad5b96f61d6a461b679c475b4b1bbceef776417e5e1922149",
-        "node_modules/rfdc/package.json": "88e323621b6835ca2b980ab1d7507f49a2b63f4c8d3301d010640de363694bd3",
-        "node_modules/rfdc/readme.md": "67da311a12dd2d655fc656bafd5d5f0345cd322667bb58201623b468d195bf05",
-        "node_modules/rfdc/test/index.js": "89c8b6631df835a01305a62ebf6ae94feb4381bcc8083fcd30bd4a394f3e5e17",
-        "package.json": "ee7789302749d6de0b4a3fc76d4d7d96708262ca6125527c87741aa020096a67",
-        "settings/presets/common.json": "b7336ffddf763895537d8ad6992c3aeec5f88ddf8848eecdfd56d421bf2b7529",
-        "settings/settings.json": "74bd662576b043ffe240d917437b4c8b9e1bb845d39813be82e77923e2f4b637"
-    }
+	"files": {
+		"LICENSE": "90f8c7dacbf501cfda5f9545c85d705e6cecf6b8f21885e4c5e1f5f9d97dc837",
+		"README.md": "be86e5aacb62a725f5cb49aaeebde0f21a9077c0b3ba270af3927a6fbb500899",
+		"data/migrationData.js": "2a5b00c748f0ce04e23800d04b053f005bad58b327f31317d2e58fd3340aba1e",
+		"data/protoData.json": "25f1579d4d485047ce796042ba7e14bd29451eb3a5faff866eba99dfcaa7758e",
+		"data/staticData.json": "58d4d156ee20e5542be97580f935d4616aa06937c38ce416c2a13f92aba71752",
+		"docs/commands.md": "447f8f5b7092d98bf4338f724ab431006864c282c7ef5cc888592124b310b1d6",
+		"docs/presets.md": "469a2b0870651ecc1af4e66d236e1d74e08eb699cc0a8f29d9eee5a91909ebee",
+		"docs/settings.md": "e4dc5e4a18deaae6936d9ed8b46b3f70d3de32139d4c0f95f9afea046486d68e",
+		"fpsManager.js": "9e460c4bbf1de314f10b780e3797d41a8f163612aec8526cf04330d184a94e98",
+		"lib/helpers/enums.js": "2a6109100af91c24d8f638e5652a3ab74315c972c4daba0834cc3ed97fa57112",
+		"lib/helpers/utils.js": "e413a0354242071c873f2615a7668b27bdc9209fe78770cf8d5607d58011c120",
+		"lib/helpers/watchdog.js": "0d0fd2f7c3e9bfff3630e6ee376979e5215bb9fda4dfee4e617a8b88289811ba",
+		"lib/unitControl.js": "84b165b46d2712dcd6f6dadb4ddb551458aa0334714ac0d47453946fd7a7f262",
+		"lib/unitFps.js": "e945807c0ca6afffc5d590e0d6cdc5b8b7be45bc1219c6b08a58fa91a005b50a",
+		"lib/unitProto.js": "eb5df2672912f68d52ea1bf183be9814612ab45ac662ba38b6687ce5bd4d6138",
+		"lib/unitState.js": "de851d84676816da652def9d3bac364a79acc46e570aeb5f989942d8822d57fc",
+		"lib/unitTracker.js": "7ef7c771171b50ad3c3d9041f7d5b50c2c4a8e3037279ba8e3772d1b5d5ecccb",
+		"manifest.json": "63dc2bbeeed10832595e7fbe3ee3f68b62553125769ce29781eeda5a8a1f13fa",
+		"module.json": "04697bdbf294c8178c0d2ad7cb54188f829c165c0ca04a6608e832ab6bb88122",
+		"node_modules/fast-deep-equal/LICENSE": "7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a",
+		"node_modules/fast-deep-equal/README.md": "ada32c1b53bd74640a22806e99b25c2b8ab2946eed338f325114be87bd5b9fce",
+		"node_modules/fast-deep-equal/es6/index.d.ts": "6088db10b4d7657ea7c69e46c9ef7c6bb507afc2d1c210c6934e31c638cfc500",
+		"node_modules/fast-deep-equal/es6/index.js": "d7f027497048c75e17268dbc66b670579d4f70f2dc0e019cdc9edf5078c247d6",
+		"node_modules/fast-deep-equal/es6/react.d.ts": "6088db10b4d7657ea7c69e46c9ef7c6bb507afc2d1c210c6934e31c638cfc500",
+		"node_modules/fast-deep-equal/es6/react.js": "366779cbb7821d26d18b9eaa12b6788cbb101cdbbabcae36f2919a5f48534ef0",
+		"node_modules/fast-deep-equal/index.d.ts": "37ffe3c12813b6a6d512f7c27b71f3388d03dafa10555ad5094cea393ed3d1f6",
+		"node_modules/fast-deep-equal/index.js": "eb469e206280321a3878f2335ec98aa2104a155079d8ed83a23029098dccd215",
+		"node_modules/fast-deep-equal/package.json": "d4b0257263006fcb1738df074d66307d2aafb9a0359d9ac70dcaacaf29946d02",
+		"node_modules/fast-deep-equal/react.d.ts": "6088db10b4d7657ea7c69e46c9ef7c6bb507afc2d1c210c6934e31c638cfc500",
+		"node_modules/fast-deep-equal/react.js": "37cbd168dbd42c73119ce7326556bddef40b3a5fbd2e215cf81a7c78fb73ff9a",
+		"node_modules/rfdc/LICENSE": "1ce941682a96c7b898ecd125d0f2e22319758ea6f3adbf498a65d649b0f3f7dd",
+		"node_modules/rfdc/index.js": "b1e2abd3238c080ad5b96f61d6a461b679c475b4b1bbceef776417e5e1922149",
+		"node_modules/rfdc/package.json": "88e323621b6835ca2b980ab1d7507f49a2b63f4c8d3301d010640de363694bd3",
+		"node_modules/rfdc/readme.md": "67da311a12dd2d655fc656bafd5d5f0345cd322667bb58201623b468d195bf05",
+		"node_modules/rfdc/test/index.js": "89c8b6631df835a01305a62ebf6ae94feb4381bcc8083fcd30bd4a394f3e5e17",
+		"package.json": "ee7789302749d6de0b4a3fc76d4d7d96708262ca6125527c87741aa020096a67",
+		"settings/presets/common.json": {
+			"overwrite": false,
+			"hash": "b7336ffddf763895537d8ad6992c3aeec5f88ddf8848eecdfd56d421bf2b7529"
+		},
+		"settings/settings.json": {
+			"overwrite": false,
+			"hash": "74bd662576b043ffe240d917437b4c8b9e1bb845d39813be82e77923e2f4b637"
+		}
+	}
 }
 }