fix: correctly remove worker from pool

Moved the logic to remove a worker from pool to worker_ctx, so it will
be done all instances. Previously, crashes would leave dead workers in
the pool.

crates/base/src/edge_runtime.rs

@@ -237,8 +237,6 @@ impl EdgeRuntime {
                 self.curr_user_opts.worker_timeout_ms,
                 memory_limit_rx,
                 halt_isolate_tx,
-                self.curr_user_opts.key,
-                self.curr_user_opts.pool_msg_tx.clone(),
             );
 
             // add a callback when a worker reaches its memory limit
@@ -335,16 +333,6 @@ impl EdgeRuntime {
             };
             let call = rt.block_on(future);
 
-            // send a shutdown message back to user worker pool (so it stops sending requets to the
-            // worker)
-            if let Some(k) = key {
-                if let Some(tx) = pool_msg_tx {
-                    if tx.send(UserWorkerMsgs::Shutdown(k)).is_err() {
-                        error!("failed to send the shutdown signal to user worker pool");
-                    }
-                }
-            };
-
             // send a message to halt the isolate
             if halt_isolate_tx.send(call).is_err() {
                 error!("failed to send the halt execution signal");

crates/base/src/worker_ctx.rs

@@ -29,6 +29,11 @@ pub async fn create_worker(
     let (worker_boot_result_tx, worker_boot_result_rx) = oneshot::channel::<Result<(), Error>>();
     let (unix_stream_tx, unix_stream_rx) = mpsc::unbounded_channel::<UnixStream>();
 
+    let (worker_key, pool_msg_tx) = match init_opts.conf.clone() {
+        EdgeContextOpts::UserWorker(worker_opts) => (worker_opts.key, worker_opts.pool_msg_tx),
+        EdgeContextOpts::MainWorker(_opts) => (None, None),
+    };
+
     let _handle: thread::JoinHandle<Result<(), Error>> = thread::spawn(move || {
         let runtime = tokio::runtime::Builder::new_current_thread()
             .enable_all()
@@ -60,6 +65,15 @@ pub async fn create_worker(
             );
         }
 
+        // remove the worker from pool
+        if let Some(k) = worker_key {
+            if let Some(tx) = pool_msg_tx {
+                if tx.send(UserWorkerMsgs::Shutdown(k)).is_err() {
+                    error!("failed to send the shutdown signal to user worker pool");
+                }
+            }
+        }
+
         Ok(())
     });