add job/task wait() method

Author: josiasmontag

README.md

@@ -32,7 +32,7 @@ import CloudConvert from 'cloudconvert';
 
 const cloudConvert = new CloudConvert('api_key');
 
-const job = await cloudConvert.jobs.create({
+let job = await cloudConvert.jobs.create({
     'tasks': {
         'import-my-file': {
             'operation': 'import/url',
@@ -53,6 +53,29 @@ const job = await cloudConvert.jobs.create({
 ```
 You can use the [CloudConvert Job Builder](https://cloudconvert.com/api/v2/jobs/builder) to see the available options for the various task types.
 
+## Downloading Files
+
+CloudConvert can generate public URLs for using `export/url` tasks. You can use these URLs to download output files.
+
+```js
+job = await cloudConvert.jobs.wait(job.id); // Wait for job completion
+
+const exportTask = job.tasks.filter(task => task.operation === 'export/url')[0];
+const file = exportTask.result.files[0];
+
+const writeStream = fs.createWriteStream('./my-output.ext');
+
+const response = await axios(file.url, {
+    responseType: 'stream'
+});
+
+response.data.pipe(writeStream);
+
+await new Promise((resolve, reject) => {
+    writeStream.on('finish', resolve);
+    writeStream.on('error', reject);
+});
+```
 
 ## Uploading Files
 
@@ -76,28 +99,6 @@ await cloudConvert.tasks.upload(uploadTask, inputFile);
 ```
 
 
-## Downloading Files
-
-CloudConvert can generate public URLs for using `export/url` tasks. You can use these URLs to download output files.
-
-```js
-const exportTask = job.tasks.filter(task => task.operation === 'export/url')[0];
-const file = exportTask.result.files[0];
-
-const writeStream = fs.createWriteStream('./my-output.ext');
-
-const response = await cloudConvert.axios(file.url, {
-    responseType: 'stream'
-});
-
-response.data.pipe(writeStream);
-
-await new Promise((resolve, reject) => {
-    writeStream.on('finish', resolve);
-    writeStream.on('error', reject);
-});
-```
-
 ## Websocket Events
 
 The node SDK can subscribe to events of the [CloudConvert socket.io API](https://cloudconvert.com/api/v2/socket#socket).

lib/JobsResouce.js

@@ -13,6 +13,11 @@ export default class JobsResource {
         return response.data.data;
     }
 
+    async wait(id) {
+        const response = await this.cloudConvert.axios.get('jobs/' + id + '/wait');
+        return response.data.data;
+    }
+
     async all(query = null) {
         const response = await this.cloudConvert.axios.get('jobs', {
             params: query || {}

lib/TasksResouce.js

@@ -13,6 +13,11 @@ export default class TasksResource {
         return response.data.data;
     }
 
+    async wait(id) {
+        const response = await this.cloudConvert.axios.get('tasks/' + id + '/wait');
+        return response.data.data;
+    }
+
     async all(query = null) {
         const response = await this.cloudConvert.axios.get('tasks', {
             params: query || {}

tests/integration/JobsResourceTest.js

@@ -3,6 +3,7 @@ import {assert} from "chai";
 import * as fs from 'fs';
 import * as os from 'os';
 import apiKey from './ApiKey';
+import axios from "axios";
 
 
 describe('JobsResouce', () => {
@@ -41,15 +42,10 @@ describe('JobsResouce', () => {
 
             await this.cloudConvert.tasks.upload(uploadTask, stream);
 
-            // wait for job finished
-            while (job.status !== 'finished' && job.status !== 'error') {
-                await new Promise(done => setTimeout(done, 1000));
-                job = await this.cloudConvert.jobs.get(job.id);
-            }
+            job = await this.cloudConvert.jobs.wait(job.id);
 
             assert.equal(job.status, 'finished');
 
-
             // download export file
 
             const exportTask = job.tasks.filter(task => task.name === 'export-it')[0];
@@ -59,7 +55,7 @@ describe('JobsResouce', () => {
 
             const writer = fs.createWriteStream(this.tmpPath);
 
-            const response = await this.cloudConvert.axios(file.url, {
+            const response = await axios(file.url, {
                 responseType: 'stream'
             });
 

tests/integration/TasksResourceTest.js

@@ -24,11 +24,7 @@ describe('TasksResouce', () => {
 
             await this.cloudConvert.tasks.upload(task, stream);
 
-            // wait for task finished
-            while(task.status !== 'finished' && task.status !== 'error') {
-                await new Promise(done => setTimeout(done, 1000));
-                task = await this.cloudConvert.tasks.get(task.id);
-            }
+            task = await this.cloudConvert.tasks.wait(task.id);
 
             assert.equal(task.status, 'finished');
             assert.equal(task.result.files[0].filename, 'input.png');