fix: Stop cancelled work item from being queued (#10)

* feat: Add package.json props

* fix: Stop cancelled work item from being queued

Closes #9

Author: webJose

src/workers.d.ts

@@ -57,7 +57,7 @@ export type QueueingOptions = {
 }
 
 export interface IWorker {
-    connect(id: number, processMessage: ProcessMessageFn, resolve: (data: any) => void, reject: (reason: any) => void): DisconnectFn;
+    connect(id: number, processMessage: ProcessMessageFn, resolve: (data: any) => void, reject: (reason: any) => void): DisconnectFn | undefined;
     post(message: AsyncMessage, transferables: Transferable[] | undefined): void;
     terminate(): boolean;
 }

src/workers/InternalSharedWorker.ts

@@ -38,7 +38,7 @@ export class InternalSharedWorker implements IWorker {
         processMessage: ProcessMessageFn,
         resolve: (data: any) => void,
         reject: (reason: any) => void
-    ): DisconnectFn {
+    ): DisconnectFn | undefined {
         const listener = this.#listenerFactory(id, processMessage, resolve);
         this.#worker.port.addEventListener('message', listener);
         this.#worker.port.start();

src/workers/InternalWorker.ts

@@ -36,9 +36,10 @@ export class InternalWorker implements IWorker {
         };
     }
 
-    connect(id: number, processMessage: ProcessMessageFn, resolve: (data: any) => void, reject: (reason: any) => void): DisconnectFn {
+    connect(id: number, processMessage: ProcessMessageFn, resolve: (data: any) => void, reject: (reason: any) => void): DisconnectFn | undefined {
         if (this.#terminated) {
             reject(new WorkerTerminatedMessage(id));
+            return;
         }
         const listener = this.#listenerFactory(id, processMessage, resolve);
         this.#worker.addEventListener('message', listener);

src/workers/WorkItem.ts

@@ -43,6 +43,7 @@ export class WorkItem<TResult> {
         if (this.status === WorkItemStatus.Enqueued) {
             this.#internal.data.reject(new CancelledMessage(true));
         }
-        return this.#internal.cancellationSource || !this.#internal.disconnect;
+        this.#internal.cancelled ||= !!this.#internal.cancellationSource || this.status === WorkItemStatus.Cancelled;
+        return !!this.#internal.cancellationSource || this.status === WorkItemStatus.Cancelled;
     }
 }

src/workers/WorkItemInternal.ts

@@ -9,11 +9,13 @@ export class WorkItemInternal<TResult = any> {
     data;
     options;
     cancellationSource;
+    cancelled;
     status: WorkItemStatusEnum;
     disconnect: DisconnectFn | undefined;
 
     constructor(worker: IWorker, data: WorkItemData<TResult>, options: QueueingOptions | undefined) {
         this.status = WorkItemStatus.Enqueued;
+        this.cancelled = false;
         this.worker = worker;
         this.data = {
             ...data,
@@ -45,15 +47,15 @@ export class WorkItemInternal<TResult = any> {
     }
 
     start() {
-        if (this.cancellationSource && CancellationSource.isSignalled(this.cancellationSource.token)) {
-            return;
-        }
         this.disconnect = this.worker.connect(
             this.data.id,
             this.options?.processMessage ?? this.#defaultProcessMessage.bind(this),
             this.data.resolve,
             this.data.reject
         );
+        if (this.cancelled) {
+            return;
+        }
         this.status = WorkItemStatus.Started;
         const wiPayload: AsyncMessage = {
             workItemId: this.data.id,