libreoffice-convert 1.6.1 → 1.8.0

package/index.js

@@ -61,13 +61,18 @@ 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({
                 times: asyncOptions.times || 3,
                 interval: asyncOptions.interval || 200
-            }, (callback) => fs.readFile(path.join(tempDir.name, `${fileName}.${format.split(":")[0]}`), callback), callback)
+            }, (callback) => fs.readFile(path.join(tempDir.name, `${fileName.slice(0, fileName.length - path.extname(fileName).length)}.${format.split(":")[0]}`), callback), callback)
         ]
     }).then( (res) => {
         return callback(null, res.loadDestination);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libreoffice-convert",
-  "version": "1.6.1",
+  "version": "1.8.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

@@ -2,7 +2,8 @@ var _jest = require('jest'),
     _fs = require('fs'),
     _path = require('path'),
     { exec } = require('child_process'),
-    convert = require('../index').convert;
+    convert = require('../index').convert
+    convertWithOptions = require('../index').convertWithOptions;
 
 describe('convert', () => {
     function expectHello(done) {
@@ -22,6 +23,12 @@ describe('convert', () => {
     });
 
 
+    it('should convert a word document to text with options', (done) => {
+        const docx = _fs.readFileSync(_path.join(__dirname, '/resources/hello.docx'));
+        convertWithOptions(docx, 'txt', undefined, { fileName: 'hello.docx' }, expectHello(done));
+    });
+
+
     it('if an another instance of soffice exists, should convert a word document to text',  (done) => {
         exec("soffice  --headless")
         // this command create an instance of soffice. This instance will get a failure "Error: source file could not be loaded"
@@ -31,4 +38,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();
+        });
+    });
 });