ebet-payroll 1.0.1 → 1.0.2

package/jdeploy-bundle/jdeploy.js

@@ -3,7 +3,7 @@
 var path = require('path');
 var os = require('os');
 var jdeployHomeDir = process.env.JDEPLOY_HOME || path.join(os.homedir(), '.jdeploy');
-var jarName = "payroll-desktop-1.0.1.jar";
+var jarName = "payroll-desktop-1.0.2.jar";
 var mainClass = "{{MAIN_CLASS}}";
 var classPath = "{{CLASSPATH}}";
 var port = "0";
@@ -32,6 +32,16 @@ function njreWrap() {
     const yauzl = require('yauzl')
     const tar = require('tar')
 
+    function cleanupDir (dir) {
+      try {
+        if (fs.existsSync(dir)) {
+          fs.rmSync(dir, { recursive: true, force: true })
+        }
+      } catch (e) {
+        // Ignore cleanup errors
+      }
+    }
+
     function createDir (dir) {
       return new Promise((resolve, reject) => {
         fs.access(dir, err => {
@@ -278,7 +288,7 @@ function njreWrap() {
 
       Object.keys(options).forEach(key => { url += key + '=' + options[key] + '&' })
 
-      const tmpdir = path.join(os.tmpdir(), 'njre')
+      const tmpdir = path.join(os.tmpdir(), 'njre-' + process.pid)
 
       return fetch(url)
         .then(response => response.json())
@@ -286,6 +296,7 @@ function njreWrap() {
         .then(verify)
         .then(move)
         .then(extract)
+        .finally(() => cleanupDir(tmpdir))
     }
 
     function installZulu(version = 11, options = {}, arch) {
@@ -327,7 +338,7 @@ function njreWrap() {
         let url = zuluBaseURL;
         Object.keys(q).forEach(key => { url += key + '=' + q[key] + '&' });
 
-        const tmpdir = path.join(os.tmpdir(), 'njre');
+        const tmpdir = path.join(os.tmpdir(), 'njre-' + process.pid);
 
         // Function to handle the download and extraction
         const attemptDownload = (url) => {
@@ -342,7 +353,8 @@ function njreWrap() {
                 console.error("Download failed: ", err);
                 // Exit with non-zero status code to signal failure to CI/CD systems
                 process.exit(1);
-            });
+            })
+            .finally(() => cleanupDir(tmpdir));
     }
 
 

package/package.json

@@ -1 +1 @@
-{"license":"ISC","author":"EBET","bin":{"ebet-payroll":"jdeploy-bundle/jdeploy.js"},"name":"ebet-payroll","description":"EBET Payroll desktop application","files":["jdeploy-bundle"],"main":"index.js","preferGlobal":true,"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"version":"1.0.1","jdeploy":{"jdk":false,"checksums":{},"generateLegacyBundles":false,"mainClass":"app.Main","javaVersion":"17","jar":"target/payroll-desktop-1.0.1.jar","javafx":false,"title":"EBET Payroll"},"dependencies":{"command-exists-promise":"^2.0.2","node-fetch":"2.6.7","tar":"^4.4.8","yauzl":"^2.10.0","shelljs":"^0.8.4"}}
+{"license":"ISC","author":"EBET","bin":{"ebet-payroll":"jdeploy-bundle/jdeploy.js"},"name":"ebet-payroll","description":"EBET Payroll desktop application","files":["jdeploy-bundle"],"main":"index.js","preferGlobal":true,"scripts":{"test":"echo \"Error: no test specified\" && exit 1"},"version":"1.0.2","jdeploy":{"jdk":false,"checksums":{},"generateLegacyBundles":false,"mainClass":"app.Main","javaVersion":"17","jar":"target/payroll-desktop-1.0.2.jar","javafx":false,"title":"EBET Payroll"},"dependencies":{"command-exists-promise":"^2.0.2","node-fetch":"2.6.7","tar":"^4.4.8","yauzl":"^2.10.0","shelljs":"^0.8.4"}}