@datadog/datadog-ci 3.3.0 → 3.4.0

package/dist/commands/synthetics/__tests__/build-and-test.test.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -31,103 +8,84 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const http = __importStar(require("http"));
-const axios_1 = __importDefault(require("axios"));
 const build_and_test_1 = require("../build-and-test");
 const fixtures_1 = require("./fixtures");
 const NODE_COMMAND = process.execPath;
-describe('build-and-test - spawnBuildPluginDevServer', () => {
-    beforeEach(() => {
-        jest.resetAllMocks();
-        jest.restoreAllMocks();
-    });
+describe('build-and-test - buildAssets', () => {
+    const tearDowns = [];
+    afterEach(() => __awaiter(void 0, void 0, void 0, function* () {
+        for (let tearDown; (tearDown = tearDowns.pop());) {
+            yield tearDown();
+        }
+    }));
+    // This httpClient function should be self-contained, as its body will be injected as a string in the build command.
+    const httpClient = () => {
+        const url = process.env.DATADOG_SYNTHETICS_REPORT_BUILD_URL;
+        if (!url) {
+            throw new Error('DATADOG_SYNTHETICS_REPORT_BUILD_URL is not set');
+        }
+        void fetch(url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                outputDirectory: 'output-directory',
+                publicPath: 'prefix/',
+            }),
+        });
+    };
     test('alert when the build-plugin is not configured', () => __awaiter(void 0, void 0, void 0, function* () {
         // Given a build command without the build plugin configured
         const MOCKED_BUILD_COMMAND_NOT_CONFIGURED = `${NODE_COMMAND} -e "console.log('build successful')"`;
         // When calling spawnBuildPluginDevServer
-        const commandPromise = (0, build_and_test_1.spawnBuildPluginDevServer)(MOCKED_BUILD_COMMAND_NOT_CONFIGURED, fixtures_1.mockReporter);
+        const commandPromise = (0, build_and_test_1.buildAssets)(MOCKED_BUILD_COMMAND_NOT_CONFIGURED, fixtures_1.mockReporter);
         // Then it should throw when the command exits.
         yield expect(commandPromise).rejects.toThrow(build_and_test_1.UnconfiguredBuildPluginError);
     }));
-    test('wait for the dev server and return expected readiness and status even with delayed server startup', () => __awaiter(void 0, void 0, void 0, function* () {
-        // Given a dev server which listen on the port provided in the environment variable BUILD_PLUGINS_S8S_PORT.
-        // The implementation of this server is written as a function, and stringified into a single line,
-        // to be used in a node -e command.
-        const httpDevServer = () => {
-            setTimeout(() => {
-                http
-                    .createServer((_, res) => res
-                    .writeHead(200, {
-                    'Content-Type': 'application/json',
-                })
-                    .end(JSON.stringify({
-                    status: 'success',
-                    publicPrefix: 'prefix2/',
-                })))
-                    .listen(process.env.BUILD_PLUGINS_S8S_PORT);
-            }, 500);
-        };
-        const SERVER_IMPLEMENTATION = httpDevServer.toString().replace(/\n\s+/g, '');
-        const MOCKED_BUILD_COMMAND = `${NODE_COMMAND} -e "(${SERVER_IMPLEMENTATION})()"`;
+    test('advertise the right URL and returns the reported builds', () => __awaiter(void 0, void 0, void 0, function* () {
+        // Given a build command which reports a build with a publicPath and an outputDirectory to the url advertised by DATADOG_SYNTHETICS_REPORT_BUILD_URL
+        const CLIENT_IMPLEMENTATION = httpClient.toString().replace(/\n\s+/g, '');
+        const MOCKED_BUILD_COMMAND = `${NODE_COMMAND} -e "(${CLIENT_IMPLEMENTATION})()"`;
         // When calling spawnBuildPluginDevServer
-        const start = Date.now();
-        const command = yield (0, build_and_test_1.spawnBuildPluginDevServer)(MOCKED_BUILD_COMMAND, fixtures_1.mockReporter);
-        const end = Date.now();
-        // Then it should send requests to the dev server until it's ready to serve,
-        // and return the devServerUrl and the path prefix.
-        expect(command.devServerUrl).toBe('http://localhost:4000');
-        expect(command.publicPrefix).toBe('prefix2/');
-        // The server should resolve the promise at maximum 1 second after the server is ready
-        expect(end - start).toBeLessThanOrEqual(500 + 1000);
-        // Stop the command at the end of the test.
-        yield command.stop();
-    }));
-    test('should wait for dev server even if the build fails', () => __awaiter(void 0, void 0, void 0, function* () {
-        // Set up axios response sequence
-        jest
-            .spyOn(axios_1.default, 'get')
-            .mockRejectedValueOnce({ code: 'ECONNREFUSED' }) // First attempt: connection refused
-            .mockResolvedValueOnce({ data: { status: 'fail' } }) // Second attempt: build failed
-            .mockResolvedValueOnce({ data: { status: 'success', publicPrefix: 'prefix3/' } }); // Third attempt: success
-        // Setup isAxiosError for ECONNREFUSED error
-        jest.spyOn(axios_1.default, 'isAxiosError').mockImplementation((error) => {
-            return error && error.code === 'ECONNREFUSED';
-        });
-        // When calling spawnBuildPluginDevServer with any command
-        const MOCKED_BUILD_COMMAND = `${NODE_COMMAND} -e "setTimeout(() => {}, 100000)"`;
-        const command = yield (0, build_and_test_1.spawnBuildPluginDevServer)(MOCKED_BUILD_COMMAND, fixtures_1.mockReporter);
-        // Then it should wait until the build succeeds
-        expect(command.devServerUrl).toBe('http://localhost:4000');
-        expect(command.publicPrefix).toBe('prefix3/');
-        // Verify the axios GET was called multiple times
-        expect(axios_1.default.get).toHaveBeenCalledTimes(3);
-        // Stop the command at the end of the test.
-        yield command.stop();
+        const { builds, devServerUrl, stop } = yield (0, build_and_test_1.buildAssets)(MOCKED_BUILD_COMMAND, fixtures_1.mockReporter);
+        tearDowns.push(stop);
+        // Then it should return the devServerUrl and the path prefix.
+        expect(devServerUrl).toMatch(/\/_datadog-ci_\/build$/);
+        expect(builds).toEqual([
+            {
+                outputDirectory: 'output-directory',
+                publicPath: 'prefix/',
+            },
+        ]);
     }));
-    test('should handle non-OK status code from dev server', () => __awaiter(void 0, void 0, void 0, function* () {
-        // Set up axios error response
-        const axiosError = {
-            isAxiosError: true,
-            code: 'ERR_BAD_RESPONSE',
-            response: {
-                status: 500,
-                statusText: 'Internal Server Error',
+    test('rejects malformed builds', () => __awaiter(void 0, void 0, void 0, function* () {
+        // Given the devServer to which to report builds
+        const CLIENT_IMPLEMENTATION = httpClient.toString().replace(/\n\s+/g, '');
+        const MOCKED_BUILD_COMMAND = `${NODE_COMMAND} -e "(${CLIENT_IMPLEMENTATION})()"`;
+        const { devServerUrl, stop } = yield (0, build_and_test_1.buildAssets)(MOCKED_BUILD_COMMAND, fixtures_1.mockReporter);
+        tearDowns.push(stop);
+        // When sending a malformed build
+        const correctPayload = {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: {
+                outputDirectory: 'output-directory',
+                publicPath: 'prefix/',
             },
         };
-        jest.spyOn(axios_1.default, 'get').mockRejectedValueOnce(axiosError);
-        // Setup isAxiosError for the specific error
-        jest.spyOn(axios_1.default, 'isAxiosError').mockImplementation((error) => {
-            return error === axiosError;
-        });
-        // When calling spawnBuildPluginDevServer with any command
-        const MOCKED_BUILD_COMMAND = `${NODE_COMMAND} -e "setTimeout(() => {}, 100000)"`;
-        const commandPromise = (0, build_and_test_1.spawnBuildPluginDevServer)(MOCKED_BUILD_COMMAND, fixtures_1.mockReporter);
-        // Then it should throw with the server error
-        yield expect(commandPromise).rejects.toThrow('Dev server returned error: 500 Internal Server Error');
+        const [missingOutputDirectory, missingPublicPath] = yield Promise.all([
+            fetch(devServerUrl, Object.assign(Object.assign({}, correctPayload), { body: JSON.stringify(Object.assign(Object.assign({}, correctPayload.body), { outputDirectory: undefined })) })),
+            fetch(devServerUrl, Object.assign(Object.assign({}, correctPayload), { body: JSON.stringify(Object.assign(Object.assign({}, correctPayload.body), { publicPath: undefined })) })),
+        ]);
+        // Then it should reject the malformed builds reported.
+        expect(missingOutputDirectory.status).toBe(500);
+        expect(yield missingOutputDirectory.text()).toBe(`Internal Server Error: ${build_and_test_1.MalformedBuildError.message}`);
+        expect(missingPublicPath.status).toBe(500);
+        expect(yield missingPublicPath.text()).toBe(`Internal Server Error: ${build_and_test_1.MalformedBuildError.message}`);
     }));
 });
 //# sourceMappingURL=build-and-test.test.js.map

package/dist/commands/synthetics/__tests__/build-and-test.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-and-test.test.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/__tests__/build-and-test.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build-and-test.test.js","sourceRoot":"","sources":["../../../../src/commands/synthetics/__tests__/build-and-test.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sDAAgG;AAEhG,yCAAuC;AAEvC,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAA;AAErC,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,MAAM,SAAS,GAA4B,EAAE,CAAA;IAC7C,SAAS,CAAC,GAAS,EAAE;QACnB,KAAK,IAAI,QAAQ,EAAE,CAAC,QAAQ,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,GAAI;YACjD,MAAM,QAAQ,EAAE,CAAA;SACjB;IACH,CAAC,CAAA,CAAC,CAAA;IAEF,oHAAoH;IACpH,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAA;QAC3D,IAAI,CAAC,GAAG,EAAE;YACR,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;SAClE;QACD,KAAK,KAAK,CAAC,GAAG,EAAE;YACd,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,eAAe,EAAE,kBAAkB;gBACnC,UAAU,EAAE,SAAS;aACtB,CAAC;SACH,CAAC,CAAA;IACJ,CAAC,CAAA;IAED,IAAI,CAAC,+CAA+C,EAAE,GAAS,EAAE;QAC/D,4DAA4D;QAC5D,MAAM,mCAAmC,GAAG,GAAG,YAAY,uCAAuC,CAAA;QAElG,yCAAyC;QACzC,MAAM,cAAc,GAAG,IAAA,4BAAW,EAAC,mCAAmC,EAAE,uBAAY,CAAC,CAAA;QAErF,+CAA+C;QAC/C,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,6CAA4B,CAAC,CAAA;IAC5E,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,yDAAyD,EAAE,GAAS,EAAE;QACzE,oJAAoJ;QACpJ,MAAM,qBAAqB,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QACzE,MAAM,oBAAoB,GAAG,GAAG,YAAY,SAAS,qBAAqB,MAAM,CAAA;QAEhF,yCAAyC;QACzC,MAAM,EAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAC,GAAG,MAAM,IAAA,4BAAW,EAAC,oBAAoB,EAAE,uBAAY,CAAC,CAAA;QAC1F,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEpB,8DAA8D;QAC9D,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAA;QACtD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB;gBACE,eAAe,EAAE,kBAAkB;gBACnC,UAAU,EAAE,SAAS;aACtB;SACF,CAAC,CAAA;IACJ,CAAC,CAAA,CAAC,CAAA;IAEF,IAAI,CAAC,0BAA0B,EAAE,GAAS,EAAE;QAC1C,gDAAgD;QAChD,MAAM,qBAAqB,GAAG,UAAU,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QACzE,MAAM,oBAAoB,GAAG,GAAG,YAAY,SAAS,qBAAqB,MAAM,CAAA;QAEhF,MAAM,EAAC,YAAY,EAAE,IAAI,EAAC,GAAG,MAAM,IAAA,4BAAW,EAAC,oBAAoB,EAAE,uBAAY,CAAC,CAAA;QAClF,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEpB,iCAAiC;QACjC,MAAM,cAAc,GAAG;YACrB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE;gBACJ,eAAe,EAAE,kBAAkB;gBACnC,UAAU,EAAE,SAAS;aACtB;SACF,CAAA;QACD,MAAM,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpE,KAAK,CAAC,YAAY,kCACb,cAAc,KACjB,IAAI,EAAE,IAAI,CAAC,SAAS,iCAAK,cAAc,CAAC,IAAI,KAAE,eAAe,EAAE,SAAS,IAAE,IAC1E;YACF,KAAK,CAAC,YAAY,kCACb,cAAc,KACjB,IAAI,EAAE,IAAI,CAAC,SAAS,iCAAK,cAAc,CAAC,IAAI,KAAE,UAAU,EAAE,SAAS,IAAE,IACrE;SACH,CAAC,CAAA;QAEF,uDAAuD;QACvD,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC/C,MAAM,CAAC,MAAM,sBAAsB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,0BAA0B,oCAAmB,CAAC,OAAO,EAAE,CAAC,CAAA;QAEzG,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC1C,MAAM,CAAC,MAAM,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,0BAA0B,oCAAmB,CAAC,OAAO,EAAE,CAAC,CAAA;IACtG,CAAC,CAAA,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/commands/synthetics/build-and-test.d.ts

@@ -1,8 +1,25 @@
+/// <reference types="node" />
+import * as http from 'http';
 import { MainReporter } from './interfaces';
-export declare const DEFAULT_BUILD_PLUGIN_PORT = 4000;
+interface ReportedBuild {
+    outputDirectory: string;
+    publicPath: string;
+}
 export declare const UnconfiguredBuildPluginError: Error;
-export declare const spawnBuildPluginDevServer: (buildCommand: string, reporter: MainReporter) => Promise<{
+export declare const MalformedBuildError: Error;
+declare const routeVerbs: readonly ["get", "post", "put", "patch", "delete"];
+type RouteVerb = typeof routeVerbs[number];
+export type Routes = Record<string, {
+    [key in RouteVerb]?: (req: http.IncomingMessage, res: http.ServerResponse) => Promise<void>;
+}>;
+export type RequestHandlerOptions = {
+    builds: ReportedBuild[];
+    root?: string;
+    routes?: Routes;
+};
+export declare const buildAssets: (buildCommand: string, reporter: MainReporter) => Promise<{
+    builds: ReportedBuild[];
     devServerUrl: string;
-    publicPrefix: string;
     stop: () => Promise<void>;
 }>;
+export {};

package/dist/commands/synthetics/build-and-test.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,95 +31,186 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.spawnBuildPluginDevServer = exports.UnconfiguredBuildPluginError = exports.DEFAULT_BUILD_PLUGIN_PORT = void 0;
+exports.buildAssets = exports.MalformedBuildError = exports.UnconfiguredBuildPluginError = void 0;
 const child_process_1 = require("child_process");
 const events_1 = require("events");
-const axios_1 = __importDefault(require("axios"));
-const internal_1 = require("./utils/internal");
-exports.DEFAULT_BUILD_PLUGIN_PORT = 4000;
+const fs_1 = require("fs");
+const http = __importStar(require("http"));
+const path = __importStar(require("path"));
+const REPORT_BUILD_PATHNAME = '/_datadog-ci_/build';
 exports.UnconfiguredBuildPluginError = new Error(`
 We couldn't detect the Datadog Build plugins within your build. Did you add it?
 If not, you can learn more about it here: https://github.com/DataDog/build-plugins#readme
 `);
-const watchBuildPluginServerReadiness = (buildPluginServerUrl, abortSignal) => __awaiter(void 0, void 0, void 0, function* () {
-    return (0, internal_1.poll)(() => __awaiter(void 0, void 0, void 0, function* () {
-        try {
-            const response = yield axios_1.default.get(buildPluginServerUrl, { signal: abortSignal });
-            const { status, publicPrefix = '' } = response.data;
-            if (status === 'success') {
+exports.MalformedBuildError = new Error(`Invalid payload. Expected payload is {\"outputDirectory\": string, \"publicPath\": string}`);
+const MIME_TYPES = {
+    default: 'application/octet-stream',
+    html: 'text/html; charset=UTF-8',
+    js: 'application/javascript',
+    css: 'text/css',
+    png: 'image/png',
+    jpg: 'image/jpg',
+    gif: 'image/gif',
+    ico: 'image/x-icon',
+    svg: 'image/svg+xml',
+};
+const isMIMEType = (mime) => {
+    return Object.keys(MIME_TYPES).includes(mime);
+};
+const routeVerbs = ['get', 'post', 'put', 'patch', 'delete'];
+const isRouteVerb = (verb) => {
+    return routeVerbs.includes(verb);
+};
+const fileExists = (filePath) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        yield fs_1.promises.access(filePath);
+        return true;
+    }
+    catch (_a) {
+        return false;
+    }
+});
+const prepareFile = (root = process.cwd(), builds, requestUrl) => __awaiter(void 0, void 0, void 0, function* () {
+    const staticPath = path.isAbsolute(root) ? root : path.resolve(process.cwd(), root);
+    for (const build of builds) {
+        if (requestUrl.startsWith(build.publicPath)) {
+            const url = new URL(requestUrl, 'http://127.0.0.1');
+            const filePath = path.join(path.resolve(staticPath, build.outputDirectory), // absolute path to the assets directory
+            path.relative(build.publicPath, url.pathname), // relative path to the file
+            url.pathname.endsWith('/') ? 'index.html' : '' // add index.html if the path ends with a slash
+            );
+            // Verify path is within the intended directory
+            const directDescendant = filePath.startsWith(path.resolve(staticPath, build.outputDirectory));
+            // Check if the file exists (only if it's withing the intended directory)
+            const found = directDescendant && (yield fileExists(filePath));
+            if (directDescendant && found) {
                 return {
-                    readiness: 'buildCommandReady',
-                    publicPrefix,
+                    found: true,
+                    ext: path.extname(filePath).substring(1).toLowerCase(),
+                    content: yield fs_1.promises.readFile(filePath, { encoding: 'utf-8' }),
                 };
             }
         }
-        catch (error) {
-            // If we got an http error with a response, return buildCommandErrored
-            if (axios_1.default.isAxiosError(error) && error.code !== 'ECONNREFUSED' && error.response) {
-                return {
-                    readiness: 'buildCommandErrored',
-                    error: new Error(`Dev server returned error: ${error.response.status} ${error.response.statusText}`),
-                };
+    }
+    return {
+        found: false,
+    };
+});
+const getRequestHandler = ({ builds, root, routes }) => (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    var _b, _c;
+    try {
+        // Handle routes.
+        const route = routes === null || routes === void 0 ? void 0 : routes[req.url || '/'];
+        if (route) {
+            const verb = (_c = (_b = req.method) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : '';
+            if (isRouteVerb(verb)) {
+                const handler = route[verb];
+                if (handler) {
+                    yield handler(req, res);
+                    return;
+                }
             }
-            // Otherwise ignore errors and continue polling in case the dev server is still starting
         }
-    }), abortSignal);
+        // Fallback to files.
+        const file = yield prepareFile(root, builds, req.url || '/');
+        if (file.found) {
+            const mimeType = isMIMEType(file.ext) ? MIME_TYPES[file.ext] : MIME_TYPES.default;
+            res.writeHead(200, { 'Content-Type': mimeType });
+            res.end(file.content);
+            return;
+        }
+        res.writeHead(404);
+        res.end();
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        res.writeHead(500, { 'Content-Type': MIME_TYPES.html });
+        res.end(`Internal Server Error: ${errorMessage}`);
+    }
 });
-const watchBuildCommandExit = (buildCommand) => __awaiter(void 0, void 0, void 0, function* () {
-    yield (0, events_1.once)(buildCommand, 'close');
-    return {
-        readiness: 'buildCommandExited',
-    };
+const getRequestBody = (req) => __awaiter(void 0, void 0, void 0, function* () {
+    const chunks = [];
+    req.on('data', (chunk) => chunks.push(chunk));
+    yield (0, events_1.once)(req, 'end');
+    return chunks.join('');
 });
-const spawnBuildPluginDevServer = (buildCommand, reporter) => __awaiter(void 0, void 0, void 0, function* () {
-    const buildPluginPort = exports.DEFAULT_BUILD_PLUGIN_PORT;
+const getReportedBuild = (payload) => {
+    const reportedBuild = JSON.parse(payload);
+    if ('outputDirectory' in reportedBuild &&
+        typeof reportedBuild.outputDirectory === 'string' &&
+        'publicPath' in reportedBuild &&
+        typeof reportedBuild.publicPath === 'string') {
+        return reportedBuild;
+    }
+    throw exports.MalformedBuildError;
+};
+const spawnDevServer = () => __awaiter(void 0, void 0, void 0, function* () {
+    const builds = [];
+    const requestHandler = getRequestHandler({
+        builds,
+        root: process.cwd(),
+        routes: {
+            [REPORT_BUILD_PATHNAME]: {
+                post: (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+                    const body = yield getRequestBody(req);
+                    const reportedBuild = getReportedBuild(body);
+                    builds.push(reportedBuild);
+                    res.end();
+                }),
+            },
+        },
+    });
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    const server = http.createServer(requestHandler);
+    server.listen();
+    yield (0, events_1.once)(server, 'listening');
+    return { builds, server, url: getBuildReportUrl(server) };
+});
+const buildAssets = (buildCommand, reporter) => __awaiter(void 0, void 0, void 0, function* () {
+    var _d, _e, _f, _g;
+    const { builds, server, url } = yield spawnDevServer();
     // Spawn the build command process with the BUILD_PLUGINS_S8S_PORT environment variable.
     const buildCommandProcess = (0, child_process_1.spawn)(buildCommand, [], {
-        env: { BUILD_PLUGINS_S8S_PORT: String(buildPluginPort) },
-        shell: true,
+        env: Object.assign({ DATADOG_SYNTHETICS_REPORT_BUILD_URL: url }, process.env),
+        shell: (_e = (_d = process.env.SHELL) !== null && _d !== void 0 ? _d : process.env.ComSpec) !== null && _e !== void 0 ? _e : true,
     });
-    // Wait for the build command to either exit, or provide a dev server serving the built assets.
-    const controller = new AbortController(); // used to abort the watcher and its http requests
-    const buildCommandExited = watchBuildCommandExit(buildCommandProcess);
-    const buildCommandReady = watchBuildPluginServerReadiness('http://localhost:' + String(buildPluginPort) + '/_datadog-ci_/build-status', controller.signal);
-    const buildCommandReturnValue = yield Promise.race([
-        buildCommandReady,
-        buildCommandExited,
-    ]);
-    controller.abort();
-    if (buildCommandReturnValue === undefined) {
-        yield killBuildCommand(buildCommandProcess, buildCommandExited);
-        throw new Error('Unexpected state: buildCommandReturnValue is undefined');
-    }
-    if (buildCommandReturnValue.readiness === 'buildCommandExited') {
-        reporter.error(exports.UnconfiguredBuildPluginError.message);
-        yield killBuildCommand(buildCommandProcess, buildCommandExited);
+    (_f = buildCommandProcess.stdout) === null || _f === void 0 ? void 0 : _f.pipe(process.stdout);
+    (_g = buildCommandProcess.stderr) === null || _g === void 0 ? void 0 : _g.pipe(process.stderr);
+    // Wait for the build command to finish
+    yield (0, events_1.once)(buildCommandProcess, 'close');
+    if (builds.length === 0) {
+        yield stopDevServer(server);
         throw exports.UnconfiguredBuildPluginError;
     }
-    if (buildCommandReturnValue.readiness === 'buildCommandErrored') {
-        reporter.error(buildCommandReturnValue.error.message);
-        yield killBuildCommand(buildCommandProcess, buildCommandExited);
-        throw buildCommandReturnValue.error;
-    }
-    const { publicPrefix = '' } = buildCommandReturnValue;
     // Once the build server is ready, return its URL with the advertised public prefix to run the tests against it.
     return {
-        devServerUrl: 'http://localhost:' + String(buildPluginPort),
-        publicPrefix,
-        stop: () => __awaiter(void 0, void 0, void 0, function* () { return killBuildCommand(buildCommandProcess, buildCommandExited); }),
+        builds,
+        devServerUrl: url,
+        stop: () => __awaiter(void 0, void 0, void 0, function* () { return stopDevServer(server); }),
     };
 });
-exports.spawnBuildPluginDevServer = spawnBuildPluginDevServer;
-const killBuildCommand = (buildCommandProcess, buildCommandExited) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
-    buildCommandProcess.kill();
-    (_a = buildCommandProcess.stdin) === null || _a === void 0 ? void 0 : _a.destroy();
-    (_b = buildCommandProcess.stdout) === null || _b === void 0 ? void 0 : _b.destroy();
-    (_c = buildCommandProcess.stderr) === null || _c === void 0 ? void 0 : _c.destroy();
-    yield buildCommandExited;
+exports.buildAssets = buildAssets;
+const getBuildReportUrl = (server) => {
+    var _a;
+    // net.Server can be listening on a named pipe, in which case the address is a string
+    // or not listening yet, in which case the address is null, which we cast to the 'undefined' string
+    // to meet the same condition as if it was a named pipe, and throw.
+    const serverAddress = (_a = server.address()) !== null && _a !== void 0 ? _a : 'undefined';
+    if (typeof serverAddress === 'string') {
+        throw new Error('Server address is not valid');
+    }
+    const url = new URL(serverAddress.family === 'IPv6'
+        ? `http://[${serverAddress.address}]:${serverAddress.port}`
+        : `http://${serverAddress.address}:${serverAddress.port}`);
+    url.pathname = REPORT_BUILD_PATHNAME;
+    return url.href;
+};
+const stopDevServer = (server) => __awaiter(void 0, void 0, void 0, function* () {
+    if (server.listening) {
+        const serverClosed = (0, events_1.once)(server, 'close');
+        server.close();
+        yield serverClosed;
+    }
 });
 //# sourceMappingURL=build-and-test.js.map

package/dist/commands/synthetics/build-and-test.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-and-test.js","sourceRoot":"","sources":["../../../src/commands/synthetics/build-and-test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"build-and-test.js","sourceRoot":"","sources":["../../../src/commands/synthetics/build-and-test.ts"],"names":[],"mappings":"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"}

package/dist/commands/synthetics/run-tests-command.js

@@ -132,12 +132,15 @@ class RunTestsCommand extends base_command_1.BaseCommand {
                     this.reporter.error('The `buildCommand` option is required for the `build-and-test` command.');
                     return 1;
                 }
-                const { devServerUrl, publicPrefix, stop } = yield (0, build_and_test_1.spawnBuildPluginDevServer)(this.config.buildCommand, this.reporter);
+                const { builds, devServerUrl, stop } = yield (0, build_and_test_1.buildAssets)(this.config.buildCommand, this.reporter);
                 this.tearDowns.push(stop);
+                const resourceUrlSubstitutionRegexes = builds.map(
+                // All of the resources matching the publicPath prefix will be redirected to the dev server.
+                (build) => `.*${build.publicPath}|${devServerUrl}/${build.publicPath}`);
                 this.config = (0, deep_extend_1.default)(this.config, {
                     tunnel: true,
                     defaultTestOverrides: {
-                        resourceUrlSubstitutionRegexes: [`.*${publicPrefix}|${devServerUrl}`],
+                        resourceUrlSubstitutionRegexes,
                     },
                 });
             }