npm-groovy-lint 11.1.2-beta202310271757.0 → 11.1.2-beta202311021422.0

package/lib/codenarc-caller.js

@@ -32,14 +32,14 @@ class CodeNarcCaller {
 
     javaCallerOptions = {
         codeNarcServer: {
-            minimumJavaVersion: 8,
-            maximumJavaVersion: 14,
+            minimumJavaVersion: 17,
+            maximumJavaVersion: 17,
             rootPath: __dirname,
             jar: "java/CodeNarcServer.jar"
         },
         codeNarcJava: {
-            minimumJavaVersion: 8,
-            maximumJavaVersion: 14,
+            minimumJavaVersion: 17,
+            maximumJavaVersion: 17,
             rootPath: __dirname,
             jar: "java/CodeNarcServer.jar"
         }
@@ -108,6 +108,14 @@ class CodeNarcCaller {
             }
             // Cancelled codeNarcAction (duplicate)
             else if (e.code && e.code === "ECONNRESET") {
+                // The server was shutdown just retry.
+                if (startServerTried === false && (await this.startCodeNarcServer()) && this.serverStatus === "running") {
+                    return await this.callCodeNarcServer(true);
+                }
+
+                // Should this really be cancelled, as the Groovy says it should return:
+                // respObj.status = 'cancelledByDuplicateRequest'
+                // respObj.statusCode = 444
                 return {
                     status: 9
                 };
@@ -255,7 +263,7 @@ class CodeNarcCaller {
     // Start CodeNarc server so it can be called via Http just after
     async startCodeNarcServer() {
         this.serverStatus = "unknown";
-        const maxAttemptTimeMs = 20000;
+        const maxAttemptTimeMs = 10000;
         const scriptArgs = ["--server"];
         const serverPingUri = this.getCodeNarcServerUri() + "/ping";
 
@@ -266,18 +274,20 @@ class CodeNarcCaller {
         javaCallerOpts.javaExecutable = this.javaExecutable;
         javaCallerOpts.additionalJavaArgs = this.additionalJavaArgs;
         const javaCaller = new JavaCaller(javaCallerOpts);
-        const javaCallRes = await javaCaller.run(scriptArgs, { detached: true, waitForErrorMs: 500 });
+        const javaResult = await javaCaller.run(scriptArgs, { detached: true, waitForErrorMs: 500 });
 
-        if ([666, 1].includes(javaCallRes.status)) {
-            console.error(c.red(`Unable to start CodeNarc server: ${JSON.stringify(javaCallRes)}`));
+        // Store the process so we can stop it later.
+        this.codeNarcProcess = javaResult.childJavaProcess;
+
+        trace(`javaResult: ${JSON.stringify(javaResult)}`);
+
+        if ([666, 1].includes(javaResult.status)) {
+            console.error(c.red(`Unable to start CodeNarc server: ${JSON.stringify(javaResult)}`));
             console.error(c.grey(JSON.stringify(scriptArgs)));
             this.serverStatus = "error";
             return false;
         }
 
-        // Store the process so we can stop it later.
-        this.codeNarcProcess = javaCallRes.childJavaProcess;
-
         // Poll it until it is ready
         const start = performance.now();
         let notified = false;
@@ -325,9 +335,8 @@ class CodeNarcCaller {
         if (this.serverStatus === "running") {
             debug(c.green(`GroovyLint: Started CodeNarc Server`));
             return true;
-        } else {
-            return false;
         }
+        return false;
     }
 
     // Kill CodeNarc process if running.
@@ -364,9 +373,9 @@ class CodeNarcCaller {
         }
 
         // Process kill wasn't possible, so try sending a kill http request.
-        const serverUri = this.getCodeNarcServerUri() + "/kill";
+        const killUri = this.getCodeNarcServerUri() + "/kill";
         try {
-            const response = await axios.post(serverUri, { timeout: 5000 });
+            const response = await axios.post(killUri, { timeout: 1000 });
             if (response.data.status === "killed") {
                 outputString = "CodeNarcServer terminated";
             } else {
@@ -381,6 +390,30 @@ class CodeNarcCaller {
                 outputString = `CodeNarcServer was not running`;
             }
         }
+
+        // Wait for the server to stop otherwise when we try to start it
+        // again it it's likely to fail due to an port in use error.
+        const serverPingUri = this.getCodeNarcServerUri() + "/ping";
+
+        let interval;
+        await new Promise(resolve => {
+            interval = setInterval(() => {
+                debug(`pinging CodeNarcServer at ${serverPingUri} serverStatus: ${this.serverStatus}`);
+                axios
+                    .get(serverPingUri)
+                    .then(response => {
+                        debug(`ping response: ${response.status}`);
+                    })
+                    .catch(e => {
+                        debug(`Ping code: ${e.code} message: ${e.message}`);
+                        clearInterval(interval);
+                        resolve();
+                    });
+            }, 400);
+        });
+
+        trace(`killCodeNarcServer: ${outputString}`);
+
         return outputString;
     }
 

package/lib/groovy-lint.js

@@ -117,6 +117,9 @@ class NpmGroovyLint {
 
     // Actions before call to CodeNarc
     async preProcess() {
+        // Reset status so we don't get stale results.
+        this.status = 0;
+
         // Manage when the user wants to use only codenarc args
         if (Array.isArray(this.args) && this.args.includes("--codenarcargs")) {
             this.codenarcArgs = this.args.slice(2).filter(userArg => userArg !== "--codenarcargs");
@@ -367,6 +370,7 @@ class NpmGroovyLint {
         await newLinter.run();
         // Merge new linter results in existing results
         this.lintResult = this.mergeResults(this.lintResult, newLinter.lintResult);
+        this.status = newLinter.status;
     }
 
     // Fix again after fix because fixed rules contained triggersAgainAfterFix property (for the moment, only Indentation rule)
@@ -489,32 +493,28 @@ class NpmGroovyLint {
             return;
         }
 
-        const errorNb = this.lintResult.summary.totalFoundErrorNumber;
-        const warningNb = this.lintResult.summary.totalFoundWarningNumber;
-        const infoNb = this.lintResult.summary.totalFoundInfoNumber;
+        const errorNb = this.lintResult.summary.totalRemainingErrorNumber;
+        const warningNb = this.lintResult.summary.totalRemainingWarningNumber;
+        const infoNb = this.lintResult.summary.totalRemainingInfoNumber;
 
         // Fail on error
         if (failureLevel === "error" && errorNb > 0) {
             if (!["json", "sarif", "stdout"].includes(this.outputType)) {
-                console.error(`Failure: ${this.lintResult.summary.totalFoundErrorNumber} error(s) have been found`);
+                console.error(`Failure summary: ${JSON.stringify(this.lintResult.summary, null, 2)}`);
             }
             this.status = 1;
         }
         // Fail on warning
         else if (failureLevel === "warning" && (errorNb > 0 || warningNb > 0)) {
             if (!["json", "sarif", "stdout"].includes(this.outputType)) {
-                console.error(
-                    `Failure: ${this.lintResult.summary.totalFoundErrorNumber} error(s) have been found \n ${this.lintResult.summary.totalFoundWarningNumber} warning(s) have been found`
-                );
+                console.error(`Failure summary: ${JSON.stringify(this.lintResult.summary, null, 2)}`);
             }
             this.status = 1;
         }
         // Fail on info
         else if (failureLevel === "info" && (errorNb > 0 || warningNb > 0 || infoNb > 0)) {
             if (!["json", "sarif", "stdout"].includes(this.outputType)) {
-                console.error(
-                    `Failure: ${this.lintResult.summary.totalFoundErrorNumber} error(s) have been found \n ${this.lintResult.summary.totalFoundWarningNumber} warning(s) have been found \n ${this.lintResult.summary.totalFoundInfoNumber} info(s) have been found`
-                );
+                console.error(`Failure summary: ${JSON.stringify(this.lintResult.summary, null, 2)}`);
             }
             this.status = 1;
         }

package/lib/java/logback.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration>
+
+<configuration>
+  <import class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"/>
+  <import class="ch.qos.logback.core.ConsoleAppender"/>
+
+  <appender name="STDERR" class="ConsoleAppender">
+    <target>System.err</target>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>${logging.appender.console.level:-INFO}</level>
+    </filter>
+    <encoder class="PatternLayoutEncoder">
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} -%kvp- %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+    <file>logback.log</file>
+    <append>true</append>
+    <immediateFlush>true</immediateFlush>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>${logging.appender.log.level:-OFF}</level>
+    </filter>
+    <encoder>
+        <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root>
+    <appender-ref ref="FILE"/>
+    <appender-ref ref="STDERR"/>
+  </root>
+</configuration>

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "npm-groovy-lint",
-  "version": "11.1.2-beta202310271757.0",
+  "version": "11.1.2-beta202311021422.0",
   "description": "Lint, format and auto-fix your Groovy / Jenkinsfile / Gradle files",
   "main": "index.js",
   "scripts": {
     "lint:fix": "eslint **/*.js --fix && prettier --write \"./lib/**/*.{js,jsx}\" --tab-width 4 --print-width 150",
-    "server:run-from-source": "npm run dev:kill-server && groovy -cp \"lib/java/*\" groovy/src/main/com/nvuillam/CodeNarcServer.groovy --server",
-    "server:run": "npm run dev:kill-server && java -Xms256m -Xmx2048m -jar lib/java/CodeNarcServer.jar --server",
+    "server:run-from-source": "npm run server:kill && groovy -cp \"lib/java/*\" groovy/src/main/com/nvuillam/CodeNarcServer.groovy --server",
+    "server:run": "npm run server:kill && java -Xms256m -Xmx2048m -jar lib/java/CodeNarcServer.jar --server",
     "server:build": "node scripts/build-server.js",
-    "test": "npm run dev:kill-server && mocha \"test/**/*.test.js\"",
+    "server:kill": "npm-groovy-lint --killserver",
+    "test": "npm run server:kill && mocha \"test/**/*.test.js\"",
     "test:coverage": "nyc npm run test",
-    "test:debug": "npm run dev:kill-server && mocha --reporter spec --inspect-brk \"test/**/*.test.js\"",
+    "test:debug": "npm run server:kill && mocha --reporter spec --inspect-brk \"test/**/*.test.js\"",
     "build": "node scripts/build-config-all.js && cp -f README.md docs/index.md && cp -f CHANGELOG.md docs/CHANGELOG.md",
-    "dev:kill-server": "npm-groovy-lint --killserver",
-    "dev:lint-install-local": "npm run dev:kill-server && npm run lint:fix && npm link --force",
+    "dev:lint-install-local": "npm run server:kill && npm run lint:fix && npm link --force",
     "dev:lint-install-local-copy-vscode": "npm run dev:lint-install-local && node scripts/deploy-in-vscode.js",
     "dev:pre-commit": "npm-run-all lint:fix build server:build"
   },