Return runtime entry URL from Miniflare#ready (#396)

* Resolve `Miniflare#ready` with runtime entry URL

* Remove `startServer()`

This was a breaking change anyway, as we no longer return an
`http.Server`. Given it's just an alias for `ready`, and doesn't
actually start a server, it doesn't make much sense to keep it.

* Use service name not binding name as service binding designator

This was a mistake and prevented service bindings being bound with
different names to the corresponding bound workers.

Author: mrbbot

packages/tre/src/index.ts

@@ -4,8 +4,15 @@ import exitHook from "exit-hook";
 import getPort from "get-port";
 import { bold, green, grey } from "kleur/colors";
 import stoppable from "stoppable";
-import { RequestInfo, RequestInit, fetch } from "undici";
-import { HeadersInit, Request, Response } from "undici";
+import {
+  HeadersInit,
+  Request,
+  RequestInfo,
+  RequestInit,
+  Response,
+  fetch,
+} from "undici";
+import workerd from "workerd";
 import { z } from "zod";
 import { setupCf } from "./cf";
 
@@ -189,10 +196,6 @@ export class Miniflare {
     }
   }
 
-  startServer(): Promise<void> {
-    return this.ready;
-  }
-
   async dispatchFetch(
     input: RequestInfo,
     init?: RequestInit
@@ -203,6 +206,7 @@ export class Miniflare {
     url.host = this.#runtimeEntryURL!.host;
     return fetch(url, forward as RequestInit);
   }
+
   async #init() {
     // Start loopback server (how the runtime accesses with Miniflare's storage)
     this.#loopbackServer = await this.#startLoopbackServer(0, "127.0.0.1");
@@ -433,8 +437,11 @@ export class Miniflare {
     return { services, sockets };
   }
 
-  get ready() {
-    return this.#initPromise;
+  get ready(): Promise<URL> {
+    // Cannot use async/await with getters.
+    // Safety: `#runtimeEntryURL` is assigned in `#init()`. `#initPromise`
+    // doesn't resolve until `#init()` returns.
+    return this.#initPromise.then(() => this.#runtimeEntryURL!);
   }
 
   #checkDisposed() {

packages/tre/src/plugins/core/index.ts

@@ -194,7 +194,7 @@ export const CORE_PLUGIN: Plugin<
             name:
               typeof service === "function"
                 ? `${SERVICE_CUSTOM_PREFIX}:${name}` // Custom `fetch` function
-                : `${SERVICE_USER_PREFIX}:${name}`, // Regular user worker
+                : `${SERVICE_USER_PREFIX}:${service}`, // Regular user worker
           },
         }))
       );