Merge pull request #608 from Frooodle/overlay

messages

.gitattributes

@@ -1,5 +1,6 @@
 # Ignore all JavaScript files in a directory
 src/main/resources/static/pdfjs/* linguist-vendored
+src/main/resources/static/pdfjs/** linguist-vendored
 src/main/resources/static/css/bootstrap-icons.css linguist-vendored
 src/main/resources/static/css/bootstrap.min.css linguist-vendored
 src/main/resources/static/css/fonts/* linguist-vendored

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# All PRs to V1 must be approved by Frooodle
+* @Frooodle

.github/pull_request_template.md

@@ -0,0 +1,4 @@
+# License Agreement for Contributions
+By submitting this pull request, I acknowledge and agree that my contributions will be included in Stirling-PDF and that they can be relicensed in the future under MPL 2.0 (Mozilla Public License Version 2.0) license. 
+
+(This does not change the general open-source nature of Stirling-PDF, simply moving from one license to another license)

.github/workflows/pull_request_template.md

@@ -0,0 +1,3 @@
+# License Agreement for Contributions
+By submitting this pull request, I acknowledge and agree that my contributions will be included in Stirling-PDF and that they can be relicensed in the future under MPL 2.0 (Mozilla Public License Version 2.0) license. 
+(This does not change the open-source nature of Stirling-PDF, simply moving from one license to another license)

.github/workflows/push-docker.yml

@@ -139,4 +139,10 @@ jobs:
         cache-to: type=gha,mode=max
         tags: ${{ steps.meta3.outputs.tags }}
         labels: ${{ steps.meta3.outputs.labels }}
+        build-args: 
+          VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
         platforms: linux/amd64,linux/arm64/v8
+    - name: Build and Push Helm Chart
+      run: |
+        helm package chart/stirling-pdf
+        helm push stirling-pdf-chart-1.0.0.tgz oci://registry-1.docker.io/frooodle

.gitignore

@@ -15,8 +15,8 @@ local.properties
 .classpath
 .project
 version.properties
-pipeline/
-
+pipeline/watchedFolders/
+pipeline/finishedFolders/
 #### Stirling-PDF Files ###
 customFiles/
 configs/
@@ -119,4 +119,9 @@ watchedFolders/
 *.db
 /build
 
-/.vscode
+/.vscode
+/.idea
+
+# Ignore Mac DS_Store files
+.DS_Store
+**/.DS_Store

Dockerfile

@@ -1,12 +1,13 @@
 # Use the base image
-FROM frooodle/stirling-pdf-base:beta4
+FROM frooodle/stirling-pdf-base:version8
 
 ARG VERSION_TAG
 
 # Set Environment Variables
 ENV DOCKER_ENABLE_SECURITY=false \
     HOME=/home/stirlingpdfuser \
-    VERSION_TAG=$VERSION_TAG
+    VERSION_TAG=$VERSION_TAG \
+    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75"
 #    PUID=1000 \
 #    PGID=1000 \
 #    UMASK=022 \
@@ -18,19 +19,20 @@ ENV DOCKER_ENABLE_SECURITY=false \
 ##    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME
 
 # Set up necessary directories and permissions
-RUN mkdir -p /scripts /usr/share/fonts/opentype/noto /usr/share/tesseract-ocr /configs /customFiles 
+RUN mkdir -p /scripts /usr/share/fonts/opentype/noto /usr/share/tesseract-ocr /configs /logs /customFiles /pipeline /pipeline/defaultWebUIConfigs  /pipeline/watchedFolders /pipeline/finishedFolders
 ##&& \
 ##    chown -R stirlingpdfuser:stirlingpdfgroup /scripts /usr/share/fonts/opentype/noto /usr/share/tesseract-ocr /configs /customFiles && \
 ##    chown -R stirlingpdfuser:stirlingpdfgroup /usr/share/tesseract-ocr-original
 
 # Copy necessary files
 COPY ./scripts/* /scripts/
+COPY ./pipeline/ /pipeline/
 COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
 COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
 COPY build/libs/*.jar app.jar
 
 # Set font cache and permissions
-RUN fc-cache -f -v && chmod +x /scripts/init.sh
+RUN fc-cache -f -v && chmod +x /scripts/*
 
 ##&& \
 ##    chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
@@ -42,4 +44,4 @@ EXPOSE 8080
 # Set user and run command
 ##USER stirlingpdfuser
 ENTRYPOINT ["/scripts/init.sh"]
-CMD ["java", "-jar", "/app.jar"]
+CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]

Dockerfile-lite

@@ -1,41 +1,53 @@
 # Build jbig2enc in a separate stage
 FROM bellsoft/liberica-openjdk-debian:17
+
+ARG VERSION_TAG
+
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-        libreoffice-core-nogui \
+        libreoffice-core \
         libreoffice-common \
-        libreoffice-writer-nogui \
-        libreoffice-calc-nogui \
-        libreoffice-impress-nogui \
+        libreoffice-writer \
+        libreoffice-calc \
+        libreoffice-impress \
         unoconv && \
     rm -rf /var/lib/apt/lists/*
 
 
 # Set Environment Variables
-ENV PUID=1000 \
-    PGID=1000 \
-    UMASK=022 \
-    DOCKER_ENABLE_SECURITY=false \
+ENV DOCKER_ENABLE_SECURITY=false \
     HOME=/home/stirlingpdfuser \
-    VERSION_TAG=$VERSION_TAG
+    VERSION_TAG=$VERSION_TAG \
+    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75"
+#	PUID=1000 \
+#   PGID=1000 \
+#   UMASK=022 \
 
 # Create user and group
-RUN groupadd -g $PGID stirlingpdfgroup && \
-    useradd -u $PUID -g stirlingpdfgroup -s /bin/sh stirlingpdfuser && \
-    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME
+#RUN groupadd -g $PGID stirlingpdfgroup && \
+#    useradd -u $PUID -g stirlingpdfgroup -s /bin/sh stirlingpdfuser && \
+#    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME
 
 # Set up necessary directories and permissions
-RUN mkdir -p /scripts /usr/share/fonts/opentype/noto /configs /customFiles && \
-    chown -R stirlingpdfuser:stirlingpdfgroup /usr/share/fonts/opentype/noto /configs /customFiles
+RUN mkdir -p /scripts /usr/share/fonts/opentype/noto /configs /customFiles /logs /pipeline /pipeline/defaultWebUIConfigs  /pipeline/watchedFolders /pipeline/finishedFolders
+
+#    chown -R stirlingpdfuser:stirlingpdfgroup /usr/share/fonts/opentype/noto /configs /customFiles
 
 # Copy necessary files
+COPY ./scripts/download-security-jar.sh /scripts/download-security-jar.sh
+COPY ./scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
+COPY ./pipeline/ /pipeline/
 COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
 COPY src/main/resources/static/fonts/*.otf /usr/share/fonts/opentype/noto/
 COPY build/libs/*.jar app.jar
 
 # Set font cache and permissions
 RUN fc-cache -f -v && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar
+chmod +x /scripts/init-without-ocr.sh && \
+chmod +x /scripts/download-security-jar.sh
+
+
+#    chown stirlingpdfuser:stirlingpdfgroup /app.jar
 
 
 
@@ -48,5 +60,6 @@ ENV ENDPOINTS_GROUPS_TO_REMOVE=Python,OpenCV,OCRmyPDF
 ENV DOCKER_ENABLE_SECURITY=false
 
 # Run the application
-USER stirlingpdfuser
-CMD ["java", "-jar", "/app.jar"]
+#USER stirlingpdfuser
+ENTRYPOINT ["/scripts/init-without-ocr.sh"]
+CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]

Dockerfile-ultra-lite

@@ -1,34 +1,46 @@
 # Build jbig2enc in a separate stage
 FROM bellsoft/liberica-openjdk-alpine:17
 
+ARG VERSION_TAG
+
 # Set Environment Variables
-ENV PUID=1000 \
-    PGID=1000 \
-    UMASK=022 \
-    DOCKER_ENABLE_SECURITY=false \
+ENV DOCKER_ENABLE_SECURITY=false \
     HOME=/home/stirlingpdfuser \
-    VERSION_TAG=$VERSION_TAG
+    VERSION_TAG=$VERSION_TAG \
+    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75"
+#	PUID=1000 \
+#   PGID=1000 \
+#   UMASK=022 \
 
 # Create user and group using Alpine's addgroup and adduser
-RUN addgroup -g $PGID stirlingpdfgroup && \
-    adduser -u $PUID -G stirlingpdfgroup -s /bin/sh -D stirlingpdfuser && \
-    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME
+#RUN addgroup -g $PGID stirlingpdfgroup && \
+#    adduser -u $PUID -G stirlingpdfgroup -s /bin/sh -D stirlingpdfuser && \
+#    mkdir -p $HOME && chown stirlingpdfuser:stirlingpdfgroup $HOME
 
 # Set up necessary directories and permissions
-RUN mkdir -p /scripts /configs /customFiles && \
-    chown -R stirlingpdfuser:stirlingpdfgroup /scripts /configs /customFiles
-
+#RUN mkdir -p /scripts /configs /customFiles && \
+#    chown -R stirlingpdfuser:stirlingpdfgroup /scripts /configs /customFiles /logs /pipeline /pipeline/defaultWebUIConfigs  /pipeline/watchedFolders /pipeline/finishedFolders
+ 
+RUN mkdir -p /scripts /usr/share/fonts/opentype/noto /configs /customFiles
+COPY ./scripts/download-security-jar.sh /scripts/download-security-jar.sh
+COPY ./scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
+COPY ./pipeline/ /pipeline/
 COPY build/libs/*.jar app.jar
 
 # Set font cache and permissions
-RUN chown stirlingpdfuser:stirlingpdfgroup /app.jar
+#RUN chown stirlingpdfuser:stirlingpdfgroup /app.jar
+
+RUN chmod +x /scripts/init-without-ocr.sh && \
+chmod +x /scripts/download-security-jar.sh && \
+apk add --no-cache curl
 
 # Expose the application port
 EXPOSE 8080
 
 # Set environment variables
 ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI
-ENV DOCKER_ENABLE_SECURITY=false
+
+ENTRYPOINT ["/scripts/init-without-ocr.sh"]
 
 # Run the application
-CMD ["java", "-jar", "/app.jar"]
+CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]

DockerfileBase

@@ -1,37 +1,50 @@
 # Main stage
-FROM bellsoft/liberica-openjdk-debian:17 AS base
+FROM ubuntu:latest AS base
+
+
+
+# JDK for app
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-        libreoffice-core-nogui \
+    	openjdk-17-jre
+    	
+# Doc conversion
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    	libreoffice-core \
         libreoffice-common \
-        libreoffice-writer-nogui \
-        libreoffice-calc-nogui \
-        libreoffice-impress-nogui \
-        python3-uno \
+        libreoffice-writer \
+        libreoffice-calc \
+        libreoffice-impress \
+		python3-uno \
+		curl \
+		unoconv
+		
+		
+# OCR MY PDF (unpaper for descew and other advanced featues)
+RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common gnupg2 && \
+add-apt-repository ppa:alex-p/tesseract-ocr5 && apt install -y --no-install-recommends tesseract-ocr && \
+apt-get update && \
+    apt-get install -y --no-install-recommends \
+        ghostscript \
         python3-pip \
-        unoconv \
-        pngquant \
-        unpaper \
-        ocrmypdf && \
-    rm -rf /var/lib/apt/lists/* && \
+        ocrmypdf \
+        unpaper && \
+    pip install --upgrade pip && \
+    pip install --no-cache-dir --upgrade ocrmypdf && \
+    pip install --no-cache-dir --upgrade pillow==10.0.1 reportlab==3.6.13 wheel==0.38.1 setuptools==65.5.1 pyjwt==2.4.0 cryptography==39.0.1
+    
+    
+#CV and HTML   
+RUN pip install --no-cache-dir opencv-python-headless WeasyPrint 
+
+
+# cleanup and etc
+RUN rm -rf /var/lib/apt/lists/* && \
     mkdir /usr/share/tesseract-ocr-original && \
     cp -r /usr/share/tesseract-ocr/* /usr/share/tesseract-ocr-original && \
     rm -rf /usr/share/tesseract-ocr
 
-# Python packages stage
-FROM base AS python-packages
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        build-essential \
-        libffi-dev \
-        libssl-dev \
-        zlib1g-dev \
-        libjpeg-dev && \
-    pip install --upgrade pip && \
-    pip install --no-cache-dir \
-        opencv-python-headless WeasyPrint && \
-    rm -rf /var/lib/apt/lists/*
 
-# Final stage: Copy necessary files from the previous stage
-FROM base
-COPY --from=python-packages /usr/local /usr/local
+
+    

HowToUseOCR.md

@@ -2,6 +2,9 @@
 
 This document provides instructions on how to add additional language packs for the OCR tab in Stirling-PDF, both inside and outside of Docker.
 
+## My OCR used to work and now doesnt!
+Please update your tesseract docker volume path version from 4.00 to 5
+
 ## How does the OCR Work
 Stirling-PDF uses [OCRmyPDF](https://github.com/ocrmypdf/OCRmyPDF) which in turn uses tesseract for its text recognition.
 All credit goes to them for this awesome work! 
@@ -18,9 +21,9 @@ Depending on your requirements, you can choose the appropriate language pack for
 ### Installing Language Packs
 
 1. Download the desired language pack(s) by selecting the `.traineddata` file(s) for the language(s) you need.
-2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tesseract-ocr/4.00/tessdata` (Debian) or `/usr/share/tesseract/tessdata` (Fedora)
+2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tesseract-ocr/5/tessdata` (Debian) or `/usr/share/tesseract/tessdata` (Fedora)
 
-# DO NOT REMOVE EXISTING ENG.TRAINEDDATA, ITS REQUIRED.
+# DO NOT REMOVE EXISTING ENG.TRAINEDDATA, IT'S REQUIRED.
 
 #### Docker
 
@@ -34,14 +37,14 @@ services:
   your_service_name:
     image: your_docker_image_name
     volumes:
-      - /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata
+      - /location/of/trainingData:/usr/share/tesseract-ocr/5/tessdata
 ```
 
 
 #### Docker run
 Add the following to your existing docker run command
 ```bash
--v /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata
+-v /location/of/trainingData:/usr/share/tesseract-ocr/5/tessdata
 ```
 
 #### Non-Docker

Jenkinsfile

@@ -22,12 +22,24 @@ pipeline {
                     def appVersion = sh(returnStdout: true, script: './gradlew printVersion -q').trim()
                     def image = "frooodle/s-pdf:$appVersion"
                     withCredentials([string(credentialsId: 'docker_hub_access_token', variable: 'DOCKER_HUB_ACCESS_TOKEN')]) {
-				sh "docker login --username frooodle --password $DOCKER_HUB_ACCESS_TOKEN"
+				        sh "docker login --username frooodle --password $DOCKER_HUB_ACCESS_TOKEN"
                         sh "docker push $image"
                     }
                 }
             }
-    	
-	}
-   }
+        }
+        stage('Helm Push') {
+            steps {
+                script {
+                    //TODO: Read chartVersion from Chart.yaml
+                    def chartVersion = '1.0.0'
+                    withCredentials([string(credentialsId: 'docker_hub_access_token', variable: 'DOCKER_HUB_ACCESS_TOKEN')]) {
+				        sh "docker login --username frooodle --password $DOCKER_HUB_ACCESS_TOKEN"
+				        sh "helm package chart/stirling-pdf"
+                        sh "helm push stirling-pdf-chart-1.0.0.tgz oci://registry-1.docker.io/frooodle"
+                    }
+                }
+            }
+        }
+    }
 }

LocalRunGuide.md

@@ -1,5 +1,5 @@
 
-To run the application without Docker, you will need to manually install all dependencies and build the necessary components.
+To run the application without Docker/Podman, you will need to manually install all dependencies and build the necessary components.
 
 Note that some dependencies might not be available in the standard repositories of all Linux distributions, and may require additional steps to install.
 
@@ -8,6 +8,8 @@ The following guide assumes you have a basic understanding of using a command li
 It should work on most Linux distributions and MacOS. For Windows, you might need to use Windows Subsystem for Linux (WSL) for certain steps.
 The amount of dependencies is to actually reduce overall size, ie installing LibreOffice sub components rather than full LibreOffice package.
 
+You could theoretically use a Distrobox/Toolbox, if your Distribution has old or not all Packages. But you might just as well use the Docker Container then.
+
 ### Step 1: Prerequisites
 
 Install the following software, if not already installed:
@@ -18,7 +20,7 @@ Install the following software, if not already installed:
 
 - Git
 
-- Python 3 (with pip)
+- Python 3.8 (with pip)
 
 - Make
 
@@ -93,14 +95,14 @@ For Debian-based systems, you can use the following command:
 
 ```bash
 sudo apt-get install -y libreoffice-writer libreoffice-calc libreoffice-impress unpaper ocrmypdf
-pip3 install uno opencv-python-headless unoconv pngquant 
+pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint 
 ```
 
 For Fedora:
 
 ```bash
 sudo dnf install -y libreoffice-writer libreoffice-calc libreoffice-impress unpaper ocrmypdf
-pip3 install uno opencv-python-headless unoconv pngquant 
+pip3 install uno opencv-python-headless unoconv pngquant WeasyPrint 
 ```
 
 ### Step 4: Clone and Build Stirling-PDF
@@ -137,7 +139,7 @@ Easiest is to use the langpacks provided by your repositories. Skip the other st
 Manual:
 
 1. Download the desired language pack(s) by selecting the `.traineddata` file(s) for the language(s) you need.
-2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tesseract-ocr/4.00/tessdata`
+2. Place the `.traineddata` files in the Tesseract tessdata directory: `/usr/share/tesseract-ocr/5/tessdata`
 3. 
 Please view  [OCRmyPDF install guide](https://ocrmypdf.readthedocs.io/en/latest/installation.html) for more info.
 **IMPORTANT:** DO NOT REMOVE EXISTING `eng.traineddata`, IT'S REQUIRED.
@@ -174,7 +176,7 @@ rpm -qa | grep tesseract-langpack | sed 's/tesseract-langpack-//g'
 ```bash
 ./gradlew bootRun
 or
-java -jar build/libs/app.jar
+java -jar /opt/Stirling-PDF/Stirling-PDF-*.jar
 ```
 
 ### Step 8: Adding a Desktop icon
@@ -200,6 +202,64 @@ EOF
 
 Note: Currently the app will run in the background until manually closed.
 
+### Optional: Run Stirling-PDF as a service
+
+First create a .env file, where you can store environment variables:
+```
+touch /opt/Stirling-PDF/.env
+```
+In this file you can add all variables, one variable per line, as stated in the main readme (for example SYSTEM_DEFAULTLOCALE="de-DE").
+
+Create a new file where we store our service settings and open it with nano editor:
+```
+nano /etc/systemd/system/stirlingpdf.service
+```
+
+Paste this content, make sure to update the filename of the jar-file. Press Ctrl+S and Ctrl+X to save and exit the nano editor:
+```
+[Unit]
+Description=Stirling-PDF service
+After=syslog.target network.target
+
+[Service]
+SuccessExitStatus=143
+
+User=root
+Group=root
+
+Type=simple
+
+EnvironmentFile=/opt/Stirling-PDF/.env
+WorkingDirectory=/opt/Stirling-PDF
+ExecStart=/usr/bin/java -jar Stirling-PDF-0.17.2.jar
+ExecStop=/bin/kill -15 $MAINPID
+
+[Install]
+WantedBy=multi-user.target
+```
+
+Notify systemd that it has to rebuild its internal service database (you have to run this command every time you make a change in the service file):
+```
+sudo systemctl daemon-reload
+```
+
+Enable the service to tell the service to start it automatically:
+```
+sudo systemctl enable stirlingpdf.service
+```
+
+See the status of the service:
+```
+sudo systemctl status stirlingpdf.service
+```
+
+Manually start/stop/restart the service:
+```
+sudo systemctl start stirlingpdf.service
+sudo systemctl stop stirlingpdf.service
+sudo systemctl restart stirlingpdf.service
+```
+
 ---
 
 Remember to set the necessary environment variables before running the project if you want to customize the application the list can be seen in the main readme.

README.md

@@ -14,11 +14,9 @@ This is a powerful locally hosted web based PDF manipulation tool using docker t
 
 Stirling PDF makes no outbound calls for any record keeping or tracking.
 
-All files and PDFs are either purely client side, in server memory only during the execution of the task or within a temporay file only for execution of the task.
-Any file which has been downloaded by the user will have already been deleted from the server by that time.
-
-Feel free to request any features or bug fixes either in github issues or our [Discord](https://discord.gg/Cn8pWhQRxZ)
+All files and PDFs exist either exclusively on the client side, reside in server memory only during task execution, or temporarily reside in a file solely for the execution of the task. Any file downloaded by the user will have been deleted from the server by that point.
 
+Please feel free to submit feature requests or report bugs either through GitHub issues or on our [Discord](https://discord.gg/Cn8pWhQRxZ)
 
 ![stirling-home](images/stirling-home.png)
 
@@ -33,6 +31,7 @@ Feel free to request any features or bug fixes either in github issues or our [D
 ## **PDF Features**
 
 ### **Page Operations**
+- View and modify PDFs - View multi page PDFs with custom viewing sorting and searching. Plus on page edit features like annotate, draw and adding text and images. (Using PDF.js with Joxit and Liberation.Liberation fonts)
 - Full interactive GUI for merging/splitting/rotating/moving PDFs and their pages. 
 - Merge multiple PDFs together into a single resultant file. 
 - Split PDFs into multiple files at specified page numbers or extract all pages as individual files. 
@@ -81,7 +80,7 @@ Feel free to request any features or bug fixes either in github issues or our [D
 - Get all information on a PDF to view or export as JSON. 
 
 
-For a overview of the tasks and the technology each uses please view [groups.md](https://github.com/Frooodle/Stirling-PDF/blob/main/Groups.md)
+For a overview of the tasks and the technology each uses please view [Endpoint-groups.md](https://github.com/Frooodle/Stirling-PDF/blob/main/Endpoint-groups.md)
 Hosted instance/demo of the app can be seen [here](https://pdf.adminforge.de/) hosted by the team at adminforge.de
 
 ## Technologies used
@@ -99,7 +98,7 @@ Hosted instance/demo of the app can be seen [here](https://pdf.adminforge.de/) h
 ### Locally
 Please view https://github.com/Frooodle/Stirling-PDF/blob/main/LocalRunGuide.md
 
-### Docker
+### Docker / Podman
 https://hub.docker.com/r/frooodle/s-pdf
 
 Stirling PDF has 3 different versions, a Full version, Lite, and ultra-Lite. Depending on the types of features you use you may want a smaller image to save on space.
@@ -113,8 +112,9 @@ Docker Run
 ```
 docker run -d \
   -p 8080:8080 \
-  -v /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata \
+  -v /location/of/trainingData:/usr/share/tesseract-ocr/5/tessdata \
   -v /location/of/extraConfigs:/configs \
+  -v /location/of/logs:/logs \
   -e DOCKER_ENABLE_SECURITY=false \
   --name stirling-pdf \
   frooodle/s-pdf:latest
@@ -133,19 +133,21 @@ services:
     ports:
       - '8080:8080'
     volumes:
-      - /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata #Required for extra OCR languages
+      - /location/of/trainingData:/usr/share/tesseract-ocr/5/tessdata #Required for extra OCR languages
       - /location/of/extraConfigs:/configs
 #      - /location/of/customFiles:/customFiles/
+#      - /location/of/logs:/logs/
     environment:
       - DOCKER_ENABLE_SECURITY=false
 ```
 
+Note: Podman is CLI-compatible with Docker, so simply replace "docker" with "podman".
 
 ## Enable OCR/Compression feature
 Please view https://github.com/Frooodle/Stirling-PDF/blob/main/HowToUseOCR.md
 
 ## Want to add your own language?
-Stirling PDF currently supports 18!
+Stirling PDF currently supports 21!
 - English (English) (en_GB)
 - English (US) (en_US)
 - Arabic (العربية) (ar_AR)
@@ -164,6 +166,10 @@ Stirling PDF currently supports 18!
 - Basque (Euskara) (eu_ES)
 - Japanese (日本語) (ja_JP)
 - Dutch (Nederlands) (nl_NL)
+- Greek (el_GR)
+- Turkish (Türkçe) (tr_TR)
+- Indonesia (Bahasa Indonesia) (id_ID)
+- Hindi (हिंदी) (hi_IN)
 
 If you want to add your own language to Stirling-PDF please refer
 https://github.com/Frooodle/Stirling-PDF/blob/main/HowToAddNewLanguage.md
@@ -218,11 +224,11 @@ metrics:
   enabled: true # 'true' to enable Info APIs endpoints (view http://localhost:8080/swagger-ui/index.html#/API to learn more), 'false' to disable
 ```
 ### Extra notes
-- Endpoints. Currently, the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma separate lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image-to-pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Frooodle/Stirling-PDF/blob/main/groups.md) 
+- Endpoints. Currently, the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma separate lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image-to-pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Frooodle/Stirling-PDF/blob/main/Endpoint-groups.md) 
 - customStaticFilePath. Customise static files such as the app logo by placing files in the /customFiles/static/ directory. An example of customising app logo is placing a /customFiles/static/favicon.svg to override current SVG. This can be used to change any images/icons/css/fonts/js etc in Stirling-PDF
 
 ### Environment only parameters
-- ``SYSTEM_ROOTURIPATH`` ie set to ``pdf-app`` to Set the application's root URI tp ``localhost:8080/pdf-app``
+- ``SYSTEM_ROOTURIPATH`` ie set to ``/pdf-app`` to Set the application's root URI to ``localhost:8080/pdf-app``
 - ``SYSTEM_CONNECTIONTIMEOUTMINUTES`` to set custom connection timeout values
 - ``DOCKER_ENABLE_SECURITY`` to tell docker to download security jar (required as true for auth login)
 
@@ -232,10 +238,12 @@ For those wanting to use Stirling-PDFs backend API to link with their own custom
 
 
 ## Login authentication
+![stirling-login](images/login-light.png)
 ### Prerequisites: 
 - User must have the folder ./configs volumed within docker so that it is retained during updates.
 - Docker uses must download the security jar version by setting ``DOCKER_ENABLE_SECURITY`` to ``true`` in environment variables. 
-- Now the initial user will be generated with username ``admin`` and password ``stirling``. On login you will be forced to change the password to a new one.
+- Then either enable login via the settings.yml file or via setting ``SECURITY_ENABLE_LOGIN`` to ``true``
+- Now the initial user will be generated with username ``admin`` and password ``stirling``. On login you will be forced to change the password to a new one. You can also use the environment variables ``SECURITY_INITIALLOGIN_USERNAME`` and  ``SECURITY_INITIALLOGIN_PASSWORD`` to set your own straight away (Recommended to remove them after user creation).
 
 Once the above has been done, on restart, a new stirling-pdf-DB.mv.db will show if everything worked.
 
@@ -256,9 +264,11 @@ For API usage you must provide a header with 'X-API-Key' and the associated API
 - Folder support with auto scanning to perform operations on
 - Redact text (Via UI not just automated way) 
 - Add Forms
-- Annotations
 - Multi page layout (Stich PDF pages together) support x rows y columns and custom page sizing 
 - Fill forms mannual and automatic 
 
 ### Q2: Why is my application downloading .htm files?
-This is a issue caused commonly by your NGINX congifuration. The default file upload size for NGINX is 1MB, you need to add the following in your Nginx sites-available file. client_max_body_size SIZE; Where "SIZE" is 50M for example for 50MB files.
+This is an issue caused commonly by your NGINX configuration. The default file upload size for NGINX is 1MB, you need to add the following in your Nginx sites-available file. ``client_max_body_size SIZE;`` Where "SIZE" is 50M for example for 50MB files.
+
+### Q3: Why is my download timing out
+NGINX has timeout values by default so if you are running Stirling-PDF behind NGINX you may need to set a timeout value such as adding the config ``proxy_read_timeout 3600;``

Version-groups.md

@@ -19,6 +19,7 @@ add-image           |     ✔️      |  ✔️   |  ✔️
 add-watermark       |     ✔️      |  ✔️   |  ✔️
 adjust-contrast     |     ✔️      |  ✔️   |  ✔️
 auto-split-pdf      |     ✔️      |  ✔️   |  ✔️
+auto-redact         |     ✔️      |  ✔️   |  ✔️
 auto-rename         |     ✔️      |  ✔️   |  ✔️
 cert-sign           |     ✔️      |  ✔️   |  ✔️
 crop                |     ✔️      |  ✔️   |  ✔️
@@ -33,7 +34,9 @@ img-to-pdf          |     ✔️      |  ✔️   |  ✔️
 markdown-to-pdf     |     ✔️      |  ✔️   |  ✔️
 merge-pdfs          |     ✔️      |  ✔️   |  ✔️
 multi-page-layout   |     ✔️      |  ✔️   |  ✔️
+overlay-pdf         |     ✔️      |  ✔️   |  ✔️
 pdf-organizer       |     ✔️      |  ✔️   |  ✔️
+pdf-to-csv          |     ✔️      |  ✔️   |  ✔️
 pdf-to-img          |     ✔️      |  ✔️   |  ✔️
 pdf-to-single-page  |     ✔️      |  ✔️   |  ✔️
 remove-pages        |     ✔️      |  ✔️   |  ✔️
@@ -43,6 +46,8 @@ sanitize-pdf        |     ✔️      |  ✔️   |  ✔️
 scale-pages         |     ✔️      |  ✔️   |  ✔️
 sign                |     ✔️      |  ✔️   |  ✔️
 show-javascript     |     ✔️      |  ✔️   |  ✔️
+split-by-size-or-count |     ✔️      |  ✔️   |  ✔️
+split-pdf-by-sections  |     ✔️      |  ✔️   |  ✔️
 split-pdfs          |     ✔️      |  ✔️   |  ✔️
 file-to-pdf         |             |  ✔️   |  ✔️
 pdf-to-html         |             |  ✔️   |  ✔️

build.gradle

@@ -1,14 +1,14 @@
 plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.1.2'
-	id 'io.spring.dependency-management' version '1.1.2'
-	id 'org.springdoc.openapi-gradle-plugin' version '1.6.0'
-	id "io.swagger.swaggerhub" version "1.2.0"
-	id 'edu.sc.seis.launch4j' version '3.0.3'
+	id 'io.spring.dependency-management' version '1.1.3'
+	id 'org.springdoc.openapi-gradle-plugin' version '1.8.0'
+	id "io.swagger.swaggerhub" version "1.3.2"
+	id 'edu.sc.seis.launch4j' version '3.0.5'
 }
 
 group = 'stirling.software'
-version = '0.14.2'
+version = '0.18.0'
 sourceCompatibility = '17'
 
 repositories {
@@ -32,7 +32,6 @@ sourceSets {
     }
 }
 
-
 openApi {
     apiDocsUrl = "http://localhost:8080/v1/api-docs"
     outputDir = file("$projectDir")
@@ -46,15 +45,15 @@ launch4j {
   outfile="Stirling-PDF.exe"
   headerType="console"
   jarTask = tasks.bootJar
-  
+
   errTitle="Encountered error, Do you have Java 17?"
-  downloadUrl="https://download.oracle.com/java/17/latest/jdk-17_windows-x64_bin.exe" 
-  variables=["BROWSER_OPEN=true"]
+  downloadUrl="https://download.oracle.com/java/17/latest/jdk-17_windows-x64_bin.exe"
+  variables=["BROWSER_OPEN=true", "ENDPOINTS_GROUPS_TO_REMOVE=CLI"]
   jreMinVersion="17"
-  
+
   mutexName="Stirling-PDF"
   windowTitle="Stirling-PDF"
-  
+
   messagesStartupError="An error occurred while starting Stirling-PDF"
   //messagesJreNotFoundError="This application requires a Java Runtime Environment, Please download Java 17."
   messagesJreVersionError="You are running the wrong version of Java, Please download Java 17."
@@ -63,46 +62,79 @@ launch4j {
 }
 
 dependencies {
-	implementation 'org.yaml:snakeyaml:2.1'
-	implementation 'org.springframework.boot:spring-boot-starter-web:3.1.2'
-	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.1.2'
+	//security updates
+	implementation 'ch.qos.logback:logback-classic:1.4.14'
+	implementation 'ch.qos.logback:logback-core:1.4.14'
+	implementation 'org.springframework:spring-webmvc:6.0.15'
 	
-	if (System.getenv('DOCKER_ENABLE_SECURITY') != 'false') {
-        implementation 'org.springframework.boot:spring-boot-starter-security:3.1.2'
+    implementation 'org.yaml:snakeyaml:2.1'
+    implementation 'org.springframework.boot:spring-boot-starter-web:3.2.1'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.1'
+
+    if (System.getenv('DOCKER_ENABLE_SECURITY') != 'false') {
+        implementation 'org.springframework.boot:spring-boot-starter-security:3.2.1'
         implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.2.RELEASE'
         implementation "org.springframework.boot:spring-boot-starter-data-jpa"
-		implementation "com.h2database:h2"
+        implementation "com.h2database:h2"
     }
-	
-	testImplementation 'org.springframework.boot:spring-boot-starter-test:3.1.2'
-	
-	
 
-	// https://mvnrepository.com/artifact/org.apache.pdfbox/jbig2-imageio
-	implementation group: 'org.apache.pdfbox', name: 'jbig2-imageio', version: '3.0.4'
-	implementation 'commons-io:commons-io:2.13.0'
-	
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test:3.2.1'
+
+    // Batik
+    implementation 'org.apache.xmlgraphics:batik-all:1.17'
+
+    // TwelveMonkeys
+    implementation 'com.twelvemonkeys.imageio:imageio-batik:3.10.1'
+    implementation 'com.twelvemonkeys.imageio:imageio-bmp:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-hdr:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-icns:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-iff:3.10.1'
+    implementation 'com.twelvemonkeys.imageio:imageio-jpeg:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-pcx:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-pict:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-pnm:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-psd:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-sgi:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-tga:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-thumbsdb:3.10.1'
+    implementation 'com.twelvemonkeys.imageio:imageio-tiff:3.10.1'
+    implementation 'com.twelvemonkeys.imageio:imageio-webp:3.10.1'
+    // implementation 'com.twelvemonkeys.imageio:imageio-xwd:3.10.1'
+
+    implementation 'commons-io:commons-io:2.15.1'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+
+    //general PDF
+
+    // https://mvnrepository.com/artifact/com.opencsv/opencsv
+    implementation ('com.opencsv:opencsv:5.7.1') {
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
     
-	//general PDF
-    implementation 'org.apache.pdfbox:pdfbox:2.0.29'
-    implementation 'org.apache.pdfbox:xmpbox:2.0.29'
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.70' 
+    implementation ('org.apache.pdfbox:pdfbox:2.0.29'){
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
+    
+    implementation ('org.apache.pdfbox:xmpbox:2.0.29'){
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
+    
+    implementation 'org.bouncycastle:bcprov-jdk18on:1.77'
+    implementation 'org.bouncycastle:bcpkix-jdk18on:1.77'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.micrometer:micrometer-core'
-    implementation group: 'com.google.zxing', name: 'core', version: '3.5.1'
+    implementation group: 'com.google.zxing', name: 'core', version: '3.5.2'
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
-	implementation 'org.commonmark:commonmark:0.21.0'
+    implementation 'org.commonmark:commonmark:0.21.0'
     // https://mvnrepository.com/artifact/com.github.vladimir-bukhtoyarov/bucket4j-core
-	implementation 'com.github.vladimir-bukhtoyarov:bucket4j-core:7.6.0'
-    
-    developmentOnly("org.springframework.boot:spring-boot-devtools")
-	compileOnly 'org.projectlombok:lombok:1.18.28'
-	annotationProcessor 'org.projectlombok:lombok:1.18.28'
+    implementation 'com.github.vladimir-bukhtoyarov:bucket4j-core:7.6.0'
 
+    developmentOnly("org.springframework.boot:spring-boot-devtools")
+    compileOnly 'org.projectlombok:lombok:1.18.30'
+    annotationProcessor 'org.projectlombok:lombok:1.18.28'
 }
 
+
 task writeVersion {
     def propsFile = file('src/main/resources/version.properties')
     def props = new Properties()
@@ -128,7 +160,7 @@ jar {
         attributes 'Implementation-Title': 'Stirling-PDF',
                    'Implementation-Version': project.version
     }
-    
+
 }
 
 tasks.named('test') {

chart/stirling-pdf/Chart.yaml

@@ -0,0 +1,15 @@
+apiVersion: v2
+appVersion: 0.14.2
+description: locally hosted web application that allows you to perform various operations on PDF files
+home: https://github.com/Frooodle/Stirling-PDF
+keywords:
+- stirling-pdf
+- helm
+- charts repo
+maintainers:
+- name: Frooodle
+  url: https://github.com/Frooodle/Stirling-PDF
+name: stirling-pdf-chart
+sources:
+- https://github.com/Frooodle/Stirling-PDF
+version: 1.0.0

chart/stirling-pdf/templates/NOTES.txt

@@ -0,0 +1,30 @@
+** Please be patient while the chart is being deployed **
+
+Get the stirlingpdf URL by running:
+
+{{- if contains "NodePort" .Values.service.type }}
+
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "stirlingpdf.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT/
+
+{{- else if contains "LoadBalancer" .Values.service.type }}
+
+** Please ensure an external IP is associated to the {{ template "stirlingpdf.fullname" . }} service before proceeding **
+** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "stirlingpdf.fullname" . }} **
+
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "stirlingpdf.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  echo http://$SERVICE_IP:{{ .Values.service.externalPort }}/
+
+OR
+
+  export SERVICE_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "stirlingpdf.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].hostname}')
+  echo http://$SERVICE_HOST:{{ .Values.service.externalPort }}/
+
+{{- else if contains "ClusterIP"  .Values.service.type }}
+
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "stirlingpdf.name" . }}" -l "release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo http://127.0.0.1:8080/
+  kubectl port-forward $POD_NAME 8080:8080 --namespace {{ .Release.Namespace }}
+
+{{- end }}

chart/stirling-pdf/templates/_helpers.tpl

@@ -0,0 +1,129 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "stirlingpdf.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "stirlingpdf.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{- /*
+Create chart name and version as used by the chart label.
+
+It does minimal escaping for use in Kubernetes labels.
+
+Example output:
+
+stirlingpdf-0.4.5
+*/ -}}
+{{- define "stirlingpdf.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "stirlingpdf.labels" -}}
+helm.sh/chart: {{ include "stirlingpdf.chart" . }}
+{{ include "stirlingpdf.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+{{- if .Values.commonLabels}}
+{{ toYaml .Values.commonLabels }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "stirlingpdf.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "stirlingpdf.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "stirlingpdf.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "stirlingpdf.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
+
+{{/*
+Return the proper image name to change the volume permissions
+*/}}
+{{- define "stirlingpdf.volumePermissions.image" -}}
+{{- $registryName := .Values.volumePermissions.image.registry -}}
+{{- $repositoryName := .Values.volumePermissions.image.repository -}}
+{{- $tag := .Values.volumePermissions.image.tag | toString -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 doesn't support it, so we need to implement this if-else logic.
+Also, we can't use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+    {{- if .Values.global.imageRegistry }}
+        {{- printf "%s/%s:%s" .Values.global.imageRegistry $repositoryName $tag -}}
+    {{- else -}}
+        {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+    {{- end -}}
+{{- else -}}
+    {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper Docker Image Registry Secret Names
+*/}}
+{{- define "stirlingpdf.imagePullSecrets" -}}
+{{/*
+Helm 2.11 supports the assignment of a value to a variable defined in a different scope,
+but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic.
+Also, we can not use a single if because lazy evaluation is not an option
+*/}}
+{{- if .Values.global }}
+{{- if .Values.global.imagePullSecrets }}
+imagePullSecrets:
+{{- range .Values.global.imagePullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- else if or .Values.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.volumePermissions.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- else if or .Values.image.pullSecrets .Values.volumePermissions.image.pullSecrets }}
+imagePullSecrets:
+{{- range .Values.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- range .Values.volumePermissions.image.pullSecrets }}
+  - name: {{ . }}
+{{- end }}
+{{- end -}}
+{{- end -}}

chart/stirling-pdf/templates/deployment.yaml

@@ -0,0 +1,129 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "stirlingpdf.fullname" . }}
+  {{- with .Values.deployment.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+    {{- if .Values.deployment.labels }}
+    {{- toYaml .Values.deployment.labels | nindent 4 }}
+    {{- end }}
+spec:
+  selector:
+    matchLabels:
+      {{- include "stirlingpdf.selectorLabels" . | nindent 6 }}
+  replicas: {{ .Values.replicaCount }}
+  strategy:
+{{ toYaml .Values.strategy | indent 4 }}
+  revisionHistoryLimit: 10
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "stirlingpdf.selectorLabels" . | nindent 8 }}
+        {{- if .Values.podLabels }}
+        {{- toYaml .Values.podLabels | nindent 8 }}
+        {{- end }}
+    spec:
+      {{- if .Values.priorityClassName }}
+      priorityClassName: "{{ .Values.priorityClassName }}"
+      {{- end }}
+      {{- if .Values.securityContext.enabled }}
+      securityContext:
+        fsGroup: {{ .Values.securityContext.fsGroup }}
+        {{- if .Values.securityContext.runAsNonRoot }}
+        runAsNonRoot: {{ .Values.securityContext.runAsNonRoot }}
+        {{- end }}
+        {{- if .Values.securityContext.supplementalGroups }}
+        supplementalGroups: {{ .Values.securityContext.supplementalGroups }}
+        {{- end }}
+      {{- else if .Values.persistence.enabled }}
+      initContainers:
+      - name: volume-permissions
+        image: {{ template "stirlingpdf.volumePermissions.image" . }}
+        imagePullPolicy: "{{ .Values.volumePermissions.image.pullPolicy }}"
+        securityContext:
+          {{- toYaml .Values.containerSecurityContext | nindent 10 }}
+        command: ['sh', '-c', 'chown -R {{ .Values.securityContext.fsGroup }}:{{ .Values.securityContext.fsGroup }} {{ .Values.persistence.path }}']
+        volumeMounts:
+        - mountPath: {{ .Values.persistence.path }}
+          name: storage-volume
+      {{- end }}
+{{- include "stirlingpdf.imagePullSecrets" . | indent 6 }}
+      containers:
+      - name: {{ .Chart.Name }}
+        image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        securityContext:
+          {{- toYaml .Values.containerSecurityContext | nindent 10 }}
+{{- if .Values.envs }}
+        env:
+{{ toYaml .Values.envs | indent 8 }}
+{{- end }}
+{{- if .Values.extraArgs }}
+        args:
+{{ toYaml .Values.extraArgs | indent 8 }}
+{{- end }}
+        ports:
+        - name: http
+          containerPort: 8080
+        livenessProbe:
+          httpGet:
+            path: /
+            port: http
+{{ toYaml .Values.probes.livenessHttpGetConfig | indent 12 }}
+{{ toYaml .Values.probes.liveness | indent 10 }}
+        readinessProbe:
+          httpGet:
+            path: /
+            port: http
+{{ toYaml .Values.probes.readinessHttpGetConfig | indent 12 }}
+{{ toYaml .Values.probes.readiness | indent 10 }}
+        volumeMounts:
+{{- if .Values.deployment.extraVolumeMounts }}
+        {{- toYaml .Values.deployment.extraVolumeMounts | nindent 8 }}
+{{- end }}
+{{- if .Values.deployment.sidecarContainers }}
+{{- range $name, $spec :=  .Values.deployment.sidecarContainers }}
+      - name: {{ $name }}
+{{- toYaml $spec | nindent 8 }}
+{{- end }}
+{{- end }}
+      {{- with .Values.resources }}
+        resources:
+{{ toYaml . | indent 10 }}
+      {{- end }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- if .Values.schedulerName }}
+      schedulerName: {{ .Values.schedulerName }}
+    {{- end }}
+      serviceAccountName: {{ include "stirlingpdf.serviceAccountName" . }}
+      automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
+      volumes:
+      {{- if .Values.deployment.extraVolumes }}
+      {{- toYaml .Values.deployment.extraVolumes | nindent 6 }}
+      {{- end }}
+      - name: storage-volume
+      {{- if .Values.persistence.enabled }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.persistence.existingClaim | default (include "stirlingpdf.fullname" .) }}
+      {{- else }}
+        emptyDir: {}
+      {{- end }}

chart/stirling-pdf/templates/ingress.yaml

@@ -0,0 +1,85 @@
+{{- if .Values.ingress.enabled }}
+{{- $servicePort := .Values.service.externalPort -}}
+{{- $serviceName := include "stirlingpdf.fullname" . -}}
+{{- $ingressExtraPaths := .Values.ingress.extraPaths -}}
+---
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: extensions/v1beta1
+{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: networking.k8s.io/v1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ include "stirlingpdf.fullname" . }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+    {{- with .Values.ingress.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- with .Values.ingress.ingressClassName }}
+  ingressClassName: {{ . }}
+  {{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+  - host: {{ .name }}
+    http:
+      paths:
+      {{- range $ingressExtraPaths }}
+      - path: {{ default "/" .path | quote }}
+        backend:
+        {{- if semverCompare "<1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+          {{- if $.Values.service.servicename }}
+          serviceName: {{ $.Values.service.servicename }}
+          {{- else }}
+          serviceName: {{ default $serviceName .service }}
+          {{- end }}
+          servicePort: {{ default $servicePort .port }}
+        {{- else }}
+          service:
+            {{- if $.Values.service.servicename }}
+            name: {{ $.Values.service.servicename }}
+            {{- else }}
+            name: {{ default $serviceName .service }}
+            {{- end }}
+            port:
+              number: {{ default $servicePort .port }}
+        pathType: {{ default $.Values.ingress.pathType .pathType }}
+        {{- end }}
+      {{- end }}
+      - path: {{ default "/" .path | quote }}
+        backend:
+        {{- if semverCompare "<1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+          {{- if $.Values.service.servicename }}
+          serviceName: {{ $.Values.service.servicename }}
+          {{- else }}
+          serviceName: {{ default $serviceName .service }}
+          {{- end }}
+          servicePort: {{ default $servicePort .servicePort }}
+        {{- else }}
+          service:
+            {{- if $.Values.service.servicename }}
+            name: {{ $.Values.service.servicename }}
+            {{- else }}
+            name: {{ default $serviceName .service }}
+            {{- end }}
+            port:
+              number: {{ default $servicePort .port }}
+        pathType: {{ $.Values.ingress.pathType }}
+        {{- end }}
+  {{- end }}
+  tls:
+  {{- range .Values.ingress.hosts }}
+  {{- if .tls }}
+  - hosts:
+    - {{ .name }}
+    secretName: {{ .tlsSecret }}
+  {{- end }}
+  {{- end }}
+{{- end -}}

chart/stirling-pdf/templates/pv.yaml

@@ -0,0 +1,16 @@
+{{- if .Values.persistence.pv.enabled -}}
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: {{ .Values.persistence.pv.pvname | default (include "stirlingpdf.fullname" .) }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+spec:
+  capacity:
+    storage: {{ .Values.persistence.pv.capacity.storage }}
+  accessModes:
+    - {{ .Values.persistence.pv.accessMode | quote }}
+  nfs:
+    server: {{ .Values.persistence.pv.nfs.server }}
+    path: {{ .Values.persistence.pv.nfs.path | quote }}
+{{- end }}

chart/stirling-pdf/templates/pvc.yaml

@@ -0,0 +1,27 @@
+{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ include "stirlingpdf.fullname" . }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+    {{- with .Values.persistence.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  accessModes:
+    - {{ .Values.persistence.accessMode | quote }}
+  resources:
+    requests:
+      storage: {{ .Values.persistence.size | quote }}
+{{- if .Values.persistence.storageClass }}
+{{- if (eq "-" .Values.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.storageClass }}"
+{{- end }}
+{{- if .Values.persistence.volumeName }}
+  volumeName: "{{ .Values.persistence.volumeName }}"
+{{- end }}
+{{- end }}
+{{- end }}

chart/stirling-pdf/templates/service.yaml

@@ -0,0 +1,48 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.service.servicename | default (include "stirlingpdf.fullname" .) }}
+  {{- with .Values.service.annotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+    {{- with .Values.service.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  {{- if (or (eq .Values.service.type "LoadBalancer") (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort)))) }}
+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
+  {{- end }}
+  {{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerIP) }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- if (and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges) }}
+  loadBalancerSourceRanges:
+  {{- with .Values.service.loadBalancerSourceRanges }}
+{{ toYaml . | indent 2 }}
+  {{- end }}
+  {{- end }}
+  {{- if eq .Values.service.type "ClusterIP" }}
+  {{- if .Values.service.clusterIP }}
+  clusterIP: {{ .Values.service.clusterIP }}
+  {{- end }}
+  {{- end }}
+  ports:
+  - port: {{ .Values.service.externalPort }}
+{{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
+    nodePort: {{.Values.service.nodePort}}
+{{- end }}
+{{- if .Values.service.targetPort }}
+    targetPort: {{ .Values.service.targetPort }}
+    name: {{ .Values.service.targetPort }}
+{{- else }}
+    targetPort: http
+    name: http
+{{- end }}
+    protocol: TCP
+    
+  selector:
+    {{- include "stirlingpdf.selectorLabels" . | nindent 4 }}

chart/stirling-pdf/templates/serviceaccount.yaml

@@ -0,0 +1,13 @@
+{{- if .Values.serviceAccount.create -}}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "stirlingpdf.serviceAccountName" . }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{ toYaml . | nindent 4 }}
+  {{- end }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+{{- end }}

chart/stirling-pdf/templates/servicemonitor.yaml

@@ -0,0 +1,31 @@
+{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.serviceMonitor.enabled ) }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ include "stirlingpdf.fullname" . }}
+  namespace: {{ .Values.serviceMonitor.namespace | default .Release.Namespace }}
+  labels:
+    {{- include "stirlingpdf.labels" . | nindent 4 }}
+    {{- with .Values.serviceMonitor.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  endpoints:
+  - targetPort: 8080
+{{- if .Values.serviceMonitor.interval }}
+    interval: {{ .Values.serviceMonitor.interval }}
+{{- end }}
+{{- if .Values.serviceMonitor.metricsPath }}
+    path: {{ .Values.serviceMonitor.metricsPath }}
+{{- end }}
+{{- if .Values.serviceMonitor.timeout }}
+    scrapeTimeout: {{ .Values.serviceMonitor.timeout }}
+{{- end }}
+  jobLabel: {{ include "stirlingpdf.fullname" . }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+      {{- include "stirlingpdf.selectorLabels" . | nindent 6 }}
+{{- end }}

chart/stirling-pdf/values.yaml

@@ -0,0 +1,239 @@
+extraArgs: []
+  # - --storage-timestamp-tolerance 1s
+replicaCount: 1
+strategy:
+  type: RollingUpdate
+image:
+  repository: frooodle/s-pdf
+  # took Chart appVersion by default
+  tag: ~
+  pullPolicy: IfNotPresent
+secret:
+  labels: {}
+## Labels to apply to all resources
+##
+commonLabels: {}
+# team_name: dev
+
+envs: []
+# - name: PP_HOME_NAME
+#   value: "Stirling PDF"
+# - name: APP_HOME_DESCRIPTION
+#   value: "Your locally hosted one-stop-shop for all your PDF needs."
+# - name: APP_NAVBAR_NAME
+#   value: "Stirling PDF"
+# - name: ALLOW_GOOGLE_VISIBILITY
+#   value: "true"
+# - name: APP_ROOT_PATH
+#   value: "/"
+# - name: APP_LOCALE
+#   value: "en_GB"
+
+deployment:
+  ## stirling-pdf Deployment annotations
+  annotations: {}
+  #   name: value
+  labels: {}
+  #   name: value
+  # additional volumes
+  extraVolumes: []
+  #  - name: nginx-config
+  #    secret:
+  #      secretName: nginx-config
+  # additional volumes to mount
+  extraVolumeMounts: []
+  ## sidecarContainers for the stirling-pdf
+  # Can be used to add a proxy to the pod that does
+  # scanning for secrets, signing, authentication, validation
+  # of the chart's content, send notifications...
+  sidecarContainers: {}
+  ## Example sidecarContainer which uses an extraVolume from above and
+  ## a named port that can be referenced in the service as targetPort.
+  #  proxy:
+  #    image: nginx:latest
+  #    ports:
+  #      - name: proxy
+  #        containerPort: 8081
+  #    volumeMounts:
+  #      - name: nginx-config
+  #        readOnly: true
+  #        mountPath: /etc/nginx
+
+## Pod annotations
+## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+## Read more about kube2iam to provide access to s3 https://github.com/jtblin/kube2iam
+##
+podAnnotations: {}
+  # iam.amazonaws.com/role: role-arn
+
+## Pod labels
+## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
+podLabels: {}
+  # name: value
+
+service:
+  servicename:
+  type: ClusterIP
+  externalTrafficPolicy: Local
+  ## Uses pre-assigned IP address from cloud provider
+  ## Only valid if service.type: LoadBalancer
+  loadBalancerIP:
+  ## Limits which cidr blocks can connect to service's load balancer
+  ## Only valid if service.type: LoadBalancer
+  loadBalancerSourceRanges: []
+  # clusterIP: None
+  externalPort: 8080
+  ## targetPort of the container to use. If a sidecar should handle the
+  ## requests first, use the named port from the sidecar. See sidecar example
+  ## from deployment above. Leave empty to use stirling-pdf directly.
+  targetPort:
+  nodePort:
+  annotations: {}
+  labels: {}
+
+serviceMonitor:
+  enabled: false
+  # namespace: prometheus
+  labels: {}
+  metricsPath: "/metrics"
+  # timeout: 60
+  # interval: 60
+
+resources: {}
+#  limits:
+#    cpu: 100m
+#    memory: 128Mi
+#  requests:
+#    cpu: 80m
+#    memory: 64Mi
+
+probes:
+  liveness:
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+  livenessHttpGetConfig:
+    scheme: HTTP
+  readiness:
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+  readinessHttpGetConfig:
+    scheme: HTTP
+
+serviceAccount:
+  create: true
+  name: ""
+  automountServiceAccountToken: false
+  ## Annotations for the Service Account
+  annotations: {}
+
+# UID/GID 1000 is the default user "stirling-pdf" used in
+# the container image starting in v0.8.0 and above. This
+# is required for local persistent storage. If your cluster
+# does not allow this, try setting securityContext: {}
+securityContext:
+  enabled: true
+  fsGroup: 1000
+  ## Optionally, specify supplementalGroups and/or
+  ## runAsNonRoot for security purposes
+  # runAsNonRoot: true
+  # supplementalGroups: [1000]
+
+containerSecurityContext: {}
+
+priorityClassName: ""
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+persistence:
+  enabled: false
+  accessMode: ReadWriteOnce
+  size: 8Gi
+  labels: {}
+    # name: value
+  path: /tmp
+  ## A manually managed Persistent Volume and Claim
+  ## Requires persistence.enabled: true
+  ## If defined, PVC must be created manually before volume will be bound
+  # existingClaim:
+
+  ## stirling-pdf data Persistent Volume Storage Class
+  ## If defined, storageClassName: <storageClass>
+  ## If set to "-", storageClassName: "", which disables dynamic provisioning
+  ## If undefined (the default) or set to null, no storageClassName spec is
+  ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+  ##   GKE, AWS & OpenStack)
+  ##
+  # storageClass: "-"
+  # volumeName:
+  pv:
+    enabled: false
+    pvname:
+    capacity:
+      storage: 8Gi
+    accessMode: ReadWriteOnce
+    nfs:
+      server:
+      path:
+
+## Init containers parameters:
+## volumePermissions: Change the owner of the persistent volume mountpoint to RunAsUser:fsGroup
+##
+volumePermissions:
+  image:
+    registry: docker.io
+    repository: bitnami/minideb
+    tag: buster
+    pullPolicy: Always
+    ## Optionally specify an array of imagePullSecrets.
+    ## Secrets must be manually created in the namespace.
+    ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+    ##
+    # pullSecrets:
+    #   - myRegistryKeySecretName
+
+## Ingress for load balancer
+ingress:
+  enabled: false
+  pathType: "ImplementationSpecific"
+  ## stirling-pdf Ingress labels
+  ##
+  labels: {}
+    # dns: "route53"
+
+  ## stirling-pdf Ingress annotations
+  ##
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+
+  ## stirling-pdf Ingress hostnames
+  ## Must be provided if Ingress is enabled
+  ##
+  hosts: []
+    # - name: stirling-pdf.domain1.com
+    #   path: /
+    #   tls: false
+    # - name: stirling-pdf.domain2.com
+    #   path: /
+    #
+    #   ## Set this to true in order to enable TLS on the ingress record
+    #   tls: true
+    #
+    #   ## If TLS is set to true, you must declare what secret will store the key/certificate for TLS
+    #   ## Secrets must be added manually to the namespace
+    #   tlsSecret: stirling-pdf.domain2-tls
+
+  # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName
+  # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress
+  ingressClassName:
+

pipeline/defaultWebUIConfigs/Prepare-pdfs-for-email.json

@@ -0,0 +1,39 @@
+{
+  "name": "Prepare-pdfs-for-email",
+  "pipeline": [
+    {
+      "operation": "/api/v1/misc/repair",
+      "parameters": {}
+    },
+    {
+      "operation": "/api/v1/security/sanitize-pdf",
+      "parameters": {
+        "removeJavaScript": true,
+        "removeEmbeddedFiles": false,
+        "removeMetadata": false,
+        "removeLinks": false,
+        "removeFonts": false
+      }
+    },
+    {
+      "operation": "/api/v1/misc/compress-pdf",
+      "parameters": {
+        "optimizeLevel": 2,
+        "expectedOutputSize": ""
+      }
+    },
+    {
+      "operation": "/api/v1/general/split-by-size-or-count",
+      "parameters": {
+        "splitType": 0,
+        "splitValue": "15MB"
+      }
+    }
+  ],
+  "_examples": {
+    "outputDir": "{outputFolder}/{folderName}",
+    "outputFileName": "{filename}-{pipelineName}-{date}-{time}"
+  },
+  "outputDir": "httpWebRequest",
+  "outputFileName": "{filename}"
+}

pipeline/defaultWebUIConfigs/split-rotate-auto-rename.json

@@ -0,0 +1,33 @@
+{
+  "name": "split-rotate-auto-rename",
+  "pipeline": [
+    {
+      "operation": "/api/v1/general/split-pdf-by-sections",
+      "parameters": {
+        "horizontalDivisions": 2,
+        "verticalDivisions": 2,
+        "fileInput": "automated"
+      }
+    },
+    {
+      "operation": "/api/v1/general/rotate-pdf",
+      "parameters": {
+        "angle": 90,
+        "fileInput": "automated"
+      }
+    },
+    {
+      "operation": "/api/v1/misc/auto-rename",
+      "parameters": {
+        "useFirstTextAsFallback": false,
+        "fileInput": "automated"
+      }
+    }
+  ],
+  "_examples": {
+    "outputDir": "{outputFolder}/{folderName}",
+    "outputFileName": "{filename}-{pipelineName}-{date}-{time}"
+  },
+  "outputDir": "{outputFolder}",
+  "outputFileName": "{filename}"
+}

scripts/detect-blank-pages.py

@@ -1,11 +1,11 @@
 import cv2
-import numpy as np
 import sys
 import argparse
+import numpy as np
 
 def is_blank_image(image_path, threshold=10, white_percent=99, white_value=255, blur_size=5):
     image = cv2.imread(image_path, cv2.IMREAD_GRAYSCALE)
-    
+
     if image is None:
         print(f"Error: Unable to read the image file: {image_path}")
         return False
@@ -16,19 +16,11 @@ def is_blank_image(image_path, threshold=10, white_percent=99, white_value=255,
     _, thresholded_image = cv2.threshold(blurred_image, white_value - threshold, white_value, cv2.THRESH_BINARY)
 
     # Calculate the percentage of white pixels in the thresholded image
-    white_pixels = 0
-    total_pixels = thresholded_image.size
-    for i in range(0, thresholded_image.shape[0], 2):
-        for j in range(0, thresholded_image.shape[1], 2):
-            if thresholded_image[i, j] == white_value:
-                white_pixels += 1
-            white_pixel_percentage = (white_pixels / (i * thresholded_image.shape[1] + j + 1)) * 100
-            if white_pixel_percentage < white_percent:
-                return False
+    white_pixels = np.sum(thresholded_image == white_value)
+    white_pixel_percentage = (white_pixels / thresholded_image.size) * 100
 
     print(f"Page has white pixel percent of {white_pixel_percentage}")
-    return True
-
+    return white_pixel_percentage >= white_percent
 
 
 if __name__ == "__main__":
@@ -40,9 +32,6 @@ if __name__ == "__main__":
 
     blank = is_blank_image(args.image_path, args.threshold, args.white_percent)
 
-    if blank:
-        # Return code 1: The image is considered blank.
-        sys.exit(1)
-    else:
-        # Return code 0: The image is not considered blank.
-        sys.exit(0)
+    # Return code 1: The image is considered blank.
+    # Return code 0: The image is not considered blank.
+    sys.exit(int(blank))

scripts/download-security-jar.sh

@@ -0,0 +1,19 @@
+echo "Running Stirling PDF with DOCKER_ENABLE_SECURITY=${DOCKER_ENABLE_SECURITY} and VERSION_TAG=${VERSION_TAG}"
+# Check for DOCKER_ENABLE_SECURITY and download the appropriate JAR if required
+if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
+    if [ ! -f app-security.jar ]; then
+    	echo "Trying to download from: https://github.com/Frooodle/Stirling-PDF/releases/download/v$VERSION_TAG/Stirling-PDF-with-login.jar"
+        curl -L -o app-security.jar https://github.com/Frooodle/Stirling-PDF/releases/download/v$VERSION_TAG/Stirling-PDF-with-login.jar
+       
+        # If the first download attempt failed, try with the 'v' prefix
+        if [ $? -ne 0 ]; then
+            echo "Trying to download from: https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar"
+        	curl -L -o app-security.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar
+        fi
+
+        if [ $? -eq 0 ]; then  # checks if curl was successful
+            rm -f app.jar
+            ln -s app-security.jar app.jar
+        fi
+    fi
+fi

scripts/init-without-ocr.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+/scripts/download-security-jar.sh
+
+# Run the main command
+exec "$@"

scripts/init.sh

@@ -3,7 +3,11 @@
 # Copy the original tesseract-ocr files to the volume directory without overwriting existing files
 echo "Copying original files without overwriting existing files"
 mkdir -p /usr/share/tesseract-ocr
-cp -rn /usr/share/tesseract-ocr-original/* /usr/share/tesseract-ocr
+cp -rn /usr/share/tesseract-ocr-original/* /usr/share/tesseract-ocr 
+
+if [ -d /usr/share/tesseract-ocr/4.00/tessdata ]; then 
+	cp -r /usr/share/tesseract-ocr/4.00/tessdata/* /usr/share/tesseract-ocr/5/tessdata/ || true; 
+fi
 
 # Check if TESSERACT_LANGS environment variable is set and is not empty
 if [[ -n "$TESSERACT_LANGS" ]]; then
@@ -16,25 +20,7 @@ if [[ -n "$TESSERACT_LANGS" ]]; then
   done
 fi
 
-# Check for DOCKER_ENABLE_SECURITY and download the appropriate JAR if required
-if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
-    if [ ! -f app-security.jar ]; then
-    	echo "Trying to download from: https://github.com/Frooodle/Stirling-PDF/releases/download/v$VERSION_TAG/Stirling-PDF-with-login.jar"
-        curl -L -o app-security.jar https://github.com/Frooodle/Stirling-PDF/releases/download/v$VERSION_TAG/Stirling-PDF-with-login.jar
-       
-        # If the first download attempt failed, try with the 'v' prefix
-        if [ $? -ne 0 ]; then
-            echo "Trying to download from: https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar"
-        	curl -L -o app-security.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar
-        fi
-
-        if [ $? -eq 0 ]; then  # checks if curl was successful
-            rm -f app.jar
-            ln -s app-security.jar app.jar
-        fi
-    fi
-fi
-
+/scripts/download-security-jar.sh
 
 # Run the main command
 exec "$@"

src/main/java/stirling/software/SPDF/SPdfApplication.java

@@ -8,13 +8,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 import jakarta.annotation.PostConstruct;
 import stirling.software.SPDF.config.ConfigInitializer;
 import stirling.software.SPDF.utils.GeneralUtils;
 @SpringBootApplication
 
-//@EnableScheduling
+@EnableScheduling
 public class SPdfApplication {
 	
 	@Autowired

src/main/java/stirling/software/SPDF/config/AppConfig.java

@@ -8,6 +8,7 @@ import stirling.software.SPDF.model.ApplicationProperties;
 @Configuration
 public class AppConfig {
 
+    
     @Autowired
     ApplicationProperties applicationProperties;
     
@@ -40,12 +41,16 @@ public class AppConfig {
         return (defaultNavBar != null) ? defaultNavBar : "Stirling PDF";
     }
 	
+    @Bean(name = "enableAlphaFunctionality")
+    public boolean enableAlphaFunctionality() { 
+        return applicationProperties.getSystem().getEnableAlphaFunctionality() != null ? applicationProperties.getSystem().getEnableAlphaFunctionality() : false;
+    }
+    
 	@Bean(name = "rateLimit")
     public boolean rateLimit() {
         String appName = System.getProperty("rateLimit");
         if (appName == null) 
             appName = System.getenv("rateLimit");
-        System.out.println("rateLimit=" + appName);
         return (appName != null) ? Boolean.valueOf(appName) : false;
     }
 	

src/main/java/stirling/software/SPDF/config/ConfigInitializer.java

@@ -12,6 +12,8 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import org.springframework.context.ApplicationContextInitializer;
@@ -19,83 +21,109 @@ import org.springframework.context.ConfigurableApplicationContext;
 
 public class ConfigInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
-    @Override
-    public void initialize(ConfigurableApplicationContext applicationContext) {
-        try {
-            ensureConfigExists();
-        } catch (IOException e) {
-            throw new RuntimeException("Failed to initialize application configuration", e);
-        }
-    }
+	@Override
+	public void initialize(ConfigurableApplicationContext applicationContext) {
+		try {
+			ensureConfigExists();
+		} catch (IOException e) {
+			throw new RuntimeException("Failed to initialize application configuration", e);
+		}
+	}
 
-    public void ensureConfigExists() throws IOException {
-        // Define the path to the external config directory
-        Path destPath = Paths.get("configs", "settings.yml");
+	public void ensureConfigExists() throws IOException {
+		// Define the path to the external config directory
+		Path destPath = Paths.get("configs", "settings.yml");
 
-        // Check if the file already exists
-        if (Files.notExists(destPath)) {
-            // Ensure the destination directory exists
-            Files.createDirectories(destPath.getParent());
+		// Check if the file already exists
+		if (Files.notExists(destPath)) {
+			// Ensure the destination directory exists
+			Files.createDirectories(destPath.getParent());
 
-            // Copy the resource from classpath to the external directory
-            try (InputStream in = getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
-                if (in != null) {
-                    Files.copy(in, destPath);
-                } else {
-                    throw new FileNotFoundException("Resource file not found: settings.yml.template");
-                }
-            }
-        } else {
-            // If user file exists, we need to merge it with the template from the classpath
-            List<String> templateLines;
-            try (InputStream in = getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
-                templateLines = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8)).lines().collect(Collectors.toList());
-            }
+			// Copy the resource from classpath to the external directory
+			try (InputStream in = getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
+				if (in != null) {
+					Files.copy(in, destPath);
+				} else {
+					throw new FileNotFoundException("Resource file not found: settings.yml.template");
+				}
+			}
+		} else {
+			// If user file exists, we need to merge it with the template from the classpath
+			List<String> templateLines;
+			try (InputStream in = getClass().getClassLoader().getResourceAsStream("settings.yml.template")) {
+				templateLines = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8)).lines()
+						.collect(Collectors.toList());
+			}
 
-            mergeYamlFiles(templateLines, destPath, destPath);
-        }
-    }
+			mergeYamlFiles(templateLines, destPath, destPath);
+		}
+	}
 
-    public void mergeYamlFiles(List<String> templateLines, Path userFilePath, Path outputPath) throws IOException {
-        List<String> userLines = Files.readAllLines(userFilePath);
+	public void mergeYamlFiles(List<String> templateLines, Path userFilePath, Path outputPath) throws IOException {
+		List<String> userLines = Files.readAllLines(userFilePath);
+		List<String> mergedLines = new ArrayList<>();
+		boolean insideAutoGenerated = false;
+		boolean beforeFirstKey = true;
 
-        List<String> mergedLines = new ArrayList<>();
-        boolean insideAutoGenerated = false;
+		Function<String, Boolean> isCommented = line -> line.trim().startsWith("#");
+		Function<String, String> extractKey = line -> {
+			String[] parts = line.split(":");
+			return parts.length > 0 ? parts[0].trim().replace("#", "").trim() : "";
+		};
 
-        for (String line : templateLines) {
-            // Check if we've entered or left the AutomaticallyGenerated section
-            if (line.trim().equalsIgnoreCase("AutomaticallyGenerated:")) {
-                insideAutoGenerated = true;
-                mergedLines.add(line);
-                continue;
-            } else if (insideAutoGenerated && line.trim().isEmpty()) {
-                // We have reached the end of the AutomaticallyGenerated section
-                insideAutoGenerated = false;
-                mergedLines.add(line);
-                continue;
-            }
+		Set<String> userKeys = userLines.stream().map(extractKey).collect(Collectors.toSet());
 
-            if (insideAutoGenerated) {
-                // Add lines from user's settings if we are inside AutomaticallyGenerated
-                Optional<String> userAutoGenValue = userLines.stream().filter(l -> l.trim().startsWith(line.split(":")[0].trim())).findFirst();
-                if (userAutoGenValue.isPresent()) {
-                    mergedLines.add(userAutoGenValue.get());
-                    continue;
-                }
-            } else {
-                // Outside of AutomaticallyGenerated, continue as before
-                if (line.contains(": ")) {
-                    String key = line.split(": ")[0].trim();
-                    Optional<String> userValue = userLines.stream().filter(l -> l.trim().startsWith(key)).findFirst();
-                    if (userValue.isPresent()) {
-                        mergedLines.add(userValue.get());
-                        continue;
-                    }
-                }
-                mergedLines.add(line);
-            }
-        }
+		for (String line : templateLines) {
+			String key = extractKey.apply(line);
+
+			if (line.trim().equalsIgnoreCase("AutomaticallyGenerated:")) {
+				insideAutoGenerated = true;
+				mergedLines.add(line);
+				continue;
+			} else if (insideAutoGenerated && line.trim().isEmpty()) {
+				insideAutoGenerated = false;
+				mergedLines.add(line);
+				continue;
+			}
+
+			if (beforeFirstKey && (isCommented.apply(line) || line.trim().isEmpty())) {
+				// Handle top comments and empty lines before the first key.
+				mergedLines.add(line);
+				continue;
+			}
+
+			if (!key.isEmpty())
+				beforeFirstKey = false;
+
+			if (userKeys.contains(key)) {
+				// If user has any version (commented or uncommented) of this key, skip the
+				// template line
+				Optional<String> userValue = userLines.stream()
+						.filter(l -> extractKey.apply(l).equalsIgnoreCase(key) && !isCommented.apply(l)).findFirst();
+				if (userValue.isPresent())
+					mergedLines.add(userValue.get());
+				continue;
+			}
+
+			if (isCommented.apply(line) || line.trim().isEmpty() || !userKeys.contains(key)) {
+				mergedLines.add(line); // If line is commented, empty or key not present in user's file, retain the
+										// template line
+				continue;
+			}
+		}
+
+		// Add any additional uncommented user lines that are not present in the
+		// template
+		for (String userLine : userLines) {
+			String userKey = extractKey.apply(userLine);
+			boolean isPresentInTemplate = templateLines.stream().map(extractKey)
+					.anyMatch(templateKey -> templateKey.equalsIgnoreCase(userKey));
+			if (!isPresentInTemplate && !isCommented.apply(userLine)) {
+				mergedLines.add(userLine);
+			}
+		}
+
+		Files.write(outputPath, mergedLines, StandardCharsets.UTF_8);
+	}
 
-        Files.write(outputPath, mergedLines, StandardCharsets.UTF_8);
-    }
 }

src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java

@@ -81,6 +81,10 @@ public class EndpointConfiguration {
         addEndpointToGroup("PageOps", "auto-split-pdf");
         addEndpointToGroup("PageOps", "extract-page");
         addEndpointToGroup("PageOps", "pdf-to-single-page");
+        addEndpointToGroup("PageOps", "split-by-size-or-count");
+        addEndpointToGroup("PageOps", "overlay-pdf");
+        addEndpointToGroup("PageOps", "split-pdf-by-sections");
+        
         
         // Adding endpoints to "Convert" group
         addEndpointToGroup("Convert", "pdf-to-img");
@@ -96,6 +100,8 @@ public class EndpointConfiguration {
         addEndpointToGroup("Convert", "html-to-pdf");
         addEndpointToGroup("Convert", "url-to-pdf");
         addEndpointToGroup("Convert", "markdown-to-pdf");
+        addEndpointToGroup("Convert", "pdf-to-csv");
+        
         
         // Adding endpoints to "Security" group
         addEndpointToGroup("Security", "add-password");
@@ -104,6 +110,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Security", "add-watermark");
         addEndpointToGroup("Security", "cert-sign");
         addEndpointToGroup("Security", "sanitize-pdf");
+        addEndpointToGroup("Security", "auto-redact");
         
         
         // Adding endpoints to "Other" group
@@ -117,6 +124,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Other", "flatten");
         addEndpointToGroup("Other", "repair");
         addEndpointToGroup("Other", "remove-blanks");
+        addEndpointToGroup("Other", "remove-annotations");
         addEndpointToGroup("Other", "compare");
         addEndpointToGroup("Other", "add-page-numbers");
         addEndpointToGroup("Other", "auto-rename");
@@ -197,6 +205,11 @@ public class EndpointConfiguration {
         addEndpointToGroup("Java", "pdf-to-single-page");
         addEndpointToGroup("Java", "markdown-to-pdf");
         addEndpointToGroup("Java", "show-javascript");
+        addEndpointToGroup("Java", "auto-redact");
+        addEndpointToGroup("Java", "pdf-to-csv");
+        addEndpointToGroup("Java", "split-by-size-or-count");
+        addEndpointToGroup("Java", "overlay-pdf");
+        addEndpointToGroup("Java", "split-pdf-by-sections");
         
         //Javascript
         addEndpointToGroup("Javascript", "pdf-organizer");

src/main/java/stirling/software/SPDF/config/MetricsFilter.java

@@ -16,33 +16,35 @@ import jakarta.servlet.http.HttpServletResponse;
 @Component
 public class MetricsFilter extends OncePerRequestFilter {
 
-    private final MeterRegistry meterRegistry;
+	private final MeterRegistry meterRegistry;
 
-    @Autowired
-    public MetricsFilter(MeterRegistry meterRegistry) {
-        this.meterRegistry = meterRegistry;
-    }
+	@Autowired
+	public MetricsFilter(MeterRegistry meterRegistry) {
+		this.meterRegistry = meterRegistry;
+	}
 
-    @Override
-    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
-            throws ServletException, IOException {
-        String uri = request.getRequestURI();
-        
-        //System.out.println("uri="+uri + ", method=" + request.getMethod() );
-        // Ignore static resources
-        if (!(uri.startsWith("/js") || uri.startsWith("api-docs") || uri.endsWith("robots.txt") || uri.startsWith("/images") || uri.endsWith(".png") || uri.endsWith(".ico") || uri.endsWith(".css") || uri.endsWith(".svg")|| uri.endsWith(".js") || uri.contains("swagger") || uri.startsWith("/api"))) {
-            Counter counter = Counter.builder("http.requests")
-                    .tag("uri", uri)
-                    .tag("method", request.getMethod())
-                    .register(meterRegistry);
+	@Override
+	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+			throws ServletException, IOException {
+		String uri = request.getRequestURI();
 
-            counter.increment();
-            //System.out.println("Counted");
-        }
+		// System.out.println("uri="+uri + ", method=" + request.getMethod() );
+		// Ignore static resources
+		if (!(uri.startsWith("/js") || uri.startsWith("/v1/api-docs") || uri.endsWith("robots.txt")
+				|| uri.startsWith("/images")  || uri.startsWith("/images")|| uri.endsWith(".png") || uri.endsWith(".ico") || uri.endsWith(".css") || uri.endsWith(".map")
+				|| uri.endsWith(".svg") || uri.endsWith(".js") || uri.contains("swagger")
+				|| uri.startsWith("/api/v1/info") || uri.startsWith("/site.webmanifest")  || uri.startsWith("/fonts") || uri.startsWith("/pdfjs") )) {
+			
+			
+			
+			Counter counter = Counter.builder("http.requests").tag("uri", uri).tag("method", request.getMethod())
+					.register(meterRegistry);
 
-        filterChain.doFilter(request, response);
-    }
+			counter.increment();
+			// System.out.println("Counted");
+		}
 
-    
+		filterChain.doFilter(request, response);
+	}
 
 }

src/main/java/stirling/software/SPDF/config/OpenApiConfig.java

@@ -1,27 +1,42 @@
 package stirling.software.SPDF.config;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
 public class OpenApiConfig {
 
+	@Autowired
+	ApplicationProperties applicationProperties;
+
 	@Bean
 	public OpenAPI customOpenAPI() {
-	    String version = getClass().getPackage().getImplementationVersion();
-	    if (version == null) {
-	        
-	            version = "1.0.0"; // default version if all else fails
-	        
-	    }
+		String version = getClass().getPackage().getImplementationVersion();
+		if (version == null) {
+			version = "1.0.0"; // default version if all else fails
+		}
+
+		SecurityScheme apiKeyScheme = new SecurityScheme().type(SecurityScheme.Type.APIKEY).in(SecurityScheme.In.HEADER)
+				.name("X-API-KEY");
+		if (!applicationProperties.getSecurity().getEnableLogin()) {
+			return new OpenAPI().components(new Components())
+					.info(new Info().title("Stirling PDF API").version(version).description(
+							"API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."));
+		} else {
+			return new OpenAPI().components(new Components().addSecuritySchemes("apiKey", apiKeyScheme))
+					.info(new Info().title("Stirling PDF API").version(version).description(
+							"API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."))
+					.addSecurityItem(new SecurityRequirement().addList("apiKey"));
+		}
 
-	    return new OpenAPI().components(new Components()).info(
-	            new Info().title("Stirling PDF API").version(version).description("API documentation for all Server-Side processing.\nPlease note some functionality might be UI only and missing from here."));
 	}
 
-
-}
+}

src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationFailureHandler.java

@@ -2,25 +2,46 @@ package stirling.software.SPDF.config.security;
 
 import java.io.IOException;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler;
+import org.springframework.stereotype.Component;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
+@Component
 public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler {
+	
+	@Autowired
+	private final LoginAttemptService loginAttemptService;
 
+    @Autowired
+    public CustomAuthenticationFailureHandler(LoginAttemptService loginAttemptService) {
+        this.loginAttemptService = loginAttemptService;
+    }
+	
     @Override
     public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) 
       throws IOException, ServletException {
-        if (exception.getClass().isAssignableFrom(BadCredentialsException.class)) {
-        	setDefaultFailureUrl("/login?error=badcredentials");
-        } else if (exception.getClass().isAssignableFrom(LockedException.class)) {
+    	String ip = request.getRemoteAddr();
+        logger.error("Failed login attempt from IP: " + ip);
+        
+        String username = request.getParameter("username");
+        if(loginAttemptService.loginAttemptCheck(username)) {
         	setDefaultFailureUrl("/login?error=locked");
+        	
+        } else {
+	        if (exception.getClass().isAssignableFrom(BadCredentialsException.class)) {
+	        	setDefaultFailureUrl("/login?error=badcredentials");
+	        } else if (exception.getClass().isAssignableFrom(LockedException.class)) {
+	        	setDefaultFailureUrl("/login?error=locked");
+	        }
         }
+        
+        
         super.onAuthenticationFailure(request, response, exception);
     }
 }

src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationSuccessHandler.java

@@ -0,0 +1,44 @@
+package stirling.software.SPDF.config.security;
+
+import java.io.IOException;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+import org.springframework.security.web.savedrequest.SavedRequest;
+import org.springframework.stereotype.Component;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import stirling.software.SPDF.utils.RequestUriUtils;
+
+@Component
+public class CustomAuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler {
+
+    @Autowired
+    private LoginAttemptService loginAttemptService;
+
+    @Override
+    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws ServletException, IOException {
+    	String username = request.getParameter("username");
+        loginAttemptService.loginSucceeded(username);
+        
+        
+        // Get the saved request
+        HttpSession session = request.getSession(false);
+        SavedRequest savedRequest = session != null ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST") : null;
+        if (savedRequest != null && !RequestUriUtils.isStaticResource(savedRequest.getRedirectUrl())) {
+            // Redirect to the original destination
+            super.onAuthenticationSuccess(request, response, authentication);
+        } else {
+            // Redirect to the root URL (considering context path)
+            getRedirectStrategy().sendRedirect(request, response, "/");
+        }
+        
+        //super.onAuthenticationSuccess(request, response, authentication);
+    }
+
+    
+}

src/main/java/stirling/software/SPDF/config/security/CustomUserDetailsService.java

@@ -5,6 +5,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.LockedException;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -22,12 +23,18 @@ public class CustomUserDetailsService implements UserDetailsService {
     @Autowired
     private UserRepository userRepository;
 
-   
+    @Autowired
+    private LoginAttemptService loginAttemptService;
+    
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         User user = userRepository.findByUsername(username)
             .orElseThrow(() -> new UsernameNotFoundException("No user found with username: " + username));
 
+        if (loginAttemptService.isBlocked(username)) {
+            throw new LockedException("Your account has been locked due to too many failed login attempts.");
+        }
+        
         return new org.springframework.security.core.userdetails.User(
             user.getUsername(),
             user.getPassword(),

src/main/java/stirling/software/SPDF/config/security/FirstLoginFilter.java

@@ -15,6 +15,7 @@ import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import stirling.software.SPDF.model.User;
+import stirling.software.SPDF.utils.RequestUriUtils;
 
 @Component
 public class FirstLoginFilter extends OncePerRequestFilter {
@@ -28,11 +29,7 @@ public class FirstLoginFilter extends OncePerRequestFilter {
     	String method = request.getMethod();
     	String requestURI = request.getRequestURI(); 
     	 // Check if the request is for static resources
-        boolean isStaticResource = requestURI.startsWith("/css/") 
-                                || requestURI.startsWith("/js/")
-                                || requestURI.startsWith("/images/")
-                                || requestURI.startsWith("/public/")
-                                || requestURI.endsWith(".svg");
+        boolean isStaticResource = RequestUriUtils.isStaticResource(requestURI);
 
         // If it's a static resource, just continue the filter chain and skip the logic below
         if (isStaticResource) {

src/main/java/stirling/software/SPDF/config/security/IPRateLimitingFilter.java

@@ -0,0 +1,65 @@
+package stirling.software.SPDF.config.security;
+import java.io.IOException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import stirling.software.SPDF.utils.RequestUriUtils;
+
+public class IPRateLimitingFilter implements Filter {
+
+    private final ConcurrentHashMap<String, AtomicInteger> requestCounts = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<String, AtomicInteger> getCounts = new ConcurrentHashMap<>();
+    private final int maxRequests;
+    private final int maxGetRequests;
+    
+    public IPRateLimitingFilter(int maxRequests, int maxGetRequests) {
+        this.maxRequests = maxRequests;
+        this.maxGetRequests = maxGetRequests;
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+    	if (request instanceof HttpServletRequest) {
+	    	HttpServletRequest httpRequest = (HttpServletRequest) request;
+	        String method = httpRequest.getMethod();
+	        String requestURI = httpRequest.getRequestURI(); 
+	    	 // Check if the request is for static resources
+	        boolean isStaticResource = RequestUriUtils.isStaticResource(requestURI);
+
+	        // If it's a static resource, just continue the filter chain and skip the logic below
+	        if (isStaticResource) {
+	        	chain.doFilter(request, response);
+	            return;
+	        }
+	        
+	        String clientIp = request.getRemoteAddr();
+	        requestCounts.computeIfAbsent(clientIp, k -> new AtomicInteger(0));
+	        if (!"GET".equalsIgnoreCase(method)) {
+	        	
+		        if (requestCounts.get(clientIp).incrementAndGet() > maxRequests) {
+		            // Handle limit exceeded (e.g., send error response)
+		            response.getWriter().write("Rate limit exceeded");
+		            return;
+		        }
+	        } else {
+	        	if (requestCounts.get(clientIp).incrementAndGet() > maxGetRequests) {
+		            // Handle limit exceeded (e.g., send error response)
+		            response.getWriter().write("GET Rate limit exceeded");
+		            return;
+		        }
+	        }
+    	}
+    	 chain.doFilter(request, response);
+    }
+    
+    public void resetRequestCounts() {
+        requestCounts.clear();
+        getCounts.clear();
+    }
+}

src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java

@@ -26,12 +26,21 @@ public class InitialSecuritySetup {
 	@PostConstruct
 	public void init() {
 		if (!userService.hasUsers()) {
-			String initialUsername = "admin";
-			String initialPassword = "stirling";
-			userService.saveUser(initialUsername, initialPassword, Role.ADMIN.getRoleId(), true);
 			
 			
-	        
+			String initialUsername = applicationProperties.getSecurity().getInitialLogin().getUsername();
+			String initialPassword = applicationProperties.getSecurity().getInitialLogin().getPassword();
+			if (initialUsername != null && initialPassword != null) {
+				userService.saveUser(initialUsername, initialPassword, Role.ADMIN.getRoleId());
+			} else {
+				initialUsername = "admin";
+			    initialPassword = "stirling";
+				userService.saveUser(initialUsername, initialPassword, Role.ADMIN.getRoleId(), true);
+			}
+		}
+		if(!userService.usernameExists(Role.INTERNAL_API_USER.getRoleId())) {
+			userService.saveUser(Role.INTERNAL_API_USER.getRoleId(), UUID.randomUUID().toString(), Role.INTERNAL_API_USER.getRoleId());
+			userService.addApiKeyToUser(Role.INTERNAL_API_USER.getRoleId());
 		}
 	}
 

src/main/java/stirling/software/SPDF/config/security/LoginAttemptService.java

@@ -0,0 +1,56 @@
+package stirling.software.SPDF.config.security;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import jakarta.annotation.PostConstruct;
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.AttemptCounter;
+
+@Service
+public class LoginAttemptService {
+
+	
+	@Autowired
+	ApplicationProperties applicationProperties;
+	
+    private int MAX_ATTEMPTS;
+    private long ATTEMPT_INCREMENT_TIME;
+    
+    
+    @PostConstruct
+    public void init() {
+    	MAX_ATTEMPTS = applicationProperties.getSecurity().getLoginAttemptCount();
+    	ATTEMPT_INCREMENT_TIME = TimeUnit.MINUTES.toMillis(applicationProperties.getSecurity().getLoginResetTimeMinutes());
+    }
+    
+    private final ConcurrentHashMap<String, AttemptCounter> attemptsCache = new ConcurrentHashMap<>();
+
+    public void loginSucceeded(String key) {
+        attemptsCache.remove(key);
+    }
+
+    public boolean loginAttemptCheck(String key) {
+        attemptsCache.compute(key, (k, attemptCounter) -> {
+            if (attemptCounter == null || attemptCounter.shouldReset(ATTEMPT_INCREMENT_TIME)) {
+                return new AttemptCounter();
+            } else {
+                attemptCounter.increment();
+                return attemptCounter;
+            }
+        });
+        return attemptsCache.get(key).getAttemptCount() >= MAX_ATTEMPTS;
+    }
+
+
+    public boolean isBlocked(String key) {
+        AttemptCounter attemptCounter = attemptsCache.get(key);
+        if (attemptCounter != null) {
+            return attemptCounter.getAttemptCount() >= MAX_ATTEMPTS;
+        }
+        return false;
+    }
+
+}

src/main/java/stirling/software/SPDF/config/security/RateLimitResetScheduler.java

@@ -0,0 +1,18 @@
+package stirling.software.SPDF.config.security;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RateLimitResetScheduler {
+
+    private final IPRateLimitingFilter rateLimitingFilter;
+
+    public RateLimitResetScheduler(IPRateLimitingFilter rateLimitingFilter) {
+        this.rateLimitingFilter = rateLimitingFilter;
+    }
+
+    @Scheduled(cron = "0 0 0 * * MON") // At 00:00 every Monday TODO: configurable 
+    public void resetRateLimit() {
+        rateLimitingFilter.resetRequestCounts();
+    }
+}

src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java

@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -15,12 +15,13 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
+import org.springframework.security.web.savedrequest.NullRequestCache;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 @Configuration
 @EnableWebSecurity()
-@EnableGlobalMethodSecurity(prePostEnabled = true)
+@EnableMethodSecurity
 public class SecurityConfiguration {
 
     @Autowired
@@ -40,6 +41,11 @@ public class SecurityConfiguration {
     
     @Autowired
     private UserAuthenticationFilter userAuthenticationFilter;
+
+
+
+    @Autowired
+    private  LoginAttemptService loginAttemptService;
     
     @Autowired
     private FirstLoginFilter firstLoginFilter;
@@ -51,14 +57,18 @@ public class SecurityConfiguration {
     	if(loginEnabledValue) {
     		
     		http.csrf(csrf -> csrf.disable());
+    		http.addFilterBefore(rateLimitingFilter(), UsernamePasswordAuthenticationFilter.class);
     		http.addFilterAfter(firstLoginFilter, UsernamePasswordAuthenticationFilter.class);
 	        http
 	            .formLogin(formLogin -> formLogin
 	                .loginPage("/login")
+	                .successHandler(new CustomAuthenticationSuccessHandler())
 	                .defaultSuccessUrl("/")
-	                .failureHandler(new CustomAuthenticationFailureHandler())
+	                .failureHandler(new CustomAuthenticationFailureHandler(loginAttemptService))
 	                .permitAll()
-	            )
+	            ).requestCache(requestCache -> requestCache
+	                    .requestCache(new NullRequestCache())
+	            	    )
 	            .logout(logout -> logout
 	            		.logoutRequestMatcher(new AntPathRequestMatcher("/logout"))
 	                    .logoutSuccessUrl("/login?logout=true")
@@ -70,8 +80,19 @@ public class SecurityConfiguration {
                     .tokenValiditySeconds(1209600) // 2 weeks
                 )
 	            .authorizeHttpRequests(authz -> authz
-	                    .requestMatchers(req -> req.getRequestURI().startsWith("/login") || req.getRequestURI().endsWith(".svg") || req.getRequestURI().startsWith("/register") || req.getRequestURI().startsWith("/error") || req.getRequestURI().startsWith("/images/") ||  req.getRequestURI().startsWith("/public/") || req.getRequestURI().startsWith("/css/") || req.getRequestURI().startsWith("/js/"))
-	                    .permitAll()
+	                    .requestMatchers(req ->  {
+	                        String uri = req.getRequestURI();
+	                        String contextPath = req.getContextPath();
+
+	                        // Remove the context path from the URI
+	                        String trimmedUri = uri.startsWith(contextPath) ? uri.substring(contextPath.length()) : uri;
+
+	                        return trimmedUri.startsWith("/login") || trimmedUri.endsWith(".svg") || 
+	                               trimmedUri.startsWith("/register") || trimmedUri.startsWith("/error") || 
+	                               trimmedUri.startsWith("/images/") || trimmedUri.startsWith("/public/") || 
+	                               trimmedUri.startsWith("/css/") || trimmedUri.startsWith("/js/");
+	                    }
+	                    ).permitAll()
 	                    .anyRequest().authenticated()
 	                )
 	            .userDetailsService(userDetailsService)
@@ -84,8 +105,17 @@ public class SecurityConfiguration {
     	}
         return http.build();
     }
+    
+    
 
+    
+    @Bean
+    public IPRateLimitingFilter rateLimitingFilter() {
+        int maxRequestsPerIp = 1000000; // Example limit TODO add config level
+        return new IPRateLimitingFilter(maxRequestsPerIp, maxRequestsPerIp);
+    }
 
+ 
     
     @Bean
     public DaoAuthenticationProvider authenticationProvider() {

src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java

@@ -74,15 +74,17 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
         // If we still don't have any authentication, deny the request
         if (authentication == null || !authentication.isAuthenticated()) {
         	String method = request.getMethod();
-        	if ("GET".equalsIgnoreCase(method) && !"/login".equals(requestURI)) {
-        		 response.sendRedirect("/login");  // redirect to the login page
+        	String contextPath = request.getContextPath();
+        	
+        	if ("GET".equalsIgnoreCase(method) && !  (contextPath + "/login").equals(requestURI)) {
+        		 response.sendRedirect(contextPath + "/login");  // redirect to the login page
         	     return;
             } else {
 	            response.setStatus(HttpStatus.UNAUTHORIZED.value());
 	            response.getWriter().write("Authentication required. Please provide a X-API-KEY in request header.\nThis is found in Settings -> Account Settings -> API Key\nAlternativly you can disable authentication if this is unexpected");
 	            return;
             }
-        }
+        } 
 
         filterChain.doFilter(request, response);
     }
@@ -90,15 +92,17 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
     @Override
     protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
         String uri = request.getRequestURI();
-
+        String contextPath = request.getContextPath();
         String[] permitAllPatterns = {
-            "/login",
-            "/register",
-            "/error",
-            "/images/",
-            "/public/",
-            "/css/",
-            "/js/"
+        		contextPath + "/login",
+        		contextPath + "/register",
+        		contextPath + "/error",
+        		contextPath + "/images/",
+        		contextPath + "/public/",
+        		contextPath + "/css/",
+        		contextPath + "/js/",
+        		contextPath +  "/pdfjs/",
+        		contextPath +  "/site.webmanifest"
         };
 
         for (String pattern : permitAllPatterns) {

src/main/java/stirling/software/SPDF/config/security/UserService.java

@@ -16,11 +16,13 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
+import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
 import stirling.software.SPDF.model.Authority;
+import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.UserRepository;
 @Service
-public class UserService {
+public class UserService  implements UserServiceInterface{
     
     @Autowired
     private UserRepository userRepository;
@@ -136,6 +138,11 @@ public class UserService {
     public void deleteUser(String username) {
     	 Optional<User> userOpt = userRepository.findByUsername(username);
          if (userOpt.isPresent()) {
+        	 for (Authority authority : userOpt.get().getAuthorities()) {
+	             if (authority.getAuthority().equals(Role.INTERNAL_API_USER.getRoleId())) {
+	                 return;
+	             }
+	         }
         	 userRepository.delete(userOpt.get());
          }
     }

src/main/java/stirling/software/SPDF/controller/api/MergeController.java

@@ -1,15 +1,9 @@
 package stirling.software.SPDF.controller.api;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.pdfbox.io.MemoryUsageSetting;
+import org.apache.pdfbox.multipdf.PDFMergerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.slf4j.Logger;
@@ -20,12 +14,19 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.model.api.general.MergePdfsRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/v1/general")
 @Tag(name = "General", description = "General APIs")
@@ -34,82 +35,80 @@ public class MergeController {
     private static final Logger logger = LoggerFactory.getLogger(MergeController.class);
 
 
-private PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
-	PDDocument mergedDoc = new PDDocument();
-    for (PDDocument doc : documents) {
-        for (PDPage page : doc.getPages()) {
-            mergedDoc.addPage(page);
-        }
-    }
-    return mergedDoc;
-}
-
-private Comparator<MultipartFile> getSortComparator(String sortType) {
-    switch (sortType) {
-        case "byFileName":
-            return Comparator.comparing(MultipartFile::getOriginalFilename);
-        case "byDateModified":
-            return (file1, file2) -> {
-                try {
-                    BasicFileAttributes attr1 = Files.readAttributes(Paths.get(file1.getOriginalFilename()), BasicFileAttributes.class);
-                    BasicFileAttributes attr2 = Files.readAttributes(Paths.get(file2.getOriginalFilename()), BasicFileAttributes.class);
-                    return attr1.lastModifiedTime().compareTo(attr2.lastModifiedTime());
-                } catch (IOException e) {
-                    return 0;  // If there's an error, treat them as equal
-                }
-            };
-        case "byDateCreated":
-            return (file1, file2) -> {
-                try {
-                    BasicFileAttributes attr1 = Files.readAttributes(Paths.get(file1.getOriginalFilename()), BasicFileAttributes.class);
-                    BasicFileAttributes attr2 = Files.readAttributes(Paths.get(file2.getOriginalFilename()), BasicFileAttributes.class);
-                    return attr1.creationTime().compareTo(attr2.creationTime());
-                } catch (IOException e) {
-                    return 0;  // If there's an error, treat them as equal
-                }
-            };
-        case "byPDFTitle":
-            return (file1, file2) -> {
-                try (PDDocument doc1 = PDDocument.load(file1.getInputStream());
-                     PDDocument doc2 = PDDocument.load(file2.getInputStream())) {
-                    String title1 = doc1.getDocumentInformation().getTitle();
-                    String title2 = doc2.getDocumentInformation().getTitle();
-                    return title1.compareTo(title2);
-                } catch (IOException e) {
-                    return 0;
-                }
-            };
-        case "orderProvided":
-        default:
-            return (file1, file2) -> 0;  // Default is the order provided
-    }
-}
-
-@PostMapping(consumes = "multipart/form-data", value = "/merge-pdfs")
-@Operation(summary = "Merge multiple PDF files into one",
-        description = "This endpoint merges multiple PDF files into a single PDF file. The merged file will contain all pages from the input files in the order they were provided. Input:PDF Output:PDF Type:MISO")
-public ResponseEntity<byte[]> mergePdfs(@ModelAttribute MergePdfsRequest form) throws IOException {
-
-	MultipartFile[]  files = form.getFileInput();
-    Arrays.sort(files, getSortComparator(form.getSortType()));
-
-    List<PDDocument> documents = new ArrayList<>();
-    for (MultipartFile file : files) {
-        try (InputStream is = file.getInputStream()) {
-            documents.add(PDDocument.load(is));
-        }
-    }
-
-    try (PDDocument mergedDoc = mergeDocuments(documents)) {
-        ResponseEntity<byte[]> response = WebResponseUtils.pdfDocToWebResponse(mergedDoc, files[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_merged.pdf");
-        return response;
-    } finally {
+    private PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
+        PDDocument mergedDoc = new PDDocument();
         for (PDDocument doc : documents) {
-            if (doc != null) {
-                doc.close();
+            for (PDPage page : doc.getPages()) {
+                mergedDoc.addPage(page);
             }
         }
+        return mergedDoc;
+    }
+
+    private Comparator<MultipartFile> getSortComparator(String sortType) {
+        switch (sortType) {
+            case "byFileName":
+                return Comparator.comparing(MultipartFile::getOriginalFilename);
+            case "byDateModified":
+                return (file1, file2) -> {
+                    try {
+                        BasicFileAttributes attr1 = Files.readAttributes(Paths.get(file1.getOriginalFilename()), BasicFileAttributes.class);
+                        BasicFileAttributes attr2 = Files.readAttributes(Paths.get(file2.getOriginalFilename()), BasicFileAttributes.class);
+                        return attr1.lastModifiedTime().compareTo(attr2.lastModifiedTime());
+                    } catch (IOException e) {
+                        return 0;  // If there's an error, treat them as equal
+                    }
+                };
+            case "byDateCreated":
+                return (file1, file2) -> {
+                    try {
+                        BasicFileAttributes attr1 = Files.readAttributes(Paths.get(file1.getOriginalFilename()), BasicFileAttributes.class);
+                        BasicFileAttributes attr2 = Files.readAttributes(Paths.get(file2.getOriginalFilename()), BasicFileAttributes.class);
+                        return attr1.creationTime().compareTo(attr2.creationTime());
+                    } catch (IOException e) {
+                        return 0;  // If there's an error, treat them as equal
+                    }
+                };
+            case "byPDFTitle":
+                return (file1, file2) -> {
+                    try (PDDocument doc1 = PDDocument.load(file1.getInputStream());
+                         PDDocument doc2 = PDDocument.load(file2.getInputStream())) {
+                        String title1 = doc1.getDocumentInformation().getTitle();
+                        String title2 = doc2.getDocumentInformation().getTitle();
+                        return title1.compareTo(title2);
+                    } catch (IOException e) {
+                        return 0;
+                    }
+                };
+            case "orderProvided":
+            default:
+                return (file1, file2) -> 0;  // Default is the order provided
+        }
+    }
+
+    @PostMapping(consumes = "multipart/form-data", value = "/merge-pdfs")
+    @Operation(summary = "Merge multiple PDF files into one",
+            description = "This endpoint merges multiple PDF files into a single PDF file. The merged file will contain all pages from the input files in the order they were provided. Input:PDF Output:PDF Type:MISO")
+    public ResponseEntity<byte[]> mergePdfs(@ModelAttribute MergePdfsRequest form) throws IOException {
+        try {
+            MultipartFile[] files = form.getFileInput();
+            Arrays.sort(files, getSortComparator(form.getSortType()));
+
+            PDFMergerUtility mergedDoc = new PDFMergerUtility();
+            ByteArrayOutputStream docOutputstream = new ByteArrayOutputStream();
+
+            for (MultipartFile file : files) {
+                mergedDoc.addSource(new ByteArrayInputStream(file.getBytes()));
+            }
+
+            mergedDoc.setDestinationFileName(files[0].getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_merged.pdf");
+            mergedDoc.setDestinationStream(docOutputstream);
+            mergedDoc.mergeDocuments(MemoryUsageSetting.setupMainMemoryOnly());
+
+            return WebResponseUtils.bytesToWebResponse(docOutputstream.toByteArray(), mergedDoc.getDestinationFileName());
+        } catch (Exception ex) {
+            logger.error("Error in merge pdf process", ex);
+           throw ex;
+        }
     }
 }
-
-}

src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java

@@ -1,6 +1,7 @@
 package stirling.software.SPDF.controller.api;
 
 
+import java.awt.Color;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
@@ -42,7 +43,8 @@ public class MultiPageLayoutController {
 
 	    int pagesPerSheet = request.getPagesPerSheet();
 	    MultipartFile file = request.getFileInput();
-
+	    boolean addBorder = request.isAddBorder();
+	    
 	    if (pagesPerSheet != 2 && pagesPerSheet != 3 && pagesPerSheet != (int) Math.sqrt(pagesPerSheet) * Math.sqrt(pagesPerSheet)) {
 	        throw new IllegalArgumentException("pagesPerSheet must be 2, 3 or a perfect square");
 	    }
@@ -62,6 +64,10 @@ public class MultiPageLayoutController {
 	    PDPageContentStream contentStream = new PDPageContentStream(newDocument, newPage, PDPageContentStream.AppendMode.APPEND, true, true);
 	    LayerUtility layerUtility = new LayerUtility(newDocument);
 
+	    float borderThickness = 1.5f; // Specify border thickness as required
+	    contentStream.setLineWidth(borderThickness);
+	    contentStream.setStrokingColor(Color.BLACK);
+	    
 	    for (int i = 0; i < totalPages; i++) {
 	        if (i != 0 && i % pagesPerSheet == 0) {
 	            // Close the current content stream and create a new page and content stream
@@ -92,6 +98,14 @@ public class MultiPageLayoutController {
 	        contentStream.drawForm(formXObject);
 
 	        contentStream.restoreGraphicsState();
+	        
+	        if(addBorder) {
+		        // Draw border around each page
+		        float borderX = colIndex * cellWidth;
+		        float borderY = newPage.getMediaBox().getHeight() - (rowIndex + 1) * cellHeight;
+		        contentStream.addRect(borderX, borderY, cellWidth, cellHeight);
+		        contentStream.stroke();
+	        }
 	    }
 
 

src/main/java/stirling/software/SPDF/controller/api/PdfOverlayController.java

@@ -0,0 +1,173 @@
+package stirling.software.SPDF.controller.api;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ArrayList;
+import org.apache.pdfbox.multipdf.Overlay;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.general.OverlayPdfsRequest;
+import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.SPDF.utils.WebResponseUtils;
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
+public class PdfOverlayController {
+
+	@PostMapping(value = "/overlay-pdfs", consumes = "multipart/form-data")
+    @Operation(summary = "Overlay PDF files in various modes", description = "Overlay PDF files onto a base PDF with different modes: Sequential, Interleaved, or Fixed Repeat. Input:PDF Output:PDF Type:MIMO")
+    public ResponseEntity<byte[]> overlayPdfs(@ModelAttribute OverlayPdfsRequest request) throws IOException {
+        MultipartFile baseFile = request.getFileInput();
+        int overlayPos = request.getOverlayPosition();
+        
+        MultipartFile[] overlayFiles = request.getOverlayFiles();
+        File[] overlayPdfFiles = new File[overlayFiles.length];
+        List<File> tempFiles = new ArrayList<>(); // List to keep track of temporary files
+
+        try { 
+            for (int i = 0; i < overlayFiles.length; i++) {
+                overlayPdfFiles[i] = GeneralUtils.multipartToFile(overlayFiles[i]);
+            }
+            
+            String mode = request.getOverlayMode(); // "SequentialOverlay", "InterleavedOverlay", "FixedRepeatOverlay"
+            int[] counts = request.getCounts(); // Used for FixedRepeatOverlay mode
+
+            try (PDDocument basePdf = PDDocument.load(baseFile.getInputStream());
+                    Overlay overlay = new Overlay()) {
+                Map<Integer, String> overlayGuide = prepareOverlayGuide(basePdf.getNumberOfPages(), overlayPdfFiles, mode, counts, tempFiles);
+                
+                overlay.setInputPDF(basePdf);
+                if (overlayPos == 0) {
+                    overlay.setOverlayPosition(Overlay.Position.FOREGROUND);
+                } else {
+                    overlay.setOverlayPosition(Overlay.Position.BACKGROUND);
+                }
+
+                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+                overlay.overlay(overlayGuide).save(outputStream);
+                byte[] data = outputStream.toByteArray();
+                String outputFilename = baseFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_overlayed.pdf";  // Remove file extension and append .pdf
+                
+                return WebResponseUtils.bytesToWebResponse(data, outputFilename, MediaType.APPLICATION_PDF);
+            } 
+        } finally {
+            for (File overlayPdfFile : overlayPdfFiles) {
+                if (overlayPdfFile != null) {
+                    overlayPdfFile.delete();
+                }
+            }
+            for (File tempFile : tempFiles) { // Delete temporary files
+                if (tempFile != null) {
+                    tempFile.delete();
+                }
+            }
+        }
+    }
+
+    private Map<Integer, String> prepareOverlayGuide(int basePageCount, File[] overlayFiles, String mode, int[] counts, List<File> tempFiles) throws IOException {
+        Map<Integer, String> overlayGuide = new HashMap<>();
+        switch (mode) {
+            case "SequentialOverlay":
+                sequentialOverlay(overlayGuide, overlayFiles, basePageCount, tempFiles);
+                break;
+            case "InterleavedOverlay":
+                interleavedOverlay(overlayGuide, overlayFiles, basePageCount);
+                break;
+            case "FixedRepeatOverlay":
+                fixedRepeatOverlay(overlayGuide, overlayFiles, counts, basePageCount);
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid overlay mode");
+        }
+        return overlayGuide;
+    }
+
+    private void sequentialOverlay(Map<Integer, String> overlayGuide, File[] overlayFiles, int basePageCount, List<File> tempFiles) throws IOException {
+        int overlayFileIndex = 0;
+        int pageCountInCurrentOverlay = 0;
+
+        for (int basePageIndex = 1; basePageIndex <= basePageCount; basePageIndex++) {
+            if (pageCountInCurrentOverlay == 0 || pageCountInCurrentOverlay >= getNumberOfPages(overlayFiles[overlayFileIndex])) {
+                pageCountInCurrentOverlay = 0;
+                overlayFileIndex = (overlayFileIndex + 1) % overlayFiles.length;
+            }
+
+            try (PDDocument overlayPdf = PDDocument.load(overlayFiles[overlayFileIndex])) {
+                PDDocument singlePageDocument = new PDDocument();
+                singlePageDocument.addPage(overlayPdf.getPage(pageCountInCurrentOverlay));
+                File tempFile = File.createTempFile("overlay-page-", ".pdf");
+                singlePageDocument.save(tempFile);
+                singlePageDocument.close();
+
+                overlayGuide.put(basePageIndex, tempFile.getAbsolutePath());
+                tempFiles.add(tempFile); // Keep track of the temporary file for cleanup
+            }
+
+            pageCountInCurrentOverlay++;
+        }
+    }
+
+    private int getNumberOfPages(File file) throws IOException {
+        try (PDDocument doc = PDDocument.load(file)) {
+            return doc.getNumberOfPages();
+        }
+    }
+
+
+
+
+
+
+
+    private void interleavedOverlay(Map<Integer, String> overlayGuide, File[] overlayFiles, int basePageCount) throws IOException {
+        for (int basePageIndex = 1; basePageIndex <= basePageCount; basePageIndex++) {
+            File overlayFile = overlayFiles[(basePageIndex - 1) % overlayFiles.length];
+
+            // Load the overlay document to check its page count
+            try (PDDocument overlayPdf = PDDocument.load(overlayFile)) {
+                int overlayPageCount = overlayPdf.getNumberOfPages();
+                if ((basePageIndex - 1) % overlayPageCount < overlayPageCount) {
+                    overlayGuide.put(basePageIndex, overlayFile.getAbsolutePath());
+                }
+            }
+        }
+    }
+
+
+    private void fixedRepeatOverlay(Map<Integer, String> overlayGuide, File[] overlayFiles, int[] counts, int basePageCount) throws IOException {
+        if (overlayFiles.length != counts.length) {
+            throw new IllegalArgumentException("Counts array length must match the number of overlay files");
+        }
+        int currentPage = 1;
+        for (int i = 0; i < overlayFiles.length; i++) {
+            File overlayFile = overlayFiles[i];
+            int repeatCount = counts[i];
+
+            // Load the overlay document to check its page count
+            try (PDDocument overlayPdf = PDDocument.load(overlayFile)) {
+                int overlayPageCount = overlayPdf.getNumberOfPages();
+                for (int j = 0; j < repeatCount; j++) {
+                    for (int page = 0; page < overlayPageCount; page++) {
+                        if (currentPage > basePageCount) break;
+                        overlayGuide.put(currentPage++, overlayFile.getAbsolutePath());
+                    }
+                }
+            }
+        }
+    }
+
+}
+
+// Additional classes like OverlayPdfsRequest, WebResponseUtils, etc. are assumed to be defined elsewhere.

src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java

@@ -12,15 +12,13 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.model.SortTypes;
+import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.model.api.general.RearrangePagesRequest;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
@@ -33,11 +31,12 @@ public class RearrangePagesPDFController {
 
 	@PostMapping(consumes = "multipart/form-data", value = "/remove-pages")
 	@Operation(summary = "Remove pages from a PDF file", description = "This endpoint removes specified pages from a given PDF file. Users can provide a comma-separated list of page numbers or ranges to delete. Input:PDF Output:PDF Type:SISO")
-	public ResponseEntity<byte[]> deletePages(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file from which pages will be removed") MultipartFile pdfFile,
-			@RequestParam("pagesToDelete") @Parameter(description = "Comma-separated list of pages or page ranges to delete, e.g., '1,3,5-8'") String pagesToDelete)
+	public ResponseEntity<byte[]> deletePages(@ModelAttribute PDFWithPageNums request )
 			throws IOException {
 
+		MultipartFile pdfFile = request.getFileInput();
+		String pagesToDelete = request.getPageNumbers();
+		
 		PDDocument document = PDDocument.load(pdfFile.getBytes());
 
 		// Split the page order string into an array of page numbers or range of numbers

src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java

@@ -108,4 +108,4 @@ public class SplitPDFController {
         
     }
 
-}
+}

src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java

@@ -0,0 +1,135 @@
+package stirling.software.SPDF.controller.api;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.pdfbox.multipdf.LayerUtility;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.apache.pdfbox.util.Matrix;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.SplitPdfBySectionsRequest;
+import stirling.software.SPDF.utils.WebResponseUtils;
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
+public class SplitPdfBySectionsController {
+
+
+	@PostMapping(value = "/split-pdf-by-sections", consumes = "multipart/form-data")
+    @Operation(summary = "Split PDF pages into smaller sections", description = "Split each page of a PDF into smaller sections based on the user's choice (halves, thirds, quarters, etc.), both vertically and horizontally. Input:PDF Output:ZIP-PDF Type:SISO")
+    public ResponseEntity<byte[]> splitPdf(@ModelAttribute SplitPdfBySectionsRequest request) throws Exception {
+        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
+
+        MultipartFile file = request.getFileInput();
+        PDDocument sourceDocument = PDDocument.load(file.getInputStream());
+
+        // Process the PDF based on split parameters
+        int horiz = request.getHorizontalDivisions() + 1;
+        int verti = request.getVerticalDivisions() + 1;
+
+        List<PDDocument> splitDocuments = splitPdfPages(sourceDocument, verti, horiz);
+        for (PDDocument doc : splitDocuments) {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            doc.save(baos);
+            doc.close();
+            splitDocumentsBoas.add(baos);
+        }
+
+        sourceDocument.close();
+
+        Path zipFile = Files.createTempFile("split_documents", ".zip");
+        String filename = file.getOriginalFilename().replaceFirst("[.][^.]+$", "");
+        byte[] data;
+
+
+        
+        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
+            int pageNum = 1;
+            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
+                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
+                int sectionNum = (i % (horiz * verti)) + 1;
+                String fileName = filename + "_" + pageNum + "_" + sectionNum + ".pdf";
+                byte[] pdf = baos.toByteArray();
+                ZipEntry pdfEntry = new ZipEntry(fileName);
+                zipOut.putNextEntry(pdfEntry);
+                zipOut.write(pdf);
+                zipOut.closeEntry();
+
+                if (sectionNum == horiz * verti) pageNum++;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            data = Files.readAllBytes(zipFile);
+            Files.delete(zipFile);
+        }
+
+        return WebResponseUtils.bytesToWebResponse(data, filename + "_split.zip", MediaType.APPLICATION_OCTET_STREAM);
+    }
+    
+    public List<PDDocument> splitPdfPages(PDDocument document, int horizontalDivisions, int verticalDivisions) throws IOException {
+        List<PDDocument> splitDocuments = new ArrayList<>();
+
+        for (PDPage originalPage : document.getPages()) {
+            PDRectangle originalMediaBox = originalPage.getMediaBox();
+            float width = originalMediaBox.getWidth();
+            float height = originalMediaBox.getHeight();
+            float subPageWidth = width / horizontalDivisions;
+            float subPageHeight = height / verticalDivisions;
+
+            LayerUtility layerUtility = new LayerUtility(document);
+
+            for (int i = 0; i < horizontalDivisions; i++) {
+                for (int j = 0; j < verticalDivisions; j++) {
+                    PDDocument subDoc = new PDDocument();
+                    PDPage subPage = new PDPage(new PDRectangle(subPageWidth, subPageHeight));
+                    subDoc.addPage(subPage);
+
+                    PDFormXObject form = layerUtility.importPageAsForm(document, document.getPages().indexOf(originalPage));
+
+                    try (PDPageContentStream contentStream = new PDPageContentStream(subDoc, subPage)) {
+                        // Set clipping area and position
+                        float translateX = -subPageWidth * i;
+                        float translateY = height - subPageHeight * (verticalDivisions - j);
+
+                        contentStream.saveGraphicsState();
+                        contentStream.addRect(0, 0, subPageWidth, subPageHeight);
+                        contentStream.clip();
+                        contentStream.transform(new Matrix(1, 0, 0, 1, translateX, translateY));
+
+                        // Draw the form
+                        contentStream.drawForm(form);
+                        contentStream.restoreGraphicsState();
+                    }
+
+                    splitDocuments.add(subDoc);
+                }
+            }
+        }
+
+        return splitDocuments;
+    }
+
+
+
+    
+
+}

src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java

@@ -0,0 +1,153 @@
+package stirling.software.SPDF.controller.api;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.model.api.general.SplitPdfBySizeOrCountRequest;
+import stirling.software.SPDF.utils.GeneralUtils;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@RequestMapping("/api/v1/general")
+@Tag(name = "General", description = "General APIs")
+public class SplitPdfBySizeController {
+
+
+    @PostMapping(value = "/split-by-size-or-count", consumes = "multipart/form-data")
+    @Operation(summary = "Auto split PDF pages into separate documents based on size or count", description = "split PDF into multiple paged documents based on size/count, ie if 20 pages and split into 5, it does 5 documents each 4 pages\r\n"
+    		+ " if 10MB and each page is 1MB and you enter 2MB then 5 docs each 2MB (rounded so that it accepts 1.9MB but not 2.1MB) Input:PDF Output:ZIP-PDF Type:SISO")
+    public ResponseEntity<byte[]> autoSplitPdf(@ModelAttribute SplitPdfBySizeOrCountRequest request) throws Exception {
+    	List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<ByteArrayOutputStream>();
+        
+        
+    	
+        MultipartFile file = request.getFileInput();
+        PDDocument sourceDocument = PDDocument.load(file.getInputStream());
+        
+        //0 = size, 1 = page count, 2 = doc count
+        int type = request.getSplitType();
+        String value = request.getSplitValue();
+        
+        if (type == 0) { // Split by size
+            long maxBytes = GeneralUtils.convertSizeToBytes(value);
+            long currentSize = 0;
+            PDDocument currentDoc = new PDDocument();
+
+            for (PDPage page : sourceDocument.getPages()) {
+                ByteArrayOutputStream pageOutputStream = new ByteArrayOutputStream();
+                PDDocument tempDoc = new PDDocument();
+                tempDoc.addPage(page);
+                tempDoc.save(pageOutputStream);
+                tempDoc.close();
+
+                long pageSize = pageOutputStream.size();
+                if (currentSize + pageSize > maxBytes) {
+                    // Save and reset current document
+                    splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
+                    currentDoc = new PDDocument();
+                    currentSize = 0;
+                }
+
+                currentDoc.addPage(page);
+                currentSize += pageSize;
+            }
+            // Add the last document if it contains any pages
+            if (currentDoc.getPages().getCount() != 0) {
+                splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
+            }
+        } else if (type == 1) { // Split by page count
+            int pageCount = Integer.parseInt(value);
+            int currentPageCount = 0;
+            PDDocument currentDoc = new PDDocument();
+
+            for (PDPage page : sourceDocument.getPages()) {
+                currentDoc.addPage(page);
+                currentPageCount++;
+
+                if (currentPageCount == pageCount) {
+                    // Save and reset current document
+                    splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
+                    currentDoc = new PDDocument();
+                    currentPageCount = 0;
+                }
+            }
+            // Add the last document if it contains any pages
+            if (currentDoc.getPages().getCount() != 0) {
+                splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
+            }
+        } else if (type == 2) { // Split by doc count
+        	int documentCount = Integer.parseInt(value);
+            int totalPageCount = sourceDocument.getNumberOfPages();
+            int pagesPerDocument = totalPageCount / documentCount;
+            int extraPages = totalPageCount % documentCount;
+            int currentPageIndex = 0;
+
+            for (int i = 0; i < documentCount; i++) {
+                PDDocument currentDoc = new PDDocument();
+                int pagesToAdd = pagesPerDocument + (i < extraPages ? 1 : 0);
+
+                for (int j = 0; j < pagesToAdd; j++) {
+                    currentDoc.addPage(sourceDocument.getPage(currentPageIndex++));
+                }
+
+                splitDocumentsBoas.add(currentDocToByteArray(currentDoc));
+            }
+        } else {
+            throw new IllegalArgumentException("Invalid argument for split type");
+        }
+
+        sourceDocument.close();
+        
+        
+        
+        Path zipFile = Files.createTempFile("split_documents", ".zip");
+        String filename = file.getOriginalFilename().replaceFirst("[.][^.]+$", "");
+        byte[] data;
+
+        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
+            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
+                String fileName = filename + "_" + (i + 1) + ".pdf";
+                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
+                byte[] pdf = baos.toByteArray();
+
+                ZipEntry pdfEntry = new ZipEntry(fileName);
+                zipOut.putNextEntry(pdfEntry);
+                zipOut.write(pdf);
+                zipOut.closeEntry();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+        	data = Files.readAllBytes(zipFile);
+            Files.delete(zipFile);
+        }
+
+        return WebResponseUtils.bytesToWebResponse(data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
+    }
+    
+    private ByteArrayOutputStream currentDocToByteArray(PDDocument document) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        document.save(baos);
+        document.close();
+        return baos;
+    }
+    
+
+}

src/main/java/stirling/software/SPDF/controller/api/UserController.java

@@ -23,6 +23,7 @@ import org.springframework.web.servlet.view.RedirectView;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import stirling.software.SPDF.config.security.UserService;
+import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
 
 @Controller
@@ -32,6 +33,7 @@ public class UserController {
     @Autowired
     private UserService userService;
     
+    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/register")
     public String register(@RequestParam String username, @RequestParam String password, Model model) {
         if(userService.usernameExists(username)) {
@@ -43,6 +45,7 @@ public class UserController {
         return "redirect:/login?registered=true";
     }
     
+    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/change-username-and-password")
     public RedirectView changeUsernameAndPassword(Principal principal,
                                                  @RequestParam String currentPassword, 
@@ -85,7 +88,7 @@ public class UserController {
     }
 
 
-    
+    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/change-username")
     public RedirectView changeUsername(Principal principal,
                                        @RequestParam String currentPassword, 
@@ -122,7 +125,8 @@ public class UserController {
 
         return new RedirectView("/login?messageType=credsUpdated");
     }
-
+    
+    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/change-password")
     public RedirectView changePassword(Principal principal, 
                                        @RequestParam String currentPassword, 
@@ -154,7 +158,7 @@ public class UserController {
         return new RedirectView("/login?messageType=credsUpdated");
     }
 
-    
+    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/updateUserSettings")
 	public String updateUserSettings(HttpServletRequest request, Principal principal) {
 	    Map<String, String[]> paramMap = request.getParameterMap();
@@ -182,6 +186,18 @@ public class UserController {
     	if(userService.usernameExists(username)) {
     		return new RedirectView("/addUsers?messageType=usernameExists");
     	}
+    	try {
+            // Validate the role
+            Role roleEnum = Role.fromString(role);
+            if (roleEnum == Role.INTERNAL_API_USER) {
+                // If the role is INTERNAL_API_USER, reject the request
+                return new RedirectView("/addUsers?messageType=invalidRole");
+            }
+        } catch (IllegalArgumentException e) {
+            // If the role ID is not valid, redirect with an error message
+            return new RedirectView("/addUsers?messageType=invalidRole");
+        }
+    	
         userService.saveUser(username, password, role, forceChange);
         return new RedirectView("/addUsers");  // Redirect to account page after adding the user
     }
@@ -203,6 +219,7 @@ public class UserController {
         return "redirect:/addUsers";
     }
     
+    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/get-api-key")
     public ResponseEntity<String> getApiKey(Principal principal) {
         if (principal == null) {
@@ -216,6 +233,7 @@ public class UserController {
         return ResponseEntity.ok(apiKey);
     }
 
+    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     @PostMapping("/update-api-key")
     public ResponseEntity<String> updateApiKey(Principal principal) {
         if (principal == null) {

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEpubToPdf.java

@@ -1,130 +0,0 @@
-package stirling.software.SPDF.controller.api.converters;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-import io.swagger.v3.oas.annotations.Hidden;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import stirling.software.SPDF.model.api.GeneralFile;
-import stirling.software.SPDF.utils.FileToPdf;
-import stirling.software.SPDF.utils.WebResponseUtils;
-
-@RestController
-@RequestMapping("/api/v1/convert")
-@Tag(name = "Convert", description = "Convert APIs")
-public class ConvertEpubToPdf {
-	//TODO
-	@PostMapping(consumes = "multipart/form-data", value = "/epub-to-single-pdf")
-	@Hidden
-	@Operation(
-	    summary = "Convert an EPUB file to a single PDF",
-	    description = "This endpoint takes an EPUB file input and converts it to a single PDF."
-	)
-	public ResponseEntity<byte[]> epubToSinglePdf(
-			@ModelAttribute GeneralFile request) 
-	        throws Exception {
-		MultipartFile fileInput = request.getFileInput();
-	    if (fileInput == null) {
-	        throw new IllegalArgumentException("Please provide an EPUB file for conversion.");
-	    }
-
-	    String originalFilename = fileInput.getOriginalFilename();
-	    if (originalFilename == null || !originalFilename.endsWith(".epub")) {
-	        throw new IllegalArgumentException("File must be in .epub format.");
-	    }
-
-	    Map<String, byte[]> epubContents = extractEpubContent(fileInput);
-	    List<String> htmlFilesOrder = getHtmlFilesOrderFromOpf(epubContents);
-
-	    List<byte[]> individualPdfs = new ArrayList<>();
-
-	    for (String htmlFile : htmlFilesOrder) {
-	        byte[] htmlContent = epubContents.get(htmlFile);
-	        byte[] pdfBytes = FileToPdf.convertHtmlToPdf(htmlContent, htmlFile.replace(".html", ".pdf"));
-	        individualPdfs.add(pdfBytes);
-	    }
-
-	    // Pseudo-code to merge individual PDFs into one.
-	    byte[] mergedPdfBytes = mergeMultiplePdfsIntoOne(individualPdfs);
-
-	    return WebResponseUtils.bytesToWebResponse(mergedPdfBytes, originalFilename.replace(".epub", ".pdf"));
-	}
-
-	// Assuming a pseudo-code function that merges multiple PDFs into one.
-	private byte[] mergeMultiplePdfsIntoOne(List<byte[]> individualPdfs) {
-	    // You can use a library such as  PDFBox to perform the merging here.
-	    // Return the byte[] of the merged PDF.
-		return null;
-	}
-	
-    private Map<String, byte[]> extractEpubContent(MultipartFile fileInput) throws IOException {
-        Map<String, byte[]> contentMap = new HashMap<>();
-
-        try (ZipInputStream zis = new ZipInputStream(fileInput.getInputStream())) {
-            ZipEntry zipEntry = zis.getNextEntry();
-            while (zipEntry != null) {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                byte[] buffer = new byte[1024];
-                int read = 0;
-                while ((read = zis.read(buffer)) != -1) {
-                    baos.write(buffer, 0, read);
-                }
-                contentMap.put(zipEntry.getName(), baos.toByteArray());
-                zipEntry = zis.getNextEntry();
-            }
-        }
-
-        return contentMap;
-    }
-
-    private List<String> getHtmlFilesOrderFromOpf(Map<String, byte[]> epubContents) throws Exception {
-        String opfContent = new String(epubContents.get("OEBPS/content.opf"));  // Adjusting for given path
-        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-        InputSource is = new InputSource(new StringReader(opfContent));
-        Document doc = dBuilder.parse(is);
-
-        NodeList itemRefs = doc.getElementsByTagName("itemref");
-        List<String> htmlFilesOrder = new ArrayList<>();
-        
-        for (int i = 0; i < itemRefs.getLength(); i++) {
-            Element itemRef = (Element) itemRefs.item(i);
-            String idref = itemRef.getAttribute("idref");
-            
-            NodeList items = doc.getElementsByTagName("item");
-            for (int j = 0; j < items.getLength(); j++) {
-                Element item = (Element) items.item(j);
-                if (idref.equals(item.getAttribute("id"))) {
-                    htmlFilesOrder.add(item.getAttribute("href"));  // Fetching the actual href
-                    break;
-                }
-            }
-        }
-
-        return htmlFilesOrder;
-    }
-
-
-}

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java

@@ -1,6 +1,7 @@
 package stirling.software.SPDF.controller.api.converters;
 
 import java.io.IOException;
+import java.net.URLConnection;
 
 import org.apache.pdfbox.rendering.ImageType;
 import org.slf4j.Logger;
@@ -23,6 +24,7 @@ import stirling.software.SPDF.model.api.converters.ConvertToImageRequest;
 import stirling.software.SPDF.model.api.converters.ConvertToPdfRequest;
 import stirling.software.SPDF.utils.PdfUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
+
 @RestController
 @RequestMapping("/api/v1/convert")
 @Tag(name = "Convert", description = "Convert APIs")
@@ -89,15 +91,7 @@ public class ConvertImgPDFController {
     }
 
     private String getMediaType(String imageFormat) {
-        if (imageFormat.equalsIgnoreCase("PNG"))
-            return "image/png";
-        else if (imageFormat.equalsIgnoreCase("JPEG") || imageFormat.equalsIgnoreCase("JPG"))
-            return "image/jpeg";
-        else if (imageFormat.equalsIgnoreCase("GIF"))
-            return "image/gif";
-        else
-            return "application/octet-stream";
+        String mimeType = URLConnection.guessContentTypeFromName("." + imageFormat);
+        return mimeType.equals("null") ? "application/octet-stream" : mimeType;
     }
-
-
 }

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java

@@ -28,7 +28,7 @@ public class ConvertWebsiteToPDF {
 	@PostMapping(consumes = "multipart/form-data", value = "/url/pdf")
 	@Operation(
 	    summary = "Convert a URL to a PDF",
-	    description = "This endpoint fetches content from a URL and converts it to a PDF format."
+	    description = "This endpoint fetches content from a URL and converts it to a PDF format. Input:N/A Output:PDF Type:SISO"
 	)
 	public ResponseEntity<byte[]> urlToPdf(@ModelAttribute UrlToPdfRequest request) throws IOException, InterruptedException {
 	    String URL = request.getUrlInput();

src/main/java/stirling/software/SPDF/controller/api/converters/ExtractController.java

@@ -0,0 +1,123 @@
+package stirling.software.SPDF.controller.api.converters;
+
+import java.io.ByteArrayInputStream;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ContentDisposition;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.opencsv.CSVWriter;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import stirling.software.SPDF.controller.api.CropController;
+import stirling.software.SPDF.controller.api.strippers.PDFTableStripper;
+import stirling.software.SPDF.model.api.extract.PDFFilePage;
+
+@RestController
+@RequestMapping("/api/v1/convert")
+@Tag(name = "Convert", description = "Convert APIs")
+public class ExtractController {
+
+    private static final Logger logger = LoggerFactory.getLogger(CropController.class);
+
+    @PostMapping(value = "/pdf/csv", consumes = "multipart/form-data")
+    @Operation(summary = "Extracts a PDF document to csv", description = "This operation takes an input PDF file and returns CSV file of whole page. Input:PDF Output:CSV Type:SISO")
+    public ResponseEntity<String> PdfToCsv(@ModelAttribute PDFFilePage form)
+            throws Exception {
+
+        ArrayList<String> tableData = new ArrayList<>();
+        int columnsCount = 0;
+
+        try (PDDocument document = PDDocument.load(new ByteArrayInputStream(form.getFileInput().getBytes()))) {
+            final double res = 72; // PDF units are at 72 DPI
+            PDFTableStripper stripper = new PDFTableStripper();
+            PDPage pdPage = document.getPage(form.getPageId() - 1);
+            stripper.extractTable(pdPage);
+            columnsCount = stripper.getColumns();
+            for (int c = 0; c < columnsCount; ++c) {
+                for(int r=0; r<stripper.getRows(); ++r) {
+                    tableData.add(stripper.getText(r, c));
+                }
+            }
+        }
+
+        ArrayList<String> notEmptyColumns = new ArrayList<>();
+
+        for (String item: tableData) {
+            if(!item.trim().isEmpty()){
+                notEmptyColumns.add(item);
+            }else{
+                columnsCount--;
+            }
+        }
+
+        List<String> fullTable  =  notEmptyColumns.stream().map((entity)->
+            entity.replace('\n',' ').replace('\r',' ').trim().replaceAll("\\s{2,}", "|")).toList();
+
+        int rowsCount = fullTable.get(0).split("\\|").length;
+
+        ArrayList<String> headersList = getTableHeaders(columnsCount,fullTable);
+        ArrayList<String> recordList = getRecordsList(rowsCount,fullTable);
+        
+        if(headersList.size() == 0 && recordList.size() == 0) {
+        	throw new Exception("No table detected, no headers or records found");
+        }
+        
+        StringWriter writer = new StringWriter();
+        try (CSVWriter csvWriter = new CSVWriter(writer)) {
+            csvWriter.writeNext(headersList.toArray(new String[0]));
+            for (String record : recordList) {
+                csvWriter.writeNext(record.split("\\|"));
+            }
+        }
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentDisposition(ContentDisposition.builder("attachment").filename(form.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_extracted.csv").build());
+        headers.setContentType(MediaType.parseMediaType("text/csv"));
+
+        return ResponseEntity.ok()
+                .headers(headers)
+                .body(writer.toString());
+    }
+
+    private ArrayList<String> getRecordsList( int rowsCounts ,List<String> items){
+        ArrayList<String> recordsList = new ArrayList<>();
+
+            for (int b=1; b<rowsCounts;b++) {
+                StringBuilder strbldr = new StringBuilder();
+
+                for (int i=0;i<items.size();i++){
+                    String[] parts = items.get(i).split("\\|");
+                    strbldr.append(parts[b]);
+                    if (i!= items.size()-1){
+                        strbldr.append("|");
+                    }
+                }
+                recordsList.add(strbldr.toString());
+            }
+
+        return recordsList;
+    }
+    private ArrayList<String> getTableHeaders(int columnsCount, List<String> items){
+        ArrayList<String> resultList = new ArrayList<>();
+        for (int i=0;i<columnsCount;i++){
+            String[] parts = items.get(i).split("\\|");
+            resultList.add(parts[0]);
+        }
+
+        return resultList;
+    }
+}

src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java

@@ -43,7 +43,7 @@ public class AutoSplitPdfController {
     private static final String QR_CONTENT = "https://github.com/Frooodle/Stirling-PDF";
 
     @PostMapping(value = "/auto-split-pdf", consumes = "multipart/form-data")
-    @Operation(summary = "Auto split PDF pages into separate documents", description = "This endpoint accepts a PDF file, scans each page for a specific QR code, and splits the document at the QR code boundaries. The output is a zip file containing each separate PDF document. Input:PDF Output:ZIP Type:SISO")
+    @Operation(summary = "Auto split PDF pages into separate documents", description = "This endpoint accepts a PDF file, scans each page for a specific QR code, and splits the document at the QR code boundaries. The output is a zip file containing each separate PDF document. Input:PDF Output:ZIP-PDF Type:SISO")
     public ResponseEntity<byte[]> autoSplitPdf(@ModelAttribute AutoSplitPdfRequest request) throws IOException {
         MultipartFile file = request.getFileInput();
         boolean duplexMode = request.isDuplexMode();

src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java

@@ -1,11 +1,12 @@
 package stirling.software.SPDF.controller.api.misc;
-
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.zip.Deflater;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -58,7 +59,8 @@ public class ExtractImagesController {
 
         int imageIndex = 1;
         String filename = file.getOriginalFilename().replaceFirst("[.][^.]+$", "");
-        int pageNum = 1;
+        int pageNum = 0;
+        Set<Integer> processedImages = new HashSet<>();
         // Iterate over each page
         for (PDPage page : document.getPages()) {
             ++pageNum;
@@ -66,7 +68,12 @@ public class ExtractImagesController {
             for (COSName name : page.getResources().getXObjectNames()) {
                 if (page.getResources().isImageXObject(name)) {
                     PDImageXObject image = (PDImageXObject) page.getResources().getXObject(name);
-
+                    int imageHash = image.hashCode();
+                    if(processedImages.contains(imageHash)) {
+                        continue; // Skip already processed images
+                    }
+                    processedImages.add(imageHash);
+                    
                     // Convert image to desired format
                     RenderedImage renderedImage = image.getImage();
                     BufferedImage bufferedImage = null;

src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java

@@ -13,6 +13,7 @@ import java.io.ByteArrayOutputStream;
 //Required for file input/output
 import java.io.File;
 import java.io.IOException;
+import java.security.SecureRandom;
 //Other required classes
 import java.util.Random;
 
@@ -85,7 +86,7 @@ public class FakeScanControllerWIP {
     	op.filter(sourceImage, destinationImage);
 
     	// Apply a rotation effect
-    	double rotationRequired = Math.toRadians((new Random().nextInt(3 - 1) + 1));  // Random angle between 1 and 3 degrees
+    	double rotationRequired = Math.toRadians((new SecureRandom().nextInt(3 - 1) + 1));  // Random angle between 1 and 3 degrees
     	double locationX = destinationImage.getWidth() / 2;
     	double locationY = destinationImage.getHeight() / 2;
     	AffineTransform tx = AffineTransform.getRotateInstance(rotationRequired, locationX, locationY);
@@ -103,7 +104,7 @@ public class FakeScanControllerWIP {
     	destinationImage = blurOp.filter(destinationImage, null);
 
     	// Add noise to the image based on the "dirtiness"
-    	Random random = new Random();
+    	Random random = new SecureRandom();
     	for (int y = 0; y < destinationImage.getHeight(); y++) {
     	    for (int x = 0; x < destinationImage.getWidth(); x++) {
     	        if (random.nextInt(100) < dirtiness) {

src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java

@@ -39,7 +39,7 @@ public class OCRController {
     private static final Logger logger = LoggerFactory.getLogger(OCRController.class);
 
     public List<String> getAvailableTesseractLanguages() {
-        String tessdataDir = "/usr/share/tesseract-ocr/4.00/tessdata";
+        String tessdataDir = "/usr/share/tesseract-ocr/5/tessdata";
         File[] files = new File(tessdataDir).listFiles();
         if (files == null) {
             return Collections.emptyList();

src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.model.api.PDFFile;
 import stirling.software.SPDF.utils.WebResponseUtils;
@@ -25,6 +26,7 @@ public class ShowJavascript {
 
     private static final Logger logger = LoggerFactory.getLogger(ShowJavascript.class);
     @PostMapping(consumes = "multipart/form-data", value = "/show-javascript")
+    @Operation(summary = "Grabs all JS from a PDF and returns a single JS file with all code", description = "desc. Input:PDF Output:JS Type:SISO")
     public ResponseEntity<byte[]> extractHeader(@ModelAttribute PDFFile request) throws Exception {
     	MultipartFile inputFile = request.getFileInput();
         String script = "";

src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java

@@ -0,0 +1,119 @@
+package stirling.software.SPDF.controller.api.pipeline;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import jakarta.servlet.ServletContext;
+import stirling.software.SPDF.model.ApiEndpoint;
+import stirling.software.SPDF.model.Role;
+@Service
+public class ApiDocService {
+
+    private final Map<String, ApiEndpoint> apiDocumentation = new HashMap<>();
+
+    @Autowired
+    private ServletContext servletContext;
+
+    private String getApiDocsUrl() {
+        String contextPath = servletContext.getContextPath();
+        String port = System.getProperty("local.server.port");
+        if(port == null || port.length() == 0) {
+        	port="8080";
+        }
+        
+        return "http://localhost:"+ port + contextPath + "/v1/api-docs";
+    }
+    
+
+    @Autowired(required=false)
+	private UserServiceInterface userService;
+
+	private String getApiKeyForUser() {
+		if(userService == null)
+			return "";
+		return userService.getApiKeyForUser(Role.INTERNAL_API_USER.getRoleId());
+	}
+	
+	JsonNode apiDocsJsonRootNode;
+	
+	
+	//@EventListener(ApplicationReadyEvent.class)
+	private synchronized void loadApiDocumentation() {
+        try {
+            HttpHeaders headers = new HttpHeaders();
+            String apiKey = getApiKeyForUser();
+            if (!apiKey.isEmpty()) {
+                headers.set("X-API-KEY", apiKey);
+            }
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+
+            RestTemplate restTemplate = new RestTemplate();
+            ResponseEntity<String> response = restTemplate.exchange(getApiDocsUrl(), HttpMethod.GET, entity, String.class);
+            String apiDocsJson = response.getBody();
+
+            ObjectMapper mapper = new ObjectMapper();
+            apiDocsJsonRootNode = mapper.readTree(apiDocsJson);
+
+            JsonNode paths = apiDocsJsonRootNode.path("paths");
+            paths.fields().forEachRemaining(entry -> {
+                String path = entry.getKey();
+                JsonNode pathNode = entry.getValue();
+                if (pathNode.has("post")) {
+                    JsonNode postNode = pathNode.get("post");
+                    ApiEndpoint endpoint = new ApiEndpoint(path, postNode);
+                    apiDocumentation.put(path, endpoint);
+                }
+            });
+        } catch (Exception e) {
+            // Handle exceptions
+            e.printStackTrace();
+        }
+    }
+
+    public boolean isValidOperation(String operationName, Map<String, Object> parameters) {
+    	if(apiDocumentation.size() == 0) {
+    		loadApiDocumentation();
+    	}
+        if (!apiDocumentation.containsKey(operationName)) {
+            return false;
+        }
+        ApiEndpoint endpoint = apiDocumentation.get(operationName);
+        return endpoint.areParametersValid(parameters);
+    }
+    
+    public boolean isMultiInput(String operationName) {
+    	if(apiDocsJsonRootNode == null || apiDocumentation.size() == 0) {
+    		loadApiDocumentation();
+    	}
+    	if (!apiDocumentation.containsKey(operationName)) {
+            return false;
+        }
+
+        ApiEndpoint endpoint = apiDocumentation.get(operationName);
+        String description = endpoint.getDescription(); 
+
+        Pattern pattern = Pattern.compile("Type:(\\w+)");
+        Matcher matcher = pattern.matcher(description);
+        if (matcher.find()) {
+            String type = matcher.group(1);
+            return type.startsWith("MI");
+        }
+
+        return false;    	
+    }
+}
+
+// Model class for API Endpoint
+

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java

@@ -1,56 +1,31 @@
 package stirling.software.SPDF.controller.api.pipeline;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.PipelineConfig;
-import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.model.api.HandleDataRequest;
 import stirling.software.SPDF.utils.WebResponseUtils;
 
@@ -60,373 +35,39 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 public class PipelineController {
 
 	private static final Logger logger = LoggerFactory.getLogger(PipelineController.class);
-	@Autowired
-	private ObjectMapper objectMapper;
 
-	final String jsonFileName = "pipelineConfig.json";
 	final String watchedFoldersDir = "./pipeline/watchedFolders/";
 	final String finishedFoldersDir = "./pipeline/finishedFolders/";
+	@Autowired
+	PipelineProcessor processor;
 	
-	@Scheduled(fixedRate = 25000)
-	public void scanFolders() {
-		logger.info("Scanning folders...");
-		Path watchedFolderPath = Paths.get(watchedFoldersDir);
-		if (!Files.exists(watchedFolderPath)) {
-			try {
-				Files.createDirectories(watchedFolderPath);
-				logger.info("Created directory: {}", watchedFolderPath);
-			} catch (IOException e) {
-				logger.error("Error creating directory: {}", watchedFolderPath, e);
-				return;
-			}
-		}
-		try (Stream<Path> paths = Files.walk(watchedFolderPath)) {
-			paths.filter(Files::isDirectory).forEach(t -> {
-				try {
-					if (!t.equals(watchedFolderPath) && !t.endsWith("processing")) {
-						handleDirectory(t);
-					}
-				} catch (Exception e) {
-					logger.error("Error handling directory: {}", t, e);
-				}
-			});
-		} catch (Exception e) {
-			logger.error("Error walking through directory: {}", watchedFolderPath, e);
-		}
-	}
 
 	@Autowired
 	ApplicationProperties applicationProperties;
 	
-
-	private void handleDirectory(Path dir) throws Exception {
-		logger.info("Handling directory: {}", dir);
-		Path jsonFile = dir.resolve(jsonFileName);
-		Path processingDir = dir.resolve("processing"); // Directory to move files during processing
-		if (!Files.exists(processingDir)) {
-			Files.createDirectory(processingDir);
-			logger.info("Created processing directory: {}", processingDir);
-		}
-
-		if (Files.exists(jsonFile)) {
-			// Read JSON file
-			String jsonString;
-			try {
-				jsonString = new String(Files.readAllBytes(jsonFile));
-				logger.info("Read JSON file: {}", jsonFile);
-			} catch (IOException e) {
-				logger.error("Error reading JSON file: {}", jsonFile, e);
-				return;
-			}
-
-			// Decode JSON to PipelineConfig
-			PipelineConfig config;
-			try {
-				config = objectMapper.readValue(jsonString, PipelineConfig.class);
-				// Assuming your PipelineConfig class has getters for all necessary fields, you
-				// can perform checks here
-				if (config.getOperations() == null || config.getOutputDir() == null || config.getName() == null) {
-					throw new IOException("Invalid JSON format");
-				}
-			} catch (IOException e) {
-				logger.error("Error parsing PipelineConfig: {}", jsonString, e);
-				return;
-			}
-
-			// For each operation in the pipeline
-			for (PipelineOperation operation : config.getOperations()) {
-				// Collect all files based on fileInput
-				File[] files;
-				String fileInput = (String) operation.getParameters().get("fileInput");
-				if ("automated".equals(fileInput)) {
-					// If fileInput is "automated", process all files in the directory
-					try (Stream<Path> paths = Files.list(dir)) {
-						files = paths
-							    .filter(path -> !Files.isDirectory(path)) // exclude directories
-							    .filter(path -> !path.equals(jsonFile)) // exclude jsonFile
-							    .map(Path::toFile)
-							    .toArray(File[]::new);
-
-					} catch (IOException e) {
-						e.printStackTrace();
-						return;
-					}
-				} else {
-					// If fileInput contains a path, process only this file
-					files = new File[] { new File(fileInput) };
-				}
-
-				// Prepare the files for processing
-				List<File> filesToProcess = new ArrayList<>();
-				for (File file : files) {
-				    logger.info(file.getName());
-				    logger.info("{} to {}",file.toPath(), processingDir.resolve(file.getName()));
-				    Files.move(file.toPath(), processingDir.resolve(file.getName()));
-				    filesToProcess.add(processingDir.resolve(file.getName()).toFile());
-				}
-
-				// Process the files
-				try {
-				    List<Resource> resources = handleFiles(filesToProcess.toArray(new File[0]), jsonString);
-				    
-					if(resources == null) {
-						return;
-					}
-					// Move resultant files and rename them as per config in JSON file
-					for (Resource resource : resources) {
-						String resourceName = resource.getFilename();
-						String baseName = resourceName.substring(0, resourceName.lastIndexOf("."));
-						String extension = resourceName.substring(resourceName.lastIndexOf(".")+1);
-						
-						String outputFileName = config.getOutputPattern().replace("{filename}", baseName);
-						
-						outputFileName = outputFileName.replace("{pipelineName}", config.getName());
-						DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-						outputFileName = outputFileName.replace("{date}", LocalDate.now().format(dateFormatter));
-						DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HHmmss");
-						outputFileName = outputFileName.replace("{time}", LocalTime.now().format(timeFormatter));
-						
-						outputFileName += "." + extension;
-						// {filename} {folder} {date} {tmime} {pipeline}
-						String outputDir = config.getOutputDir();
-
-						String outputFolder = applicationProperties.getAutoPipeline().getOutputFolder();
-
-						if (outputFolder == null || outputFolder.isEmpty()) {
-						    // If the environment variable is not set, use the default value
-						    outputFolder = finishedFoldersDir;
-						}
-						logger.info("outputDir 0={}", outputDir);
-						// Replace the placeholders in the outputDir string
-						outputDir = outputDir.replace("{outputFolder}", outputFolder);
-						outputDir = outputDir.replace("{folderName}", dir.toString());
-						logger.info("outputDir 1={}", outputDir);
-						outputDir = outputDir.replace("\\watchedFolders", "");
-						outputDir = outputDir.replace("//watchedFolders", "");
-						outputDir = outputDir.replace("\\\\watchedFolders", "");
-						outputDir = outputDir.replace("/watchedFolders", "");
-						
-						Path outputPath; 
-						logger.info("outputDir 2={}", outputDir);
-						if (Paths.get(outputDir).isAbsolute()) {
-						    // If it's an absolute path, use it directly
-						    outputPath = Paths.get(outputDir);
-						} else {
-						    // If it's a relative path, make it relative to the current working directory
-						    outputPath = Paths.get(".", outputDir);
-						}
-						
-						logger.info("outputPath={}", outputPath);
-						
-						if (!Files.exists(outputPath)) {
-							try {
-								Files.createDirectories(outputPath);
-								logger.info("Created directory: {}", outputPath);
-							} catch (IOException e) {
-								logger.error("Error creating directory: {}", outputPath, e);
-								return;
-							}
-						}
-						logger.info("outputPath {}", outputPath);	
-						logger.info("outputPath.resolve(outputFileName).toString() {}", outputPath.resolve(outputFileName).toString());	
-						File newFile = new File(outputPath.resolve(outputFileName).toString());
-					    OutputStream os = new FileOutputStream(newFile);
-					    os.write(((ByteArrayResource)resource).getByteArray());
-					    os.close();
-						logger.info("made {}", outputPath.resolve(outputFileName));	
-					}
-
-					// If successful, delete the original files
-					for (File file : filesToProcess) {
-						Files.deleteIfExists(processingDir.resolve(file.getName()));
-					}
-				} catch (Exception e) {
-					// If an error occurs, move the original files back
-					for (File file : filesToProcess) {
-						Files.move(processingDir.resolve(file.getName()), file.toPath());
-					}
-					throw e;
-				}
-			}
-		}
-	}
-
-	List<Resource> processFiles(List<Resource> outputFiles, String jsonString) throws Exception {
-		
-		ObjectMapper mapper = new ObjectMapper();
-		JsonNode jsonNode = mapper.readTree(jsonString);
-
-		JsonNode pipelineNode = jsonNode.get("pipeline");
-		logger.info("Running pipelineNode: {}", pipelineNode);
-		ByteArrayOutputStream logStream = new ByteArrayOutputStream();
-		PrintStream logPrintStream = new PrintStream(logStream);
-
-		boolean hasErrors = false;
-
-		for (JsonNode operationNode : pipelineNode) {
-			String operation = operationNode.get("operation").asText();
-			logger.info("Running operation: {}", operation);
-			JsonNode parametersNode = operationNode.get("parameters");
-			String inputFileExtension = "";
-			if (operationNode.has("inputFileType")) {
-				inputFileExtension = operationNode.get("inputFileType").asText();
-			} else {
-				inputFileExtension = ".pdf";
-			}
-
-			List<Resource> newOutputFiles = new ArrayList<>();
-			boolean hasInputFileType = false;
-
-			for (Resource file : outputFiles) {
-				if (file.getFilename().endsWith(inputFileExtension)) {
-					hasInputFileType = true;
-					MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
-					body.add("fileInput", file);
-
-					Iterator<Map.Entry<String, JsonNode>> parameters = parametersNode.fields();
-					while (parameters.hasNext()) {
-						Map.Entry<String, JsonNode> parameter = parameters.next();
-						body.add(parameter.getKey(), parameter.getValue().asText());
-					}
-
-					HttpHeaders headers = new HttpHeaders();
-					headers.setContentType(MediaType.MULTIPART_FORM_DATA);
-
-					HttpEntity<MultiValueMap<String, Object>> entity = new HttpEntity<>(body, headers);
-
-					RestTemplate restTemplate = new RestTemplate();
-					String url = "http://localhost:8080/" + operation;
-
-					ResponseEntity<byte[]> response = restTemplate.exchange(url, HttpMethod.POST, entity, byte[].class);
-
-					// If the operation is filter and the response body is null or empty, skip this file
-	                if (operation.startsWith("filter-") && (response.getBody() == null || response.getBody().length == 0)) {
-	                	logger.info("Skipping file due to failing {}", operation);
-	                    continue;
-	                }
-	                
-					if (!response.getStatusCode().equals(HttpStatus.OK)) {
-						logPrintStream.println("Error: " + response.getBody());
-						hasErrors = true;
-						continue;
-					}
-					
-					
-					// Define filename
-	                String filename;
-	                if ("auto-rename".equals(operation)) {
-	                    // If the operation is "auto-rename", generate a new filename.
-	                    // This is a simple example of generating a filename using current timestamp.
-	                    // Modify as per your needs.
-	                    filename = "file_" + System.currentTimeMillis();
-	                } else {
-	                    // Otherwise, keep the original filename.
-	                    filename = file.getFilename();
-	                }
-
-	                // Check if the response body is a zip file
-	                if (isZip(response.getBody())) {
-	                    // Unzip the file and add all the files to the new output files
-	                    newOutputFiles.addAll(unzip(response.getBody()));
-	                } else {
-	                    Resource outputResource = new ByteArrayResource(response.getBody()) {
-	                        @Override
-	                        public String getFilename() {
-	                            return filename;
-	                        }
-	                    };
-	                    newOutputFiles.add(outputResource);
-	                }
-				}
-
-				if (!hasInputFileType) {
-					logPrintStream.println(
-							"No files with extension " + inputFileExtension + " found for operation " + operation);
-					hasErrors = true;
-				}
-
-				outputFiles = newOutputFiles;
-			}
-			logPrintStream.close();
-
-		}
-		if (hasErrors) {
-			logger.error("Errors occurred during processing. Log: {}", logStream.toString());
-		}
-		return outputFiles;
-	}
-
-	List<Resource> handleFiles(File[] files, String jsonString) throws Exception {
-		if(files == null || files.length == 0) {
-			logger.info("No files");
-			return null;
-		}
-			
-		logger.info("Handling files: {} files, with JSON string of length: {}", files.length, jsonString.length());
-		
-		ObjectMapper mapper = new ObjectMapper();
-		JsonNode jsonNode = mapper.readTree(jsonString);
-
-		JsonNode pipelineNode = jsonNode.get("pipeline");
-
-		boolean hasErrors = false;
-		List<Resource> outputFiles = new ArrayList<>();
-
-		for (File file : files) {
-		    Path path = Paths.get(file.getAbsolutePath());
-		    System.out.println("Reading file: " + path); // debug statement
-		    
-		    if (Files.exists(path)) {
-		        Resource fileResource = new ByteArrayResource(Files.readAllBytes(path)) {
-		            @Override
-		            public String getFilename() {
-		                return file.getName();
-		            }
-		        };
-		        outputFiles.add(fileResource);
-		    } else {
-		        System.out.println("File not found: " + path); // debug statement
-		    }
-		}
-		logger.info("Files successfully loaded. Starting processing...");
-		return processFiles(outputFiles, jsonString);
-	}
-
-	List<Resource> handleFiles(MultipartFile[] files, String jsonString) throws Exception {
-		if(files == null || files.length == 0) {
-			logger.info("No files");
-			return null;
-		}
-		logger.info("Handling files: {} files, with JSON string of length: {}", files.length, jsonString.length());
-		ObjectMapper mapper = new ObjectMapper();
-		JsonNode jsonNode = mapper.readTree(jsonString);
-
-		JsonNode pipelineNode = jsonNode.get("pipeline");
-
-		boolean hasErrors = false;
-		List<Resource> outputFiles = new ArrayList<>();
-
-		for (MultipartFile file : files) {
-			Resource fileResource = new ByteArrayResource(file.getBytes()) {
-				@Override
-				public String getFilename() {
-					return file.getOriginalFilename();
-				}
-			};
-			outputFiles.add(fileResource);
-		}
-		logger.info("Files successfully loaded. Starting processing...");
-		return processFiles(outputFiles, jsonString);
-	}
+	@Autowired
+	private ObjectMapper objectMapper;
+	
 
 	@PostMapping("/handleData")
-	public ResponseEntity<byte[]> handleData(@ModelAttribute HandleDataRequest request) {
-	    MultipartFile[] files = request.getFileInputs();
-	    String jsonString = request.getJsonString();
+	public ResponseEntity<byte[]> handleData(@ModelAttribute HandleDataRequest request) throws JsonMappingException, JsonProcessingException {
+		if (!Boolean.TRUE.equals(applicationProperties.getSystem().getEnableAlphaFunctionality())) {
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+		}
+
+		MultipartFile[] files = request.getFileInput();
+		String jsonString = request.getJson();
+		if (files == null) {
+			return null;
+		}
+		PipelineConfig config = objectMapper.readValue(jsonString, PipelineConfig.class);
 		logger.info("Received POST request to /handleData with {} files", files.length);
 		try {
-			List<Resource> outputFiles = handleFiles(files, jsonString);
-
+			List<Resource> inputFiles = processor.generateInputFiles(files);
+			if(inputFiles == null  || inputFiles.size() == 0) {
+            	return null;
+            }
+			List<Resource> outputFiles = processor.runPipelineAgainstFiles(inputFiles, config);
 			if (outputFiles != null && outputFiles.size() == 1) {
 				// If there is only one file, return it directly
 				Resource singleFile = outputFiles.get(0);
@@ -473,52 +114,4 @@ public class PipelineController {
 		}
 	}
 
-	private boolean isZip(byte[] data) {
-		if (data == null || data.length < 4) {
-			return false;
-		}
-
-		// Check the first four bytes of the data against the standard zip magic number
-		return data[0] == 0x50 && data[1] == 0x4B && data[2] == 0x03 && data[3] == 0x04;
-	}
-
-	private List<Resource> unzip(byte[] data) throws IOException {
-		logger.info("Unzipping data of length: {}", data.length);
-		List<Resource> unzippedFiles = new ArrayList<>();
-
-		try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
-				ZipInputStream zis = new ZipInputStream(bais)) {
-
-			ZipEntry entry;
-			while ((entry = zis.getNextEntry()) != null) {
-				ByteArrayOutputStream baos = new ByteArrayOutputStream();
-				byte[] buffer = new byte[1024];
-				int count;
-
-				while ((count = zis.read(buffer)) != -1) {
-					baos.write(buffer, 0, count);
-				}
-
-				final String filename = entry.getName();
-				Resource fileResource = new ByteArrayResource(baos.toByteArray()) {
-					@Override
-					public String getFilename() {
-						return filename;
-					}
-				};
-
-				// If the unzipped file is a zip file, unzip it
-				if (isZip(baos.toByteArray())) {
-					logger.info("File {} is a zip file. Unzipping...", filename);
-					unzippedFiles.addAll(unzip(baos.toByteArray()));
-				} else {
-					unzippedFiles.add(fileResource);
-				}
-			}
-		}
-
-		logger.info("Unzipping completed. {} files were unzipped.", unzippedFiles.size());
-		return unzippedFiles;
-	}
-
 }

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java

@@ -0,0 +1,258 @@
+package stirling.software.SPDF.controller.api.pipeline;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.core.io.Resource;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.PipelineConfig;
+import stirling.software.SPDF.model.PipelineOperation;
+
+@Service
+public class PipelineDirectoryProcessor {
+
+	private static final Logger logger = LoggerFactory.getLogger(PipelineDirectoryProcessor.class);
+    @Autowired
+    private ObjectMapper objectMapper;
+    @Autowired
+    private ApiDocService apiDocService;
+    @Autowired
+    private ApplicationProperties applicationProperties;
+    
+    final String watchedFoldersDir = "./pipeline/watchedFolders/";
+	final String finishedFoldersDir = "./pipeline/finishedFolders/";
+	
+    @Autowired
+	PipelineProcessor processor;
+
+    @Scheduled(fixedRate = 60000)
+	public void scanFolders() {
+		if (!Boolean.TRUE.equals(applicationProperties.getSystem().getEnableAlphaFunctionality())) {
+			return;
+		}
+		Path watchedFolderPath = Paths.get(watchedFoldersDir);
+		if (!Files.exists(watchedFolderPath)) {
+			try {
+				Files.createDirectories(watchedFolderPath);
+				logger.info("Created directory: {}", watchedFolderPath);
+			} catch (IOException e) {
+				logger.error("Error creating directory: {}", watchedFolderPath, e);
+				return;
+			}
+		}
+		try (Stream<Path> paths = Files.walk(watchedFolderPath)) {
+			paths.filter(Files::isDirectory).forEach(t -> {
+				try {
+					if (!t.equals(watchedFolderPath) && !t.endsWith("processing")) {
+						handleDirectory(t);
+					}
+				} catch (Exception e) {
+					logger.error("Error handling directory: {}", t, e);
+				}
+			});
+		} catch (Exception e) {
+			logger.error("Error walking through directory: {}", watchedFolderPath, e);
+		}
+	}
+    
+    public void handleDirectory(Path dir) throws IOException {
+        logger.info("Handling directory: {}", dir);
+        Path processingDir = createProcessingDirectory(dir);
+
+        Optional<Path> jsonFileOptional = findJsonFile(dir);
+        if (!jsonFileOptional.isPresent()) {
+            logger.warn("No .JSON settings file found. No processing will happen for dir {}.", dir);
+            return;
+        }
+
+        Path jsonFile = jsonFileOptional.get();
+        PipelineConfig config = readAndParseJson(jsonFile);
+        processPipelineOperations(dir, processingDir, jsonFile, config);
+    }
+
+    private Path createProcessingDirectory(Path dir) throws IOException {
+        Path processingDir = dir.resolve("processing");
+        if (!Files.exists(processingDir)) {
+            Files.createDirectory(processingDir);
+            logger.info("Created processing directory: {}", processingDir);
+        }
+        return processingDir;
+    }
+
+    private Optional<Path> findJsonFile(Path dir) throws IOException {
+        try (Stream<Path> paths = Files.list(dir)) {
+            return paths.filter(file -> file.toString().endsWith(".json")).findFirst();
+        }
+    }
+
+    private PipelineConfig readAndParseJson(Path jsonFile) throws IOException {
+        String jsonString = new String(Files.readAllBytes(jsonFile), StandardCharsets.UTF_8);
+        logger.debug("Reading JSON file: {}", jsonFile);
+        return objectMapper.readValue(jsonString, PipelineConfig.class);
+    }
+
+    private void processPipelineOperations(Path dir, Path processingDir, Path jsonFile, PipelineConfig config) throws IOException {
+        for (PipelineOperation operation : config.getOperations()) {
+            validateOperation(operation);
+            File[] files = collectFilesForProcessing(dir, jsonFile, operation);
+            if(files == null || files.length == 0) {
+            	logger.debug("No files detected for {} ", dir);
+            	return;
+            }
+            List<File> filesToProcess = prepareFilesForProcessing(files, processingDir);
+            runPipelineAgainstFiles(filesToProcess, config, dir, processingDir);
+        }
+    }
+
+    private void validateOperation(PipelineOperation operation) throws IOException {
+        if (!apiDocService.isValidOperation(operation.getOperation(), operation.getParameters())) {
+            throw new IOException("Invalid operation: " + operation.getOperation());
+        }
+    }
+
+    private File[] collectFilesForProcessing(Path dir, Path jsonFile, PipelineOperation operation) throws IOException {
+        try (Stream<Path> paths = Files.list(dir)) {
+            if ("automated".equals(operation.getParameters().get("fileInput"))) {
+                return paths.filter(path -> !Files.isDirectory(path) && !path.equals(jsonFile))
+                            .map(Path::toFile)
+                            .toArray(File[]::new);
+            } else {
+                String fileInput = (String) operation.getParameters().get("fileInput");
+                return new File[]{new File(fileInput)};
+            }
+        }
+    }
+
+    private List<File> prepareFilesForProcessing(File[] files, Path processingDir) throws IOException {
+        List<File> filesToProcess = new ArrayList<>();
+        for (File file : files) {
+            Path targetPath = resolveUniqueFilePath(processingDir, file.getName());
+            Files.move(file.toPath(), targetPath);
+            filesToProcess.add(targetPath.toFile());
+        }
+        return filesToProcess;
+    }
+
+    private Path resolveUniqueFilePath(Path directory, String originalFileName) {
+        Path filePath = directory.resolve(originalFileName);
+        int counter = 1;
+
+        while (Files.exists(filePath)) {
+            String newName = appendSuffixToFileName(originalFileName, "(" + counter + ")");
+            filePath = directory.resolve(newName);
+            counter++;
+        }
+
+        return filePath;
+    }
+
+    private String appendSuffixToFileName(String originalFileName, String suffix) {
+        int dotIndex = originalFileName.lastIndexOf('.');
+        if (dotIndex == -1) {
+            return originalFileName + suffix;
+        } else {
+            return originalFileName.substring(0, dotIndex) + suffix + originalFileName.substring(dotIndex);
+        }
+    }
+
+    private void runPipelineAgainstFiles(List<File> filesToProcess, PipelineConfig config, Path dir, Path processingDir) throws IOException {
+        try {
+            List<Resource> inputFiles = processor.generateInputFiles(filesToProcess.toArray(new File[0]));
+            if(inputFiles == null  || inputFiles.size() == 0) {
+            	return;
+            }
+            List<Resource> outputFiles =  processor.runPipelineAgainstFiles(inputFiles, config);
+            if (outputFiles == null) return;
+            moveAndRenameFiles(outputFiles, config, dir);
+            deleteOriginalFiles(filesToProcess, processingDir);
+        } catch (Exception e) {
+        	logger.error("error during processing", e);
+            moveFilesBack(filesToProcess, processingDir);
+        }
+    }
+
+    private void moveAndRenameFiles(List<Resource> resources, PipelineConfig config, Path dir) throws IOException {
+        for (Resource resource : resources) {
+            String outputFileName = createOutputFileName(resource, config);
+            Path outputPath = determineOutputPath(config, dir);
+
+            if (!Files.exists(outputPath)) {
+                Files.createDirectories(outputPath);
+                logger.info("Created directory: {}", outputPath);
+            }
+
+            Path outputFile = outputPath.resolve(outputFileName);
+            try (OutputStream os = new FileOutputStream(outputFile.toFile())) {
+                os.write(((ByteArrayResource) resource).getByteArray());
+            }
+
+            logger.info("File moved and renamed to {}", outputFile);
+        }
+    }
+
+    private String createOutputFileName(Resource resource, PipelineConfig config) {
+        String resourceName = resource.getFilename();
+        String baseName = resourceName.substring(0, resourceName.lastIndexOf('.'));
+        String extension = resourceName.substring(resourceName.lastIndexOf('.') + 1);
+
+        String outputFileName = config.getOutputPattern()
+            .replace("{filename}", baseName)
+            .replace("{pipelineName}", config.getName())
+            .replace("{date}", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")))
+            .replace("{time}", LocalTime.now().format(DateTimeFormatter.ofPattern("HHmmss")))
+            + "." + extension;
+
+        return outputFileName;
+    }
+
+    private Path determineOutputPath(PipelineConfig config, Path dir) {
+        String outputDir = config.getOutputDir()
+            .replace("{outputFolder}", finishedFoldersDir)
+            .replace("{folderName}", dir.toString())
+            .replaceAll("\\\\?watchedFolders", "");
+
+        return Paths.get(outputDir).isAbsolute() ? Paths.get(outputDir) : Paths.get(".", outputDir);
+    }
+
+    private void deleteOriginalFiles(List<File> filesToProcess, Path processingDir) throws IOException {
+        for (File file : filesToProcess) {
+            Files.deleteIfExists(processingDir.resolve(file.getName()));
+            logger.info("Deleted original file: {}", file.getName());
+        }
+    }
+
+    private void moveFilesBack(List<File> filesToProcess, Path processingDir) {
+        for (File file : filesToProcess) {
+            try {
+                Files.move(processingDir.resolve(file.getName()), file.toPath());
+                logger.info("Moved file back to original location: {} , {}",file.toPath(), file.getName());
+            } catch (IOException e) {
+                logger.error("Error moving file back to original location: {}", file.getName(), e);
+            }
+        }
+    }
+
+    
+}

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java

@@ -0,0 +1,328 @@
+package stirling.software.SPDF.controller.api.pipeline;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ByteArrayResource;
+import org.springframework.core.io.Resource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.multipart.MultipartFile;
+
+import jakarta.servlet.ServletContext;
+import stirling.software.SPDF.model.PipelineConfig;
+import stirling.software.SPDF.model.PipelineOperation;
+import stirling.software.SPDF.model.Role;
+
+@Service
+public class PipelineProcessor {
+
+	private static final Logger logger = LoggerFactory.getLogger(PipelineProcessor.class);
+
+
+	@Autowired
+	private ApiDocService apiDocService;
+    
+	@Autowired
+    private UserServiceInterface userService;
+	
+	@Autowired
+    private ServletContext servletContext;
+
+    
+
+
+	private String getApiKeyForUser() {
+		if (userService == null)
+			return "";
+		return userService.getApiKeyForUser(Role.INTERNAL_API_USER.getRoleId());
+	}
+
+
+	private String getBaseUrl() {
+		String contextPath = servletContext.getContextPath();
+		return "http://localhost:8080" + contextPath + "/";
+	}
+
+	 
+	 
+	List<Resource> runPipelineAgainstFiles(List<Resource> outputFiles, PipelineConfig config) throws Exception {
+
+		ByteArrayOutputStream logStream = new ByteArrayOutputStream();
+		PrintStream logPrintStream = new PrintStream(logStream);
+
+		boolean hasErrors = false;
+
+		for (PipelineOperation pipelineOperation : config.getOperations()) {
+			String operation = pipelineOperation.getOperation();
+			boolean isMultiInputOperation = apiDocService.isMultiInput(operation);
+
+			logger.info("Running operation: {} isMultiInputOperation {}", operation, isMultiInputOperation);
+			Map<String, Object> parameters = pipelineOperation.getParameters();
+			String inputFileExtension = "";
+			
+			//TODO
+			//if (operationNode.has("inputFileType")) {
+			//	inputFileExtension = operationNode.get("inputFileType").asText();
+			//} else {
+				inputFileExtension = ".pdf";
+			//}
+			final String finalInputFileExtension = inputFileExtension;
+			
+			String url = getBaseUrl() + operation;
+			
+			List<Resource> newOutputFiles = new ArrayList<>();
+			if (!isMultiInputOperation) {
+				for (Resource file : outputFiles) {
+					boolean hasInputFileType = false;
+					if (file.getFilename().endsWith(inputFileExtension)) {
+						hasInputFileType = true;
+						MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+						body.add("fileInput", file);
+
+						
+						for(Entry<String, Object> entry : parameters.entrySet()) {
+							body.add(entry.getKey(), entry.getValue());
+						}
+
+						ResponseEntity<byte[]> response = sendWebRequest(url, body);
+
+						// If the operation is filter and the response body is null or empty, skip this
+						// file
+						if (operation.startsWith("filter-")
+								&& (response.getBody() == null || response.getBody().length == 0)) {
+							logger.info("Skipping file due to failing {}", operation);
+							continue;
+						}
+
+						if (!response.getStatusCode().equals(HttpStatus.OK)) {
+							logPrintStream.println("Error: " + response.getBody());
+							hasErrors = true;
+							continue;
+						}
+						processOutputFiles(operation, file.getFilename(), response, newOutputFiles);
+						
+					}
+
+					if (!hasInputFileType) {
+						logPrintStream.println(
+								"No files with extension " + inputFileExtension + " found for operation " + operation);
+						hasErrors = true;
+					}
+
+					outputFiles = newOutputFiles;
+				}
+
+			} else {
+				 // Filter and collect all files that match the inputFileExtension
+			    List<Resource> matchingFiles = outputFiles.stream()
+			                                              .filter(file -> file.getFilename().endsWith(finalInputFileExtension))
+			                                              .collect(Collectors.toList());
+
+			    // Check if there are matching files
+			    if (!matchingFiles.isEmpty()) {
+			        // Create a new MultiValueMap for the request body
+			        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+
+			        // Add all matching files to the body
+			        for (Resource file : matchingFiles) {
+			            body.add("fileInput", file);
+			        }
+
+			        for(Entry<String, Object> entry : parameters.entrySet()) {
+						body.add(entry.getKey(), entry.getValue());
+					}
+		        
+			        ResponseEntity<byte[]> response = sendWebRequest(url, body);
+
+			        // Handle the response
+			        if (response.getStatusCode().equals(HttpStatus.OK)) {
+			        	processOutputFiles(operation, matchingFiles.get(0).getFilename(), response, newOutputFiles);
+			        } else {
+			            // Log error if the response status is not OK
+			            logPrintStream.println("Error in multi-input operation: " + response.getBody());
+			            hasErrors = true;
+			        }
+			    } else {
+			        logPrintStream.println("No files with extension " + inputFileExtension + " found for multi-input operation " + operation);
+			        hasErrors = true;
+			    }
+			}
+			logPrintStream.close();
+
+		}
+		if (hasErrors) {
+			logger.error("Errors occurred during processing. Log: {}", logStream.toString());
+		}
+		return outputFiles;
+	}
+
+	private ResponseEntity<byte[]> sendWebRequest(String url, MultiValueMap<String, Object> body ){
+		RestTemplate restTemplate = new RestTemplate();
+		
+		 // Set up headers, including API key
+        HttpHeaders headers = new HttpHeaders();
+        String apiKey = getApiKeyForUser();
+        headers.add("X-API-Key", apiKey);
+        headers.setContentType(MediaType.MULTIPART_FORM_DATA);
+
+        // Create HttpEntity with the body and headers
+        HttpEntity<MultiValueMap<String, Object>> entity = new HttpEntity<>(body, headers);
+
+        // Make the request to the REST endpoint
+        return restTemplate.exchange(url, HttpMethod.POST, entity, byte[].class);
+	}
+	
+	private List<Resource> processOutputFiles(String operation, String fileName, ResponseEntity<byte[]> response, List<Resource> newOutputFiles) throws IOException{
+		// Define filename
+		String newFilename;
+		if ("auto-rename".equals(operation)) {
+			// If the operation is "auto-rename", generate a new filename.
+			// This is a simple example of generating a filename using current timestamp.
+			// Modify as per your needs.
+			newFilename = "file_" + System.currentTimeMillis();
+		} else {
+			// Otherwise, keep the original filename.
+			newFilename = fileName;
+		}
+
+		// Check if the response body is a zip file
+		if (isZip(response.getBody())) {
+			// Unzip the file and add all the files to the new output files
+			newOutputFiles.addAll(unzip(response.getBody()));
+		} else {
+			Resource outputResource = new ByteArrayResource(response.getBody()) {
+				@Override
+				public String getFilename() {
+					return newFilename;
+				}
+			};
+			newOutputFiles.add(outputResource);
+		}
+		
+		return newOutputFiles;
+		
+	}
+	List<Resource> generateInputFiles(File[] files) throws Exception {
+		if (files == null || files.length == 0) {
+			logger.info("No files");
+			return null;
+		}
+
+	
+		List<Resource> outputFiles = new ArrayList<>();
+
+		for (File file : files) {
+			Path path = Paths.get(file.getAbsolutePath());
+			logger.info("Reading file: " + path); // debug statement
+
+			if (Files.exists(path)) {
+				Resource fileResource = new ByteArrayResource(Files.readAllBytes(path)) {
+					@Override
+					public String getFilename() {
+						return file.getName();
+					}
+				};
+				outputFiles.add(fileResource);
+			} else {
+				logger.info("File not found: " + path);
+			}
+		}
+		logger.info("Files successfully loaded. Starting processing...");
+		return outputFiles;
+	}
+
+	List<Resource> generateInputFiles(MultipartFile[] files) throws Exception {
+		if (files == null || files.length == 0) {
+			logger.info("No files");
+			return null;
+		}
+
+		List<Resource> outputFiles = new ArrayList<>();
+
+		for (MultipartFile file : files) {
+			Resource fileResource = new ByteArrayResource(file.getBytes()) {
+				@Override
+				public String getFilename() {
+					return file.getOriginalFilename();
+				}
+			};
+			outputFiles.add(fileResource);
+		}
+		logger.info("Files successfully loaded. Starting processing...");
+		return outputFiles;
+	}
+
+	private boolean isZip(byte[] data) {
+		if (data == null || data.length < 4) {
+			return false;
+		}
+
+		// Check the first four bytes of the data against the standard zip magic number
+		return data[0] == 0x50 && data[1] == 0x4B && data[2] == 0x03 && data[3] == 0x04;
+	}
+
+	private List<Resource> unzip(byte[] data) throws IOException {
+		logger.info("Unzipping data of length: {}", data.length);
+		List<Resource> unzippedFiles = new ArrayList<>();
+
+		try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
+				ZipInputStream zis = new ZipInputStream(bais)) {
+
+			ZipEntry entry;
+			while ((entry = zis.getNextEntry()) != null) {
+				ByteArrayOutputStream baos = new ByteArrayOutputStream();
+				byte[] buffer = new byte[1024];
+				int count;
+
+				while ((count = zis.read(buffer)) != -1) {
+					baos.write(buffer, 0, count);
+				}
+
+				final String filename = entry.getName();
+				Resource fileResource = new ByteArrayResource(baos.toByteArray()) {
+					@Override
+					public String getFilename() {
+						return filename;
+					}
+				};
+
+				// If the unzipped file is a zip file, unzip it
+				if (isZip(baos.toByteArray())) {
+					logger.info("File {} is a zip file. Unzipping...", filename);
+					unzippedFiles.addAll(unzip(baos.toByteArray()));
+				} else {
+					unzippedFiles.add(fileResource);
+				}
+			}
+		}
+
+		logger.info("Unzipping completed. {} files were unzipped.", unzippedFiles.size());
+		return unzippedFiles;
+	}
+
+}

src/main/java/stirling/software/SPDF/controller/api/pipeline/UserServiceInterface.java

@@ -0,0 +1,4 @@
+package stirling.software.SPDF.controller.api.pipeline;
+public interface UserServiceInterface {
+    String getApiKeyForUser(String username);
+}

src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java

@@ -12,6 +12,7 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 
@@ -130,7 +131,8 @@ public class CertSignController {
 		signature.setName(name);
 		signature.setLocation(location);
 		signature.setReason(reason);
-
+		signature.setSignDate(Calendar.getInstance());
+		
 		// Load the PDF
 		try (PDDocument document = PDDocument.load(pdf.getBytes())) {
 			logger.info("Successfully loaded the provided PDF");

src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java

@@ -386,12 +386,16 @@ public class GetInfoOnPDF {
                 float width = mediaBox.getWidth();
                 float height = mediaBox.getHeight();
 
-                pageInfo.put("Width", width);
-                pageInfo.put("Height", height);
+                ObjectNode sizeInfo = objectMapper.createObjectNode();
+                
+                getDimensionInfo(sizeInfo, width, height);
+                
+                sizeInfo.put("Standard Page", getPageSize(width, height));
+                pageInfo.set("Size", sizeInfo);
+                		
                 pageInfo.put("Rotation", page.getRotation());
-
                 pageInfo.put("Page Orientation", getPageOrientation(width, height));
-                pageInfo.put("Standard Size", getPageSize(width, height));
+                
 
                 // Boxes
                 pageInfo.put("MediaBox", mediaBox.toString());
@@ -620,7 +624,7 @@ public class GetInfoOnPDF {
 
                 
 
-                pageInfoParent.set("Page " + pageNum, pageInfo);
+                pageInfoParent.set("Page " + (pageNum+1), pageInfo);
             }
 
             
@@ -670,28 +674,52 @@ public class GetInfoOnPDF {
             return "Square";
         }
     }
-    public String getPageSize(double width, double height) {
-        // Common aspect ratios used for standard paper sizes
-        double[] aspectRatios = {4.0 / 3.0, 3.0 / 2.0, Math.sqrt(2.0), 16.0 / 9.0};
+    public String getPageSize(float width, float height) {
+        // Define standard page sizes
+        Map<String, PDRectangle> standardSizes = new HashMap<>();
+        standardSizes.put("Letter", PDRectangle.LETTER);
+        standardSizes.put("LEGAL", PDRectangle.LEGAL);
+        standardSizes.put("A0", PDRectangle.A0);
+        standardSizes.put("A1", PDRectangle.A1);
+        standardSizes.put("A2", PDRectangle.A2);
+        standardSizes.put("A3", PDRectangle.A3);
+        standardSizes.put("A4", PDRectangle.A4);
+        standardSizes.put("A5", PDRectangle.A5);
+        standardSizes.put("A6", PDRectangle.A6);
 
-        // Check if the page matches any common aspect ratio
-        for (double aspectRatio : aspectRatios) {
-            if (isCloseToAspectRatio(width, height, aspectRatio)) {
-                return "Standard";
+        for (Map.Entry<String, PDRectangle> entry : standardSizes.entrySet()) {
+            PDRectangle size = entry.getValue();
+            if (isCloseToSize(width, height, size.getWidth(), size.getHeight())) {
+                return entry.getKey();
             }
         }
-
-        // If not a standard aspect ratio, consider it as a custom size
         return "Custom";
     }
-    private boolean isCloseToAspectRatio(double width, double height, double aspectRatio) {
-        // Calculate the aspect ratio of the page
-        double pageAspectRatio = width / height;
 
-        // Compare the page aspect ratio with the common aspect ratio within a threshold
-        return Math.abs(pageAspectRatio - aspectRatio) <= 0.05;
+    private boolean isCloseToSize(float width, float height, float standardWidth, float standardHeight) {
+        float tolerance = 1.0f; // You can adjust the tolerance as needed
+        return Math.abs(width - standardWidth) <= tolerance && Math.abs(height - standardHeight) <= tolerance;
     }
-    
+
+
+    public ObjectNode getDimensionInfo(ObjectNode dimensionInfo, float width, float height) {      
+        float ppi = 72; // Points Per Inch
+        
+        float widthInInches = width / ppi;
+        float heightInInches = height / ppi;
+        
+        float widthInCm = widthInInches * 2.54f;
+        float heightInCm = heightInInches * 2.54f;
+        
+        dimensionInfo.put("Width (px)", String.format("%.2f", width));
+        dimensionInfo.put("Height (px)", String.format("%.2f", height));
+        dimensionInfo.put("Width (in)", String.format("%.2f", widthInInches));
+        dimensionInfo.put("Height (in)", String.format("%.2f", heightInInches));
+        dimensionInfo.put("Width (cm)", String.format("%.2f", widthInCm));
+        dimensionInfo.put("Height (cm)", String.format("%.2f", heightInCm));
+        return dimensionInfo;
+    }
+
 
 
 public static boolean checkForStandard(PDDocument document, String standardKeyword) {

src/main/java/stirling/software/SPDF/controller/api/strippers/PDFTableStripper.java

@@ -0,0 +1,358 @@
+package stirling.software.SPDF.controller.api.strippers;
+
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.fontbox.util.BoundingBox;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.font.PDType3Font;
+import org.apache.pdfbox.text.PDFTextStripper;
+import org.apache.pdfbox.text.PDFTextStripperByArea;
+import org.apache.pdfbox.text.TextPosition;
+
+/**
+ *
+ * Class to extract tabular data from a PDF.
+ * Works by making a first pass of the page to group all nearby text items
+ * together, and then inferring a 2D grid from these regions. Each table cell
+ * is then extracted using a PDFTextStripperByArea object.
+ *
+ * Works best when
+ * headers are included in the detected region, to ensure representative text
+ * in every column.
+ *
+ * Based upon DrawPrintTextLocations PDFBox example
+ * (https://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/DrawPrintTextLocations.java)
+ *
+ * @author Beldaz
+ */
+public class PDFTableStripper extends PDFTextStripper
+{
+
+    /**
+     * This will print the documents data, for each table cell.
+     *
+     * @param args The command line arguments.
+     *
+     * @throws IOException If there is an error parsing the document.
+     */
+    /*
+     *  Used in methods derived from DrawPrintTextLocations
+     */
+    private AffineTransform flipAT;
+    private AffineTransform rotateAT;
+
+    /**
+     *  Regions updated by calls to writeString
+     */
+    private Set<Rectangle2D> boxes;
+
+    // Border to allow when finding intersections
+    private double dx = 1.0; // This value works for me, feel free to tweak (or add setter)
+    private double dy = 0.000; // Rows of text tend to overlap, so need to extend
+
+    /**
+     *  Region in which to find table (otherwise whole page)
+     */
+    private Rectangle2D regionArea;
+
+    /**
+     * Number of rows in inferred table
+     */
+    private int nRows=0;
+
+    /**
+     * Number of columns in inferred table
+     */
+    private int nCols=0;
+
+    /**
+     * This is the object that does the text extraction
+     */
+    private PDFTextStripperByArea regionStripper;
+
+    /**
+     * 1D intervals - used for calculateTableRegions()
+     * @author Beldaz
+     *
+     */
+    public static class Interval {
+        double start;
+        double end;
+        public Interval(double start, double end) {
+            this.start=start; this.end = end;
+        }
+        public void add(Interval col) {
+            if(col.start<start)
+                start = col.start;
+            if(col.end>end)
+                end = col.end;
+        }
+        public static void addTo(Interval x, LinkedList<Interval> columns) {
+            int p = 0;
+            Iterator<Interval> it = columns.iterator();
+            // Find where x should go
+            while(it.hasNext()) {
+                Interval col = it.next();
+                if(x.end>=col.start) {
+                    if(x.start<=col.end) { // overlaps
+                        x.add(col);
+                        it.remove();
+                    }
+                    break;
+                }
+                ++p;
+            }
+            while(it.hasNext()) {
+                Interval col = it.next();
+                if(x.start>col.end)
+                    break;
+                x.add(col);
+                it.remove();
+            }
+            columns.add(p, x);
+        }
+
+    }
+
+
+    /**
+     * Instantiate a new PDFTableStripper object.
+     *
+     * @param document
+     * @throws IOException If there is an error loading the properties.
+     */
+    public PDFTableStripper() throws IOException
+    {
+        super.setShouldSeparateByBeads(false);
+        regionStripper = new PDFTextStripperByArea();
+        regionStripper.setSortByPosition( true );
+    }
+
+    /**
+     * Define the region to group text by.
+     *
+     * @param rect The rectangle area to retrieve the text from.
+     */
+    public void setRegion(Rectangle2D rect )
+    {
+        regionArea = rect;
+    }
+
+    public int getRows()
+    {
+        return nRows;
+    }
+
+    public int getColumns()
+    {
+        return nCols;
+    }
+
+    /**
+     * Get the text for the region, this should be called after extractTable().
+     *
+     * @return The text that was identified in that region.
+     */
+    public String getText(int row, int col)
+    {
+        return regionStripper.getTextForRegion("el"+col+"x"+row);
+    }
+
+    public void extractTable(PDPage pdPage) throws IOException
+    {
+        setStartPage(getCurrentPageNo());
+        setEndPage(getCurrentPageNo());
+
+        boxes = new HashSet<Rectangle2D>();
+        // flip y-axis
+        flipAT = new AffineTransform();
+        flipAT.translate(0, pdPage.getBBox().getHeight());
+        flipAT.scale(1, -1);
+
+        // page may be rotated
+        rotateAT = new AffineTransform();
+        int rotation = pdPage.getRotation();
+        if (rotation != 0)
+        {
+            PDRectangle mediaBox = pdPage.getMediaBox();
+            switch (rotation)
+            {
+                case 90:
+                    rotateAT.translate(mediaBox.getHeight(), 0);
+                    break;
+                case 270:
+                    rotateAT.translate(0, mediaBox.getWidth());
+                    break;
+                case 180:
+                    rotateAT.translate(mediaBox.getWidth(), mediaBox.getHeight());
+                    break;
+                default:
+                    break;
+            }
+            rotateAT.rotate(Math.toRadians(rotation));
+        }
+        // Trigger processing of the document so that writeString is called.
+        try (Writer dummy = new OutputStreamWriter(new ByteArrayOutputStream())) {
+            super.output = dummy;
+            super.processPage(pdPage);
+        }
+
+        Rectangle2D[][] regions = calculateTableRegions();
+
+//        System.err.println("Drawing " + nCols + "x" + nRows + "="+ nRows*nCols + " regions");
+        for(int i=0; i<nCols; ++i) {
+            for(int j=0; j<nRows; ++j) {
+                final Rectangle2D region = regions[i][j];
+                regionStripper.addRegion("el"+i+"x"+j, region);
+            }
+        }
+
+        regionStripper.extractRegions(pdPage);
+    }
+
+    /**
+     * Infer a rectangular grid of regions from the boxes field.
+     *
+     * @return 2D array of table regions (as Rectangle2D objects). Note that
+     * some of these regions may have no content.
+     */
+    private Rectangle2D[][] calculateTableRegions() {
+
+        // Build up a list of all table regions, based upon the populated
+        // regions of boxes field. Treats the horizontal and vertical extents
+        // of each box as distinct
+        LinkedList<Interval> columns = new LinkedList<Interval>();
+        LinkedList<Interval> rows = new LinkedList<Interval>();
+
+        for(Rectangle2D box: boxes) {
+            Interval x = new Interval(box.getMinX(), box.getMaxX());
+            Interval y = new Interval(box.getMinY(), box.getMaxY());
+
+            Interval.addTo(x, columns);
+            Interval.addTo(y, rows);
+        }
+
+        nRows = rows.size();
+        nCols = columns.size();
+        Rectangle2D[][] regions = new Rectangle2D[nCols][nRows];
+        int i=0;
+        // Label regions from top left, rather than the transformed orientation
+        for(Interval column: columns) {
+            int j=0;
+            for(Interval row: rows) {
+                regions[nCols-i-1][nRows-j-1] = new Rectangle2D.Double(column.start, row.start, column.end - column.start, row.end - row.start);
+                ++j;
+            }
+            ++i;
+        }
+
+        return regions;
+    }
+
+    /**
+     * Register each character's bounding box, updating boxes field to maintain
+     * a list of all distinct groups of characters.
+     *
+     * Overrides the default functionality of PDFTextStripper.
+     * Most of this is taken from DrawPrintTextLocations.java, with extra steps
+     * at end of main loop
+     */
+    @Override
+    protected void writeString(String string, List<TextPosition> textPositions) throws IOException
+    {
+        for (TextPosition text : textPositions)
+        {
+            // glyph space -> user space
+            // note: text.getTextMatrix() is *not* the Text Matrix, it's the Text Rendering Matrix
+            AffineTransform at = text.getTextMatrix().createAffineTransform();
+            PDFont font = text.getFont();
+            BoundingBox bbox = font.getBoundingBox();
+
+            // advance width, bbox height (glyph space)
+            float xadvance = font.getWidth(text.getCharacterCodes()[0]); // todo: should iterate all chars
+            Rectangle2D.Float rect = new Rectangle2D.Float(0, bbox.getLowerLeftY(), xadvance, bbox.getHeight());
+
+            if (font instanceof PDType3Font)
+            {
+                // bbox and font matrix are unscaled
+                at.concatenate(font.getFontMatrix().createAffineTransform());
+            }
+            else
+            {
+                // bbox and font matrix are already scaled to 1000
+                at.scale(1/1000f, 1/1000f);
+            }
+            Shape s = at.createTransformedShape(rect);
+            s = flipAT.createTransformedShape(s);
+            s = rotateAT.createTransformedShape(s);
+
+
+            //
+            // Merge character's bounding box with boxes field
+            //
+            Rectangle2D bounds = s.getBounds2D();
+            // Pad sides to detect almost touching boxes
+            Rectangle2D hitbox = bounds.getBounds2D();
+            hitbox.add(bounds.getMinX() - dx , bounds.getMinY() - dy);
+            hitbox.add(bounds.getMaxX() + dx , bounds.getMaxY() + dy);
+
+            // Find all overlapping boxes
+            List<Rectangle2D> intersectList = new ArrayList<Rectangle2D>();
+            for(Rectangle2D box: boxes) {
+                if(box.intersects(hitbox)) {
+                    intersectList.add(box);
+                }
+            }
+
+            // Combine all touching boxes and update
+            // (NOTE: Potentially this could leave some overlapping boxes un-merged,
+            // but it's sufficient for now and get's fixed up in calculateTableRegions)
+            for(Rectangle2D box: intersectList) {
+                bounds.add(box);
+                boxes.remove(box);
+            }
+            boxes.add(bounds);
+
+        }
+
+    }
+
+    /**
+     * This method does nothing in this derived class, because beads and regions are incompatible. Beads are
+     * ignored when stripping by area.
+     *
+     * @param aShouldSeparateByBeads The new grouping of beads.
+     */
+    @Override
+    public final void setShouldSeparateByBeads(boolean aShouldSeparateByBeads)
+    {
+    }
+
+    /**
+     * Adapted from PDFTextStripperByArea
+     * {@inheritDoc}
+     */
+    @Override
+    protected void processTextPosition( TextPosition text )
+    {
+        if(regionArea!=null && !regionArea.contains( text.getX(), text.getY() ) ) {
+            // skip character
+        } else {
+            super.processTextPosition( text );
+        }
+    }
+}

src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java

@@ -1,4 +1,5 @@
 package stirling.software.SPDF.controller.web;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 
@@ -15,6 +16,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
+import stirling.software.SPDF.model.Authority;
+import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.UserRepository;
 @Controller
@@ -46,14 +49,28 @@ public class AccountWebController {
 	@PreAuthorize("hasRole('ROLE_ADMIN')")
 	@GetMapping("/addUsers")
 	public String showAddUserForm(Model model,  Authentication authentication) {
-	    List<User> allUsers = userRepository.findAll();
+		List<User> allUsers = userRepository.findAll();
+		Iterator<User> iterator = allUsers.iterator();
+
+		while(iterator.hasNext()) {
+		    User user = iterator.next();
+		    if(user != null) {
+		    	 for (Authority authority : user.getAuthorities()) {
+		             if (authority.getAuthority().equals(Role.INTERNAL_API_USER.getRoleId())) {
+		                 iterator.remove();
+		                 break; // Break out of the inner loop once the user is removed
+		             }
+		         }
+		    }
+		}
+
 	    model.addAttribute("users", allUsers);
 	    model.addAttribute("currentUsername", authentication.getName());
 	    return "addUsers";
 	}
 
 	
-	
+	@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
 	@GetMapping("/account")
 	public String account(HttpServletRequest request, Model model, Authentication authentication) {
 		if (authentication == null || !authentication.isAuthenticated()) {
@@ -100,7 +117,7 @@ public class AccountWebController {
 	}
 	 
 	
-	
+	@PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
 	@GetMapping("/change-creds")
 	public String changeCreds(HttpServletRequest request, Model model, Authentication authentication) {
 		if (authentication == null || !authentication.isAuthenticated()) {

src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java

@@ -99,6 +99,14 @@ public class ConverterWebController {
         return modelAndView;
     }
 
+    @GetMapping("/pdf-to-csv")
+    @Hidden
+    public ModelAndView pdfToCSV() {
+        ModelAndView modelAndView = new ModelAndView("convert/pdf-to-csv");
+        modelAndView.addObject("currentPage", "pdf-to-csv");
+        return modelAndView;
+    }
+
 
     @GetMapping("/pdf-to-pdfa")
     @Hidden

src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java

@@ -1,4 +1,6 @@
 package stirling.software.SPDF.controller.web;
+
+import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -40,31 +42,44 @@ public class GeneralWebController {
 	    model.addAttribute("currentPage", "pipeline");
 
 	    List<String> pipelineConfigs = new ArrayList<>();
-	    try (Stream<Path> paths = Files.walk(Paths.get("./pipeline/defaultWebUIConfigs/"))) {
-	        List<Path> jsonFiles = paths
-	            .filter(Files::isRegularFile)
-	            .filter(p -> p.toString().endsWith(".json"))
-	            .collect(Collectors.toList());
-
-	        for (Path jsonFile : jsonFiles) {
-	            String content = Files.readString(jsonFile, StandardCharsets.UTF_8);
-	            pipelineConfigs.add(content);
-	        }
-	        List<Map<String, String>> pipelineConfigsWithNames = new ArrayList<>();
-	        for (String config : pipelineConfigs) {
-	        	Map<String, Object> jsonContent = new ObjectMapper().readValue(config, new TypeReference<Map<String, Object>>(){});
-
-	            String name = (String) jsonContent.get("name");
-	            Map<String, String> configWithName = new HashMap<>();
-	            configWithName.put("json", config);
-	            configWithName.put("name", name);
+	    List<Map<String, String>> pipelineConfigsWithNames = new ArrayList<>();
+	    
+	    if(new File("./pipeline/defaultWebUIConfigs/").exists()) {
+		    try (Stream<Path> paths = Files.walk(Paths.get("./pipeline/defaultWebUIConfigs/"))) {
+		        List<Path> jsonFiles = paths
+		            .filter(Files::isRegularFile)
+		            .filter(p -> p.toString().endsWith(".json"))
+		            .collect(Collectors.toList());
+	
+		        for (Path jsonFile : jsonFiles) {
+		            String content = Files.readString(jsonFile, StandardCharsets.UTF_8);
+		            pipelineConfigs.add(content);
+		        }
+		        
+		        for (String config : pipelineConfigs) {
+		        	Map<String, Object> jsonContent = new ObjectMapper().readValue(config, new TypeReference<Map<String, Object>>(){});
+	
+		            String name = (String) jsonContent.get("name");
+		            Map<String, String> configWithName = new HashMap<>();
+		            configWithName.put("json", config);
+		            configWithName.put("name", name);
+		            pipelineConfigsWithNames.add(configWithName);
+		        }
+		        
+		        
+		        
+	
+		    } catch (IOException e) {
+		        e.printStackTrace();
+		    }
+		}
+	    if(pipelineConfigsWithNames.size() == 0) {
+	    	 Map<String, String> configWithName = new HashMap<>();
+	            configWithName.put("json", "");
+	            configWithName.put("name", "No preloaded configs found");
 	            pipelineConfigsWithNames.add(configWithName);
-	        }
-	        model.addAttribute("pipelineConfigsWithNames", pipelineConfigsWithNames);
-
-	    } catch (IOException e) {
-	        e.printStackTrace();
 	    }
+	    model.addAttribute("pipelineConfigsWithNames", pipelineConfigsWithNames);
 
 	    model.addAttribute("pipelineConfigs", pipelineConfigs);
 
@@ -81,6 +96,19 @@ public class GeneralWebController {
         return "merge-pdfs";
     }
     
+    @GetMapping("/split-pdf-by-sections")
+    @Hidden
+    public String splitPdfBySections(Model model) {
+        model.addAttribute("currentPage", "split-pdf-by-sections");
+        return "split-pdf-by-sections";
+    }
+
+    @GetMapping("/view-pdf")
+    @Hidden
+    public String ViewPdfForm2(Model model) {
+        model.addAttribute("currentPage", "view-pdf");
+        return "view-pdf";
+    }
     
     @GetMapping("/multi-tool")
     @Hidden
@@ -155,6 +183,20 @@ public class GeneralWebController {
         return "scale-pages";
     }
     
+
+    @GetMapping("/split-by-size-or-count")
+    @Hidden
+    public String splitBySizeOrCount(Model model) {
+        model.addAttribute("currentPage", "split-by-size-or-count");
+        return "split-by-size-or-count";
+    }
+    
+    @GetMapping("/overlay-pdf")
+    @Hidden
+    public String overlayPdf(Model model) {
+        model.addAttribute("currentPage", "overlay-pdf");
+        return "overlay-pdf";
+    }
     
     
     @Autowired

src/main/java/stirling/software/SPDF/controller/web/MetricsController.java

@@ -27,8 +27,8 @@ import stirling.software.SPDF.config.StartupApplicationListener;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @RestController
-@RequestMapping("/api/v1")
-@Tag(name = "API", description = "Info APIs")
+@RequestMapping("/api/v1/info")
+@Tag(name = "Info", description = "Info APIs")
 public class MetricsController {
 
 	

src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java

@@ -78,7 +78,7 @@ public class OtherWebController {
     }
     
     public List<String> getAvailableTesseractLanguages() {
-        String tessdataDir = "/usr/share/tesseract-ocr/4.00/tessdata";
+        String tessdataDir = "/usr/share/tesseract-ocr/5/tessdata";
         File[] files = new File(tessdataDir).listFiles();
         if (files == null) {
             return Collections.emptyList();
@@ -98,7 +98,7 @@ public class OtherWebController {
         return modelAndView;
     }
     
-
+    
     @GetMapping("/add-image")
     @Hidden
     public String overlayImage(Model model) {
@@ -126,7 +126,13 @@ public class OtherWebController {
         model.addAttribute("currentPage", "remove-blanks");
         return "misc/remove-blanks";
     }
-    
+
+    @GetMapping("/remove-annotations")
+    @Hidden
+    public String removeAnnotationsForm(Model model) {
+        model.addAttribute("currentPage", "remove-annotations");
+        return "misc/remove-annotations";
+    }
 
     @GetMapping("/auto-crop")
     @Hidden

src/main/java/stirling/software/SPDF/model/ApiEndpoint.java

@@ -0,0 +1,42 @@
+package stirling.software.SPDF.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+public class ApiEndpoint {
+    private String name;
+    private Map<String, JsonNode> parameters;
+    private String description;
+    
+    public ApiEndpoint(String name, JsonNode postNode) {
+        this.name = name;
+        this.parameters = new HashMap<>();
+        postNode.path("parameters").forEach(paramNode -> {
+            String paramName = paramNode.path("name").asText();
+            parameters.put(paramName, paramNode);
+        });
+        this.description = postNode.path("description").asText();
+    }
+
+    public boolean areParametersValid(Map<String, Object> providedParams) {
+        for (String requiredParam : parameters.keySet()) {
+            if (!providedParams.containsKey(requiredParam)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+    
+	@Override
+	public String toString() {
+		return "ApiEndpoint [name=" + name + ", parameters=" + parameters + "]";
+	}
+    
+    
+}

src/main/java/stirling/software/SPDF/model/ApplicationProperties.java

@@ -105,7 +105,35 @@ public class ApplicationProperties {
 	public static class Security {
 		private Boolean enableLogin;
 		private Boolean csrfDisabled;
+		private InitialLogin initialLogin;
+		private int loginAttemptCount;
+		private long loginResetTimeMinutes;
 
+		
+		public int getLoginAttemptCount() {
+			return loginAttemptCount;
+		}
+
+		public void setLoginAttemptCount(int loginAttemptCount) {
+			this.loginAttemptCount = loginAttemptCount;
+		}
+
+		public long getLoginResetTimeMinutes() {
+			return loginResetTimeMinutes;
+		}
+
+		public void setLoginResetTimeMinutes(long loginResetTimeMinutes) {
+			this.loginResetTimeMinutes = loginResetTimeMinutes;
+		}
+
+		public InitialLogin getInitialLogin() {
+			return initialLogin != null ? initialLogin : new InitialLogin();
+		}
+
+		public void setInitialLogin(InitialLogin initialLogin) {
+			this.initialLogin = initialLogin;
+		}
+		
 		public Boolean getEnableLogin() {
 			return enableLogin;
 		}
@@ -125,9 +153,39 @@ public class ApplicationProperties {
 		
 		@Override
 		public String toString() {
-			return "Security [enableLogin=" + enableLogin + ", csrfDisabled="
+			return "Security [enableLogin=" + enableLogin + ", initialLogin=" + initialLogin + ",  csrfDisabled="
 					+ csrfDisabled + "]";
 		}
+		
+		public static class InitialLogin {
+
+			private String username;
+			private String password;
+
+			public String getUsername() {
+				return username;
+			}
+
+			public void setUsername(String username) {
+				this.username = username;
+			}
+
+			public String getPassword() {
+				return password;
+			}
+
+			public void setPassword(String password) {
+				this.password = password;
+			}
+
+			@Override
+			public String toString() {
+				return "InitialLogin [username=" + username + ", password=" + (password != null && !password.isEmpty() ? "MASKED" : "NULL") + "]";
+			}
+
+
+
+		}
 	}
 
 	public static class System {
@@ -136,6 +194,19 @@ public class ApplicationProperties {
 		private String rootURIPath;
 		private String customStaticFilePath;
 		private Integer maxFileSize;
+		
+		private Boolean  enableAlphaFunctionality;
+		
+		
+		
+
+		public Boolean getEnableAlphaFunctionality() {
+			return enableAlphaFunctionality;
+		}
+
+		public void setEnableAlphaFunctionality(Boolean enableAlphaFunctionality) {
+			this.enableAlphaFunctionality = enableAlphaFunctionality;
+		}
 
 		public String getDefaultLocale() {
 			return defaultLocale;
@@ -179,12 +250,13 @@ public class ApplicationProperties {
 
 		@Override
 		public String toString() {
-			return "System [defaultLocale=" + defaultLocale + ", googlevisibility=" + googlevisibility + ", rootURIPath="
-					+ rootURIPath + ", customStaticFilePath=" + customStaticFilePath + ", maxFileSize=" + maxFileSize
-					+ "]";
+			return "System [defaultLocale=" + defaultLocale + ", googlevisibility=" + googlevisibility
+					+ ", rootURIPath=" + rootURIPath + ", customStaticFilePath=" + customStaticFilePath
+					+ ", maxFileSize=" + maxFileSize + ", enableAlphaFunctionality=" + enableAlphaFunctionality + "]";
 		}
 
 		
+		
 	}
 
 	public static class Ui {
@@ -193,6 +265,8 @@ public class ApplicationProperties {
 	    private String appNameNavbar;
 
 	    public String getAppName() {
+	    	if(appName != null && appName.trim().length() == 0)
+	    		return null;
 	        return appName;
 	    }
 
@@ -201,6 +275,8 @@ public class ApplicationProperties {
 	    }
 
 	    public String getHomeDescription() {
+	    	if(homeDescription != null && homeDescription.trim().length() == 0)
+	    		return null;
 	        return homeDescription;
 	    }
 
@@ -209,6 +285,8 @@ public class ApplicationProperties {
 	    }
 
 	    public String getAppNameNavbar() {
+	    	if(appNameNavbar != null && appNameNavbar.trim().length() == 0)
+	    		return null;
 	        return appNameNavbar;
 	    }
 

src/main/java/stirling/software/SPDF/model/AttemptCounter.java

@@ -0,0 +1,27 @@
+package stirling.software.SPDF.model;
+public class AttemptCounter {
+    private int attemptCount;
+    private long lastAttemptTime;
+
+    public AttemptCounter() {
+        this.attemptCount = 1;
+        this.lastAttemptTime = System.currentTimeMillis();
+    }
+
+    public void increment() {
+        this.attemptCount++;
+        this.lastAttemptTime = System.currentTimeMillis();
+    }
+
+    public int getAttemptCount() {
+        return attemptCount;
+    }
+
+    public long getlastAttemptTime() {
+        return lastAttemptTime;
+    }
+
+    public boolean shouldReset(long ATTEMPT_INCREMENT_TIME) {
+        return System.currentTimeMillis() - lastAttemptTime > ATTEMPT_INCREMENT_TIME;
+    }
+}

src/main/java/stirling/software/SPDF/model/Role.java

@@ -14,8 +14,13 @@ public enum Role {
     EXTRA_LIMITED_API_USER("ROLE_EXTRA_LIMITED_API_USER", 20, 20),
 
     // 0 API calls per day and 20 web calls
-    WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20);
+    WEB_ONLY_USER("ROLE_WEB_ONLY_USER", 0, 20),
+	
+	
+	INTERNAL_API_USER("STIRLING-PDF-BACKEND-API-USER", Integer.MAX_VALUE, Integer.MAX_VALUE),
 
+	DEMO_USER("ROLE_DEMO_USER", 100, 100);
+	
     private final String roleId;
     private final int apiCallsPerDay;
     private final int webCallsPerDay;

src/main/java/stirling/software/SPDF/model/api/HandleDataRequest.java

@@ -13,8 +13,8 @@ import lombok.NoArgsConstructor;
 public class HandleDataRequest {
 
     @Schema(description = "The input files")
-    private MultipartFile[] fileInputs;
+    private MultipartFile[] fileInput;
 
     @Schema(description = "JSON String")
-    private String jsonString;
+    private String json;
 }

src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,7 +19,7 @@ public class PDFWithPageNums extends PDFFile {
 	@Schema(description = "The pages to select, Supports ranges (e.g., '1,3,5-9'), or 'all' or functions in the format 'an+b' where 'a' is the multiplier of the page number 'n', and 'b' is a constant (e.g., '2n+1', '3n', '6n-5')\"")
     private String pageNumbers;
 	
-	
+	@Hidden
 	public List<Integer> getPageNumbersList(){
 		int pageCount = 0;
 		try {
@@ -30,6 +31,8 @@ public class PDFWithPageNums extends PDFFile {
 		return GeneralUtils.parsePageString(pageNumbers, pageCount);
 		
 	}
+	
+	@Hidden
 	public List<Integer> getPageNumbersList(PDDocument doc){
 		int pageCount = 0;
 		pageCount = doc.getNumberOfPages();

src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java

@@ -0,0 +1,16 @@
+package stirling.software.SPDF.model.api;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper=true)
+public class SplitPdfBySectionsRequest extends PDFFile {
+	@Schema(description = "Number of horizontal divisions for each PDF page", example = "2")
+    private int horizontalDivisions;
+
+    @Schema(description = "Number of vertical divisions for each PDF page", example = "2")
+    private int verticalDivisions;
+}

src/main/java/stirling/software/SPDF/model/api/extract/PDFFilePage.java

@@ -0,0 +1,18 @@
+package stirling.software.SPDF.model.api.extract;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import stirling.software.SPDF.model.api.PDFFile;
+
+@Data
+@EqualsAndHashCode(callSuper=true)
+public class PDFFilePage extends PDFFile {
+
+
+    @Schema(description = "Number of chosen page", type = "number")
+    private int pageId;
+
+
+}
+

src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java

@@ -12,4 +12,7 @@ public class MergeMultiplePagesRequest extends PDFFile {
     @Schema(description = "The number of pages to fit onto a single sheet in the output PDF.",
             type = "integer", allowableValues = {"2", "3", "4", "9", "16"})
     private int pagesPerSheet;
+    
+    @Schema(description = "Boolean for if you wish to add border around the pages")
+    private boolean addBorder;
 }

src/main/java/stirling/software/SPDF/model/api/general/OverlayPdfsRequest.java

@@ -0,0 +1,24 @@
+package stirling.software.SPDF.model.api.general;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import stirling.software.SPDF.model.api.PDFFile;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OverlayPdfsRequest  extends PDFFile {
+
+    @Schema(description = "An array of PDF files to be used as overlays on the base PDF. The order in these files is applied based on the selected mode.")
+    private MultipartFile[] overlayFiles;
+
+    @Schema(description = "The mode of overlaying: 'SequentialOverlay' for sequential application, 'InterleavedOverlay' for round-robin application, 'FixedRepeatOverlay' for fixed repetition based on provided counts", required = true)
+    private String overlayMode;
+
+    @Schema(description = "An array of integers specifying the number of times each corresponding overlay file should be applied in the 'FixedRepeatOverlay' mode. This should match the length of the overlayFiles array.", required = false)
+    private int[] counts;
+    
+    @Schema(description = "Overlay position 0 is Foregound, 1 is Background")
+    private int overlayPosition;
+}

src/main/java/stirling/software/SPDF/model/api/general/ScalePagesRequest.java

@@ -3,7 +3,6 @@ package stirling.software.SPDF.model.api.general;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import stirling.software.SPDF.model.api.PDFFile;
 import stirling.software.SPDF.model.api.PDFWithPageSize;
 
 @Data

src/main/java/stirling/software/SPDF/model/api/general/SplitPdfBySizeOrCountRequest.java

@@ -0,0 +1,18 @@
+package stirling.software.SPDF.model.api.general;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import stirling.software.SPDF.model.api.PDFFile;
+
+@Data
+@EqualsAndHashCode(callSuper=true)
+public class SplitPdfBySizeOrCountRequest extends PDFFile {
+
+	@Schema(description = "Determines the type of split: 0 for size, 1 for page count, 2 for document count", required = false, defaultValue = "0")
+	private int splitType;
+
+    
+    @Schema(description = "Value for split: size in MB (e.g., '10MB') or number of pages (e.g., '5')", required = false, defaultValue = "10MB")
+    private String splitValue;
+}

src/main/java/stirling/software/SPDF/utils/GeneralUtils.java

@@ -1,6 +1,9 @@
 package stirling.software.SPDF.utils;
 
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.FileVisitResult;
@@ -12,6 +15,7 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.web.multipart.MultipartFile;
 public class GeneralUtils {
 
 	public static void deleteDirectory(Path path) throws IOException {
@@ -48,6 +52,18 @@ public class GeneralUtils {
 	    }
 	}
 
+	public static File multipartToFile(MultipartFile multipart) throws IOException {
+        Path tempFile = Files.createTempFile("overlay-", ".pdf");
+        try (InputStream in = multipart.getInputStream(); 
+             FileOutputStream out = new FileOutputStream(tempFile.toFile())) {
+            byte[] buffer = new byte[1024];
+            int bytesRead;
+            while ((bytesRead = in.read(buffer)) != -1) {
+                out.write(buffer, 0, bytesRead);
+            }
+        }
+        return tempFile.toFile();
+    }
 	
 	public static Long convertSizeToBytes(String sizeStr) {
 	    if (sizeStr == null) {

src/main/java/stirling/software/SPDF/utils/PdfUtils.java

@@ -4,19 +4,18 @@ import java.awt.Graphics;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReader;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageOutputStream;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -199,36 +198,56 @@ public class PdfUtils {
         try (PDDocument document = PDDocument.load(new ByteArrayInputStream(inputStream))) {
             PDFRenderer pdfRenderer = new PDFRenderer(document);
             int pageCount = document.getNumberOfPages();
-            List<BufferedImage> images = new ArrayList<>();
-
-            // Create images of all pages
-            for (int i = 0; i < pageCount; i++) {
-                images.add(pdfRenderer.renderImageWithDPI(i, DPI, colorType));
-            }
-
-            if (singleImage) {
-                // Combine all images into a single big image
-                BufferedImage combined = new BufferedImage(images.get(0).getWidth(), images.get(0).getHeight() * pageCount, BufferedImage.TYPE_INT_RGB);
-                Graphics g = combined.getGraphics();
-                for (int i = 0; i < images.size(); i++) {
-                    g.drawImage(images.get(i), 0, i * images.get(0).getHeight(), null);
-                }
-                images = Arrays.asList(combined);
-            }
 
             // Create a ByteArrayOutputStream to save the image(s) to
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
             if (singleImage) {
-                // Write the image to the output stream
-                ImageIO.write(images.get(0), imageType, baos);
+                if (imageType.toLowerCase().equals("tiff") || imageType.toLowerCase().equals("tif")) {
+                    // Write the images to the output stream as a TIFF with multiple frames
+                    ImageWriter writer = ImageIO.getImageWritersByFormatName("tiff").next();
+                    ImageWriteParam param = writer.getDefaultWriteParam();
+                    param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+                    param.setCompressionType("ZLib");
+                    param.setCompressionQuality(1.0f);
+
+                    try (ImageOutputStream ios = ImageIO.createImageOutputStream(baos)) {
+                        writer.setOutput(ios);
+                        writer.prepareWriteSequence(null);
+
+                        for (int i = 0; i < pageCount; ++i) {
+                            BufferedImage image = pdfRenderer.renderImageWithDPI(i, DPI, colorType);
+                            writer.writeToSequence(new IIOImage(image, null, null), param);
+                        }
+
+                        writer.endWriteSequence();
+                    }
+
+                    writer.dispose();
+                } else {
+                    // Combine all images into a single big image
+                    BufferedImage image = pdfRenderer.renderImageWithDPI(0, DPI, colorType);
+                    BufferedImage combined = new BufferedImage(image.getWidth(), image.getHeight() * pageCount, BufferedImage.TYPE_INT_RGB);
+                    Graphics g = combined.getGraphics();
+
+                    for (int i = 0; i < pageCount; ++i) {
+                        if (i != 0) {
+                            image = pdfRenderer.renderImageWithDPI(i, DPI, colorType);
+			}
+                        g.drawImage(image, 0, i * image.getHeight(), null);
+                    }
+
+                    // Write the image to the output stream
+                    ImageIO.write(combined, imageType, baos);
+                }
 
                 // Log that the image was successfully written to the byte array
                 logger.info("Image successfully written to byte array");
             } else {
                 // Zip the images and return as byte array
                 try (ZipOutputStream zos = new ZipOutputStream(baos)) {
-                    for (int i = 0; i < images.size(); i++) {
-                        BufferedImage image = images.get(i);
+                    for (int i = 0; i < pageCount; ++i) {
+                        BufferedImage image = pdfRenderer.renderImageWithDPI(i, DPI, colorType);
                         try (ByteArrayOutputStream baosImage = new ByteArrayOutputStream()) {
                             ImageIO.write(image, imageType, baosImage);
 
@@ -264,28 +283,13 @@ public class PdfUtils {
                         addImageToDocument(doc, pdImage, fitOption, autoRotate);
                     }
                 } else {
-                    File imageFile = Files.createTempFile("image", ".png").toFile();
-                    try (FileOutputStream fos = new FileOutputStream(imageFile); InputStream input = file.getInputStream()) {
-                        byte[] buffer = new byte[1024];
-                        int len;
-                        while ((len = input.read(buffer)) != -1) {
-                            fos.write(buffer, 0, len);
-                        }
-                        BufferedImage image = ImageIO.read(imageFile);
-                        BufferedImage convertedImage = ImageProcessingUtils.convertColorType(image, colorType);
-                        PDImageXObject pdImage;
-                        if (contentType != null && (contentType.equals("image/jpeg"))) {
-                            pdImage = JPEGFactory.createFromImage(doc, convertedImage);
-                        } else {
-                            pdImage = LosslessFactory.createFromImage(doc, convertedImage);
-                        }
-                        addImageToDocument(doc, pdImage, fitOption, autoRotate);
-                    } catch (IOException e) {
-                        logger.error("Error writing image to file: {}", imageFile.getAbsolutePath(), e);
-                        throw e;
-                    } finally {
-                        imageFile.delete();
-                    }
+                    BufferedImage image = ImageIO.read(file.getInputStream());
+                    BufferedImage convertedImage = ImageProcessingUtils.convertColorType(image, colorType);
+                    // Use JPEGFactory if it's JPEG since JPEG is lossy
+                    PDImageXObject pdImage = (contentType != null && contentType.equals("image/jpeg"))
+                                           ? JPEGFactory.createFromImage(doc, convertedImage)
+                                           : LosslessFactory.createFromImage(doc, convertedImage);
+                    addImageToDocument(doc, pdImage, fitOption, autoRotate);
                 }
             }
             ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();

src/main/java/stirling/software/SPDF/utils/RequestUriUtils.java

@@ -0,0 +1,16 @@
+package stirling.software.SPDF.utils;
+
+public class RequestUriUtils {
+
+	public static boolean isStaticResource(String requestURI) {
+		
+		return requestURI.startsWith("/css/") 
+        || requestURI.startsWith("/js/")
+        || requestURI.startsWith("/images/")
+        || requestURI.startsWith("/public/")
+        || requestURI.startsWith("/pdfjs/")
+        || requestURI.endsWith(".svg");
+		
+	}
+
+}

src/main/resources/application.properties

@@ -35,7 +35,7 @@ spring.datasource.url=jdbc:h2:file:./configs/stirling-pdf-DB;DB_CLOSE_DELAY=-1;D
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=
-spring.h2.console.enabled=true
+spring.h2.console.enabled=false
 spring.jpa.hibernate.ddl-auto=update
 
 # Change the default URL path for OpenAPI JSON

src/main/resources/banner.txt

@@ -0,0 +1,6 @@
+ ____ _____ ___ ____  _     ___ _   _  ____       ____  ____  _____ 
+/ ___|_   _|_ _|  _ \| |   |_ _| \ | |/ ___|     |  _ \|  _ \|  ___|
+\___ \ | |  | || |_) | |    | ||  \| | |  _ _____| |_) | | | | |_   
+ ___) || |  | ||  _ <| |___ | || |\  | |_| |_____|  __/| |_| |  _|  
+|____/ |_| |___|_| \_\_____|___|_| \_|\____|     |_|   |____/|_|                                                                 
+Powered by Spring Boot ${spring-boot.version}

src/main/resources/log4j.properties

@@ -1,8 +0,0 @@
-log4j.rootLogger=ERROR,stdout
-log4j.logger.com.endeca=INFO
-# Logger for crawl metrics
-log4j.logger.com.endeca.itl.web.metrics=INFO
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%p\t%d{ISO8601}\t%r\t%c\t[%t]\t%m%n

src/main/resources/logback.xml

@@ -0,0 +1,51 @@
+<configuration>
+
+    <!-- Console Appender -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Rolling File Appender -->
+    <appender name="AUTHLOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/invalid-auths.log</file>
+        <encoder>
+		    <pattern>%d %p %c{1} [%thread] %m%n</pattern>
+		</encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- daily rollover and keep 7 days' worth of history -->
+            <fileNamePattern>logs/auth-%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>1</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+	<!-- Rolling File Appender -->
+    <appender name="GENERAL" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/info.log</file>
+        <encoder>
+		    <pattern>%d %p %c{1} [%thread] %m%n</pattern>
+		</encoder>
+
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- daily rollover and keep 7 days' worth of history -->
+            <fileNamePattern>logs/info-%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>1</maxHistory>
+        </rollingPolicy>
+    </appender>
+
+
+    <!-- Root Logger -->
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="GENERAL"/>
+    </root>
+
+    <!-- Specific Logger -->
+    <logger name="stirling.software.SPDF.config.security.CustomAuthenticationFailureHandler" level="ERROR" additivity="false">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="AUTHLOG"/>
+    </logger>
+
+</configuration>

src/main/resources/messages_ar_AR.properties

@@ -119,6 +119,7 @@ adminUserSettings.role=Role
 adminUserSettings.actions=Actions
 adminUserSettings.apiUser=Limited API User
 adminUserSettings.webOnlyUser=Web Only User
+adminUserSettings.demoUser=Demo User (No custom settings)
 adminUserSettings.forceChange=Force user to change username/password on login
 adminUserSettings.submit=Save User
 
@@ -126,8 +127,13 @@ adminUserSettings.submit=Save User
 # HOME-PAGE #
 #############
 home.desc=متجرك الشامل المستضاف محليًا لجميع احتياجات PDF الخاصة بك.
+home.searchBar=Search for features...
 
 
+home.viewPdf.title=View PDF
+home.viewPdf.desc=View, annotate, add text or images
+viewPdf.tags=view,read,annotate,text,image
+
 home.multiTool.title=أداة متعددة PDF
 home.multiTool.desc=دمج الصفحات وتدويرها وإعادة ترتيبها وإزالتها
 multiTool.tags=Multi Tool,Multi operation,UI,click drag,front end,client side
@@ -250,6 +256,10 @@ home.removeBlanks.title=إزالة الصفحات الفارغة
 home.removeBlanks.desc=يكتشف ويزيل الصفحات الفارغة من المستند
 removeBlanks.tags=cleanup,streamline,non-content,organize
 
+home.removeAnnotations.title=Remove Annotations
+home.removeAnnotations.desc=Removes all comments/annotations from a PDF
+removeAnnotations.tags=comments,highlight,notes,markup,remove
+
 home.compare.title=قارن
 home.compare.desc=يقارن ويظهر الاختلافات بين 2 من مستندات PDF
 compare.tags=differentiate,contrast,changes,analysis
@@ -331,6 +341,24 @@ home.autoRedact.title=Auto Redact
 home.autoRedact.desc=Auto Redacts(Blacks out) text in a PDF based on input text
 showJS.tags=JS
 
+home.tableExtraxt.title=PDF to CSV
+home.tableExtraxt.desc=Extracts Tables from a PDF converting it to CSV
+tableExtraxt.tags=CSV,Table Extraction,extract,convert
+
+
+home.autoSizeSplitPDF.title=Auto Split by Size/Count
+home.autoSizeSplitPDF.desc=Split a single PDF into multiple documents based on size, page count, or document count
+autoSizeSplitPDF.tags=pdf,split,document,organization
+
+
+home.overlay-pdfs.title=Overlay PDFs
+home.overlay-pdfs.desc=Overlays PDFs on-top of another PDF
+overlay-pdfs.tags=Overlay
+
+home.split-by-sections.title=Split PDF by Sections
+home.split-by-sections.desc=Divide each page of a PDF into smaller horizontal and vertical sections
+split-by-sections.tags=Section Split, Divide, Customize
+
 ###########################
 #                         #
 #       WEB PAGES         #
@@ -478,6 +506,7 @@ pipeline.title=Pipeline
 pageLayout.title=Multi Page Layout
 pageLayout.header=Multi Page Layout
 pageLayout.pagesPerSheet=Pages per sheet:
+pageLayout.addBorder=Add Borders
 pageLayout.submit=Submit
 
 
@@ -515,6 +544,12 @@ removeBlanks.whitePercentDesc=النسبة المئوية للصفحة التي
 removeBlanks.submit=إزالة الفراغات
 
 
+#removeAnnotations
+removeAnnotations.title=Remove Annotations
+removeAnnotations.header=Remove Annotations
+removeAnnotations.submit=Remove
+
+
 #compare
 compare.title=يقارن
 compare.header=قارن ملفات PDF
@@ -631,6 +666,9 @@ pdfOrganiser.submit=إعادة ترتيب الصفحات
 multiTool.title=أداة متعددة PDF
 multiTool.header=أداة متعددة PDF
 
+#view pdf
+viewPdf.title=View PDF
+viewPdf.header=View PDF
 
 #pageRemover
 pageRemover.title=مزيل الصفحة
@@ -665,9 +703,6 @@ split.submit=Split
 imageToPDF.title=صورة إلى PDF
 imageToPDF.header=صورة إلى PDF
 imageToPDF.submit=تحول
-##########################
-###  TODO: Translate   ###
-##########################
 imageToPDF.selectLabel=Image Fit Options
 imageToPDF.fillPage=Fill Page
 imageToPDF.fitDocumentToImage=Fit Page to Image
@@ -817,3 +852,45 @@ PDFToXML.title=تحويل PDF إلى XML
 PDFToXML.header=تحويل PDF إلى XML
 PDFToXML.credit=تستخدم هذه الخدمة LibreOffice لتحويل الملفات.
 PDFToXML.submit=تحويل
+
+#PDFToCSV
+PDFToCSV.title=PDF ??? CSV
+PDFToCSV.header=PDF ??? CSV
+PDFToCSV.prompt=Choose page to extract table
+PDFToCSV.submit=??????
+
+#split-by-size-or-count
+split-by-size-or-count.header=Split PDF by Size or Count
+split-by-size-or-count.type.label=Select Split Type
+split-by-size-or-count.type.size=By Size
+split-by-size-or-count.type.pageCount=By Page Count
+split-by-size-or-count.type.docCount=By Document Count
+split-by-size-or-count.value.label=Enter Value
+split-by-size-or-count.value.placeholder=Enter size (e.g., 2MB or 3KB) or count (e.g., 5)
+split-by-size-or-count.submit=Submit
+
+
+#overlay-pdfs
+overlay-pdfs.header=Overlay PDF Files
+overlay-pdfs.baseFile.label=Select Base PDF File
+overlay-pdfs.overlayFiles.label=Select Overlay PDF Files
+overlay-pdfs.mode.label=Select Overlay Mode
+overlay-pdfs.mode.sequential=Sequential Overlay
+overlay-pdfs.mode.interleaved=Interleaved Overlay
+overlay-pdfs.mode.fixedRepeat=Fixed Repeat Overlay
+overlay-pdfs.counts.label=Overlay Counts (for Fixed Repeat Mode)
+overlay-pdfs.counts.placeholder=Enter comma-separated counts (e.g., 2,3,1)
+overlay-pdfs.position.label=Select Overlay Position
+overlay-pdfs.position.foreground=Foreground
+overlay-pdfs.position.background=Background
+overlay-pdfs.submit=Submit
+
+
+#split-by-sections
+split-by-sections.title=Split PDF by Sections
+split-by-sections.header=Split PDF into Sections
+split-by-sections.horizontal.label=Horizontal Divisions
+split-by-sections.vertical.label=Vertical Divisions
+split-by-sections.horizontal.placeholder=Enter number of horizontal divisions
+split-by-sections.vertical.placeholder=Enter number of vertical divisions
+split-by-sections.submit=Split PDF