From 33a1ca1c9798f54286ff81c590ab1b00c6d4016f Mon Sep 17 00:00:00 2001
From: HF <hf@pixelplanet.fun>
Date: Thu, 28 Dec 2023 23:52:21 +0100
Subject: [PATCH] use path.resolve for parsing path strings

---
 src/core/captchaserver.js | 3 ++-
 src/core/tileserver.js    | 3 ++-
 src/data/redis/client.js  | 9 +++++----
 webpack.config.server.js  | 3 ++-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/core/captchaserver.js b/src/core/captchaserver.js
index 91213c67..af31b5c9 100644
--- a/src/core/captchaserver.js
+++ b/src/core/captchaserver.js
@@ -2,6 +2,7 @@
  * creation of captchas
  */
 
+import path from 'path';
 import { Worker } from 'worker_threads';
 
 import logger from './logger';
@@ -11,7 +12,7 @@ const MAX_WAIT = 30 * 1000;
 /*
  * worker thread
  */
-const worker = new Worker('./workers/captchaloader.js');
+const worker = new Worker(path.resolve('./workers/captchaloader.js'));
 
 /*
  * queue of captcha-generation tasks
diff --git a/src/core/tileserver.js b/src/core/tileserver.js
index bea2e4c0..fe2e69af 100644
--- a/src/core/tileserver.js
+++ b/src/core/tileserver.js
@@ -4,6 +4,7 @@
  */
 
 import fs from 'fs';
+import path from 'path';
 import { Worker } from 'worker_threads';
 
 import logger from './logger';
@@ -23,7 +24,7 @@ const CanvasUpdaters = {};
 /*
  * worker thread
  */
-const worker = new Worker('./workers/tilewriter.js');
+const worker = new Worker(path.resolve('./workers/tilewriter.js'));
 
 /*
  * queue of tasks that is worked on in FIFO
diff --git a/src/data/redis/client.js b/src/data/redis/client.js
index fff6e613..74ed8bcb 100644
--- a/src/data/redis/client.js
+++ b/src/data/redis/client.js
@@ -3,6 +3,7 @@
  * REDIS_URL can be url or path to unix socket
  */
 import fs from 'fs';
+import path from 'path';
 import { createClient, defineScript } from 'redis';
 import { isMainThread } from 'worker_threads';
 
@@ -11,7 +12,7 @@ import { REDIS_URL, SHARD_NAME } from '../../core/config';
 const scripts = {
   placePxl: defineScript({
     NUMBER_OF_KEYS: 9,
-    SCRIPT: fs.readFileSync('./workers/lua/placePixel.lua'),
+    SCRIPT: fs.readFileSync(path.resolve('./workers/lua/placePixel.lua')),
     transformArguments(...args) {
       return args.map((a) => ((typeof a === 'string') ? a : a.toString()));
     },
@@ -19,7 +20,7 @@ const scripts = {
   }),
   allowedChat: defineScript({
     NUMBER_OF_KEYS: 3,
-    SCRIPT: fs.readFileSync('./workers/lua/allowedChat.lua'),
+    SCRIPT: fs.readFileSync(path.resolve('./workers/lua/allowedChat.lua')),
     transformArguments(...args) {
       return args.map((a) => ((typeof a === 'string') ? a : a.toString()));
     },
@@ -27,7 +28,7 @@ const scripts = {
   }),
   getUserRanks: defineScript({
     NUMBER_OF_KEYS: 2,
-    SCRIPT: fs.readFileSync('./workers/lua/getUserRanks.lua'),
+    SCRIPT: fs.readFileSync(path.resolve('./workers/lua/getUserRanks.lua')),
     transformArguments(...args) {
       return args.map((a) => ((typeof a === 'string') ? a : a.toString()));
     },
@@ -35,7 +36,7 @@ const scripts = {
   }),
   zmRankRev: defineScript({
     NUMBER_OF_KEYS: 1,
-    SCRIPT: fs.readFileSync('./workers/lua/zmRankRev.lua'),
+    SCRIPT: fs.readFileSync(path.resolve('./workers/lua/zmRankRev.lua')),
     transformArguments(key, uids) {
       return [
         key,
diff --git a/webpack.config.server.js b/webpack.config.server.js
index c53678bb..90bcab4d 100644
--- a/webpack.config.server.js
+++ b/webpack.config.server.js
@@ -21,12 +21,13 @@ const basePackageValues = {
   private: true,
   engines: pkg.engines,
   scripts: {
-    start: 'node --nouse-idle-notification --expose-gc server.js',
+    start: 'pm2 restart ecosystem.yml',
   },
   dependencies: {
     mysql2: '',
     'utf-8-validate': '',
     bufferutil: '',
+    pm2: '^5.3.0',
   },
 };