- generazione della raccolta PDF OK !!!

src/server/models/raccoltacataloghi.js

@@ -37,6 +37,7 @@ const RaccoltaCataloghiSchema = new Schema({
 
   nomefile_da_generare: String,
 
+  pdf_generato: String,
   pdf_generato_size: String,
   pdf_generato_stampa: String,
   data_generato: {

src/server/modules/GenPdf.js

@@ -86,6 +86,7 @@ class GenPdf {
     try {
       console.log(`caricamento pagina: ${url}`);
       await page.goto(url, { waitUntil: 'networkidle0' });
+      await page.waitForNavigation({ waitUntil: 'networkidle0' }).catch(() => {});
 
       page.on('console', (msg) => {
         if (msg.type() === 'error') {
@@ -93,7 +94,7 @@ class GenPdf {
         }
       });
 
-      await tools.attendiNSecondi(8);
+      await tools.attendiNSecondi(6);
       let success = false;
       let numTentativi1 = 0;
       while (numTentativi1 < maxTentativi) {

src/server/router/admin_router.js

@@ -282,7 +282,6 @@ async function diagnosePDFProblem() {
   }
 }
 
-
 // ALTERNATIVA 1: Usando child_process direttamente
 async function convertPDF_ChildProcess(inputFile, outputFile, width, height, compressionLevel = 'screen') {
   const { spawn } = require('child_process');
@@ -306,39 +305,35 @@ async function convertPDF_ChildProcess(inputFile, outputFile, width, height, com
 
   // const widthPt = Math.round(width * 28.34646);
   // const heightPt = Math.round(height * 28.34646);
-  const widthPt = Math.round(width * 28.34646* 10);
+  const widthPt = Math.round(width * 28.34646 * 10);
   const heightPt = Math.round(height * 28.34646 * 10);
 
   // Parametri di compressione ottimizzati
   const compressionSettings = {
-    'maximum': [
+    maximum: [
       '-dPDFSETTINGS=/screen',
       '-dDownsampleColorImages=true',
       '-dColorImageResolution=72',
       '-dDownsampleGrayImages=true',
       '-dGrayImageResolution=72',
       '-dDownsampleMonoImages=true',
-      '-dMonoImageResolution=72'
+      '-dMonoImageResolution=72',
     ],
-    'high': [
+    high: [
       '-dPDFSETTINGS=/ebook',
       '-dDownsampleColorImages=true',
       '-dColorImageResolution=150',
       '-dDownsampleGrayImages=true',
-      '-dGrayImageResolution=150'
+      '-dGrayImageResolution=150',
     ],
-    'printer': [
+    printer: ['-dPDFSETTINGS=/printer', '-dDownsampleColorImages=true', '-dColorImageResolution=300'],
-      '-dPDFSETTINGS=/printer',
+    screen: [
-      '-dDownsampleColorImages=true',
-      '-dColorImageResolution=300'
-    ],
-    'screen': [
       '-dPDFSETTINGS=/screen',
       '-dDownsampleColorImages=true',
       '-dColorImageResolution=96',
       '-dDownsampleGrayImages=true',
-      '-dGrayImageResolution=96'
+      '-dGrayImageResolution=96',
-    ]
+    ],
   };
 
   return new Promise((resolve, reject) => {
@@ -351,7 +346,7 @@ async function convertPDF_ChildProcess(inputFile, outputFile, width, height, com
       '-dSAFER',
 
       // Parametri di compressione
-      ...compressionSettings[compressionLevel] || compressionSettings['screen'],
+      ...(compressionSettings[compressionLevel] || compressionSettings['screen']),
       '-dCompressFonts=true',
       '-dSubsetFonts=true',
       '-dColorImageFilter=/DCTEncode',
@@ -365,14 +360,14 @@ async function convertPDF_ChildProcess(inputFile, outputFile, width, height, com
 
       // Output
       `-sOutputFile=${outputFile}`,
-      inputFile
+      inputFile,
     ];
 
     console.log('Spawning gs with compression args:', args.join(' '));
 
     const gsProcess = spawn('gs', args, {
       stdio: ['ignore', 'pipe', 'pipe'],
-      shell: process.platform === 'win32'
+      shell: process.platform === 'win32',
     });
 
     let stdout = '';
@@ -380,7 +375,8 @@ async function convertPDF_ChildProcess(inputFile, outputFile, width, height, com
 
     gsProcess.stdout.on('data', (data) => {
       stdout += data.toString();
-      if (stdout.length < 1000) { // Evita log troppo lunghi
+      if (stdout.length < 1000) {
+        // Evita log troppo lunghi
         console.log('GS OUT:', data.toString().trim());
       }
     });
@@ -405,7 +401,7 @@ async function convertPDF_ChildProcess(inputFile, outputFile, width, height, com
               try {
                 const originalStats = await tools.getFileStatsAsync(inputFile);
                 const newStats = await tools.getFileStatsAsync(outputFile);
-                const compressionRatio = ((originalStats.size - newStats.size) / originalStats.size * 100).toFixed(1);
+                const compressionRatio = (((originalStats.size - newStats.size) / originalStats.size) * 100).toFixed(1);
 
                 console.log(`📁 File originale: ${(originalStats.size / 1024 / 1024).toFixed(2)} MB`);
                 console.log(`📁 File compresso: ${(newStats.size / 1024 / 1024).toFixed(2)} MB`);
@@ -631,6 +627,7 @@ router.post('/online-pdf', authenticate, async (req, res) => {
 
   try {
     let myrec = null;
+
     // Aggiorna il PDF OnLine, copiando il file da Generato a OnLine
     if (id_catalog) {
       myrec = await Catalog.findOne({ _id: id_catalog });
@@ -645,7 +642,7 @@ router.post('/online-pdf', authenticate, async (req, res) => {
       if (stampa) {
         myrec.pdf_online_stampa = myrec.pdf_generato_stampa.replace('_generato', '');
       } else {
-        myrec.pdf_online = myrec.pdf_generato.replace('_generato', '');
+        myrec.pdf_online = myrec.pdf_generato?.replace('_generato', '');
       }
 
       // Aggiorna il PDF OnLine, copiando il file da Generato a OnLine
@@ -699,9 +696,11 @@ async function JoinPDFCatalogs(cataloghi, options, outputFile, stampa) {
     for (let id_catalog of cataloghi) {
       let catalog = await Catalog.findOne({ _id: id_catalog });
       if (catalog) {
-        let filename = stampa ? catalog.pdf_generato_stampa : catalog.pdf_generato;
+        let filename = stampa ? catalog.pdf_online_stampa : catalog.pdf_online;
         if (filename) {
-          const pdfBytes = await fs.promises.readFile(options.mydir + filename);
+          let myfile = tools.fixFilePath(options.mydir + '/' + filename);
+          if (await tools.isFileExistsAsync(myfile)) {
+            const pdfBytes = await fs.promises.readFile(myfile);
             const pdf = await PDFDocument.load(pdfBytes);
             const pages = pdf.getPages();
             const copiedPages = await pdfDoc.copyPages(
@@ -711,6 +710,7 @@ async function JoinPDFCatalogs(cataloghi, options, outputFile, stampa) {
             for (let page of copiedPages) {
               pdfDoc.addPage(page);
             }
+          }
         } else {
           console.log('ATTENZIONE! Catalogo non ancora Generato ! ', catalog.title);
         }
@@ -725,6 +725,12 @@ async function JoinPDFCatalogs(cataloghi, options, outputFile, stampa) {
     const outputFilename = path.basename(outputFile);
     const outputPath = path.join(options.dir_out, outputFilename);
 
+    if (await tools.isFileExistsAsync(outputFile)) {
+      console.log('✅ Catalogo Completo Generato correttamente ! ', outputFile);
+    } else {
+      console.log('❌ Catalogo non generato ! ', outputFile);
+    }
+
     const ris = {
       outputPath,
     };
@@ -746,7 +752,8 @@ router.post('/join-pdf', authenticate, async (req, res) => {
   options.mydir = tools.getdirByIdApp(idapp);
 
   try {
-    const full_dir_out = tools.getdirByIdApp(options.idapp) + '/' + options.dir_out;
+    const mydirpath = tools.getdirByIdApp(options.idapp);
+    const full_dir_out = tools.fixFilePath(path.join(mydirpath, options.dir_out));
     await fs.promises.mkdir(full_dir_out, { recursive: true });
 
     // Aggiorna il PDF OnLine, copiando il file da Generato a OnLine
@@ -767,13 +774,16 @@ router.post('/join-pdf', authenticate, async (req, res) => {
         const ris_stampa = await JoinPDFCatalogs(cataloghi, options, outputFileStampa, true);
         if (ris_stampa) {
           raccolta.pdf_generato_stampa = ris_stampa.outputPath;
+          let myfilecheckstampa = path.join(mydirpath, ris_stampa.outputPath);
+          raccolta.pdf_generato_stampa_size = await tools.getSizeFile(myfilecheckstampa);
         }
       } else {
         // Creazione file per WEB
         const ris = await JoinPDFCatalogs(cataloghi, options, outputFile, false);
         if (ris) {
           raccolta.pdf_generato = ris.outputPath;
-          raccolta.pdf_generato_size = await tools.getSizeFile(ris.outputPath);
+          let myfilecheck = path.join(mydirpath, ris.outputPath);
+          raccolta.pdf_generato_size = await tools.getSizeFile(myfilecheck);
         }
       }
 
@@ -2663,5 +2673,4 @@ router.post('/generate-pdf', async (req, res) => {
   }
 });
 
-
 module.exports = router;

src/server/router/users_router.js

@@ -1173,7 +1173,7 @@ router.post('/dbop', authenticate, async (req, res) => {
   idapp = req.body.idapp;
   locale = req.body.locale;
 
-  if (!User.isAdmin(req.user.perm)) {
+  if (!User.isCollaboratore(req.user.perm)) {
     return res.status(404).send({ code: server_constants.RIS_CODE_ERR_UNAUTHORIZED });
   }
 

src/server/tools/general.js

@@ -6186,5 +6186,9 @@ module.exports = {
 
   async attendiNSecondi(numsec) {
     await new Promise(resolve => setTimeout(resolve, numsec * 1000));
-  }
+  },
+
+  fixFilePath(myfilepath) {
+    return myfilepath.replace(/\\/g, '/');
+  },
 };