libreoffice-convert 1.6.0 → 1.7.0

package/Readme.md

@@ -4,7 +4,8 @@ A simple and fast node.js module for converting office documents to different fo
 
 ## Dependency
 
-Please install libreoffice in /Applications (Mac), with your favorite package manager (Linux), or with the msi (Windows).
+Please install libreoffice in /Applications (Mac), with your favorite package manager (Linux), or with the msi (Windows)
+(On Windows, add `PROGRAMFILES` environment variable for Windows program files path to your local project)
 
 ## Usage example
 

package/index.js

@@ -24,9 +24,12 @@ const convertWithOptions = (document, format, filter, options, callback) => {
                     break;
                 case 'win32': paths = [
                     ...paths,
-                    path.join(process.env['PROGRAMFILES(X86)'], 'LIBREO~1/program/soffice.exe'),
-                    path.join(process.env['PROGRAMFILES(X86)'], 'LibreOffice/program/soffice.exe'),
-                    path.join(process.env.PROGRAMFILES, 'LibreOffice/program/soffice.exe'),
+                    path.join(process.env['PROGRAMFILES(X86)'] || '', 'LIBREO~1/program/soffice.exe'),
+                    path.join(process.env['PROGRAMFILES(X86)'] || '', 'LibreOffice/program/soffice.exe'),
+                    path.join(process.env.PROGRAMFILES_X86 || '', 'LibreOffice/program/soffice.exe'),
+                    path.join(process.env.PROGRAMFILES || '', 'LibreOffice/program/soffice.exe'),  
+                    process.env.LIBRE_OFFICE_EXE || '',
+                     'C:/Program Files/LibreOffice/program/soffice.exe'
                 ];
                     break;
                 default:
@@ -58,7 +61,12 @@ const convertWithOptions = (document, format, filter, options, callback) => {
             args.push(tempDir.name);
             args.push(path.join(tempDir.name, fileName));
           
-            return execFile(results.soffice, args, execOptions, callback);
+            return execFile(results.soffice, args, execOptions, (err, stdout, stderr) => {
+                // warnings might also be emitted to stderr
+                if (stderr && stderr.toLowerCase().includes('error'))
+                    callback(new Error('Error calling soffice: ' + stderr));
+                else callback(err, stdout, stderr);
+            });
         }],
         loadDestination: ['convert', (results, callback) =>
             async.retry({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libreoffice-convert",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "A simple and fast node.js module for converting office documents to different formats",
   "main": "index.js",
   "types": "index.d.ts",

package/tests/convert.test.js

@@ -31,4 +31,14 @@ describe('convert', () => {
             convert(docx, 'txt', undefined, expectHello(done));
         }, 100);
     });
+
+    it('should fail when libreoffice encounters an error', (done) => {
+        // call with invalid document: a buffer starting with PNG header but data is missing
+        const badPng = Buffer.from([0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A]);
+        convert(badPng, 'txt', undefined, (err, result) => {
+            expect(err).toBeInstanceOf(Error);
+            expect(err.message).toMatch(/Error calling soffice:/);
+            done();
+        });
+    });
 });