diff options
author | Florian Dold <florian.dold@gmail.com> | 2019-08-15 19:10:23 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2019-08-15 19:10:23 +0200 |
commit | 61bc36b90aed99d161b28b9bc1742e7e1599546a (patch) | |
tree | f5b8c6048e1de577860ddf2313cbe38efbe7dd88 /src/crypto/cryptoApi.ts | |
parent | 05e32fd8552c316c4d1d5b84bb565c31575a579d (diff) | |
download | wallet-core-61bc36b90aed99d161b28b9bc1742e7e1599546a.tar.xz |
use factory instead of startWorker
Diffstat (limited to 'src/crypto/cryptoApi.ts')
-rw-r--r-- | src/crypto/cryptoApi.ts | 88 |
1 files changed, 72 insertions, 16 deletions
diff --git a/src/crypto/cryptoApi.ts b/src/crypto/cryptoApi.ts index 5e3237836..accebd651 100644 --- a/src/crypto/cryptoApi.ts +++ b/src/crypto/cryptoApi.ts @@ -39,9 +39,7 @@ import { ContractTerms, PaybackRequest } from "../talerTypes"; import { BenchmarkResult, CoinWithDenom, PayCoinInfo } from "../walletTypes"; import * as timer from "../timer"; - -import { startWorker } from "./startWorker"; -import { throws } from "assert"; +import { string } from "prop-types"; /** * State of a crypto worker. @@ -50,7 +48,7 @@ interface WorkerState { /** * The actual worker thread. */ - w: Worker | null; + w: CryptoWorker | null; /** * Work we're currently executing or null if not busy. @@ -86,6 +84,67 @@ interface WorkItem { */ const NUM_PRIO = 5; +interface CryptoWorker { + postMessage(message: any): void; + + terminate(): void; + + onmessage: (m: any) => void; + onerror: (m: any) => void; +} + +export interface CryptoWorkerFactory { + /** + * Start a new worker. + */ + startWorker(): CryptoWorker; + + /** + * Query the number of workers that should be + * run at the same time. + */ + getConcurrency(): number +} + + +export class NodeCryptoWorkerFactory implements CryptoWorkerFactory { + startWorker(): CryptoWorker { + if (typeof require === "undefined") { + throw Error("cannot make worker, require(...) not defined"); + } + const workerCtor = require("./nodeWorker").Worker; + const workerPath = __dirname + "/cryptoWorker.js"; + return new workerCtor(workerPath); + } + + getConcurrency(): number { + return 2; + } +} + + +export class BrowserCryptoWorkerFactory implements CryptoWorkerFactory { + startWorker(): CryptoWorker { + const workerCtor = Worker; + const workerPath = "/dist/cryptoWorker-bundle.js"; + return new workerCtor(workerPath) as CryptoWorker; + } + + getConcurrency(): number { + let concurrency = 2; + try { + // only works in the browser + // tslint:disable-next-line:no-string-literal + concurrency = (navigator as any)["hardwareConcurrency"]; + concurrency = Math.max(1, Math.ceil(concurrency / 2)); + } catch (e) { + concurrency = 2; + } + return concurrency; + } +} + + /** * Crypto API that interfaces manages a background crypto thread * for the execution of expensive operations. @@ -94,6 +153,9 @@ export class CryptoApi { private nextRpcId: number = 1; private workers: WorkerState[]; private workQueues: WorkItem[][]; + + private workerFactory: CryptoWorkerFactory; + /** * Number of busy workers. */ @@ -106,6 +168,7 @@ export class CryptoApi { public enableTracing = false; + /** * Terminate all worker threads. */ @@ -146,7 +209,7 @@ export class CryptoApi { ws.currentWorkItem = work; this.numBusy++; if (!ws.w) { - const w = startWorker(); + const w = this.workerFactory.startWorker(); w.onmessage = (m: MessageEvent) => this.handleWorkerMessage(ws, m); w.onerror = (e: ErrorEvent) => this.handleWorkerError(ws, e); ws.w = w; @@ -239,17 +302,9 @@ export class CryptoApi { currentWorkItem.resolve(msg.data.result); } - constructor() { - let concurrency = 2; - try { - // only works in the browser - // tslint:disable-next-line:no-string-literal - concurrency = (navigator as any)["hardwareConcurrency"]; - concurrency = Math.max(1, Math.ceil(concurrency / 2)); - } catch (e) { - // ignore - } - this.workers = new Array<WorkerState>(concurrency); + constructor(workerFactory: CryptoWorkerFactory) { + this.workerFactory = workerFactory; + this.workers = new Array<WorkerState>(workerFactory.getConcurrency()); for (let i = 0; i < this.workers.length; i++) { this.workers[i] = { @@ -258,6 +313,7 @@ export class CryptoApi { w: null, }; } + this.workQueues = []; for (let i = 0; i < NUM_PRIO; i++) { this.workQueues.push([]); |