@utoo/pack 0.0.1-alpha.2 → 0.0.1-alpha.20

package/esm/dev.js

@@ -0,0 +1,346 @@
+import fs from "fs";
+import http from "http";
+import https from "https";
+import { isIPv6 } from "net";
+import path from "path";
+import send from "send";
+import url from "url";
+import { createHotReloader } from "./hmr";
+import { createSelfSignedCertificate } from "./mkcert";
+import { blockStdout } from "./util";
+import { compatOptionsFromWebpack } from "./webpackCompat";
+import { xcodeProfilingReady } from "./xcodeProfile";
+export function serve(options, projectPath, rootPath, serverOptions) {
+    const bundleOptions = options.compatMode
+        ? compatOptionsFromWebpack(options)
+        : options;
+    return serveInternal(bundleOptions, projectPath, rootPath, serverOptions);
+}
+async function serveInternal(options, projectPath, rootPath, serverOptions) {
+    blockStdout();
+    if (process.env.XCODE_PROFILE) {
+        await xcodeProfilingReady();
+    }
+    startServer({
+        hostname: (serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.hostname) || "localhost",
+        port: (serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.port) || 3000,
+        https: serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.https,
+        selfSignedCertificate: (serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.https)
+            ? await createSelfSignedCertificate((serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.hostname) || "localhost")
+            : undefined,
+    }, options, projectPath || process.cwd(), rootPath);
+}
+export async function startServer(serverOptions, bundleOptions, projectPath, rootPath) {
+    let { port, hostname, selfSignedCertificate } = serverOptions;
+    process.title = "utoo-pack-dev-server";
+    let handlersReady = () => { };
+    let handlersError = () => { };
+    let handlersPromise = new Promise((resolve, reject) => {
+        handlersReady = resolve;
+        handlersError = reject;
+    });
+    let requestHandler = async (req, res) => {
+        if (handlersPromise) {
+            await handlersPromise;
+            return requestHandler(req, res);
+        }
+        throw new Error("Invariant request handler was not setup");
+    };
+    let upgradeHandler = async (req, socket, head) => {
+        if (handlersPromise) {
+            await handlersPromise;
+            return upgradeHandler(req, socket, head);
+        }
+        throw new Error("Invariant upgrade handler was not setup");
+    };
+    async function requestListener(req, res) {
+        try {
+            if (handlersPromise) {
+                await handlersPromise;
+                handlersPromise = undefined;
+            }
+            await requestHandler(req, res);
+        }
+        catch (err) {
+            res.statusCode = 500;
+            res.end("Internal Server Error");
+            console.error(`Failed to handle request for ${req.url}`);
+            console.error(err);
+        }
+    }
+    const server = selfSignedCertificate
+        ? https.createServer({
+            key: fs.readFileSync(selfSignedCertificate.key),
+            cert: fs.readFileSync(selfSignedCertificate.cert),
+        }, requestListener)
+        : http.createServer(requestListener);
+    server.on("upgrade", async (req, socket, head) => {
+        try {
+            await upgradeHandler(req, socket, head);
+        }
+        catch (err) {
+            socket.destroy();
+            console.error(`Failed to handle request for ${req.url}`);
+            console.error(err);
+        }
+    });
+    let portRetryCount = 0;
+    const originalPort = port;
+    server.on("error", (err) => {
+        if (port && err.code === "EADDRINUSE" && portRetryCount < 10) {
+            port += 1;
+            portRetryCount += 1;
+            server.listen(port, hostname);
+        }
+        else {
+            console.error(`Failed to start server`);
+            console.error(err);
+            process.exit(1);
+        }
+    });
+    await new Promise((resolve) => {
+        server.on("listening", async () => {
+            const addr = server.address();
+            const actualHostname = formatHostname(typeof addr === "object"
+                ? (addr === null || addr === void 0 ? void 0 : addr.address) || hostname || "localhost"
+                : addr);
+            const formattedHostname = !hostname || actualHostname === "0.0.0.0"
+                ? "localhost"
+                : actualHostname === "[::]"
+                    ? "[::1]"
+                    : formatHostname(hostname);
+            port = typeof addr === "object" ? (addr === null || addr === void 0 ? void 0 : addr.port) || port : port;
+            if (portRetryCount) {
+                console.warn(`Port ${originalPort} is in use, using available port ${port} instead.`);
+            }
+            console.log(`Listening on ${serverOptions.https ? "https" : "http"}://${formattedHostname}:${port} ...`);
+            try {
+                let cleanupStarted = false;
+                let closeUpgraded = null;
+                const cleanup = () => {
+                    if (cleanupStarted) {
+                        return;
+                    }
+                    cleanupStarted = true;
+                    (async () => {
+                        console.debug("start-server process cleanup");
+                        await new Promise((res) => {
+                            server.close((err) => {
+                                if (err)
+                                    console.error(err);
+                                res();
+                            });
+                            server.closeAllConnections();
+                            closeUpgraded === null || closeUpgraded === void 0 ? void 0 : closeUpgraded();
+                        });
+                        console.debug("start-server process cleanup finished");
+                        process.exit(0);
+                    })();
+                };
+                const exception = (err) => {
+                    console.error(err);
+                };
+                process.on("SIGINT", cleanup);
+                process.on("SIGTERM", cleanup);
+                process.on("rejectionHandled", () => { });
+                process.on("uncaughtException", exception);
+                process.on("unhandledRejection", exception);
+                const initResult = await initialize(bundleOptions, projectPath, rootPath);
+                requestHandler = initResult.requestHandler;
+                upgradeHandler = initResult.upgradeHandler;
+                closeUpgraded = initResult.closeUpgraded;
+                handlersReady();
+            }
+            catch (err) {
+                handlersError();
+                console.error(err);
+                process.exit(1);
+            }
+            resolve();
+        });
+        server.listen(port, hostname);
+    });
+}
+export async function initialize(bundleOptions, projectPath, rootPath) {
+    process.env.NODE_ENV = "development";
+    const hotReloader = await createHotReloader(bundleOptions, projectPath, rootPath);
+    await hotReloader.start();
+    const requestHandlerImpl = async (req, res) => {
+        req.on("error", console.error);
+        res.on("error", console.error);
+        const handleRequest = async () => {
+            var _a;
+            if (!(req.method === "GET" || req.method === "HEAD")) {
+                res.setHeader("Allow", ["GET", "HEAD"]);
+                res.statusCode = 405;
+                res.end();
+            }
+            const distRoot = path.resolve(projectPath, ((_a = bundleOptions.config.output) === null || _a === void 0 ? void 0 : _a.path) || "./dist");
+            try {
+                const reqUrl = req.url || "";
+                const path = url.parse(reqUrl).pathname || "";
+                return await serveStatic(req, res, path, { root: distRoot });
+            }
+            catch (err) {
+                res.setHeader("Cache-Control", "private, no-cache, no-store, max-age=0, must-revalidate");
+                res.statusCode = 404;
+                res.end();
+            }
+        };
+        try {
+            await handleRequest();
+        }
+        catch (err) {
+            res.statusCode = 500;
+            res.end("Internal Server Error");
+        }
+    };
+    let requestHandler = requestHandlerImpl;
+    const logError = async (type, err) => {
+        if (type === "unhandledRejection") {
+            console.error("unhandledRejection: ", err);
+        }
+        else if (type === "uncaughtException") {
+            console.error("uncaughtException: ", err);
+        }
+    };
+    process.on("uncaughtException", logError.bind(null, "uncaughtException"));
+    process.on("unhandledRejection", logError.bind(null, "unhandledRejection"));
+    const upgradeHandler = async (req, socket, head) => {
+        var _a;
+        try {
+            const isHMRRequest = (_a = req.url) === null || _a === void 0 ? void 0 : _a.includes("turbopack-hmr");
+            if (isHMRRequest) {
+                hotReloader.onHMR(req, socket, head);
+            }
+            else {
+                socket.end();
+            }
+        }
+        catch (err) {
+            console.error("Error handling upgrade request", err);
+            socket.end();
+        }
+    };
+    return {
+        requestHandler,
+        upgradeHandler,
+        closeUpgraded() {
+            hotReloader.close();
+        },
+    };
+}
+export async function pipeToNodeResponse(readable, res, waitUntilForEnd) {
+    try {
+        const { errored, destroyed } = res;
+        if (errored || destroyed)
+            return;
+        const controller = createAbortController(res);
+        const writer = createWriterFromResponse(res, waitUntilForEnd);
+        await readable.pipeTo(writer, { signal: controller.signal });
+    }
+    catch (err) {
+        if (isAbortError(err))
+            return;
+        throw new Error("failed to pipe response", { cause: err });
+    }
+}
+export function createAbortController(response) {
+    const controller = new AbortController();
+    response.once("close", () => {
+        if (response.writableFinished)
+            return;
+        controller.abort(new ResponseAborted());
+    });
+    return controller;
+}
+export function isAbortError(e) {
+    return (e === null || e === void 0 ? void 0 : e.name) === "AbortError" || (e === null || e === void 0 ? void 0 : e.name) === ResponseAbortedName;
+}
+export const ResponseAbortedName = "ResponseAborted";
+export class ResponseAborted extends Error {
+    constructor() {
+        super(...arguments);
+        this.name = ResponseAbortedName;
+    }
+}
+function createWriterFromResponse(res, waitUntilForEnd) {
+    let started = false;
+    let drained = new DetachedPromise();
+    function onDrain() {
+        drained.resolve();
+    }
+    res.on("drain", onDrain);
+    res.once("close", () => {
+        res.off("drain", onDrain);
+        drained.resolve();
+    });
+    const finished = new DetachedPromise();
+    res.once("finish", () => {
+        finished.resolve();
+    });
+    return new WritableStream({
+        write: async (chunk) => {
+            if (!started) {
+                started = true;
+                res.flushHeaders();
+            }
+            try {
+                const ok = res.write(chunk);
+                if ("flush" in res && typeof res.flush === "function") {
+                    res.flush();
+                }
+                if (!ok) {
+                    await drained.promise;
+                    drained = new DetachedPromise();
+                }
+            }
+            catch (err) {
+                res.end();
+                throw new Error("failed to write chunk to response", { cause: err });
+            }
+        },
+        abort: (err) => {
+            if (res.writableFinished)
+                return;
+            res.destroy(err);
+        },
+        close: async () => {
+            if (waitUntilForEnd) {
+                await waitUntilForEnd;
+            }
+            if (res.writableFinished)
+                return;
+            res.end();
+            return finished.promise;
+        },
+    });
+}
+export class DetachedPromise {
+    constructor() {
+        let resolve;
+        let reject;
+        this.promise = new Promise((res, rej) => {
+            resolve = res;
+            reject = rej;
+        });
+        this.resolve = resolve;
+        this.reject = reject;
+    }
+}
+export function serveStatic(req, res, path, opts) {
+    return new Promise((resolve, reject) => {
+        send(req, path, opts)
+            .on("directory", () => {
+            const err = new Error("No directory access");
+            err.code = "ENOENT";
+            reject(err);
+        })
+            .on("error", reject)
+            .pipe(res)
+            .on("finish", resolve);
+    });
+}
+export function formatHostname(hostname) {
+    return isIPv6(hostname) ? `[${hostname}]` : hostname;
+}

package/esm/{hotReloader.d.ts → hmr.d.ts}

@@ -1,8 +1,7 @@
-import { ModernSourceMapPayload } from "./sourceMap";
-import { Project, ProjectOptions, Update as TurbopackUpdate } from "./types";
-import type webpack from "webpack";
 import { IncomingMessage } from "http";
 import { Duplex } from "stream";
+import type webpack from "webpack";
+import { BundleOptions, Project, Update as TurbopackUpdate } from "./types";
 export declare const enum HMR_ACTIONS_SENT_TO_BROWSER {
     RELOAD = "reload",
     CLIENT_CHANGES = "clientChanges",
@@ -17,10 +16,6 @@ export interface TurbopackMessageAction {
     action: HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_MESSAGE;
     data: TurbopackUpdate | TurbopackUpdate[];
 }
-export interface TurbopackMessageAction {
-    action: HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_MESSAGE;
-    data: TurbopackUpdate | TurbopackUpdate[];
-}
 export interface TurbopackConnectedAction {
     action: HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_CONNECTED;
     data: {
@@ -65,14 +60,12 @@ export interface HotReloaderInterface {
     clearHmrServerError(): void;
     start(): Promise<void>;
     send(action: HMR_ACTION_TYPES): void;
-    onHMR(req: IncomingMessage, _socket: Duplex, head: Buffer, onUpgrade: (client: {
+    onHMR(req: IncomingMessage, socket: Duplex, head: Buffer, onUpgrade?: (client: {
         send(data: string): void;
     }) => void): void;
     buildFallbackError(): Promise<void>;
     close(): void;
 }
-type FindSourceMapPayload = (sourceURL: string) => ModernSourceMapPayload | undefined;
-export declare function setBundlerFindSourceMapImplementation(findSourceMapImplementation: FindSourceMapPayload): void;
 export type ChangeSubscriptions = Map<string, Promise<AsyncIterableIterator<TurbopackResult>>>;
 export type ReadyIds = Set<string>;
 export type StartBuilding = (id: string, forceRebuild: boolean) => () => void;
@@ -83,5 +76,5 @@ export type ClientState = {
 };
 export type SendHmr = (id: string, payload: HMR_ACTION_TYPES) => void;
 export declare const FAST_REFRESH_RUNTIME_RELOAD = "Fast Refresh had to perform a full reload due to a runtime error.";
-export declare function createHotReloader(projectOptions: ProjectOptions, projectPath?: string, rootPath?: string): Promise<HotReloaderInterface>;
+export declare function createHotReloader(bundleOptions: BundleOptions, projectPath?: string, rootPath?: string): Promise<HotReloaderInterface>;
 export {};

package/esm/{hotReloader.js → hmr.js}

@@ -1,71 +1,30 @@
+import { nanoid } from "nanoid";
 import ws from "ws";
-import { join } from "path";
-import { pathToFileURL } from "url";
 import { projectFactory } from "./project";
 import { createDefineEnv, debounce, processIssues } from "./util";
-import { nanoid } from "nanoid";
 const wsServer = new ws.Server({ noServer: true });
 const sessionId = Math.floor(Number.MAX_SAFE_INTEGER * Math.random());
-/**
- * Replaces turbopack:///[project] with the specified project in the `source` field.
- */
-function rewriteTurbopackSources(projectRoot, sourceMap) {
-    if ("sections" in sourceMap) {
-        for (const section of sourceMap.sections) {
-            rewriteTurbopackSources(projectRoot, section.map);
-        }
-    }
-    else {
-        for (let i = 0; i < sourceMap.sources.length; i++) {
-            sourceMap.sources[i] = pathToFileURL(join(projectRoot, sourceMap.sources[i].replace(/turbopack:\/\/\/\[project\]/, ""))).toString();
-        }
-    }
-}
-function getSourceMapFromTurbopack(project, projectRoot, sourceURL) {
-    let sourceMapJson = null;
-    try {
-        sourceMapJson = project.getSourceMapSync(sourceURL);
-    }
-    catch (err) { }
-    if (sourceMapJson === null) {
-        return undefined;
-    }
-    else {
-        const payload = JSON.parse(sourceMapJson);
-        // The sourcemap from Turbopack is not yet written to disk so its `sources`
-        // are not absolute paths yet. We need to rewrite them to be absolute paths.
-        rewriteTurbopackSources(projectRoot, payload);
-        return payload;
-    }
-}
-// Find a source map using the bundler's API.
-// This is only a fallback for when Node.js fails to due to bugs e.g. https://github.com/nodejs/node/issues/52102
-// TODO: Remove once all supported Node.js versions are fixed.
-// TODO(veil): Set from Webpack as well
-let bundlerFindSourceMapPayload = () => undefined;
-export function setBundlerFindSourceMapImplementation(findSourceMapImplementation) {
-    bundlerFindSourceMapPayload = findSourceMapImplementation;
-}
 export const FAST_REFRESH_RUNTIME_RELOAD = "Fast Refresh had to perform a full reload due to a runtime error.";
-export async function createHotReloader(projectOptions, projectPath, rootPath) {
-    var _a, _b;
+export async function createHotReloader(bundleOptions, projectPath, rootPath) {
+    var _a;
     const createProject = projectFactory();
     const project = await createProject({
-        processEnv: (_a = projectOptions.processEnv) !== null && _a !== void 0 ? _a : {},
-        processDefineEnv: createDefineEnv({
-            config: projectOptions.config,
+        processEnv: (_a = bundleOptions.processEnv) !== null && _a !== void 0 ? _a : {},
+        defineEnv: createDefineEnv({
+            config: bundleOptions.config,
             dev: true,
-            optionDefineEnv: projectOptions.processDefineEnv,
+            optionDefineEnv: bundleOptions.defineEnv,
         }),
-        watch: (_b = projectOptions.watch) !== null && _b !== void 0 ? _b : {
-            enable: false,
+        watch: {
+            enable: true,
         },
         dev: true,
-        buildId: nanoid(),
+        buildId: bundleOptions.buildId || nanoid(),
         config: {
-            ...projectOptions.config,
+            ...bundleOptions.config,
+            mode: "development",
             optimization: {
-                ...projectOptions.config.optimization,
+                ...bundleOptions.config.optimization,
                 minify: false,
                 moduleIds: "named",
             },
@@ -75,7 +34,6 @@ export async function createHotReloader(projectOptions, projectPath, rootPath) {
     }, {
         persistentCaching: true,
     });
-    setBundlerFindSourceMapImplementation(getSourceMapFromTurbopack.bind(null, project, projectOptions.projectPath));
     const entrypointsSubscription = project.entrypointsSubscribe();
     let currentEntriesHandlingResolve;
     let currentEntriesHandling = new Promise((resolve) => (currentEntriesHandlingResolve = resolve));
@@ -108,9 +66,6 @@ export async function createHotReloader(projectOptions, projectPath, rootPath) {
     const sendEnqueuedMessagesDebounce = debounce(sendEnqueuedMessages, 2);
     function sendTurbopackMessage(payload) {
         var _a;
-        // TODO(PACK-2049): For some reason we end up emitting hundreds of issues messages on bigger apps,
-        //   a lot of which are duplicates.
-        //   They are currently not handled on the client at all, so might as well not send them for now.
         payload.diagnostics = [];
         payload.issues = [];
         for (const client of clients) {
@@ -174,10 +129,9 @@ export async function createHotReloader(projectOptions, projectPath, rootPath) {
     const hotReloader = {
         turbopackProject: project,
         serverStats: null,
-        // TODO: Figure out if socket type can match the HotReloaderInterface
         onHMR(req, socket, head, onUpgrade) {
             wsServer.handleUpgrade(req, socket, head, (client) => {
-                onUpgrade(client);
+                onUpgrade === null || onUpgrade === void 0 ? void 0 : onUpgrade(client);
                 const subscriptions = new Map();
                 clients.add(client);
                 clientStates.set(client, {

package/esm/index.d.ts

@@ -1,15 +1,14 @@
-import { NapiDiagnostic, NapiIssue } from "./binding";
-export { build } from "./build";
-export { watch } from "./watch";
-declare global {
-    export type TurbopackResult<T = {}> = T & {
-        issues: NapiIssue[];
-        diagnostics: NapiDiagnostic[];
-    };
-    export type RefCell = {
-        readonly __tag: unique symbol;
-    };
-    export type ExternalEndpoint = {
-        readonly __tag: unique symbol;
-    };
+import { build } from "./build";
+import { serve } from "./dev";
+import * as webpackCompat from "./webpackCompat";
+export { build };
+export { serve };
+declare const utoopack: {
+    build: typeof build;
+    serve: typeof serve;
+};
+export default utoopack;
+export type WebpackConfig = webpackCompat.WebpackConfig;
+declare namespace utoopack {
+    type WebpackConfig = webpackCompat.WebpackConfig;
 }

package/esm/index.js

@@ -1,2 +1,6 @@
-export { build } from "./build";
-export { watch } from "./watch";
+import { build } from "./build";
+import { serve } from "./dev";
+export { build };
+export { serve };
+const utoopack = { build, serve };
+export default utoopack;

package/esm/mkcert.d.ts

@@ -0,0 +1,7 @@
+export interface SelfSignedCertificate {
+    key: string;
+    cert: string;
+    rootCA?: string;
+}
+export declare function createSelfSignedCertificate(host?: string, certDir?: string): Promise<SelfSignedCertificate | undefined>;
+export declare function getCacheDirectory(fileDirectory: string, envPath?: string): string;