testeranto 0.205.0 → 0.207.0

package/Dockerfile.mothership

@@ -1,11 +1,21 @@
-FROM node:18-alpine
+FROM node:18-alpine  AS dependencies
+
 # Install build tools for node-gyp and libxml2-utils for xmllint
 RUN apk add --update make g++ linux-headers python3 libxml2-utils
 WORKDIR /workspace
 COPY package*.json ./
 RUN npm install --legacy-peer-deps
-# Install Docker SDK
-# RUN npm install dockerode
+
+FROM node:18-alpine
+WORKDIR /workspace
+# Copy the pre-installed dependencies from the 'dependencies' stage
+# COPY --from=dependencies /app/node_modules ./node_modules
+# Copy the rest of your application source code
 # COPY . .
+# Define the command to run your application
+# CMD ["node", "src/index.js"]
+# Copy the bundled mothership file
+COPY ./dist/prebuild/mothership.mjs mothership.mjsasd
 EXPOSE 8080
-CMD ["npm", "run", "mothership"]
+# CMD ['ls']
+CMD ["node", "./dist/prebuild/mothership.mjs"]

package/Dockerfile.node

@@ -2,8 +2,10 @@ FROM node:18-alpine
 # Install build tools for node-gyp and libxml2-utils for xmllint
 RUN apk add --update make g++ linux-headers python3 libxml2-utils
 WORKDIR /workspace
+# Copy package files first to leverage Docker cache
 COPY package*.json ./
 RUN npm install --legacy-peer-deps
-# Install ts-node to run TypeScript files
-# RUN npm install -g ts-node typescript
-# COPY . .
+# Now copy the rest of the source code
+COPY ./src ./src
+Run yarn tsc ./src
+

package/bundle.js

@@ -4,15 +4,16 @@ import { sassPlugin } from 'esbuild-sass-plugin'
 await esbuild.build({
   outExtension: { '.js': '.mjs' },
   entryPoints: [
-    'src/init-docs.ts',
-    'src/esbuildConfigs/eslint-formatter-testeranto.ts',
-    'src/testeranto.ts'
+    // 'src/init-docs.ts',
+    // 'src/esbuildConfigs/eslint-formatter-testeranto.ts',
+    // 'src/testeranto.ts',
+    'src/mothership/mothership.ts',
   ],
   bundle: true,
   format: "esm",
   platform: "node",
   outdir: 'dist/prebuild',
-  packages: "external",
+  // packages: "external",
   supported: {
     "dynamic-import": true,
   },

package/dist/common/src/app/backend/PM_0.js

@@ -16,7 +16,10 @@ const recorders = {};
 const screenshots = {};
 class PM_0 {
     constructor(configs, projectName, mode) {
+        console.log("mark6", configs);
+        console.log("mark7", this.configs);
         this.configs = configs;
+        console.log("mark8", this.configs);
         this.mode = mode;
         this.projectName = projectName;
     }

package/dist/common/src/app/backend/PM_1_WithProcesses.js

@@ -175,6 +175,8 @@ class PM_1_WithProcesses extends PM_0_js_1.PM_0 {
                 }
             }
         };
+        console.log("mark5", configs);
+        console.log("mark1", this.configs);
         this.configs.tests.forEach(([t, rt, tr, sidecars]) => {
             this.ensureSummaryEntry(t);
             sidecars.forEach(([sidecarName]) => {

package/dist/common/src/app/backend/PM_2_WithTCP.js

@@ -17,6 +17,8 @@ const PM_1_WithProcesses_js_1 = require("./PM_1_WithProcesses.js");
 class PM_2_WithTCP extends PM_1_WithProcesses_js_1.PM_1_WithProcesses {
     constructor(configs, name, mode) {
         super(configs, name, mode);
+        console.log("mark2", this.configs);
+        console.log("mark3", configs);
         this.httpServer = http_1.default.createServer(this.handleHttpRequest.bind(this));
         this.wss = new ws_1.WebSocketServer({ server: this.httpServer });
         this.wss.on("connection", (ws) => {

package/dist/common/src/app/backend/PM_WithHelpo.js

@@ -12,6 +12,7 @@ const node_child_process_1 = require("node:child_process");
 // @ts-ignore: node-pty is a CommonJS module
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+// import { PM_1 } from "./PM_1_WithProcesses.js";
 const PM_WithGit_js_1 = require("./PM_WithGit.js");
 class PM_WithHelpo extends PM_WithGit_js_1.PM_WithGit {
     constructor(configs, name, mode) {

package/dist/common/src/app/backend/main.js

@@ -57,8 +57,8 @@ const PM_WithHelpo_js_1 = require("./PM_WithHelpo.js");
 const files = {};
 const screenshots = {};
 class PM_Main extends PM_WithHelpo_js_1.PM_WithHelpo {
-    constructor() {
-        super(...arguments);
+    constructor(configs, name, mode) {
+        super(configs, name, mode);
         this.launchPure = async (src, dest) => {
             console.log(ansi_colors_2.default.green(ansi_colors_2.default.inverse(`pure < ${src}`)));
             const processId = `pure-${src}-${Date.now()}`;
@@ -262,6 +262,7 @@ class PM_Main extends PM_WithHelpo_js_1.PM_WithHelpo {
             const command = `web test: ${src}`;
             // Create the promise
             const webPromise = (async () => {
+                var _a, _b;
                 this.bddTestIsRunning(src);
                 const reportDest = `testeranto/reports/${this.projectName}/${src
                     .split(".")
@@ -279,12 +280,16 @@ class PM_Main extends PM_WithHelpo_js_1.PM_WithHelpo {
                 });
                 const d = `${dest}?cacheBust=${Date.now()}`;
                 const logs = (0, utils_js_2.createLogStreams)(reportDest, "web");
+                (_a = logs.info) === null || _a === void 0 ? void 0 : _a.write("testing123");
+                (_b = logs.info) === null || _b === void 0 ? void 0 : _b.write("wtf");
                 return new Promise((resolve, reject) => {
                     this.browser
                         .newPage()
                         .then((page) => {
+                        // page.on("")
                         page.on("console", (log) => {
                             var _a, _b, _c, _d;
+                            console.log("mark9", log);
                             const msg = `${log.text()}\n`;
                             switch (log.type()) {
                                 case "info":
@@ -304,6 +309,8 @@ class PM_Main extends PM_WithHelpo_js_1.PM_WithHelpo {
                             }
                         });
                         page.on("close", () => {
+                            var _a;
+                            (_a = logs.info) === null || _a === void 0 ? void 0 : _a.write("close 1");
                             logs.writeExitCode(0);
                             logs.closeAll();
                         });
@@ -326,6 +333,8 @@ class PM_Main extends PM_WithHelpo_js_1.PM_WithHelpo {
                     })
                         .then(async (page) => {
                         const close = () => {
+                            var _a;
+                            (_a = logs.info) === null || _a === void 0 ? void 0 : _a.write("close2");
                             if (!files[src]) {
                                 files[src] = new Set();
                             }
@@ -336,21 +345,31 @@ class PM_Main extends PM_WithHelpo_js_1.PM_WithHelpo {
                             });
                         };
                         page.on("pageerror", (err) => {
-                            logs.writeExitCode(-1, err);
-                            console.log(ansi_colors_1.default.red(`web ! ${src} failed to execute No "tests.json" file was generated. Check ${reportDest}/error.log for more info`));
-                            this.bddTestIsNowDone(src, -1);
-                            close();
+                            var _a;
+                            (_a = logs.info) === null || _a === void 0 ? void 0 : _a.write("pageerror");
+                            // logs.writeExitCode(-1, err);
+                            // console.log(
+                            //   ansiColors.red(
+                            //     `web ! ${src} failed to execute No "tests.json" file was generated. Check ${reportDest}/error.log for more info`
+                            //   )
+                            // );
+                            // this.bddTestIsNowDone(src, -1);
+                            // close();
                             reject(err);
                         });
                         await page.goto(`file://${`${destFolder}.html`}`, {});
                         await page
                             .evaluate((0, utils_js_1.webEvaluator)(d, webArgz))
                             .then(async ({ fails, failed, features }) => {
+                            var _a;
+                            (_a = logs.info) === null || _a === void 0 ? void 0 : _a.write("\n idk1");
                             (0, utils_js_2.statusMessagePretty)(fails, src, "web");
                             this.bddTestIsNowDone(src, fails);
                             resolve();
                         })
                             .catch((e) => {
+                            var _a;
+                            (_a = logs.info) === null || _a === void 0 ? void 0 : _a.write("\n idk2");
                             console.log(ansi_colors_2.default.red(ansi_colors_2.default.inverse(e.stack)));
                             console.log(ansi_colors_2.default.red(ansi_colors_2.default.inverse(`web ! ${src} failed to execute. No "tests.json" file was generated. Check logs for more info`)));
                             // Create a minimal tests.json even on failure
@@ -367,6 +386,8 @@ class PM_Main extends PM_WithHelpo_js_1.PM_WithHelpo {
                             reject(e);
                         })
                             .finally(async () => {
+                            var _a;
+                            (_a = logs.info) === null || _a === void 0 ? void 0 : _a.write("\n idk3");
                             // Generate prompt files for Web tests
                             await this.generatePromptFiles(reportDest, src);
                             close();
@@ -555,26 +576,6 @@ class PM_Main extends PM_WithHelpo_js_1.PM_WithHelpo {
             })();
             this.addPromiseProcess(processId, golangPromise, command, "bdd-test", src, "golang");
         };
-        // private getGolangSourceFiles(src: string): string[] {
-        //   // Get all .go files in the same directory as the test
-        //   const testDir = path.dirname(src);
-        //   const files: string[] = [];
-        //   try {
-        //     const dirContents = fs.readdirSync(testDir);
-        //     dirContents.forEach((file) => {
-        //       if (file.endsWith(".go")) {
-        //         files.push(path.join(testDir, file));
-        //       }
-        //     });
-        //   } catch (error) {
-        //     console.error(`Error reading directory ${testDir}:`, error);
-        //   }
-        //   // Always include the main test file
-        //   if (!files.includes(src)) {
-        //     files.push(src);
-        //   }
-        //   return files;
-        // }
     }
     async startBuildProcesses() {
         const { nodeEntryPoints, webEntryPoints, pureEntryPoints } = (0, utils_js_1.getRunnables)(this.configs.tests, this.projectName);

package/dist/common/src/app/frontend/useFs.js

@@ -10,6 +10,7 @@ const useFs = () => {
     if (!context) {
         throw new Error("useFileService must be used within a FileServiceProvider");
     }
-    return context;
+    // Return as an array to make it iterable
+    return [context];
 };
 exports.useFs = useFs;

package/dist/common/src/mothership/mothership.js

@@ -0,0 +1,197 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+// import Docker from "dockerode";
+console.log("hello mothership");
+// const app = express();
+// app.use(express.json());
+// // const docker = new Docker();
+// // Track running services
+// const runningServices = new Map();
+// // Service to build file mapping
+// const serviceBuildFiles = {
+//   "node-build": "src/builders/node.ts",
+//   "web-build": "src/builders/web.ts",
+//   "golang-build": "src/builders/golang.ts",
+//   "python-build": "src/builders/python.ts",
+// };
+// // Automatically start build services on mothership startup
+// async function initializeServices() {
+//   console.log("Initializing build services...");
+//   for (const serviceName of Object.keys(serviceBuildFiles)) {
+//     try {
+//       // Get all containers
+//       // const containers = await docker.listContainers({ all: true });
+//       // Find the container for the requested service
+//       // const containerInfo = containers.find((container) =>
+//       //   container.Names.some((name) => name.includes(serviceName))
+//       // );
+//       // if (containerInfo) {
+//       //   // const container = docker.getContainer(containerInfo.Id);
+//       //   // Start the container if it's not running
+//       //   if (containerInfo.State !== "running") {
+//       //     console.log(`Starting ${serviceName}...`);
+//       //     await container.start();
+//       //   } else {
+//       //     console.log(`${serviceName} is already running`);
+//       //   }
+//       //   runningServices.set(serviceName, containerInfo.Id);
+//       // } else {
+//       //   console.warn(`Container for ${serviceName} not found`);
+//       // }
+//     } catch (error) {
+//       console.error(`Error initializing ${serviceName}:`, error);
+//     }
+//   }
+//   console.log("Build services initialization complete");
+// }
+// // Initialize services when mothership starts
+// initializeServices();
+// app.get("/", (req, res) => {
+//   res.send("Mothership is running");
+// });
+// // Start a specific service
+// app.post("/services/:serviceName/start", async (req, res) => {
+//   const { serviceName } = req.params;
+//   try {
+//     // // Get all containers
+//     // const containers = await docker.listContainers({ all: true });
+//     // // Find the container for the requested service
+//     // const containerInfo = containers.find((container) =>
+//     //   container.Names.some((name) => name.includes(serviceName))
+//     // );
+//     // if (!containerInfo) {
+//     //   return res
+//     //     .status(404)
+//     //     .json({ error: `Service ${serviceName} not found` });
+//     // }
+//     // const container = docker.getContainer(containerInfo.Id);
+//     // // Start the container if it's not running
+//     // if (containerInfo.State !== "running") {
+//     //   await container.start();
+//     // }
+//     // runningServices.set(serviceName, containerInfo.Id);
+//     // res.status(200).json({
+//     //   status: "started",
+//     //   service: serviceName,
+//     //   containerId: containerInfo.Id,
+//     // });
+//   } catch (error) {
+//     console.error(`Error starting service ${serviceName}:`, error);
+//     res
+//       .status(500)
+//       .json({ error: `Failed to start service: ${error.message}` });
+//   }
+// });
+// // Stop a specific service
+// app.post("/services/:serviceName/stop", async (req, res) => {
+//   const { serviceName } = req.params;
+//   try {
+//     // const containerId = runningServices.get(serviceName);
+//     // if (!containerId) {
+//     //   return res
+//     //     .status(404)
+//     //     .json({ error: `Service ${serviceName} is not running` });
+//     // }
+//     // const container = docker.getContainer(containerId);
+//     // await container.stop();
+//     // runningServices.delete(serviceName);
+//     res.status(200).json({
+//       status: "stopped",
+//       service: serviceName,
+//     });
+//   } catch (error) {
+//     console.error(`Error stopping service ${serviceName}:`, error);
+//     res.status(500).json({ error: `Failed to stop service: ${error.message}` });
+//   }
+// });
+// // Get status of all services
+// app.get("/services", async (req, res) => {
+//   try {
+//     // const containers = await docker.listContainers({ all: true });
+//     // const services = containers
+//     //   .filter((container) =>
+//     //     container.Names.some((name) =>
+//     //       name.match(
+//     //         /_(node-build|web-build|golang-build|python-build|mothership)_/
+//     //       )
+//     //     )
+//     //   )
+//     //   .map((container) => ({
+//     //     name: container.Names[0].replace("/", ""),
+//     //     id: container.Id,
+//     //     status: container.State,
+//     //     image: container.Image,
+//     //   }));
+//     // res.status(200).json({ services });
+//   } catch (error) {
+//     console.error("Error listing services:", error);
+//     res
+//       .status(500)
+//       .json({ error: `Failed to list services: ${error.message}` });
+//   }
+// });
+// // Trigger a build in a specific service
+// app.post("/build/:serviceName", async (req, res) => {
+//   // const { serviceName } = req.params;
+//   // try {
+//   //   const containerId = runningServices.get(serviceName);
+//   //   if (!containerId) {
+//   //     return res
+//   //       .status(404)
+//   //       .json({ error: `Service ${serviceName} is not running` });
+//   //   }
+//   //   // const container = docker.getContainer(containerId);
+//   //   // Execute the build command in the container
+//   //   const buildFile = serviceBuildFiles[serviceName];
+//   //   if (!buildFile) {
+//   //     return res
+//   //       .status(400)
+//   //       .json({ error: `No build file configured for ${serviceName}` });
+//   //   }
+//   //   // Run the TypeScript build file using ts-node
+//   //   const exec = await container.exec({
+//   //     Cmd: ["npx", "ts-node", "--transpile-only", buildFile],
+//   //     AttachStdout: true,
+//   //     AttachStderr: true,
+//   //   });
+//   //   // Start the exec instance
+//   //   const stream = await exec.start({ hijack: true, stdin: false });
+//   //   // Collect output
+//   //   let output = "";
+//   //   stream.on("data", (chunk: Buffer) => {
+//   //     output += chunk.toString();
+//   //   });
+//   //   stream.on("end", () => {
+//   //     res.status(200).json({
+//   //       status: "build completed",
+//   //       service: serviceName,
+//   //       output: output,
+//   //     });
+//   //   });
+//   //   stream.on("error", (error) => {
+//   //     console.error(`Stream error for ${serviceName}:`, error);
+//   //     res.status(500).json({ error: `Build stream error: ${error.message}` });
+//   //   });
+//   // } catch (error) {
+//   //   console.error(`Error triggering build for ${serviceName}:`, error);
+//   //   res
+//   //     .status(500)
+//   //     .json({ error: `Failed to trigger build: ${error.message}` });
+//   // }
+// });
+// // Get build file for each service
+// app.get("/build-files", (req, res) => {
+//   res.status(200).json(serviceBuildFiles);
+// });
+// // Claim resource endpoint
+// app.get("/claim", (req, res) => {
+//   const { resource } = req.query;
+//   console.log(`Resource claimed: ${resource}`);
+//   res.status(200).json({ status: "claimed", resource });
+// });
+// export default (port: number) => {
+//   app.listen(port, () => {
+//     console.log(`Mothership listening on port ${port}`);
+//   });
+//   return app;
+// };

package/dist/common/src/testeranto.js

@@ -44,7 +44,9 @@ const readline_1 = __importDefault(require("readline"));
 const buildTemplates_1 = require("./utils/buildTemplates");
 const pitonoBuild_1 = require("./PM/pitonoBuild");
 const utils_1 = require("./app/backend/utils");
+const path_1 = __importDefault(require("path"));
 const { GolingvuBuild } = await Promise.resolve().then(() => __importStar(require("./PM/golingvuBuild")));
+const web_html_1 = __importDefault(require("./web.html"));
 // if (!process.env.GITHUB_CLIENT_ID) {
 //   console.error(`env var "GITHUB_CLIENT_ID" needs to be set!`);
 //   process.exit(-1);
@@ -113,53 +115,40 @@ Promise.resolve(`${configFilePath}`).then(s => __importStar(require(s))).then(as
         }
         fs_1.default.writeFileSync(`testeranto/reports/${projectName}/config.json`, JSON.stringify(config, null, 2));
     });
-    // const getSecondaryEndpointsPoints = (runtime?: IRunTime): string[] => {
-    //   const meta = (ts: ITestTypes[], st: Set<string>): Set<string> => {
-    //     ts.forEach((t) => {
-    //       if (t[1] === runtime) {
-    //         st.add(t[0]);
-    //       }
-    //       if (Array.isArray(t[3])) {
-    //         meta(t[3], st);
-    //       }
-    //     });
-    //     return st;
-    //   };
-    //   return Array.from(meta(config.tests, new Set()));
-    // };
+    const getSecondaryEndpointsPoints = (runtime) => {
+        const meta = (ts, st) => {
+            ts.forEach((t) => {
+                if (t[1] === runtime) {
+                    st.add(t[0]);
+                }
+                if (Array.isArray(t[3])) {
+                    meta(t[3], st);
+                }
+            });
+            return st;
+        };
+        return Array.from(meta(config.tests, new Set()));
+    };
     // Also handle pitono endpoints for HTML generation if needed
     // [...getSecondaryEndpointsPoints("python")].forEach(async (sourceFilePath) => {
     //   // You might want to generate specific files for pitono tests here
     //   console.log(`Pitono test found: ${sourceFilePath}`);
     // });
-    // Promise.resolve(
-    //   Promise.all(
-    //     [...getSecondaryEndpointsPoints("web")].map(async (sourceFilePath) => {
-    //       const sourceFileSplit = sourceFilePath.split("/");
-    //       const sourceDir = sourceFileSplit.slice(0, -1);
-    //       const sourceFileName = sourceFileSplit[sourceFileSplit.length - 1];
-    //       const sourceFileNameMinusJs = sourceFileName
-    //         .split(".")
-    //         .slice(0, -1)
-    //         .join(".");
-    //       const htmlFilePath = path.normalize(
-    //         `${process.cwd()}/testeranto/bundles/web/${testName}/${sourceDir.join(
-    //           "/"
-    //         )}/${sourceFileNameMinusJs}.html`
-    //       );
-    //       const jsfilePath = `./${sourceFileNameMinusJs}.mjs`;
-    //       const cssFilePath = `./${sourceFileNameMinusJs}.css`;
-    //       return fs.promises
-    //         .mkdir(path.dirname(htmlFilePath), { recursive: true })
-    //         .then((x) =>
-    //           fs.writeFileSync(
-    //             htmlFilePath,
-    //             webHtmlFrame(jsfilePath, htmlFilePath, cssFilePath)
-    //           )
-    //         );
-    //     })
-    //   )
-    // );
+    Promise.resolve(Promise.all([...getSecondaryEndpointsPoints("web")].map(async (sourceFilePath) => {
+        const sourceFileSplit = sourceFilePath.split("/");
+        const sourceDir = sourceFileSplit.slice(0, -1);
+        const sourceFileName = sourceFileSplit[sourceFileSplit.length - 1];
+        const sourceFileNameMinusJs = sourceFileName
+            .split(".")
+            .slice(0, -1)
+            .join(".");
+        const htmlFilePath = path_1.default.normalize(`${process.cwd()}/testeranto/bundles/web/${testName}/${sourceDir.join("/")}/${sourceFileNameMinusJs}.html`);
+        const jsfilePath = `./${sourceFileNameMinusJs}.mjs`;
+        const cssFilePath = `./${sourceFileNameMinusJs}.css`;
+        return fs_1.default.promises
+            .mkdir(path_1.default.dirname(htmlFilePath), { recursive: true })
+            .then((x) => fs_1.default.writeFileSync(htmlFilePath, (0, web_html_1.default)(jsfilePath, htmlFilePath, cssFilePath)));
+    })));
     const { nodeEntryPoints, nodeEntryPointSidecars, webEntryPoints, webEntryPointSidecars, pureEntryPoints, pureEntryPointSidecars, pythonEntryPoints, pythonEntryPointSidecars, golangEntryPoints, golangEntryPointSidecars, } = (0, utils_1.getRunnables)(config.tests, testName);
     // Debug logging to check if entry points are being found
     console.log("Node entry points:", Object.keys(nodeEntryPoints));