eod

bitBeater · Mar 5, 2024 · 6544cde · 6544cde
1 parent bd37b18
commit 6544cde
Show file tree

Hide file tree

Showing 17 changed files with 77 additions and 681 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -13,7 +13,6 @@
    "runtimeExecutable": "/home/alex/.deno/bin/deno",
    "runtimeArgs": [
     "run",
-    "--unstable",
     "--config",
     "deno.jsonc",
     "--inspect-wait",
@@ -34,7 +33,6 @@
    "runtimeExecutable": "/home/alex/.deno/bin/deno",
    "runtimeArgs": [
     "run",
-    "--unstable",
     "--config",
     "deno.jsonc",
     "--inspect-wait",
@@ -54,7 +52,6 @@
    "runtimeExecutable": "/home/alex/.deno/bin/deno",
    "runtimeArgs": [
     "test",
-    "--unstable",
     "--config",
     "${workspaceFolder}/deno.jsonc",
     "--inspect-wait",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -6,7 +6,6 @@
    "console": "integratedTerminal",
    "command": "run",
    "args": [
-    "--unstable",
     "-A",
     "${file}"
    ],

diff --git a/assets/defaults/config.json b/assets/defaults/config.json
@@ -1,22 +1,22 @@
 {
-  "serverInstallationDir": "~/.local/bin/minecraft-server",
-  "versionManifestV2Url": "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json",
-  "launchArgs": {
-    "default": {
-      "javaArgs": [
-        "-Xms4G",
-        "-Xmx8G",
-        "-XX:+UseG1GC",
-        "-XX:+ParallelRefProcEnabled",
-        "-XX:MaxGCPauseMillis=200",
-        "-XX:+UseLargePages",
-        "-XX:+AlwaysPreTouch",
-        "-XX:+UseStringDeduplication",
-        "-XX:+DisableExplicitGC",
-        "-XX:+UnlockExperimentalVMOptions",
-        "-XX:+OptimizeStringConcat"
-      ],
-      "serverArgs": ["--nogui"]
-    }
+ "serverInstallationDir": "~/.local/bin/minecraft-server",
+ "versionManifestV2Url": "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json",
+ "launchArgs": {
+  "default": {
+   "javaArgs": [
+    "-Xms4G",
+    "-Xmx8G",
+    "-XX:+UseG1GC",
+    "-XX:+ParallelRefProcEnabled",
+    "-XX:MaxGCPauseMillis=200",
+    "-XX:+UseLargePages",
+    "-XX:+AlwaysPreTouch",
+    "-XX:+UseStringDeduplication",
+    "-XX:+DisableExplicitGC",
+    "-XX:+UnlockExperimentalVMOptions",
+    "-XX:+OptimizeStringConcat"
+   ],
+   "serverArgs": ["--nogui"]
   }
+ }
 }
diff --git a/config.json b/config.json
@@ -1,22 +1,22 @@
 {
-  "serverInstallationDir": "~/.local/bin/minecraft-server",
-  "versionManifestV2Url": "http://127.0.0.1:8765/version_manifest_v2",
-  "launchArgs": {
-    "default": {
-      "javaArgs": [
-        "-Xms4G",
-        "-Xmx8G",
-        "-XX:+UseG1GC",
-        "-XX:+ParallelRefProcEnabled",
-        "-XX:MaxGCPauseMillis=200",
-        "-XX:+UseLargePages",
-        "-XX:+AlwaysPreTouch",
-        "-XX:+UseStringDeduplication",
-        "-XX:+DisableExplicitGC",
-        "-XX:+UnlockExperimentalVMOptions",
-        "-XX:+OptimizeStringConcat"
-      ],
-      "serverArgs": ["--nogui"]
-    }
+ "serverInstallationDir": "~/.local/bin/minecraft-server",
+ "versionManifestV2Url": "http://127.0.0.1:8765/version_manifest_v2",
+ "launchArgs": {
+  "default": {
+   "javaArgs": [
+    "-Xms4G",
+    "-Xmx8G",
+    "-XX:+UseG1GC",
+    "-XX:+ParallelRefProcEnabled",
+    "-XX:MaxGCPauseMillis=200",
+    "-XX:+UseLargePages",
+    "-XX:+AlwaysPreTouch",
+    "-XX:+UseStringDeduplication",
+    "-XX:+DisableExplicitGC",
+    "-XX:+UnlockExperimentalVMOptions",
+    "-XX:+OptimizeStringConcat"
+   ],
+   "serverArgs": ["--nogui"]
   }
+ }
 }
diff --git a/deno.jsonc b/deno.jsonc
@@ -1,20 +1,21 @@
 {
  "imports": {
-  "std/": "https://deno.land/std@0.208.0/",
+  "@std/fs": "jsr:@std/fs@^0.218.2",
+  "cli/": "./src/cli/",
   "cliffy/": "https://deno.land/x/cliffy@v1.0.0-rc.3/",
   "data/": "./src/data/",
-  "cli/": "./src/cli/",
-  "utils/": "./src/utils/",
-  "types/": "./src/types/",
-  "services/": "./src/services/",
   "errors/": "./src/errors/",
-  "semver": "https://deno.land/x/semver@v1.4.1/mod.ts",
-  "progress": "https://deno.land/x/progress@v1.4.0/mod.ts",
   "iggs-utils": "npm:iggs-utils@1.2.16",
-  "testing-utils": "./tests/utils.ts"
+  "progress": "https://deno.land/x/progress@v1.4.0/mod.ts",
+  "semver": "https://deno.land/x/semver@v1.4.1/mod.ts",
+  "services/": "./src/services/",
+  "std/": "https://deno.land/std@0.208.0/",
+  "testing-utils": "./tests/utils.ts",
+  "types/": "./src/types/",
+  "utils/": "./src/utils/"
  },
  "tasks": {
-  "test": "clear && ./scripts/set_up_test_env.ts && cd ./tests && deno test -A --allow-env --unstable --trace-ops",
+  "test": "./scripts/set_up_test_env.ts && cd ./tests && deno test -A --allow-env --unstable --trace-ops",
   "check": "deno run --allow-read --allow-write scripts/check.ts",
   "gtests": "deno run -A --allow-env scripts/generate_test_files.ts",
   "compile": "deno compile -A --target='x86_64-unknown-linux-gnu' --output='dist/minecraft-server-launcher' ./src/main.ts"
@@ -26,7 +27,11 @@
  "fmt": {
   "semiColons": true,
   "singleQuote": true,
-  "lineWidth": 160,
-  "indentWidth": 1
+  "lineWidth": 500,
+  "indentWidth": 1,
+  "include": ["./src", "./tests", "./scripts"]
+ },
+ "lint": {
+  "include": ["./src", "./tests"]
  }
 }
diff --git a/scripts/check.ts b/scripts/check.ts
@@ -2,38 +2,6 @@
 /**
  * script to check code quality and consistency
  */
-import { getEmptyFiles, getSkipTestSrcs, getsMissingTestSrcs, SRC_DIR, TESTS_DIR } from './utils.ts';
+import { checkCodeQuality } from './utils/check.ts';
 
-let exitCode = 0;
-
-// check if there are src files with the @skip-test comment
-const skipTestSrcFiles = getSkipTestSrcs();
-if (skipTestSrcFiles.length > 0) {
- for (const srcFile of skipTestSrcFiles) {
-  console.log(`%c[SKIP TEST] %c${srcFile}`, 'color: orange', 'color: yellow');
- }
-}
-
-// check if there are src files WITHOUT TEST files
-const srcFilesWithoutTestFile = getsMissingTestSrcs();
-if (srcFilesWithoutTestFile.length > 0) {
- for (const srcFile of srcFilesWithoutTestFile) {
-  console.log(`%c[WITHOUT TEST] %c${srcFile}`, 'color: red', 'color: #ff4900');
- }
- exitCode = 1;
-}
-
-// check if there are EMPTY TS FILES, in src or test
-const emptyTsFiles = [...getEmptyFiles(SRC_DIR, 'ts'), ...getEmptyFiles(TESTS_DIR, 'test.ts')];
-if (emptyTsFiles.length > 0) {
- for (const tsFile of emptyTsFiles) {
-  console.log(`%c[EMPTY TS FILE] %c${tsFile}`, 'color: red', 'color: gray');
- }
- exitCode = 1;
-}
-
-if (exitCode === 0) {
- console.log(`%c[CHECK PASS]`, 'color: green');
-} else {
- Deno.exit(exitCode);
-}
+checkCodeQuality()
diff --git a/scripts/generate_test_files.ts b/scripts/generate_test_files.ts
@@ -1,7 +1,7 @@
 #!/usr/bin/env -S deno run -A
 /** script to generate an empty .test.ts file for each .ts file that doesnt have one*/
 import { writeFileAndDir } from 'utils/fs.ts';
-import { getSkipTestSrcs, sourceFilePathToTestFilePath } from './utils.ts';
+import { getSkipTestSrcs, sourceFilePathToTestFilePath } from './utils/utils.ts';
 
 const skipTestSrcFiles = getSkipTestSrcs();
 

diff --git a/scripts/mk_deb_pkg.ts b/scripts/mk_deb_pkg.ts
diff --git a/scripts/mk_deb_pkg_mod.ts b/scripts/mk_deb_pkg_mod.ts