X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Futility-types.ts;h=fb0e435a81ac949b0b82740f1b17c1561bd9d762;hb=a3f5f781d7f502c040dd2baacd225f308446bff6;hp=2d142f860e4b19893a131e7cbc872abda5f8270a;hpb=38e795c12f0e9daeff7b025147f36f85f486366e;p=poolifier.git

diff --git a/src/utility-types.ts b/src/utility-types.ts
index 2d142f86..fb0e435a 100644
--- a/src/utility-types.ts
+++ b/src/utility-types.ts
@@ -1,28 +1,26 @@
-import type { Worker as ClusterWorker } from 'cluster'
-import type { MessagePort } from 'worker_threads'
-import type { IPoolWorker } from './pools/pool-worker'
+import type { Worker as ClusterWorker } from 'node:cluster'
+import type { MessagePort } from 'node:worker_threads'
 import type { KillBehavior } from './worker/worker-options'
+import type { IWorker, Task } from './pools/worker'
 
 /**
  * Make all properties in T non-readonly.
+ *
+ * @typeParam T - Type in which properties will be non-readonly.
  */
 export type Draft<T> = { -readonly [P in keyof T]?: T[P] }
 
 /**
- * Message object that is passed between worker and main worker.
+ * Message object that is passed between main worker and worker.
+ *
+ * @typeParam Data - Type of data sent to the worker. This can only be serializable data.
+ * @typeParam MainWorker - Type of main worker.
+ * @internal
  */
 export interface MessageValue<
   Data = unknown,
   MainWorker extends ClusterWorker | MessagePort | unknown = unknown
-> {
-  /**
-   * Input data that will be passed to the worker.
-   */
-  readonly data?: Data
-  /**
-   * Id of the message.
-   */
-  readonly id?: number
+> extends Task<Data> {
   /**
    * Kill code.
    */
@@ -32,25 +30,24 @@ export interface MessageValue<
    */
   readonly error?: string
   /**
-   * Task runtime.
+   * Runtime.
    */
-  readonly taskRunTime?: number
+  readonly runTime?: number
   /**
    * Reference to main worker.
-   *
-   * Only for internal use.
    */
   readonly parent?: MainWorker
 }
 
 /**
- * An object holding the worker that will be used to resolve/rejects the promise later on.
+ * An object holding the execution response promise resolve/reject callbacks.
  *
  * @typeParam Worker - Type of worker.
- * @typeParam Response - Type of response of execution. This can only be serializable data.
+ * @typeParam Response - Type of execution response. This can only be serializable data.
+ * @internal
  */
-export interface PromiseWorkerResponseWrapper<
-  Worker extends IPoolWorker,
+export interface PromiseResponseWrapper<
+  Worker extends IWorker,
   Response = unknown
 > {
   /**
@@ -62,7 +59,7 @@ export interface PromiseWorkerResponseWrapper<
    */
   readonly reject: (reason?: string) => void
   /**
-   * The worker that has the assigned task.
+   * The worker handling the execution.
    */
   readonly worker: Worker
 }