Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on May 29, 2023. It is now read-only.
/workersPublic archive

Commitf181bbd

Browse files
committed
fix: add termination of unused workers
If pipe is destroyed a worker will be terminated
1 parent8acee38 commitf181bbd

File tree

2 files changed

+39
-11
lines changed

2 files changed

+39
-11
lines changed

‎projects/workers/src/worker/pipes/worker.pipe.spec.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,18 @@ describe('WorkerPipe', () => {
3232

3333
expect(worker).not.toEqual(differentWorker);
3434
});
35+
36+
it('should terminate a previous worker',async()=>{
37+
constworker=awaitpipe.transform('a',(data:unknown)=>data);
38+
39+
awaitpipe.transform('a',(data:unknown)=>data);
40+
awaitexpectAsync(worker.toPromise()).toBeResolved();
41+
});
42+
43+
it('should terminate a worker then a pipe is destroyed',async()=>{
44+
constworker=awaitpipe.transform('a',(data:unknown)=>data);
45+
46+
pipe.ngOnDestroy();
47+
awaitexpectAsync(worker.toPromise()).toBeResolved();
48+
});
3549
});
Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import{Pipe,PipeTransform}from'@angular/core';
1+
import{OnDestroy,Pipe,PipeTransform}from'@angular/core';
22
import{Observable}from'rxjs';
33
import{WebWorker}from'../classes/web-worker';
44
import{toData}from'../operators/to-data';
@@ -7,21 +7,35 @@ import {WorkerFunction} from '../types/worker-function';
77
@Pipe({
88
name:'waWorker',
99
})
10-
exportclassWorkerPipeimplementsPipeTransform{
11-
privateworkers=newWeakMap<WorkerFunction,WebWorker>();
12-
privateobservers=newWeakMap<WebWorker,Observable<any>>();
10+
exportclassWorkerPipeimplementsPipeTransform,OnDestroy{
11+
privatefn!:WorkerFunction;
12+
privateworker!:WebWorker;
13+
privateobserver!:Observable<any>;
1314

1415
transform<T,R>(value:T,fn:WorkerFunction<T,R>):Observable<R>{
15-
constworker:WebWorker<T,R>=
16-
this.workers.get(fn)||WebWorker.fromFunction(fn);
16+
if(this.fn!==fn){
17+
this.terminate();
18+
this.initNewWorker(fn);
1719

18-
this.workers.set(fn,worker);
19-
worker.postMessage(value);
20+
this.worker.postMessage(value);
21+
}
2022

21-
constobserver=this.observers.get(worker)||worker.pipe(toData());
23+
returnthis.observer;
24+
}
25+
26+
ngOnDestroy():void{
27+
this.terminate();
28+
}
2229

23-
this.observers.set(worker,observer);
30+
privateterminate(){
31+
if(this.worker){
32+
this.worker.terminate();
33+
}
34+
}
2435

25-
returnobserver;
36+
privateinitNewWorker<T,R>(fn:WorkerFunction<T,R>){
37+
this.fn=fn;
38+
this.worker=WebWorker.fromFunction(fn);
39+
this.observer=this.worker.pipe(toData());
2640
}
2741
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp