puppyperpetual 1.2.6 → 1.3.0

package/README.md

@@ -1,59 +1,57 @@
-# puppyperpetual
-
-node script to run things... perpetually. adapted from [legacyshell](https://github.com/onlypuppy7/LegacyShell)
-
-[On npm @ https://www.npmjs.com/package/puppyperpetual](https://www.npmjs.com/package/puppyperpetual)
-
-[And GitHub @ https://github.com/onlypuppy7/perpetual](https://github.com/onlypuppy7/perpetual)
-
-## usage (as an npm package)
-
-you can use it to run your node stuff perpetually:
-
-```js
-import Perpetual from '../index.js';
-
-const perpetual = new Perpetual('test_process', {
-    process_cmd: 'node ./src/test/test_process.js',
-});
-await perpetual.run();
-```
-
-or anything really:
-
-```js
-import Perpetual from '../index.js';
-
-const perpetual = new Perpetual('test_process', {
-    process_cmd: 'cd . && git pull && date',
-});
-await perpetual.run();
-```
-
-## usage (as a node app thing)
-
-note: on windows unless you spawn as worker, perpetual expects `C:\Program Files\Git\bin\bash.exe` to exist.
-
-as per tradition for my projects, simple installation!
-
-1. `npm i`
-
-then run once to create config
-
-- `npm run start`
-
-then customise it in `store/config.yaml`, making a new entry for every thing
-
-then run like this:
-
-- `node .\perpetual.js --default`
-
-alternatively, just pass in your command:
-
-- `node .\perpetual.js "cd . && echo date"`
-
-then you dont need to mess around with the horrible yaml. dont worry, i hate doing it too.
-
-## it doesnt work?
-
+# puppyperpetual
+
+node script to run things... perpetually. adapted from [legacyshell](https://github.com/onlypuppy7/LegacyShell)
+
+[On npm @ https://www.npmjs.com/package/puppyperpetual](https://www.npmjs.com/package/puppyperpetual)
+
+[And GitHub @ https://github.com/onlypuppy7/perpetual](https://github.com/onlypuppy7/perpetual)
+
+## usage (as an npm package)
+
+you can use it to run your node stuff perpetually:
+
+```js
+import Perpetual from '../index.js';
+
+const perpetual = new Perpetual('test_process', {
+    process_cmd: 'node ./src/test/test_process.js',
+});
+await perpetual.run();
+```
+
+or anything really:
+
+```js
+import Perpetual from '../index.js';
+
+const perpetual = new Perpetual('test_process', {
+    process_cmd: 'cd . && git pull && date',
+});
+await perpetual.run();
+```
+
+## usage (as a node app thing)
+
+as per tradition for my projects, simple installation!
+
+1. `npm i`
+
+then run once to create config
+
+- `npm run start`
+
+then customise it in `store/config.yaml`, making a new entry for every thing
+
+then run like this:
+
+- `node .\perpetual.js --default`
+
+alternatively, just pass in your command:
+
+- `node .\perpetual.js "cd . && echo date"`
+
+then you dont need to mess around with the horrible yaml. dont worry, i hate doing it too.
+
+## it doesnt work?
+
 i dont care. i use this for my own stuff. i know that it works on linux and thats all i need.

package/package.json

@@ -2,7 +2,7 @@
     "name": "puppyperpetual",
     "type": "module",
     "types": "./src/index.d.ts",
-    "version": "1.2.6",
+    "version": "1.3.0",
     "description": "Run stuff FOREVER! PERPETUALLY!",
     "main": "./src/index.js",
     "exports": {

package/src/ConfigManager.js

@@ -12,7 +12,7 @@ export class ConfigManager {
         const __dirname = path.dirname(__filename);
 
         this.defaultConfigPath = path.join(__dirname, 'defaultconfig.yaml');
-        this.configPath = path.join(this.rootDir, perpConfigLocation);
+        this.configPath = path.join(perpConfigLocation);
 
         if (!noYAML) {
             this.ensureConfigExists();
@@ -41,6 +41,7 @@ export class ConfigManager {
                 if (cdMatch) {
                     console.log("Detected 'cd' command in process_cmd:", cdMatch[1]);
                     passed.dir = cdMatch[1];
+                    // passed.process_cmd = cdMatch[2];
                 };
             };
         }
@@ -56,7 +57,7 @@ export class ConfigManager {
             dailyrestart_quickpull: passed.dailyrestart_quickpull,
             //file logging
             logfile_enable:         passed.logfile_enable,
-            logfile_location:       passed.logfile_location         || path.join(this.rootDir, "store", "logs", this.serverName), //no editing kek
+            logfile_location:       passed.logfile_location         || path.join("store", "logs", this.serverName), //no editing kek
             //webhook logging
             webhook_url:            passed.webhook_url              || "", //false or empty is disabled
             webhook_username:       passed.webhook_username         || "Webhook", //eg "LegacyShell: Client Server"
@@ -65,6 +66,7 @@ export class ConfigManager {
             webhook_ping_role:      passed.webhook_ping_role        || false, //this might flood EVERYONE'S shit
             //pulling
             is_puller:              this.config.pullers?.includes(this.serverName) || false,
+            restart_on_update:      passed.restart_on_update        ?? true,
         };
 
         if (passed.process_cmd_prefix) passed.process_cmd = `${passed.process_cmd_prefix}${passed.process_cmd}`;

package/src/ProcessManager.js

@@ -13,6 +13,7 @@ export class ProcessManager {
         this.runningProcess = null;
         this.restartScheduled = false;
         this.autoRestart();
+        this.pullerSetup();
     }
 
     async startProcess(purposefulStop = false) {
@@ -54,7 +55,7 @@ export class ProcessManager {
             this.logger.logSend(`Starting process: ${this.options.process_cmd}`);
 
             const useWorkerThreads = this.options.useWorkerThreads ?? false;
-            const isNodeScript = this.options.process_cmd.startsWith('node ') || this.options.isNode;
+            const isNodeScript = this.options.process_cmd.startsWith('node ') || this.options.isNodeScript;
             let scriptPath = this.options.process_cmd;
 
             if (isNodeScript && useWorkerThreads) {
@@ -114,13 +115,20 @@ export class ProcessManager {
 
             } else {
                 let bash = 'bash';
-                let options = ['-c', 'export FORCE_COLOR=3; exec ' + scriptPath];
+                let options = ['-c', 'export FORCE_COLOR=3;' + this.options.process_cmd];
                 if (process.platform === 'win32') {
-                    bash = this.options.winBashPath || 'C:\\Program Files\\Git\\bin\\bash.exe';
+                    // bash = this.options.winBashPath || 'C:\\Program Files\\Git\\bin\\bash.exe';
                     if (isNodeScript) {
                         bash = 'node';
                         options = scriptPath.replace(/^node\s+/, '').trim().split(' ');
                         // options.push("FORCE_COLOR=3");
+                    } else {
+                        //check if bash exists at the specified path
+                        bash = this.options.winBashPath || 'C:\\Program Files\\Git\\bin\\bash.exe';
+                        if (!fs.existsSync(bash)) {
+                            bash = 'cmd.exe';
+                            options = ['/c', this.options.process_cmd];
+                        }
                     }
                 }
                 this.runningProcess = spawn(bash, options, {
@@ -166,7 +174,32 @@ export class ProcessManager {
         }
     }
 
-    autoRestart() {
+    async gitPull() {
+        this.logger.logSend("Performing git pull...");
+        this.executeCommand('git', ['pull'], 'ignore');
+    }
+
+    async getGitHash() {
+        return new Promise((resolve) => {
+            const gitProcess = spawn('git', ['rev-parse', 'HEAD'], { cwd: this.options.dir || process.cwd() });
+            let hash = '';
+
+            gitProcess.stdout.on('data', (data) => {
+                hash += data.toString();
+            });
+
+            gitProcess.on('close', (code) => {
+                if (code === 0) {
+                    resolve(hash.trim());
+                } else {
+                    this.logger.logSend(`git rev-parse exited with code ${code}`);
+                    resolve(null);
+                }
+            });
+        });
+    }
+
+    async autoRestart() {
         if (!this.options.dailyrestart_enable) return;
         if (this.restartScheduled) {
             this.logger.logSend("Restart already scheduled.");
@@ -194,8 +227,7 @@ export class ProcessManager {
 
         setTimeout(async () => {
             if (this.options.dailyrestart_quickpull) {
-                this.logger.logSend("Quick-pulling before restart.");
-                this.executeCommand('git', ['pull'], 'ignore');
+                await this.gitPull();
             }
             this.logger.logSend("Auto-restarting process.");
             await this.startProcess();
@@ -204,6 +236,21 @@ export class ProcessManager {
         }, timeUntilRestart);
     }
 
+    async pullerSetup() {
+        this.currentHash = await this.getGitHash();
+        setInterval(async () => {
+            if (this.options.is_puller) {
+                await this.gitPull();
+            }
+            const newHash = await this.getGitHash();
+            if (newHash && newHash !== this.currentHash && this.config.restart_on_update) {
+                this.logger.logSend(`Git hash changed from ${this.currentHash} to ${newHash}. Restarting process.`);
+                this.currentHash = newHash;
+                await this.startProcess();
+            }
+        }, 60e3);
+    }
+
     executeCommand(command, args, stdio = "inherit") {
         let dir = this.options.dir || "";