Merge pull request #84 from KnorpelSenf/housekeeping

Housekeeping

Author: josiasmontag

lib/CloudConvert.ts

@@ -1,7 +1,7 @@
-import axios, { AxiosInstance } from 'axios';
+import axios, { type AxiosInstance } from 'axios';
 import io from 'socket.io-client';
-import JobsResource, { JobEventData } from './JobsResource';
-import TasksResource, { TaskEventData } from './TasksResource';
+import JobsResource, { type JobEventData } from './JobsResource';
+import TasksResource, { type TaskEventData } from './TasksResource';
 import UsersResource from './UsersResource';
 import WebhooksResource from './WebhooksResource';
 import { version } from '../package.json';
@@ -35,11 +35,8 @@ export default class CloudConvert {
                 ? 'https://api.sandbox.cloudconvert.com/v2/'
                 : 'https://api.cloudconvert.com/v2/',
             headers: {
-                Authorization: 'Bearer ' + this.apiKey,
-                'User-Agent':
-                    'cloudconvert-node/v' +
-                    version +
-                    ' (https://github.com/cloudconvert/cloudconvert-node)'
+                Authorization: `Bearer ${this.apiKey}`,
+                'User-Agent': `cloudconvert-node/v${version} (https://github.com/cloudconvert/cloudconvert-node)`
             }
         });
     }
@@ -48,8 +45,8 @@ export default class CloudConvert {
         this.tasks = new TasksResource(this);
         this.jobs = new JobsResource(this);
         this.users = new UsersResource(this);
-        this.webhooks = new WebhooksResource(this);
-        this.signedUrls = new SignedUrlResource(this);
+        this.webhooks = new WebhooksResource();
+        this.signedUrls = new SignedUrlResource();
     }
 
     subscribe(
@@ -76,7 +73,7 @@ export default class CloudConvert {
                 channel,
                 auth: {
                     headers: {
-                        Authorization: 'Bearer ' + this.apiKey
+                        Authorization: `Bearer ${this.apiKey}`
                     }
                 }
             });

lib/JobsResource.ts

@@ -1,5 +1,10 @@
 import CloudConvert from './CloudConvert';
-import { Operation, Task, TaskEventData, TaskStatus } from './TasksResource';
+import {
+    type Operation,
+    type Task,
+    type TaskEventData,
+    type TaskStatus
+} from './TasksResource';
 
 export type JobEvent = 'created' | 'updated' | 'finished' | 'failed';
 export type JobStatus = 'processing' | 'finished' | 'error';
@@ -31,14 +36,14 @@ export default class JobsResource {
     }
 
     async get(id: string, query = null): Promise<Job> {
-        const response = await this.cloudConvert.axios.get('jobs/' + id, {
+        const response = await this.cloudConvert.axios.get(`jobs/${id}`, {
             params: query || {}
         });
         return response.data.data;
     }
 
     async wait(id: string): Promise<Job> {
-        const response = await this.cloudConvert.axios.get('jobs/' + id, {
+        const response = await this.cloudConvert.axios.get(`jobs/${id}`, {
             baseURL: this.cloudConvert.useSandbox
                 ? 'https://sync.api.sandbox.cloudconvert.com/v2/'
                 : 'https://sync.api.cloudconvert.com/v2/'
@@ -68,7 +73,7 @@ export default class JobsResource {
     }
 
     async delete(id: string): Promise<void> {
-        await this.cloudConvert.axios.delete('jobs/' + id);
+        await this.cloudConvert.axios.delete(`jobs/${id}`);
     }
 
     async subscribeEvent(
@@ -77,8 +82,8 @@ export default class JobsResource {
         callback: (event: JobEventData) => void
     ): Promise<void> {
         this.cloudConvert.subscribe(
-            'private-job.' + id,
-            'job.' + event,
+            `private-job.${id}`,
+            `job.${event}`,
             callback
         );
     }
@@ -89,8 +94,8 @@ export default class JobsResource {
         callback: (event: TaskEventData) => void
     ): Promise<void> {
         this.cloudConvert.subscribe(
-            'private-job.' + id + '.tasks',
-            'task.' + event,
+            `private-job.${id}.tasks`,
+            `task.${event}`,
             callback
         );
     }
@@ -130,4 +135,5 @@ interface TaskContainer {
 export interface JobTemplate {
     tasks: TaskContainer;
     tag?: string;
+    webhook_url?: string;
 }

lib/SignedUrlResource.ts

@@ -1,37 +1,30 @@
 import * as crypto from 'crypto';
-import CloudConvert from './CloudConvert';
-import { JobTemplate } from './JobsResource';
+import { type JobTemplate } from './JobsResource';
 
 export default class SignedUrlResource {
-    private readonly cloudConvert: CloudConvert;
-
-    constructor(cloudConvert: CloudConvert) {
-        this.cloudConvert = cloudConvert;
-    }
-
     sign(
         base: string,
         signingSecret: string,
         job: JobTemplate,
         cacheKey: string | null
     ): string {
         const json = JSON.stringify(job);
-        const base64 = new Buffer(json || '').toString('base64');
+        const base64 = Buffer.from(json || '').toString('base64');
         const base64UrlSafe = base64
             .replace('+', '-')
             .replace('/', '_')
             .replace(/=+$/, '');
 
-        let url = base + '?job=' + base64UrlSafe;
+        let url = `${base}?job=${base64UrlSafe}`;
 
         if (cacheKey) {
-            url += '&cache_key=' + cacheKey;
+            url += `&cache_key=${cacheKey}`;
         }
 
         const hmac = crypto.createHmac('sha256', signingSecret);
         const signature = hmac.update(Buffer.from(url, 'utf-8')).digest('hex');
 
-        url += '&s=' + signature;
+        url += `&s=${signature}`;
 
         return url;
     }