testeranto 0.205.0 → 0.206.0

package/docker-compose.yml

@@ -1,19 +1,19 @@
-version: '3.8'
+version: "3.8"
 
 services:
-  mothership:
-    build: 
-      context: .
-      dockerfile: Dockerfile.mothership
-    ports:
-      - "8080:8080"
-    environment:
-      - NODE_ENV=development
-    volumes:
-      - .:/workspace
-      - /var/run/docker.sock:/var/run/docker.sock
-    working_dir: /workspace
-    command: npm run mothership
+  # mothership:
+  #   build:
+  #     context: .
+  #     dockerfile: Dockerfile.mothership
+  #   ports:
+  #     - "8080:8080"
+  #   environment:
+  #     - NODE_ENV=development
+  #   volumes:
+  #     - .:/workspace
+  #     - /var/run/docker.sock:/var/run/docker.sock
+  #   working_dir: /workspace
+  #   # command: npm run mothership
 
   node-build:
     build:
@@ -23,51 +23,51 @@ services:
       - .:/workspace
       - node_modules:/workspace/node_modules
     working_dir: /workspace
-    command: tail -f /dev/null
+    # command: tail -f /dev/null
     environment:
       - NODE_ENV=development
-    depends_on:
-      - mothership
+    # depends_on:
+    #   - mothership
 
-  web-build:
-    build:
-      context: .
-      dockerfile: Dockerfile.web
-    volumes:
-      - .:/workspace
-      - web_build_node_modules:/workspace/node_modules
-    working_dir: /workspace
-    command: tail -f /dev/null
-    environment:
-      - NODE_ENV=development
-    depends_on:
-      - mothership
+  # web-build:
+  #   build:
+  #     context: .
+  #     dockerfile: Dockerfile.web
+  #   volumes:
+  #     - .:/workspace
+  #     - web_build_node_modules:/workspace/node_modules
+  #   working_dir: /workspace
+  #   command: tail -f /dev/null
+  #   environment:
+  #     - NODE_ENV=development
+  #   depends_on:
+  #     - mothership
 
-  golang-build:
-    build:
-      context: .
-      dockerfile: Dockerfile.golang
-    volumes:
-      - .:/workspace
-    working_dir: /workspace
-    command: tail -f /dev/null
-    environment:
-      - GOPATH=/workspace
-    depends_on:
-      - mothership
+  # golang-build:
+  #   build:
+  #     context: .
+  #     dockerfile: Dockerfile.golang
+  #   volumes:
+  #     - .:/workspace
+  #   working_dir: /workspace
+  #   command: tail -f /dev/null
+  #   environment:
+  #     - GOPATH=/workspace
+  #   depends_on:
+  #     - mothership
 
-  python-build:
-    build:
-      context: .
-      dockerfile: Dockerfile.python
-    volumes:
-      - .:/workspace
-    working_dir: /workspace
-    command: tail -f /dev/null
-    environment:
-      - PYTHONPATH=/workspace
-    depends_on:
-      - mothership
+  # python-build:
+  #   build:
+  #     context: .
+  #     dockerfile: Dockerfile.python
+  #   volumes:
+  #     - .:/workspace
+  #   working_dir: /workspace
+  #   command: tail -f /dev/null
+  #   environment:
+  #     - PYTHONPATH=/workspace
+  #   depends_on:
+  #     - mothership
 
 volumes:
   node_modules:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "testeranto",
   "description": "the AI powered BDD test framework for typescript projects",
-  "version": "0.205.0",
+  "version": "0.206.0",
   "engines": {
     "node": "18.18.0"
   },
@@ -13,7 +13,7 @@
   "author": "adam wong <adamwong246@gmail.com>",
   "license": "MIT",
   "scripts": {
-    "mothership": "tsx src/mothership/start.ts",
+    "mothership": "node dist/prebuild/mothership/index.mjs",
     "build-hard": "rm -rf testeranto/** && yarn build && yarn type-check; yarn t-init; cp dist/prebuild/App.*  testeranto; yarn t-build core once; yarn t-run core once",
     "build": "sh prebuild.sh; cp ./src/cjs-shim.js ./dist/cjs-shim.js; tsc -p tsconfig.module.json; tsc -p tsconfig.common.json; tsc -p tsconfig.types.json; sh postBuild.sh; yarn bundle",
     "build3": "yarn bundle",
@@ -84,6 +84,10 @@
       "import": "./src/WebSidecar.ts",
       "require": "./src/WebSidecar.ts"
     },
+    "./src/CoreTypes": {
+      "import": "./src/CoreTypes.ts",
+      "require": "./src/CoreTypes.ts"
+    },
     "./src/Types": {
       "import": "./src/Types.ts",
       "require": "./src/Types.ts"
@@ -189,6 +193,7 @@
     "@jest/globals": "^30.0.4",
     "@monaco-editor/react": "^4.7.0",
     "@types/chokidar": "^2.1.7",
+    "@types/dockerode": "3.3.40",
     "@types/eslint": "^9.6.1",
     "@types/fabric": "^5.3.10",
     "@types/file-saver": "^2.0.7",
@@ -207,7 +212,7 @@
     "chai": "^5.2.0",
     "chokidar": "^4.0.3",
     "chromium": "^3.0.3",
-    "dockernode": "^0.1.0",
+    "dockerode": "^4.0.9",
     "dynamic-base": "^1.1.2",
     "esbuild": "^0.20.1",
     "esbuild-plugin-external-package": "^1.0.0",

package/src/app/backend/PM_0.ts

@@ -31,7 +31,10 @@ export abstract class PM_0 {
   projectName: string;
 
   constructor(configs: IBuiltConfig, projectName: string, mode: IMode) {
+    console.log("mark6", configs);
+    console.log("mark7", this.configs);
     this.configs = configs;
+    console.log("mark8", this.configs);
     this.mode = mode;
     this.projectName = projectName;
   }

package/src/app/backend/PM_1_WithProcesses.ts

@@ -39,8 +39,6 @@ export abstract class PM_1_WithProcesses extends PM_0 {
   logStreams: Record<string, ReturnType<typeof createLogStreams>> = {};
   launchers: Record<string, () => void>;
 
-  configs: any;
-
   abstract launchNode(src: string, dest: string);
   abstract launchWeb(src: string, dest: string);
   abstract launchPure(src: string, dest: string);
@@ -98,6 +96,10 @@ export abstract class PM_1_WithProcesses extends PM_0 {
   constructor(configs: IBuiltConfig, name, mode) {
     super(configs, name, mode);
 
+    console.log("mark5", configs);
+
+    console.log("mark1", this.configs);
+
     this.configs.tests.forEach(([t, rt, tr, sidecars]) => {
       this.ensureSummaryEntry(t);
       sidecars.forEach(([sidecarName]) => {

package/src/app/backend/PM_2_WithTCP.ts

@@ -18,6 +18,9 @@ export abstract class PM_2_WithTCP extends PM_1_WithProcesses {
   constructor(configs: any, name: string, mode: string) {
     super(configs, name, mode);
 
+    console.log("mark2", this.configs);
+    console.log("mark3", configs);
+
     this.httpServer = http.createServer(this.handleHttpRequest.bind(this));
     this.wss = new WebSocketServer({ server: this.httpServer });
 

package/src/app/backend/PM_WithBuild.ts

@@ -6,8 +6,6 @@ import { IBuiltConfig } from "../../Types.js";
 import { PM_2_WithTCP } from "./PM_2_WithTCP.js";
 
 export abstract class PM_WithBuild extends PM_2_WithTCP {
-  configs: IBuiltConfig;
-
   currentBuildResolve: (() => void) | null = null;
   currentBuildReject: ((error: any) => void) | null = null;
 

package/src/app/backend/PM_WithHelpo.ts

@@ -27,7 +27,7 @@ import { spawnSync, ChildProcess } from "node:child_process";
 // @ts-ignore: node-pty is a CommonJS module
 import fs from "fs";
 import path from "path";
-import { PM_1 } from "./PM_1_WithProcesses.js";
+// import { PM_1 } from "./PM_1_WithProcesses.js";
 import { PM_WithGit } from "./PM_WithGit.js";
 
 interface ChatMessage {

package/src/app/backend/main.ts

@@ -31,6 +31,10 @@ const files: Record<string, Set<string>> = {};
 const screenshots: Record<string, Promise<Uint8Array>[]> = {};
 
 export class PM_Main extends PM_WithHelpo {
+  constructor(configs: any, name: string, mode: string) {
+    super(configs, name, mode);
+  }
+
   async startBuildProcesses(): Promise<void> {
     const { nodeEntryPoints, webEntryPoints, pureEntryPoints } = getRunnables(
       this.configs.tests,
@@ -513,11 +517,18 @@ export class PM_Main extends PM_WithHelpo {
 
       const logs = createLogStreams(reportDest, "web");
 
+      logs.info?.write("testing123");
+      logs.info?.write("wtf");
+
       return new Promise<void>((resolve, reject) => {
         this.browser
           .newPage()
+
           .then((page) => {
+            // page.on("")
             page.on("console", (log: ConsoleMessage) => {
+              console.log("mark9", log);
+
               const msg = `${log.text()}\n`;
 
               switch (log.type()) {
@@ -539,6 +550,7 @@ export class PM_Main extends PM_WithHelpo {
             });
 
             page.on("close", () => {
+              logs.info?.write("close 1");
               logs.writeExitCode(0);
               logs.closeAll();
             });
@@ -561,6 +573,8 @@ export class PM_Main extends PM_WithHelpo {
           })
           .then(async (page) => {
             const close = () => {
+              logs.info?.write("close2");
+
               if (!files[src]) {
                 files[src] = new Set();
               }
@@ -574,14 +588,15 @@ export class PM_Main extends PM_WithHelpo {
             };
 
             page.on("pageerror", (err: Error) => {
-              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();
+              logs.info?.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);
             });
 
@@ -590,11 +605,13 @@ export class PM_Main extends PM_WithHelpo {
             await page
               .evaluate(webEvaluator(d, webArgz))
               .then(async ({ fails, failed, features }: IFinalResults) => {
+                logs.info?.write("\n idk1");
                 statusMessagePretty(fails, src, "web");
                 this.bddTestIsNowDone(src, fails);
                 resolve();
               })
               .catch((e) => {
+                logs.info?.write("\n idk2");
                 console.log(ansiC.red(ansiC.inverse(e.stack)));
                 console.log(
                   ansiC.red(
@@ -626,6 +643,7 @@ export class PM_Main extends PM_WithHelpo {
                 reject(e);
               })
               .finally(async () => {
+                logs.info?.write("\n idk3");
                 // Generate prompt files for Web tests
                 await this.generatePromptFiles(reportDest, src);
                 close();

package/src/app/frontend/useFs.ts

@@ -12,5 +12,6 @@ export 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];
 };

package/src/mothership/mothership.ts

@@ -0,0 +1,218 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import express from "express";
+// 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;
+// };