puppyperpetual 1.0.1 → 1.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "puppyperpetual",
     "type": "module",
-    "version": "v1.0.1",
+    "version": "1.0.3",
     "description": "Run stuff FOREVER! PERPETUALLY!",
     "main": "perpetual.js",
     "keywords": [

package/src/Logger.js

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import fetch from 'node-fetch';
 import { getTimestamp, stripAnsi, divideString, ensureDirExists } from 'puppymisc';
 import log from 'puppylog';
+import PuppyWebhook from 'puppywebhook';
 
 export class Logger {
     constructor(options) {
@@ -11,6 +12,12 @@ export class Logger {
         this.maxMessageLength = 1900;
         this.messagesSent = 0;
 
+        if (options.webhook_url) this.webhook = new PuppyWebhook({
+            webhookUrl: options.webhook_url,
+            username: options.webhook_username,
+            avatar_url: options.webhook_avatar,
+        });
+
         ensureDirExists(options.logfile_location);
         this.logFilePath = `${options.logfile_location}/${getTimestamp(true)}.log`;
         ensureDirExists(this.logFilePath);
@@ -18,7 +25,7 @@ export class Logger {
 
     appendLog(msg, noSend = false) {
         msg = stripAnsi(msg);
-        if (!noSend) this.logQueue.push(msg);
+        if (this.webhook && !noSend) this.webhook.send(msg)
         fs.appendFile(this.logFilePath, `${msg}\n`, () => {});
     }
 
@@ -33,45 +40,4 @@ export class Logger {
         log.muted(line);
         this.appendLog(line, true);
     }
-
-    async sendToWebhook() {
-        while (this.logQueue.length) {
-            let msg = this.logQueue.shift();
-            if (msg.length > this.maxMessageLength) {
-                this.logQueue.unshift(...divideString(msg, this.maxMessageLength));
-            } else {
-                const lastChunk = this.queuedChunks[0] || "";
-                const newChunk = lastChunk + `\n${msg}`;
-                if (newChunk.length > this.maxMessageLength) {
-                    this.queuedChunks.unshift(`\n${msg}`);
-                } else {
-                    this.queuedChunks[0] = newChunk;
-                }
-            }
-        }
-
-        if (this.queuedChunks.length && this.options.webhook_url) {
-            try {
-                const response = await fetch(this.options.webhook_url, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
-                        username: this.options.webhook_username,
-                        avatar_url: this.options.webhook_avatar,
-                        content: this.queuedChunks[this.queuedChunks.length - 1].slice(0, 2000),
-                    })
-                });
-                if (!response.ok) throw new Error(response.statusText);
-                this.logNoSend(`Logs sent to webhook (${this.messagesSent})`);
-                this.queuedChunks.pop();
-                this.messagesSent++;
-            } catch (err) {
-                this.logNoSend(`Error sending webhook: ${err.message}`);
-            }
-        }
-    }
-
-    startWebhookInterval(interval = 15000) {
-        this.webhookInterval = setInterval(() => this.sendToWebhook(), interval);
-    }
 }

package/src/ProcessManager.js

@@ -12,6 +12,7 @@ export class ProcessManager {
 
         this.runningProcess = null;
         this.restartScheduled = false;
+        this.autoRestart();
     }
 
     async startProcess(purposefulStop = false) {
@@ -148,13 +149,20 @@ export class ProcessManager {
             return;
         }
 
-        const now = new Date();
-        const [hour, minute] = this.options.dailyrestart_time.split(':').map(Number);
-        const nextRestart = new Date();
-        nextRestart.setHours(hour, minute, 0, 0);
-        if (nextRestart < now) nextRestart.setDate(nextRestart.getDate() + 1);
+        const restartTimes = Array.isArray(this.options.dailyrestart_time) ? this.options.dailyrestart_time : [this.options.dailyrestart_time];
+        let earliestTime = null;
+        for (const timeStr of restartTimes) {
+            const [hour, minute] = timeStr.split(':').map(Number);
+            const now = new Date();
+            const restartTime = new Date();
+            restartTime.setHours(hour, minute, 0, 0);
+            if (restartTime < now) restartTime.setDate(restartTime.getDate() + 1);
+            if (!earliestTime || restartTime < earliestTime) {
+                earliestTime = restartTime;
+            }
+        }
 
-        let timeUntilRestart = nextRestart - now;
+        let timeUntilRestart = earliestTime - new Date();
         if (timeUntilRestart <= 0) timeUntilRestart += 24*60*60*1000;
 
         this.logger.logSend(`Scheduled restart in ${Math.floor(timeUntilRestart / 1000 / 60)} minutes.`);

package/src/index.js

@@ -14,7 +14,6 @@ export class Perpetual {
     }
 
     async run() {
-        if (this.options.webhook_url) this.logger.startWebhookInterval();
         await this.processManager.startProcess();
 
         const rl = readline.createInterface({

package/src/test/test.js

@@ -3,5 +3,8 @@ import Perpetual from '../index.js';
 const perpetual = new Perpetual('test_process', {
     // process_cmd: 'node ./src/test/test_process.js',
     process_cmd: 'date',
+    webhook_url: 'https://discord.com/api/webhooks/1460782220192256031/Fkibsumk3hWg4M6F2eCmDe_ylXaJlY_z3W9XeCMWbiw4r8zcYfQJg64YeIhaHT-7tpbT',
+    dailyrestart_enable: true,
+    dailyrestart_time: ['15:26', '15:27', '15:28', '15:29', '15:30', '15:31', '20:00'],
 })
 await perpetual.run();