Make the two ReusableWorker interfaces match

Author: nex3

lib/src/embedded/js/executable.dart

@@ -4,10 +4,10 @@
 
 import 'package:stream_channel/stream_channel.dart';
 
+import '../compilation_dispatcher.dart';
 import '../options.dart';
 import '../util/length_delimited_transformer.dart';
 import '../worker_dispatcher.dart';
-import '../worker_entrypoint.dart';
 import 'io.dart';
 import 'sync_receive_port.dart';
 import 'worker_threads.dart';
@@ -21,7 +21,7 @@ void main(List<String> args) {
           .listen();
     } else {
       var port = workerData! as MessagePort;
-      workerEntryPoint(JSSyncReceivePort(port), JSSendPort(port));
+      CompilationDispatcher(JSSyncReceivePort(port), JSSendPort(port)).listen();
     }
   }
 }

lib/src/embedded/js/reusable_worker.dart

@@ -6,15 +6,12 @@ import 'dart:async';
 import 'dart:js_interop';
 import 'dart:typed_data';
 
+import 'package:node_interop/node_interop.dart';
+
 import 'js.dart';
 import 'sync_message_port.dart';
 import 'worker_threads.dart';
 
-/// The entrypoint for a [ReusableWorker].
-///
-/// This must return a Record of filename and argv for creating the Worker.
-typedef ReusableWorkerEntryPoint = (String, JSArray<JSAny?>) Function();
-
 class ReusableWorker {
   /// The worker.
   final Worker _worker;
@@ -34,17 +31,17 @@ class ReusableWorker {
   ReusableWorker._(
       this._worker, this._sendPort, this._receivePort, this._subscription);
 
-  /// Spawns a [ReusableWorker] that runs the the entrypoint script.
-  static Future<ReusableWorker> spawn(ReusableWorkerEntryPoint entryPoint,
-      {Function? onError}) async {
-    var (filename, argv) = entryPoint();
+  /// Spawns a [ReusableWorker].
+  static Future<ReusableWorker> spawn({Function? onError}) async {
+    var filename = process.argv[1] as String;
+    var argv = [for (var arg in process.argv.skip(2)) (arg as String).toJS];
     var channel = SyncMessagePort.createChannel();
     var worker = Worker(
         filename,
         WorkerOptions(
             workerData: channel.port2,
             transferList: [channel.port2].toJS,
-            argv: argv));
+            argv: argv.toJS));
     var controller = StreamController<dynamic>(sync: true);
     var sendPort = SyncMessagePort(channel.port1);
     var receivePort = channel.port1;

lib/src/embedded/js/worker_entrypoint.dart

@@ -10,18 +10,7 @@ import 'package:native_synchronization/mailbox.dart';
 import 'package:native_synchronization/sendable.dart';
 
 import '../sync_receive_port.dart';
-
-/// The entrypoint for a [ReusableWorker].
-///
-/// This must be a static global function. It's run when the isolate is spawned,
-/// and is passed a [Mailbox] that receives messages from [ReusableWorker.send]
-/// and a [SendPort] that sends messages to the [ReceivePort] listened by
-/// [ReusableWorker.borrow].
-///
-/// If the [sendPort] sends a message before [ReusableWorker.borrow] is called,
-/// this will throw an unhandled [StateError].
-typedef ReusableWorkerEntryPoint = FutureOr<void> Function(
-    SyncReceivePort receivePort, SendPort sendPort);
+import '../compilation_dispatcher.dart';
 
 class ReusableWorker {
   /// The wrapped isolate.
@@ -46,15 +35,13 @@ class ReusableWorker {
     Function? onError,
   }) : _subscription = _receivePort.listen(_defaultOnData, onError: onError);
 
-  /// Spawns a [ReusableWorker] that runs the given [entryPoint].
-  static Future<ReusableWorker> spawn(
-    ReusableWorkerEntryPoint entryPoint, {
+  /// Spawns a [ReusableWorker].
+  static Future<ReusableWorker> spawn({
     Function? onError,
   }) async {
     var mailbox = Mailbox();
     var receivePort = ReceivePort();
     var isolate = await Isolate.spawn(_isolateMain, (
-      entryPoint,
       mailbox.asSendable,
       receivePort.sendPort,
     ));
@@ -107,9 +94,9 @@ void _defaultOnData(dynamic _) {
   throw StateError("Shouldn't receive a message before being borrowed.");
 }
 
-void _isolateMain(
-  (ReusableWorkerEntryPoint, Sendable<Mailbox>, SendPort) message,
-) {
-  var (entryPoint, sendableMailbox, sendPort) = message;
-  entryPoint(MailboxSyncReceivePort(sendableMailbox.materialize()), sendPort);
+void _isolateMain((Sendable<Mailbox>, SendPort) message) {
+  var (sendableMailbox, sendPort) = message;
+  CompilationDispatcher(
+          MailboxSyncReceivePort(sendableMailbox.materialize()), sendPort)
+      .listen();
 }

lib/src/embedded/vm/reusable_worker.dart

@@ -15,8 +15,6 @@ import 'util/proto_extensions.dart';
 import 'utils.dart';
 import 'vm/concurrency.dart' if (dart.library.js) 'js/concurrency.dart';
 import 'vm/reusable_worker.dart' if (dart.library.js) 'js/reusable_worker.dart';
-import 'worker_entrypoint.dart'
-    if (dart.library.js) 'js/worker_entrypoint.dart';
 
 /// A class that dispatches messages between the host and various workers that
 /// are each running an individual compilation.
@@ -129,7 +127,6 @@ class WorkerDispatcher {
       _inactiveWorkers.remove(worker);
     } else {
       var future = ReusableWorker.spawn(
-        workerEntryPoint,
         onError: (Object error, StackTrace stackTrace) {
           _handleError(error, stackTrace);
         },