npm - @shopify/cli-hydrogen - Versions diffs - 6.0.2 → 7.0.0 - Mend

@shopify/cli-hydrogen 6.0.2 → 7.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (108) hide show

package/dist/commands/hydrogen/build.js +40 -78
package/dist/commands/hydrogen/codegen.js +8 -3
package/dist/commands/hydrogen/deploy.js +173 -37
package/dist/commands/hydrogen/deploy.test.js +192 -20
package/dist/commands/hydrogen/dev.js +56 -31
package/dist/commands/hydrogen/init.js +1 -1
package/dist/commands/hydrogen/init.test.js +155 -53
package/dist/commands/hydrogen/link.js +5 -21
package/dist/commands/hydrogen/link.test.js +10 -10
package/dist/commands/hydrogen/preview.js +22 -11
package/dist/commands/hydrogen/setup.js +0 -4
package/dist/commands/hydrogen/setup.test.js +0 -1
package/dist/commands/hydrogen/shortcut.js +1 -0
package/dist/commands/hydrogen/upgrade.js +720 -0
package/dist/commands/hydrogen/upgrade.test.js +786 -0
package/dist/generator-templates/starter/.graphqlrc.yml +12 -1
package/dist/generator-templates/starter/CHANGELOG.md +126 -0
package/dist/generator-templates/starter/README.md +23 -0
package/dist/generator-templates/starter/app/components/Cart.tsx +1 -1
package/dist/generator-templates/starter/app/components/Footer.tsx +3 -1
package/dist/generator-templates/starter/app/components/Header.tsx +5 -1
package/dist/generator-templates/starter/app/components/Layout.tsx +14 -11
package/dist/generator-templates/starter/app/components/Search.tsx +1 -1
package/dist/generator-templates/starter/app/graphql/customer-account/CustomerAddressMutations.ts +61 -0
package/dist/generator-templates/starter/app/graphql/customer-account/CustomerDetailsQuery.ts +39 -0
package/dist/generator-templates/starter/app/graphql/customer-account/CustomerOrderQuery.ts +87 -0
package/dist/generator-templates/starter/app/graphql/customer-account/CustomerOrdersQuery.ts +58 -0
package/dist/generator-templates/starter/app/graphql/customer-account/CustomerUpdateMutation.ts +24 -0
package/dist/generator-templates/starter/app/lib/fragments.ts +102 -0
package/dist/generator-templates/starter/app/lib/session.ts +67 -0
package/dist/generator-templates/starter/app/root.tsx +11 -45
package/dist/generator-templates/starter/app/routes/[robots.txt].tsx +0 -27
package/dist/generator-templates/starter/app/routes/account.$.tsx +8 -4
package/dist/generator-templates/starter/app/routes/account._index.tsx +5 -0
package/dist/generator-templates/starter/app/routes/account.addresses.tsx +215 -206
package/dist/generator-templates/starter/app/routes/account.orders.$id.tsx +56 -163
package/dist/generator-templates/starter/app/routes/account.orders._index.tsx +32 -109
package/dist/generator-templates/starter/app/routes/account.profile.tsx +40 -180
package/dist/generator-templates/starter/app/routes/account.tsx +20 -135
package/dist/generator-templates/starter/app/routes/account_.authorize.tsx +5 -0
package/dist/generator-templates/starter/app/routes/account_.login.tsx +3 -140
package/dist/generator-templates/starter/app/routes/account_.logout.tsx +5 -24
package/dist/generator-templates/starter/app/routes/cart.tsx +7 -5
package/dist/generator-templates/starter/app/routes/collections.$handle.tsx +1 -1
package/dist/generator-templates/starter/app/routes/products.$handle.tsx +2 -2
package/dist/generator-templates/starter/app/routes/search.tsx +1 -1
package/dist/generator-templates/starter/customer-accountapi.generated.d.ts +506 -0
package/dist/generator-templates/starter/package.json +11 -10
package/dist/generator-templates/starter/remix.config.js +4 -0
package/dist/generator-templates/starter/remix.env.d.ts +6 -11
package/dist/generator-templates/starter/server.ts +24 -167
package/dist/generator-templates/starter/storefrontapi.generated.d.ts +104 -881
package/dist/hooks/init.js +4 -4
package/dist/lib/auth.js +5 -10
package/dist/lib/build.js +6 -1
package/dist/lib/bundle/analyzer.js +36 -26
package/dist/lib/check-lockfile.js +1 -0
package/dist/lib/codegen.js +59 -18
package/dist/lib/defer.js +12 -0
package/dist/lib/file.js +52 -3
package/dist/lib/flags.js +27 -9
package/dist/lib/get-oxygen-deployment-data.test.js +4 -2
package/dist/lib/graphql/admin/client.test.js +2 -2
package/dist/lib/graphql/admin/get-oxygen-data.js +1 -0
package/dist/lib/log.js +32 -14
package/dist/lib/mini-oxygen/assets.js +118 -0
package/dist/lib/mini-oxygen/common.js +2 -1
package/dist/lib/mini-oxygen/index.js +7 -5
package/dist/lib/mini-oxygen/mini-oxygen.test.js +214 -0
package/dist/lib/mini-oxygen/node.js +19 -5
package/dist/lib/mini-oxygen/workerd-inspector-logs.js +227 -0
package/dist/lib/mini-oxygen/workerd-inspector-proxy.js +200 -0
package/dist/lib/mini-oxygen/workerd-inspector.js +62 -235
package/dist/lib/mini-oxygen/workerd.js +74 -50
package/dist/lib/missing-routes.js +6 -3
package/dist/lib/onboarding/common.js +40 -9
package/dist/lib/onboarding/local.js +19 -11
package/dist/lib/onboarding/remote.js +48 -28
package/dist/lib/render-errors.js +2 -0
package/dist/lib/request-events.js +65 -31
package/dist/lib/setups/css/assets.js +1 -46
package/dist/lib/setups/css/css-modules.js +3 -2
package/dist/lib/setups/css/postcss.js +4 -2
package/dist/lib/setups/css/tailwind.js +4 -2
package/dist/lib/setups/css/vanilla-extract.js +3 -2
package/dist/lib/setups/i18n/replacers.test.js +56 -38
package/dist/lib/shell.js +1 -1
package/dist/lib/template-diff.js +89 -0
package/dist/lib/template-downloader.js +3 -2
package/dist/lib/transpile/project.js +1 -1
package/dist/virtual-routes/assets/debug-network.css +592 -0
package/dist/virtual-routes/assets/favicon-dark.svg +20 -0
package/dist/virtual-routes/components/FlameChartWrapper.jsx +8 -10
package/dist/virtual-routes/components/IconClose.jsx +38 -0
package/dist/virtual-routes/components/IconDiscard.jsx +44 -0
package/dist/virtual-routes/components/RequestDetails.jsx +179 -0
package/dist/virtual-routes/components/RequestTable.jsx +92 -0
package/dist/virtual-routes/components/RequestWaterfall.jsx +151 -0
package/dist/virtual-routes/lib/useDebugNetworkServer.jsx +176 -0
package/dist/virtual-routes/routes/subrequest-profiler.jsx +243 -0
package/oclif.manifest.json +134 -59
package/package.json +18 -26
package/dist/generator-templates/starter/app/routes/account_.activate.$id.$activationToken.tsx +0 -161
package/dist/generator-templates/starter/app/routes/account_.recover.tsx +0 -129
package/dist/generator-templates/starter/app/routes/account_.register.tsx +0 -207
package/dist/generator-templates/starter/app/routes/account_.reset.$id.$resetToken.tsx +0 -136
package/dist/virtual-routes/routes/debug-network.jsx +0 -289
/package/dist/generator-templates/starter/app/{utils.ts → lib/variants.ts} +0 -0

package/dist/lib/mini-oxygen/workerd-inspector-proxy.js ADDED Viewed

@@ -0,0 +1,200 @@
+import crypto from 'node:crypto';
+import { readFileSync } from 'node:fs';
+import { createServer } from 'node:http';
+import { WebSocketServer } from 'ws';
+import { request } from 'undici';
+const CFW_DEVTOOLS = "https://devtools.devprod.cloudflare.dev";
+const H2_FAVICON_URL = "https://cdn.shopify.com/s/files/1/0598/4822/8886/files/favicon.svg";
+function createInspectorProxy(port, sourceFilePath, newInspectorConnection) {
+  const sessionId = crypto.randomUUID();
+  let debuggerWs = void 0;
+  let inspector = newInspectorConnection;
+  let isDevToolsInBrowser = false;
+  const sourceMapPathname = "/__index.js.map";
+  const sourceMapURL = `http://localhost:${port}${sourceMapPathname}`;
+  const server = createServer((req, res) => {
+    const [url = "/", queryString = ""] = req.url?.split("?") || [];
+    switch (url) {
+      case "/json/version":
+        res.setHeader("Content-Type", "application/json");
+        res.end(
+          JSON.stringify({ Browser: "hydrogen/v2", "Protocol-Version": "1.3" })
+        );
+        break;
+      case "/json":
+      case "/json/list":
+        {
+          res.setHeader("Content-Type", "application/json");
+          const localHost = `localhost:${port}/ws`;
+          const devtoolsFrontendUrl = `devtools://devtools/bundled/js_app.html?experiments=true&v8only=true&ws=${localHost}`;
+          const devtoolsFrontendUrlCompat = `devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=${localHost}`;
+          res.end(
+            JSON.stringify([
+              {
+                id: sessionId,
+                type: "node",
+                webSocketDebuggerUrl: `ws://${localHost}`,
+                devtoolsFrontendUrl,
+                devtoolsFrontendUrlCompat,
+                // Below are fields that are visible in the DevTools UI.
+                title: "Hydrogen / Oxygen Worker",
+                faviconUrl: H2_FAVICON_URL,
+                url: "https://" + new URL(inspector.ws.url).host
+              }
+            ])
+          );
+        }
+        return;
+      case sourceMapPathname:
+        res.setHeader("Content-Type", "text/plain");
+        res.setHeader("Cache-Control", "no-store");
+        res.setHeader(
+          "Access-Control-Allow-Origin",
+          req.headers.origin ?? "devtools://devtools"
+        );
+        res.end(readFileSync(sourceFilePath + ".map", "utf-8"));
+        break;
+      case "/favicon.ico":
+        proxyHttp(H2_FAVICON_URL, req.headers, res);
+        break;
+      case "/":
+        if (!queryString) {
+          res.statusCode = 302;
+          res.setHeader(
+            "Location",
+            `/?experiments=true&v8only=true&debugger=true&ws=localhost:${port}/ws`
+          );
+          res.end();
+        } else {
+          proxyHttp(
+            CFW_DEVTOOLS + "/js_app",
+            req.headers,
+            res,
+            (content) => (
+              // HTML from DevTools comes without closing <body> and <html> tags.
+              // The browser closes them automatically, then modifies the DOM with JS.
+              // This adds a loading indicator before the JS kicks in and modifies the DOM.
+              content + '<div style="display: flex; flex-direction: column; align-items: center; padding-top: 20px; font-family: Arial; color: white">Loading DevTools...</div></body></html>'
+            )
+          );
+        }
+        break;
+      default:
+        if (url === "/panels/sources/sources-meta.js" || url.startsWith("/core/i18n/locales/") && url.endsWith(".json")) {
+          proxyHttp(
+            CFW_DEVTOOLS + url,
+            req.headers,
+            res,
+            (content) => content.replace(/['"]Cloudflare['"]/g, '"Hydrogen"')
+          );
+        } else {
+          proxyHttp(CFW_DEVTOOLS + url, req.headers, res);
+        }
+        break;
+    }
+  });
+  const wsServer = new WebSocketServer({ server, clientTracking: true });
+  server.listen(port);
+  let messageBuffer = [];
+  wsServer.on("connection", (ws, req) => {
+    if (wsServer.clients.size > 1) {
+      console.error(
+        "Tried to open a new devtools window when a previous one was already open."
+      );
+      ws.close(1013, "Too many clients; only one can be connected at a time");
+    } else {
+      inspector.ws.send(
+        JSON.stringify({ id: 1e8, method: "Debugger.disable" })
+      );
+      debuggerWs?.removeEventListener("message", sendMessageToInspector);
+      debuggerWs = ws;
+      isDevToolsInBrowser = /mozilla/i.test(req.headers["user-agent"] ?? "");
+      debuggerWs.addEventListener("message", sendMessageToInspector);
+      debuggerWs.addEventListener("close", () => {
+        debuggerWs?.removeEventListener("message", sendMessageToInspector);
+        debuggerWs = void 0;
+      });
+      messageBuffer.forEach(sendMessageToDebugger);
+      messageBuffer = [];
+    }
+  });
+  if (inspector.ws)
+    onInspectorConnection();
+  function onInspectorConnection() {
+    inspector.ws.addEventListener("message", sendMessageToDebugger);
+    debuggerWs?.send(
+      JSON.stringify({
+        method: "Runtime.consoleAPICalled",
+        params: {
+          type: "warning",
+          args: [
+            {
+              type: "string",
+              value: "Source code changed. Please reload the DevTools to reconnect the debugger."
+            }
+          ],
+          executionContextId: Date.now(),
+          timestamp: Date.now()
+        }
+      })
+    );
+    debuggerWs?.close(1001, "Source code changed");
+  }
+  function sendMessageToInspector(event) {
+    inspector.ws.send(event.data);
+  }
+  function sendMessageToDebugger(event) {
+    if (isDevToolsInBrowser) {
+      event = enhanceDevToolsEvent(event, sourceMapURL);
+    }
+    if (debuggerWs) {
+      debuggerWs.send(event.data);
+    } else {
+      messageBuffer.push(event);
+    }
+  }
+  return {
+    updateInspectorConnection(newConnection) {
+      inspector = newConnection;
+      onInspectorConnection();
+    }
+  };
+}
+function enhanceDevToolsEvent(event, sourceMapUrl) {
+  const message = JSON.parse(event.data);
+  if (message.method === "Debugger.scriptParsed") {
+    if (message.params.sourceMapURL === "index.js.map") {
+      message.params.sourceMapURL = sourceMapUrl;
+    }
+  }
+  return { ...event, data: JSON.stringify(message) };
+}
+function proxyHttp(url, originalHeaders, nodeResponse, contentReplacer) {
+  const headers = Object.fromEntries(Object.entries(originalHeaders));
+  delete headers["host"];
+  delete headers["cookie"];
+  if (contentReplacer)
+    delete headers["accept-encoding"];
+  return request(url, { responseHeader: "raw", headers }).then((response) => {
+    nodeResponse.statusCode = response.statusCode;
+    if (nodeResponse.statusCode === 404) {
+      return nodeResponse.end("Not found");
+    }
+    Object.entries(response.headers).forEach(([key, value]) => {
+      if (value) {
+        nodeResponse.setHeader(key, value);
+      }
+    });
+    if (contentReplacer) {
+      return response.body?.text().then(contentReplacer).then(nodeResponse.end.bind(nodeResponse));
+    }
+    return response.body.pipe(nodeResponse);
+  }).catch((err) => {
+    console.error(err);
+    nodeResponse.statusCode = 500;
+    nodeResponse.end("Internal error");
+  });
+}
+export { createInspectorProxy };

package/dist/lib/mini-oxygen/workerd-inspector.js CHANGED Viewed

@@ -1,22 +1,59 @@
 import { dirname } from 'node:path';
 import { readFile } from 'node:fs/promises';
+import { fetch } from '@shopify/cli-kit/node/http';
 import { SourceMapConsumer } from 'source-map';
-import { parse } from 'stack-trace';
-import WebSocket from 'ws';
+import { WebSocket } from 'ws';
+import { addInspectorConsoleLogger, formatStack } from './workerd-inspector-logs.js';
+import { AbortError } from '@shopify/cli-kit/node/error';
+import { createInspectorProxy } from './workerd-inspector-proxy.js';
+function createInspectorConnector(options) {
+  let inspectorUrl;
+  let inspectorConnection;
+  let inspectorProxy;
+  return async (onBeforeConnect) => {
+    inspectorConnection?.close();
+    inspectorUrl ??= await findInspectorUrl(options.privateInspectorPort);
+    await onBeforeConnect?.();
+    inspectorConnection = connectToInspector({
+      inspectorUrl,
+      sourceMapPath: options.sourceMapPath
+    });
+    addInspectorConsoleLogger(inspectorConnection);
+    if (options.debug) {
+      if (inspectorProxy) {
+        inspectorProxy.updateInspectorConnection(inspectorConnection);
+      } else {
+        inspectorProxy = createInspectorProxy(
+          options.publicInspectorPort,
+          options.absoluteBundlePath,
+          inspectorConnection
+        );
+      }
+    }
+  };
+}
 async function findInspectorUrl(inspectorPort) {
   try {
     const jsonUrl = `http://127.0.0.1:${inspectorPort}/json`;
     const body = await (await fetch(jsonUrl)).json();
-    return body?.find(({ id }) => id === "core:user:hydrogen")?.webSocketDebuggerUrl;
+    const url = body?.find(
+      ({ id }) => id === "core:user:hydrogen"
+    )?.webSocketDebuggerUrl;
+    if (!url) {
+      throw new Error("Unable to find inspector URL");
+    }
+    return url;
   } catch (error) {
-    console.error("Error attempting to retrieve debugger URL:", error);
+    const abortError = new AbortError(
+      "Unable to connect to Worker inspector",
+      `Please report this issue. ${error.stack}`
+    );
+    abortError.stack = error.stack;
+    throw abortError;
   }
 }
-function connectToInspector({
-  inspectorUrl,
-  sourceMapPath
-}) {
+function connectToInspector({ inspectorUrl, sourceMapPath }) {
   const messageCounterRef = { value: -1 };
   const getMessageId = () => messageCounterRef.value--;
   const pendingMessages = /* @__PURE__ */ new Map();
@@ -147,42 +184,6 @@ function connectToInspector({
       }
     })();
   };
-  ws.addEventListener("message", async (event) => {
-    if (typeof event.data === "string") {
-      const evt = JSON.parse(event.data);
-      cleanupMessageQueue(evt);
-      if (evt.method === "Runtime.exceptionThrown") {
-        const params = evt.params;
-        const errorProperties = {};
-        const sourceMapConsumer = await getSourceMapConsumer();
-        if (sourceMapConsumer !== void 0) {
-          const message = params.exceptionDetails.exception?.description?.split("\n")[0];
-          const stack = params.exceptionDetails.stackTrace?.callFrames;
-          const formatted = formatStructuredError(
-            sourceMapConsumer,
-            message,
-            stack
-          );
-          errorProperties.message = params.exceptionDetails.text;
-          errorProperties.stack = formatted;
-        } else {
-          errorProperties.message = params.exceptionDetails.text + " " + (params.exceptionDetails.exception?.description ?? "");
-        }
-        console.error(
-          await reconstructError(
-            errorProperties,
-            params.exceptionDetails.exception
-          )
-        );
-      }
-      if (evt.method === "Runtime.consoleAPICalled") {
-        const params = evt.params;
-        await logConsoleMessage(params, reconstructError);
-      }
-    } else {
-      console.error("Unrecognised devtools event:", event);
-    }
-  });
   ws.once("open", () => {
     send("Runtime.enable");
     keepAliveInterval = setInterval(() => send("Runtime.getIsolateId"), 1e4);
@@ -194,199 +195,25 @@ function connectToInspector({
     clearInterval(keepAliveInterval);
     sourceMapAbortController.abort();
   });
-  return () => {
-    clearInterval(keepAliveInterval);
-    if (!isClosed()) {
-      try {
-        ws.close();
-      } catch (err) {
-      }
-    }
-    sourceMapAbortController.abort();
-  };
-}
-const mapConsoleAPIMessageTypeToConsoleMethod = {
-  log: "log",
-  debug: "debug",
-  info: "info",
-  warning: "warn",
-  error: "error",
-  dir: "dir",
-  dirxml: "dirxml",
-  table: "table",
-  trace: "trace",
-  clear: "clear",
-  count: "count",
-  assert: "assert",
-  profile: "profile",
-  profileEnd: "profileEnd",
-  timeEnd: "timeEnd",
-  startGroup: "group",
-  startGroupCollapsed: "groupCollapsed",
-  endGroup: "groupEnd"
-};
-async function logConsoleMessage(evt, reconstructError) {
-  const args = [];
-  for (const ro of evt.args) {
-    switch (ro.type) {
-      case "string":
-      case "number":
-      case "boolean":
-      case "undefined":
-      case "symbol":
-      case "bigint":
-        args.push(ro.value);
-        break;
-      case "function":
-        args.push(`[Function: ${ro.description ?? "<no-description>"}]`);
-        break;
-      case "object":
-        if (!ro.preview) {
-          args.push(
-            ro.subtype === "null" ? "null" : ro.description ?? "<no-description>"
-          );
-        } else {
-          if (ro.preview.description)
-            args.push(ro.preview.description);
-          switch (ro.preview.subtype) {
-            case "array":
-              args.push(
-                "[ " + ro.preview.properties.map(({ value }) => {
-                  return value;
-                }).join(", ") + (ro.preview.overflow ? "..." : "") + " ]"
-              );
-              break;
-            case "weakmap":
-            case "map":
-              ro.preview.entries === void 0 ? args.push("{}") : args.push(
-                "{\n" + ro.preview.entries.map(({ key, value }) => {
-                  return `  ${key?.description ?? "<unknown>"} => ${value.description}`;
-                }).join(",\n") + (ro.preview.overflow ? "\n  ..." : "") + "\n}"
-              );
-              break;
-            case "weakset":
-            case "set":
-              ro.preview.entries === void 0 ? args.push("{}") : args.push(
-                "{ " + ro.preview.entries.map(({ value }) => {
-                  return `${value.description}`;
-                }).join(", ") + (ro.preview.overflow ? ", ..." : "") + " }"
-              );
-              break;
-            case "regexp":
-              break;
-            case "date":
-              break;
-            case "generator":
-              args.push(ro.preview?.properties[0]?.value || "");
-              break;
-            case "promise":
-              if (ro.preview?.properties[0]?.value === "pending") {
-                args.push(`{<${ro.preview.properties[0].value}>}`);
-              } else {
-                args.push(
-                  `{<${ro.preview?.properties[0]?.value}>: ${ro.preview?.properties[1]?.value}}`
-                );
-              }
-              break;
-            case "node":
-            case "iterator":
-            case "proxy":
-            case "typedarray":
-            case "arraybuffer":
-            case "dataview":
-            case "webassemblymemory":
-            case "wasmvalue":
-              break;
-            case "error":
-              const errorProperties = {
-                message: ro.preview.description?.split("\n").filter((line) => !/^\s+at\s/.test(line)).join("\n") ?? ro.preview.properties.find(({ name }) => name === "message")?.value ?? "",
-                stack: ro.preview.description ?? ro.description ?? ro.preview.properties.find(({ name }) => name === "stack")?.value,
-                cause: ro.preview.properties.find(({ name }) => name === "cause")?.value
-              };
-              const error = await reconstructError(errorProperties, ro);
-              args.splice(-1, 1, error);
-              break;
-            default:
-              args.push(
-                "{\n" + ro.preview.properties.map(({ name, value }) => {
-                  return `  ${name}: ${value}`;
-                }).join(",\n") + (ro.preview.overflow ? "\n  ..." : "") + "\n}"
-              );
-          }
-        }
-        break;
-      default:
-        args.push(ro.description || ro.unserializableValue || "\u{1F98B}");
-        break;
-    }
-  }
-  const method = mapConsoleAPIMessageTypeToConsoleMethod[evt.type];
-  if (method in console) {
-    switch (method) {
-      case "dir":
-        console.dir(args);
-        break;
-      case "table":
-        console.table(args);
-        break;
-      default:
-        console[method].apply(console, args);
-        break;
-    }
-  } else {
-    console.warn(`Unsupported console method: ${method}`);
-    console.warn("console event:", evt);
-  }
-}
-function formatStructuredError(sourceMapConsumer, message, frames) {
-  const lines = [];
-  if (message !== void 0)
-    lines.push(message);
-  frames?.forEach(({ functionName, lineNumber, columnNumber }, i) => {
-    try {
-      if (lineNumber) {
-        const pos = sourceMapConsumer.originalPositionFor({
-          line: lineNumber + 1,
-          column: columnNumber
-        });
-        if (i === 0 && pos.source && pos.line) {
-          const fileSource = sourceMapConsumer.sourceContentFor(pos.source);
-          const fileSourceLine = fileSource?.split("\n")[pos.line - 1] || "";
-          lines.push(fileSourceLine.trim());
-          if (pos.column) {
-            lines.push(
-              `${" ".repeat(pos.column - fileSourceLine.search(/\S/))}^`
-            );
-          }
-        }
-        if (pos && pos.line !== null && pos.column !== null) {
-          const convertedFnName = pos.name || functionName || "";
-          let convertedLocation = `${pos.source}:${pos.line}:${pos.column + 1}`;
-          if (convertedFnName === "") {
-            lines.push(`    at ${convertedLocation}`);
-          } else {
-            lines.push(`    at ${convertedFnName} (${convertedLocation})`);
-          }
+  return {
+    ws,
+    send,
+    reconstructError,
+    getSourceMapConsumer,
+    cleanupMessageQueue,
+    isClosed,
+    close: () => {
+      clearInterval(keepAliveInterval);
+      if (!isClosed()) {
+        try {
+          ws.removeAllListeners();
+          ws.close();
+        } catch (err) {
         }
       }
-    } catch {
+      sourceMapAbortController.abort();
     }
-  });
-  return lines.join("\n");
-}
-function formatStack(sourceMapConsumer, stack) {
-  const message = stack.split("\n")[0];
-  const callSites = parse({ stack });
-  const frames = callSites.map((site) => ({
-    functionName: site.getFunctionName() ?? "",
-    // `Protocol.Runtime.CallFrame`s line numbers are 0-indexed, hence `- 1`
-    lineNumber: (site.getLineNumber() ?? 1) - 1,
-    columnNumber: site.getColumnNumber() ?? 1,
-    // Unused by `formattedError`
-    scriptId: "",
-    url: ""
-  }));
-  return formatStructuredError(sourceMapConsumer, message, frames);
+  };
 }
-export { connectToInspector, findInspectorUrl, mapConsoleAPIMessageTypeToConsoleMethod };
+export { createInspectorConnector };