merge: master into confirmDeliver

src/appv2.js

@@ -236,8 +236,8 @@ class Appv2 {
 		const afterFetchFromDb = Date.now();
 		console.log("Fetch from db: "+(Date.now() - startTimeToDebug) / 1000 + " seconds");
 
-		for (const user of users) {
+		for (const userId of userToDel) {
-			const storage = new storageObj(user.id);
+			const storage = new storageObj(userId);
 			await storage.removeQueue();
 			count++;
 		}

src/myDatabase.js

@@ -1,9 +1,13 @@
 const Database = require("better-sqlite3");
+const path = require("path");
+
+const DATABASE_DIR = process.env.DATABASE_DIR || "/database";
+const DATABASE_FILE = process.env.DATABASE_FILE || path.join(DATABASE_DIR, "users.db");
 
 class MyDatabase {
 	dbObj;
 	constructor() {
-		this.dbObj = new Database("/database/users.db");
+		this.dbObj = new Database(DATABASE_FILE);
 		this.dbObj.exec(`
 			CREATE TABLE IF NOT EXISTS users (
 				id INTEGER PRIMARY KEY,

src/storage.js

@@ -1,8 +1,12 @@
 const fs = require('fs');
 const fsp = require('fs/promises');
+const path = require('path');
 const readline = require('readline');
 const readLine = require("node:readline");
 const myDb = require('./myDatabase');
+
+const STORAGE_DIR = process.env.STORAGE_DIR || "/storage";
+
 class Storage {
 	userId;
 	dbObj;
@@ -13,7 +17,7 @@ class Storage {
 	}
 
 	get getDir() {
-		return "/storage/" + Math.floor(this.userId / 100);
+		return path.join(STORAGE_DIR, String(Math.floor(this.userId / 100)));
 	}
 	get fileName() {
 		return this.getDir + "/" + this.userId + ".jsonl";
@@ -51,8 +55,10 @@ class Storage {
 		try	{
 			await fsp.unlink(this.fileName);
 		} catch(err) {
+			if (err?.code !== 'ENOENT') {
 				console.log(err);
 			}
+		}
 		this.dbObj.deleteUser(this.userId);
 	}