p3x-html-pdf 2025.4.136 → 2025.4.145

package/README.md

@@ -6,7 +6,7 @@
 
 
 
-# 📃 Generates PDF from HTML with custom headers and footers with wkhtmltopdf v2025.4.136
+# 📃 Generates PDF from HTML with custom headers and footers with wkhtmltopdf v2025.4.145
 
 
   
@@ -196,16 +196,7 @@ The `p3x-footer` and `p3x-header` should not have any styles other than `id` and
 
 ### ARM64 Support
 
-If `os.arch() === 'arm64'`, the package will automatically set the `wkhtmltopdf` path to:  
-`/usr/local/bin/wkhtmltopdf-arm64`
-
-  
-To use this functionality, you must manually download the binary and place it in the specified location.  
-You can download the ARM64 binary from the link below:
-
-[Download wkhtmltopdf-arm64 binary](https://github.com/houseoftech/wkhtmltopdf-arm64/raw/refs/heads/master/bin/wkhtmltopdf-arm64)
-
-Currently, the ARM64 binary setup is manual. If there is sufficient demand, an automated installation process may be implemented in the future.
+Full ARM64 support.
 
 
 ---
@@ -213,9 +204,9 @@ Currently, the ARM64 binary setup is manual. If there is sufficient demand, an a
 ## 🖼️ Example Output
 
 Check out an example output PDF:  
-[Example PDF](https://cdn.corifeus.com/git/html-pdf/assets/p3x-html-pdf-example.pdf).
+[Example PDF](https://cdn.corifeus.com/git/html-pdf/assets/p3x-html-pdf-output.pdf).
   
-![Example Output](https://cdn.corifeus.com/git/html-pdf/assets/p3x-html-pdf-example.png)  
+![Example Output](https://cdn.corifeus.com/git/html-pdf/assets/p3x-html-pdf-output.png)  
   
 ---
 
@@ -374,7 +365,7 @@ All my domains, including [patrikx3.com](https://patrikx3.com), [corifeus.eu](ht
 ---
 
 
-[**P3X-HTML-PDF**](https://corifeus.com/html-pdf) Build v2025.4.136
+[**P3X-HTML-PDF**](https://corifeus.com/html-pdf) Build v2025.4.145
 
  [![NPM](https://img.shields.io/npm/v/p3x-html-pdf.svg)](https://www.npmjs.com/package/p3x-html-pdf)  [![Donate for Corifeus / P3X](https://img.shields.io/badge/Donate-Corifeus-003087.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QZVM4V6HVZJW6)  [![Contact Corifeus / P3X](https://img.shields.io/badge/Contact-P3X-ff9900.svg)](https://www.patrikx3.com/en/front/contact) [![Like Corifeus @ Facebook](https://img.shields.io/badge/LIKE-Corifeus-3b5998.svg)](https://www.facebook.com/corifeus.software)
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "p3x-html-pdf",
-    "version": "2025.4.136",
+    "version": "2025.4.145",
     "corifeus": {
         "prefix": "p3x-",
         "publish": true,

package/src/index.js

@@ -14,7 +14,7 @@ const binPathAddon = isWin ? '' : 'wkhtmltox/';
 let binpath = path.resolve(`${__dirname}/../release/${binPathAddon}bin/wkhtmltopdf`);
 // if we are in arm64, change the binpath
 if (os.arch() === 'arm64') {
-    binpath = '/usr/local/bin/wkhtmltopdf-arm64'
+    binpath = `${__dirname}/../release/wkhtmltopdf-arm64`
 }
 
 const generate = async (options) => {

package/src/package/install.js

@@ -1,34 +1,31 @@
 const utils = require('corifeus-utils');
-
 const os = require('os');
 const path = require('path');
 const fsExtra = require('fs-extra');
-// https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/tags
-// https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases/latest
-
 const progress = require('progress');
 
-//const currentRelease = 'https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases/latest';
+// GitHub API for wkhtmltopdf releases
 const currentRelease = 'https://api.github.com/repos/wkhtmltopdf/wkhtmltopdf/releases/4730156';
 
+// Install function
 const install = async () => {
-
     let staticInstaller;
-
     const staticInstallerPath = `${process.cwd()}/package.json`;
 
-    staticInstaller = require(staticInstallerPath)
-//    console.log('staticInstaller 1', JSON.stringify(staticInstaller, null, 4 ))
+    staticInstaller = require(staticInstallerPath);
 
     if (staticInstaller.hasOwnProperty('_where')) {
-        staticInstaller = require(`${staticInstaller._where}/package.json`)
+        staticInstaller = require(`${staticInstaller._where}/package.json`);
     }
 
-//    console.log('staticInstaller 2', JSON.stringify(staticInstaller, null, 4 ))
-
-    if (typeof staticInstaller === 'object' && staticInstaller.hasOwnProperty('p3x') && staticInstaller.p3x.hasOwnProperty('installer') && staticInstaller.p3x.installer['p3x-html-pdf'].hasOwnProperty('linux-x64') && staticInstaller.p3x.installer['p3x-html-pdf'].hasOwnProperty('win32-x64')) {
-        console.log('Found static download instead of GitHub as:', `
-`, JSON.stringify(staticInstaller.p3x.installer['p3x-html-pdf'], null, 4))
+    if (
+        typeof staticInstaller === 'object' &&
+        staticInstaller.hasOwnProperty('p3x') &&
+        staticInstaller.p3x.hasOwnProperty('installer') &&
+        staticInstaller.p3x.installer['p3x-html-pdf'].hasOwnProperty('linux-x64') &&
+        staticInstaller.p3x.installer['p3x-html-pdf'].hasOwnProperty('win32-x64')
+    ) {
+        console.log('Found static download instead of GitHub as:', JSON.stringify(staticInstaller.p3x.installer['p3x-html-pdf'], null, 4));
     } else {
         staticInstaller = undefined;
     }
@@ -37,55 +34,86 @@ const install = async () => {
     await fsExtra.remove(binPath);
 
     const arch = os.arch();
-    const platform = os.platform()
-
+    const platform = os.platform();
     let platformSearch;
     let archSearch;
+
     if (platform === 'linux') {
         platformSearch = 'linux';
         if (arch === 'x64') {
             archSearch = 'amd64';
+        } else if (arch === 'arm64') {
+            console.log('Detected arm64 architecture. Preparing to download arm64 binary.');
+            const releaseBinaryFileName = `${binPath}/wkhtmltopdf-arm64`;
+
+            await fsExtra.ensureDir(binPath);
+
+            const downloadResponse = await utils.http.request({
+                url: 'https://github.com/houseoftech/wkhtmltopdf-arm64/raw/refs/heads/master/bin/wkhtmltopdf-arm64',
+                pipe: true,
+            });
+
+            const releaseBinaryFile = utils.fs.createWriteStream(releaseBinaryFileName);
+            downloadResponse.pipe(releaseBinaryFile.stream);
+
+            const releaseSize = downloadResponse.headers['content-length'];
+            const bar = new progress('Downloading release [:bar] :rate/bps :percent :etas', {
+                complete: '=',
+                incomplete: ' ',
+                width: 20,
+                total: parseInt(releaseSize, 10),
+            });
+
+            downloadResponse.on('data', (chunk) => {
+                bar.tick(chunk.length);
+            });
+
+            await releaseBinaryFile;
+
+            console.log('Setting executable permissions for arm64 binary.');
+            await utils.childProcess.exec(`chmod +x ${releaseBinaryFileName}`, true);
+
+            console.log('Installation for arm64 completed.');
+            return;
         }
     } else if (platform === 'win32' && arch === 'x64') {
-        // wkhtmltox-0.12.4_mingw-w64-cross-win64.exe
         platformSearch = 'mingw-w64-cross';
         archSearch = 'win64';
     }
 
     if (platformSearch === undefined || archSearch === undefined) {
         console.log(`This platform for p3x-html-pdf is not implemented: ${platform}/${arch}`);
-        console.log('The p3x-html-pdf will not work, but will work silently');
-        return
+        console.log('The p3x-html-pdf will not work, but will work silently.');
+        return;
     }
 
     console.log(`Found platform: ${platformSearch} and architecture ${archSearch}`);
-
-    console.log(`Downloading latest release for wkhtmltopdf`);
+    console.log('Downloading latest release for wkhtmltopdf.');
 
     await utils.fs.ensureDir(binPath);
 
-    let releaseBinaryFileName
-    let downloadResponse
-    let releaseBinaryFile
+    let releaseBinaryFileName;
+    let downloadResponse;
+    let releaseBinaryFile;
 
     if (staticInstaller === undefined) {
         const headers = {};
 
         if (process.env.hasOwnProperty('GITHUB_TOKEN')) {
-            headers['Authorization'] = `token ${process.env.GITHUB_TOKEN}`
-            console.log(`Found GITHUB_TOKEN, using as GitHub authorization.`)
+            headers['Authorization'] = `token ${process.env.GITHUB_TOKEN}`;
+            console.log('Found GITHUB_TOKEN, using as GitHub authorization.');
         }
 
-        const {body} = await utils.http.request({
+        const { body } = await utils.http.request({
             url: currentRelease,
-            headers: headers
+            headers: headers,
         });
-        const findReleaseAsset = body.assets.find((asset) => {
-            return asset.browser_download_url.includes(platformSearch) && asset.browser_download_url.includes(archSearch);
-        })
+        const findReleaseAsset = body.assets.find((asset) =>
+            asset.browser_download_url.includes(platformSearch) && asset.browser_download_url.includes(archSearch)
+        );
 
-        if (findReleaseAsset === undefined || findReleaseAsset === null) {
-            throw new Error('Could not found the latest release for wkhtmltopdf')
+        if (!findReleaseAsset) {
+            throw new Error('Could not find the latest release for wkhtmltopdf.');
         }
 
         console.log(`Found the latest release: ${findReleaseAsset.browser_download_url}`);
@@ -94,22 +122,21 @@ const install = async () => {
         downloadResponse = await utils.http.request({
             url: findReleaseAsset.browser_download_url,
             pipe: true,
-        })
+        });
 
         releaseBinaryFile = utils.fs.createWriteStream(releaseBinaryFileName);
         downloadResponse.pipe(releaseBinaryFile.stream);
-
     } else {
-        console.log(`Found the latest release: ${staticInstaller.p3x.installer['p3x-html-pdf'][`${platform}-${arch}`]}`)
+        console.log(`Found the latest release: ${staticInstaller.p3x.installer['p3x-html-pdf'][`${platform}-${arch}`]}`);
 
         releaseBinaryFileName = `${binPath}/${path.basename(staticInstaller.p3x.installer['p3x-html-pdf'][`${platform}-${arch}`])}`;
 
-        let fixedUrl = staticInstaller.p3x.installer['p3x-html-pdf'][`${platform}-${arch}`]
+        const fixedUrl = staticInstaller.p3x.installer['p3x-html-pdf'][`${platform}-${arch}`];
 
         downloadResponse = await utils.http.request({
             url: fixedUrl,
             pipe: true,
-        })
+        });
 
         releaseBinaryFile = utils.fs.createWriteStream(releaseBinaryFileName);
         downloadResponse.pipe(releaseBinaryFile.stream);
@@ -125,30 +152,24 @@ const install = async () => {
 
     downloadResponse.on('data', (chunk) => {
         bar.tick(chunk.length);
-    })
+    });
 
     await releaseBinaryFile;
 
-
     if (platform === 'linux') {
-        console.log(`Decompress ${releaseBinaryFileName}`);
-        await utils.childProcess.exec(`tar -xvf ${releaseBinaryFileName} -C ${binPath}`, true)
+        console.log(`Decompressing ${releaseBinaryFileName}`);
+        await utils.childProcess.exec(`tar -xvf ${releaseBinaryFileName} -C ${binPath}`, true);
     } else if (platformSearch === 'mingw-w64-cross') {
-        console.log(`Install ${releaseBinaryFileName}`);
+        console.log(`Installing ${releaseBinaryFileName}`);
         const winCommand = `cmd.exe /v /c "set binpath=${binPath} && \"${releaseBinaryFileName}\" /S /D=!binpath! && echo !binpath!"`;
-        await utils.childProcess.exec(winCommand, true)
+        await utils.childProcess.exec(winCommand, true);
     }
 
-    console.log(`Delete ${releaseBinaryFileName} file`);
-    await fsExtra.remove(releaseBinaryFileName)
+    console.log(`Deleting ${releaseBinaryFileName} file.`);
+    await fsExtra.remove(releaseBinaryFileName);
 
-    /*
-    const jqueryVersion = `jquery@1.12.4`;
-    console.log(`Install The specific ${jqueryVersion} we need`);
-    await utils.childProcess.exec(`npm install ${jqueryVersion}`);
-    */
+    console.log('Installation done.');
+    process.exit();
+};
 
-    console.log(`Install done`);
-    process.exit()
-}
-install()
+install();

package/test/test.js

@@ -5,12 +5,21 @@ const fs = require('fs');
 
 (async () => {
     try {
-        // Delete the output file if it already exists
-        const outputPath = path.resolve(__dirname, '..', 'assets', 'p3x-html-pdf-example.pdf');
+        // Define the output path
+        const assetsPath = path.resolve(__dirname, '..', 'assets');
+        const outputPath = path.join(assetsPath, 'p3x-html-pdf-output.pdf');
+
+        // Ensure the assets directory exists
+        if (!fs.existsSync(assetsPath)) {
+            fs.mkdirSync(assetsPath, { recursive: true }); // Create the directory if it doesn't exist
+            console.log(`Created directory: ${assetsPath}`);
+        }
+
         if (fs.existsSync(outputPath)) {
             fs.unlinkSync(outputPath);
         }
 
+
         // Define options for PDF generation
         const options = {
             settings: {
@@ -49,7 +58,7 @@ const fs = require('fs');
                             <th style="border: 1px solid #ddd; padding: 8px; background-color: #f4f4f4;">Price</th>
                             <th style="border: 1px solid #ddd; padding: 8px; background-color: #f4f4f4;">Total</th>
                         </tr>
-                        ${Array.from({ length: 27 }).map((_, i) => {
+                        ${Array.from({ length: 26 }).map((_, i) => {
                             const price = (i + 1) * 10;
                             const quantity = (i % 5) + 1;
                             const total = price * quantity;
@@ -83,7 +92,7 @@ const fs = require('fs');
                         <li>Accepted payment methods include credit card, bank transfer, and PayPal.</li>
                         <li>Please ensure that all transactions reference the invoice number provided above.</li>
                     </ul>
-                    <p style="font-size: 14px; color: #555;">If you have any questions, feel free to contact our support team at <a href="mailto:support@corifeus.com">support@corifeus.com</a>.</p>
+                    <p style="font-size: 14px; color: #555;">If you have any questions, feel free to contact our support team at <a href="mailto:support@patrikx3.com">support@patrikx3.com</a>.</p>
                 </div>
                 <div class="ng-template-page-break"></div>
                 <div>