Release V1.1.7

.github/workflows/docker-image.yml

@@ -39,12 +39,21 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_TOKEN }}
 
+    - name: Log in to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Build Docker image
       uses: docker/build-push-action@v5
       with:
         context: .
         push: true
-        tags: ${{ steps.meta.outputs.tags }}
+        tags: |
+          ${{ steps.meta.outputs.tags }}
+          ghcr.io/${{ steps.meta.outputs.tags }}
         platforms: linux/amd64,linux/arm64,linux/arm/v7
         cache-from: type=gha
         cache-to: type=gha,mode=max

.github/workflows/docker-latest.yml

@@ -44,6 +44,13 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker image
         uses: docker/build-push-action@v5
@@ -53,4 +60,6 @@ jobs:
           tags: |
             cyfershepard/jellystat:latest
             cyfershepard/jellystat:${{ env.VERSION }}
+            ghcr.io/cyfershepard/jellystat:latest
+            ghcr.io/cyfershepard/jellystat:${{ env.VERSION }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7

Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Build the application
-FROM node:slim AS builder
+FROM node:22.21.1-bookworm-slim AS builder
 
 WORKDIR /app
 
@@ -14,7 +14,7 @@ COPY entry.sh ./
 RUN npm run build
 
 # Stage 2: Create the production image
-FROM node:slim
+FROM node:22.21.1-bookworm-slim
 
 RUN apt-get update && \
     apt-get install -yqq --no-install-recommends wget && \

README.md

@@ -30,6 +30,8 @@
 | POSTGRES_PASSWORD `REQUIRED`        | `null`   | `postgres`                      | Password that will be used in postgres database                                                                                          |
 | POSTGRES_IP `REQUIRED`              | `null`   | `jellystat-db` or `192.168.0.5` | Hostname/IP of postgres instance                                                                                                         |
 | POSTGRES_PORT `REQUIRED`            | `null`   | `5432`                          | Port Postgres is running on                                                                                                              |
+| POSTGRES_SSL_ENABLED                | `null`   | `true`                          | Enable SSL connections to Postgres
+| POSTGRES_SSL_REJECT_UNAUTHORIZED    | `null`   | `false`                         | Verify Postgres SSL certificates when POSTGRES_SSL_ENABLED=true
 | JS_LISTEN_IP                        | `0.0.0.0`| `0.0.0.0` or `::`               | Enable listening on specific IP or `::` for IPv6 |
 | JWT_SECRET `REQUIRED`               | `null`   | `my-secret-jwt-key`             | JWT Key to be used to encrypt JWT tokens for authentication                                                                              |
 | TZ `REQUIRED`                       | `null`   | `Etc/UTC`                       | Server timezone (Can be found at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List)                                      |

backend/classes/backup.js

@@ -3,7 +3,7 @@ const fs = require("fs");
 const path = require("path");
 const configClass = require("./config");
 
-const moment = require("moment");
+const dayjs = require("dayjs");
 const Logging = require("./logging");
 
 const taskstate = require("../logging/taskstate");
@@ -34,7 +34,7 @@ async function backup(refLog) {
   if (config.error) {
     refLog.logData.push({ color: "red", Message: "Backup Failed: Failed to get config" });
     refLog.logData.push({ color: "red", Message: "Backup Failed with errors" });
-    Logging.updateLog(refLog.uuid, refLog.logData, taskstate.FAILED);
+    await Logging.updateLog(refLog.uuid, refLog.logData, taskstate.FAILED);
     return;
   }
 
@@ -50,7 +50,7 @@ async function backup(refLog) {
   // Get data from each table and append it to the backup file
 
   try {
-    let now = moment();
+    let now = dayjs();
     const backuppath = "./" + backupfolder;
 
     if (!fs.existsSync(backuppath)) {
@@ -61,7 +61,7 @@ async function backup(refLog) {
       console.error("No write permissions for the folder:", backuppath);
       refLog.logData.push({ color: "red", Message: "Backup Failed: No write permissions for the folder: " + backuppath });
       refLog.logData.push({ color: "red", Message: "Backup Failed with errors" });
-      Logging.updateLog(refLog.uuid, refLog.logData, taskstate.FAILED);
+      await Logging.updateLog(refLog.uuid, refLog.logData, taskstate.FAILED);
       await pool.end();
       return;
     }
@@ -73,18 +73,18 @@ async function backup(refLog) {
     if (filteredTables.length === 0) {
       refLog.logData.push({ color: "red", Message: "Backup Failed: No tables to backup" });
       refLog.logData.push({ color: "red", Message: "Backup Failed with errors" });
-      Logging.updateLog(refLog.uuid, refLog.logData, taskstate.FAILED);
+      await Logging.updateLog(refLog.uuid, refLog.logData, taskstate.FAILED);
       await pool.end();
       return;
     }
 
-    // const backupPath = `../backup-data/backup_${now.format('yyyy-MM-DD HH-mm-ss')}.json`;
-    const directoryPath = path.join(__dirname, "..", backupfolder, `backup_${now.format("yyyy-MM-DD HH-mm-ss")}.json`);
+    // const backupPath = `../backup-data/backup_${now.format('YYYY-MM-DD HH-mm-ss')}.json`;
+    const directoryPath = path.join(__dirname, "..", backupfolder, `backup_${now.format("YYYY-MM-DD HH-mm-ss")}.json`);
     refLog.logData.push({ color: "yellow", Message: "Begin Backup " + directoryPath });
     const stream = fs.createWriteStream(directoryPath, { flags: "a" });
-    stream.on("error", (error) => {
+    stream.on("error", async (error) => {
       refLog.logData.push({ color: "red", Message: "Backup Failed: " + error });
-      Logging.updateLog(refLog.uuid, refLog.logData, taskstate.FAILED);
+      await Logging.updateLog(refLog.uuid, refLog.logData, taskstate.FAILED);
       return;
     });
     const backup_data = [];
@@ -152,7 +152,7 @@ async function backup(refLog) {
   } catch (error) {
     console.log(error);
     refLog.logData.push({ color: "red", Message: "Backup Failed: " + error });
-    Logging.updateLog(refLog.uuid, refLog.logData, taskstate.FAILED);
+    await Logging.updateLog(refLog.uuid, refLog.logData, taskstate.FAILED);
   }
 
   await pool.end();

backend/classes/config.js

@@ -15,14 +15,17 @@ class Config {
         return { state: 0, error: "Config Details Not Found" };
       }
 
+      const _config = config[0];
+
       return {
-        JF_HOST: process.env.JF_HOST ?? config[0].JF_HOST,
-        JF_API_KEY: process.env.JF_API_KEY ?? config[0].JF_API_KEY,
-        APP_USER: config[0].APP_USER,
-        APP_PASSWORD: config[0].APP_PASSWORD,
-        REQUIRE_LOGIN: config[0].REQUIRE_LOGIN,
-        settings: config[0].settings,
-        api_keys: config[0].api_keys,
+        JF_HOST: process.env.JF_HOST ?? _config.JF_HOST,
+        JF_EXTERNAL_HOST: _config.settings?.EXTERNAL_URL,
+        JF_API_KEY: process.env.JF_API_KEY ?? _config.JF_API_KEY,
+        APP_USER: _config.APP_USER,
+        APP_PASSWORD: _config.APP_PASSWORD,
+        REQUIRE_LOGIN: _config.REQUIRE_LOGIN,
+        settings: _config.settings,
+        api_keys: _config.api_keys,
         state: state,
         IS_JELLYFIN: (process.env.IS_EMBY_API || "false").toLowerCase() === "false",
       };

backend/classes/db-helper.js

@@ -14,7 +14,8 @@ function wrapField(field) {
     field.includes("AVG") ||
     field.includes("DISTINCT") ||
     field.includes("json_agg") ||
-    field.includes("CASE")
+    field.includes("CASE") ||
+    field.includes("REGEXP_REPLACE")
   ) {
     return field;
   }
@@ -203,6 +204,124 @@ async function query({
     client.release();
   }
 }
+
+function buildFilterList(query, filtersArray, filterFields) {
+  if (filtersArray.length > 0) {
+    query.where = query.where || [];
+    filtersArray.forEach((filter) => {
+      const findField = filterFields.find((item) => item.field === filter.field);
+      const column = findField?.column || "a.ActivityDateInserted";
+      const isColumn = findField?.isColumn || false;
+      const applyToCTE = findField?.applyToCTE || false;
+      if (filter.min) {
+        query.where.push({
+          column: column,
+          operator: ">=",
+          value: `$${query.values.length + 1}`,
+        });
+
+        query.values.push(filter.min);
+
+        if (applyToCTE) {
+          if (query.cte) {
+            if (!query.cte.where) {
+              query.cte.where = [];
+            }
+            query.cte.where.push({
+              column: column,
+              operator: ">=",
+              value: `$${query.values.length + 1}`,
+            });
+
+            query.values.push(filter.min);
+          }
+        }
+      }
+
+      if (filter.in) {
+        const values = filter.in.split(",");
+        const valuesPlaceholders = values.map((_, i) => `$${query.values.length + i + 1}`).join(", ");
+        query.where.push({
+          column: column,
+          operator: "in",
+          value: `(${valuesPlaceholders})`,
+        });
+
+        if (applyToCTE) {
+          if (query.cte) {
+            if (!query.cte.where) {
+              query.cte.where = [];
+            }
+            const valuesPlaceholdersCTE = values.map((_, i) => `$${query.values.length + values.length + i + 1}`).join(", ");
+            query.cte.where.push({
+              column: column,
+              operator: "in",
+              value: `(${valuesPlaceholdersCTE})`,
+            });
+          }
+        }
+        query.values.push(...values);
+        if (applyToCTE && query.cte) {
+          query.values.push(...values);
+        }
+      }
+
+      if (filter.max) {
+        query.where.push({
+          column: column,
+          operator: "<=",
+          value: `$${query.values.length + 1}`,
+        });
+
+        query.values.push(filter.max);
+
+        if (applyToCTE) {
+          if (query.cte) {
+            if (!query.cte.where) {
+              query.cte.where = [];
+            }
+            query.cte.where.push({
+              column: column,
+              operator: "<=",
+              value: `$${query.values.length + 1}`,
+            });
+
+            query.values.push(filter.max);
+          }
+        }
+      }
+
+      if (filter.value) {
+        const whereClause = {
+          operator: "LIKE",
+          value: `$${query.values.length + 1}`,
+        };
+
+        query.values.push(`%${filter.value.toLowerCase()}%`);
+
+        if (isColumn) {
+          whereClause.column = column;
+        } else {
+          whereClause.field = column;
+        }
+        query.where.push(whereClause);
+
+        if (applyToCTE) {
+          if (query.cte) {
+            if (!query.cte.where) {
+              query.cte.where = [];
+            }
+            whereClause.value = `$${query.values.length + 1}`;
+            query.cte.where.push(whereClause);
+
+            query.values.push(`%${filter.value.toLowerCase()}%`);
+          }
+        }
+      }
+    });
+  }
+}
 module.exports = {
   query,
+  buildFilterList,
 };

backend/classes/emby-api.js

@@ -143,6 +143,23 @@ class EmbyAPI {
     }
   }
 
+  async getUserById(userid) {
+    if (!this.configReady) {
+      const success = await this.#fetchConfig();
+      if (!success) {
+        return null;
+      }
+    }
+
+    try {
+      const users = await this.getUsers();
+      return users.find((user) => user.Id === userid) || null;
+    } catch (error) {
+      this.#errorHandler(error);
+      return null;
+    }
+  }
+
   async getItemsByID({ ids, params }) {
     if (!this.configReady) {
       return [];