Update build.gradle

Dynamic tracking services (#4690 )
Added bean for both scarf and posthog followed documentation at https://docs.stirlingpdf.com/analytics-telemetry Co-authored-by: Connor Yoh <connor@stirlingpdf.com>
2025-10-16 16:52:36 +01:00 · 2025-10-16 12:21:52 +01:00 · 2025-10-11 18:37:58 +01:00 · 2025-10-11 18:35:24 +01:00 · 2025-10-11 18:23:44 +01:00 · 2025-10-11 18:23:09 +01:00
292 changed files with 11302 additions and 4236 deletions
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --allow-unsafe --generate-hashes --output-file='.github\scripts\requirements_dev.txt' --strip-extras '.github\scripts\requirements_dev.in'
@@ -333,11 +333,11 @@ opencv-python-headless==4.12.0.88 \
    --hash=sha256:aeb4b13ecb8b4a0beb2668ea07928160ea7c2cd2d9b5ef571bbee6bafe9cc8d0 \
    --hash=sha256:cfdc017ddf2e59b6c2f53bc12d74b6b0be7ded4ec59083ea70763921af2b6c09 \
    --hash=sha256:fde2cf5c51e4def5f2132d78e0c08f9c14783cd67356922182c6845b9af87dbd
-    # via -r .github\scripts\requirements_dev.in
+    # via -r .github/scripts/requirements_dev.in
 pdf2image==1.17.0 \
    --hash=sha256:eaa959bc116b420dd7ec415fcae49b98100dda3dd18cd2fdfa86d09f112f6d57 \
    --hash=sha256:ecdd58d7afb810dffe21ef2b1bbc057ef434dabbac6c33778a38a3f7744a27e2
-    # via -r .github\scripts\requirements_dev.in
+    # via -r .github/scripts/requirements_dev.in
 pillow==11.3.0 \
    --hash=sha256:023f6d2d11784a465f09fd09a34b150ea4672e85fb3d05931d89f373ab14abb2 \
    --hash=sha256:02a723e6bf909e7cea0dac1b0e0310be9d7650cd66222a5f1c571455c0a45214 \
@@ -446,7 +446,7 @@ pillow==11.3.0 \
    --hash=sha256:fdae223722da47b024b867c1ea0be64e0df702c5e0a60e27daad39bf960dd1e4 \
    --hash=sha256:fe27fb049cdcca11f11a7bfda64043c37b30e6b91f10cb5bab275806c32f6ab3
    # via
-    #   -r .github\scripts\requirements_dev.in
+    #   -r .github/scripts/requirements_dev.in
    #   pdf2image
    #   weasyprint
 platformdirs==4.3.8 \
@@ -456,7 +456,7 @@ platformdirs==4.3.8 \
 pre-commit==4.3.0 \
    --hash=sha256:2b0747ad7e6e967169136edffee14c16e148a778a54e4f967921aa1ebf2308d8 \
    --hash=sha256:499fe450cc9d42e9d58e606262795ecb64dd05438943c62b66f6a8673da30b16
-    # via -r .github\scripts\requirements_dev.in
+    # via -r .github/scripts/requirements_dev.in
 pycparser==2.22 \
    --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \
    --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc
@@ -537,7 +537,7 @@ tinyhtml5==2.0.0 \
 unoserver==3.3.2 \
    --hash=sha256:1eeb7467cf6b56b8eff3b576e2d1b2b2ff4e0eb2052e995ac80a1456de300639 \
    --hash=sha256:87e144f903ee21951b2e06a97549450c13ed7eca5bcebad942d3352d4e882616
-    # via -r .github\scripts\requirements_dev.in
+    # via -r .github/scripts/requirements_dev.in
 virtualenv==20.33.1 \
    --hash=sha256:07c19bc66c11acab6a5958b815cbcee30891cd1c2ccf53785a28651a0d8d8a67 \
    --hash=sha256:1b44478d9e261b3fb8baa5e74a0ca3bc0e05f21aa36167bf9cbf850e542765b8
@@ -545,7 +545,7 @@ virtualenv==20.33.1 \
 weasyprint==66.0 \
    --hash=sha256:82b0783b726fcd318e2c977dcdddca76515b30044bc7a830cc4fbe717582a6d0 \
    --hash=sha256:da71dc87dc129ac9cffdc65e5477e90365ab9dbae45c744014ec1d06303dde40
-    # via -r .github\scripts\requirements_dev.in
+    # via -r .github/scripts/requirements_dev.in
 webencodings==0.5.1 \
    --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \
    --hash=sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923
@@ -631,8 +631,8 @@ zopfli==0.2.3.post1 \
 pip==25.2 \
    --hash=sha256:578283f006390f85bb6282dffb876454593d637f5d1be494b5202ce4877e71f2 \
    --hash=sha256:6d67a2b4e7f14d8b31b8b52648866fa717f45a1eb70e83002f4331d07e953717
-    # via -r .github\scripts\requirements_dev.in
+    # via -r .github/scripts/requirements_dev.in
 setuptools==80.9.0 \
    --hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \
    --hash=sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c
-    # via -r .github\scripts\requirements_dev.in
+    # via -r .github/scripts/requirements_dev.in
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --generate-hashes --output-file='.github\scripts\requirements_pre_commit.txt' --strip-extras '.github\scripts\requirements_pre_commit.in'
@@ -12,85 +12,101 @@ distlib==0.4.0 \
    --hash=sha256:9659f7d87e46584a30b5780e43ac7a2143098441670ff0a49d5f9034c54a6c16 \
    --hash=sha256:feec40075be03a04501a973d81f633735b4b69f98b05450592310c0f401a4e0d
    # via virtualenv
-filelock==3.18.0 \
-    --hash=sha256:adbc88eabb99d2fec8c9c1b229b171f18afa655400173ddc653d5d01501fb9f2 \
-    --hash=sha256:c401f4f8377c4464e6db25fff06205fd89bdd83b65eb0488ed1b160f780e21de
+filelock==3.19.1 \
+    --hash=sha256:66eda1888b0171c998b35be2bcc0f6d75c388a7ce20c3f3f37aa8e96c2dddf58 \
+    --hash=sha256:d38e30481def20772f5baf097c122c3babc4fcdb7e14e57049eb9d88c6dc017d
    # via virtualenv
-identify==2.6.13 \
-    --hash=sha256:60381139b3ae39447482ecc406944190f690d4a2997f2584062089848361b33b \
-    --hash=sha256:da8d6c828e773620e13bfa86ea601c5a5310ba4bcd65edf378198b56a1f9fb32
+identify==2.6.15 \
+    --hash=sha256:1181ef7608e00704db228516541eb83a88a9f94433a8c80bb9b5bd54b1d81757 \
+    --hash=sha256:e4f4864b96c6557ef2a1e1c951771838f4edc9df3a72ec7118b338801b11c7bf
    # via pre-commit
 nodeenv==1.9.1 \
    --hash=sha256:6ec12890a2dab7946721edbfbcd91f3319c6ccc9aec47be7c7e6b7011ee6645f \
    --hash=sha256:ba11c9782d29c27c70ffbdda2d7415098754709be8a7056d79a737cd901155c9
    # via pre-commit
-platformdirs==4.3.8 \
-    --hash=sha256:3d512d96e16bcb959a814c9f348431070822a6496326a4be0911c40b5a74c2bc \
-    --hash=sha256:ff7059bb7eb1179e2685604f4aaf157cfd9535242bd23742eadc3c13542139b4
+platformdirs==4.4.0 \
+    --hash=sha256:abd01743f24e5287cd7a5db3752faf1a2d65353f38ec26d98e25a6db65958c85 \
+    --hash=sha256:ca753cf4d81dc309bc67b0ea38fd15dc97bc30ce419a7f58d13eb3bf14c4febf
    # via virtualenv
 pre-commit==4.3.0 \
    --hash=sha256:2b0747ad7e6e967169136edffee14c16e148a778a54e4f967921aa1ebf2308d8 \
    --hash=sha256:499fe450cc9d42e9d58e606262795ecb64dd05438943c62b66f6a8673da30b16
-    # via -r .github\scripts\requirements_pre_commit.in
-pyyaml==6.0.2 \
-    --hash=sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff \
-    --hash=sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48 \
-    --hash=sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086 \
-    --hash=sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e \
-    --hash=sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133 \
-    --hash=sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5 \
-    --hash=sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484 \
-    --hash=sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee \
-    --hash=sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5 \
-    --hash=sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68 \
-    --hash=sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a \
-    --hash=sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf \
-    --hash=sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99 \
-    --hash=sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8 \
-    --hash=sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85 \
-    --hash=sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19 \
-    --hash=sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc \
-    --hash=sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a \
-    --hash=sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1 \
-    --hash=sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317 \
-    --hash=sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c \
-    --hash=sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631 \
-    --hash=sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d \
-    --hash=sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652 \
-    --hash=sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5 \
-    --hash=sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e \
-    --hash=sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b \
-    --hash=sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8 \
-    --hash=sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476 \
-    --hash=sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706 \
-    --hash=sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563 \
-    --hash=sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237 \
-    --hash=sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b \
-    --hash=sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083 \
-    --hash=sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180 \
-    --hash=sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425 \
-    --hash=sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e \
-    --hash=sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f \
-    --hash=sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725 \
-    --hash=sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183 \
-    --hash=sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab \
-    --hash=sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774 \
-    --hash=sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725 \
-    --hash=sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e \
-    --hash=sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5 \
-    --hash=sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d \
-    --hash=sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290 \
-    --hash=sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44 \
-    --hash=sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed \
-    --hash=sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4 \
-    --hash=sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba \
-    --hash=sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12 \
-    --hash=sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4
+    # via -r .github/scripts/requirements_pre_commit.in
+pyyaml==6.0.3 \
+    --hash=sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c \
+    --hash=sha256:0150219816b6a1fa26fb4699fb7daa9caf09eb1999f3b70fb6e786805e80375a \
+    --hash=sha256:02893d100e99e03eda1c8fd5c441d8c60103fd175728e23e431db1b589cf5ab3 \
+    --hash=sha256:02ea2dfa234451bbb8772601d7b8e426c2bfa197136796224e50e35a78777956 \
+    --hash=sha256:0f29edc409a6392443abf94b9cf89ce99889a1dd5376d94316ae5145dfedd5d6 \
+    --hash=sha256:10892704fc220243f5305762e276552a0395f7beb4dbf9b14ec8fd43b57f126c \
+    --hash=sha256:16249ee61e95f858e83976573de0f5b2893b3677ba71c9dd36b9cf8be9ac6d65 \
+    --hash=sha256:1d37d57ad971609cf3c53ba6a7e365e40660e3be0e5175fa9f2365a379d6095a \
+    --hash=sha256:1ebe39cb5fc479422b83de611d14e2c0d3bb2a18bbcb01f229ab3cfbd8fee7a0 \
+    --hash=sha256:214ed4befebe12df36bcc8bc2b64b396ca31be9304b8f59e25c11cf94a4c033b \
+    --hash=sha256:2283a07e2c21a2aa78d9c4442724ec1eb15f5e42a723b99cb3d822d48f5f7ad1 \
+    --hash=sha256:22ba7cfcad58ef3ecddc7ed1db3409af68d023b7f940da23c6c2a1890976eda6 \
+    --hash=sha256:27c0abcb4a5dac13684a37f76e701e054692a9b2d3064b70f5e4eb54810553d7 \
+    --hash=sha256:28c8d926f98f432f88adc23edf2e6d4921ac26fb084b028c733d01868d19007e \
+    --hash=sha256:2e71d11abed7344e42a8849600193d15b6def118602c4c176f748e4583246007 \
+    --hash=sha256:34d5fcd24b8445fadc33f9cf348c1047101756fd760b4dacb5c3e99755703310 \
+    --hash=sha256:37503bfbfc9d2c40b344d06b2199cf0e96e97957ab1c1b546fd4f87e53e5d3e4 \
+    --hash=sha256:3c5677e12444c15717b902a5798264fa7909e41153cdf9ef7ad571b704a63dd9 \
+    --hash=sha256:3ff07ec89bae51176c0549bc4c63aa6202991da2d9a6129d7aef7f1407d3f295 \
+    --hash=sha256:41715c910c881bc081f1e8872880d3c650acf13dfa8214bad49ed4cede7c34ea \
+    --hash=sha256:418cf3f2111bc80e0933b2cd8cd04f286338bb88bdc7bc8e6dd775ebde60b5e0 \
+    --hash=sha256:44edc647873928551a01e7a563d7452ccdebee747728c1080d881d68af7b997e \
+    --hash=sha256:4a2e8cebe2ff6ab7d1050ecd59c25d4c8bd7e6f400f5f82b96557ac0abafd0ac \
+    --hash=sha256:4ad1906908f2f5ae4e5a8ddfce73c320c2a1429ec52eafd27138b7f1cbe341c9 \
+    --hash=sha256:501a031947e3a9025ed4405a168e6ef5ae3126c59f90ce0cd6f2bfc477be31b7 \
+    --hash=sha256:5190d403f121660ce8d1d2c1bb2ef1bd05b5f68533fc5c2ea899bd15f4399b35 \
+    --hash=sha256:5498cd1645aa724a7c71c8f378eb29ebe23da2fc0d7a08071d89469bf1d2defb \
+    --hash=sha256:5cf4e27da7e3fbed4d6c3d8e797387aaad68102272f8f9752883bc32d61cb87b \
+    --hash=sha256:5e0b74767e5f8c593e8c9b5912019159ed0533c70051e9cce3e8b6aa699fcd69 \
+    --hash=sha256:5ed875a24292240029e4483f9d4a4b8a1ae08843b9c54f43fcc11e404532a8a5 \
+    --hash=sha256:5fcd34e47f6e0b794d17de1b4ff496c00986e1c83f7ab2fb8fcfe9616ff7477b \
+    --hash=sha256:5fdec68f91a0c6739b380c83b951e2c72ac0197ace422360e6d5a959d8d97b2c \
+    --hash=sha256:6344df0d5755a2c9a276d4473ae6b90647e216ab4757f8426893b5dd2ac3f369 \
+    --hash=sha256:64386e5e707d03a7e172c0701abfb7e10f0fb753ee1d773128192742712a98fd \
+    --hash=sha256:652cb6edd41e718550aad172851962662ff2681490a8a711af6a4d288dd96824 \
+    --hash=sha256:66291b10affd76d76f54fad28e22e51719ef9ba22b29e1d7d03d6777a9174198 \
+    --hash=sha256:66e1674c3ef6f541c35191caae2d429b967b99e02040f5ba928632d9a7f0f065 \
+    --hash=sha256:6adc77889b628398debc7b65c073bcb99c4a0237b248cacaf3fe8a557563ef6c \
+    --hash=sha256:79005a0d97d5ddabfeeea4cf676af11e647e41d81c9a7722a193022accdb6b7c \
+    --hash=sha256:7c6610def4f163542a622a73fb39f534f8c101d690126992300bf3207eab9764 \
+    --hash=sha256:7f047e29dcae44602496db43be01ad42fc6f1cc0d8cd6c83d342306c32270196 \
+    --hash=sha256:8098f252adfa6c80ab48096053f512f2321f0b998f98150cea9bd23d83e1467b \
+    --hash=sha256:850774a7879607d3a6f50d36d04f00ee69e7fc816450e5f7e58d7f17f1ae5c00 \
+    --hash=sha256:8d1fab6bb153a416f9aeb4b8763bc0f22a5586065f86f7664fc23339fc1c1fac \
+    --hash=sha256:8da9669d359f02c0b91ccc01cac4a67f16afec0dac22c2ad09f46bee0697eba8 \
+    --hash=sha256:8dc52c23056b9ddd46818a57b78404882310fb473d63f17b07d5c40421e47f8e \
+    --hash=sha256:9149cad251584d5fb4981be1ecde53a1ca46c891a79788c0df828d2f166bda28 \
+    --hash=sha256:93dda82c9c22deb0a405ea4dc5f2d0cda384168e466364dec6255b293923b2f3 \
+    --hash=sha256:96b533f0e99f6579b3d4d4995707cf36df9100d67e0c8303a0c55b27b5f99bc5 \
+    --hash=sha256:9c57bb8c96f6d1808c030b1687b9b5fb476abaa47f0db9c0101f5e9f394e97f4 \
+    --hash=sha256:9c7708761fccb9397fe64bbc0395abcae8c4bf7b0eac081e12b809bf47700d0b \
+    --hash=sha256:9f3bfb4965eb874431221a3ff3fdcddc7e74e3b07799e0e84ca4a0f867d449bf \
+    --hash=sha256:a33284e20b78bd4a18c8c2282d549d10bc8408a2a7ff57653c0cf0b9be0afce5 \
+    --hash=sha256:a80cb027f6b349846a3bf6d73b5e95e782175e52f22108cfa17876aaeff93702 \
+    --hash=sha256:b30236e45cf30d2b8e7b3e85881719e98507abed1011bf463a8fa23e9c3e98a8 \
+    --hash=sha256:b3bc83488de33889877a0f2543ade9f70c67d66d9ebb4ac959502e12de895788 \
+    --hash=sha256:b865addae83924361678b652338317d1bd7e79b1f4596f96b96c77a5a34b34da \
+    --hash=sha256:b8bb0864c5a28024fac8a632c443c87c5aa6f215c0b126c449ae1a150412f31d \
+    --hash=sha256:ba1cc08a7ccde2d2ec775841541641e4548226580ab850948cbfda66a1befcdc \
+    --hash=sha256:bdb2c67c6c1390b63c6ff89f210c8fd09d9a1217a465701eac7316313c915e4c \
+    --hash=sha256:c1ff362665ae507275af2853520967820d9124984e0f7466736aea23d8611fba \
+    --hash=sha256:c2514fceb77bc5e7a2f7adfaa1feb2fb311607c9cb518dbc378688ec73d8292f \
+    --hash=sha256:c3355370a2c156cffb25e876646f149d5d68f5e0a3ce86a5084dd0b64a994917 \
+    --hash=sha256:c458b6d084f9b935061bc36216e8a69a7e293a2f1e68bf956dcd9e6cbcd143f5 \
+    --hash=sha256:d0eae10f8159e8fdad514efdc92d74fd8d682c933a6dd088030f3834bc8e6b26 \
+    --hash=sha256:d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f \
+    --hash=sha256:ebc55a14a21cb14062aa4162f906cd962b28e2e9ea38f9b4391244cd8de4ae0b \
+    --hash=sha256:eda16858a3cab07b80edaf74336ece1f986ba330fdb8ee0d6c0d68fe82bc96be \
+    --hash=sha256:ee2922902c45ae8ccada2c5b501ab86c36525b883eff4255313a253a3160861c \
+    --hash=sha256:efd7b85f94a6f21e4932043973a7ba2613b059c4a000551892ac9f1d11f5baf3 \
+    --hash=sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6 \
+    --hash=sha256:fa160448684b4e94d80416c0fa4aac48967a969efe22931448d853ada8baf926 \
+    --hash=sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0
    # via pre-commit
-typing-extensions==4.14.1 \
-    --hash=sha256:38b39f4aeeab64884ce9f74c94263ef78f3c22467c8724005483154c26648d36 \
-    --hash=sha256:d1e1e3b58374dc93031d6eda2420a48ea44a36c2b4766a4fdeb3710755731d76
-    # via virtualenv
 virtualenv==20.34.0 \
    --hash=sha256:341f5afa7eee943e4984a9207c025feedd768baff6753cd660c857ceb3e36026 \
    --hash=sha256:44815b2c9dee7ed86e387b842a84f20b93f7f417f95886ca1996a72a4138eb1a
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --generate-hashes --output-file='.github\scripts\requirements_sync_readme.txt' --strip-extras '.github\scripts\requirements_sync_readme.in'
@@ -7,4 +7,4 @@
 tomlkit==0.13.3 \
    --hash=sha256:430cf247ee57df2b94ee3fbe588e71d362a941ebb545dec29b53961d61add2a1 \
    --hash=sha256:c89c649d79ee40629a9fda55f8ace8c6a1b42deb912b2a8fd8d942ddadb606b0
-    # via -r .github\scripts\requirements_sync_readme.in
+    # via -r .github/scripts/requirements_sync_readme.in
@@ -39,7 +39,7 @@ jobs:
      enable_enterprise: ${{ steps.check-pro-flag.outputs.enable_enterprise }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -57,7 +57,7 @@ jobs:

      - name: Get PR data
        id: get-pr
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
          script: |
            const prNumber = context.payload.issue.number;
@@ -98,7 +98,7 @@ jobs:

      - name: Add 'in_progress' reaction to comment
        id: add-eyes-reaction
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
          script: |
@@ -127,7 +127,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -170,7 +170,7 @@ jobs:
        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1

      - name: Login to Docker Hub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}
@@ -270,7 +270,7 @@ jobs:

      - name: Add success reaction to comment
        if: success()
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
          script: |
@@ -305,7 +305,7 @@ jobs:

      - name: Add failure reaction to comment
        if: failure()
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
          script: |
@@ -325,7 +325,7 @@ jobs:

      - name: Post deployment URL to PR
        if: success()
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
          script: |
@@ -21,7 +21,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -39,7 +39,7 @@ jobs:

      - name: Remove 'pr-deployed' label if present
        id: remove-label-comment
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
          script: |
@@ -19,7 +19,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -158,7 +158,7 @@ jobs:

      - name: Post comment on PR if needed
        if: steps.actor.outputs.is_repo_dev == 'true'
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        continue-on-error: true
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
@@ -13,7 +13,7 @@ jobs:
      pull-requests: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -56,7 +56,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -70,7 +70,7 @@ jobs:
          distribution: "temurin"

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
        with:
          gradle-version: 8.14

@@ -129,7 +129,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -143,7 +143,7 @@ jobs:
          distribution: "temurin"

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

      - name: Generate OpenAPI documentation
        run: ./gradlew :stirling-pdf:generateOpenApiDocs
@@ -162,7 +162,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -211,7 +211,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -233,7 +233,7 @@ jobs:
          sudo chmod +x /usr/local/bin/docker-compose

      - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: "3.12"
          cache: 'pip' # caching pip dependencies
@@ -260,7 +260,7 @@ jobs:
        docker-rev: ["Dockerfile", "Dockerfile.ultra-lite", "Dockerfile.fat"]
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -274,7 +274,7 @@ jobs:
          distribution: "temurin"

      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
        with:
          gradle-version: 8.14

@@ -30,7 +30,7 @@ jobs:
      pull-requests: write # Allow writing to pull requests
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -46,7 +46,7 @@ jobs:

      - name: Get PR data
        id: get-pr-data
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
          script: |
@@ -90,7 +90,7 @@ jobs:

      - name: Determine reference file test
        id: determine-file
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
          script: |
@@ -234,7 +234,7 @@ jobs:

      - name: Post comment on PR
        if: env.SCRIPT_OUTPUT != ''
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
        with:
          github-token: ${{ steps.setup-bot.outputs.token }}
          script: |
@@ -17,11 +17,11 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

      - name: "Checkout Repository"
        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
      - name: "Dependency Review"
-        uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
+        uses: actions/dependency-review-action@56339e523c0409420f6c2c9a2f4292bbb3c07dd3 # v4.8.0
@@ -31,7 +31,7 @@ jobs:
      repository-projects: write # Required for enabling automerge
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -54,7 +54,7 @@ jobs:
          distribution: "temurin"

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

      - name: Check licenses for compatibility
        run: ./gradlew clean checkLicense
@@ -15,7 +15,7 @@ jobs:
      issues: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -21,7 +21,7 @@ jobs:
      versionMac: ${{ steps.versionNumberMac.outputs.versionNumberMac }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -60,7 +60,7 @@ jobs:
            file_suffix: ""
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -72,7 +72,7 @@ jobs:
          java-version: "21"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
        with:
          gradle-version: 8.14

@@ -110,7 +110,7 @@ jobs:
            file_suffix: ""
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -148,7 +148,7 @@ jobs:
      contents: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -160,7 +160,7 @@ jobs:
          java-version: "21"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
        with:
          gradle-version: 8.14

@@ -238,7 +238,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -252,7 +252,7 @@ jobs:

      - name: Install Cosign
        if: matrix.os == 'windows-latest'
-        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0

      - name: Generate key pair
        if: matrix.os == 'windows-latest'
@@ -301,7 +301,7 @@ jobs:
      contents: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -310,7 +310,7 @@ jobs:
      - name: Display structure of downloaded files
        run: ls -R
      - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7 # v2.3.4
        with:
          tag_name: v${{ needs.read_versions.outputs.version }}
          generate_release_notes: true
@@ -12,12 +12,16 @@ permissions:
 jobs:
  pre-commit:
    runs-on: ubuntu-latest
+    env:
+      # Prevents sdist builds → no tar extraction
+      PIP_ONLY_BINARY: ":all:"
+      PIP_DISABLE_PIP_VERSION_CHECK: "1"
    permissions:
      contents: write
      pull-requests: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -34,7 +38,7 @@ jobs:
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}

      - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: 3.12
          cache: 'pip' # caching pip dependencies
@@ -42,7 +46,7 @@ jobs:

      - name: Run Pre-Commit Hooks
        run: |
-          pip install --require-hashes -r ./.github/scripts/requirements_pre_commit.txt
+          pip install --require-hashes --only-binary=:all: -r ./.github/scripts/requirements_pre_commit.txt

      - run: pre-commit run --all-files -c .pre-commit-config.yaml
        continue-on-error: true
@@ -30,7 +30,7 @@ jobs:
      id-token: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -42,7 +42,7 @@ jobs:
          java-version: "17"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
        with:
          gradle-version: 8.14

@@ -54,7 +54,7 @@ jobs:

      - name: Install cosign
        if: github.ref == 'refs/heads/master'
-        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0
        with:
          cosign-release: "v2.4.1"

@@ -67,13 +67,13 @@ jobs:
        run: echo "versionNumber=$(./gradlew printVersion --quiet | tail -1)" >> $GITHUB_OUTPUT

      - name: Login to Docker Hub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -23,7 +23,7 @@ jobs:
      version: ${{ steps.versionNumber.outputs.versionNumber }}
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -35,7 +35,7 @@ jobs:
          java-version: "17"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
        with:
          gradle-version: 8.14

@@ -83,7 +83,7 @@ jobs:
            file_suffix: ""
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -95,7 +95,7 @@ jobs:
        run: ls -R

      - name: Install Cosign
-        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        uses: sigstore/cosign-installer@d7543c93d881b35a8faa02e8e3605f69b7a1ce62 # v3.10.0

      - name: Generate key pair
        run: cosign generate-key-pair
@@ -161,7 +161,7 @@ jobs:
            file_suffix: ""
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -171,7 +171,7 @@ jobs:
          name: signed${{ matrix.file_suffix }}

      - name: Upload binaries, attestations and signatures to Release and create GitHub Release
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
+        uses: softprops/action-gh-release@62c96d0c4e8a889135c1f3a25910db8dbe0e85f7 # v2.3.4
        with:
          tag_name: v${{ needs.build.outputs.version }}
          generate_release_notes: true
@@ -34,7 +34,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -44,7 +44,7 @@ jobs:
          persist-credentials: false

      - name: "Run analysis"
-        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
+        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
        with:
          results_file: results.sarif
          results_format: sarif
@@ -74,6 +74,6 @@ jobs:

      # Upload the results to GitHub's code scanning dashboard.
      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.29.5
+        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
        with:
          sarif_file: results.sarif
@@ -30,7 +30,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -39,7 +39,7 @@ jobs:
          fetch-depth: 0

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

      - name: Build and analyze with Gradle
        env:
@@ -16,12 +16,12 @@ jobs:
      pull-requests: write
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

      - name: 30 days stale issues
-        uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 30
@@ -26,7 +26,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -38,7 +38,7 @@ jobs:
          java-version: "17"
          distribution: "temurin"

-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0

      - name: Generate Swagger documentation
        run: ./gradlew :stirling-pdf:generateOpenApiDocs
@@ -30,9 +30,13 @@ permissions:
 jobs:
  sync-files:
    runs-on: ubuntu-latest
+    env:
+      # Prevents sdist builds → no tar extraction
+      PIP_ONLY_BINARY: ":all:"
+      PIP_DISABLE_PIP_VERSION_CHECK: "1"
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -46,7 +50,7 @@ jobs:
          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}

      - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
          python-version: "3.12"
          cache: "pip" # caching pip dependencies
@@ -61,7 +65,9 @@ jobs:
          git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "No changes detected"

      - name: Install dependencies
-        run: pip install --require-hashes -r ./.github/scripts/requirements_sync_readme.txt
+        # Wheels-only + Hash-Pinning
+        run: |
+          pip install --require-hashes --only-binary=:all: -r ./.github/scripts/requirements_sync_readme.txt

      - name: Sync README.md
        run: |
@@ -24,7 +24,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -38,7 +38,7 @@ jobs:
          distribution: 'temurin'

      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
        with:
          gradle-version: 8.14

@@ -57,7 +57,7 @@ jobs:
          echo "versionNumber=$VERSION" >> $GITHUB_OUTPUT

      - name: Login to Docker Hub
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
        with:
          username: ${{ secrets.DOCKER_HUB_USERNAME }}
          password: ${{ secrets.DOCKER_HUB_API }}
@@ -124,7 +124,7 @@ jobs:
    outputs:
      frontend: ${{ steps.changes.outputs.frontend }}
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

      - name: Check for file changes
        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
@@ -139,14 +139,14 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

      - name: Set up Node
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
        with:
          cache: 'npm'
          cache-dependency-path: frontend/package-lock.json
@@ -175,7 +175,7 @@ jobs:

    steps:
      - name: Harden Runner
-        uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
        with:
          egress-policy: audit

@@ -21,82 +21,97 @@ All documentation available at [https://docs.stirlingpdf.com/](https://docs.stir

 ## Features

- 50+ PDF Operations
 - Parallel file processing and downloads
 - Dark mode support
 - Custom download options
- Custom 'Pipelines' to run multiple features in a automated queue
+- Custom 'Pipelines' to run multiple features in an automated queue
 - API for integration with external scripts
 - Optional Login and Authentication support (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/System%20and%20Security) for documentation)
- Database Backup and Import (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/DATABASE) for documentation)
 - Enterprise features like SSO (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/Single%20Sign-On%20Configuration) for documentation)
+- Database Backup and Import (see [here](https://docs.stirlingpdf.com/Advanced%20Configuration/DATABASE) for documentation)

-## PDF Features
+### 50+ PDF Operations

-### Page Operations
+#### Organise
+- **Merge**: Combine multiple PDFs into one
+- **Split**: Divide PDFs into multiple files
+- **Extract page(s)**: Extract specific pages from PDF
+- **Remove**: Delete pages from PDF
+- **Crop PDF**: Adjust PDF page boundaries
+- **Rotate**: Rotate pages in 90-degree increments
+- **Adjust page size/scale**: Resize page contents
+- **Multi-Page Layout**: Add multiple pages to PDF
+- **PDF to Single Large Page**: Convert to single continuous page
+- **Organize**: Rearrange PDF pages

- View and modify PDFs - View multi-page PDFs with custom viewing, sorting, and searching. Plus, on-page edit features like annotating, drawing, and adding text and images. (Using PDF.js with Joxit and Liberation fonts)
- Full interactive GUI for merging/splitting/rotating/moving PDFs and their pages
- Merge multiple PDFs into a single resultant file
- Split PDFs into multiple files at specified page numbers or extract all pages as individual files
- Reorganize PDF pages into different orders
- Rotate PDFs in 90-degree increments
- Remove pages
- Multi-page layout (format PDFs into a multi-paged page)
- Scale page contents size by set percentage
- Adjust contrast
- Crop PDF
- Auto-split PDF (with physically scanned page dividers)
- Extract page(s)
- Convert PDF to a single page
- Overlay PDFs on top of each other
- PDF to a single page
- Split PDF by sections
+#### Convert to PDF
+- **Image to PDF**: Convert images to PDF format
+- **Convert file to PDF**: Convert various common file types to PDF
+- **HTML to PDF**: Transform HTML documents to PDF
+- **Markdown to PDF**: Convert Markdown files to PDF
+- **CBZ to PDF**: Convert comic book archives
+- **CBR to PDF**: Convert comic book rar archives
+- **Email to PDF**: Convert email files to PDF

-### Conversion Operations
-
- Convert PDFs to and from images
- Convert any common file to PDF (using LibreOffice)
- Convert PDF to Word/PowerPoint/others (using LibreOffice)
- Convert HTML to PDF
- Convert PDF to XML
- Convert PDF to CSV
- URL to PDF
- Markdown to PDF
-
-### Security & Permissions
-
- Add and remove passwords
- Change/set PDF permissions
- Add watermark(s)
- Certify/sign PDFs
- Sanitize PDFs
- Auto-redact text
-
-### Other Operations
-
- Add/generate/write signatures
- Split by Size or PDF
- Repair PDFs
- Detect and remove blank pages
- Compare two PDFs and show differences in text
- Add images to PDFs
- Compress PDFs to decrease their filesize (using qpdf)
- Extract images from PDF
- Remove images from PDF
- Extract images from scans
- Remove annotations
- Add page numbers
- Auto-rename files by detecting PDF header text
- OCR on PDF (using Tesseract OCR)
- PDF/A conversion (using LibreOffice)
- Edit metadata
- Flatten PDFs
- Get all information on a PDF to view or export as JSON
- Show/detect embedded JavaScript
+#### Convert from PDF
+- **PDF to Word**: Convert to documet (docx, doc, odt) format
+- **PDF to Image**: Extract PDF pages as images
+- **PDF to RTF (Text)**: Convert to Rich Text Format
+- **PDF to Presentation**: Convert to presentation (pptx, ppt, odp) format
+- **PDF to CSV**: Extract tables to CSV
+- **PDF to XML**: Convert to XML format
+- **PDF to HTML**: Transform to HTML
+- **PDF to PDF/A**: Convert to archival (PDF/A-1b, PDF/A-2b) format
+- **PDF to Markdown**: Convert PDF to Markdown
+- **PDF to CBZ**: Convert to comic book archive
+- **PDF to CBR**: Convert to comic book rar archive

+#### Sign & Security
+- **Sign**: Add digital signatures
+- **Remove Password**: Remove PDF security
+- **Add Watermark**: Apply watermarks
+- **Sign with Certificate**: Certificate-based signing
+- **Add Stamp to PDF**: Apply digital stamps
+- **Auto Redact**: Automatically redact content
+- **Change Permissions**: Modify access permissions
+- **Add Password**: Apply PDF encryption
+- **Manual Redaction**: Manual content redaction
+- **Remove Certificate Sign**: Remove digital signatures
+- **Sanitize**: Clean PDF of potential security issues
+- **Validate PDF Signature**: Verify digital signatures

+#### View & Edit
+- **OCR / Cleanup scans**: Optical Character Recognition
+- **Add Image**: Insert images into PDF
+- **Extract Images**: Extract embedded images
+- **Change Metadata**: Edit PDF metadata
+- **Get ALL Info on PDF**: Comprehensive PDF analysis
+- **Advanced Colour options**: Colour manipulation (various options for colour inversion, CMYK conversion)
+- **Compare**: Compare PDF documents
+- **Add Page Numbers**: Insert page numbering
+- **Flatten**: Flatten PDF layers, and interactive elements
+- **Remove Annotations**: Delete comments and markups
+- **Remove Blank pages**: Delete empty pages
+- **Remove Image**: Delete embedded images
+- **View/Edit PDF**: Interactive PDF editing
+- **Unlock PDF Forms**: Enable form editing
+- **Add Attachments**: Attach files to PDF

+#### Advanced
+- **Compress**: Reduce file size
+- **Pipeline**: Automated workflow processing (OCR images pipeline, prepare PDFs for emailing pipeline)
+- **Adjust Colours/Contrast**: Colour and contrast adjustment
+- **Auto Rename PDF File**: Automatic file renaming
+- **Auto Split Pages**: Automatic page splitting
+- **Detect/Split Scanned photos**: Photo detection and splitting
+- **Overlay PDFs**: Layer PDFs over each other
+- **Repair**: Fix corrupted PDFs
+- **Show JavaScript**: Display embedded JavaScript
+- **Auto Split by Size/Count**: Split by file size or page count
+- **Split PDF by Chapters**: Chapter-based splitting
+- **Split PDF by Sections**: Section-based splitting
+- **Scanner Effect**: Apply scanner-like effects
+- **Edit Table of Contents**: Modify PDF bookmarks and TOC

 # 📖 Get Started

@@ -115,48 +130,48 @@ Visit our comprehensive documentation at [docs.stirlingpdf.com](https://docs.sti
 Stirling-PDF currently supports 40 languages!

 | Language                                     | Progress                               |
-| -------------------------------------------- | -------------------------------------- |
-| Arabic (العربية) (ar_AR)                        | ![61%](https://geps.dev/progress/61)   |
-| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![62%](https://geps.dev/progress/62)   |
-| Basque (Euskara) (eu_ES)                     | ![36%](https://geps.dev/progress/36)   |
-| Bulgarian (Български) (bg_BG)                | ![68%](https://geps.dev/progress/68)   |
-| Catalan (Català) (ca_CA)                     | ![67%](https://geps.dev/progress/67)   |
-| Croatian (Hrvatski) (hr_HR)                  | ![60%](https://geps.dev/progress/60)   |
-| Czech (Česky) (cs_CZ)                        | ![70%](https://geps.dev/progress/70)   |
-| Danish (Dansk) (da_DK)                       | ![61%](https://geps.dev/progress/61)   |
-| Dutch (Nederlands) (nl_NL)                   | ![60%](https://geps.dev/progress/60)   |
+|----------------------------------------------|----------------------------------------|
+| Arabic (العربية) (ar_AR)                     | ![59%](https://geps.dev/progress/59)   |
+| Azerbaijani (Azərbaycan Dili) (az_AZ)        | ![60%](https://geps.dev/progress/60)   |
+| Basque (Euskara) (eu_ES)                     | ![35%](https://geps.dev/progress/35)   |
+| Bulgarian (Български) (bg_BG)                | ![66%](https://geps.dev/progress/66)   |
+| Catalan (Català) (ca_CA)                     | ![66%](https://geps.dev/progress/66)   |
+| Croatian (Hrvatski) (hr_HR)                  | ![96%](https://geps.dev/progress/96)   |
+| Czech (Česky) (cs_CZ)                        | ![68%](https://geps.dev/progress/68)   |
+| Danish (Dansk) (da_DK)                       | ![60%](https://geps.dev/progress/60)   |
+| Dutch (Nederlands) (nl_NL)                   | ![58%](https://geps.dev/progress/58)   |
 | English (English) (en_GB)                    | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                         | ![100%](https://geps.dev/progress/100) |
 | French (Français) (fr_FR)                    | ![88%](https://geps.dev/progress/88)   |
-| German (Deutsch) (de_DE)                     | ![98%](https://geps.dev/progress/98)   |
-| Greek (Ελληνικά) (el_GR)                     | ![67%](https://geps.dev/progress/67)   |
-| Hindi (हिंदी) (hi_IN)                          | ![67%](https://geps.dev/progress/67)   |
-| Hungarian (Magyar) (hu_HU)                   | ![99%](https://geps.dev/progress/99)   |
-| Indonesian (Bahasa Indonesia) (id_ID)        | ![62%](https://geps.dev/progress/62)   |
-| Irish (Gaeilge) (ga_IE)                      | ![68%](https://geps.dev/progress/68)   |
-| Italian (Italiano) (it_IT)                   | ![98%](https://geps.dev/progress/98)   |
-| Japanese (日本語) (ja_JP)                    | ![92%](https://geps.dev/progress/92)   |
-| Korean (한국어) (ko_KR)                      | ![67%](https://geps.dev/progress/67)   |
-| Norwegian (Norsk) (no_NB)                    | ![66%](https://geps.dev/progress/66)   |
-| Persian (فارسی) (fa_IR)                      | ![64%](https://geps.dev/progress/64)   |
-| Polish (Polski) (pl_PL)                      | ![72%](https://geps.dev/progress/72)   |
-| Portuguese (Português) (pt_PT)               | ![68%](https://geps.dev/progress/68)   |
-| Portuguese Brazilian (Português) (pt_BR)     | ![76%](https://geps.dev/progress/76)   |
-| Romanian (Română) (ro_RO)                    | ![57%](https://geps.dev/progress/57)   |
-| Russian (Русский) (ru_RU)                    | ![88%](https://geps.dev/progress/88)   |
-| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![95%](https://geps.dev/progress/95)   |
-| Simplified Chinese (简体中文) (zh_CN)         | ![93%](https://geps.dev/progress/93)   |
-| Slovakian (Slovensky) (sk_SK)                | ![51%](https://geps.dev/progress/51)   |
-| Slovenian (Slovenščina) (sl_SI)              | ![71%](https://geps.dev/progress/71)   |
-| Spanish (Español) (es_ES)                    | ![74%](https://geps.dev/progress/74)   |
-| Swedish (Svenska) (sv_SE)                    | ![65%](https://geps.dev/progress/65)   |
-| Thai (ไทย) (th_TH)                           | ![59%](https://geps.dev/progress/59)   |
-| Tibetan (བོད་ཡིག་) (bo_CN)                     | ![65%](https://geps.dev/progress/65) |
-| Traditional Chinese (繁體中文) (zh_TW)        | ![99%](https://geps.dev/progress/99)   |
-| Turkish (Türkçe) (tr_TR)                     | ![99%](https://geps.dev/progress/99)   |
-| Ukrainian (Українська) (uk_UA)               | ![70%](https://geps.dev/progress/70)   |
-| Vietnamese (Tiếng Việt) (vi_VN)              | ![57%](https://geps.dev/progress/57)   |
-| Malayalam (മലയാളം) (ml_IN)              | ![73%](https://geps.dev/progress/73)   |
+| German (Deutsch) (de_DE)                     | ![95%](https://geps.dev/progress/95)   |
+| Greek (Ελληνικά) (el_GR)                     | ![65%](https://geps.dev/progress/65)   |
+| Hindi (हिंदी) (hi_IN)                        | ![65%](https://geps.dev/progress/65)   |
+| Hungarian (Magyar) (hu_HU)                   | ![97%](https://geps.dev/progress/97)   |
+| Indonesian (Bahasa Indonesia) (id_ID)        | ![60%](https://geps.dev/progress/60)   |
+| Irish (Gaeilge) (ga_IE)                      | ![66%](https://geps.dev/progress/66)   |
+| Italian (Italiano) (it_IT)                   | ![96%](https://geps.dev/progress/96)   |
+| Japanese (日本語) (ja_JP)                       | ![90%](https://geps.dev/progress/90)   |
+| Korean (한국어) (ko_KR)                         | ![66%](https://geps.dev/progress/66)   |
+| Norwegian (Norsk) (no_NB)                    | ![64%](https://geps.dev/progress/64)   |
+| Persian (فارسی) (fa_IR)                      | ![62%](https://geps.dev/progress/62)   |
+| Polish (Polski) (pl_PL)                      | ![70%](https://geps.dev/progress/70)   |
+| Portuguese (Português) (pt_PT)               | ![67%](https://geps.dev/progress/67)   |
+| Portuguese Brazilian (Português) (pt_BR)     | ![74%](https://geps.dev/progress/74)   |
+| Romanian (Română) (ro_RO)                    | ![56%](https://geps.dev/progress/56)   |
+| Russian (Русский) (ru_RU)                    | ![90%](https://geps.dev/progress/90)   |
+| Serbian Latin alphabet (Srpski) (sr_LATN_RS) | ![97%](https://geps.dev/progress/97)   |
+| Simplified Chinese (简体中文) (zh_CN)            | ![91%](https://geps.dev/progress/91)   |
+| Slovakian (Slovensky) (sk_SK)                | ![50%](https://geps.dev/progress/50)   |
+| Slovenian (Slovenščina) (sl_SI)              | ![69%](https://geps.dev/progress/69)   |
+| Spanish (Español) (es_ES)                    | ![95%](https://geps.dev/progress/95)   |
+| Swedish (Svenska) (sv_SE)                    | ![63%](https://geps.dev/progress/63)   |
+| Thai (ไทย) (th_TH)                           | ![57%](https://geps.dev/progress/57)   |
+| Tibetan (བོད་ཡིག་) (bo_CN)                   | ![63%](https://geps.dev/progress/63)   |
+| Traditional Chinese (繁體中文) (zh_TW)           | ![97%](https://geps.dev/progress/97)   |
+| Turkish (Türkçe) (tr_TR)                     | ![96%](https://geps.dev/progress/96)   |
+| Ukrainian (Українська) (uk_UA)               | ![69%](https://geps.dev/progress/69)   |
+| Vietnamese (Tiếng Việt) (vi_VN)              | ![55%](https://geps.dev/progress/55)   |
+| Malayalam (മലയാളം) (ml_IN)                   | ![71%](https://geps.dev/progress/71)   |

 ## Stirling PDF Enterprise

@@ -167,6 +167,10 @@
    {
      "moduleName": ".*",
      "moduleLicense": "The W3C License"
+    },
+    {
+      "moduleName": ".*",
+      "moduleLicense": "UnRar License"
    }
  ]
 }
@@ -33,13 +33,14 @@ dependencies {
    api 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
    api 'com.fathzer:javaluator:3.0.6'
    api 'com.posthog.java:posthog:1.2.0'
-    api 'org.apache.commons:commons-lang3:3.18.0'
+    api 'org.apache.commons:commons-lang3:3.19.0'
    api 'com.drewnoakes:metadata-extractor:2.19.0' // Image metadata extractor
    api 'com.vladsch.flexmark:flexmark-html2md-converter:0.64.8'
    api "org.apache.pdfbox:pdfbox:$pdfboxVersion"
+    api 'com.github.junrar:junrar:7.5.5' // RAR archive support for CBR files
    api 'jakarta.servlet:jakarta.servlet-api:6.1.0'
    api 'org.snakeyaml:snakeyaml-engine:2.10'
-    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.12"
-    api 'jakarta.mail:jakarta.mail-api:2.1.4'
-    runtimeOnly 'org.eclipse.angus:angus-mail:2.0.4'
+    api "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.13"
+    api 'jakarta.mail:jakarta.mail-api:2.1.5'
+    runtimeOnly 'org.eclipse.angus:angus-mail:2.0.5'
 }
@@ -3,6 +3,7 @@ package stirling.software.common.annotations;
 import java.lang.annotation.*;

 import org.springframework.core.annotation.AliasFor;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

@@ -37,7 +38,7 @@ public @interface AutoJobPostMapping {

    /** MIME types this endpoint accepts. Defaults to {@code multipart/form-data}. */
    @AliasFor(annotation = RequestMapping.class, attribute = "consumes")
-    String[] consumes() default {"multipart/form-data"};
+    String[] consumes() default {MediaType.MULTIPART_FORM_DATA_VALUE};

    /**
     * Maximum execution time in milliseconds before the job is aborted. A negative value means "use
@@ -271,9 +271,14 @@ public class AppConfig {
        return "NORMAL";
    }

-    @Bean(name = "disablePixel")
-    public boolean disablePixel() {
-        return Boolean.parseBoolean(env.getProperty("DISABLE_PIXEL", "false"));
+    @Bean(name = "scarfEnabled")
+    public boolean scarfEnabled() {
+        return applicationProperties.getSystem().isScarfEnabled();
+    }
+
+    @Bean(name = "posthogEnabled")
+    public boolean posthogEnabled() {
+        return applicationProperties.getSystem().isPosthogEnabled();
    }

    @Bean(name = "machineType")
@@ -73,11 +73,11 @@ public class ApplicationProperties {
    public PropertySource<?> dynamicYamlPropertySource(ConfigurableEnvironment environment)
            throws IOException {
        String configPath = InstallationPathConfig.getSettingsPath();
-        log.debug("Attempting to load settings from: " + configPath);
+        log.debug("Attempting to load settings from: {}", configPath);

        File file = new File(configPath);
        if (!file.exists()) {
-            log.error("Warning: Settings file does not exist at: " + configPath);
+            log.error("Warning: Settings file does not exist at: {}", configPath);
        }

        Resource resource = new FileSystemResource(configPath);
@@ -90,7 +90,7 @@ public class ApplicationProperties {
                new YamlPropertySourceFactory().createPropertySource(null, encodedResource);
        environment.getPropertySources().addFirst(propertySource);

-        log.debug("Loaded properties: " + propertySource.getSource());
+        log.debug("Loaded properties: {}", propertySource.getSource());

        return propertySource;
    }
@@ -303,11 +303,10 @@ public class ApplicationProperties {

        @Data
        public static class Jwt {
-            private boolean enableKeystore = true;
-            private boolean enableKeyRotation = false;
-            private boolean enableKeyCleanup = true;
+            private boolean enabled = true;
+            private boolean keyCleanup = true;
            private int keyRetentionDays = 7;
-            private boolean secureCookie;
+            private Boolean secureCookie;
        }
    }

@@ -321,6 +320,8 @@ public class ApplicationProperties {
        private String tessdataDir;
        private Boolean enableAlphaFunctionality;
        private Boolean enableAnalytics;
+        private Boolean enablePosthog;
+        private Boolean enableScarf;
        private Datasource datasource;
        private Boolean disableSanitize;
        private int maxDPI;
@@ -334,6 +335,18 @@ public class ApplicationProperties {
        public boolean isAnalyticsEnabled() {
            return this.getEnableAnalytics() != null && this.getEnableAnalytics();
        }
+
+        public boolean isPosthogEnabled() {
+            // Treat null as enabled when analytics is enabled
+            return this.isAnalyticsEnabled()
+                    && (this.getEnablePosthog() == null || this.getEnablePosthog());
+        }
+
+        public boolean isScarfEnabled() {
+            // Treat null as enabled when analytics is enabled
+            return this.isAnalyticsEnabled()
+                    && (this.getEnableScarf() == null || this.getEnableScarf());
+        }
    }

    @Data
@@ -377,16 +390,19 @@ public class ApplicationProperties {

        @JsonIgnore
        public String getBaseTmpDir() {
-            return baseTmpDir != null && !baseTmpDir.isEmpty()
-                    ? baseTmpDir
-                    : java.lang.System.getProperty("java.io.tmpdir") + "/stirling-pdf";
+            if (baseTmpDir != null && !baseTmpDir.isEmpty()) {
+                return baseTmpDir;
+            }
+            String tmp = java.lang.System.getProperty("java.io.tmpdir");
+            return new File(tmp, "stirling-pdf").getPath();
        }

        @JsonIgnore
        public String getLibreofficeDir() {
-            return libreofficeDir != null && !libreofficeDir.isEmpty()
-                    ? libreofficeDir
-                    : getBaseTmpDir() + "/libreoffice";
+            if (libreofficeDir != null && !libreofficeDir.isEmpty()) {
+                return libreofficeDir;
+            }
+            return new File(getBaseTmpDir(), "libreoffice").getPath();
        }
    }

@@ -452,19 +468,17 @@ public class ApplicationProperties {
        private List<String> languages;

        public String getAppName() {
-            return appName != null && appName.trim().length() > 0 ? appName : null;
+            return appName != null && !appName.trim().isEmpty() ? appName : null;
        }

        public String getHomeDescription() {
-            return homeDescription != null && homeDescription.trim().length() > 0
+            return homeDescription != null && !homeDescription.trim().isEmpty()
                    ? homeDescription
                    : null;
        }

        public String getAppNameNavbar() {
-            return appNameNavbar != null && appNameNavbar.trim().length() > 0
-                    ? appNameNavbar
-                    : null;
+            return appNameNavbar != null && !appNameNavbar.trim().isEmpty() ? appNameNavbar : null;
        }
    }

@@ -1,6 +1,6 @@
 package stirling.software.common.model;

-import java.util.Calendar;
+import java.time.ZonedDateTime;

 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -18,6 +18,6 @@ public class PdfMetadata {
    private String creator;
    private String subject;
    private String keywords;
-    private Calendar creationDate;
-    private Calendar modificationDate;
+    private ZonedDateTime creationDate;
+    private ZonedDateTime modificationDate;
 }
@@ -1,5 +1,6 @@
 package stirling.software.common.model.api;

+import org.springframework.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;

 import io.swagger.v3.oas.annotations.media.Schema;
@@ -14,7 +15,7 @@ import lombok.NoArgsConstructor;
 public class PDFFile {
    @Schema(
            description = "The input PDF file",
-            contentMediaType = "application/pdf",
+            contentMediaType = MediaType.APPLICATION_PDF_VALUE,
            format = "binary")
    private MultipartFile fileInput;

@@ -4,4 +4,5 @@ public enum ReplaceAndInvert {
    HIGH_CONTRAST_COLOR,
    CUSTOM_COLOR,
    FULL_INVERSION,
+    COLOR_SPACE_CONVERSION,
 }
@@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;

 import stirling.software.common.model.job.JobResponse;
 import stirling.software.common.util.ExecutorFactory;
+import stirling.software.common.util.RegexPatternUtils;

 /** Service for executing jobs asynchronously or synchronously */
@Service
@@ -227,7 +228,8 @@ public class JobExecutorService {
            if (result instanceof byte[]) {
                // Store byte array directly to disk to avoid double memory consumption
                String fileId = fileStorage.storeBytes((byte[]) result, "result.pdf");
-                taskManager.setFileResult(jobId, fileId, "result.pdf", "application/pdf");
+                taskManager.setFileResult(
+                        jobId, fileId, "result.pdf", MediaType.APPLICATION_PDF_VALUE);
                log.debug("Stored byte[] result with fileId: {}", fileId);

                // Let the byte array get collected naturally in the next GC cycle
@@ -239,7 +241,7 @@ public class JobExecutorService {
                if (body instanceof byte[]) {
                    // Extract filename from content-disposition header if available
                    String filename = "result.pdf";
-                    String contentType = "application/pdf";
+                    String contentType = MediaType.APPLICATION_PDF_VALUE;

                    if (response.getHeaders().getContentDisposition() != null) {
                        String disposition =
@@ -276,7 +278,7 @@ public class JobExecutorService {
                            if (fileId != null && !fileId.isEmpty()) {
                                // Try to get filename and content type
                                String filename = "result.pdf";
-                                String contentType = "application/pdf";
+                                String contentType = MediaType.APPLICATION_PDF_VALUE;

                                try {
                                    java.lang.reflect.Method getOriginalFileName =
@@ -317,8 +319,7 @@ public class JobExecutorService {
                    // Store generic result
                    taskManager.setResult(jobId, body);
                }
-            } else if (result instanceof MultipartFile) {
-                MultipartFile file = (MultipartFile) result;
+            } else if (result instanceof MultipartFile file) {
                String fileId = fileStorage.storeFile(file);
                taskManager.setFileResult(
                        jobId, fileId, file.getOriginalFilename(), file.getContentType());
@@ -335,7 +336,7 @@ public class JobExecutorService {
                        if (fileId != null && !fileId.isEmpty()) {
                            // Try to get filename and content type
                            String filename = "result.pdf";
-                            String contentType = "application/pdf";
+                            String contentType = MediaType.APPLICATION_PDF_VALUE;

                            try {
                                java.lang.reflect.Method getOriginalFileName =
@@ -398,9 +399,8 @@ public class JobExecutorService {
                            HttpHeaders.CONTENT_DISPOSITION,
                            "form-data; name=\"attachment\"; filename=\"result.pdf\"")
                    .body(result);
-        } else if (result instanceof MultipartFile) {
+        } else if (result instanceof MultipartFile file) {
            // Return MultipartFile content
-            MultipartFile file = (MultipartFile) result;
            return ResponseEntity.ok()
                    .contentType(MediaType.parseMediaType(file.getContentType()))
                    .header(
@@ -427,8 +427,16 @@ public class JobExecutorService {
        }

        try {
-            String value = timeout.replaceAll("[^\\d.]", "");
-            String unit = timeout.replaceAll("[\\d.]", "");
+            String value =
+                    RegexPatternUtils.getInstance()
+                            .getNonDigitDotPattern()
+                            .matcher(timeout)
+                            .replaceAll("");
+            String unit =
+                    RegexPatternUtils.getInstance()
+                            .getDigitDotPattern()
+                            .matcher(timeout)
+                            .replaceAll("");

            double numericValue = Double.parseDouble(value);

@@ -1,5 +1,9 @@
 package stirling.software.common.service;

+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;

 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -29,17 +33,19 @@ public class PdfMetadataService {
        this.runningProOrHigher = runningProOrHigher;
    }

-    public PdfMetadata extractMetadataFromPdf(PDDocument pdf) {
-        return PdfMetadata.builder()
-                .author(pdf.getDocumentInformation().getAuthor())
-                .producer(pdf.getDocumentInformation().getProducer())
-                .title(pdf.getDocumentInformation().getTitle())
-                .creator(pdf.getDocumentInformation().getCreator())
-                .subject(pdf.getDocumentInformation().getSubject())
-                .keywords(pdf.getDocumentInformation().getKeywords())
-                .creationDate(pdf.getDocumentInformation().getCreationDate())
-                .modificationDate(pdf.getDocumentInformation().getModificationDate())
-                .build();
+    /**
+     * Converts ZonedDateTime to Calendar for PDFBox compatibility.
+     *
+     * @param zonedDateTime the ZonedDateTime to convert
+     * @return Calendar instance or null if input is null
+     */
+    public static Calendar toCalendar(ZonedDateTime zonedDateTime) {
+        if (zonedDateTime == null) {
+            return null;
+        }
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(zonedDateTime.toInstant().toEpochMilli());
+        return calendar;
    }

    public void setDefaultMetadata(PDDocument pdf) {
@@ -58,6 +64,52 @@ public class PdfMetadataService {
        setCommonMetadata(pdf, pdfMetadata);
    }

+    /**
+     * Parses a date string and converts it to Calendar for PDFBox compatibility.
+     *
+     * @param dateString the date string in "yyyy/MM/dd HH:mm:ss" format
+     * @return Calendar instance or null if parsing fails or input is empty
+     */
+    public static Calendar parseToCalendar(String dateString) {
+        if (dateString == null || dateString.trim().isEmpty()) {
+            return null;
+        }
+        try {
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
+            ZonedDateTime zonedDateTime =
+                    LocalDateTime.parse(dateString, formatter).atZone(ZoneId.systemDefault());
+            return toCalendar(zonedDateTime);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public PdfMetadata extractMetadataFromPdf(PDDocument pdf) {
+        Calendar creationCal = pdf.getDocumentInformation().getCreationDate();
+        Calendar modificationCal = pdf.getDocumentInformation().getModificationDate();
+
+        ZonedDateTime creationDate =
+                creationCal != null
+                        ? ZonedDateTime.ofInstant(creationCal.toInstant(), ZoneId.systemDefault())
+                        : null;
+        ZonedDateTime modificationDate =
+                modificationCal != null
+                        ? ZonedDateTime.ofInstant(
+                                modificationCal.toInstant(), ZoneId.systemDefault())
+                        : null;
+
+        return PdfMetadata.builder()
+                .author(pdf.getDocumentInformation().getAuthor())
+                .producer(pdf.getDocumentInformation().getProducer())
+                .title(pdf.getDocumentInformation().getTitle())
+                .creator(pdf.getDocumentInformation().getCreator())
+                .subject(pdf.getDocumentInformation().getSubject())
+                .keywords(pdf.getDocumentInformation().getKeywords())
+                .creationDate(creationDate)
+                .modificationDate(modificationDate)
+                .build();
+    }
+
    private void setNewDocumentMetadata(PDDocument pdf, PdfMetadata pdfMetadata) {

        String creator = stirlingPDFLabel;
@@ -79,7 +131,13 @@ public class PdfMetadataService {
        }

        pdf.getDocumentInformation().setCreator(creator);
-        pdf.getDocumentInformation().setCreationDate(Calendar.getInstance());
+
+        // Use existing creation date if available, otherwise create new one
+        Calendar creationCal =
+                pdfMetadata.getCreationDate() != null
+                        ? toCalendar(pdfMetadata.getCreationDate())
+                        : Calendar.getInstance();
+        pdf.getDocumentInformation().setCreationDate(creationCal);
    }

    private void setCommonMetadata(PDDocument pdf, PdfMetadata pdfMetadata) {
@@ -88,7 +146,13 @@ public class PdfMetadataService {
        pdf.getDocumentInformation().setProducer(stirlingPDFLabel);
        pdf.getDocumentInformation().setSubject(pdfMetadata.getSubject());
        pdf.getDocumentInformation().setKeywords(pdfMetadata.getKeywords());
-        pdf.getDocumentInformation().setModificationDate(Calendar.getInstance());
+
+        // Convert ZonedDateTime to Calendar for PDFBox compatibility
+        Calendar modificationCal =
+                pdfMetadata.getModificationDate() != null
+                        ? toCalendar(pdfMetadata.getModificationDate())
+                        : Calendar.getInstance();
+        pdf.getDocumentInformation().setModificationDate(modificationCal);

        String author = pdfMetadata.getAuthor();
        if (applicationProperties
@@ -56,7 +56,7 @@ public class PostHogService {
    }

    private void captureSystemInfo() {
-        if (!applicationProperties.getSystem().isAnalyticsEnabled()) {
+        if (!applicationProperties.getSystem().isPosthogEnabled()) {
            return;
        }
        try {
@@ -67,7 +67,7 @@ public class PostHogService {
    }

    public void captureEvent(String eventName, Map<String, Object> properties) {
-        if (!applicationProperties.getSystem().isAnalyticsEnabled()) {
+        if (!applicationProperties.getSystem().isPosthogEnabled()) {
            return;
        }

@@ -13,6 +13,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

 import stirling.software.common.model.ApplicationProperties;
+import stirling.software.common.util.RegexPatternUtils;

@Service
@RequiredArgsConstructor
@@ -22,8 +23,9 @@ public class SsrfProtectionService {
    private final ApplicationProperties applicationProperties;

    private static final Pattern DATA_URL_PATTERN =
-            Pattern.compile("^data:.*", Pattern.CASE_INSENSITIVE);
-    private static final Pattern FRAGMENT_PATTERN = Pattern.compile("^#.*");
+            RegexPatternUtils.getInstance().getPattern("^data:.*", Pattern.CASE_INSENSITIVE);
+    private static final Pattern FRAGMENT_PATTERN =
+            RegexPatternUtils.getInstance().getPattern("^#.*");

    public enum SsrfProtectionLevel {
        OFF, // No SSRF protection - allows all URLs
@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;

 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.RegexPatternUtils;
 import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.TempFileRegistry;

@@ -61,8 +62,14 @@ public class TempFileCleanupService {
    // File patterns that identify common system temp files
    private static final Predicate<String> IS_SYSTEM_TEMP_FILE =
            fileName ->
-                    fileName.matches("lu\\d+[a-z0-9]*\\.tmp")
-                            || fileName.matches("ocr_process\\d+")
+                    RegexPatternUtils.getInstance()
+                                    .getSystemTempFile1Pattern()
+                                    .matcher(fileName)
+                                    .matches()
+                            || RegexPatternUtils.getInstance()
+                                    .getSystemTempFile2Pattern()
+                                    .matcher(fileName)
+                                    .matches()
                            || (fileName.startsWith("tmp") && !fileName.contains("jetty"))
                            || fileName.startsWith("OSL_PIPE_")
                            || (fileName.endsWith(".tmp") && !fileName.contains("jetty"));
@@ -0,0 +1,258 @@
+package stirling.software.common.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.commons.io.FilenameUtils;
+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.image.PDImageXObject;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.github.junrar.Archive;
+import com.github.junrar.exception.CorruptHeaderException;
+import com.github.junrar.exception.RarException;
+import com.github.junrar.rarfile.FileHeader;
+
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.service.CustomPDFDocumentFactory;
+
+@Slf4j
+@UtilityClass
+public class CbrUtils {
+
+    public byte[] convertCbrToPdf(
+            MultipartFile cbrFile,
+            CustomPDFDocumentFactory pdfDocumentFactory,
+            TempFileManager tempFileManager)
+            throws IOException {
+        return convertCbrToPdf(cbrFile, pdfDocumentFactory, tempFileManager, false);
+    }
+
+    public byte[] convertCbrToPdf(
+            MultipartFile cbrFile,
+            CustomPDFDocumentFactory pdfDocumentFactory,
+            TempFileManager tempFileManager,
+            boolean optimizeForEbook)
+            throws IOException {
+
+        validateCbrFile(cbrFile);
+
+        try (TempFile tempFile = new TempFile(tempFileManager, ".cbr")) {
+            cbrFile.transferTo(tempFile.getFile());
+
+            try (PDDocument document = pdfDocumentFactory.createNewDocument()) {
+
+                Archive archive;
+                try {
+                    archive = new Archive(tempFile.getFile());
+                } catch (CorruptHeaderException e) {
+                    log.warn(
+                            "Failed to open CBR/RAR archive due to corrupt header: {}",
+                            e.getMessage());
+                    throw ExceptionUtils.createIllegalArgumentException(
+                            "error.invalidFormat",
+                            "Invalid or corrupted CBR/RAR archive. "
+                                    + "The file may be corrupted, use an unsupported RAR format (RAR5+), "
+                                    + "or may not be a valid RAR archive. "
+                                    + "Please ensure the file is a valid RAR archive.");
+                } catch (RarException e) {
+                    log.warn("Failed to open CBR/RAR archive: {}", e.getMessage());
+                    String errorMessage;
+                    String exMessage = e.getMessage() != null ? e.getMessage() : "";
+
+                    if (exMessage.contains("encrypted")) {
+                        errorMessage = "Encrypted CBR/RAR archives are not supported.";
+                    } else if (exMessage.isEmpty()) {
+                        errorMessage =
+                                "Invalid CBR/RAR archive. "
+                                        + "The file may be encrypted, corrupted, or use an unsupported format.";
+                    } else {
+                        errorMessage =
+                                "Invalid CBR/RAR archive: "
+                                        + exMessage
+                                        + ". The file may be encrypted, corrupted, or use an unsupported format.";
+                    }
+                    throw ExceptionUtils.createIllegalArgumentException(
+                            "error.invalidFormat", errorMessage);
+                } catch (IOException e) {
+                    log.warn("IO error reading CBR/RAR archive: {}", e.getMessage());
+                    throw ExceptionUtils.createFileProcessingException("CBR extraction", e);
+                }
+
+                List<ImageEntryData> imageEntries = new ArrayList<>();
+
+                try {
+                    for (FileHeader fileHeader : archive) {
+                        if (!fileHeader.isDirectory() && isImageFile(fileHeader.getFileName())) {
+                            try (InputStream is = archive.getInputStream(fileHeader)) {
+                                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                                is.transferTo(baos);
+                                imageEntries.add(
+                                        new ImageEntryData(
+                                                fileHeader.getFileName(), baos.toByteArray()));
+                            } catch (Exception e) {
+                                log.warn(
+                                        "Error reading image {}: {}",
+                                        fileHeader.getFileName(),
+                                        e.getMessage());
+                            }
+                        }
+                    }
+                } finally {
+                    try {
+                        archive.close();
+                    } catch (IOException e) {
+                        log.warn("Error closing CBR/RAR archive: {}", e.getMessage());
+                    }
+                }
+
+                imageEntries.sort(
+                        Comparator.comparing(ImageEntryData::name, new NaturalOrderComparator()));
+
+                if (imageEntries.isEmpty()) {
+                    throw ExceptionUtils.createIllegalArgumentException(
+                            "error.fileProcessing",
+                            "No valid images found in the CBR file. The archive may be empty or contain no supported image formats.");
+                }
+
+                for (ImageEntryData imageEntry : imageEntries) {
+                    try {
+                        PDImageXObject pdImage =
+                                PDImageXObject.createFromByteArray(
+                                        document, imageEntry.data(), imageEntry.name());
+                        PDPage page =
+                                new PDPage(
+                                        new PDRectangle(pdImage.getWidth(), pdImage.getHeight()));
+                        document.addPage(page);
+                        try (PDPageContentStream contentStream =
+                                new PDPageContentStream(document, page)) {
+                            contentStream.drawImage(pdImage, 0, 0);
+                        }
+                    } catch (IOException e) {
+                        log.warn(
+                                "Error processing image {}: {}", imageEntry.name(), e.getMessage());
+                    }
+                }
+
+                if (document.getNumberOfPages() == 0) {
+                    throw ExceptionUtils.createIllegalArgumentException(
+                            "error.fileProcessing",
+                            "No images could be processed from the CBR file. All images may be corrupted or in unsupported formats.");
+                }
+
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                document.save(baos);
+                byte[] pdfBytes = baos.toByteArray();
+
+                // Apply Ghostscript optimization if requested
+                if (optimizeForEbook) {
+                    try {
+                        return GeneralUtils.optimizePdfWithGhostscript(pdfBytes);
+                    } catch (IOException e) {
+                        log.warn("Ghostscript optimization failed, returning unoptimized PDF", e);
+                        return pdfBytes;
+                    }
+                }
+
+                return pdfBytes;
+            }
+        }
+    }
+
+    private void validateCbrFile(MultipartFile file) {
+        if (file == null || file.isEmpty()) {
+            throw new IllegalArgumentException("File cannot be null or empty");
+        }
+
+        String filename = file.getOriginalFilename();
+        if (filename == null) {
+            throw new IllegalArgumentException("File must have a name");
+        }
+
+        String extension = FilenameUtils.getExtension(filename).toLowerCase();
+        if (!"cbr".equals(extension) && !"rar".equals(extension)) {
+            throw new IllegalArgumentException("File must be a CBR or RAR archive");
+        }
+    }
+
+    public boolean isCbrFile(MultipartFile file) {
+        String filename = file.getOriginalFilename();
+        if (filename == null) {
+            return false;
+        }
+
+        String extension = FilenameUtils.getExtension(filename).toLowerCase();
+        return "cbr".equals(extension) || "rar".equals(extension);
+    }
+
+    private boolean isImageFile(String filename) {
+        return RegexPatternUtils.getInstance().getImageFilePattern().matcher(filename).matches();
+    }
+
+    private record ImageEntryData(String name, byte[] data) {}
+
+    private class NaturalOrderComparator implements Comparator<String> {
+        private static String getChunk(String s, int length, int marker) {
+            StringBuilder chunk = new StringBuilder();
+            char c = s.charAt(marker);
+            chunk.append(c);
+            marker++;
+
+            if (isDigit(c)) {
+                while (marker < length && isDigit(s.charAt(marker))) {
+                    chunk.append(s.charAt(marker));
+                    marker++;
+                }
+            } else {
+                while (marker < length && !isDigit(s.charAt(marker))) {
+                    chunk.append(s.charAt(marker));
+                    marker++;
+                }
+            }
+            return chunk.toString();
+        }
+
+        private static boolean isDigit(char ch) {
+            return ch >= '0' && ch <= '9';
+        }
+
+        @Override
+        public int compare(String s1, String s2) {
+            int len1 = s1.length();
+            int len2 = s2.length();
+            int marker1 = 0, marker2 = 0;
+
+            while (marker1 < len1 && marker2 < len2) {
+                String chunk1 = getChunk(s1, len1, marker1);
+                marker1 += chunk1.length();
+
+                String chunk2 = getChunk(s2, len2, marker2);
+                marker2 += chunk2.length();
+
+                int result;
+                if (isDigit(chunk1.charAt(0)) && isDigit(chunk2.charAt(0))) {
+                    int thisNumericValue = Integer.parseInt(chunk1);
+                    int thatNumericValue = Integer.parseInt(chunk2);
+                    result = Integer.compare(thisNumericValue, thatNumericValue);
+                } else {
+                    result = chunk1.compareTo(chunk2);
+                }
+
+                if (result != 0) {
+                    return result;
+                }
+            }
+
+            return Integer.compare(len1, len2);
+        }
+    }
+}
@@ -0,0 +1,231 @@
+package stirling.software.common.util;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
+
+import org.apache.commons.io.FilenameUtils;
+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.image.PDImageXObject;
+import org.springframework.web.multipart.MultipartFile;
+
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.service.CustomPDFDocumentFactory;
+
+@Slf4j
+@UtilityClass
+public class CbzUtils {
+
+    public byte[] convertCbzToPdf(
+            MultipartFile cbzFile,
+            CustomPDFDocumentFactory pdfDocumentFactory,
+            TempFileManager tempFileManager)
+            throws IOException {
+        return convertCbzToPdf(cbzFile, pdfDocumentFactory, tempFileManager, false);
+    }
+
+    public byte[] convertCbzToPdf(
+            MultipartFile cbzFile,
+            CustomPDFDocumentFactory pdfDocumentFactory,
+            TempFileManager tempFileManager,
+            boolean optimizeForEbook)
+            throws IOException {
+
+        validateCbzFile(cbzFile);
+
+        try (TempFile tempFile = new TempFile(tempFileManager, ".cbz")) {
+            cbzFile.transferTo(tempFile.getFile());
+
+            // Early ZIP validity check using ZipInputStream (fail fast on non-zip content)
+            try (BufferedInputStream bis =
+                            new BufferedInputStream(
+                                    new java.io.FileInputStream(tempFile.getFile()));
+                    ZipInputStream zis = new ZipInputStream(bis)) {
+                if (zis.getNextEntry() == null) {
+                    throw new IllegalArgumentException("Archive is empty or invalid ZIP");
+                }
+            } catch (IOException e) {
+                throw new IllegalArgumentException("Invalid CBZ/ZIP archive", e);
+            }
+
+            try (PDDocument document = pdfDocumentFactory.createNewDocument();
+                    ZipFile zipFile = new ZipFile(tempFile.getFile())) {
+                Enumeration<? extends ZipEntry> entries = zipFile.entries();
+                List<ImageEntryData> imageEntries = new ArrayList<>();
+                while (entries.hasMoreElements()) {
+                    ZipEntry entry = entries.nextElement();
+                    if (!entry.isDirectory() && isImageFile(entry.getName())) {
+                        try (InputStream is = zipFile.getInputStream(entry)) {
+                            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                            is.transferTo(baos);
+                            imageEntries.add(
+                                    new ImageEntryData(entry.getName(), baos.toByteArray()));
+                        } catch (IOException e) {
+                            log.warn("Error reading image {}: {}", entry.getName(), e.getMessage());
+                        }
+                    }
+                }
+
+                imageEntries.sort(
+                        Comparator.comparing(ImageEntryData::name, new NaturalOrderComparator()));
+
+                if (imageEntries.isEmpty()) {
+                    throw new IllegalArgumentException("No valid images found in the CBZ file");
+                }
+
+                for (ImageEntryData imageEntry : imageEntries) {
+                    try {
+                        PDImageXObject pdImage =
+                                PDImageXObject.createFromByteArray(
+                                        document, imageEntry.data(), imageEntry.name());
+                        PDPage page =
+                                new PDPage(
+                                        new PDRectangle(pdImage.getWidth(), pdImage.getHeight()));
+                        document.addPage(page);
+                        try (PDPageContentStream contentStream =
+                                new PDPageContentStream(document, page)) {
+                            contentStream.drawImage(pdImage, 0, 0);
+                        }
+                    } catch (IOException e) {
+                        log.warn(
+                                "Error processing image {}: {}", imageEntry.name(), e.getMessage());
+                    }
+                }
+
+                if (document.getNumberOfPages() == 0) {
+                    throw new IllegalArgumentException(
+                            "No images could be processed from the CBZ file");
+                }
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                document.save(baos);
+                byte[] pdfBytes = baos.toByteArray();
+
+                // Apply Ghostscript optimization if requested
+                if (optimizeForEbook) {
+                    try {
+                        return GeneralUtils.optimizePdfWithGhostscript(pdfBytes);
+                    } catch (IOException e) {
+                        log.warn("Ghostscript optimization failed, returning unoptimized PDF", e);
+                        return pdfBytes;
+                    }
+                }
+
+                return pdfBytes;
+            }
+        }
+    }
+
+    private void validateCbzFile(MultipartFile file) {
+        if (file == null || file.isEmpty()) {
+            throw new IllegalArgumentException("File cannot be null or empty");
+        }
+
+        String filename = file.getOriginalFilename();
+        if (filename == null) {
+            throw new IllegalArgumentException("File must have a name");
+        }
+
+        String extension = FilenameUtils.getExtension(filename).toLowerCase();
+        if (!"cbz".equals(extension) && !"zip".equals(extension)) {
+            throw new IllegalArgumentException("File must be a CBZ or ZIP archive");
+        }
+    }
+
+    public boolean isCbzFile(MultipartFile file) {
+        String filename = file.getOriginalFilename();
+        if (filename == null) {
+            return false;
+        }
+
+        String extension = FilenameUtils.getExtension(filename).toLowerCase();
+        return "cbz".equals(extension) || "zip".equals(extension);
+    }
+
+    public static boolean isComicBookFile(MultipartFile file) {
+        String filename = file.getOriginalFilename();
+        if (filename == null) {
+            return false;
+        }
+
+        String extension = FilenameUtils.getExtension(filename).toLowerCase();
+        return "cbz".equals(extension)
+                || "zip".equals(extension)
+                || "cbr".equals(extension)
+                || "rar".equals(extension);
+    }
+
+    private boolean isImageFile(String filename) {
+        return RegexPatternUtils.getInstance().getImageFilePattern().matcher(filename).matches();
+    }
+
+    private record ImageEntryData(String name, byte[] data) {}
+
+    private class NaturalOrderComparator implements Comparator<String> {
+        @Override
+        public int compare(String s1, String s2) {
+            int len1 = s1.length();
+            int len2 = s2.length();
+            int marker1 = 0, marker2 = 0;
+
+            while (marker1 < len1 && marker2 < len2) {
+                String chunk1 = getChunk(s1, len1, marker1);
+                marker1 += chunk1.length();
+
+                String chunk2 = getChunk(s2, len2, marker2);
+                marker2 += chunk2.length();
+
+                int result;
+                if (isDigit(chunk1.charAt(0)) && isDigit(chunk2.charAt(0))) {
+                    int thisNumericValue = Integer.parseInt(chunk1);
+                    int thatNumericValue = Integer.parseInt(chunk2);
+                    result = Integer.compare(thisNumericValue, thatNumericValue);
+                } else {
+                    result = chunk1.compareTo(chunk2);
+                }
+
+                if (result != 0) {
+                    return result;
+                }
+            }
+
+            return Integer.compare(len1, len2);
+        }
+
+        private static String getChunk(String s, int length, int marker) {
+            StringBuilder chunk = new StringBuilder();
+            char c = s.charAt(marker);
+            chunk.append(c);
+            marker++;
+
+            if (isDigit(c)) {
+                while (marker < length && isDigit(s.charAt(marker))) {
+                    chunk.append(s.charAt(marker));
+                    marker++;
+                }
+            } else {
+                while (marker < length && !isDigit(s.charAt(marker))) {
+                    chunk.append(s.charAt(marker));
+                    marker++;
+                }
+            }
+            return chunk.toString();
+        }
+
+        private static boolean isDigit(char ch) {
+            return ch >= '0' && ch <= '9';
+        }
+    }
+}
@@ -26,7 +26,7 @@ public class CustomHtmlSanitizer {
            new AttributePolicy() {
                @Override
                public String apply(String elementName, String attributeName, String value) {
-                    if (value == null || value.trim().isEmpty()) {
+                    if (value.trim().isEmpty()) {
                        return null;
                    }

@@ -6,12 +6,16 @@ import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 import java.util.regex.Pattern;

+import org.springframework.http.MediaType;
+
 import lombok.Data;
 import lombok.experimental.UtilityClass;

@@ -25,11 +29,11 @@ public class EmlParser {
    private static volatile boolean mimeUtilityChecked = false;

    private static final Pattern MIME_ENCODED_PATTERN =
-            Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
+            RegexPatternUtils.getInstance().getMimeEncodedWordPattern();

    private static final String DISPOSITION_ATTACHMENT = "attachment";
-    private static final String TEXT_PLAIN = "text/plain";
-    private static final String TEXT_HTML = "text/html";
+    private static final String TEXT_PLAIN = MediaType.TEXT_PLAIN_VALUE;
+    private static final String TEXT_HTML = MediaType.TEXT_HTML_VALUE;
    private static final String MULTIPART_PREFIX = "multipart/";

    private static final String HEADER_CONTENT_TYPE = "content-type:";
@@ -69,12 +73,12 @@ public class EmlParser {
        if (isJakartaMailAvailable()) {
            return extractEmailContentAdvanced(emlBytes, request, customHtmlSanitizer);
        } else {
-            return extractEmailContentBasic(emlBytes, request, customHtmlSanitizer);
+            return extractEmailContentBasic(emlBytes, customHtmlSanitizer);
        }
    }

    private static EmailContent extractEmailContentBasic(
-            byte[] emlBytes, EmlToPdfRequest request, CustomHtmlSanitizer customHtmlSanitizer) {
+            byte[] emlBytes, CustomHtmlSanitizer customHtmlSanitizer) {
        String emlContent = new String(emlBytes, StandardCharsets.UTF_8);
        EmailContent content = new EmailContent();

@@ -121,7 +125,7 @@ public class EmlParser {
            return extractFromMimeMessage(message, request, customHtmlSanitizer);

        } catch (ReflectiveOperationException e) {
-            return extractEmailContentBasic(emlBytes, request, customHtmlSanitizer);
+            return extractEmailContentBasic(emlBytes, customHtmlSanitizer);
        }
    }

@@ -143,7 +147,11 @@ public class EmlParser {
            extractRecipients(message, messageClass, content);

            Method getSentDate = messageClass.getMethod("getSentDate");
-            content.setDate((Date) getSentDate.invoke(message));
+            Date legacyDate = (Date) getSentDate.invoke(message);
+            if (legacyDate != null) {
+                content.setDate(
+                        ZonedDateTime.ofInstant(legacyDate.toInstant(), ZoneId.systemDefault()));
+            }

            Method getContent = messageClass.getMethod("getContent");
            Object messageContent = getContent.invoke(message);
@@ -349,7 +357,11 @@ public class EmlParser {
                    for (String contentIdHeader : contentIdHeaders) {
                        if (contentIdHeader != null && !contentIdHeader.trim().isEmpty()) {
                            attachment.setEmbedded(true);
-                            String contentId = contentIdHeader.trim().replaceAll("[<>]", "");
+                            String contentId =
+                                    RegexPatternUtils.getInstance()
+                                            .getAngleBracketsPattern()
+                                            .matcher(contentIdHeader.trim())
+                                            .replaceAll("");
                            attachment.setContentId(contentId);
                            break;
                        }
@@ -406,7 +418,8 @@ public class EmlParser {

    private static String extractBasicHeader(String emlContent, String headerName) {
        try {
-            String[] lines = emlContent.split("\r?\n");
+            String[] lines =
+                    RegexPatternUtils.getInstance().getNewlineSplitPattern().split(emlContent);
            for (int i = 0; i < lines.length; i++) {
                String line = lines[i];
                if (line.toLowerCase().startsWith(headerName.toLowerCase())) {
@@ -477,7 +490,10 @@ public class EmlParser {
    }

    private static int findPartEnd(String content, int start) {
-        String[] lines = content.substring(start).split("\r?\n");
+        String[] lines =
+                RegexPatternUtils.getInstance()
+                        .getNewlineSplitPattern()
+                        .split(content.substring(start));
        StringBuilder result = new StringBuilder();

        for (String line : lines) {
@@ -491,7 +507,8 @@ public class EmlParser {
    private static List<EmailAttachment> extractAttachmentsBasic(String emlContent) {
        List<EmailAttachment> attachments = new ArrayList<>();
        try {
-            String[] lines = emlContent.split("\r?\n");
+            String[] lines =
+                    RegexPatternUtils.getInstance().getNewlineSplitPattern().split(emlContent);
            boolean inHeaders = true;
            String currentContentType = "";
            String currentDisposition = "";
@@ -554,7 +571,11 @@ public class EmlParser {
            if (filenameStarEnd == -1) filenameStarEnd = disposition.length();
            String extendedFilename =
                    disposition.substring(filenameStarStart, filenameStarEnd).trim();
-            extendedFilename = extendedFilename.replaceAll("^\"|\"$", "");
+            extendedFilename =
+                    RegexPatternUtils.getInstance()
+                            .getQuotesRemovalPattern()
+                            .matcher(extendedFilename)
+                            .replaceAll("");

            if (extendedFilename.contains("'")) {
                String[] parts = extendedFilename.split("'", 3);
@@ -569,7 +590,11 @@ public class EmlParser {
        int filenameEnd = disposition.indexOf(";", filenameStart);
        if (filenameEnd == -1) filenameEnd = disposition.length();
        String filename = disposition.substring(filenameStart, filenameEnd).trim();
-        filename = filename.replaceAll("^\"|\"$", "");
+        filename =
+                RegexPatternUtils.getInstance()
+                        .getQuotesRemovalPattern()
+                        .matcher(filename)
+                        .replaceAll("");
        return safeMimeDecode(filename);
    }

@@ -614,7 +639,7 @@ public class EmlParser {
        private String to;
        private String cc;
        private String bcc;
-        private Date date;
+        private ZonedDateTime date;
        private String dateString; // For basic parsing fallback
        private String htmlBody;
        private String textBody;
@@ -622,11 +647,23 @@ public class EmlParser {
        private List<EmailAttachment> attachments = new ArrayList<>();

        public void setHtmlBody(String htmlBody) {
-            this.htmlBody = htmlBody != null ? htmlBody.replaceAll("\r", "") : null;
+            this.htmlBody =
+                    htmlBody != null
+                            ? RegexPatternUtils.getInstance()
+                                    .getCarriageReturnPattern()
+                                    .matcher(htmlBody)
+                                    .replaceAll("")
+                            : null;
        }

        public void setTextBody(String textBody) {
-            this.textBody = textBody != null ? textBody.replaceAll("\r", "") : null;
+            this.textBody =
+                    textBody != null
+                            ? RegexPatternUtils.getInstance()
+                                    .getCarriageReturnPattern()
+                                    .matcher(textBody)
+                                    .replaceAll("")
+                            : null;
        }
    }

@@ -8,6 +8,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

+import org.springframework.http.MediaType;
+
 import lombok.experimental.UtilityClass;

 import stirling.software.common.model.api.converters.EmlToPdfRequest;
@@ -33,10 +35,10 @@ public class EmlProcessingUtils {
    // MIME type detection
    private static final Map<String, String> EXTENSION_TO_MIME_TYPE =
            Map.of(
-                    ".png", "image/png",
-                    ".jpg", "image/jpeg",
-                    ".jpeg", "image/jpeg",
-                    ".gif", "image/gif",
+                    ".png", MediaType.IMAGE_PNG_VALUE,
+                    ".jpg", MediaType.IMAGE_JPEG_VALUE,
+                    ".jpeg", MediaType.IMAGE_JPEG_VALUE,
+                    ".gif", MediaType.IMAGE_GIF_VALUE,
                    ".bmp", "image/bmp",
                    ".webp", "image/webp",
                    ".svg", "image/svg+xml",
@@ -81,8 +83,8 @@ public class EmlProcessingUtils {
                            || lowerContent.contains("bcc:");
            boolean hasMimeStructure =
                    lowerContent.contains("multipart/")
-                            || lowerContent.contains("text/plain")
-                            || lowerContent.contains("text/html")
+                            || lowerContent.contains(MediaType.TEXT_PLAIN_VALUE)
+                            || lowerContent.contains(MediaType.TEXT_HTML_VALUE)
                            || lowerContent.contains("boundary=");

            int headerCount = 0;
@@ -197,8 +199,16 @@ public class EmlProcessingUtils {
        String processed =
                customHtmlSanitizer != null ? customHtmlSanitizer.sanitize(htmlBody) : htmlBody;

-        processed = processed.replaceAll("(?i)\\s*position\\s*:\\s*fixed[^;]*;?", "");
-        processed = processed.replaceAll("(?i)\\s*position\\s*:\\s*absolute[^;]*;?", "");
+        processed =
+                RegexPatternUtils.getInstance()
+                        .getFixedPositionCssPattern()
+                        .matcher(processed)
+                        .replaceAll("");
+        processed =
+                RegexPatternUtils.getInstance()
+                        .getAbsolutePositionCssPattern()
+                        .matcher(processed)
+                        .replaceAll("");

        if (emailContent != null && !emailContent.getAttachments().isEmpty()) {
            processed = PdfAttachmentHandler.processInlineImages(processed, emailContent);
@@ -220,14 +230,18 @@ public class EmlProcessingUtils {
        html = html.replace("\n", "<br>\n");

        html =
-                html.replaceAll(
-                        "(https?://[\\w\\-._~:/?#\\[\\]@!$&'()*+,;=%]+)",
-                        "<a href=\"$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");
+                RegexPatternUtils.getInstance()
+                        .getUrlLinkPattern()
+                        .matcher(html)
+                        .replaceAll(
+                                "<a href=\"$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");

        html =
-                html.replaceAll(
-                        "([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,63})",
-                        "<a href=\"mailto:$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");
+                RegexPatternUtils.getInstance()
+                        .getEmailLinkPattern()
+                        .matcher(html)
+                        .replaceAll(
+                                "<a href=\"mailto:$1\" style=\"color: #1a73e8; text-decoration: underline;\">$1</a>");

        return html;
    }
@@ -464,7 +478,7 @@ public class EmlProcessingUtils {
            }
        }

-        return "image/png";
+        return MediaType.IMAGE_PNG_VALUE; // Default MIME type
    }

    public static String decodeUrlEncoded(String encoded) {
@@ -488,9 +502,13 @@ public class EmlProcessingUtils {
            Matcher concatenatedMatcher = concatenatedPattern.matcher(encodedText);
            String processedText =
                    concatenatedMatcher.replaceAll(
-                            match -> match.group().replaceAll("\\s+(?==\\?)", ""));
+                            match ->
+                                    RegexPatternUtils.getInstance()
+                                            .getMimeHeaderWhitespacePattern()
+                                            .matcher(match.group())
+                                            .replaceAll(""));

-            Pattern mimePattern = Pattern.compile("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
+            Pattern mimePattern = RegexPatternUtils.getInstance().getMimeEncodedWordPattern();
            Matcher matcher = mimePattern.matcher(processedText);
            int lastEnd = 0;

@@ -505,7 +523,11 @@ public class EmlProcessingUtils {
                    String decodedValue =
                            switch (encoding) {
                                case "B" -> {
-                                    String cleanBase64 = encodedValue.replaceAll("\\s", "");
+                                    String cleanBase64 =
+                                            RegexPatternUtils.getInstance()
+                                                    .getWhitespacePattern()
+                                                    .matcher(encodedValue)
+                                                    .replaceAll("");
                                    byte[] decodedBytes = Base64.getDecoder().decode(cleanBase64);
                                    Charset targetCharset;
                                    try {
@@ -594,8 +616,16 @@ public class EmlProcessingUtils {
    }

    public static String simplifyHtmlContent(String htmlContent) {
-        String simplified = htmlContent.replaceAll("(?i)<script[^>]*>.*?</script>", "");
-        simplified = simplified.replaceAll("(?i)<style[^>]*>.*?</style>", "");
+        String simplified =
+                RegexPatternUtils.getInstance()
+                        .getScriptTagPattern()
+                        .matcher(htmlContent)
+                        .replaceAll("");
+        simplified =
+                RegexPatternUtils.getInstance()
+                        .getStyleTagPattern()
+                        .matcher(simplified)
+                        .replaceAll("");
        return simplified;
    }
 }
@@ -324,4 +324,63 @@ public class ExceptionUtils {
        return createIllegalArgumentException(
                "error.argumentRequired", "{0} must not be null", argumentName);
    }
+
+    /**
+     * Create a RuntimeException for memory/image size errors when rendering PDF images with DPI.
+     * Handles OutOfMemoryError and related conditions (e.g., NegativeArraySizeException) that
+     * result from images exceeding Java's array/memory limits.
+     *
+     * @param pageNumber the page number that caused the error
+     * @param dpi the DPI value used
+     * @param cause the original error/exception (e.g., OutOfMemoryError,
+     *     NegativeArraySizeException)
+     * @return RuntimeException with user-friendly message
+     */
+    public static RuntimeException createOutOfMemoryDpiException(
+            int pageNumber, int dpi, Throwable cause) {
+        String message =
+                MessageFormat.format(
+                        "Out of memory or image-too-large error while rendering PDF page {0} at {1} DPI. "
+                                + "This can occur when the resulting image exceeds Java's array/memory limits (e.g., NegativeArraySizeException). "
+                                + "Please use a lower DPI value (recommended: 150 or less) or process the document in smaller chunks.",
+                        pageNumber, dpi);
+        return new RuntimeException(message, cause);
+    }
+
+    /**
+     * Create a RuntimeException for OutOfMemoryError when rendering PDF images with DPI.
+     *
+     * @param pageNumber the page number that caused the error
+     * @param dpi the DPI value used
+     * @param cause the original OutOfMemoryError
+     * @return RuntimeException with user-friendly message
+     */
+    public static RuntimeException createOutOfMemoryDpiException(
+            int pageNumber, int dpi, OutOfMemoryError cause) {
+        return createOutOfMemoryDpiException(pageNumber, dpi, (Throwable) cause);
+    }
+
+    /**
+     * Create a RuntimeException for memory/image size errors when rendering PDF images with DPI.
+     * Handles OutOfMemoryError and related conditions (e.g., NegativeArraySizeException) that
+     * result from images exceeding Java's array/memory limits.
+     *
+     * @param dpi the DPI value used
+     * @param cause the original error/exception (e.g., OutOfMemoryError,
+     *     NegativeArraySizeException)
+     * @return RuntimeException with user-friendly message
+     */
+    public static RuntimeException createOutOfMemoryDpiException(int dpi, Throwable cause) {
+        String message =
+                MessageFormat.format(
+                        "Out of memory or image-too-large error while rendering PDF at {0} DPI. "
+                                + "This can occur when the resulting image exceeds Java's array/memory limits (e.g., NegativeArraySizeException). "
+                                + "Please use a lower DPI value (recommended: 150 or less) or process the document in smaller chunks.",
+                        dpi);
+        return new RuntimeException(message, cause);
+    }
+
+    public static RuntimeException createOutOfMemoryDpiException(int dpi, OutOfMemoryError cause) {
+        return createOutOfMemoryDpiException(dpi, (Throwable) cause);
+    }
 }
@@ -1,6 +1,9 @@
 package stirling.software.common.util;

-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
@@ -124,20 +127,21 @@ public class FileToPdf {
    private static void zipDirectory(Path sourceDir, Path zipFilePath) throws IOException {
        try (ZipOutputStream zos =
                new ZipOutputStream(new FileOutputStream(zipFilePath.toFile()))) {
-            Files.walk(sourceDir)
-                    .filter(path -> !Files.isDirectory(path))
-                    .forEach(
-                            path -> {
-                                ZipEntry zipEntry =
-                                        new ZipEntry(sourceDir.relativize(path).toString());
-                                try {
-                                    zos.putNextEntry(zipEntry);
-                                    Files.copy(path, zos);
-                                    zos.closeEntry();
-                                } catch (IOException e) {
-                                    throw new UncheckedIOException(e);
-                                }
-                            });
+            try (Stream<Path> walk = Files.walk(sourceDir)) {
+                walk.filter(path -> !Files.isDirectory(path))
+                        .forEach(
+                                path -> {
+                                    ZipEntry zipEntry =
+                                            new ZipEntry(sourceDir.relativize(path).toString());
+                                    try {
+                                        zos.putNextEntry(zipEntry);
+                                        Files.copy(path, zos);
+                                        zos.closeEntry();
+                                    } catch (IOException e) {
+                                        throw new UncheckedIOException(e);
+                                    }
+                                });
+            }
        }
    }

@@ -204,15 +208,27 @@ public class FileToPdf {
            return "";
        }
        // Remove any drive letters (e.g., "C:\") and leading forward/backslashes
-        entryName = entryName.replaceAll("^[a-zA-Z]:[\\\\/]+", "");
-        entryName = entryName.replaceAll("^[\\\\/]+", "");
+        entryName =
+                RegexPatternUtils.getInstance()
+                        .getDriveLetterPattern()
+                        .matcher(entryName)
+                        .replaceAll("");
+        entryName =
+                RegexPatternUtils.getInstance()
+                        .getLeadingSlashesPattern()
+                        .matcher(entryName)
+                        .replaceAll("");

        // Recursively remove path traversal sequences
        while (entryName.contains("../") || entryName.contains("..\\")) {
            entryName = entryName.replace("../", "").replace("..\\", "");
        }
        // Normalize all backslashes to forward slashes
-        entryName = entryName.replaceAll("\\\\", "/");
+        entryName =
+                RegexPatternUtils.getInstance()
+                        .getBackslashPattern()
+                        .matcher(entryName)
+                        .replaceAll("/");
        return entryName;
    }
 }
@@ -0,0 +1,658 @@
+package stirling.software.common.util;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDResources;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
+import org.apache.pdfbox.pdmodel.interactive.form.*;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public final class FormUtils {
+
+    private FormUtils() {}
+
+    public static boolean hasAnyRotatedPage(PDDocument document) {
+        try {
+            for (PDPage page : document.getPages()) {
+                int rot = page.getRotation();
+                int norm = ((rot % 360) + 360) % 360;
+                if (norm != 0) {
+                    return true;
+                }
+            }
+        } catch (Exception e) {
+            log.warn("Failed to inspect page rotations: {}", e.getMessage(), e);
+        }
+        return false;
+    }
+
+    public static void copyAndTransformFormFields(
+            PDDocument sourceDocument,
+            PDDocument newDocument,
+            int totalPages,
+            int pagesPerSheet,
+            int cols,
+            int rows,
+            float cellWidth,
+            float cellHeight)
+            throws IOException {
+
+        PDDocumentCatalog sourceCatalog = sourceDocument.getDocumentCatalog();
+        PDAcroForm sourceAcroForm = sourceCatalog.getAcroForm();
+
+        if (sourceAcroForm == null || sourceAcroForm.getFields().isEmpty()) {
+            return;
+        }
+
+        PDDocumentCatalog newCatalog = newDocument.getDocumentCatalog();
+        PDAcroForm newAcroForm = new PDAcroForm(newDocument);
+        newCatalog.setAcroForm(newAcroForm);
+
+        PDResources dr = new PDResources();
+        PDType1Font helvetica = new PDType1Font(Standard14Fonts.FontName.HELVETICA);
+        PDType1Font zapfDingbats = new PDType1Font(Standard14Fonts.FontName.ZAPF_DINGBATS);
+        dr.put(COSName.getPDFName("Helv"), helvetica);
+        dr.put(COSName.getPDFName("ZaDb"), zapfDingbats);
+        newAcroForm.setDefaultResources(dr);
+        newAcroForm.setDefaultAppearance("/Helv 12 Tf 0 g");
+
+        // Do not mutate the source AcroForm; skip bad widgets during copy
+        newAcroForm.setNeedAppearances(true);
+
+        Map<String, Integer> fieldNameCounters = new HashMap<>();
+
+        // Build widget -> field map once for efficient lookups
+        Map<PDAnnotationWidget, PDField> widgetFieldMap = buildWidgetFieldMap(sourceAcroForm);
+
+        for (int pageIndex = 0; pageIndex < totalPages; pageIndex++) {
+            PDPage sourcePage = sourceDocument.getPage(pageIndex);
+            List<PDAnnotation> annotations = sourcePage.getAnnotations();
+
+            if (annotations.isEmpty()) {
+                continue;
+            }
+
+            int destinationPageIndex = pageIndex / pagesPerSheet;
+            int adjustedPageIndex = pageIndex % pagesPerSheet;
+            int rowIndex = adjustedPageIndex / cols;
+            int colIndex = adjustedPageIndex % cols;
+
+            if (destinationPageIndex >= newDocument.getNumberOfPages()) {
+                continue;
+            }
+
+            PDPage destinationPage = newDocument.getPage(destinationPageIndex);
+            PDRectangle sourceRect = sourcePage.getMediaBox();
+
+            float scaleWidth = cellWidth / sourceRect.getWidth();
+            float scaleHeight = cellHeight / sourceRect.getHeight();
+            float scale = Math.min(scaleWidth, scaleHeight);
+
+            float x = colIndex * cellWidth + (cellWidth - sourceRect.getWidth() * scale) / 2;
+            float y =
+                    destinationPage.getMediaBox().getHeight()
+                            - ((rowIndex + 1) * cellHeight
+                                    - (cellHeight - sourceRect.getHeight() * scale) / 2);
+
+            copyBasicFormFields(
+                    sourceAcroForm,
+                    newAcroForm,
+                    sourcePage,
+                    destinationPage,
+                    x,
+                    y,
+                    scale,
+                    pageIndex,
+                    fieldNameCounters,
+                    widgetFieldMap);
+        }
+
+        // Refresh appearances to ensure widgets render correctly across viewers
+        try {
+            // Use reflection to avoid compile-time dependency on PDFBox version
+            Method m = newAcroForm.getClass().getMethod("refreshAppearances");
+            m.invoke(newAcroForm);
+        } catch (NoSuchMethodException nsme) {
+            log.warn(
+                    "AcroForm.refreshAppearances() not available in this PDFBox version; relying on NeedAppearances.");
+        } catch (Throwable t) {
+            log.warn("Failed to refresh field appearances via AcroForm: {}", t.getMessage(), t);
+        }
+    }
+
+    private static void copyBasicFormFields(
+            PDAcroForm sourceAcroForm,
+            PDAcroForm newAcroForm,
+            PDPage sourcePage,
+            PDPage destinationPage,
+            float offsetX,
+            float offsetY,
+            float scale,
+            int pageIndex,
+            Map<String, Integer> fieldNameCounters,
+            Map<PDAnnotationWidget, PDField> widgetFieldMap) {
+
+        try {
+            List<PDAnnotation> sourceAnnotations = sourcePage.getAnnotations();
+            List<PDAnnotation> destinationAnnotations = destinationPage.getAnnotations();
+
+            for (PDAnnotation annotation : sourceAnnotations) {
+                if (annotation instanceof PDAnnotationWidget widgetAnnotation) {
+                    if (widgetAnnotation.getRectangle() == null) {
+                        continue;
+                    }
+                    PDField sourceField =
+                            widgetFieldMap != null ? widgetFieldMap.get(widgetAnnotation) : null;
+                    if (sourceField == null) {
+                        continue; // skip widgets without a matching field
+                    }
+                    if (sourceField instanceof PDTextField pdtextfield) {
+                        createSimpleTextField(
+                                newAcroForm,
+                                destinationPage,
+                                destinationAnnotations,
+                                pdtextfield,
+                                widgetAnnotation,
+                                offsetX,
+                                offsetY,
+                                scale,
+                                pageIndex,
+                                fieldNameCounters);
+                    } else if (sourceField instanceof PDCheckBox pdCheckBox) {
+                        createSimpleCheckBoxField(
+                                newAcroForm,
+                                destinationPage,
+                                destinationAnnotations,
+                                pdCheckBox,
+                                widgetAnnotation,
+                                offsetX,
+                                offsetY,
+                                scale,
+                                pageIndex,
+                                fieldNameCounters);
+                    } else if (sourceField instanceof PDRadioButton pdRadioButton) {
+                        createSimpleRadioButtonField(
+                                newAcroForm,
+                                destinationPage,
+                                destinationAnnotations,
+                                pdRadioButton,
+                                widgetAnnotation,
+                                offsetX,
+                                offsetY,
+                                scale,
+                                pageIndex,
+                                fieldNameCounters);
+                    } else if (sourceField instanceof PDComboBox pdComboBox) {
+                        createSimpleComboBoxField(
+                                newAcroForm,
+                                destinationPage,
+                                destinationAnnotations,
+                                pdComboBox,
+                                widgetAnnotation,
+                                offsetX,
+                                offsetY,
+                                scale,
+                                pageIndex,
+                                fieldNameCounters);
+                    } else if (sourceField instanceof PDListBox pdlistbox) {
+                        createSimpleListBoxField(
+                                newAcroForm,
+                                destinationPage,
+                                destinationAnnotations,
+                                pdlistbox,
+                                widgetAnnotation,
+                                offsetX,
+                                offsetY,
+                                scale,
+                                pageIndex,
+                                fieldNameCounters);
+                    } else if (sourceField instanceof PDSignatureField pdSignatureField) {
+                        createSimpleSignatureField(
+                                newAcroForm,
+                                destinationPage,
+                                destinationAnnotations,
+                                pdSignatureField,
+                                widgetAnnotation,
+                                offsetX,
+                                offsetY,
+                                scale,
+                                pageIndex,
+                                fieldNameCounters);
+                    } else if (sourceField instanceof PDPushButton pdPushButton) {
+                        createSimplePushButtonField(
+                                newAcroForm,
+                                destinationPage,
+                                destinationAnnotations,
+                                pdPushButton,
+                                widgetAnnotation,
+                                offsetX,
+                                offsetY,
+                                scale,
+                                pageIndex,
+                                fieldNameCounters);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.warn(
+                    "Failed to copy basic form fields for page {}: {}",
+                    pageIndex,
+                    e.getMessage(),
+                    e);
+        }
+    }
+
+    private static void createSimpleTextField(
+            PDAcroForm newAcroForm,
+            PDPage destinationPage,
+            List<PDAnnotation> destinationAnnotations,
+            PDTextField sourceField,
+            PDAnnotationWidget sourceWidget,
+            float offsetX,
+            float offsetY,
+            float scale,
+            int pageIndex,
+            Map<String, Integer> fieldNameCounters) {
+
+        try {
+            PDTextField newTextField = new PDTextField(newAcroForm);
+            newTextField.setDefaultAppearance("/Helv 12 Tf 0 g");
+
+            boolean initialized =
+                    initializeFieldWithWidget(
+                            newAcroForm,
+                            destinationPage,
+                            destinationAnnotations,
+                            newTextField,
+                            sourceField.getPartialName(),
+                            "textField",
+                            sourceWidget,
+                            offsetX,
+                            offsetY,
+                            scale,
+                            pageIndex,
+                            fieldNameCounters);
+
+            if (!initialized) {
+                return;
+            }
+
+            if (sourceField.getValueAsString() != null) {
+                newTextField.setValue(sourceField.getValueAsString());
+            }
+
+        } catch (Exception e) {
+            log.warn(
+                    "Failed to create text field '{}': {}",
+                    sourceField.getPartialName(),
+                    e.getMessage(),
+                    e);
+        }
+    }
+
+    private static void createSimpleCheckBoxField(
+            PDAcroForm newAcroForm,
+            PDPage destinationPage,
+            List<PDAnnotation> destinationAnnotations,
+            PDCheckBox sourceField,
+            PDAnnotationWidget sourceWidget,
+            float offsetX,
+            float offsetY,
+            float scale,
+            int pageIndex,
+            Map<String, Integer> fieldNameCounters) {
+
+        try {
+            PDCheckBox newCheckBox = new PDCheckBox(newAcroForm);
+
+            boolean initialized =
+                    initializeFieldWithWidget(
+                            newAcroForm,
+                            destinationPage,
+                            destinationAnnotations,
+                            newCheckBox,
+                            sourceField.getPartialName(),
+                            "checkBox",
+                            sourceWidget,
+                            offsetX,
+                            offsetY,
+                            scale,
+                            pageIndex,
+                            fieldNameCounters);
+
+            if (!initialized) {
+                return;
+            }
+
+            if (sourceField.isChecked()) {
+                newCheckBox.check();
+            } else {
+                newCheckBox.unCheck();
+            }
+
+        } catch (Exception e) {
+            log.warn(
+                    "Failed to create checkbox field '{}': {}",
+                    sourceField.getPartialName(),
+                    e.getMessage(),
+                    e);
+        }
+    }
+
+    private static void createSimpleRadioButtonField(
+            PDAcroForm newAcroForm,
+            PDPage destinationPage,
+            List<PDAnnotation> destinationAnnotations,
+            PDRadioButton sourceField,
+            PDAnnotationWidget sourceWidget,
+            float offsetX,
+            float offsetY,
+            float scale,
+            int pageIndex,
+            Map<String, Integer> fieldNameCounters) {
+
+        try {
+            PDRadioButton newRadioButton = new PDRadioButton(newAcroForm);
+
+            boolean initialized =
+                    initializeFieldWithWidget(
+                            newAcroForm,
+                            destinationPage,
+                            destinationAnnotations,
+                            newRadioButton,
+                            sourceField.getPartialName(),
+                            "radioButton",
+                            sourceWidget,
+                            offsetX,
+                            offsetY,
+                            scale,
+                            pageIndex,
+                            fieldNameCounters);
+
+            if (!initialized) {
+                return;
+            }
+
+            if (sourceField.getExportValues() != null) {
+                newRadioButton.setExportValues(sourceField.getExportValues());
+            }
+            if (sourceField.getValue() != null) {
+                newRadioButton.setValue(sourceField.getValue());
+            }
+        } catch (Exception e) {
+            log.warn(
+                    "Failed to create radio button field '{}': {}",
+                    sourceField.getPartialName(),
+                    e.getMessage(),
+                    e);
+        }
+    }
+
+    private static void createSimpleComboBoxField(
+            PDAcroForm newAcroForm,
+            PDPage destinationPage,
+            List<PDAnnotation> destinationAnnotations,
+            PDComboBox sourceField,
+            PDAnnotationWidget sourceWidget,
+            float offsetX,
+            float offsetY,
+            float scale,
+            int pageIndex,
+            Map<String, Integer> fieldNameCounters) {
+
+        try {
+            PDComboBox newComboBox = new PDComboBox(newAcroForm);
+
+            boolean initialized =
+                    initializeFieldWithWidget(
+                            newAcroForm,
+                            destinationPage,
+                            destinationAnnotations,
+                            newComboBox,
+                            sourceField.getPartialName(),
+                            "comboBox",
+                            sourceWidget,
+                            offsetX,
+                            offsetY,
+                            scale,
+                            pageIndex,
+                            fieldNameCounters);
+
+            if (!initialized) {
+                return;
+            }
+
+            if (sourceField.getOptions() != null) {
+                newComboBox.setOptions(sourceField.getOptions());
+            }
+            if (sourceField.getValue() != null && !sourceField.getValue().isEmpty()) {
+                newComboBox.setValue(sourceField.getValue());
+            }
+        } catch (Exception e) {
+            log.warn(
+                    "Failed to create combo box field '{}': {}",
+                    sourceField.getPartialName(),
+                    e.getMessage(),
+                    e);
+        }
+    }
+
+    private static void createSimpleListBoxField(
+            PDAcroForm newAcroForm,
+            PDPage destinationPage,
+            List<PDAnnotation> destinationAnnotations,
+            PDListBox sourceField,
+            PDAnnotationWidget sourceWidget,
+            float offsetX,
+            float offsetY,
+            float scale,
+            int pageIndex,
+            Map<String, Integer> fieldNameCounters) {
+
+        try {
+            PDListBox newListBox = new PDListBox(newAcroForm);
+
+            boolean initialized =
+                    initializeFieldWithWidget(
+                            newAcroForm,
+                            destinationPage,
+                            destinationAnnotations,
+                            newListBox,
+                            sourceField.getPartialName(),
+                            "listBox",
+                            sourceWidget,
+                            offsetX,
+                            offsetY,
+                            scale,
+                            pageIndex,
+                            fieldNameCounters);
+
+            if (!initialized) {
+                return;
+            }
+
+            if (sourceField.getOptions() != null) {
+                newListBox.setOptions(sourceField.getOptions());
+            }
+            if (sourceField.getValue() != null && !sourceField.getValue().isEmpty()) {
+                newListBox.setValue(sourceField.getValue());
+            }
+        } catch (Exception e) {
+            log.warn(
+                    "Failed to create list box field '{}': {}",
+                    sourceField.getPartialName(),
+                    e.getMessage(),
+                    e);
+        }
+    }
+
+    private static void createSimpleSignatureField(
+            PDAcroForm newAcroForm,
+            PDPage destinationPage,
+            List<PDAnnotation> destinationAnnotations,
+            PDSignatureField sourceField,
+            PDAnnotationWidget sourceWidget,
+            float offsetX,
+            float offsetY,
+            float scale,
+            int pageIndex,
+            Map<String, Integer> fieldNameCounters) {
+
+        try {
+            PDSignatureField newSignatureField = new PDSignatureField(newAcroForm);
+
+            boolean initialized =
+                    initializeFieldWithWidget(
+                            newAcroForm,
+                            destinationPage,
+                            destinationAnnotations,
+                            newSignatureField,
+                            sourceField.getPartialName(),
+                            "signature",
+                            sourceWidget,
+                            offsetX,
+                            offsetY,
+                            scale,
+                            pageIndex,
+                            fieldNameCounters);
+
+            if (!initialized) {
+                return;
+            }
+        } catch (Exception e) {
+            log.warn(
+                    "Failed to create signature field '{}': {}",
+                    sourceField.getPartialName(),
+                    e.getMessage(),
+                    e);
+        }
+    }
+
+    private static void createSimplePushButtonField(
+            PDAcroForm newAcroForm,
+            PDPage destinationPage,
+            List<PDAnnotation> destinationAnnotations,
+            PDPushButton sourceField,
+            PDAnnotationWidget sourceWidget,
+            float offsetX,
+            float offsetY,
+            float scale,
+            int pageIndex,
+            Map<String, Integer> fieldNameCounters) {
+
+        try {
+            PDPushButton newPushButton = new PDPushButton(newAcroForm);
+
+            boolean initialized =
+                    initializeFieldWithWidget(
+                            newAcroForm,
+                            destinationPage,
+                            destinationAnnotations,
+                            newPushButton,
+                            sourceField.getPartialName(),
+                            "pushButton",
+                            sourceWidget,
+                            offsetX,
+                            offsetY,
+                            scale,
+                            pageIndex,
+                            fieldNameCounters);
+
+        } catch (Exception e) {
+            log.warn(
+                    "Failed to create push button field '{}': {}",
+                    sourceField.getPartialName(),
+                    e.getMessage(),
+                    e);
+        }
+    }
+
+    private static <T extends PDTerminalField> boolean initializeFieldWithWidget(
+            PDAcroForm newAcroForm,
+            PDPage destinationPage,
+            List<PDAnnotation> destinationAnnotations,
+            T newField,
+            String originalName,
+            String fallbackName,
+            PDAnnotationWidget sourceWidget,
+            float offsetX,
+            float offsetY,
+            float scale,
+            int pageIndex,
+            Map<String, Integer> fieldNameCounters) {
+
+        String baseName = (originalName != null) ? originalName : fallbackName;
+        String newFieldName = generateUniqueFieldName(baseName, pageIndex, fieldNameCounters);
+        newField.setPartialName(newFieldName);
+
+        PDAnnotationWidget newWidget = new PDAnnotationWidget();
+        PDRectangle sourceRect = sourceWidget.getRectangle();
+        if (sourceRect == null) {
+            return false;
+        }
+
+        float newX = (sourceRect.getLowerLeftX() * scale) + offsetX;
+        float newY = (sourceRect.getLowerLeftY() * scale) + offsetY;
+        float newWidth = sourceRect.getWidth() * scale;
+        float newHeight = sourceRect.getHeight() * scale;
+        newWidget.setRectangle(new PDRectangle(newX, newY, newWidth, newHeight));
+        newWidget.setPage(destinationPage);
+
+        newField.getWidgets().add(newWidget);
+        newWidget.setParent(newField);
+        newAcroForm.getFields().add(newField);
+        destinationAnnotations.add(newWidget);
+        return true;
+    }
+
+    private static String generateUniqueFieldName(
+            String originalName, int pageIndex, Map<String, Integer> fieldNameCounters) {
+        String baseName = "page" + pageIndex + "_" + originalName;
+
+        Integer counter = fieldNameCounters.get(baseName);
+        if (counter == null) {
+            counter = 0;
+        } else {
+            counter++;
+        }
+        fieldNameCounters.put(baseName, counter);
+
+        return counter == 0 ? baseName : baseName + "_" + counter;
+    }
+
+    private static Map<PDAnnotationWidget, PDField> buildWidgetFieldMap(PDAcroForm acroForm) {
+        Map<PDAnnotationWidget, PDField> map = new HashMap<>();
+        if (acroForm == null) {
+            return map;
+        }
+        try {
+            for (PDField field : acroForm.getFieldTree()) {
+                List<PDAnnotationWidget> widgets = field.getWidgets();
+                if (widgets != null) {
+                    for (PDAnnotationWidget w : widgets) {
+                        if (w != null) {
+                            map.put(w, field);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.warn("Failed to build widget->field map: {}", e.getMessage(), e);
+        }
+        return map;
+    }
+}
@@ -9,13 +9,9 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.security.MessageDigest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -28,25 +24,37 @@ import com.fathzer.soft.javaluator.DoubleEvaluator;
 import io.github.pixee.security.HostValidator;
 import io.github.pixee.security.Urls;

+import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;

 import stirling.software.common.configuration.InstallationPathConfig;

@Slf4j
+@UtilityClass
 public class GeneralUtils {

-    private static final Set<String> DEFAULT_VALID_SCRIPTS =
-            Set.of("png_to_webp.py", "split_photos.py");
-    private static final Set<String> DEFAULT_VALID_PIPELINE =
+    private final Set<String> DEFAULT_VALID_SCRIPTS = Set.of("png_to_webp.py", "split_photos.py");
+    private final Set<String> DEFAULT_VALID_PIPELINE =
            Set.of(
                    "OCR images.json",
                    "Prepare-pdfs-for-email.json",
                    "split-rotate-auto-rename.json");

-    private static final String DEFAULT_WEBUI_CONFIGS_DIR = "defaultWebUIConfigs";
-    private static final String PYTHON_SCRIPTS_DIR = "python";
+    private final String DEFAULT_WEBUI_CONFIGS_DIR = "defaultWebUIConfigs";
+    private final String PYTHON_SCRIPTS_DIR = "python";
+    private final RegexPatternUtils patternCache = RegexPatternUtils.getInstance();
+    // Valid size units used for convertSizeToBytes validation and parsing
+    private final Set<String> VALID_SIZE_UNITS = Set.of("B", "KB", "MB", "GB", "TB");

-    public static File convertMultipartFileToFile(MultipartFile multipartFile) throws IOException {
+    /*
+     * Converts a MultipartFile to a regular File with improved performance and security.
+     *
+     * @param multipartFile the multipart file to convert
+     * @return temporary File containing the multipart file data
+     * @throws IOException if I/O error occurs during conversion
+     * @throws IllegalArgumentException if file exceeds maximum allowed size
+     */
+    public File convertMultipartFileToFile(MultipartFile multipartFile) throws IOException {
        String customTempDir = System.getenv("STIRLING_TEMPFILES_DIRECTORY");
        if (customTempDir == null || customTempDir.isEmpty()) {
            customTempDir = System.getProperty("stirling.tempfiles.directory");
@@ -81,10 +89,137 @@ public class GeneralUtils {
        return tempFile;
    }

-    public static void deleteDirectory(Path path) throws IOException {
+    /*
+     * Gets the configured temporary directory, creating it if necessary.
+     *
+     * @return Path to the temporary directory
+     * @throws IOException if directory creation fails
+     */
+    private Path getTempDirectory() throws IOException {
+        String customTempDir = System.getenv("STIRLING_TEMPFILES_DIRECTORY");
+        if (customTempDir == null || customTempDir.isEmpty()) {
+            customTempDir = System.getProperty("stirling.tempfiles.directory");
+        }
+
+        Path tempDir;
+        if (customTempDir != null && !customTempDir.isEmpty()) {
+            tempDir = Path.of(customTempDir);
+        } else {
+            tempDir = Path.of(System.getProperty("java.io.tmpdir"), "stirling-pdf");
+        }
+
+        if (!Files.exists(tempDir)) {
+            Files.createDirectories(tempDir);
+        }
+
+        return tempDir;
+    }
+
+    /*
+     * Remove file extension
+     *
+     * <p>Uses fast string operations for common cases (valid extensions) and falls back to
+     * optimized regex for edge cases (no extension, hidden files, etc.).
+     *
+     * <ul>
+     *   <li>String operations avoid regex engine overhead for common cases
+     *   <li>Cached pattern compilation eliminates recompilation costs
+     *   <li>Fresh Matcher instances ensure thread safety
+     * </ul>
+     *
+     * @param filename the filename to process, may be null
+     * @return filename without extension, or "default" if input is null
+     */
+    public String removeExtension(String filename) {
+        if (filename == null) {
+            return "default";
+        }
+
+        if (filename.isEmpty()) {
+            return filename;
+        }
+
+        int dotIndex = filename.lastIndexOf('.');
+        if (dotIndex > 0 && dotIndex < filename.length() - 1) {
+            return filename.substring(0, dotIndex);
+        }
+
+        if (dotIndex == 0 || dotIndex == filename.length() - 1 || dotIndex == -1) {
+            return filename;
+        }
+
+        Pattern pattern = patternCache.getPattern(RegexPatternUtils.getExtensionRegex());
+        Matcher matcher = pattern.matcher(filename);
+        return matcher.find() ? matcher.replaceFirst("") : filename;
+    }
+
+    /*
+     * Append suffix to base name with null safety.
+     *
+     * @param baseName the base filename, null becomes "default"
+     * @param suffix the suffix to append, null becomes empty string
+     * @return concatenated string with null safety
+     */
+    public String appendSuffix(String baseName, String suffix) {
+        return (baseName == null ? "default" : baseName) + (suffix != null ? suffix : "");
+    }
+
+    /*
+     * Generate a PDF filename by removing extension from first file and adding suffix.
+     *
+     * <p>High-level utility method for common PDF naming scenarios. Handles null safety and uses
+     * extension removal.
+     *
+     * @param firstFilename the filename of the first file being, may be null
+     * @param suffix the suffix to append (e.g., "_merged.pdf")
+     * @return filename with suffix, or default name if input is null
+     */
+    public String generateFilename(String firstFilename, String suffix) {
+        String baseName = removeExtension(firstFilename);
+        return appendSuffix(baseName, suffix);
+    }
+
+    /*
+     * Process a list of filenames by removing extensions and adding suffix.
+     *
+     * <p>Efficiently processes multiple filenames using streaming operations and bulk operations
+     * where possible. Handles null safety for both input list and individual filenames.
+     *
+     * @param filenames the list of filenames to process, may be null
+     * @param suffix the suffix to append to each processed filename
+     * @param processor consumer to handle each processed filename, may be null
+     */
+    public void processFilenames(
+            List<String> filenames, String suffix, java.util.function.Consumer<String> processor) {
+        if (filenames == null || processor == null) {
+            return;
+        }
+
+        filenames.stream()
+                .map(filename -> appendSuffix(removeExtension(filename), suffix))
+                .forEach(processor);
+    }
+
+    /*
+     * Extract title from filename by removing extension, with fallback handling.
+     *
+     * <p>Returns "Untitled" for null or empty filenames, otherwise removes the extension using the
+     * optimized removeExtension method.
+     *
+     * @param filename the filename to extract title from, may be null
+     * @return the title without extension, or "Untitled" if input is null/empty
+     */
+    public String getTitleFromFilename(String filename) {
+        if (filename == null || filename.isEmpty()) {
+            return "Untitled";
+        }
+        return removeExtension(filename);
+    }
+
+    public void deleteDirectory(Path path) throws IOException {
        Files.walkFileTree(
                path,
-                new SimpleFileVisitor<Path>() {
+                new SimpleFileVisitor<>() {
                    @Override
                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
                            throws IOException {
@@ -101,8 +236,18 @@ public class GeneralUtils {
                });
    }

-    public static String convertToFileName(String name) {
-        String safeName = name.replaceAll("[^a-zA-Z0-9]", "_");
+    public String convertToFileName(String name) {
+        if (name == null) return "_";
+        StringBuilder safeNameBuilder = new StringBuilder(name.length());
+        for (int i = 0; i < name.length(); i++) {
+            char c = name.charAt(i);
+            if (Character.isLetterOrDigit(c)) {
+                safeNameBuilder.append(c);
+            } else {
+                safeNameBuilder.append('_');
+            }
+        }
+        String safeName = safeNameBuilder.toString();
        if (safeName.length() > 50) {
            safeName = safeName.substring(0, 50);
        }
@@ -110,19 +255,20 @@ public class GeneralUtils {
    }

    // Get resources from a location pattern
-    public static Resource[] getResourcesFromLocationPattern(
+    public Resource[] getResourcesFromLocationPattern(
            String locationPattern, ResourceLoader resourceLoader) throws Exception {
        // Normalize the path for file resources
-        if (locationPattern.startsWith("file:")) {
-            String rawPath = locationPattern.substring(5).replace("\\*", "").replace("/*", "");
+        String pattern = locationPattern;
+        if (pattern.startsWith("file:")) {
+            String rawPath = pattern.substring(5).replace("\\*", "").replace("/*", "");
            Path normalizePath = Paths.get(rawPath).normalize();
-            locationPattern = "file:" + normalizePath.toString().replace("\\", "/") + "/*";
+            pattern = "file:" + normalizePath.toString().replace("\\", "/") + "/*";
        }
        return ResourcePatternUtils.getResourcePatternResolver(resourceLoader)
-                .getResources(locationPattern);
+                .getResources(pattern);
    }

-    public static boolean isValidURL(String urlStr) {
+    public boolean isValidURL(String urlStr) {
        try {
            Urls.create(
                    urlStr, Urls.HTTP_PROTOCOLS, HostValidator.DENY_COMMON_INFRASTRUCTURE_TARGETS);
@@ -132,7 +278,25 @@ public class GeneralUtils {
        }
    }

-    public static boolean isURLReachable(String urlStr) {
+    /*
+     * Checks if a URL is reachable with proper timeout configuration and error handling.
+     *
+     * @param urlStr the URL string to check
+     * @return true if URL is reachable, false otherwise
+     */
+    public boolean isURLReachable(String urlStr) {
+        return isURLReachable(urlStr, 5000, 5000);
+    }
+
+    /*
+     * Checks if a URL is reachable with configurable timeouts.
+     *
+     * @param urlStr the URL string to check
+     * @param connectTimeout connection timeout in milliseconds
+     * @param readTimeout read timeout in milliseconds
+     * @return true if URL is reachable, false otherwise
+     */
+    public boolean isURLReachable(String urlStr, int connectTimeout, int readTimeout) {
        try {
            // Parse the URL
            URL url = URI.create(urlStr).toURL();
@@ -152,16 +316,19 @@ public class GeneralUtils {
            // Check if the URL is reachable
            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
            connection.setRequestMethod("HEAD");
-            // connection.setConnectTimeout(5000); // Set connection timeout
-            // connection.setReadTimeout(5000);    // Set read timeout
+            connection.setConnectTimeout(connectTimeout);
+            connection.setReadTimeout(readTimeout);
+            connection.setInstanceFollowRedirects(false); // Security: prevent redirect loops
+
            int responseCode = connection.getResponseCode();
            return (200 <= responseCode && responseCode <= 399);
        } catch (Exception e) {
+            log.debug("URL {} is not reachable: {}", urlStr, e.getMessage());
            return false; // Return false in case of any exception
        }
    }

-    private static boolean isLocalAddress(String host) {
+    private boolean isLocalAddress(String host) {
        try {
            // Resolve DNS to IP address
            InetAddress address = InetAddress.getByName(host);
@@ -181,7 +348,14 @@ public class GeneralUtils {
        }
    }

-    public static File multipartToFile(MultipartFile multipart) throws IOException {
+    /*
+     * Improved multipart file conversion using the shared helper method.
+     *
+     * @param multipart the multipart file to convert
+     * @return temporary File containing the multipart file data
+     * @throws IOException if I/O error occurs during conversion
+     */
+    public File multipartToFile(MultipartFile multipart) throws IOException {
        Path tempFile = Files.createTempFile("overlay-", ".pdf");
        try (InputStream in = multipart.getInputStream();
                FileOutputStream out = new FileOutputStream(tempFile.toFile())) {
@@ -194,54 +368,105 @@ public class GeneralUtils {
        return tempFile.toFile();
    }

-    public static Long convertSizeToBytes(String sizeStr) {
+    /*
+     * Supports TB/PB units and provides detailed error messages.
+     *
+     * @param sizeStr the size string to convert (e.g., "100MB", "1.5GB")
+     * @param defaultUnit the default unit to assume if none specified ("MB", "GB", etc.)
+     * @return size in bytes, or null if parsing fails
+     * @throws IllegalArgumentException if defaultUnit is invalid
+     */
+    public Long convertSizeToBytes(String sizeStr, String defaultUnit) {
        if (sizeStr == null) {
            return null;
        }

+        if (defaultUnit != null && !isValidSizeUnit(defaultUnit)) {
+            throw new IllegalArgumentException("Invalid default unit: " + defaultUnit);
+        }
+
        sizeStr = sizeStr.trim().toUpperCase();
        sizeStr = sizeStr.replace(",", ".").replace(" ", "");
+
        try {
-            if (sizeStr.endsWith("KB")) {
-                return (long)
-                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024);
-            } else if (sizeStr.endsWith("MB")) {
+            if (sizeStr.endsWith("TB")) {
                return (long)
                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
-                                * 1024
-                                * 1024);
+                                * 1024L
+                                * 1024L
+                                * 1024L
+                                * 1024L);
            } else if (sizeStr.endsWith("GB")) {
                return (long)
                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
-                                * 1024
-                                * 1024
-                                * 1024);
-            } else if (sizeStr.endsWith("B")) {
+                                * 1024L
+                                * 1024L
+                                * 1024L);
+            } else if (sizeStr.endsWith("MB")) {
+                return (long)
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2))
+                                * 1024L
+                                * 1024L);
+            } else if (sizeStr.endsWith("KB")) {
+                return (long)
+                        (Double.parseDouble(sizeStr.substring(0, sizeStr.length() - 2)) * 1024L);
+            } else if (!sizeStr.isEmpty() && sizeStr.charAt(sizeStr.length() - 1) == 'B') {
                return Long.parseLong(sizeStr.substring(0, sizeStr.length() - 1));
            } else {
-                // Assume MB if no unit is specified
-                return (long) (Double.parseDouble(sizeStr) * 1024 * 1024);
+                // Use provided default unit or fall back to MB
+                String unit = defaultUnit != null ? defaultUnit.toUpperCase() : "MB";
+                double value = Double.parseDouble(sizeStr);
+                return switch (unit) {
+                    case "TB" -> (long) (value * 1024L * 1024L * 1024L * 1024L);
+                    case "GB" -> (long) (value * 1024L * 1024L * 1024L);
+                    case "MB" -> (long) (value * 1024L * 1024L);
+                    case "KB" -> (long) (value * 1024L);
+                    case "B" -> (long) value;
+                    default -> (long) (value * 1024L * 1024L); // Default to MB
+                };
            }
        } catch (NumberFormatException e) {
-            // The numeric part of the input string cannot be parsed, handle this case
+            log.warn("Failed to parse size string '{}': {}", sizeStr, e.getMessage());
+            return null;
        }
-
-        return null;
    }

-    public static String formatBytes(long bytes) {
+    /*
+     * Converts size string to bytes using MB as default unit.
+     *
+     * @param sizeStr the size string to convert
+     * @return size in bytes, or null if parsing fails
+     */
+    public Long convertSizeToBytes(String sizeStr) {
+        return convertSizeToBytes(sizeStr, "MB");
+    }
+
+    /* Validates if a string represents a valid size unit. */
+    private boolean isValidSizeUnit(String unit) {
+        // Use a precomputed Set for O(1) lookup, normalize using a locale-safe toUpperCase
+        return unit != null && VALID_SIZE_UNITS.contains(unit.toUpperCase(Locale.ROOT));
+    }
+
+    /* Enhanced byte formatting with TB/PB support and better precision. */
+    public String formatBytes(long bytes) {
+        if (bytes < 0) {
+            return "Invalid size";
+        }
+
        if (bytes < 1024) {
            return bytes + " B";
-        } else if (bytes < 1024 * 1024) {
+        } else if (bytes < 1024L * 1024L) {
            return String.format(Locale.US, "%.2f KB", bytes / 1024.0);
-        } else if (bytes < 1024 * 1024 * 1024) {
+        } else if (bytes < 1024L * 1024L * 1024L) {
            return String.format(Locale.US, "%.2f MB", bytes / (1024.0 * 1024.0));
-        } else {
+        } else if (bytes < 1024L * 1024L * 1024L * 1024L) {
            return String.format(Locale.US, "%.2f GB", bytes / (1024.0 * 1024.0 * 1024.0));
+        } else {
+            return String.format(Locale.US, "%.2f TB", bytes / (1024.0 * 1024.0 * 1024.0 * 1024.0));
        }
    }

-    public static List<Integer> parsePageList(String pages, int totalPages, boolean oneBased) {
+    public List<Integer> parsePageList(String pages, int totalPages, boolean oneBased) {
        if (pages == null) {
            return List.of(1); // Default to first page if input is null
        }
@@ -252,11 +477,11 @@ public class GeneralUtils {
        }
    }

-    public static List<Integer> parsePageList(String[] pages, int totalPages) {
+    public List<Integer> parsePageList(String[] pages, int totalPages) {
        return parsePageList(pages, totalPages, false);
    }

-    public static List<Integer> parsePageList(String[] pages, int totalPages, boolean oneBased) {
+    public List<Integer> parsePageList(String[] pages, int totalPages, boolean oneBased) {
        List<Integer> result = new ArrayList<>();
        int offset = oneBased ? 1 : 0;
        for (String page : pages) {
@@ -278,33 +503,72 @@ public class GeneralUtils {
        return result;
    }

-    public static List<Integer> evaluateNFunc(String expression, int maxValue) {
+    /*
+     * Enhanced mathematical expression evaluation with bounds checking and timeout protection.
+     *
+     * @param expression the mathematical expression containing 'n'
+     * @param maxValue the maximum value for 'n' and result bounds
+     * @return list of valid page numbers
+     * @throws IllegalArgumentException if expression is invalid or unsafe
+     */
+    public List<Integer> evaluateNFunc(String expression, int maxValue) {
+        if (expression == null || expression.trim().isEmpty()) {
+            throw new IllegalArgumentException("Expression cannot be null or empty");
+        }
+
+        if (maxValue <= 0 || maxValue > 10000) {
+            throw new IllegalArgumentException("maxValue must be between 1 and 10000 for safety");
+        }
+
        List<Integer> results = new ArrayList<>();
        DoubleEvaluator evaluator = new DoubleEvaluator();

-        // Validate the expression
-        if (!expression.matches("[0-9n+\\-*/() ]+")) {
-            throw new IllegalArgumentException("Invalid expression");
+        // Validate the expression format
+        if (!RegexPatternUtils.getInstance()
+                .getMathExpressionPattern()
+                .matcher(expression.trim())
+                .matches()) {
+            throw new IllegalArgumentException("Invalid expression format: " + expression);
        }

        for (int n = 1; n <= maxValue; n++) {
-            // Replace 'n' with the current value of n, correctly handling numbers before
-            // 'n'
-            String sanitizedExpression = sanitizeNFunction(expression, n);
-            Double result = evaluator.evaluate(sanitizedExpression);
+            try {
+                // Replace 'n' with the current value of n, correctly handling numbers before 'n'
+                String sanitizedExpression = sanitizeNFunction(expression.trim(), n);
+                Double result = evaluator.evaluate(sanitizedExpression);

-            // Check if the result is null or not within bounds
-            if (result == null) break;
+                // Check if the result is null or not within bounds
+                if (result == null || !Double.isFinite(result)) {
+                    continue;
+                }

-            if (result.intValue() > 0 && result.intValue() <= maxValue)
-                results.add(result.intValue());
+                int intResult = result.intValue();
+                if (intResult > 0 && intResult <= maxValue) {
+                    results.add(intResult);
+                }
+            } catch (Exception e) {
+                log.debug(
+                        "Failed to evaluate expression '{}' for n={}: {}",
+                        expression,
+                        n,
+                        e.getMessage());
+                // Continue with next value instead of breaking
+            }
        }

        return results;
    }

-    private static String sanitizeNFunction(String expression, int nValue) {
-        String sanitizedExpression = expression.replace(" ", "");
+    private String sanitizeNFunction(String expression, int nValue) {
+        // Remove all spaces using a specialized character removal
+        StringBuilder sb = new StringBuilder(expression.length());
+        for (int i = 0; i < expression.length(); i++) {
+            char c = expression.charAt(i);
+            if (c != ' ') {
+                sb.append(c);
+            }
+        }
+        String sanitizedExpression = sb.toString();
        String multiplyByOpeningRoundBracketPattern =
                "([0-9n)])\\("; // example: n(n-1), 9(n-1), (n-1)(n-2)
        sanitizedExpression =
@@ -319,23 +583,45 @@ public class GeneralUtils {
        return sanitizedExpression;
    }

-    private static String insertMultiplicationBeforeN(String expression, int nValue) {
-        // Insert multiplication between a number and 'n' (e.g., "4n" becomes "4*n")
-        String withMultiplication = expression.replaceAll("(\\d)n", "$1*n");
+    private String insertMultiplicationBeforeN(String expression, int nValue) {
+        // Insert multiplication between a number and 'n' (e.g., "4n" becomes "4*n") using a loop
+        StringBuilder sb = new StringBuilder(expression.length() + 4); // +4 for possible extra '*'
+        for (int i = 0; i < expression.length(); i++) {
+            char c = expression.charAt(i);
+            sb.append(c);
+            if (Character.isDigit(c)
+                    && i + 1 < expression.length()
+                    && expression.charAt(i + 1) == 'n') {
+                sb.append('*');
+            }
+        }
+        String withMultiplication = sb.toString();
        withMultiplication = formatConsecutiveNsForNFunction(withMultiplication);
        // Now replace 'n' with its current value
        return withMultiplication.replace("n", String.valueOf(nValue));
    }

-    private static String formatConsecutiveNsForNFunction(String expression) {
+    private String formatConsecutiveNsForNFunction(String expression) {
        String text = expression;
-        while (text.matches(".*n{2,}.*")) {
-            text = text.replaceAll("(?<!n)n{2}", "n*n");
+        // Replace all consecutive 'nn' with 'n*n' until no more 'nn' is found
+        while (text.contains("nn")) {
+            StringBuilder sb = new StringBuilder(text.length() + 2); // +2 for possible extra '*'
+            int i = 0;
+            while (i < text.length()) {
+                if (i < text.length() - 1 && text.charAt(i) == 'n' && text.charAt(i + 1) == 'n') {
+                    sb.append("n*n");
+                    i += 2;
+                } else {
+                    sb.append(text.charAt(i));
+                    i++;
+                }
+            }
+            text = sb.toString();
        }
        return text;
    }

-    private static List<Integer> handlePart(String part, int totalPages, int offset) {
+    private List<Integer> handlePart(String part, int totalPages, int offset) {
        List<Integer> partResult = new ArrayList<>();

        // First check for n-syntax because it should not be processed as a range
@@ -361,7 +647,7 @@ public class GeneralUtils {
                    }
                }
            } catch (NumberFormatException e) {
-                // Range is invalid, ignore this part
+                log.debug("Invalid range: {}", part);
            }
        } else {
            // This is a single page number
@@ -370,14 +656,14 @@ public class GeneralUtils {
                if (pageNum >= 1 && pageNum <= totalPages) {
                    partResult.add(pageNum - 1 + offset);
                }
-            } catch (NumberFormatException ignored) {
-                // Ignore invalid numbers
+            } catch (NumberFormatException e) {
+                log.debug("Invalid page number: {}", part);
            }
        }
        return partResult;
    }

-    public static boolean createDir(String path) {
+    public boolean createDir(String path) {
        Path folder = Paths.get(path);
        if (!Files.exists(folder)) {
            try {
@@ -390,7 +676,7 @@ public class GeneralUtils {
        return true;
    }

-    public static boolean isValidUUID(String uuid) {
+    public boolean isValidUUID(String uuid) {
        if (uuid == null) {
            return false;
        }
@@ -406,7 +692,7 @@ public class GeneralUtils {
     *                  Internal Implementation Details                       *
     *------------------------------------------------------------------------*/

-    public static void saveKeyToSettings(String key, Object newValue) throws IOException {
+    public void saveKeyToSettings(String key, Object newValue) throws IOException {
        String[] keyArray = key.split("\\.");
        Path settingsPath = Paths.get(InstallationPathConfig.getSettingsPath());
        YamlHelper settingsYaml = new YamlHelper(settingsPath);
@@ -414,48 +700,67 @@ public class GeneralUtils {
        settingsYaml.saveOverride(settingsPath);
    }

-    public static String generateMachineFingerprint() {
+    /*
+     * Machine fingerprint generation with better error logging and fallbacks.
+     *
+     * @return unique machine fingerprint or "GenericID" if generation fails
+     */
+    public String generateMachineFingerprint() {
        try {
-            // Get the MAC address
            StringBuilder sb = new StringBuilder();
+
+            // Try to get MAC address from primary network interface
            InetAddress ip = InetAddress.getLocalHost();
            NetworkInterface network = NetworkInterface.getByInetAddress(ip);

-            if (network == null) {
+            if (network == null || network.getHardwareAddress() == null) {
+                // Fallback: iterate through all network interfaces
                Enumeration<NetworkInterface> networks = NetworkInterface.getNetworkInterfaces();
                while (networks.hasMoreElements()) {
                    NetworkInterface net = networks.nextElement();
-                    byte[] mac = net.getHardwareAddress();
-                    if (mac != null) {
-                        for (int i = 0; i < mac.length; i++) {
-                            sb.append(String.format("%02X", mac[i]));
+                    if (net.isUp() && !net.isLoopback() && !net.isVirtual()) {
+                        byte[] mac = net.getHardwareAddress();
+                        if (mac != null && mac.length > 0) {
+                            for (byte b : mac) {
+                                sb.append(String.format("%02X", b));
+                            }
+                            break; // Use the first valid network interface
                        }
-                        break; // Use the first network interface with a MAC address
                    }
                }
            } else {
                byte[] mac = network.getHardwareAddress();
                if (mac != null) {
-                    for (int i = 0; i < mac.length; i++) {
-                        sb.append(String.format("%02X", mac[i]));
+                    for (byte b : mac) {
+                        sb.append(String.format("%02X", b));
                    }
                }
            }

-            // Hash the MAC address for privacy and consistency
+            // If no MAC address found, use hostname as fallback
+            if (sb.length() == 0) {
+                String hostname = InetAddress.getLocalHost().getHostName();
+                sb.append(hostname != null ? hostname : "unknown-host");
+                log.warn("No MAC address found, using hostname for fingerprint generation");
+            }
+
+            // Hash the collected data for privacy and consistency
            MessageDigest md = MessageDigest.getInstance("SHA-256");
            byte[] hash = md.digest(sb.toString().getBytes(StandardCharsets.UTF_8));
            StringBuilder fingerprint = new StringBuilder();
            for (byte b : hash) {
                fingerprint.append(String.format("%02x", b));
            }
+
+            log.debug("Successfully generated machine fingerprint");
            return fingerprint.toString();
        } catch (Exception e) {
+            log.warn("Failed to generate machine fingerprint: {}", e.getMessage());
            return "GenericID";
        }
    }

-    /**
+    /*
     * Extracts the default pipeline configurations from the classpath to the installation path.
     * Creates directories if needed and copies default JSON files.
     *
@@ -464,7 +769,7 @@ public class GeneralUtils {
     *
     * @throws IOException if an I/O error occurs during file operations
     */
-    public static void extractPipeline() throws IOException {
+    public void extractPipeline() throws IOException {
        Path pipelineDir =
                Paths.get(InstallationPathConfig.getPipelinePath(), DEFAULT_WEBUI_CONFIGS_DIR);
        Files.createDirectories(pipelineDir);
@@ -486,7 +791,7 @@ public class GeneralUtils {
        }
    }

-    /**
+    /*
     * Extracts the specified Python script from the classpath to the installation path. Validates
     * name and copies file atomically when possible, overwriting existing.
     *
@@ -497,7 +802,7 @@ public class GeneralUtils {
     * @throws IllegalArgumentException if the script name is invalid or not allowed
     * @throws IOException if an I/O error occurs
     */
-    public static Path extractScript(String scriptName) throws IOException {
+    public Path extractScript(String scriptName) throws IOException {
        // Validate input
        if (scriptName == null || scriptName.trim().isEmpty()) {
            throw new IllegalArgumentException("scriptName must not be null or empty");
@@ -530,15 +835,14 @@ public class GeneralUtils {
        return target;
    }

-    /**
+    /*
     * Copies a resource from the classpath to a specified target file.
     *
     * @param resource the ClassPathResource to copy
     * @param target the target Path where the resource will be copied
     * @throws IOException if an I/O error occurs during the copy operation
     */
-    private static void copyResourceToFile(ClassPathResource resource, Path target)
-            throws IOException {
+    private void copyResourceToFile(ClassPathResource resource, Path target) throws IOException {
        Path dir = target.getParent();
        Path tmp = Files.createTempFile(dir, target.getFileName().toString(), ".tmp");
        try (InputStream in = resource.getInputStream()) {
@@ -573,7 +877,7 @@ public class GeneralUtils {
        }
    }

-    public static boolean isVersionHigher(String currentVersion, String compareVersion) {
+    public boolean isVersionHigher(String currentVersion, String compareVersion) {
        if (currentVersion == null || compareVersion == null) {
            return false;
        }
@@ -601,4 +905,67 @@ public class GeneralUtils {
        // If all components so far are equal, the longer version is considered higher
        return current.length > compare.length;
    }
+
+    /**
+     * Optimizes a PDF using Ghostscript with ebook settings for better e-reader compatibility. Uses
+     * -dPDFSETTINGS=/ebook -dFastWebView=true settings to create an optimized PDF.
+     *
+     * @param inputPdfBytes Original PDF as byte array
+     * @return Optimized PDF as byte array
+     * @throws IOException if Ghostscript optimization fails
+     */
+    public byte[] optimizePdfWithGhostscript(byte[] inputPdfBytes) throws IOException {
+        Path tempInput = null;
+        Path tempOutput = null;
+
+        try {
+            tempInput = Files.createTempFile("gs_input_", ".pdf");
+            tempOutput = Files.createTempFile("gs_output_", ".pdf");
+
+            Files.write(tempInput, inputPdfBytes);
+
+            List<String> command = new ArrayList<>();
+            command.add("gs");
+            command.add("-sDEVICE=pdfwrite");
+            command.add("-dPDFSETTINGS=/ebook");
+            command.add("-dFastWebView=true");
+            command.add("-dNOPAUSE");
+            command.add("-dQUIET");
+            command.add("-dBATCH");
+            command.add("-sOutputFile=" + tempOutput.toString());
+            command.add(tempInput.toString());
+
+            ProcessExecutor.ProcessExecutorResult result =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
+                            .runCommandWithOutputHandling(command);
+
+            if (result.getRc() != 0) {
+                log.warn(
+                        "Ghostscript ebook optimization failed with return code: {}",
+                        result.getRc());
+                throw ExceptionUtils.createGhostscriptCompressionException();
+            }
+
+            return Files.readAllBytes(tempOutput);
+
+        } catch (Exception e) {
+            log.warn("Ghostscript ebook optimization failed", e);
+            throw ExceptionUtils.createGhostscriptCompressionException(e);
+        } finally {
+            if (tempInput != null) {
+                try {
+                    Files.deleteIfExists(tempInput);
+                } catch (IOException e) {
+                    log.warn("Failed to delete temp input file: {}", tempInput, e);
+                }
+            }
+            if (tempOutput != null) {
+                try {
+                    Files.deleteIfExists(tempOutput);
+                } catch (IOException e) {
+                    log.warn("Failed to delete temp output file: {}", tempOutput, e);
+                }
+            }
+        }
+    }
 }
@@ -85,19 +85,16 @@ public class ImageProcessingUtils {
                return 0;
            }
            int orientationTag = directory.getInt(ExifSubIFDDirectory.TAG_ORIENTATION);
-            switch (orientationTag) {
-                case 1:
-                    return 0;
-                case 6:
-                    return 90;
-                case 3:
-                    return 180;
-                case 8:
-                    return 270;
-                default:
+            return switch (orientationTag) {
+                case 1 -> 0;
+                case 6 -> 90;
+                case 3 -> 180;
+                case 8 -> 270;
+                default -> {
                    log.warn("Unknown orientation tag: {}", orientationTag);
-                    return 0;
-            }
+                    yield 0;
+                }
+            };
        } catch (ImageProcessingException | MetadataException e) {
            return 0;
        }
@@ -0,0 +1,35 @@
+package stirling.software.common.util;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.pdfbox.multipdf.PDFMergerUtility;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.springframework.stereotype.Service;
+
+import lombok.RequiredArgsConstructor;
+
+import stirling.software.common.service.CustomPDFDocumentFactory;
+
+@Service
+@RequiredArgsConstructor
+public class PDFService {
+
+    private final CustomPDFDocumentFactory pdfDocumentFactory;
+
+    /*
+     * Merge multiple PDF documents into a single PDF document
+     *
+     * @param documents List of PDDocument to be merged
+     * @return Merged PDDocument
+     * @throws IOException If an error occurs during merging
+     */
+    public PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
+        PDDocument merged = pdfDocumentFactory.createNewDocument();
+        PDFMergerUtility merger = new PDFMergerUtility();
+        for (PDDocument doc : documents) {
+            merger.appendDocument(merged, doc);
+        }
+        return merged;
+    }
+}
@@ -25,18 +25,22 @@ import com.vladsch.flexmark.util.data.MutableDataSet;

 import io.github.pixee.security.Filenames;

-import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;

@Slf4j
-@NoArgsConstructor
 public class PDFToFile {

+    private final TempFileManager tempFileManager;
+
+    public PDFToFile(TempFileManager tempFileManager) {
+        this.tempFileManager = tempFileManager;
+    }
+
    public ResponseEntity<byte[]> processPdfToMarkdown(MultipartFile inputFile)
            throws IOException, InterruptedException {
-        if (!"application/pdf".equals(inputFile.getContentType())) {
+        if (!MediaType.APPLICATION_PDF_VALUE.equals(inputFile.getContentType())) {
            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
        }

@@ -71,15 +75,12 @@ public class PDFToFile {
            pdfBaseName = originalPdfFileName.substring(0, originalPdfFileName.lastIndexOf('.'));
        }

-        Path tempInputFile = null;
-        Path tempOutputDir = null;
        byte[] fileBytes;
-        String fileName = "temp.file";
+        String fileName;

-        try {
-            tempInputFile = Files.createTempFile("input_", ".pdf");
-            inputFile.transferTo(tempInputFile);
-            tempOutputDir = Files.createTempDirectory("output_");
+        try (TempFile tempInputFile = new TempFile(tempFileManager, ".pdf");
+                TempDirectory tempOutputDir = new TempDirectory(tempFileManager)) {
+            inputFile.transferTo(tempInputFile.getFile());

            List<String> command =
                    new ArrayList<>(
@@ -88,14 +89,16 @@ public class PDFToFile {
                                    "-s",
                                    "-noframes",
                                    "-c",
-                                    tempInputFile.toString(),
+                                    tempInputFile.getAbsolutePath(),
                                    pdfBaseName));

            ProcessExecutorResult returnCode =
                    ProcessExecutor.getInstance(ProcessExecutor.Processes.PDFTOHTML)
-                            .runCommandWithOutputHandling(command, tempOutputDir.toFile());
+                            .runCommandWithOutputHandling(
+                                    command, tempOutputDir.getPath().toFile());
            // Process HTML files to Markdown
-            File[] outputFiles = Objects.requireNonNull(tempOutputDir.toFile().listFiles());
+            File[] outputFiles =
+                    Objects.requireNonNull(tempOutputDir.getPath().toFile().listFiles());
            List<File> markdownFiles = new ArrayList<>();

            // Convert HTML files to Markdown
@@ -105,7 +108,7 @@ public class PDFToFile {
                    String markdown = htmlToMarkdownConverter.convert(html);

                    String mdFileName = outputFile.getName().replace(".html", ".md");
-                    File mdFile = new File(tempOutputDir.toFile(), mdFileName);
+                    File mdFile = new File(tempOutputDir.getPath().toFile(), mdFileName);
                    Files.writeString(mdFile.toPath(), markdown);
                    markdownFiles.add(mdFile);
                }
@@ -142,10 +145,6 @@ public class PDFToFile {

                fileBytes = byteArrayOutputStream.toByteArray();
            }
-
-        } finally {
-            if (tempInputFile != null) Files.deleteIfExists(tempInputFile);
-            if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
        }
        return WebResponseUtils.bytesToWebResponse(
                fileBytes, fileName, MediaType.APPLICATION_OCTET_STREAM);
@@ -153,7 +152,7 @@ public class PDFToFile {

    public ResponseEntity<byte[]> processPdfToHtml(MultipartFile inputFile)
            throws IOException, InterruptedException {
-        if (!"application/pdf".equals(inputFile.getContentType())) {
+        if (!MediaType.APPLICATION_PDF_VALUE.equals(inputFile.getContentType())) {
            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
        }

@@ -164,19 +163,18 @@ public class PDFToFile {
            pdfBaseName = originalPdfFileName.substring(0, originalPdfFileName.lastIndexOf('.'));
        }

-        Path tempInputFile = null;
-        Path tempOutputDir = null;
        byte[] fileBytes;
-        String fileName = "temp.file";
+        String fileName;
+
+        try (TempFile inputFileTemp = new TempFile(tempFileManager, ".pdf");
+                TempDirectory outputDirTemp = new TempDirectory(tempFileManager)) {
+
+            Path tempInputFile = inputFileTemp.getPath();
+            Path tempOutputDir = outputDirTemp.getPath();

-        try {
            // Save the uploaded file to a temporary location
-            tempInputFile = Files.createTempFile("input_", ".pdf");
            inputFile.transferTo(tempInputFile);

-            // Prepare the output directory
-            tempOutputDir = Files.createTempDirectory("output_");
-
            // Run the pdftohtml command with complex output
            List<String> command =
                    new ArrayList<>(
@@ -208,11 +206,6 @@ public class PDFToFile {
                log.error("Exception writing zip", e);
            }
            fileBytes = byteArrayOutputStream.toByteArray();
-
-        } finally {
-            // Clean up the temporary files
-            if (tempInputFile != null) Files.deleteIfExists(tempInputFile);
-            if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
        }

        return WebResponseUtils.bytesToWebResponse(
@@ -223,14 +216,14 @@ public class PDFToFile {
            MultipartFile inputFile, String outputFormat, String libreOfficeFilter)
            throws IOException, InterruptedException {

-        if (!"application/pdf".equals(inputFile.getContentType())) {
+        if (!MediaType.APPLICATION_PDF_VALUE.equals(inputFile.getContentType())) {
            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
        }

        // Get the original PDF file name without the extension
        String originalPdfFileName = Filenames.toSimpleFileName(inputFile.getOriginalFilename());

-        if (originalPdfFileName == null || "".equals(originalPdfFileName.trim())) {
+        if (originalPdfFileName == null || originalPdfFileName.trim().isEmpty()) {
            originalPdfFileName = "output.pdf";
        }
        // Assume file is pdf if no extension
@@ -245,19 +238,18 @@ public class PDFToFile {
            return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
        }

-        Path tempInputFile = null;
-        Path tempOutputDir = null;
        byte[] fileBytes;
-        String fileName = "temp.file";
+        String fileName;
+
+        try (TempFile inputFileTemp = new TempFile(tempFileManager, ".pdf");
+                TempDirectory outputDirTemp = new TempDirectory(tempFileManager)) {
+
+            Path tempInputFile = inputFileTemp.getPath();
+            Path tempOutputDir = outputDirTemp.getPath();

-        try {
            // Save the uploaded file to a temporary location
-            tempInputFile = Files.createTempFile("input_", ".pdf");
            inputFile.transferTo(tempInputFile);

-            // Prepare the output directory
-            tempOutputDir = Files.createTempDirectory("output_");
-
            // Run the LibreOffice command
            List<String> command =
                    new ArrayList<>(
@@ -308,11 +300,6 @@ public class PDFToFile {

                fileBytes = byteArrayOutputStream.toByteArray();
            }
-
-        } finally {
-            // Clean up the temporary files
-            Files.deleteIfExists(tempInputFile);
-            if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
        }
        return WebResponseUtils.bytesToWebResponse(
                fileBytes, fileName, MediaType.APPLICATION_OCTET_STREAM);
@@ -8,7 +8,9 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.text.SimpleDateFormat;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Date;
@@ -18,7 +20,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

@@ -37,6 +38,7 @@ import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceStream;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
 import org.jetbrains.annotations.NotNull;
+import org.springframework.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;

 import lombok.Data;
@@ -118,7 +120,7 @@ public class PdfAttachmentHandler {
            public String getContentType() {
                return attachment.getContentType() != null
                        ? attachment.getContentType()
-                        : "application/octet-stream";
+                        : MediaType.APPLICATION_OCTET_STREAM_VALUE;
            }

            @Override
@@ -256,10 +258,7 @@ public class PdfAttachmentHandler {

        if (contentIdMap.isEmpty()) return htmlContent;

-        Pattern cidPattern =
-                Pattern.compile(
-                        "(?i)<img[^>]*\\ssrc\\s*=\\s*['\"]cid:([^'\"]+)['\"][^>]*>",
-                        Pattern.CASE_INSENSITIVE);
+        Pattern cidPattern = RegexPatternUtils.getInstance().getInlineCidImagePattern();
        Matcher matcher = cidPattern.matcher(htmlContent);

        StringBuilder result = new StringBuilder();
@@ -289,11 +288,15 @@ public class PdfAttachmentHandler {

    public static String formatEmailDate(Date date) {
        if (date == null) return "";
+        return formatEmailDate(ZonedDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()));
+    }

-        SimpleDateFormat formatter =
-                new SimpleDateFormat("EEE, MMM d, yyyy 'at' h:mm a z", Locale.ENGLISH);
-        formatter.setTimeZone(TimeZone.getTimeZone("UTC"));
-        return formatter.format(date);
+    public static String formatEmailDate(ZonedDateTime dateTime) {
+        if (dateTime == null) return "";
+
+        DateTimeFormatter formatter =
+                DateTimeFormatter.ofPattern("EEE, MMM d, yyyy 'at' h:mm a z", Locale.ENGLISH);
+        return dateTime.withZoneSameInstant(ZoneId.of("UTC")).format(formatter);
    }

    @Data
@@ -313,121 +316,20 @@ public class PdfAttachmentHandler {
        }
    }

-    public static class AttachmentMarkerPositionFinder extends PDFTextStripper {
-        @Getter private final List<MarkerPosition> positions = new ArrayList<>();
-        private int currentPageIndex;
-        protected boolean sortByPosition;
-        private boolean isInAttachmentSection;
-        private boolean attachmentSectionFound;
-        private final StringBuilder currentText = new StringBuilder();
-
-        private static final Pattern ATTACHMENT_SECTION_PATTERN =
-                Pattern.compile("attachments\\s*\\(\\d+\\)", Pattern.CASE_INSENSITIVE);
-
-        private static final Pattern FILENAME_PATTERN =
-                Pattern.compile("@\\s*([^\\s\\(]+(?:\\.[a-zA-Z0-9]+)?)");
-
-        public AttachmentMarkerPositionFinder() {
-            super();
-            this.currentPageIndex = 0;
-            this.sortByPosition = false; // Disable sorting to preserve document order
-            this.isInAttachmentSection = false;
-            this.attachmentSectionFound = false;
-        }
-
-        @Override
-        public String getText(PDDocument document) throws IOException {
-            super.getText(document);
-
-            if (sortByPosition) {
-                positions.sort(
-                        (a, b) -> {
-                            int pageCompare = Integer.compare(a.getPageIndex(), b.getPageIndex());
-                            if (pageCompare != 0) return pageCompare;
-                            return Float.compare(
-                                    b.getY(), a.getY()); // Descending Y per PDF coordinate system
-                        });
-            }
-
-            return ""; // Return empty string as we only need positions
-        }
-
-        @Override
-        protected void startPage(PDPage page) throws IOException {
-            super.startPage(page);
-        }
-
-        @Override
-        protected void endPage(PDPage page) throws IOException {
-            currentPageIndex++;
-            super.endPage(page);
-        }
-
-        @Override
-        protected void writeString(String string, List<TextPosition> textPositions)
-                throws IOException {
-            String lowerString = string.toLowerCase();
-
-            if (ATTACHMENT_SECTION_PATTERN.matcher(lowerString).find()) {
-                isInAttachmentSection = true;
-                attachmentSectionFound = true;
-            }
-
-            if (isInAttachmentSection
-                    && (lowerString.contains("</body>")
-                            || lowerString.contains("</html>")
-                            || (attachmentSectionFound
-                                    && lowerString.trim().isEmpty()
-                                    && string.length() > 50))) {
-                isInAttachmentSection = false;
-            }
-
-            if (isInAttachmentSection) {
-                currentText.append(string);
-
-                for (int i = 0; (i = string.indexOf(ATTACHMENT_MARKER, i)) != -1; i++) {
-                    if (i < textPositions.size()) {
-                        TextPosition textPosition = textPositions.get(i);
-
-                        String filename = extractFilenameAfterMarker(string, i);
-
-                        MarkerPosition position =
-                                new MarkerPosition(
-                                        currentPageIndex,
-                                        textPosition.getXDirAdj(),
-                                        textPosition.getYDirAdj(),
-                                        ATTACHMENT_MARKER,
-                                        filename);
-                        positions.add(position);
-                    }
-                }
-            }
-            super.writeString(string, textPositions);
-        }
-
-        @Override
-        public void setSortByPosition(boolean sortByPosition) {
-            this.sortByPosition = sortByPosition;
-        }
-
-        private String extractFilenameAfterMarker(String text, int markerIndex) {
-            String afterMarker = text.substring(markerIndex + 1);
-
-            Matcher matcher = FILENAME_PATTERN.matcher("@" + afterMarker);
-            if (matcher.find()) {
-                return matcher.group(1);
-            }
-
-            String[] parts = afterMarker.split("[\\s\\(\\)]+");
-            for (String part : parts) {
-                part = part.trim();
-                if (part.length() > 3 && part.contains(".")) {
-                    return part;
-                }
-            }
-
-            return null;
-        }
+    private static String normalizeFilename(String filename) {
+        if (filename == null) return "";
+        String normalized = filename.toLowerCase().trim();
+        normalized =
+                RegexPatternUtils.getInstance()
+                        .getWhitespacePattern()
+                        .matcher(normalized)
+                        .replaceAll(" ");
+        normalized =
+                RegexPatternUtils.getInstance()
+                        .getPattern("[^a-zA-Z0-9._-]")
+                        .matcher(normalized)
+                        .replaceAll("");
+        return normalized;
    }

    private static Map<Integer, String> addAttachmentsToDocumentWithMapping(
@@ -607,12 +509,122 @@ public class PdfAttachmentHandler {
        return null;
    }

-    private static String normalizeFilename(String filename) {
-        if (filename == null) return "";
-        return filename.toLowerCase()
-                .trim()
-                .replaceAll("\\s+", " ")
-                .replaceAll("[^a-zA-Z0-9._-]", "");
+    public static class AttachmentMarkerPositionFinder extends PDFTextStripper {
+        private static final Pattern ATTACHMENT_SECTION_PATTERN =
+                RegexPatternUtils.getInstance().getAttachmentSectionPattern();
+        private static final Pattern FILENAME_PATTERN =
+                RegexPatternUtils.getInstance().getAttachmentFilenamePattern();
+        @Getter private final List<MarkerPosition> positions = new ArrayList<>();
+        private final StringBuilder currentText = new StringBuilder();
+        protected boolean sortByPosition;
+        private int currentPageIndex;
+        private boolean isInAttachmentSection;
+        private boolean attachmentSectionFound;
+
+        public AttachmentMarkerPositionFinder() {
+            super();
+            this.currentPageIndex = 0;
+            this.sortByPosition = false; // Disable sorting to preserve document order
+            this.isInAttachmentSection = false;
+            this.attachmentSectionFound = false;
+        }
+
+        @Override
+        public String getText(PDDocument document) throws IOException {
+            super.getText(document);
+
+            if (sortByPosition) {
+                positions.sort(
+                        (a, b) -> {
+                            int pageCompare = Integer.compare(a.getPageIndex(), b.getPageIndex());
+                            if (pageCompare != 0) return pageCompare;
+                            return Float.compare(
+                                    b.getY(), a.getY()); // Descending Y per PDF coordinate system
+                        });
+            }
+
+            return ""; // Return empty string as we only need positions
+        }
+
+        @Override
+        protected void startPage(PDPage page) throws IOException {
+            super.startPage(page);
+        }
+
+        @Override
+        protected void endPage(PDPage page) throws IOException {
+            currentPageIndex++;
+            super.endPage(page);
+        }
+
+        @Override
+        protected void writeString(String string, List<TextPosition> textPositions)
+                throws IOException {
+            String lowerString = string.toLowerCase();
+
+            if (ATTACHMENT_SECTION_PATTERN.matcher(lowerString).find()) {
+                isInAttachmentSection = true;
+                attachmentSectionFound = true;
+            }
+
+            if (isInAttachmentSection
+                    && (lowerString.contains("</body>")
+                            || lowerString.contains("</html>")
+                            || (attachmentSectionFound
+                                    && lowerString.trim().isEmpty()
+                                    && string.length() > 50))) {
+                isInAttachmentSection = false;
+            }
+
+            if (isInAttachmentSection) {
+                currentText.append(string);
+
+                for (int i = 0; (i = string.indexOf(ATTACHMENT_MARKER, i)) != -1; i++) {
+                    if (i < textPositions.size()) {
+                        TextPosition textPosition = textPositions.get(i);
+
+                        String filename = extractFilenameAfterMarker(string, i);
+
+                        MarkerPosition position =
+                                new MarkerPosition(
+                                        currentPageIndex,
+                                        textPosition.getXDirAdj(),
+                                        textPosition.getYDirAdj(),
+                                        ATTACHMENT_MARKER,
+                                        filename);
+                        positions.add(position);
+                    }
+                }
+            }
+            super.writeString(string, textPositions);
+        }
+
+        @Override
+        public void setSortByPosition(boolean sortByPosition) {
+            this.sortByPosition = sortByPosition;
+        }
+
+        private String extractFilenameAfterMarker(String text, int markerIndex) {
+            String afterMarker = text.substring(markerIndex + 1);
+
+            Matcher matcher = FILENAME_PATTERN.matcher("@" + afterMarker);
+            if (matcher.find()) {
+                return matcher.group(1);
+            }
+
+            String[] parts =
+                    RegexPatternUtils.getInstance()
+                            .getWhitespaceParenthesesSplitPattern()
+                            .split(afterMarker);
+            for (String part : parts) {
+                part = part.trim();
+                if (part.length() > 3 && part.contains(".")) {
+                    return part;
+                }
+            }
+
+            return null;
+        }
    }

    private static void addAttachmentAnnotationToPageWithMapping(
@@ -0,0 +1,173 @@
+package stirling.software.common.util;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import javax.imageio.ImageIO;
+
+import org.apache.commons.io.FilenameUtils;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.rendering.ImageType;
+import org.apache.pdfbox.rendering.PDFRenderer;
+import org.springframework.web.multipart.MultipartFile;
+
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+
+@Slf4j
+public class PdfToCbrUtils {
+
+    public static byte[] convertPdfToCbr(
+            MultipartFile pdfFile, int dpi, CustomPDFDocumentFactory pdfDocumentFactory)
+            throws IOException {
+
+        validatePdfFile(pdfFile);
+
+        try (PDDocument document = pdfDocumentFactory.load(pdfFile)) {
+            if (document.getNumberOfPages() == 0) {
+                throw new IllegalArgumentException("PDF file contains no pages");
+            }
+
+            return createCbrFromPdf(document, dpi);
+        }
+    }
+
+    private static void validatePdfFile(MultipartFile file) {
+        if (file == null || file.isEmpty()) {
+            throw new IllegalArgumentException("File cannot be null or empty");
+        }
+
+        String filename = file.getOriginalFilename();
+        if (filename == null) {
+            throw new IllegalArgumentException("File must have a name");
+        }
+
+        String extension = FilenameUtils.getExtension(filename).toLowerCase();
+        if (!"pdf".equals(extension)) {
+            throw new IllegalArgumentException("File must be a PDF");
+        }
+    }
+
+    private static byte[] createCbrFromPdf(PDDocument document, int dpi) throws IOException {
+        PDFRenderer pdfRenderer = new PDFRenderer(document);
+
+        Path tempDir = Files.createTempDirectory("stirling-pdf-cbr-");
+        List<Path> generatedImages = new ArrayList<>();
+        try {
+            int totalPages = document.getNumberOfPages();
+
+            for (int pageIndex = 0; pageIndex < totalPages; pageIndex++) {
+                try {
+                    BufferedImage image =
+                            pdfRenderer.renderImageWithDPI(pageIndex, dpi, ImageType.RGB);
+
+                    String imageFilename = String.format("page_%03d.png", pageIndex + 1);
+                    Path imagePath = tempDir.resolve(imageFilename);
+
+                    ImageIO.write(image, "PNG", imagePath.toFile());
+                    generatedImages.add(imagePath);
+
+                } catch (IOException e) {
+                    log.warn("Error processing page {}: {}", pageIndex + 1, e.getMessage());
+                } catch (OutOfMemoryError e) {
+                    throw ExceptionUtils.createOutOfMemoryDpiException(pageIndex + 1, dpi, e);
+                } catch (NegativeArraySizeException e) {
+                    throw ExceptionUtils.createOutOfMemoryDpiException(pageIndex + 1, dpi, e);
+                }
+            }
+
+            if (generatedImages.isEmpty()) {
+                throw new IOException("Failed to render any pages to images for CBR conversion");
+            }
+
+            return createRarArchive(tempDir, generatedImages);
+        } finally {
+            cleanupTempFiles(generatedImages, tempDir);
+        }
+    }
+
+    private static byte[] createRarArchive(Path tempDir, List<Path> images) throws IOException {
+        List<String> command = new ArrayList<>();
+        command.add("rar");
+        command.add("a");
+        command.add("-m5");
+        command.add("-ep1");
+
+        Path rarFile = tempDir.resolve("output.cbr");
+        command.add(rarFile.getFileName().toString());
+
+        for (Path image : images) {
+            command.add(image.getFileName().toString());
+        }
+
+        ProcessExecutor executor =
+                ProcessExecutor.getInstance(ProcessExecutor.Processes.INSTALL_APP);
+        try {
+            ProcessExecutorResult result =
+                    executor.runCommandWithOutputHandling(command, tempDir.toFile());
+            if (result.getRc() != 0) {
+                throw new IOException("RAR command failed: " + result.getMessages());
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IOException("RAR command interrupted", e);
+        }
+
+        if (!Files.exists(rarFile)) {
+            throw new IOException("RAR file was not created");
+        }
+
+        try (FileInputStream fis = new FileInputStream(rarFile.toFile());
+                ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            fis.transferTo(baos);
+            return baos.toByteArray();
+        }
+    }
+
+    private static void cleanupTempFiles(List<Path> images, Path tempDir) {
+        for (Path image : images) {
+            try {
+                Files.deleteIfExists(image);
+            } catch (IOException e) {
+                log.warn("Failed to delete temp image file {}: {}", image, e.getMessage());
+            }
+        }
+        if (tempDir != null) {
+            try (var paths = Files.walk(tempDir)) {
+                paths.sorted(Comparator.reverseOrder())
+                        .forEach(
+                                path -> {
+                                    try {
+                                        Files.deleteIfExists(path);
+                                    } catch (IOException e) {
+                                        log.warn(
+                                                "Failed to delete temp path {}: {}",
+                                                path,
+                                                e.getMessage());
+                                    }
+                                });
+            } catch (IOException e) {
+                log.warn("Failed to clean up temp directory {}: {}", tempDir, e.getMessage());
+            }
+        }
+    }
+
+    public static boolean isPdfFile(MultipartFile file) {
+        String filename = file.getOriginalFilename();
+        if (filename == null) {
+            return false;
+        }
+
+        String extension = FilenameUtils.getExtension(filename).toLowerCase();
+        return "pdf".equals(extension);
+    }
+}
@@ -0,0 +1,99 @@
+package stirling.software.common.util;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import javax.imageio.ImageIO;
+
+import org.apache.commons.io.FilenameUtils;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.rendering.ImageType;
+import org.apache.pdfbox.rendering.PDFRenderer;
+import org.springframework.web.multipart.MultipartFile;
+
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.service.CustomPDFDocumentFactory;
+
+@Slf4j
+public class PdfToCbzUtils {
+
+    public static byte[] convertPdfToCbz(
+            MultipartFile pdfFile, int dpi, CustomPDFDocumentFactory pdfDocumentFactory)
+            throws IOException {
+
+        validatePdfFile(pdfFile);
+
+        try (PDDocument document = pdfDocumentFactory.load(pdfFile)) {
+            if (document.getNumberOfPages() == 0) {
+                throw new IllegalArgumentException("PDF file contains no pages");
+            }
+
+            return createCbzFromPdf(document, dpi);
+        }
+    }
+
+    private static void validatePdfFile(MultipartFile file) {
+        if (file == null || file.isEmpty()) {
+            throw new IllegalArgumentException("File cannot be null or empty");
+        }
+
+        String filename = file.getOriginalFilename();
+        if (filename == null) {
+            throw new IllegalArgumentException("File must have a name");
+        }
+
+        String extension = FilenameUtils.getExtension(filename).toLowerCase();
+        if (!"pdf".equals(extension)) {
+            throw new IllegalArgumentException("File must be a PDF");
+        }
+    }
+
+    private static byte[] createCbzFromPdf(PDDocument document, int dpi) throws IOException {
+        PDFRenderer pdfRenderer = new PDFRenderer(document);
+
+        try (ByteArrayOutputStream cbzOutputStream = new ByteArrayOutputStream();
+                ZipOutputStream zipOut = new ZipOutputStream(cbzOutputStream)) {
+
+            int totalPages = document.getNumberOfPages();
+
+            for (int pageIndex = 0; pageIndex < totalPages; pageIndex++) {
+                try {
+                    BufferedImage image =
+                            pdfRenderer.renderImageWithDPI(pageIndex, dpi, ImageType.RGB);
+
+                    String imageFilename = String.format("page_%03d.png", pageIndex + 1);
+
+                    ZipEntry zipEntry = new ZipEntry(imageFilename);
+                    zipOut.putNextEntry(zipEntry);
+
+                    ImageIO.write(image, "PNG", zipOut);
+                    zipOut.closeEntry();
+
+                } catch (IOException e) {
+                    log.warn("Error processing page {}: {}", pageIndex + 1, e.getMessage());
+                } catch (OutOfMemoryError e) {
+                    throw ExceptionUtils.createOutOfMemoryDpiException(pageIndex + 1, dpi, e);
+                } catch (NegativeArraySizeException e) {
+                    throw ExceptionUtils.createOutOfMemoryDpiException(pageIndex + 1, dpi, e);
+                }
+            }
+
+            zipOut.finish();
+            return cbzOutputStream.toByteArray();
+        }
+    }
+
+    public static boolean isPdfFile(MultipartFile file) {
+        String filename = file.getOriginalFilename();
+        if (filename == null) {
+            return false;
+        }
+
+        String extension = FilenameUtils.getExtension(filename).toLowerCase();
+        return "pdf".equals(extension);
+    }
+}
@@ -8,6 +8,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;

@@ -29,19 +31,25 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.apache.pdfbox.text.PDFTextStripper;
+import org.springframework.http.MediaType;
 import org.springframework.web.multipart.MultipartFile;

 import io.github.pixee.security.Filenames;

+import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;

 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.service.CustomPDFDocumentFactory;

@Slf4j
+@UtilityClass
 public class PdfUtils {

-    public static PDRectangle textToPageSize(String size) {
+    private final RegexPatternUtils patternCache = RegexPatternUtils.getInstance();
+
+    public PDRectangle textToPageSize(String size) {
+
        switch (size.toUpperCase()) {
            case "A0" -> {
                return PDRectangle.A0;
@@ -74,7 +82,7 @@ public class PdfUtils {
        }
    }

-    public static List<RenderedImage> getAllImages(PDResources resources) throws IOException {
+    public List<RenderedImage> getAllImages(PDResources resources) throws IOException {
        List<RenderedImage> images = new ArrayList<>();

        for (COSName name : resources.getXObjectNames()) {
@@ -91,7 +99,7 @@ public class PdfUtils {
        return images;
    }

-    public static boolean hasImages(PDDocument document, String pagesToCheck) throws IOException {
+    public boolean hasImages(PDDocument document, String pagesToCheck) throws IOException {
        String[] pageOrderArr = pagesToCheck.split(",");
        List<Integer> pageList =
                GeneralUtils.parsePageList(pageOrderArr, document.getNumberOfPages());
@@ -106,7 +114,7 @@ public class PdfUtils {
        return false;
    }

-    public static boolean hasText(PDDocument document, String pageNumbersToCheck, String phrase)
+    public boolean hasText(PDDocument document, String pageNumbersToCheck, String phrase)
            throws IOException {
        String[] pageOrderArr = pageNumbersToCheck.split(",");
        List<Integer> pageList =
@@ -122,11 +130,11 @@ public class PdfUtils {
        return false;
    }

-    public static boolean hasImagesOnPage(PDPage page) throws IOException {
-        return getAllImages(page.getResources()).size() > 0;
+    public boolean hasImagesOnPage(PDPage page) throws IOException {
+        return !getAllImages(page.getResources()).isEmpty();
    }

-    public static boolean hasTextOnPage(PDPage page, String phrase) throws IOException {
+    public boolean hasTextOnPage(PDPage page, String phrase) throws IOException {
        PDFTextStripper textStripper = new PDFTextStripper();
        PDDocument tempDoc = new PDDocument();
        tempDoc.addPage(page);
@@ -135,7 +143,7 @@ public class PdfUtils {
        return pageText.contains(phrase);
    }

-    public static byte[] convertFromPdf(
+    public byte[] convertFromPdf(
            CustomPDFDocumentFactory pdfDocumentFactory,
            byte[] inputStream,
            String imageType,
@@ -156,7 +164,8 @@ public class PdfUtils {
        if (DPI > maxSafeDpi) {
            throw ExceptionUtils.createIllegalArgumentException(
                    "error.dpiExceedsLimit",
-                    "DPI value {0} exceeds maximum safe limit of {1}. High DPI values can cause memory issues and crashes. Please use a lower DPI value.",
+                    "DPI value {0} exceeds maximum safe limit of {1}. High DPI values can cause"
+                            + " memory issues and crashes. Please use a lower DPI value.",
                    DPI,
                    maxSafeDpi);
        }
@@ -196,11 +205,17 @@ public class PdfUtils {
                                                .contains("Maximum size of image exceeded")) {
                                    throw ExceptionUtils.createIllegalArgumentException(
                                            "error.pageTooBigForDpi",
-                                            "PDF page {0} is too large to render at {1} DPI. Please try a lower DPI value (recommended: 150 or less).",
+                                            "PDF page {0} is too large to render at {1} DPI. Please"
+                                                    + " try a lower DPI value (recommended: 150 or"
+                                                    + " less).",
                                            i + 1,
                                            DPI);
                                }
                                throw e;
+                            } catch (OutOfMemoryError e) {
+                                throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
+                            } catch (NegativeArraySizeException e) {
+                                throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
                            }
                            writer.writeToSequence(new IIOImage(image, null, null), param);
                        }
@@ -241,11 +256,18 @@ public class PdfUtils {
                                                .contains("Maximum size of image exceeded")) {
                                    throw ExceptionUtils.createIllegalArgumentException(
                                            "error.pageTooBigExceedsArray",
-                                            "PDF page {0} is too large to render at {1} DPI. The resulting image would exceed Java's maximum array size. Please try a lower DPI value (recommended: 150 or less).",
+                                            "PDF page {0} is too large to render at {1} DPI. The"
+                                                    + " resulting image would exceed Java's maximum"
+                                                    + " array size. Please try a lower DPI value"
+                                                    + " (recommended: 150 or less).",
                                            i + 1,
                                            DPI);
                                }
                                throw e;
+                            } catch (OutOfMemoryError e) {
+                                throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
+                            } catch (NegativeArraySizeException e) {
+                                throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
                            }
                            pdfSizeImageIndex = i;
                            dimension =
@@ -282,11 +304,17 @@ public class PdfUtils {
                                                .contains("Maximum size of image exceeded")) {
                                    throw ExceptionUtils.createIllegalArgumentException(
                                            "error.pageTooBigForDpi",
-                                            "PDF page {0} is too large to render at {1} DPI. Please try a lower DPI value (recommended: 150 or less).",
+                                            "PDF page {0} is too large to render at {1} DPI. Please"
+                                                    + " try a lower DPI value (recommended: 150 or"
+                                                    + " less).",
                                            i + 1,
                                            DPI);
                                }
                                throw e;
+                            } catch (OutOfMemoryError e) {
+                                throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
+                            } catch (NegativeArraySizeException e) {
+                                throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
                            }
                        }

@@ -315,11 +343,16 @@ public class PdfUtils {
                                    && e.getMessage().contains("Maximum size of image exceeded")) {
                                throw ExceptionUtils.createIllegalArgumentException(
                                        "error.pageTooBigForDpi",
-                                        "PDF page {0} is too large to render at {1} DPI. Please try a lower DPI value (recommended: 150 or less).",
+                                        "PDF page {0} is too large to render at {1} DPI. Please try"
+                                                + " a lower DPI value (recommended: 150 or less).",
                                        i + 1,
                                        DPI);
                            }
                            throw e;
+                        } catch (OutOfMemoryError e) {
+                            throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
+                        } catch (NegativeArraySizeException e) {
+                            throw ExceptionUtils.createOutOfMemoryDpiException(i + 1, DPI, e);
                        }
                        try (ByteArrayOutputStream baosImage = new ByteArrayOutputStream()) {
                            ImageIO.write(image, imageType, baosImage);
@@ -353,23 +386,38 @@ public class PdfUtils {
     * @return converted document to PDF-Image
     * @throws IOException if conversion fails
     */
-    public static PDDocument convertPdfToPdfImage(PDDocument document) throws IOException {
+    public PDDocument convertPdfToPdfImage(PDDocument document) throws IOException {
        PDDocument imageDocument = new PDDocument();
        PDFRenderer pdfRenderer = new PDFRenderer(document);
        pdfRenderer.setSubsamplingAllowed(true);
        for (int page = 0; page < document.getNumberOfPages(); ++page) {
            BufferedImage bim;
+
+            // Use global maximum DPI setting, fallback to 300 if not set
+            int renderDpi = 300; // Default fallback
+            ApplicationProperties properties =
+                    ApplicationContextProvider.getBean(ApplicationProperties.class);
+            if (properties != null && properties.getSystem() != null) {
+                renderDpi = properties.getSystem().getMaxDPI();
+            }
+
            try {
-                bim = pdfRenderer.renderImageWithDPI(page, 300, ImageType.RGB);
+                bim = pdfRenderer.renderImageWithDPI(page, renderDpi, ImageType.RGB);
            } catch (IllegalArgumentException e) {
                if (e.getMessage() != null
                        && e.getMessage().contains("Maximum size of image exceeded")) {
                    throw ExceptionUtils.createIllegalArgumentException(
                            "error.pageTooBigFor300Dpi",
-                            "PDF page {0} is too large to render at 300 DPI. The resulting image would exceed Java's maximum array size. Please use a lower DPI value for PDF-to-image conversion.",
+                            "PDF page {0} is too large to render at 300 DPI. The resulting image"
+                                    + " would exceed Java's maximum array size. Please use a lower DPI"
+                                    + " value for PDF-to-image conversion.",
                            page + 1);
                }
                throw e;
+            } catch (OutOfMemoryError e) {
+                throw ExceptionUtils.createOutOfMemoryDpiException(page + 1, 300, e);
+            } catch (NegativeArraySizeException e) {
+                throw ExceptionUtils.createOutOfMemoryDpiException(page + 1, 300, e);
            }
            PDPage originalPage = document.getPage(page);

@@ -387,8 +435,7 @@ public class PdfUtils {
        return imageDocument;
    }

-    private static BufferedImage prepareImageForPdfToImage(
-            int maxWidth, int height, String imageType) {
+    private BufferedImage prepareImageForPdfToImage(int maxWidth, int height, String imageType) {
        BufferedImage combined;
        if ("png".equalsIgnoreCase(imageType)) {
            combined = new BufferedImage(maxWidth, height, BufferedImage.TYPE_INT_ARGB);
@@ -404,7 +451,7 @@ public class PdfUtils {
        return combined;
    }

-    public static byte[] imageToPdf(
+    public byte[] imageToPdf(
            MultipartFile[] files,
            String fitOption,
            boolean autoRotate,
@@ -435,7 +482,7 @@ public class PdfUtils {
                            ImageProcessingUtils.convertColorType(image, colorType);
                    // Use JPEGFactory if it's JPEG since JPEG is lossy
                    PDImageXObject pdImage =
-                            (contentType != null && "image/jpeg".equals(contentType))
+                            (contentType != null && MediaType.IMAGE_JPEG_VALUE.equals(contentType))
                                    ? JPEGFactory.createFromImage(doc, convertedImage)
                                    : LosslessFactory.createFromImage(doc, convertedImage);
                    addImageToDocument(doc, pdImage, fitOption, autoRotate);
@@ -448,7 +495,7 @@ public class PdfUtils {
        }
    }

-    public static void addImageToDocument(
+    public void addImageToDocument(
            PDDocument doc, PDImageXObject image, String fitOption, boolean autoRotate)
            throws IOException {
        boolean imageIsLandscape = image.getWidth() > image.getHeight();
@@ -498,7 +545,7 @@ public class PdfUtils {
        }
    }

-    public static byte[] overlayImage(
+    public byte[] overlayImage(
            CustomPDFDocumentFactory pdfDocumentFactory,
            byte[] pdfBytes,
            byte[] imageBytes,
@@ -540,13 +587,16 @@ public class PdfUtils {
    public boolean containsTextInFile(PDDocument pdfDocument, String text, String pagesToCheck)
            throws IOException {
        PDFTextStripper textStripper = new PDFTextStripper();
-        String pdfText = "";
+        StringBuilder pdfText = new StringBuilder();

        if (pagesToCheck == null || "all".equals(pagesToCheck)) {
-            pdfText = textStripper.getText(pdfDocument);
+            pdfText = new StringBuilder(textStripper.getText(pdfDocument));
        } else {
-            // remove whitespaces
-            pagesToCheck = pagesToCheck.replaceAll("\\s+", "");
+            // remove whitespaces using cached pattern
+            Pattern whitespacePattern =
+                    patternCache.getPattern(RegexPatternUtils.getWhitespaceRegex());
+            Matcher whitespaceMatcher = whitespacePattern.matcher(pagesToCheck);
+            pagesToCheck = whitespaceMatcher.replaceAll("");

            String[] splitPoints = pagesToCheck.split(",");
            for (String splitPoint : splitPoints) {
@@ -559,21 +609,21 @@ public class PdfUtils {
                    for (int i = startPage; i <= endPage; i++) {
                        textStripper.setStartPage(i);
                        textStripper.setEndPage(i);
-                        pdfText += textStripper.getText(pdfDocument);
+                        pdfText.append(textStripper.getText(pdfDocument));
                    }
                } else {
                    // Handle individual page
                    int page = Integer.parseInt(splitPoint);
                    textStripper.setStartPage(page);
                    textStripper.setEndPage(page);
-                    pdfText += textStripper.getText(pdfDocument);
+                    pdfText.append(textStripper.getText(pdfDocument));
                }
            }
        }

        pdfDocument.close();

-        return pdfText.contains(text);
+        return pdfText.toString().contains(text);
    }

    public boolean pageCount(PDDocument pdfDocument, int pageCount, String comparator)
@@ -581,16 +631,13 @@ public class PdfUtils {
        int actualPageCount = pdfDocument.getNumberOfPages();
        pdfDocument.close();

-        switch (comparator.toLowerCase()) {
-            case "greater":
-                return actualPageCount > pageCount;
-            case "equal":
-                return actualPageCount == pageCount;
-            case "less":
-                return actualPageCount < pageCount;
-            default:
-                throw ExceptionUtils.createInvalidArgumentException("comparator", comparator);
-        }
+        return switch (comparator.toLowerCase()) {
+            case "greater" -> actualPageCount > pageCount;
+            case "equal" -> actualPageCount == pageCount;
+            case "less" -> actualPageCount < pageCount;
+            default ->
+                    throw ExceptionUtils.createInvalidArgumentException("comparator", comparator);
+        };
    }

    public boolean pageSize(PDDocument pdfDocument, String expectedPageSize) throws IOException {
@@ -167,7 +167,7 @@ public class ProcessExecutor {
        semaphore.acquire();
        try {

-            log.info("Running command: " + String.join(" ", command));
+            log.info("Running command: {}", String.join(" ", command));
            ProcessBuilder processBuilder = new ProcessBuilder(command);

            // Use the working directory if it's set
@@ -252,7 +252,7 @@ public class ProcessExecutor {
                String outputMessage = String.join("\n", outputLines);
                messages += outputMessage;
                if (!liveUpdates) {
-                    log.info("Command output:\n" + outputMessage);
+                    log.info("Command output:\n{}", outputMessage);
                }
            }

@@ -260,7 +260,7 @@ public class ProcessExecutor {
                String errorMessage = String.join("\n", errorLines);
                messages += errorMessage;
                if (!liveUpdates) {
-                    log.warn("Command error output:\n" + errorMessage);
+                    log.warn("Command error output:\n{}", errorMessage);
                }
                if (exitCode != 0) {
                    if (isQpdf && exitCode == 3) {
@@ -315,6 +315,5 @@ public class ProcessExecutor {
            this.rc = rc;
            this.messages = messages;
        }
-
    }
 }
@@ -0,0 +1,524 @@
+package stirling.software.common.util;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public final class RegexPatternUtils {
+
+    private static final RegexPatternUtils INSTANCE = new RegexPatternUtils();
+    private final ConcurrentHashMap<PatternKey, Pattern> patternCache = new ConcurrentHashMap<>();
+
+    private static final String WHITESPACE_REGEX = "\\s++";
+    private static final String EXTENSION_REGEX = "\\.(?:[^.]*+)?$";
+
+    private RegexPatternUtils() {
+        super();
+        // Initialize with commonly used patterns for immediate availability
+        precompileCommonPatterns();
+    }
+
+    /**
+     * Get the singleton instance of the pattern cache.
+     *
+     * @return the singleton RegexPatternCache instance
+     */
+    public static RegexPatternUtils getInstance() {
+        return INSTANCE;
+    }
+
+    /**
+     * Get a compiled pattern from cache, compiling and caching if not present.
+     *
+     * <p>This method is thread-safe and uses lazy initialization. Multiple threads calling with the
+     * same regex will result in only one compilation, with all threads receiving the same cached
+     * Pattern instance.
+     *
+     * <p>Performance: first call compiles and caches (expensive), subsequent calls return cached
+     * pattern (fast O(1) lookup).
+     *
+     * @param regex the regular expression string to compile
+     * @return compiled Pattern object, never null
+     * @throws PatternSyntaxException if the regex syntax is invalid
+     * @throws IllegalArgumentException if regex is null
+     */
+    public Pattern getPattern(String regex) {
+        if (regex == null) {
+            throw new IllegalArgumentException("Regex pattern cannot be null");
+        }
+
+        return patternCache.computeIfAbsent(new PatternKey(regex, 0), this::compilePattern);
+    }
+
+    /**
+     * Get a compiled pattern with flags.
+     *
+     * <p>Patterns with different flags are cached separately using a composite key. Common flags
+     * include:
+     *
+     * <ul>
+     *   <li>{@link Pattern#CASE_INSENSITIVE} - ignore case differences
+     *   <li>{@link Pattern#MULTILINE} - ^ and $ match line boundaries
+     *   <li>{@link Pattern#DOTALL} - . matches any character including newlines
+     * </ul>
+     *
+     * @param regex the regular expression string
+     * @param flags pattern flags (e.g., Pattern.CASE_INSENSITIVE)
+     * @return compiled Pattern object with specified flags
+     * @throws PatternSyntaxException if the regex syntax is invalid
+     * @throws IllegalArgumentException if regex is null
+     */
+    public Pattern getPattern(String regex, int flags) {
+        if (regex == null) {
+            throw new IllegalArgumentException("Regex pattern cannot be null");
+        }
+
+        return patternCache.computeIfAbsent(new PatternKey(regex, flags), this::compilePattern);
+    }
+
+    /**
+     * Check if a pattern is already cached.
+     *
+     * @param regex the regular expression string
+     * @return true if pattern is cached, false otherwise
+     */
+    public boolean isCached(String regex) {
+        return isCached(regex, 0);
+    }
+
+    /**
+     * Check if a pattern with flags is already cached.
+     *
+     * @param regex the regular expression string
+     * @param flags pattern flags
+     * @return true if pattern is cached, false otherwise
+     */
+    public boolean isCached(String regex, int flags) {
+        return regex != null && patternCache.containsKey(new PatternKey(regex, flags));
+    }
+
+    /**
+     * Get current cache size (number of cached patterns). Useful for monitoring and debugging.
+     *
+     * @return number of patterns currently cached
+     */
+    public int getCacheSize() {
+        return patternCache.size();
+    }
+
+    /**
+     * Clear all cached patterns. Use sparingly as it forces recompilation of all patterns. Mainly
+     * useful for testing or memory cleanup in long-running applications.
+     */
+    public void clearCache() {
+        patternCache.clear();
+        log.debug("Regex pattern cache cleared");
+    }
+
+    /**
+     * Remove a specific pattern from cache.
+     *
+     * @param regex the regular expression string to remove
+     * @return true if pattern was cached and removed, false otherwise
+     */
+    public boolean removeFromCache(String regex) {
+        return removeFromCache(regex, 0);
+    }
+
+    /**
+     * Remove a specific pattern with flags from cache.
+     *
+     * @param regex the regular expression string to remove
+     * @param flags pattern flags
+     * @return true if pattern was cached and removed, false otherwise
+     */
+    public boolean removeFromCache(String regex, int flags) {
+        if (regex == null) {
+            return false;
+        }
+        PatternKey key = new PatternKey(regex, flags);
+        boolean removed = patternCache.remove(key) != null;
+        if (removed) {
+            log.debug("Removed regex pattern from cache: {} (flags: {})", regex, flags);
+        }
+        return removed;
+    }
+
+    /**
+     * Internal method to compile a pattern and handle errors consistently.
+     *
+     * @return compiled Pattern
+     * @throws PatternSyntaxException if regex is invalid
+     */
+    private Pattern compilePattern(PatternKey key) {
+        String regex = key.regex;
+        int flags = key.flags;
+
+        try {
+            Pattern pattern = Pattern.compile(regex, flags);
+            log.trace("Compiled and cached regex pattern with flags {}: {}", flags, regex);
+            return pattern;
+        } catch (PatternSyntaxException e) {
+            log.error(
+                    "Invalid regex pattern: '{}' with flags {} - {}", regex, flags, e.getMessage());
+            throw e;
+        }
+    }
+
+    public static String getWhitespaceRegex() {
+        return WHITESPACE_REGEX;
+    }
+
+    /** Creates a case-insensitive pattern for text searching */
+    public Pattern createSearchPattern(String regex, boolean caseInsensitive) {
+        int flags = caseInsensitive ? (Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE) : 0;
+        return getPattern(regex, flags);
+    }
+
+    /** Pattern for matching trailing slashes (e.g., "/path/to/dir///") */
+    public Pattern getTrailingSlashesPattern() {
+        return getPattern("/+$");
+    }
+
+    /** Pattern for removing drive letters from paths */
+    public Pattern getDriveLetterPattern() {
+        return getPattern("^[a-zA-Z]:[\\\\/]+");
+    }
+
+    /** Pattern for removing leading slashes from paths */
+    public Pattern getLeadingSlashesPattern() {
+        return getPattern("^[\\\\/]+");
+    }
+
+    /** Pattern for matching backslashes */
+    public Pattern getBackslashPattern() {
+        return getPattern("\\\\");
+    }
+
+    /** Pattern for sanitizing filenames by removing problematic characters */
+    public Pattern getSafeFilenamePattern() {
+        return getPattern("[/\\\\?%*:|\"<>]");
+    }
+
+    /** Pattern for sanitizing filenames (keeps only alphanumeric) */
+    public Pattern getFilenameSafePattern() {
+        return getPattern("[^a-zA-Z0-9]");
+    }
+
+    /**
+     * Pattern for replacing non-alphanumeric characters with underscore (explicit underscore
+     * variant)
+     */
+    public Pattern getNonAlnumUnderscorePattern() {
+        return getPattern("[^A-Za-z0-9_]");
+    }
+
+    /** Pattern for collapsing multiple underscores */
+    public Pattern getMultipleUnderscoresPattern() {
+        return getPattern("_+");
+    }
+
+    /** Pattern for trimming leading underscores */
+    public Pattern getLeadingUnderscoresPattern() {
+        return getPattern("^_+");
+    }
+
+    /** Pattern for trimming trailing underscores */
+    public Pattern getTrailingUnderscoresPattern() {
+        return getPattern("_+$");
+    }
+
+    /** Pattern for matching upload/download paths (case insensitive) */
+    public Pattern getUploadDownloadPathPattern() {
+        return getPattern("(?i).*/(upload|download)/.*");
+    }
+
+    /** Pattern for matching one or more whitespace characters */
+    public Pattern getWhitespacePattern() {
+        return getPattern("\\s+");
+    }
+
+    /** Pattern for matching newlines (Windows and Unix style) */
+    public Pattern getNewlinesPattern() {
+        return getPattern("\\r?\\n");
+    }
+
+    /** Pattern for splitting on newlines (Windows and Unix style) */
+    public Pattern getNewlineSplitPattern() {
+        return getPattern("\\r?\\n");
+    }
+
+    /** Pattern for splitting text into words */
+    public Pattern getWordSplitPattern() {
+        return getPattern("\\s+");
+    }
+
+    /** Pattern for removing carriage returns */
+    public Pattern getCarriageReturnPattern() {
+        return getPattern("\\r");
+    }
+
+    /** Pattern for matching newline characters */
+    public Pattern getNewlineCharsPattern() {
+        return getPattern("[\n\r]");
+    }
+
+    /** Pattern for multi-format newline splitting (Windows, Mac, Unix) */
+    public Pattern getMultiFormatNewlinePattern() {
+        return getPattern("\r\n|\r|\n");
+    }
+
+    /** Pattern for encoded payload newline removal */
+    public Pattern getEncodedPayloadNewlinePattern() {
+        return getPattern("\\r?\\n");
+    }
+
+    /** Pattern for escaped newlines in watermark text */
+    public Pattern getEscapedNewlinePattern() {
+        return getPattern("\\\\n");
+    }
+
+    /** Pattern for input sanitization (allows only alphanumeric and spaces) */
+    public Pattern getInputSanitizePattern() {
+        return getPattern("[^a-zA-Z0-9 ]");
+    }
+
+    /** Pattern for removing angle brackets */
+    public Pattern getAngleBracketsPattern() {
+        return getPattern("[<>]");
+    }
+
+    /** Pattern for removing leading and trailing quotes */
+    public Pattern getQuotesRemovalPattern() {
+        return getPattern("^\"|\"$");
+    }
+
+    /** Pattern for plus signs (URL encoding replacement) */
+    public Pattern getPlusSignPattern() {
+        return getPattern("\\+");
+    }
+
+    /** Pattern for username validation */
+    public Pattern getUsernameValidationPattern() {
+        return getPattern("^[a-zA-Z0-9](?!.*[-@._+]{2,})[a-zA-Z0-9@._+-]{1,48}[a-zA-Z0-9]$");
+    }
+
+    public static String getExtensionRegex() {
+        return EXTENSION_REGEX;
+    }
+
+    /** Pattern for extracting non-numeric characters */
+    public Pattern getNumericExtractionPattern() {
+        return getPattern("\\D");
+    }
+
+    /** Pattern for removing non-digit/dot characters (for timeout parsing) */
+    public Pattern getNonDigitDotPattern() {
+        return getPattern("[^\\d.]");
+    }
+
+    /** Pattern for matching digit/dot characters (for timeout parsing) */
+    public Pattern getDigitDotPattern() {
+        return getPattern("[\\d.]");
+    }
+
+    /** Pattern for detecting strings containing digits */
+    public Pattern getContainsDigitsPattern() {
+        return getPattern(".*\\d+.*");
+    }
+
+    /** Pattern for matching 1-3 digit numbers */
+    public Pattern getNumberRangePattern() {
+        return getPattern("[1-9][0-9]{0,2}");
+    }
+
+    /** Pattern for validating mathematical expressions */
+    public Pattern getMathExpressionPattern() {
+        return getPattern("[0-9n+\\-*/() ]+");
+    }
+
+    /** Pattern for adding multiplication between numbers and 'n' */
+    public Pattern getNumberBeforeNPattern() {
+        return getPattern("(\\d)n");
+    }
+
+    /** Pattern for detecting consecutive 'n' characters */
+    public Pattern getConsecutiveNPattern() {
+        return getPattern(".*n{2,}.*");
+    }
+
+    /** Pattern for replacing consecutive 'n' characters */
+    public Pattern getConsecutiveNReplacementPattern() {
+        return getPattern("(?<!n)n{2}");
+    }
+
+    /** Pattern for validating HTTP/HTTPS URLs */
+    public Pattern getHttpUrlPattern() {
+        return getPattern("^https?://.*");
+    }
+
+    /** Pattern for matching URLs in text for link creation */
+    public Pattern getUrlLinkPattern() {
+        return getPattern("(https?://[\\w\\-._~:/?#\\[\\]@!$&'()*+,;=%]+)");
+    }
+
+    /** Pattern for matching email addresses in text for link creation */
+    public Pattern getEmailLinkPattern() {
+        return getPattern("([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,63})");
+    }
+
+    /** Pattern for removing script tags from HTML */
+    public Pattern getScriptTagPattern() {
+        return getPattern("(?i)<script[^>]*>.*?</script>");
+    }
+
+    /** Pattern for removing style tags from HTML */
+    public Pattern getStyleTagPattern() {
+        return getPattern("(?i)<style[^>]*>.*?</style>");
+    }
+
+    /** Pattern for removing fixed position CSS */
+    public Pattern getFixedPositionCssPattern() {
+        return getPattern("(?i)\\s*position\\s*:\\s*fixed[^;]*;?");
+    }
+
+    /** Pattern for removing absolute position CSS */
+    public Pattern getAbsolutePositionCssPattern() {
+        return getPattern("(?i)\\s*position\\s*:\\s*absolute[^;]*;?");
+    }
+
+    /** Pattern for matching size unit suffixes (KB, MB, GB, etc.) */
+    public Pattern getSizeUnitPattern() {
+        return getPattern("[KMGkmg][Bb]");
+    }
+
+    /** Pattern for system temp file type 1 */
+    public Pattern getSystemTempFile1Pattern() {
+        return getPattern("lu\\d+[a-z0-9]*\\.tmp");
+    }
+
+    /** Pattern for system temp file type 2 (OCR processes) */
+    public Pattern getSystemTempFile2Pattern() {
+        return getPattern("ocr_process\\d+");
+    }
+
+    /** Pattern for splitting on whitespace and parentheses */
+    public Pattern getWhitespaceParenthesesSplitPattern() {
+        return getPattern("[\\s\\(\\)]+");
+    }
+
+    /** Pattern for MIME header whitespace cleanup before encoded sequences */
+    public Pattern getMimeHeaderWhitespacePattern() {
+        return getPattern("\\s+(?==\\?)");
+    }
+
+    /** Pattern for font name validation (6 uppercase letters + plus + rest) */
+    public Pattern getFontNamePattern() {
+        return getPattern("^[A-Z]{6}\\+.*");
+    }
+
+    /** Pattern for matching access="readOnly" attribute in XFA XML (with optional whitespace) */
+    public Pattern getAccessReadOnlyPattern() {
+        return getPattern("access\\s*=\\s*\"readOnly\"");
+    }
+
+    /** Pattern for matching MIME encoded-word headers (RFC 2047) Example: =?charset?B?encoded?= */
+    public Pattern getMimeEncodedWordPattern() {
+        return getPattern("=\\?([^?]+)\\?([BbQq])\\?([^?]*)\\?=");
+    }
+
+    /** Pattern for matching inline CID images in HTML (case-insensitive) */
+    public Pattern getInlineCidImagePattern() {
+        return getPattern(
+                "(?i)<img[^>]*\\ssrc\\s*=\\s*['\"]cid:([^'\"]+)['\"][^>]*>",
+                Pattern.CASE_INSENSITIVE);
+    }
+
+    /** Pattern for matching image file extensions (case-insensitive) */
+    public Pattern getImageFilePattern() {
+        return getPattern(".*\\.(jpg|jpeg|png|gif|bmp|webp)$", Pattern.CASE_INSENSITIVE);
+    }
+
+    /** Pattern for matching attachment section headers (case-insensitive) */
+    public Pattern getAttachmentSectionPattern() {
+        return getPattern("attachments\\s*\\(\\d+\\)", Pattern.CASE_INSENSITIVE);
+    }
+
+    /** Pattern for matching filenames in attachment markers */
+    public Pattern getAttachmentFilenamePattern() {
+        return getPattern("@\\s*([^\\s\\(]+(?:\\.[a-zA-Z0-9]+)?)");
+    }
+
+    /** Pattern for matching pdfaid:part attribute in XMP metadata */
+    public Pattern getPdfAidPartPattern() {
+        return getPattern("pdfaid:part[\"\\s]*=[\"\\s]*([0-9]+)");
+    }
+
+    /** Pattern for matching pdfaid:conformance attribute in XMP metadata */
+    public Pattern getPdfAidConformancePattern() {
+        return getPattern("pdfaid:conformance[\"\\s]*=[\"\\s]*([A-Za-z]+)");
+    }
+
+    /** Pattern for matching slash in page mode description */
+    public Pattern getPageModePattern() {
+        return getPattern("/");
+    }
+
+    /**
+     * Pre-compile commonly used patterns for immediate availability. This eliminates first-call
+     * compilation overhead for frequent patterns.
+     */
+    private void precompileCommonPatterns() {
+        getPattern("\\.(?:[^.]*+)?$"); // Extension removal - possessive, optional, anchored
+        getPattern("\\.[^.]+$"); // Simple extension match - anchored
+
+        getPattern("\\s+"); // One or more whitespace
+        getPattern("\\s*"); // Zero or more whitespace
+
+        getPattern("/+$"); // Trailing slashes
+        getPattern("\\D"); // Non-numeric characters
+        getPattern("[/\\\\?%*:|\"<>]"); // Unsafe filename characters
+        getPattern("[^a-zA-Z0-9 ]"); // Input sanitization
+        getPattern("[^a-zA-Z0-9]"); // Filename sanitization
+        // API doc patterns
+        getPattern("Output:(\\w+)"); // precompiled single-escaped for runtime regex \w
+        getPattern("Input:(\\w+)");
+        getPattern("Type:(\\w+)");
+        log.debug("Pre-compiled {} common regex patterns", patternCache.size());
+    }
+
+    /** Pattern for email validation */
+    public Pattern getEmailValidationPattern() {
+        return getPattern(
+                "^(?=.{1,320}$)(?=.{1,64}@)[A-Za-z0-9](?:[A-Za-z0-9_.+-]*[A-Za-z0-9])?@[^-][A-Za-z0-9-]+(?:\\.[A-Za-z0-9-]+)*(?:\\.[A-Za-z]{2,})$");
+    }
+
+    /* Pattern for matching Output:<TYPE> in API descriptions */
+    public Pattern getApiDocOutputTypePattern() {
+        return getPattern("Output:(\\w+)");
+    }
+
+    /* Pattern for matching Input:<TYPE> in API descriptions */
+    public Pattern getApiDocInputTypePattern() {
+        return getPattern("Input:(\\w+)");
+    }
+
+    /**
+     * Pattern for matching Type:<CODE> in API descriptions
+     */
+    public Pattern getApiDocTypePattern() {
+        return getPattern("Type:(\\w+)");
+    }
+
+    /* Pattern for validating file extensions (2-4 alphanumeric, case-insensitive) */
+    public Pattern getFileExtensionValidationPattern() {
+        return getPattern("^[a-zA-Z0-9]{2,4}$", Pattern.CASE_INSENSITIVE);
+    }
+
+    private record PatternKey(String regex, int flags) {
+        // Record automatically provides equals, hashCode, and toString
+    }
+}
@@ -15,8 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 public class TempFile implements AutoCloseable {

    private final TempFileManager manager;
-    @Getter
-    private final File file;
+    @Getter private final File file;

    public TempFile(TempFileManager manager, String suffix) throws IOException {
        this.manager = manager;
@@ -11,9 +11,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;

-import lombok.Getter;
 import org.springframework.stereotype.Component;

+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

 /**
@@ -25,18 +25,18 @@ import lombok.extern.slf4j.Slf4j;
 public class TempFileRegistry {

    private final ConcurrentMap<Path, Instant> registeredFiles = new ConcurrentHashMap<>();
+
    /**
-     * -- GETTER --
-     *  Get all registered third-party temporary files.
+     * -- GETTER -- Get all registered third-party temporary files.
     *
     * @return Set of third-party file paths
     */
    @Getter
    private final Set<Path> thirdPartyTempFiles =
            Collections.newSetFromMap(new ConcurrentHashMap<>());
+
    /**
-     * -- GETTER --
-     *  Get all registered temporary directories.
+     * -- GETTER -- Get all registered temporary directories.
     *
     * @return Set of temporary directory paths
     */
@@ -4,6 +4,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;

 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.HttpHeaders;
@@ -11,9 +13,13 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;

 import io.github.pixee.security.Filenames;

+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class WebResponseUtils {

    public static ResponseEntity<byte[]> baosToWebResponse(
@@ -44,7 +50,10 @@ public class WebResponseUtils {
        headers.setContentType(mediaType);
        headers.setContentLength(bytes.length);
        String encodedDocName =
-                URLEncoder.encode(docName, StandardCharsets.UTF_8).replaceAll("\\+", "%20");
+                RegexPatternUtils.getInstance()
+                        .getPlusSignPattern()
+                        .matcher(URLEncoder.encode(docName, StandardCharsets.UTF_8))
+                        .replaceAll("%20");
        headers.setContentDispositionFormData("attachment", encodedDocName);
        return new ResponseEntity<>(bytes, headers, HttpStatus.OK);
    }
@@ -64,4 +73,59 @@ public class WebResponseUtils {

        return baosToWebResponse(baos, docName);
    }
+
+    /**
+     * Convert a File to a web response (PDF default).
+     *
+     * @param outputTempFile The temporary file to be sent as a response.
+     * @param docName The name of the document.
+     * @return A ResponseEntity containing the file as a resource.
+     */
+    public static ResponseEntity<StreamingResponseBody> pdfFileToWebResponse(
+            TempFile outputTempFile, String docName) throws IOException {
+        return fileToWebResponse(outputTempFile, docName, MediaType.APPLICATION_PDF);
+    }
+
+    /**
+     * Convert a File to a web response (ZIP default).
+     *
+     * @param outputTempFile The temporary file to be sent as a response.
+     * @param docName The name of the document.
+     * @return A ResponseEntity containing the file as a resource.
+     */
+    public static ResponseEntity<StreamingResponseBody> zipFileToWebResponse(
+            TempFile outputTempFile, String docName) throws IOException {
+        return fileToWebResponse(outputTempFile, docName, MediaType.APPLICATION_OCTET_STREAM);
+    }
+
+    /**
+     * Convert a File to a web response with explicit media type (e.g., ZIP).
+     *
+     * @param outputTempFile The temporary file to be sent as a response.
+     * @param docName The name of the document.
+     * @param mediaType The content type to set on the response.
+     * @return A ResponseEntity containing the file as a resource.
+     */
+    public static ResponseEntity<StreamingResponseBody> fileToWebResponse(
+            TempFile outputTempFile, String docName, MediaType mediaType) throws IOException {
+
+        Path path = outputTempFile.getFile().toPath().normalize();
+        long len = Files.size(path);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(mediaType);
+        headers.setContentLength(len);
+        headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + docName + "\"");
+
+        StreamingResponseBody body =
+                os -> {
+                    try (os) {
+                        Files.copy(path, os);
+                        os.flush();
+                    } finally {
+                        outputTempFile.close();
+                    }
+                };
+
+        return new ResponseEntity<>(body, headers, HttpStatus.OK);
+    }
 }
@@ -0,0 +1,86 @@
+package stirling.software.common.util.misc;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.web.multipart.MultipartFile;
+
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.model.api.misc.ReplaceAndInvert;
+import stirling.software.common.util.ProcessExecutor;
+import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+import stirling.software.common.util.TempFile;
+import stirling.software.common.util.TempFileManager;
+
+@Slf4j
+public class ColorSpaceConversionStrategy extends ReplaceAndInvertColorStrategy {
+
+    private final TempFileManager tempFileManager;
+
+    public ColorSpaceConversionStrategy(
+            MultipartFile file,
+            ReplaceAndInvert replaceAndInvert,
+            TempFileManager tempFileManager) {
+        super(file, replaceAndInvert);
+        this.tempFileManager = tempFileManager;
+    }
+
+    @Override
+    public InputStreamResource replace() throws IOException {
+        try (TempFile tempInput = new TempFile(tempFileManager, ".pdf");
+                TempFile tempOutput = new TempFile(tempFileManager, ".pdf")) {
+
+            Path tempInputFile = tempInput.getPath();
+            Path tempOutputFile = tempOutput.getPath();
+
+            Files.write(tempInputFile, getFileInput().getBytes());
+
+            log.info("Starting CMYK color space conversion");
+
+            List<String> command = new ArrayList<>();
+            command.add("gs");
+            command.add("-sDEVICE=pdfwrite");
+            command.add("-dCompatibilityLevel=1.5");
+            command.add("-dPDFSETTINGS=/prepress");
+            command.add("-dNOPAUSE");
+            command.add("-dQUIET");
+            command.add("-dBATCH");
+            command.add("-sProcessColorModel=DeviceCMYK");
+            command.add("-sColorConversionStrategy=CMYK");
+            command.add("-sColorConversionStrategyForImages=CMYK");
+            command.add("-sOutputFile=" + tempOutputFile.toString());
+            command.add(tempInputFile.toString());
+
+            log.debug("Executing Ghostscript command for CMYK conversion: {}", command);
+
+            ProcessExecutorResult result =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
+                            .runCommandWithOutputHandling(command);
+
+            if (result.getRc() != 0) {
+                log.error(
+                        "Ghostscript CMYK conversion failed with return code: {}. Output: {}",
+                        result.getRc(),
+                        result.getMessages());
+                throw new IOException(
+                        "CMYK color space conversion failed: " + result.getMessages());
+            }
+
+            log.info("CMYK color space conversion completed successfully");
+
+            byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
+            return new InputStreamResource(new ByteArrayInputStream(pdfBytes));
+
+        } catch (Exception e) {
+            log.warn("CMYK color space conversion failed", e);
+            throw new IOException(
+                    "Failed to convert PDF to CMYK color space: " + e.getMessage(), e);
+        }
+    }
+}
@@ -19,7 +19,10 @@ import org.apache.pdfbox.rendering.PDFRenderer;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.web.multipart.MultipartFile;

+import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.api.misc.ReplaceAndInvert;
+import stirling.software.common.util.ApplicationContextProvider;
+import stirling.software.common.util.ExceptionUtils;

 public class InvertFullColorStrategy extends ReplaceAndInvertColorStrategy {

@@ -44,8 +47,25 @@ public class InvertFullColorStrategy extends ReplaceAndInvertColorStrategy {
            // Render each page and invert colors
            PDFRenderer pdfRenderer = new PDFRenderer(document);
            for (int page = 0; page < document.getNumberOfPages(); page++) {
-                BufferedImage image =
-                        pdfRenderer.renderImageWithDPI(page, 300); // Render page at 300 DPI
+                BufferedImage image;
+
+                // Use global maximum DPI setting, fallback to 300 if not set
+                int renderDpi = 300; // Default fallback
+                ApplicationProperties properties =
+                        ApplicationContextProvider.getBean(ApplicationProperties.class);
+                if (properties != null && properties.getSystem() != null) {
+                    renderDpi = properties.getSystem().getMaxDPI();
+                }
+
+                try {
+                    image =
+                            pdfRenderer.renderImageWithDPI(
+                                    page, renderDpi); // Render page with global DPI setting
+                } catch (OutOfMemoryError e) {
+                    throw ExceptionUtils.createOutOfMemoryDpiException(page + 1, renderDpi, e);
+                } catch (NegativeArraySizeException e) {
+                    throw ExceptionUtils.createOutOfMemoryDpiException(page + 1, renderDpi, e);
+                }

                // Invert the colors
                invertImageColors(image);
@@ -2,9 +2,11 @@ package stirling.software.common.model;

 import static org.junit.jupiter.api.Assertions.*;

+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Function;

 import org.junit.jupiter.api.Test;

@@ -31,22 +33,23 @@ class ApplicationPropertiesLogicTest {

    @Test
    void tempFileManagement_defaults_and_overrides() {
+        Function<String, String> normalize = s -> Paths.get(s).normalize().toString();
        ApplicationProperties.TempFileManagement tfm =
                new ApplicationProperties.TempFileManagement();

        String expectedBase =
-                java.lang.System.getProperty("java.io.tmpdir").replaceAll("/+$", "")
-                        + "/stirling-pdf";
+                Paths.get(java.lang.System.getProperty("java.io.tmpdir"), "stirling-pdf")
+                        .toString();
        assertEquals(expectedBase, tfm.getBaseTmpDir());

-        String expectedLibre = expectedBase + "/libreoffice";
+        String expectedLibre = Paths.get(expectedBase, "libreoffice").toString();
        assertEquals(expectedLibre, tfm.getLibreofficeDir());

        tfm.setBaseTmpDir("/custom/base");
-        assertEquals("/custom/base", tfm.getBaseTmpDir());
+        assertEquals("/custom/base", normalize.apply(tfm.getBaseTmpDir()));

        tfm.setLibreofficeDir("/opt/libre");
-        assertEquals("/opt/libre", tfm.getLibreofficeDir());
+        assertEquals("/opt/libre", normalize.apply(tfm.getLibreofficeDir()));
    }

    @Test
@@ -11,6 +11,7 @@ import java.nio.file.Path;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
+import org.springframework.http.MediaType;

 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
@@ -23,7 +24,7 @@ class ApplicationPropertiesSaml2HttpTest {
            server.enqueue(
                    new MockResponse()
                            .setResponseCode(200)
-                            .addHeader("Content-Type", "application/xml")
+                            .addHeader("Content-Type", MediaType.APPLICATION_XML_VALUE)
                            .setBody("<EntityDescriptor/>"));
            server.start();

@@ -1,12 +1,12 @@
 package stirling.software.common.service;

 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 import static stirling.software.common.service.SpyPDFDocumentFactory.*;

 import java.io.*;
 import java.nio.file.*;
-import java.nio.file.Files;
 import java.util.Arrays;

 import org.apache.pdfbox.Loader;
@@ -18,9 +18,11 @@ import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
+import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;

 import stirling.software.common.model.api.PDFFile;
+import stirling.software.common.service.SpyPDFDocumentFactory.StrategyType;

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@@ -73,7 +75,7 @@ class CustomPDFDocumentFactoryTest {
    void testStrategy_MultipartFile(int sizeMB, StrategyType expected) throws IOException {
        byte[] inflated = inflatePdf(basePdfBytes, sizeMB);
        MockMultipartFile multipart =
-                new MockMultipartFile("file", "doc.pdf", "application/pdf", inflated);
+                new MockMultipartFile("file", "doc.pdf", MediaType.APPLICATION_PDF_VALUE, inflated);
        try (PDDocument doc = factory.load(multipart)) {
            Assertions.assertEquals(expected, factory.lastStrategyUsed);
        }
@@ -84,7 +86,7 @@ class CustomPDFDocumentFactoryTest {
    void testStrategy_PDFFile(int sizeMB, StrategyType expected) throws IOException {
        byte[] inflated = inflatePdf(basePdfBytes, sizeMB);
        MockMultipartFile multipart =
-                new MockMultipartFile("file", "doc.pdf", "application/pdf", inflated);
+                new MockMultipartFile("file", "doc.pdf", MediaType.APPLICATION_PDF_VALUE, inflated);
        PDFFile pdfFile = new PDFFile();
        pdfFile.setFileInput(multipart);
        try (PDDocument doc = factory.load(pdfFile)) {
@@ -2,6 +2,8 @@ package stirling.software.common.service;

 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.AdditionalAnswers.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;

 import java.io.IOException;
@@ -15,6 +17,7 @@ import org.junit.jupiter.api.io.TempDir;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.springframework.http.MediaType;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.multipart.MultipartFile;

@@ -36,7 +39,7 @@ class FileStorageTest {
        // Create a mock MultipartFile
        mockFile = mock(MultipartFile.class);
        when(mockFile.getOriginalFilename()).thenReturn("test.pdf");
-        when(mockFile.getContentType()).thenReturn("application/pdf");
+        when(mockFile.getContentType()).thenReturn(MediaType.APPLICATION_PDF_VALUE);
    }

    @Test
@@ -13,6 +13,7 @@ import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.springframework.http.MediaType;
 import org.springframework.test.util.ReflectionTestUtils;

 import stirling.software.common.model.job.JobResult;
@@ -77,7 +78,7 @@ class TaskManagerTest {
        taskManager.createTask(jobId);
        String fileId = "file-id";
        String originalFileName = "test.pdf";
-        String contentType = "application/pdf";
+        String contentType = MediaType.APPLICATION_PDF_VALUE;
        long fileSize = 1024L;

        // Mock the fileStorage.getFileSize() call
@@ -185,7 +186,8 @@ class TaskManagerTest {
        // 2. Create completed successful job with file
        String successFileJobId = "success-file-job";
        taskManager.createTask(successFileJobId);
-        taskManager.setFileResult(successFileJobId, "file-id", "test.pdf", "application/pdf");
+        taskManager.setFileResult(
+                successFileJobId, "file-id", "test.pdf", MediaType.APPLICATION_PDF_VALUE);

        // 3. Create completed successful job without file
        String successJobId = "success-job";
@@ -235,7 +237,7 @@ class TaskManagerTest {
                ResultFile.builder()
                        .fileId("file-id")
                        .fileName("test.pdf")
-                        .contentType("application/pdf")
+                        .contentType(MediaType.APPLICATION_PDF_VALUE)
                        .fileSize(1024L)
                        .build();
        ReflectionTestUtils.setField(oldJob, "resultFiles", java.util.List.of(resultFile));
@@ -1,8 +1,15 @@
 package stirling.software.common.util;

-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;

+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;

 import org.junit.jupiter.api.Test;

@@ -154,4 +161,223 @@ public class GeneralUtilsTest {
        List<Integer> result = GeneralUtils.parsePageList(new String[] {"1,3,7-8"}, 8, false);
        assertEquals(List.of(0, 2, 6, 7), result, "Range should be parsed correctly.");
    }
+
+    @Test
+    void testRemoveExtension() {
+        // Test common cases (should use fast string operations)
+        assertEquals("document", GeneralUtils.removeExtension("document.pdf"));
+        assertEquals("image", GeneralUtils.removeExtension("image.jpg"));
+        assertEquals("file.backup", GeneralUtils.removeExtension("file.backup.zip"));
+        assertEquals("complex.file.name", GeneralUtils.removeExtension("complex.file.name.txt"));
+
+        // Test edge cases (should fall back to regex)
+        assertEquals("default", GeneralUtils.removeExtension(null));
+        assertEquals("noextension", GeneralUtils.removeExtension("noextension"));
+        assertEquals(
+                ".hidden", GeneralUtils.removeExtension(".hidden")); // Hidden file, no extension
+        assertEquals("trailing.", GeneralUtils.removeExtension("trailing.")); // Trailing dot
+        assertEquals("", GeneralUtils.removeExtension(""));
+        assertEquals("a", GeneralUtils.removeExtension("a"));
+
+        // Test multiple dots
+        assertEquals("file.with.multiple", GeneralUtils.removeExtension("file.with.multiple.dots"));
+        assertEquals("path/to/file", GeneralUtils.removeExtension("path/to/file.ext"));
+    }
+
+    @Test
+    void testAppendSuffix() {
+        // Normal cases
+        assertEquals("document_processed", GeneralUtils.appendSuffix("document", "_processed"));
+        assertEquals("file.txt", GeneralUtils.appendSuffix("file", ".txt"));
+
+        // Null handling
+        assertEquals("default_suffix", GeneralUtils.appendSuffix(null, "_suffix"));
+        assertEquals("basename", GeneralUtils.appendSuffix("basename", null));
+        assertEquals("default", GeneralUtils.appendSuffix(null, null));
+
+        // Empty strings
+        assertEquals("_suffix", GeneralUtils.appendSuffix("", "_suffix"));
+        assertEquals("basename", GeneralUtils.appendSuffix("basename", ""));
+    }
+
+    @Test
+    void testProcessFilenames() {
+        List<String> filenames = new ArrayList<>();
+        filenames.add("document.pdf");
+        filenames.add("image.jpg");
+        filenames.add("spreadsheet.xlsx");
+        filenames.add("presentation.pptx");
+        filenames.add(null); // Should handle null gracefully
+        filenames.add("noextension");
+
+        List<String> results = new ArrayList<>();
+        GeneralUtils.processFilenames(filenames, "_processed", results::add);
+
+        List<String> expected =
+                List.of(
+                        "document_processed",
+                        "image_processed",
+                        "spreadsheet_processed",
+                        "presentation_processed",
+                        "default_processed",
+                        "noextension_processed");
+
+        assertEquals(expected, results);
+    }
+
+    @Test
+    void testProcessFilenamesNullHandling() {
+        List<String> results = new ArrayList<>();
+
+        // Null filenames list
+        GeneralUtils.processFilenames(null, "_suffix", results::add);
+        assertTrue(results.isEmpty(), "Should handle null filenames list");
+
+        // Null processor
+        List<String> filenames = List.of("test.txt");
+        GeneralUtils.processFilenames(filenames, "_suffix", null); // Should not throw
+    }
+
+    @Test
+    void testRemoveExtensionThreadSafety() throws InterruptedException {
+        final int threadCount = 50;
+        final int operationsPerThread = 100;
+        final String[] testFilenames = {
+            "document.pdf", "image.jpg", "data.csv", "presentation.pptx",
+            "archive.zip", "music.mp3", "video.mp4", "text.txt"
+        };
+
+        ExecutorService executor = Executors.newFixedThreadPool(threadCount);
+        CountDownLatch latch = new CountDownLatch(threadCount);
+        AtomicInteger successCount = new AtomicInteger(0);
+        List<Exception> exceptions = Collections.synchronizedList(new ArrayList<>());
+
+        for (int i = 0; i < threadCount; i++) {
+            executor.submit(
+                    () -> {
+                        try {
+                            for (int j = 0; j < operationsPerThread; j++) {
+                                String filename = testFilenames[j % testFilenames.length];
+                                String result = GeneralUtils.removeExtension(filename);
+
+                                // Verify result is correct
+                                assertFalse(
+                                        result.contains("."),
+                                        "Result should not contain extension: " + result);
+                                assertTrue(
+                                        filename.startsWith(result),
+                                        "Original should start with result: "
+                                                + filename
+                                                + " -> "
+                                                + result);
+                            }
+                            successCount.incrementAndGet();
+                        } catch (Exception e) {
+                            exceptions.add(e);
+                        } finally {
+                            latch.countDown();
+                        }
+                    });
+        }
+
+        assertTrue(latch.await(10, TimeUnit.SECONDS), "All threads should complete");
+
+        if (!exceptions.isEmpty()) {
+            fail("Thread safety test failed with exceptions: " + exceptions);
+        }
+
+        assertEquals(threadCount, successCount.get(), "All threads should succeed");
+
+        executor.shutdown();
+    }
+
+    @Test
+    void testBatchProcessingPerformance() {
+        List<String> filenames = new ArrayList<>();
+        for (int i = 0; i < 1000; i++) {
+            filenames.add("file" + i + ".pdf");
+            filenames.add("document" + i + ".docx");
+            filenames.add("image" + i + ".jpg");
+        }
+
+        List<String> results = new ArrayList<>();
+
+        GeneralUtils.processFilenames(filenames, "_processed", results::add);
+
+        assertEquals(filenames.size(), results.size(), "Should process all filenames");
+
+        assertTrue(results.contains("file0_processed"), "Should contain processed filename");
+        assertTrue(results.contains("document500_processed"), "Should contain processed filename");
+        assertTrue(results.contains("image999_processed"), "Should contain processed filename");
+    }
+
+    @Test
+    void testHybridStringRegexApproach() {
+
+        String[] edgeCases = {
+            "", // Empty string
+            ".", // Just a dot
+            "..", // Two dots
+            "...", // Three dots
+            ".hidden", // Hidden file
+            "file.", // Trailing dot
+            "a.b.c.d.e.f.g", // Many extensions
+            "no-extension-here", // No extension
+            "file..double.dot" // Double dots
+        };
+
+        for (String edgeCase : edgeCases) {
+            String result = GeneralUtils.removeExtension(edgeCase);
+            assertNotNull(result, "Result should not be null for: " + edgeCase);
+
+            // For specific edge cases, verify expected behavior
+            switch (edgeCase) {
+                case "" -> assertEquals("", result, "Empty string should remain empty");
+                case "." -> assertEquals(".", result, "Single dot should remain unchanged");
+                case ".." -> assertEquals("..", result, "Double dots should remain unchanged");
+                case "..." -> assertEquals("...", result, "Triple dots should remain unchanged");
+                case ".hidden" ->
+                        assertEquals(".hidden", result, "Hidden file should remain unchanged");
+                case "file." ->
+                        assertEquals("file.", result, "Trailing dot should remain unchanged");
+                case "no-extension-here" ->
+                        assertEquals(
+                                "no-extension-here",
+                                result,
+                                "No extension should remain unchanged");
+                case "a.b.c.d.e.f.g" ->
+                        assertEquals(
+                                "a.b.c.d.e.f",
+                                result,
+                                "Multiple extensions should remove last one");
+                case "file..double.dot" ->
+                        assertEquals(
+                                "file..double",
+                                result,
+                                "Double dot case should remove last extension");
+            }
+        }
+    }
+
+    @Test
+    void testGetTitleFromFilename() {
+        // Test normal cases
+        assertEquals("document", GeneralUtils.getTitleFromFilename("document.pdf"));
+        assertEquals("presentation", GeneralUtils.getTitleFromFilename("presentation.pptx"));
+        assertEquals("file.backup", GeneralUtils.getTitleFromFilename("file.backup.zip"));
+
+        // Test null and empty handling
+        assertEquals("Untitled", GeneralUtils.getTitleFromFilename(null));
+        assertEquals("Untitled", GeneralUtils.getTitleFromFilename(""));
+
+        // Test edge cases
+        assertEquals(".hidden", GeneralUtils.getTitleFromFilename(".hidden"));
+        assertEquals("file.", GeneralUtils.getTitleFromFilename("file."));
+        assertEquals("noextension", GeneralUtils.getTitleFromFilename("noextension"));
+
+        // Test complex cases
+        assertEquals(
+                "complex.file.name", GeneralUtils.getTitleFromFilename("complex.file.name.txt"));
+        assertEquals("path/to/file", GeneralUtils.getTitleFromFilename("path/to/file.ext"));
+    }
 }
@@ -5,7 +5,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mockStatic;
 import static org.mockito.Mockito.when;

@@ -25,6 +27,7 @@ import org.mockito.Mock;
 import org.mockito.MockedStatic;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;
@@ -46,10 +49,21 @@ class PDFToFileTest {

    @Mock private ProcessExecutor mockProcessExecutor;
    @Mock private ProcessExecutorResult mockExecutorResult;
+    @Mock private TempFileManager mockTempFileManager;

    @BeforeEach
-    void setUp() {
-        pdfToFile = new PDFToFile();
+    void setUp() throws IOException {
+        // Mock the TempFileManager to return real temp files
+        lenient()
+                .when(mockTempFileManager.createTempFile(anyString()))
+                .thenAnswer(
+                        invocation ->
+                                Files.createTempFile("test", invocation.getArgument(0)).toFile());
+        lenient()
+                .when(mockTempFileManager.createTempDirectory())
+                .thenAnswer(invocation -> Files.createTempDirectory("test"));
+
+        pdfToFile = new PDFToFile(mockTempFileManager);
    }

    @Test
@@ -57,7 +71,10 @@ class PDFToFileTest {
        // Prepare
        MultipartFile nonPdfFile =
                new MockMultipartFile(
-                        "file", "test.txt", "text/plain", "This is not a PDF".getBytes());
+                        "file",
+                        "test.txt",
+                        MediaType.TEXT_PLAIN_VALUE,
+                        "This is not a PDF".getBytes());

        // Execute
        ResponseEntity<byte[]> response = pdfToFile.processPdfToMarkdown(nonPdfFile);
@@ -71,7 +88,10 @@ class PDFToFileTest {
        // Prepare
        MultipartFile nonPdfFile =
                new MockMultipartFile(
-                        "file", "test.txt", "text/plain", "This is not a PDF".getBytes());
+                        "file",
+                        "test.txt",
+                        MediaType.TEXT_PLAIN_VALUE,
+                        "This is not a PDF".getBytes());

        // Execute
        ResponseEntity<byte[]> response = pdfToFile.processPdfToHtml(nonPdfFile);
@@ -86,7 +106,10 @@ class PDFToFileTest {
        // Prepare
        MultipartFile nonPdfFile =
                new MockMultipartFile(
-                        "file", "test.txt", "text/plain", "This is not a PDF".getBytes());
+                        "file",
+                        "test.txt",
+                        MediaType.TEXT_PLAIN_VALUE,
+                        "This is not a PDF".getBytes());

        // Execute
        ResponseEntity<byte[]> response =
@@ -102,7 +125,10 @@ class PDFToFileTest {
        // Prepare
        MultipartFile pdfFile =
                new MockMultipartFile(
-                        "file", "test.pdf", "application/pdf", "Fake PDF content".getBytes());
+                        "file",
+                        "test.pdf",
+                        MediaType.APPLICATION_PDF_VALUE,
+                        "Fake PDF content".getBytes());

        // Execute with invalid format
        ResponseEntity<byte[]> response =
@@ -120,7 +146,10 @@ class PDFToFileTest {
            // Create a mock PDF file
            MultipartFile pdfFile =
                    new MockMultipartFile(
-                            "file", "test.pdf", "application/pdf", "Fake PDF content".getBytes());
+                            "file",
+                            "test.pdf",
+                            MediaType.APPLICATION_PDF_VALUE,
+                            "Fake PDF content".getBytes());

            // Create a mock HTML output file
            Path htmlOutputFile = tempDir.resolve("test.html");
@@ -168,7 +197,7 @@ class PDFToFileTest {
                    new MockMultipartFile(
                            "file",
                            "multipage.pdf",
-                            "application/pdf",
+                            MediaType.APPLICATION_PDF_VALUE,
                            "Fake PDF content".getBytes());

            // Setup ProcessExecutor mock
@@ -245,7 +274,10 @@ class PDFToFileTest {
            // Create a mock PDF file
            MultipartFile pdfFile =
                    new MockMultipartFile(
-                            "file", "test.pdf", "application/pdf", "Fake PDF content".getBytes());
+                            "file",
+                            "test.pdf",
+                            MediaType.APPLICATION_PDF_VALUE,
+                            "Fake PDF content".getBytes());

            // Setup ProcessExecutor mock
            mockedStaticProcessExecutor
@@ -324,7 +356,7 @@ class PDFToFileTest {
                    new MockMultipartFile(
                            "file",
                            "document.pdf",
-                            "application/pdf",
+                            MediaType.APPLICATION_PDF_VALUE,
                            "Fake PDF content".getBytes());

            // Setup ProcessExecutor mock
@@ -386,7 +418,7 @@ class PDFToFileTest {
                    new MockMultipartFile(
                            "file",
                            "document.pdf",
-                            "application/pdf",
+                            MediaType.APPLICATION_PDF_VALUE,
                            "Fake PDF content".getBytes());

            // Setup ProcessExecutor mock
@@ -472,7 +504,7 @@ class PDFToFileTest {
                    new MockMultipartFile(
                            "file",
                            "document.pdf",
-                            "application/pdf",
+                            MediaType.APPLICATION_PDF_VALUE,
                            "Fake PDF content".getBytes());

            // Setup ProcessExecutor mock
@@ -531,7 +563,10 @@ class PDFToFileTest {
            // Create a mock PDF file with no filename
            MultipartFile pdfFile =
                    new MockMultipartFile(
-                            "file", "", "application/pdf", "Fake PDF content".getBytes());
+                            "file",
+                            "",
+                            MediaType.APPLICATION_PDF_VALUE,
+                            "Fake PDF content".getBytes());

            // Setup ProcessExecutor mock
            mockedStaticProcessExecutor
@@ -65,23 +65,22 @@ public class PdfUtilsTest {
        doc1.addPage(new PDPage());
        doc1.addPage(new PDPage());
        doc1.addPage(new PDPage());
-        PdfUtils utils = new PdfUtils();
-        assertTrue(utils.pageCount(doc1, 2, "greater"));
+        assertTrue(PdfUtils.pageCount(doc1, 2, "greater"));

        PDDocument doc2 = new PDDocument();
        doc2.addPage(new PDPage());
        doc2.addPage(new PDPage());
        doc2.addPage(new PDPage());
-        assertTrue(utils.pageCount(doc2, 3, "equal"));
+        assertTrue(PdfUtils.pageCount(doc2, 3, "equal"));

        PDDocument doc3 = new PDDocument();
        doc3.addPage(new PDPage());
        doc3.addPage(new PDPage());
-        assertTrue(utils.pageCount(doc3, 5, "less"));
+        assertTrue(PdfUtils.pageCount(doc3, 5, "less"));

        PDDocument doc4 = new PDDocument();
        doc4.addPage(new PDPage());
-        assertThrows(IllegalArgumentException.class, () -> utils.pageCount(doc4, 1, "bad"));
+        assertThrows(IllegalArgumentException.class, () -> PdfUtils.pageCount(doc4, 1, "bad"));
    }

    @Test
@@ -91,8 +90,7 @@ public class PdfUtilsTest {
        doc.addPage(page);
        PDRectangle rect = page.getMediaBox();
        String expected = rect.getWidth() + "x" + rect.getHeight();
-        PdfUtils utils = new PdfUtils();
-        assertTrue(utils.pageSize(doc, expected));
+        assertTrue(PdfUtils.pageSize(doc, expected));
    }

    @Test
@@ -0,0 +1,115 @@
+package stirling.software.common.util;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.regex.Pattern;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class RegexPatternUtilsTest {
+
+    private RegexPatternUtils utils;
+
+    @BeforeEach
+    void setUp() {
+        utils = RegexPatternUtils.getInstance();
+        utils.clearCache(); // Start with clean cache for each test
+    }
+
+    @Test
+    void testPatternCaching() {
+        String regex = "test\\d+";
+
+        Pattern pattern1 = utils.getPattern(regex);
+        assertNotNull(pattern1);
+        assertTrue(utils.isCached(regex));
+        assertEquals(
+                1, utils.getCacheSize()); // Should have at least 1 pattern (plus precompiled ones
+        // are cleared)
+
+        Pattern pattern2 = utils.getPattern(regex);
+        assertSame(pattern1, pattern2); // Should be the exact same object
+    }
+
+    @Test
+    void testPatternWithFlags() {
+        String regex = "test";
+        int flags = Pattern.CASE_INSENSITIVE;
+
+        Pattern pattern1 = utils.getPattern(regex, flags);
+        Pattern pattern2 = utils.getPattern(regex); // No flags
+
+        assertNotSame(pattern1, pattern2); // Different flags = different cached patterns
+        assertTrue(utils.isCached(regex, flags));
+        assertTrue(utils.isCached(regex, 0));
+    }
+
+    @Test
+    void testCacheEviction() {
+        String regex = "evict\\d+";
+
+        utils.getPattern(regex);
+        assertTrue(utils.isCached(regex));
+
+        boolean removed = utils.removeFromCache(regex);
+        assertTrue(removed);
+        assertFalse(utils.isCached(regex));
+
+        boolean removedAgain = utils.removeFromCache(regex);
+        assertFalse(removedAgain);
+    }
+
+    @Test
+    void testNullRegexHandling() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    utils.getPattern(null);
+                });
+
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> {
+                    utils.getPattern(null, Pattern.CASE_INSENSITIVE);
+                });
+
+        assertFalse(utils.isCached(null));
+        assertFalse(utils.removeFromCache(null));
+    }
+
+    @Test
+    void testCommonPatterns() {
+        Pattern whitespace = utils.getWhitespacePattern();
+        assertTrue(whitespace.matcher("  \t  ").matches());
+
+        Pattern trailing = utils.getTrailingSlashesPattern();
+        assertTrue(trailing.matcher("/path/to/dir///").find());
+
+        Pattern filename = utils.getSafeFilenamePattern();
+        assertTrue(filename.matcher("bad<file>name").find());
+    }
+
+    @Test
+    void testCreateSearchPattern() {
+        String regex = "Hello";
+
+        Pattern caseSensitive = utils.createSearchPattern(regex, false);
+        Pattern caseInsensitive = utils.createSearchPattern(regex, true);
+
+        assertTrue(caseSensitive.matcher("Hello").matches());
+        assertFalse(caseSensitive.matcher("hello").matches());
+
+        assertTrue(caseInsensitive.matcher("Hello").matches());
+        assertTrue(caseInsensitive.matcher("hello").matches());
+        assertTrue(caseInsensitive.matcher("HELLO").matches());
+    }
+
+    @Test
+    void testSingletonBehavior() {
+        RegexPatternUtils instance1 = RegexPatternUtils.getInstance();
+        RegexPatternUtils instance2 = RegexPatternUtils.getInstance();
+
+        assertSame(instance1, instance2);
+    }
+}
@@ -48,7 +48,8 @@ public class WebResponseUtilsTest {
        try {
            byte[] fileContent = "Sample file content".getBytes();
            MockMultipartFile file =
-                    new MockMultipartFile("file", "sample.txt", "text/plain", fileContent);
+                    new MockMultipartFile(
+                            "file", "sample.txt", MediaType.TEXT_PLAIN_VALUE, fileContent);

            ResponseEntity<byte[]> responseEntity =
                    WebResponseUtils.multiPartFileToWebResponse(file);
@@ -8,6 +8,7 @@ import java.lang.reflect.Method;

 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;

@@ -24,7 +25,10 @@ class CustomColorReplaceStrategyTest {
        // Create a mock file
        mockFile =
                new MockMultipartFile(
-                        "file", "test.pdf", "application/pdf", "test pdf content".getBytes());
+                        "file",
+                        "test.pdf",
+                        MediaType.APPLICATION_PDF_VALUE,
+                        "test pdf content".getBytes());

        // Initialize strategy with custom colors
        strategy =
@@ -24,6 +24,7 @@ import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;

@@ -38,7 +39,9 @@ class InvertFullColorStrategyTest {
    void setUp() throws Exception {
        // Create a simple PDF document for testing
        byte[] pdfBytes = createSimplePdfWithRectangle();
-        mockPdfFile = new MockMultipartFile("file", "test.pdf", "application/pdf", pdfBytes);
+        mockPdfFile =
+                new MockMultipartFile(
+                        "file", "test.pdf", MediaType.APPLICATION_PDF_VALUE, pdfBytes);

        // Create the strategy instance
        strategy = new InvertFullColorStrategy(mockPdfFile, ReplaceAndInvert.FULL_INVERSION);
@@ -7,6 +7,7 @@ import java.io.IOException;

 import org.junit.jupiter.api.Test;
 import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;

@@ -35,7 +36,10 @@ class ReplaceAndInvertColorStrategyTest {
        // Arrange
        MultipartFile mockFile =
                new MockMultipartFile(
-                        "file", "test.pdf", "application/pdf", "test content".getBytes());
+                        "file",
+                        "test.pdf",
+                        MediaType.APPLICATION_PDF_VALUE,
+                        "test content".getBytes());
        ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.CUSTOM_COLOR;

        // Act
@@ -56,7 +60,7 @@ class ReplaceAndInvertColorStrategyTest {
        // Arrange
        byte[] content = "test pdf content".getBytes();
        MultipartFile mockFile =
-                new MockMultipartFile("file", "test.pdf", "application/pdf", content);
+                new MockMultipartFile("file", "test.pdf", MediaType.APPLICATION_PDF_VALUE, content);
        ReplaceAndInvert replaceAndInvert = ReplaceAndInvert.CUSTOM_COLOR;

        ReplaceAndInvertColorStrategy strategy =
@@ -74,10 +78,16 @@ class ReplaceAndInvertColorStrategyTest {
        // Arrange
        MultipartFile mockFile1 =
                new MockMultipartFile(
-                        "file1", "test1.pdf", "application/pdf", "content1".getBytes());
+                        "file1",
+                        "test1.pdf",
+                        MediaType.APPLICATION_PDF_VALUE,
+                        "content1".getBytes());
        MultipartFile mockFile2 =
                new MockMultipartFile(
-                        "file2", "test2.pdf", "application/pdf", "content2".getBytes());
+                        "file2",
+                        "test2.pdf",
+                        MediaType.APPLICATION_PDF_VALUE,
+                        "content2".getBytes());

        // Act
        ReplaceAndInvertColorStrategy strategy =
@@ -58,7 +58,7 @@ dependencies {
    implementation 'commons-io:commons-io:2.20.0'
    implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
    implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
-    implementation 'io.micrometer:micrometer-core:1.15.3'
+    implementation 'io.micrometer:micrometer-core:1.15.4'
    implementation 'com.google.zxing:core:3.5.3'
    implementation "org.commonmark:commonmark:$commonmarkVersion" // https://mvnrepository.com/artifact/org.commonmark/commonmark
    implementation "org.commonmark:commonmark-ext-gfm-tables:$commonmarkVersion"
@@ -31,8 +31,6 @@ import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.Enumeration;

-import lombok.Getter;
-import lombok.Setter;
 import org.apache.pdfbox.pdmodel.interactive.digitalsignature.SignatureInterface;
 import org.bouncycastle.cert.jcajce.JcaCertStore;
 import org.bouncycastle.cms.CMSException;
@@ -44,24 +42,25 @@ import org.bouncycastle.operator.OperatorCreationException;
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;

+import lombok.Getter;
+import lombok.Setter;
+
 public abstract class CreateSignatureBase implements SignatureInterface {
    private PrivateKey privateKey;
-    @Getter
-    private Certificate[] certificateChain;
-    @Setter
-    private String tsaUrl;
+    @Getter private Certificate[] certificateChain;
+    @Setter private String tsaUrl;
+
    /**
-     * Specifies whether the external signing scenario should be used.
-     * If set to {@code true}, external signing will be performed and
-     * {@link SignatureInterface} will be used for signing.
+     * Specifies whether the external signing scenario should be used. If set to {@code true},
+     * external signing will be performed and {@link SignatureInterface} will be used for signing.
     * If set to {@code false}, internal signing will be performed.
+     *
     * <p>Default: {@code false}
     *
-     * @param externalSigning {@code true} if external signing should be performed; {@code false} for internal signing
+     * @param externalSigning {@code true} if external signing should be performed; {@code false}
+     *     for internal signing
     */
-    @Setter
-    @Getter
-    private boolean externalSigning;
+    @Setter @Getter private boolean externalSigning;

    /**
     * Initialize the signature creator with a keystore (pkcs12) and pin that should be used for the
@@ -158,5 +157,4 @@ public abstract class CreateSignatureBase implements SignatureInterface {
            throw new IOException(e);
        }
    }
-
 }
@@ -3,15 +3,22 @@ package stirling.software.SPDF.Factories;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;

+import lombok.RequiredArgsConstructor;
+
 import stirling.software.common.model.api.misc.HighContrastColorCombination;
 import stirling.software.common.model.api.misc.ReplaceAndInvert;
+import stirling.software.common.util.TempFileManager;
+import stirling.software.common.util.misc.ColorSpaceConversionStrategy;
 import stirling.software.common.util.misc.CustomColorReplaceStrategy;
 import stirling.software.common.util.misc.InvertFullColorStrategy;
 import stirling.software.common.util.misc.ReplaceAndInvertColorStrategy;

@Component
+@RequiredArgsConstructor
 public class ReplaceAndInvertColorFactory {

+    private final TempFileManager tempFileManager;
+
    public ReplaceAndInvertColorStrategy replaceAndInvert(
            MultipartFile file,
            ReplaceAndInvert replaceAndInvertOption,
@@ -19,21 +26,17 @@ public class ReplaceAndInvertColorFactory {
            String backGroundColor,
            String textColor) {

-        if (replaceAndInvertOption == ReplaceAndInvert.CUSTOM_COLOR
-                || replaceAndInvertOption == ReplaceAndInvert.HIGH_CONTRAST_COLOR) {
-
-            return new CustomColorReplaceStrategy(
-                    file,
-                    replaceAndInvertOption,
-                    textColor,
-                    backGroundColor,
-                    highContrastColorCombination);
-
-        } else if (replaceAndInvertOption == ReplaceAndInvert.FULL_INVERSION) {
-
-            return new InvertFullColorStrategy(file, replaceAndInvertOption);
-        }
-
-        return null;
+        return switch (replaceAndInvertOption) {
+            case CUSTOM_COLOR, HIGH_CONTRAST_COLOR ->
+                    new CustomColorReplaceStrategy(
+                            file,
+                            replaceAndInvertOption,
+                            textColor,
+                            backGroundColor,
+                            highContrastColorCombination);
+            case FULL_INVERSION -> new InvertFullColorStrategy(file, replaceAndInvertOption);
+            case COLOR_SPACE_CONVERSION ->
+                    new ColorSpaceConversionStrategy(file, replaceAndInvertOption, tempFileManager);
+        };
    }
 }
@@ -119,7 +119,7 @@ public class DesktopBrowser implements WebBrowser {
    private void configureCefSettings(CefAppBuilder builder) {
        CefSettings settings = builder.getCefSettings();
        String basePath = InstallationPathConfig.getClientWebUIPath();
-        log.info("basePath " + basePath);
+        log.info("basePath {}", basePath);
        settings.cache_path = new File(basePath + "cache").getAbsolutePath();
        settings.root_cache_path = new File(basePath + "root_cache").getAbsolutePath();
        //        settings.browser_subprocess_path = new File(basePath +
@@ -136,7 +136,7 @@ public class DesktopBrowser implements WebBrowser {
                new MavenCefAppHandlerAdapter() {
                    @Override
                    public void stateHasChanged(org.cef.CefApp.CefAppState state) {
-                        log.info("CEF state changed: " + state);
+                        log.info("CEF state changed: {}", state);
                        if (state == CefApp.CefAppState.TERMINATED) {
                            System.exit(0);
                        }
@@ -163,9 +163,9 @@ public class DesktopBrowser implements WebBrowser {
                            CefDownloadItem downloadItem,
                            CefDownloadItemCallback callback) {
                        if (downloadItem.isComplete()) {
-                            log.info("Download completed: " + downloadItem.getFullPath());
+                            log.info("Download completed: {}", downloadItem.getFullPath());
                        } else if (downloadItem.isCanceled()) {
-                            log.info("Download canceled: " + downloadItem.getFullPath());
+                            log.info("Download canceled: {}", downloadItem.getFullPath());
                        }
                    }
                });
@@ -409,7 +409,7 @@ public class DesktopBrowser implements WebBrowser {
                        }
                    }
                } catch (Exception e) {
-                    log.debug("Could not load icon from " + path, e);
+                    log.debug("Could not load icon from {}", path, e);
                }
            }

@@ -7,6 +7,7 @@ import java.io.InputStreamReader;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;

 import javax.imageio.ImageIO;
 import javax.swing.*;
@@ -15,10 +16,13 @@ import io.github.pixee.security.BoundedLineReader;

 import lombok.extern.slf4j.Slf4j;

+import stirling.software.common.util.RegexPatternUtils;
 import stirling.software.common.util.UIScaling;

@Slf4j
 public class LoadingWindow extends JDialog {
+    private static final Pattern PATTERN =
+            RegexPatternUtils.getInstance().getContainsDigitsPattern();
    private final JProgressBar progressBar;
    private final JLabel statusLabel;
    private final JPanel mainPanel;
@@ -151,7 +155,10 @@ public class LoadingWindow extends JDialog {
                                                        BoundedLineReader.readLine(
                                                                reader, 5_000_000))
                                                != null) {
-                                            if (line.matches(".*\\d+.*")) { // Contains numbers
+                                            if (RegexPatternUtils.getInstance()
+                                                    .getContainsDigitsPattern()
+                                                    .matcher(line)
+                                                    .matches()) { // Contains numbers
                                                String[] parts = line.trim().split(",");
                                                if (parts.length >= 2) {
                                                    existingPids.add(
@@ -206,8 +213,8 @@ public class LoadingWindow extends JDialog {
                                                                                                newReader,
                                                                                                5_000_000))
                                                                        != null) {
-                                                                    if (newLine.matches(
-                                                                            ".*\\d+.*")) {
+                                                                    if (PATTERN.matcher(newLine)
+                                                                            .matches()) {
                                                                        String[] parts =
                                                                                newLine.trim()
                                                                                        .split(",");
@@ -221,8 +228,8 @@ public class LoadingWindow extends JDialog {
                                                                                    .contains(
                                                                                            pid)) {
                                                                                log.debug(
-                                                                                        "Found new explorer.exe with PID: "
-                                                                                                + pid);
+                                                                                        "Found new explorer.exe with PID: {}",
+                                                                                        pid);
                                                                                ProcessBuilder
                                                                                        killProcess =
                                                                                                new ProcessBuilder(
@@ -241,8 +248,8 @@ public class LoadingWindow extends JDialog {
                                                                                        TimeUnit
                                                                                                .SECONDS);
                                                                                log.debug(
-                                                                                        "Explorer process terminated: "
-                                                                                                + pid);
+                                                                                        "Explorer process terminated: {}",
+                                                                                        pid);
                                                                            }
                                                                        }
                                                                    }
@@ -313,7 +320,7 @@ public class LoadingWindow extends JDialog {
                        mainPanel.revalidate();
                        mainPanel.repaint();
                    } catch (Exception e) {
-                        log.error("Error updating progress to " + progress, e);
+                        log.error("Error updating progress to {}", progress, e);
                    }
                });
    }
@@ -338,7 +345,7 @@ public class LoadingWindow extends JDialog {
                        mainPanel.revalidate();
                        mainPanel.repaint();
                    } catch (Exception e) {
-                        log.error("Error updating status to: " + status, e);
+                        log.error("Error updating status to: {}", status, e);
                    }
                });
    }
@@ -26,7 +26,7 @@ class AppUpdateService {
    @Scope("request")
    public boolean shouldShow() {
        boolean showUpdate = applicationProperties.getSystem().isShowUpdate();
-        boolean showAdminResult = (showAdmin != null) ? showAdmin.getShowUpdateOnlyAdmins() : true;
+        boolean showAdminResult = showAdmin == null || showAdmin.getShowUpdateOnlyAdmins();
        return showUpdate && showAdminResult;
    }
 }
@@ -66,7 +66,7 @@ public class CleanUrlInterceptor implements HandlerInterceptor {
                // Construct new query string
                StringBuilder newQueryString = new StringBuilder();
                for (Map.Entry<String, String> entry : allowedParameters.entrySet()) {
-                    if (newQueryString.length() > 0) {
+                    if (!newQueryString.isEmpty()) {
                        newQueryString.append("&");
                    }
                    newQueryString.append(entry.getKey()).append("=").append(entry.getValue());
@@ -6,10 +6,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;

-import lombok.Getter;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;

+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;

 import stirling.software.common.model.ApplicationProperties;
@@ -20,8 +20,7 @@ public class EndpointConfiguration {

    private static final String REMOVE_BLANKS = "remove-blanks";
    private final ApplicationProperties applicationProperties;
-    @Getter
-    private Map<String, Boolean> endpointStatuses = new ConcurrentHashMap<>();
+    @Getter private Map<String, Boolean> endpointStatuses = new ConcurrentHashMap<>();
    private Map<String, Set<String>> endpointGroups = new ConcurrentHashMap<>();
    private Set<String> disabledGroups = new HashSet<>();
    private Map<String, Set<String>> endpointAlternatives = new ConcurrentHashMap<>();
@@ -387,6 +386,7 @@ public class EndpointConfiguration {
        addEndpointToGroup("Java", "pdf-to-markdown");
        addEndpointToGroup("Java", "add-attachments");
        addEndpointToGroup("Java", "compress-pdf");
+        addEndpointToGroup("rar", "pdf-to-cbr");

        // Javascript
        addEndpointToGroup("Javascript", "pdf-organizer");
@@ -401,6 +401,8 @@ public class EndpointConfiguration {
        /* Ghostscript */
        addEndpointToGroup("Ghostscript", "repair");
        addEndpointToGroup("Ghostscript", "compress-pdf");
+        addEndpointToGroup("Ghostscript", "crop");
+        addEndpointToGroup("Ghostscript", "replace-invert-pdf");

        /* tesseract */
        addEndpointToGroup("tesseract", "ocr-pdf");
@@ -484,7 +486,8 @@ public class EndpointConfiguration {
                || "Java".equals(group)
                || "Javascript".equals(group)
                || "Weasyprint".equals(group)
-                || "Pdftohtml".equals(group);
+                || "Pdftohtml".equals(group)
+                || "rar".equals(group);
    }

    private boolean isEndpointEnabledDirectly(String endpoint) {
@@ -13,6 +13,7 @@ import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;

 import stirling.software.common.configuration.RuntimePathConfig;
+import stirling.software.common.util.RegexPatternUtils;

@Configuration
@Slf4j
@@ -42,6 +43,7 @@ public class ExternalAppDepConfig {
                        put(unoconvPath, List.of("Unoconvert"));
                        put("qpdf", List.of("qpdf"));
                        put("tesseract", List.of("tesseract"));
+                        put("rar", List.of("rar")); // Required for real CBR output
                    }
                };
    }
@@ -73,7 +75,7 @@ public class ExternalAppDepConfig {
        // First replace common terms
        String feature = endpoint.replace("-", " ").replace("pdf", "PDF").replace("img", "image");
        // Split into words and capitalize each word
-        return Arrays.stream(feature.split("\\s+"))
+        return Arrays.stream(RegexPatternUtils.getInstance().getWordSplitPattern().split(feature))
                .map(word -> capitalizeWord(word))
                .collect(Collectors.joining(" "));
    }
@@ -100,7 +102,7 @@ public class ExternalAppDepConfig {
                            "Missing dependency: {} - Disabling group: {} (Affected features: {})",
                            command,
                            group,
-                            affectedFeatures != null && !affectedFeatures.isEmpty()
+                            !affectedFeatures.isEmpty()
                                    ? String.join(", ", affectedFeatures)
                                    : "unknown");
                }
@@ -119,6 +121,7 @@ public class ExternalAppDepConfig {
        checkDependencyAndDisableGroup(weasyprintPath);
        checkDependencyAndDisableGroup("pdftohtml");
        checkDependencyAndDisableGroup(unoconvPath);
+        checkDependencyAndDisableGroup("rar");
        // Special handling for Python/OpenCV dependencies
        boolean pythonAvailable = isCommandAvailable("python3") || isCommandAvailable("python");
        if (!pythonAvailable) {
@@ -41,7 +41,8 @@ public class OpenApiConfig {
                                new License()
                                        .name("MIT")
                                        .url(
-                                                "https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/refs/heads/main/LICENSE"))
+                                                "https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/refs/heads/main/LICENSE")
+                                        .identifier("MIT"))
                        .termsOfService("https://www.stirlingpdf.com/terms")
                        .contact(
                                new Contact()
@@ -11,6 +11,7 @@ import org.apache.pdfbox.pdmodel.PDPageTree;
 import org.apache.pdfbox.pdmodel.encryption.PDEncryption;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;

 import io.swagger.v3.oas.annotations.Operation;
@@ -29,7 +30,7 @@ public class AnalysisController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;

-    @PostMapping(value = "/page-count", consumes = "multipart/form-data")
+    @PostMapping(value = "/page-count", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Get PDF page count",
            description = "Returns total number of pages in PDF. Input:PDF Output:JSON Type:SISO")
@@ -39,7 +40,7 @@ public class AnalysisController {
        }
    }

-    @PostMapping(value = "/basic-info", consumes = "multipart/form-data")
+    @PostMapping(value = "/basic-info", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Get basic PDF information",
            description = "Returns page count, version, file size. Input:PDF Output:JSON Type:SISO")
@@ -53,7 +54,7 @@ public class AnalysisController {
        }
    }

-    @PostMapping(value = "/document-properties", consumes = "multipart/form-data")
+    @PostMapping(value = "/document-properties", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Get PDF document properties",
            description = "Returns title, author, subject, etc. Input:PDF Output:JSON Type:SISO")
@@ -76,7 +77,7 @@ public class AnalysisController {
        }
    }

-    @PostMapping(value = "/page-dimensions", consumes = "multipart/form-data")
+    @PostMapping(value = "/page-dimensions", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Get page dimensions for all pages",
            description = "Returns width and height of each page. Input:PDF Output:JSON Type:SISO")
@@ -96,7 +97,7 @@ public class AnalysisController {
        }
    }

-    @PostMapping(value = "/form-fields", consumes = "multipart/form-data")
+    @PostMapping(value = "/form-fields", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Get form field information",
            description =
@@ -119,7 +120,7 @@ public class AnalysisController {
        }
    }

-    @PostMapping(value = "/annotation-info", consumes = "multipart/form-data")
+    @PostMapping(value = "/annotation-info", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Get annotation information",
            description = "Returns count and types of annotations. Input:PDF Output:JSON Type:SISO")
@@ -143,7 +144,7 @@ public class AnalysisController {
        }
    }

-    @PostMapping(value = "/font-info", consumes = "multipart/form-data")
+    @PostMapping(value = "/font-info", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Get font information",
            description =
@@ -165,7 +166,7 @@ public class AnalysisController {
        }
    }

-    @PostMapping(value = "/security-info", consumes = "multipart/form-data")
+    @PostMapping(value = "/security-info", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Get security information",
            description =
@@ -2,6 +2,9 @@ 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.List;

 import org.apache.pdfbox.multipdf.LayerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -10,6 +13,7 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream;
 import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,26 +24,39 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

 import stirling.software.SPDF.model.api.general.CropPdfForm;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/general")
@Tag(name = "General", description = "General APIs")
@RequiredArgsConstructor
+@Slf4j
 public class CropController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;

-    @PostMapping(value = "/crop", consumes = "multipart/form-data")
+    @PostMapping(value = "/crop", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Crops a PDF document",
            description =
                    "This operation takes an input PDF file and crops it according to the given"
                            + " coordinates. Input:PDF Output:PDF Type:SISO")
    public ResponseEntity<byte[]> cropPdf(@ModelAttribute CropPdfForm request) throws IOException {
+        if (request.isRemoveDataOutsideCrop()) {
+            return cropWithGhostscript(request);
+        } else {
+            return cropWithPDFBox(request);
+        }
+    }
+
+    private ResponseEntity<byte[]> cropWithPDFBox(@ModelAttribute CropPdfForm request)
+            throws IOException {
        PDDocument sourceDocument = pdfDocumentFactory.load(request);

        PDDocument newDocument =
@@ -92,7 +109,62 @@ public class CropController {
        byte[] pdfContent = baos.toByteArray();
        return WebResponseUtils.bytesToWebResponse(
                pdfContent,
-                request.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
-                        + "_cropped.pdf");
+                GeneralUtils.generateFilename(
+                        request.getFileInput().getOriginalFilename(), "_cropped.pdf"));
+    }
+
+    private ResponseEntity<byte[]> cropWithGhostscript(@ModelAttribute CropPdfForm request)
+            throws IOException {
+        PDDocument sourceDocument = pdfDocumentFactory.load(request);
+
+        for (int i = 0; i < sourceDocument.getNumberOfPages(); i++) {
+            PDPage page = sourceDocument.getPage(i);
+            PDRectangle cropBox =
+                    new PDRectangle(
+                            request.getX(),
+                            request.getY(),
+                            request.getWidth(),
+                            request.getHeight());
+            page.setCropBox(cropBox);
+        }
+
+        Path tempInputFile = Files.createTempFile("crop_input", ".pdf");
+        Path tempOutputFile = Files.createTempFile("crop_output", ".pdf");
+
+        try {
+            sourceDocument.save(tempInputFile.toFile());
+            sourceDocument.close();
+
+            ProcessExecutor processExecutor =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT);
+            List<String> command =
+                    List.of(
+                            "gs",
+                            "-sDEVICE=pdfwrite",
+                            "-dUseCropBox",
+                            "-o",
+                            tempOutputFile.toString(),
+                            tempInputFile.toString());
+
+            processExecutor.runCommandWithOutputHandling(command);
+
+            byte[] pdfContent = Files.readAllBytes(tempOutputFile);
+
+            return WebResponseUtils.bytesToWebResponse(
+                    pdfContent,
+                    request.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
+                            + "_cropped.pdf");
+
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IOException("Ghostscript processing was interrupted", e);
+        } finally {
+            try {
+                Files.deleteIfExists(tempInputFile);
+                Files.deleteIfExists(tempOutputFile);
+            } catch (IOException e) {
+                log.debug("Failed to delete temporary files", e);
+            }
+        }
    }
 }
@@ -6,8 +6,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import lombok.Getter;
-import lombok.Setter;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
@@ -15,12 +13,7 @@ import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlin
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineNode;
 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.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

 import com.fasterxml.jackson.core.type.TypeReference;
@@ -29,11 +22,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;

 import stirling.software.SPDF.model.api.EditTableOfContentsRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@@ -46,7 +42,7 @@ public class EditTableOfContentsController {
    private final CustomPDFDocumentFactory pdfDocumentFactory;
    private final ObjectMapper objectMapper;

-    @PostMapping(value = "/extract-bookmarks", consumes = "multipart/form-data")
+    @PostMapping(value = "/extract-bookmarks", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Extract PDF Bookmarks",
            description = "Extracts bookmarks/table of contents from a PDF document as JSON.")
@@ -154,7 +150,7 @@ public class EditTableOfContentsController {
        return bookmark;
    }

-    @PostMapping(value = "/edit-table-of-contents", consumes = "multipart/form-data")
+    @PostMapping(value = "/edit-table-of-contents", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Edit Table of Contents",
            description = "Add or edit bookmarks/table of contents in a PDF document.")
@@ -182,9 +178,10 @@ public class EditTableOfContentsController {
            ByteArrayOutputStream baos = new ByteArrayOutputStream();
            document.save(baos);

-            String filename = file.getOriginalFilename().replaceFirst("[.][^.]+$", "");
            return WebResponseUtils.bytesToWebResponse(
-                    baos.toByteArray(), filename + "_with_toc.pdf", MediaType.APPLICATION_PDF);
+                    baos.toByteArray(),
+                    GeneralUtils.generateFilename(file.getOriginalFilename(), "_with_toc.pdf"),
+                    MediaType.APPLICATION_PDF);

        } finally {
            if (document != null) {
@@ -242,6 +239,5 @@ public class EditTableOfContentsController {
        private String title;
        private int pageNumber;
        private List<BookmarkItem> children = new ArrayList<>();
-
    }
 }
@@ -1,11 +1,8 @@
 package stirling.software.SPDF.controller.api;

-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.attribute.BasicFileAttributes;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -14,18 +11,26 @@ import java.util.List;
 import org.apache.pdfbox.multipdf.PDFMergerUtility;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.PDDocumentInformation;
 import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.common.PDMetadata;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.pdmodel.interactive.form.PDField;
 import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
+import org.apache.xmpbox.XMPMetadata;
+import org.apache.xmpbox.schema.XMPBasicSchema;
+import org.apache.xmpbox.xml.DomXmpParser;
+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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;

 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -38,6 +43,8 @@ import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.PdfErrorUtils;
+import stirling.software.common.util.TempFile;
+import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@@ -48,6 +55,7 @@ import stirling.software.common.util.WebResponseUtils;
 public class MergeController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final TempFileManager tempFileManager;

    // Merges a list of PDDocument objects into a single PDDocument
    public PDDocument mergeDocuments(List<PDDocument> documents) throws IOException {
@@ -60,58 +68,78 @@ public class MergeController {
        return mergedDoc;
    }

+    // Re-order files to match the explicit order provided by the front-end.
+    // fileOrder is newline-delimited original filenames in the desired order.
+    private static MultipartFile[] reorderFilesByProvidedOrder(
+            MultipartFile[] files, String fileOrder) {
+        String[] desired = fileOrder.split("\n", -1);
+        List<MultipartFile> remaining = new ArrayList<>(Arrays.asList(files));
+        List<MultipartFile> ordered = new ArrayList<>(files.length);
+
+        for (String name : desired) {
+            if (name == null || name.isEmpty()) continue;
+            int idx = indexOfByOriginalFilename(remaining, name);
+            if (idx >= 0) {
+                ordered.add(remaining.remove(idx));
+            }
+        }
+
+        // Append any files not explicitly listed, preserving their relative order
+        ordered.addAll(remaining);
+        return ordered.toArray(new MultipartFile[0]);
+    }
+
    // Returns a comparator for sorting MultipartFile arrays based on the given sort type
    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 = pdfDocumentFactory.load(file1);
-                            PDDocument doc2 = pdfDocumentFactory.load(file2)) {
-                        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
-        }
+        return switch (sortType) {
+            case "byFileName" ->
+                    Comparator.comparing(
+                            (MultipartFile mf) -> {
+                                String name = mf.getOriginalFilename();
+                                return name == null ? "" : name;
+                            },
+                            String.CASE_INSENSITIVE_ORDER);
+            case "byDateModified" ->
+                    (file1, file2) -> {
+                        long t1 = getPdfDateTimeSafe(file1);
+                        long t2 = getPdfDateTimeSafe(file2);
+                        return Long.compare(t2, t1);
+                    };
+            case "byDateCreated" ->
+                    (file1, file2) -> {
+                        long t1 = getPdfDateTimeSafe(file1);
+                        long t2 = getPdfDateTimeSafe(file2);
+                        return Long.compare(t2, t1);
+                    };
+            case "byPDFTitle" ->
+                    (file1, file2) -> {
+                        try (PDDocument doc1 = pdfDocumentFactory.load(file1);
+                                PDDocument doc2 = pdfDocumentFactory.load(file2)) {
+                            String title1 =
+                                    doc1.getDocumentInformation() != null
+                                            ? doc1.getDocumentInformation().getTitle()
+                                            : null;
+                            String title2 =
+                                    doc2.getDocumentInformation() != null
+                                            ? doc2.getDocumentInformation().getTitle()
+                                            : null;
+                            if (title1 == null && title2 == null) {
+                                return 0;
+                            }
+                            if (title1 == null) {
+                                return 1;
+                            }
+                            if (title2 == null) {
+                                return -1;
+                            }
+                            return title1.compareToIgnoreCase(title2);
+                        } catch (IOException e) {
+                            return 0;
+                        }
+                    };
+            case "orderProvided" -> (file1, file2) -> 0; // Default is the order provided
+            default -> (file1, file2) -> 0; // Default is the order provided
+        };
    }

    // Adds a table of contents to the merged document using filenames as chapter titles
@@ -126,10 +154,7 @@ public class MergeController {
        for (MultipartFile file : files) {
            // Get the filename without extension to use as bookmark title
            String filename = file.getOriginalFilename();
-            String title = filename;
-            if (title != null && title.contains(".")) {
-                title = title.substring(0, title.lastIndexOf('.'));
-            }
+            String title = GeneralUtils.removeExtension(filename);

            // Create an outline item for this file
            PDOutlineItem item = new PDOutlineItem();
@@ -154,42 +179,103 @@ public class MergeController {
        }
    }

-    @PostMapping(consumes = "multipart/form-data", value = "/merge-pdfs")
+    private long getPdfDateTimeSafe(MultipartFile file) {
+        try {
+            try (PDDocument doc = pdfDocumentFactory.load(file)) {
+                PDDocumentInformation info = doc.getDocumentInformation();
+                if (info != null) {
+                    if (info.getModificationDate() != null) {
+                        return info.getModificationDate().getTimeInMillis();
+                    }
+                    if (info.getCreationDate() != null) {
+                        return info.getCreationDate().getTimeInMillis();
+                    }
+                }
+
+                // Fallback to XMP metadata if Info dates are missing
+                PDMetadata metadata = doc.getDocumentCatalog().getMetadata();
+                if (metadata != null) {
+                    try (InputStream is = metadata.createInputStream()) {
+                        DomXmpParser parser = new DomXmpParser();
+                        XMPMetadata xmp = parser.parse(is);
+                        XMPBasicSchema basic = xmp.getXMPBasicSchema();
+                        if (basic != null) {
+                            if (basic.getModifyDate() != null) {
+                                return basic.getModifyDate().getTimeInMillis();
+                            }
+                            if (basic.getCreateDate() != null) {
+                                return basic.getCreateDate().getTimeInMillis();
+                            }
+                        }
+                    } catch (Exception e) {
+                        log.debug(
+                                "Unable to read XMP metadata dates from uploaded file: {}",
+                                e.getMessage());
+                    }
+                }
+            }
+        } catch (IOException e) {
+            log.debug("Unable to read PDF dates from uploaded file: {}", e.getMessage());
+        }
+        return 0L;
+    }
+
+    private static int indexOfByOriginalFilename(List<MultipartFile> list, String name) {
+        for (int i = 0; i < list.size(); i++) {
+            MultipartFile f = list.get(i);
+            if (name.equals(f.getOriginalFilename())) return i;
+        }
+        return -1;
+    }
+
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, 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 request)
+    public ResponseEntity<StreamingResponseBody> mergePdfs(
+            @ModelAttribute MergePdfsRequest request,
+            @RequestParam(value = "fileOrder", required = false) String fileOrder)
            throws IOException {
        List<File> filesToDelete = new ArrayList<>(); // List of temporary files to delete
-        File mergedTempFile = null;
-        PDDocument mergedDocument = null;
+        TempFile outputTempFile = null;

        boolean removeCertSign = Boolean.TRUE.equals(request.getRemoveCertSign());
        boolean generateToc = request.isGenerateToc();

-        try {
-            MultipartFile[] files = request.getFileInput();
+        MultipartFile[] files = request.getFileInput();
+        if (files == null) {
+            files = new MultipartFile[0];
+        }
+
+        // If front-end provided explicit visible order, honor it and override backend sorting
+        if (fileOrder != null && !fileOrder.isBlank()) {
+            files = reorderFilesByProvidedOrder(files, fileOrder);
+        } else {
            Arrays.sort(
                    files,
                    getSortComparator(
-                            request.getSortType())); // Sort files based on the given sort type
+                            request.getSortType())); // Sort files based on requested sort type
+        }
+
+        ResponseEntity<StreamingResponseBody> response;
+
+        try (TempFile mt = new TempFile(tempFileManager, ".pdf")) {

            PDFMergerUtility mergerUtility = new PDFMergerUtility();
            long totalSize = 0;
            for (MultipartFile multipartFile : files) {
                totalSize += multipartFile.getSize();
                File tempFile =
-                        GeneralUtils.convertMultipartFileToFile(
+                        tempFileManager.convertMultipartFileToFile(
                                multipartFile); // Convert MultipartFile to File
                filesToDelete.add(tempFile); // Add temp file to the list for later deletion
                mergerUtility.addSource(tempFile); // Add source file to the merger utility
            }

-            mergedTempFile = Files.createTempFile("merged-", ".pdf").toFile();
-            mergerUtility.setDestinationFileName(mergedTempFile.getAbsolutePath());
+            mergerUtility.setDestinationFileName(mt.getFile().getAbsolutePath());

            try {
                mergerUtility.mergeDocuments(
@@ -203,42 +289,35 @@ public class MergeController {
                throw e;
            }

-            // Load the merged PDF document
-            mergedDocument = pdfDocumentFactory.load(mergedTempFile);
+            // Load the merged PDF document and operate on it inside try-with-resources
+            try (PDDocument mergedDocument = pdfDocumentFactory.load(mt.getFile())) {
+                // Remove signatures if removeCertSign is true
+                if (removeCertSign) {
+                    PDDocumentCatalog catalog = mergedDocument.getDocumentCatalog();
+                    PDAcroForm acroForm = catalog.getAcroForm();
+                    if (acroForm != null) {
+                        List<PDField> fieldsToRemove =
+                                acroForm.getFields().stream()
+                                        .filter(PDSignatureField.class::isInstance)
+                                        .toList();

-            // Remove signatures if removeCertSign is true
-            if (removeCertSign) {
-                PDDocumentCatalog catalog = mergedDocument.getDocumentCatalog();
-                PDAcroForm acroForm = catalog.getAcroForm();
-                if (acroForm != null) {
-                    List<PDField> fieldsToRemove =
-                            acroForm.getFields().stream()
-                                    .filter(field -> field instanceof PDSignatureField)
-                                    .toList();
-
-                    if (!fieldsToRemove.isEmpty()) {
-                        acroForm.flatten(
-                                fieldsToRemove,
-                                false); // Flatten the fields, effectively removing them
+                        if (!fieldsToRemove.isEmpty()) {
+                            acroForm.flatten(
+                                    fieldsToRemove,
+                                    false); // Flatten the fields, effectively removing them
+                        }
                    }
                }
+
+                // Add table of contents if generateToc is true
+                if (generateToc && files.length > 0) {
+                    addTableOfContents(mergedDocument, files);
+                }
+
+                // Save the modified document to a temporary file
+                outputTempFile = new TempFile(tempFileManager, ".pdf");
+                mergedDocument.save(outputTempFile.getFile());
            }
-
-            // Add table of contents if generateToc is true
-            if (generateToc && files.length > 0) {
-                addTableOfContents(mergedDocument, files);
-            }
-
-            // Save the modified document to a new ByteArrayOutputStream
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            mergedDocument.save(baos);
-
-            String mergedFileName =
-                    files[0].getOriginalFilename().replaceFirst("[.][^.]+$", "")
-                            + "_merged_unsigned.pdf";
-            return WebResponseUtils.baosToWebResponse(
-                    baos, mergedFileName); // Return the modified PDF
-
        } catch (Exception ex) {
            if (ex instanceof IOException && PdfErrorUtils.isCorruptedPdfError((IOException) ex)) {
                log.warn("Corrupted PDF detected in merge pdf process: {}", ex.getMessage());
@@ -247,17 +326,16 @@ public class MergeController {
            }
            throw ex;
        } finally {
-            if (mergedDocument != null) {
-                mergedDocument.close(); // Close the merged document
-            }
            for (File file : filesToDelete) {
-                if (file != null) {
-                    Files.deleteIfExists(file.toPath()); // Delete temporary files
-                }
-            }
-            if (mergedTempFile != null) {
-                Files.deleteIfExists(mergedTempFile.toPath());
+                tempFileManager.deleteTempFile(file); // Delete temporary files
            }
        }
+
+        String firstFilename = files.length > 0 ? files[0].getOriginalFilename() : null;
+        String mergedFileName =
+                GeneralUtils.generateFilename(firstFilename, "_merged_unsigned.pdf");
+
+        response = WebResponseUtils.pdfFileToWebResponse(outputTempFile, mergedFileName);
+        return response;
    }
 }
@@ -1,6 +1,6 @@
 package stirling.software.SPDF.controller.api;

-import java.awt.*;
+import java.awt.Color;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

@@ -11,6 +11,7 @@ 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;
@@ -18,25 +19,28 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

-import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;

 import stirling.software.SPDF.model.api.general.MergeMultiplePagesRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.FormUtils;
+import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@RequestMapping("/api/v1/general")
@Tag(name = "General", description = "General APIs")
@RequiredArgsConstructor
+@Slf4j
 public class MultiPageLayoutController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;

-    @PostMapping(value = "/multi-page-layout", consumes = "multipart/form-data")
+    @PostMapping(value = "/multi-page-layout", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Merge multiple pages of a PDF document into a single page",
            description =
@@ -102,7 +106,8 @@ public class MultiPageLayoutController {
            float scale = Math.min(scaleWidth, scaleHeight);

            int adjustedPageIndex =
-                    i % pagesPerSheet; // This will reset the index for every new page
+                    i % pagesPerSheet; // Close the current content stream and create a new
+            // page and content stream
            int rowIndex = adjustedPageIndex / cols;
            int colIndex = adjustedPageIndex % cols;

@@ -130,7 +135,28 @@ public class MultiPageLayoutController {
            }
        }

-        contentStream.close(); // Close the final content stream
+        contentStream.close();
+
+        // If any source page is rotated, skip form copying/transformation entirely
+        boolean hasRotation = FormUtils.hasAnyRotatedPage(sourceDocument);
+        if (hasRotation) {
+            log.info("Source document has rotated pages; skipping form field copying.");
+        } else {
+            try {
+                FormUtils.copyAndTransformFormFields(
+                        sourceDocument,
+                        newDocument,
+                        totalPages,
+                        pagesPerSheet,
+                        cols,
+                        rows,
+                        cellWidth,
+                        cellHeight);
+            } catch (Exception e) {
+                log.warn("Failed to copy and transform form fields: {}", e.getMessage(), e);
+            }
+        }
+
        sourceDocument.close();

        ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -140,7 +166,7 @@ public class MultiPageLayoutController {
        byte[] result = baos.toByteArray();
        return WebResponseUtils.bytesToWebResponse(
                result,
-                Filenames.toSimpleFileName(file.getOriginalFilename()).replaceFirst("[.][^.]+$", "")
-                        + "_layoutChanged.pdf");
+                GeneralUtils.generateFilename(
+                        file.getOriginalFilename(), "_multi_page_layout.pdf"));
    }
 }
@@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;

 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;
@@ -18,6 +19,7 @@ import lombok.RequiredArgsConstructor;
 import stirling.software.SPDF.service.PdfImageRemovalService;
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;

 /**
@@ -46,7 +48,7 @@ public class PdfImageRemovalController {
     *     content type and filename.
     * @throws IOException If an error occurs while processing the PDF file.
     */
-    @PostMapping(consumes = "multipart/form-data", value = "/remove-image-pdf")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/remove-image-pdf")
    @Operation(
            summary = "Remove images from file to reduce the file size.",
            description =
@@ -68,8 +70,8 @@ public class PdfImageRemovalController {

        // Generate a new filename for the modified PDF
        String mergedFileName =
-                file.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
-                        + "_removed_images.pdf";
+                GeneralUtils.generateFilename(
+                        file.getFileInput().getOriginalFilename(), "_images_removed.pdf");

        // Convert the byte array to a web response and return it
        return WebResponseUtils.bytesToWebResponse(outputStream.toByteArray(), mergedFileName);
@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

-import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

@@ -39,7 +38,7 @@ public class PdfOverlayController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;

-    @PostMapping(value = "/overlay-pdfs", consumes = "multipart/form-data")
+    @PostMapping(value = "/overlay-pdfs", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Overlay PDF files in various modes",
            description =
@@ -84,9 +83,8 @@ public class PdfOverlayController {
                overlay.overlay(overlayGuide).save(outputStream);
                byte[] data = outputStream.toByteArray();
                String outputFilename =
-                        Filenames.toSimpleFileName(baseFile.getOriginalFilename())
-                                        .replaceFirst("[.][^.]+$", "")
-                                + "_overlayed.pdf"; // Remove file extension and append .pdf
+                        GeneralUtils.generateFilename(
+                                baseFile.getOriginalFilename(), "_overlayed.pdf");

                return WebResponseUtils.bytesToWebResponse(
                        data, outputFilename, MediaType.APPLICATION_PDF);
@@ -7,6 +7,7 @@ import java.util.List;

 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;
@@ -14,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

-import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

@@ -38,7 +38,7 @@ public class RearrangePagesPDFController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;

-    @PostMapping(consumes = "multipart/form-data", value = "/remove-pages")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/remove-pages")
    @Operation(
            summary = "Remove pages from a PDF file",
            description =
@@ -67,9 +67,7 @@ public class RearrangePagesPDFController {
        }
        return WebResponseUtils.pdfDocToWebResponse(
                document,
-                Filenames.toSimpleFileName(pdfFile.getOriginalFilename())
-                                .replaceFirst("[.][^.]+$", "")
-                        + "_removed_pages.pdf");
+                GeneralUtils.generateFilename(pdfFile.getOriginalFilename(), "_removed_pages.pdf"));
    }

    private List<Integer> removeFirst(int totalPages) {
@@ -207,37 +205,26 @@ public class RearrangePagesPDFController {
    private List<Integer> processSortTypes(String sortTypes, int totalPages, String pageOrder) {
        try {
            SortTypes mode = SortTypes.valueOf(sortTypes.toUpperCase());
-            switch (mode) {
-                case REVERSE_ORDER:
-                    return reverseOrder(totalPages);
-                case DUPLEX_SORT:
-                    return duplexSort(totalPages);
-                case BOOKLET_SORT:
-                    return bookletSort(totalPages);
-                case SIDE_STITCH_BOOKLET_SORT:
-                    return sideStitchBooklet(totalPages);
-                case ODD_EVEN_SPLIT:
-                    return oddEvenSplit(totalPages);
-                case ODD_EVEN_MERGE:
-                    return oddEvenMerge(totalPages);
-                case REMOVE_FIRST:
-                    return removeFirst(totalPages);
-                case REMOVE_LAST:
-                    return removeLast(totalPages);
-                case REMOVE_FIRST_AND_LAST:
-                    return removeFirstAndLast(totalPages);
-                case DUPLICATE:
-                    return duplicate(totalPages, pageOrder);
-                default:
-                    throw new IllegalArgumentException("Unsupported custom mode");
-            }
+            return switch (mode) {
+                case REVERSE_ORDER -> reverseOrder(totalPages);
+                case DUPLEX_SORT -> duplexSort(totalPages);
+                case BOOKLET_SORT -> bookletSort(totalPages);
+                case SIDE_STITCH_BOOKLET_SORT -> sideStitchBooklet(totalPages);
+                case ODD_EVEN_SPLIT -> oddEvenSplit(totalPages);
+                case ODD_EVEN_MERGE -> oddEvenMerge(totalPages);
+                case REMOVE_FIRST -> removeFirst(totalPages);
+                case REMOVE_LAST -> removeLast(totalPages);
+                case REMOVE_FIRST_AND_LAST -> removeFirstAndLast(totalPages);
+                case DUPLICATE -> duplicate(totalPages, pageOrder);
+                default -> throw new IllegalArgumentException("Unsupported custom mode");
+            };
        } catch (IllegalArgumentException e) {
            log.error("Unsupported custom mode", e);
            return null;
        }
    }

-    @PostMapping(consumes = "multipart/form-data", value = "/rearrange-pages")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/rearrange-pages")
    @Operation(
            summary = "Rearrange pages in a PDF file",
            description =
@@ -259,14 +246,14 @@ public class RearrangePagesPDFController {
            int totalPages = document.getNumberOfPages();
            List<Integer> newPageOrder;
            if (sortType != null
-                    && sortType.length() > 0
+                    && !sortType.isEmpty()
                    && !"custom".equals(sortType.toLowerCase())) {
                newPageOrder = processSortTypes(sortType, totalPages, pageOrder);
            } else {
                newPageOrder = GeneralUtils.parsePageList(pageOrderArr, totalPages, false);
            }
-            log.info("newPageOrder = " + newPageOrder);
-            log.info("totalPages = " + totalPages);
+            log.info("newPageOrder = {}", newPageOrder);
+            log.info("totalPages = {}", totalPages);
            // Create a new list to hold the pages in the new order
            List<PDPage> newPages = new ArrayList<>();
            for (int i = 0; i < newPageOrder.size(); i++) {
@@ -285,9 +272,8 @@ public class RearrangePagesPDFController {

            return WebResponseUtils.pdfDocToWebResponse(
                    document,
-                    Filenames.toSimpleFileName(pdfFile.getOriginalFilename())
-                                    .replaceFirst("[.][^.]+$", "")
-                            + "_rearranged.pdf");
+                    GeneralUtils.generateFilename(
+                            pdfFile.getOriginalFilename(), "_rearranged.pdf"));
        } catch (IOException e) {
            ExceptionUtils.logException("document rearrangement", e);
            throw e;
@@ -5,6 +5,7 @@ import java.io.IOException;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDPageTree;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

-import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

@@ -21,6 +21,7 @@ import lombok.RequiredArgsConstructor;
 import stirling.software.SPDF.model.api.general.RotatePDFRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
+import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@@ -31,7 +32,7 @@ public class RotationController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;

-    @PostMapping(consumes = "multipart/form-data", value = "/rotate-pdf")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/rotate-pdf")
    @Operation(
            summary = "Rotate a PDF file",
            description =
@@ -58,10 +59,9 @@ public class RotationController {
            page.setRotation(page.getRotation() + angle);
        }

+        // Return the rotated PDF as a response
        return WebResponseUtils.pdfDocToWebResponse(
                document,
-                Filenames.toSimpleFileName(pdfFile.getOriginalFilename())
-                                .replaceFirst("[.][^.]+$", "")
-                        + "_rotated.pdf");
+                GeneralUtils.generateFilename(pdfFile.getOriginalFilename(), "_rotated.pdf"));
    }
 }
@@ -12,6 +12,7 @@ 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;
@@ -19,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

-import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

@@ -28,6 +28,7 @@ import lombok.RequiredArgsConstructor;
 import stirling.software.SPDF.model.api.general.ScalePagesRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
+import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@@ -38,7 +39,7 @@ public class ScalePagesController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;

-    @PostMapping(value = "/scale-pages", consumes = "multipart/form-data")
+    @PostMapping(value = "/scale-pages", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Change the size of a PDF page/document",
            description =
@@ -98,20 +99,26 @@ public class ScalePagesController {

        return WebResponseUtils.bytesToWebResponse(
                baos.toByteArray(),
-                Filenames.toSimpleFileName(file.getOriginalFilename()).replaceFirst("[.][^.]+$", "")
-                        + "_scaled.pdf");
+                GeneralUtils.generateFilename(file.getOriginalFilename(), "_scaled.pdf"));
    }

    private PDRectangle getTargetSize(String targetPDRectangle, PDDocument sourceDocument) {
        if ("KEEP".equals(targetPDRectangle)) {
            if (sourceDocument.getNumberOfPages() == 0) {
-                return null;
+                // Do not return null here; throw a clear exception so callers don't get a nullable
+                // PDRectangle.
+                throw ExceptionUtils.createInvalidPageSizeException("KEEP");
            }

            // use the first page to determine the target page size
            PDPage sourcePage = sourceDocument.getPage(0);
            PDRectangle sourceSize = sourcePage.getMediaBox();

+            if (sourceSize == null) {
+                // If media box is unexpectedly null, treat it as invalid
+                throw ExceptionUtils.createInvalidPageSizeException("KEEP");
+            }
+
            return sourceSize;
        }

@@ -3,7 +3,6 @@ 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.stream.Collectors;
@@ -20,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

-import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

@@ -30,6 +28,9 @@ import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.TempFile;
+import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@@ -40,8 +41,9 @@ import stirling.software.common.util.WebResponseUtils;
 public class SplitPDFController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final TempFileManager tempFileManager;

-    @PostMapping(consumes = "multipart/form-data", value = "/split-pages")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/split-pages")
    @Operation(
            summary = "Split a PDF file into separate documents",
            description =
@@ -53,17 +55,15 @@ public class SplitPDFController {
            throws IOException {

        PDDocument document = null;
-        Path zipFile = null;
        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();
+        TempFile outputTempFile = null;

        try {
+            outputTempFile = new TempFile(tempFileManager, ".zip");

            MultipartFile file = request.getFileInput();
-            String pages = request.getPageNumbers();
-            // open the pdf document
-
            document = pdfDocumentFactory.load(file);
-            // PdfMetadata metadata = PdfMetadataService.extractMetadataFromPdf(document);
+
            int totalPages = document.getNumberOfPages();
            List<Integer> pageNumbers = request.getPageNumbersList(document, false);
            if (!pageNumbers.contains(totalPages - 1)) {
@@ -76,8 +76,7 @@ public class SplitPDFController {
                    "Splitting PDF into pages: {}",
                    pageNumbers.stream().map(String::valueOf).collect(Collectors.joining(",")));

-            // split the document
-            splitDocumentsBoas = new ArrayList<>();
+            splitDocumentsBoas = new ArrayList<>(pageNumbers.size());
            int previousPageNumber = 0;
            for (int splitPoint : pageNumbers) {
                try (PDDocument splitDocument =
@@ -94,7 +93,6 @@ public class SplitPDFController {

                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
                    splitDocument.save(baos);
-
                    splitDocumentsBoas.add(baos);
                } catch (Exception e) {
                    ExceptionUtils.logException("document splitting and saving", e);
@@ -102,22 +100,21 @@ public class SplitPDFController {
                }
            }

-            // closing the original document
            document.close();

-            zipFile = Files.createTempFile("split_documents", ".zip");
+            String baseFilename = GeneralUtils.removeExtension(file.getOriginalFilename());
+
+            try (ZipOutputStream zipOut =
+                    new ZipOutputStream(Files.newOutputStream(outputTempFile.getPath()))) {
+                int splitDocumentsSize = splitDocumentsBoas.size();
+                for (int i = 0; i < splitDocumentsSize; i++) {
+                    StringBuilder sb = new StringBuilder(baseFilename.length() + 10);
+                    sb.append(baseFilename).append('_').append(i + 1).append(".pdf");
+                    String fileName = sb.toString();

-            String filename =
-                    Filenames.toSimpleFileName(file.getOriginalFilename())
-                            .replaceFirst("[.][^.]+$", "");
-            try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
-                // loop through the split documents and write them to the zip file
-                for (int i = 0; i < splitDocumentsBoas.size(); i++) {
-                    String fileName = filename + "_" + (i + 1) + ".pdf";
                    ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
                    byte[] pdf = baos.toByteArray();

-                    // Add PDF file to the zip
                    ZipEntry pdfEntry = new ZipEntry(fileName);
                    zipOut.putNextEntry(pdfEntry);
                    zipOut.write(pdf);
@@ -125,18 +122,17 @@ public class SplitPDFController {

                    log.debug("Wrote split document {} to zip file", fileName);
                }
-            } catch (Exception e) {
-                log.error("Failed writing to zip", e);
-                throw e;
            }

-            log.debug("Successfully created zip file with split documents: {}", zipFile.toString());
-            byte[] data = Files.readAllBytes(zipFile);
-            Files.deleteIfExists(zipFile);
+            log.debug(
+                    "Successfully created zip file with split documents: {}",
+                    outputTempFile.getPath().toString());
+            byte[] data = Files.readAllBytes(outputTempFile.getPath());

-            // return the Resource in the response
+            String zipFilename =
+                    GeneralUtils.generateFilename(file.getOriginalFilename(), "_split.zip");
            return WebResponseUtils.bytesToWebResponse(
-                    data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
+                    data, zipFilename, MediaType.APPLICATION_OCTET_STREAM);

        } finally {
            try {
@@ -152,9 +148,9 @@ public class SplitPDFController {
                    }
                }

-                // Delete temporary zip file
-                if (zipFile != null) {
-                    Files.deleteIfExists(zipFile);
+                // Close the output temporary file
+                if (outputTempFile != null) {
+                    outputTempFile.close();
                }
            } catch (Exception e) {
                log.error("Error while cleaning up resources", e);
@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

-import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

@@ -36,6 +35,7 @@ import stirling.software.common.model.PdfMetadata;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.service.PdfMetadataService;
 import stirling.software.common.util.ExceptionUtils;
+import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@@ -117,7 +117,7 @@ public class SplitPdfByChaptersController {
        return bookmarks;
    }

-    @PostMapping(value = "/split-pdf-by-chapters", consumes = "multipart/form-data")
+    @PostMapping(value = "/split-pdf-by-chapters", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Split PDFs by Chapters",
            description = "Splits a PDF into chapters and returns a ZIP file.")
@@ -188,9 +188,7 @@ public class SplitPdfByChaptersController {
            byte[] data = Files.readAllBytes(zipFile);
            Files.deleteIfExists(zipFile);

-            String filename =
-                    Filenames.toSimpleFileName(file.getOriginalFilename())
-                            .replaceFirst("[.][^.]+$", "");
+            String filename = GeneralUtils.generateFilename(file.getOriginalFilename(), "");
            sourceDocument.close();
            return WebResponseUtils.bytesToWebResponse(
                    data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
@@ -2,8 +2,8 @@ package stirling.software.SPDF.controller.api;

 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.zip.ZipEntry;
@@ -24,8 +24,8 @@ 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.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;

-import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

@@ -33,6 +33,10 @@ import lombok.RequiredArgsConstructor;

 import stirling.software.SPDF.model.api.SplitPdfBySectionsRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.PDFService;
+import stirling.software.common.util.TempFile;
+import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@@ -42,16 +46,18 @@ import stirling.software.common.util.WebResponseUtils;
 public class SplitPdfBySectionsController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final TempFileManager tempFileManager;
+    private final PDFService pdfService;

-    @PostMapping(value = "/split-pdf-by-sections", consumes = "multipart/form-data")
+    @PostMapping(value = "/split-pdf-by-sections", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @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 {
+    public ResponseEntity<StreamingResponseBody> splitPdf(
+            @ModelAttribute SplitPdfBySectionsRequest request) throws Exception {
        List<ByteArrayOutputStream> splitDocumentsBoas = new ArrayList<>();

        MultipartFile file = request.getFileInput();
@@ -63,14 +69,16 @@ public class SplitPdfBySectionsController {
        boolean merge = Boolean.TRUE.equals(request.getMerge());
        List<PDDocument> splitDocuments = splitPdfPages(sourceDocument, verti, horiz);

-        String filename =
-                Filenames.toSimpleFileName(file.getOriginalFilename())
-                        .replaceFirst("[.][^.]+$", "");
+        String filename = GeneralUtils.generateFilename(file.getOriginalFilename(), "_split.pdf");
        if (merge) {
-            MergeController mergeController = new MergeController(pdfDocumentFactory);
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            mergeController.mergeDocuments(splitDocuments).save(baos);
-            return WebResponseUtils.bytesToWebResponse(baos.toByteArray(), filename + "_split.pdf");
+            TempFile tempFile = new TempFile(tempFileManager, ".pdf");
+            try (PDDocument merged = pdfService.mergeDocuments(splitDocuments);
+                    OutputStream out = Files.newOutputStream(tempFile.getPath())) {
+                merged.save(out);
+                for (PDDocument d : splitDocuments) d.close();
+                sourceDocument.close();
+            }
+            return WebResponseUtils.pdfFileToWebResponse(tempFile, filename + "_split.pdf");
        }
        for (PDDocument doc : splitDocuments) {
            ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -81,10 +89,9 @@ public class SplitPdfBySectionsController {

        sourceDocument.close();

-        Path zipFile = Files.createTempFile("split_documents", ".zip");
-        byte[] data;
-
-        try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
+        TempFile zipTempFile = new TempFile(tempFileManager, ".zip");
+        try (ZipOutputStream zipOut =
+                new ZipOutputStream(Files.newOutputStream(zipTempFile.getPath()))) {
            int pageNum = 1;
            for (int i = 0; i < splitDocumentsBoas.size(); i++) {
                ByteArrayOutputStream baos = splitDocumentsBoas.get(i);
@@ -98,15 +105,8 @@ public class SplitPdfBySectionsController {

                if (sectionNum == horiz * verti) pageNum++;
            }
-
-            zipOut.finish();
-            data = Files.readAllBytes(zipFile);
-            return WebResponseUtils.bytesToWebResponse(
-                    data, filename + "_split.zip", MediaType.APPLICATION_OCTET_STREAM);
-
-        } finally {
-            Files.deleteIfExists(zipFile);
        }
+        return WebResponseUtils.zipFileToWebResponse(zipTempFile, filename + "_split.zip");
    }

    public List<PDDocument> splitPdfPages(
@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

-import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

@@ -28,6 +27,8 @@ import stirling.software.SPDF.model.api.general.SplitPdfBySizeOrCountRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.TempFile;
+import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@@ -38,8 +39,9 @@ import stirling.software.common.util.WebResponseUtils;
 public class SplitPdfBySizeController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final TempFileManager tempFileManager;

-    @PostMapping(value = "/split-by-size-or-count", consumes = "multipart/form-data")
+    @PostMapping(value = "/split-by-size-or-count", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    @Operation(
            summary = "Auto split PDF pages into separate documents based on size or count",
            description =
@@ -54,89 +56,67 @@ public class SplitPdfBySizeController {
        log.debug("Starting PDF split process with request: {}", request);
        MultipartFile file = request.getFileInput();

-        Path zipFile = Files.createTempFile("split_documents", ".zip");
-        log.debug("Created temporary zip file: {}", zipFile);
-
-        String filename =
-                Filenames.toSimpleFileName(file.getOriginalFilename())
-                        .replaceFirst("[.][^.]+$", "");
+        String filename = GeneralUtils.generateFilename(file.getOriginalFilename(), "");
        log.debug("Base filename for output: {}", filename);

-        byte[] data = null;
-        try {
-            log.debug("Reading input file bytes");
-            byte[] pdfBytes = file.getBytes();
-            log.debug("Successfully read {} bytes from input file", pdfBytes.length);
+        try (TempFile zipTempFile = new TempFile(tempFileManager, ".zip")) {
+            Path managedZipPath = zipTempFile.getPath();
+            log.debug("Created temporary managed zip file: {}", managedZipPath);
+            try {
+                log.debug("Reading input file bytes");
+                byte[] pdfBytes = file.getBytes();
+                log.debug("Successfully read {} bytes from input file", pdfBytes.length);

-            log.debug("Creating ZIP output stream");
-            try (ZipOutputStream zipOut = new ZipOutputStream(Files.newOutputStream(zipFile))) {
-                log.debug("Loading PDF document");
-                try (PDDocument sourceDocument = pdfDocumentFactory.load(pdfBytes)) {
-                    log.debug(
-                            "Successfully loaded PDF with {} pages",
-                            sourceDocument.getNumberOfPages());
+                log.debug("Creating ZIP output stream");
+                try (ZipOutputStream zipOut =
+                        new ZipOutputStream(Files.newOutputStream(managedZipPath))) {
+                    log.debug("Loading PDF document");
+                    try (PDDocument sourceDocument = pdfDocumentFactory.load(pdfBytes)) {
+                        log.debug(
+                                "Successfully loaded PDF with {} pages",
+                                sourceDocument.getNumberOfPages());

-                    int type = request.getSplitType();
-                    String value = request.getSplitValue();
-                    log.debug("Split type: {}, Split value: {}", type, value);
+                        int type = request.getSplitType();
+                        String value = request.getSplitValue();
+                        log.debug("Split type: {}, Split value: {}", type, value);

-                    if (type == 0) {
-                        log.debug("Processing split by size");
-                        long maxBytes = GeneralUtils.convertSizeToBytes(value);
-                        log.debug("Max bytes per document: {}", maxBytes);
-                        handleSplitBySize(sourceDocument, maxBytes, zipOut, filename);
-                    } else if (type == 1) {
-                        log.debug("Processing split by page count");
-                        int pageCount = Integer.parseInt(value);
-                        log.debug("Pages per document: {}", pageCount);
-                        handleSplitByPageCount(sourceDocument, pageCount, zipOut, filename);
-                    } else if (type == 2) {
-                        log.debug("Processing split by document count");
-                        int documentCount = Integer.parseInt(value);
-                        log.debug("Total number of documents: {}", documentCount);
-                        handleSplitByDocCount(sourceDocument, documentCount, zipOut, filename);
-                    } else {
-                        log.error("Invalid split type: {}", type);
-                        throw ExceptionUtils.createIllegalArgumentException(
-                                "error.invalidArgument",
-                                "Invalid argument: {0}",
-                                "split type: " + type);
+                        if (type == 0) {
+                            log.debug("Processing split by size");
+                            long maxBytes = GeneralUtils.convertSizeToBytes(value);
+                            log.debug("Max bytes per document: {}", maxBytes);
+                            handleSplitBySize(sourceDocument, maxBytes, zipOut, filename);
+                        } else if (type == 1) {
+                            log.debug("Processing split by page count");
+                            int pageCount = Integer.parseInt(value);
+                            log.debug("Pages per document: {}", pageCount);
+                            handleSplitByPageCount(sourceDocument, pageCount, zipOut, filename);
+                        } else if (type == 2) {
+                            log.debug("Processing split by document count");
+                            int documentCount = Integer.parseInt(value);
+                            log.debug("Total number of documents: {}", documentCount);
+                            handleSplitByDocCount(sourceDocument, documentCount, zipOut, filename);
+                        } else {
+                            log.error("Invalid split type: {}", type);
+                            throw ExceptionUtils.createIllegalArgumentException(
+                                    "error.invalidArgument",
+                                    "Invalid argument: {0}",
+                                    "split type: " + type);
+                        }
+                        log.debug("PDF splitting completed successfully");
                    }
-
-                    log.debug("PDF splitting completed successfully");
-                } catch (Exception e) {
-                    ExceptionUtils.logException("PDF document loading or processing", e);
-                    throw e;
                }
-            } catch (IOException e) {
-                log.error("Error creating or writing to ZIP file", e);
-                throw e;
-            }

-        } catch (Exception e) {
-            ExceptionUtils.logException("PDF splitting process", e);
-            throw e; // Re-throw to ensure proper error response
-        } finally {
-            try {
-                log.debug("Reading ZIP file data");
-                data = Files.readAllBytes(zipFile);
+                byte[] data = Files.readAllBytes(managedZipPath);
                log.debug("Successfully read {} bytes from ZIP file", data.length);
-            } catch (IOException e) {
-                log.error("Error reading ZIP file data", e);
-            }

-            try {
-                log.debug("Deleting temporary ZIP file");
-                boolean deleted = Files.deleteIfExists(zipFile);
-                log.debug("Temporary ZIP file deleted: {}", deleted);
-            } catch (IOException e) {
-                log.error("Error deleting temporary ZIP file", e);
+                log.debug("Returning response with {} bytes of data", data.length);
+                return WebResponseUtils.bytesToWebResponse(
+                        data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
+            } catch (Exception e) {
+                ExceptionUtils.logException("PDF splitting process", e);
+                throw e; // Re-throw to ensure proper error response
            }
        }
-
-        log.debug("Returning response with {} bytes of data", data != null ? data.length : 0);
-        return WebResponseUtils.bytesToWebResponse(
-                data, filename + ".zip", MediaType.APPLICATION_OCTET_STREAM);
    }

    private void handleSplitBySize(
@@ -273,7 +253,7 @@ public class SplitPdfBySizeController {
        log.debug("Starting handleSplitByPageCount with pageCount={}", pageCount);
        int currentPageCount = 0;
        log.debug("Creating initial output document");
-        PDDocument currentDoc = null;
+        PDDocument currentDoc;
        try {
            currentDoc = pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
            log.debug("Successfully created initial output document");
@@ -387,7 +367,7 @@ public class SplitPdfBySizeController {

        for (int i = 0; i < documentCount; i++) {
            log.debug("Creating document {} of {}", i + 1, documentCount);
-            PDDocument currentDoc = null;
+            PDDocument currentDoc;
            try {
                currentDoc = pdfDocumentFactory.createNewDocumentBasedOnOldDocument(sourceDocument);
                log.debug("Successfully created document {} of {}", i + 1, documentCount);
@@ -10,6 +10,7 @@ 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.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,6 +24,7 @@ import lombok.RequiredArgsConstructor;

 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@@ -33,7 +35,7 @@ public class ToSinglePageController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;

-    @PostMapping(consumes = "multipart/form-data", value = "/pdf-to-single-page")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf-to-single-page")
    @Operation(
            summary = "Convert a multi-page PDF into a single long page PDF",
            description =
@@ -91,7 +93,7 @@ public class ToSinglePageController {
        byte[] result = baos.toByteArray();
        return WebResponseUtils.bytesToWebResponse(
                result,
-                request.getFileInput().getOriginalFilename().replaceFirst("[.][^.]+$", "")
-                        + "_singlePage.pdf");
+                GeneralUtils.generateFilename(
+                        request.getFileInput().getOriginalFilename(), "_singlePage.pdf"));
    }
 }
@@ -40,7 +40,7 @@ public class ConvertEmlToPDF {
    private final TempFileManager tempFileManager;
    private final CustomHtmlSanitizer customHtmlSanitizer;

-    @PostMapping(consumes = "multipart/form-data", value = "/eml/pdf")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/eml/pdf")
    @Operation(
            summary = "Convert EML to PDF",
            description =
@@ -1,5 +1,6 @@
 package stirling.software.SPDF.controller.api.converters;

+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,11 +17,7 @@ import lombok.RequiredArgsConstructor;
 import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.api.converters.HTMLToPdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
-import stirling.software.common.util.CustomHtmlSanitizer;
-import stirling.software.common.util.ExceptionUtils;
-import stirling.software.common.util.FileToPdf;
-import stirling.software.common.util.TempFileManager;
-import stirling.software.common.util.WebResponseUtils;
+import stirling.software.common.util.*;

@RestController
@Tag(name = "Convert", description = "Convert APIs")
@@ -36,7 +33,7 @@ public class ConvertHtmlToPDF {

    private final CustomHtmlSanitizer customHtmlSanitizer;

-    @PostMapping(consumes = "multipart/form-data", value = "/html/pdf")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/html/pdf")
    @Operation(
            summary = "Convert an HTML or ZIP (containing HTML and CSS) to PDF",
            description =
@@ -68,9 +65,7 @@ public class ConvertHtmlToPDF {

        pdfBytes = pdfDocumentFactory.createNewBytesBasedOnOldDocument(pdfBytes);

-        String outputFilename =
-                originalFilename.replaceFirst("[.][^.]+$", "")
-                        + ".pdf"; // Remove file extension and append .pdf
+        String outputFilename = GeneralUtils.generateFilename(originalFilename, ".pdf");

        return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
    }
@@ -1,7 +1,6 @@
 package stirling.software.SPDF.controller.api.converters;

 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URLConnection;
@@ -9,6 +8,9 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;

@@ -16,6 +18,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.rendering.ImageType;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -24,22 +27,32 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

-import io.github.pixee.security.Filenames;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

+import stirling.software.SPDF.config.EndpointConfiguration;
+import stirling.software.SPDF.model.api.converters.ConvertCbrToPdfRequest;
+import stirling.software.SPDF.model.api.converters.ConvertCbzToPdfRequest;
+import stirling.software.SPDF.model.api.converters.ConvertPdfToCbrRequest;
+import stirling.software.SPDF.model.api.converters.ConvertPdfToCbzRequest;
 import stirling.software.SPDF.model.api.converters.ConvertToImageRequest;
 import stirling.software.SPDF.model.api.converters.ConvertToPdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.util.CbrUtils;
+import stirling.software.common.util.CbzUtils;
 import stirling.software.common.util.CheckProgramInstall;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
+import stirling.software.common.util.PdfToCbrUtils;
+import stirling.software.common.util.PdfToCbzUtils;
 import stirling.software.common.util.PdfUtils;
 import stirling.software.common.util.ProcessExecutor;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+import stirling.software.common.util.RegexPatternUtils;
+import stirling.software.common.util.TempFileManager;
 import stirling.software.common.util.WebResponseUtils;

@RestController
@@ -50,8 +63,17 @@ import stirling.software.common.util.WebResponseUtils;
 public class ConvertImgPDFController {

    private final CustomPDFDocumentFactory pdfDocumentFactory;
+    private final TempFileManager tempFileManager;
+    private final EndpointConfiguration endpointConfiguration;
+    private static final Pattern EXTENSION_PATTERN =
+            RegexPatternUtils.getInstance().getPattern(RegexPatternUtils.getExtensionRegex());
+    private static final String DEFAULT_COMIC_NAME = "comic";

-    @PostMapping(consumes = "multipart/form-data", value = "/pdf/img")
+    private boolean isGhostscriptEnabled() {
+        return endpointConfiguration.isGroupEnabled("Ghostscript");
+    }
+
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/img")
    @Operation(
            summary = "Convert PDF to image(s)",
            description =
@@ -88,9 +110,7 @@ public class ConvertImgPDFController {
            }
            // returns bytes for image
            boolean singleImage = "single".equals(singleOrMultiple);
-            String filename =
-                    Filenames.toSimpleFileName(new File(file.getOriginalFilename()).getName())
-                            .replaceFirst("[.][^.]+$", "");
+            String filename = GeneralUtils.generateFilename(file.getOriginalFilename(), "");

            result =
                    PdfUtils.convertFromPdf(
@@ -150,10 +170,11 @@ public class ConvertImgPDFController {
                                .runCommandWithOutputHandling(command);

                // Find all WebP files in the output directory
-                List<Path> webpFiles =
-                        Files.walk(tempOutputDir)
-                                .filter(path -> path.toString().endsWith(".webp"))
-                                .toList();
+                List<Path> webpFiles;
+                try (Stream<Path> walkStream = Files.walk(tempOutputDir)) {
+                    webpFiles =
+                            walkStream.filter(path -> path.toString().endsWith(".webp")).toList();
+                }

                if (webpFiles.isEmpty()) {
                    log.error("No WebP files were created in: {}", tempOutputDir.toString());
@@ -213,7 +234,7 @@ public class ConvertImgPDFController {
        }
    }

-    @PostMapping(consumes = "multipart/form-data", value = "/img/pdf")
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/img/pdf")
    @Operation(
            summary = "Convert images to a PDF file",
            description =
@@ -238,13 +259,163 @@ public class ConvertImgPDFController {
                PdfUtils.imageToPdf(file, fitOption, autoRotate, colorType, pdfDocumentFactory);
        return WebResponseUtils.bytesToWebResponse(
                bytes,
-                new File(file[0].getOriginalFilename()).getName().replaceFirst("[.][^.]+$", "")
-                        + "_converted.pdf");
+                GeneralUtils.generateFilename(file[0].getOriginalFilename(), "_converted.pdf"));
+    }
+
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/cbz/pdf")
+    @Operation(
+            summary = "Convert CBZ comic book archive to PDF",
+            description =
+                    "This endpoint converts a CBZ (ZIP) comic book archive to a PDF file. "
+                            + "Input:CBZ Output:PDF Type:SISO")
+    public ResponseEntity<?> convertCbzToPdf(@ModelAttribute ConvertCbzToPdfRequest request)
+            throws IOException {
+        MultipartFile file = request.getFileInput();
+        boolean optimizeForEbook = request.isOptimizeForEbook();
+
+        // Disable optimization if Ghostscript is not available
+        if (optimizeForEbook && !isGhostscriptEnabled()) {
+            log.warn("Ghostscript optimization requested but Ghostscript is not enabled/available");
+            optimizeForEbook = false;
+        }
+
+        byte[] pdfBytes;
+        try {
+            pdfBytes =
+                    CbzUtils.convertCbzToPdf(
+                            file, pdfDocumentFactory, tempFileManager, optimizeForEbook);
+        } catch (IllegalArgumentException ex) {
+            String message = ex.getMessage() == null ? "Invalid CBZ file" : ex.getMessage();
+            Map<String, Object> errorBody =
+                    Map.of("error", "Invalid CBZ file", "message", message, "trace", "");
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .body(errorBody);
+        }
+
+        String filename = createConvertedFilename(file.getOriginalFilename(), "_converted.pdf");
+
+        return WebResponseUtils.bytesToWebResponse(pdfBytes, filename);
+    }
+
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/cbz")
+    @Operation(
+            summary = "Convert PDF to CBZ comic book archive",
+            description =
+                    "This endpoint converts a PDF file to a CBZ (ZIP) comic book archive. "
+                            + "Input:PDF Output:CBZ Type:SISO")
+    public ResponseEntity<?> convertPdfToCbz(@ModelAttribute ConvertPdfToCbzRequest request)
+            throws IOException {
+        MultipartFile file = request.getFileInput();
+        int dpi = request.getDpi();
+
+        if (dpi <= 0) {
+            dpi = 300;
+        }
+
+        byte[] cbzBytes;
+        try {
+            cbzBytes = PdfToCbzUtils.convertPdfToCbz(file, dpi, pdfDocumentFactory);
+        } catch (IllegalArgumentException ex) {
+            String message = ex.getMessage() == null ? "Invalid PDF file" : ex.getMessage();
+            Map<String, Object> errorBody =
+                    Map.of("error", "Invalid PDF file", "message", message, "trace", "");
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .body(errorBody);
+        }
+
+        String filename = createConvertedFilename(file.getOriginalFilename(), "_converted.cbz");
+
+        return WebResponseUtils.bytesToWebResponse(
+                cbzBytes, filename, MediaType.APPLICATION_OCTET_STREAM);
+    }
+
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/cbr/pdf")
+    @Operation(
+            summary = "Convert CBR comic book archive to PDF",
+            description =
+                    "This endpoint converts a CBR (RAR) comic book archive to a PDF file. "
+                            + "Input:CBR Output:PDF Type:SISO")
+    public ResponseEntity<?> convertCbrToPdf(@ModelAttribute ConvertCbrToPdfRequest request)
+            throws IOException {
+        MultipartFile file = request.getFileInput();
+        boolean optimizeForEbook = request.isOptimizeForEbook();
+
+        // Disable optimization if Ghostscript is not available
+        if (optimizeForEbook && !isGhostscriptEnabled()) {
+            log.warn("Ghostscript optimization requested but Ghostscript is not enabled/available");
+            optimizeForEbook = false;
+        }
+
+        byte[] pdfBytes;
+        try {
+            pdfBytes =
+                    CbrUtils.convertCbrToPdf(
+                            file, pdfDocumentFactory, tempFileManager, optimizeForEbook);
+        } catch (IllegalArgumentException ex) {
+            String message = ex.getMessage() == null ? "Invalid CBR file" : ex.getMessage();
+            Map<String, Object> errorBody =
+                    Map.of("error", "Invalid CBR file", "message", message, "trace", "");
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .body(errorBody);
+        }
+
+        String filename = createConvertedFilename(file.getOriginalFilename(), "_converted.pdf");
+
+        return WebResponseUtils.bytesToWebResponse(pdfBytes, filename);
+    }
+
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE, value = "/pdf/cbr")
+    @Operation(
+            summary = "Convert PDF to CBR comic book archive",
+            description =
+                    "This endpoint converts a PDF file to a CBR comic book archive using the local RAR CLI. "
+                            + "Input:PDF Output:CBR Type:SISO")
+    public ResponseEntity<?> convertPdfToCbr(@ModelAttribute ConvertPdfToCbrRequest request)
+            throws IOException {
+        MultipartFile file = request.getFileInput();
+        int dpi = request.getDpi();
+
+        if (dpi <= 0) {
+            dpi = 300;
+        }
+
+        byte[] cbrBytes;
+        try {
+            cbrBytes = PdfToCbrUtils.convertPdfToCbr(file, dpi, pdfDocumentFactory);
+        } catch (IllegalArgumentException ex) {
+            String message = ex.getMessage() == null ? "Invalid PDF file" : ex.getMessage();
+            Map<String, Object> errorBody =
+                    Map.of("error", "Invalid PDF file", "message", message, "trace", "");
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .body(errorBody);
+        }
+
+        String filename = createConvertedFilename(file.getOriginalFilename(), "_converted.cbr");
+
+        return WebResponseUtils.bytesToWebResponse(
+                cbrBytes, filename, MediaType.APPLICATION_OCTET_STREAM);
+    }
+
+    private String createConvertedFilename(String originalFilename, String suffix) {
+        if (originalFilename == null) {
+            return GeneralUtils.generateFilename(DEFAULT_COMIC_NAME, suffix);
+        }
+
+        String baseName = EXTENSION_PATTERN.matcher(originalFilename).replaceFirst("");
+        if (baseName.isBlank()) {
+            baseName = DEFAULT_COMIC_NAME;
+        }
+
+        return GeneralUtils.generateFilename(baseName, suffix);
    }

    private String getMediaType(String imageFormat) {
        String mimeType = URLConnection.guessContentTypeFromName("." + imageFormat);
-        return "null".equals(mimeType) ? "application/octet-stream" : mimeType;
+        return "null".equals(mimeType) ? MediaType.APPLICATION_OCTET_STREAM_VALUE : mimeType;
    }

    /**
--- a/Show More
+++ b/Show More