|
@@ -4,6 +4,13 @@ export class KokoroWorker {
|
|
|
private worker: Worker | null = null;
|
|
|
private initialized: boolean = false;
|
|
|
private dtype: string;
|
|
|
+ private requestQueue: Array<{
|
|
|
+ text: string;
|
|
|
+ voice: string;
|
|
|
+ resolve: (value: string) => void;
|
|
|
+ reject: (reason: any) => void;
|
|
|
+ }> = [];
|
|
|
+ private processing = false; // To track if a request is being processed
|
|
|
|
|
|
constructor(dtype: string = 'fp32') {
|
|
|
this.dtype = dtype;
|
|
@@ -17,24 +24,49 @@ export class KokoroWorker {
|
|
|
|
|
|
this.worker = new WorkerInstance();
|
|
|
|
|
|
- return new Promise<void>((resolve, reject) => {
|
|
|
- this.worker!.onmessage = (event) => {
|
|
|
- const { status, error } = event.data;
|
|
|
+ // Handle worker messages
|
|
|
+ this.worker.onmessage = (event) => {
|
|
|
+ const { status, error, audioUrl } = event.data;
|
|
|
|
|
|
- if (status === 'init:complete') {
|
|
|
- this.initialized = true;
|
|
|
- resolve();
|
|
|
- } else if (status === 'init:error') {
|
|
|
- console.error(error);
|
|
|
- this.initialized = false;
|
|
|
- reject(new Error(error));
|
|
|
+ if (status === 'init:complete') {
|
|
|
+ this.initialized = true;
|
|
|
+ } else if (status === 'init:error') {
|
|
|
+ console.error(error);
|
|
|
+ this.initialized = false;
|
|
|
+ } else if (status === 'generate:complete') {
|
|
|
+ // Resolve promise from queue
|
|
|
+ const request = this.requestQueue.shift();
|
|
|
+ if (request) {
|
|
|
+ request.resolve(audioUrl);
|
|
|
+ this.processNextRequest(); // Process next request in queue
|
|
|
}
|
|
|
- };
|
|
|
+ } else if (status === 'generate:error') {
|
|
|
+ const request = this.requestQueue.shift();
|
|
|
+ if (request) {
|
|
|
+ request.reject(new Error(error));
|
|
|
+ this.processNextRequest(); // Continue processing next in queue
|
|
|
+ }
|
|
|
+ }
|
|
|
+ };
|
|
|
|
|
|
+ return new Promise<void>((resolve, reject) => {
|
|
|
this.worker!.postMessage({
|
|
|
type: 'init',
|
|
|
payload: { dtype: this.dtype }
|
|
|
});
|
|
|
+
|
|
|
+ const handleMessage = (event: MessageEvent) => {
|
|
|
+ if (event.data.status === 'init:complete') {
|
|
|
+ this.worker!.removeEventListener('message', handleMessage);
|
|
|
+ this.initialized = true;
|
|
|
+ resolve();
|
|
|
+ } else if (event.data.status === 'init:error') {
|
|
|
+ this.worker!.removeEventListener('message', handleMessage);
|
|
|
+ reject(new Error(event.data.error));
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
+ this.worker!.addEventListener('message', handleMessage);
|
|
|
});
|
|
|
}
|
|
|
|
|
@@ -44,20 +76,22 @@ export class KokoroWorker {
|
|
|
}
|
|
|
|
|
|
return new Promise<string>((resolve, reject) => {
|
|
|
- this.worker.postMessage({ type: 'generate', payload: { text, voice } });
|
|
|
+ this.requestQueue.push({ text, voice, resolve, reject });
|
|
|
+ if (!this.processing) {
|
|
|
+ this.processNextRequest();
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
- const handleMessage = (event: MessageEvent) => {
|
|
|
- if (event.data.status === 'generate:complete') {
|
|
|
- this.worker!.removeEventListener('message', handleMessage);
|
|
|
- resolve(event.data.audioUrl);
|
|
|
- } else if (event.data.status === 'generate:error') {
|
|
|
- this.worker!.removeEventListener('message', handleMessage);
|
|
|
- reject(new Error(event.data.error));
|
|
|
- }
|
|
|
- };
|
|
|
+ private processNextRequest() {
|
|
|
+ if (this.requestQueue.length === 0) {
|
|
|
+ this.processing = false;
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- this.worker.addEventListener('message', handleMessage);
|
|
|
- });
|
|
|
+ this.processing = true;
|
|
|
+ const { text, voice } = this.requestQueue[0]; // Get first request but don't remove yet
|
|
|
+ this.worker!.postMessage({ type: 'generate', payload: { text, voice } });
|
|
|
}
|
|
|
|
|
|
public terminate() {
|
|
@@ -65,6 +99,8 @@ export class KokoroWorker {
|
|
|
this.worker.terminate();
|
|
|
this.worker = null;
|
|
|
this.initialized = false;
|
|
|
+ this.requestQueue = [];
|
|
|
+ this.processing = false;
|
|
|
}
|
|
|
}
|
|
|
}
|