From 3db124bc41289fe171bbdbc6a19a83b2770025d5 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sat, 15 Oct 2022 00:40:57 +0530 Subject: [PATCH] rename heicConvertor to wasmHeicConvertor --- .../wasmHEICConverterClient.ts} | 0 .../wasmHEICConverterService.ts} | 7 ++++--- src/worker/convert.worker.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) rename src/services/{heicConverter/heicConverterClient.ts => wasmHeicConverter/wasmHEICConverterClient.ts} (100%) rename src/services/{heicConverter/heicConverterService.ts => wasmHeicConverter/wasmHEICConverterService.ts} (96%) diff --git a/src/services/heicConverter/heicConverterClient.ts b/src/services/wasmHeicConverter/wasmHEICConverterClient.ts similarity index 100% rename from src/services/heicConverter/heicConverterClient.ts rename to src/services/wasmHeicConverter/wasmHEICConverterClient.ts diff --git a/src/services/heicConverter/heicConverterService.ts b/src/services/wasmHeicConverter/wasmHEICConverterService.ts similarity index 96% rename from src/services/heicConverter/heicConverterService.ts rename to src/services/wasmHeicConverter/wasmHEICConverterService.ts index bc478e0b8..cd6466d73 100644 --- a/src/services/heicConverter/heicConverterService.ts +++ b/src/services/wasmHeicConverter/wasmHEICConverterService.ts @@ -11,6 +11,7 @@ const MAX_CONVERSION_IN_PARALLEL = 1; const WAIT_TIME_BEFORE_NEXT_ATTEMPT_IN_MICROSECONDS = [100, 100]; const WAIT_TIME_IN_MICROSECONDS = 30 * 1000; const BREATH_TIME_IN_MICROSECONDS = 1000; +const CONVERT_FORMAT = 'JPEG'; class HEICConverter { private convertProcessor = new QueueProcessor( @@ -22,13 +23,13 @@ class HEICConverter { constructor() { this.ready = this.init(); } - async init() { + private async init() { this.workerPool = []; for (let i = 0; i < WORKER_POOL_SIZE; i++) { this.workerPool.push(await createNewConvertWorker()); } } - async convert(fileBlob: Blob, format = 'JPEG'): Promise { + async convert(fileBlob: Blob): Promise { await this.ready; const response = this.convertProcessor.queueUpRequest(() => retryAsyncFunction(async () => { @@ -45,7 +46,7 @@ class HEICConverter { const convertedHEIC: Blob = await comlink.convertHEIC( fileBlob, - format + CONVERT_FORMAT ); addLogLine( `originalFileSize:${makeHumanReadableStorage( diff --git a/src/worker/convert.worker.js b/src/worker/convert.worker.js index ee1a7ca55..2fb86bf14 100644 --- a/src/worker/convert.worker.js +++ b/src/worker/convert.worker.js @@ -1,5 +1,5 @@ import * as Comlink from 'comlink'; -import { convertHEIC } from 'services/heicConverter/heicConverterClient'; +import { convertHEIC } from 'services/wasmHeicConverter/wasmHEICConverterService.ts'; export class Convert { async convertHEIC(fileBlob, format) {