@memrov2/pentcloud-metasploit 0.1.0 → 0.1.1-dev.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memrov2/pentcloud-metasploit",
-  "version": "0.1.0",
+  "version": "0.1.1-dev.0",
   "type": "module",
   "license": "MIT",
   "description": "Cloudflare-native metasploit tool pack",
@@ -33,6 +33,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@memrov2/pentcloud-tool-runtime": "0.1.0"
+    "@memrov2/pentcloud-tool-runtime": "0.1.1-dev.0"
   }
 }

package/src/worker.d.mts

@@ -1,5 +1,7 @@
 import { DurableObject } from "cloudflare:workers";
 export declare class MetasploitRunner extends DurableObject {
+  ready(): Promise<{ image: string; instance: "standard-2" }>;
   fetch(request: Request): Promise<Response>;
+  retire(): Promise<{ stopped: boolean; retired: true }>;
   stop(): Promise<{ stopped: boolean }>;
 }

package/src/worker.mjs

@@ -21,6 +21,7 @@ export class MetasploitRunner extends DurableObject {
     return result;
   }
   async #ready() {
+      if (await this.ctx.storage.get("retired")) throw new Error("Owned tool runtime is retired");
     const c = this.ctx.container,
       image = c.images.metasploit;
     if (!image) throw new Error("Configure the metasploit named image");
@@ -58,11 +59,11 @@ export class MetasploitRunner extends DurableObject {
           MSF_MCP_MIN_THREADS: "1",
           MSF_MCP_MAX_THREADS: "4",
         },
-        instance: { vcpu: 2, memoryMib: 2048, diskMb: 8000 },
+        instance: "standard-2",
         enableInternet: true,
         labels: { pack: "metasploit", version: lock.packVersion },
       });
-    await c.setInactivityTimeout(120000);
+    await c.setInactivityTimeout(240000);
     const deadline = Date.now() + 180000;
     let verified = false;
     while (Date.now() < deadline) {
@@ -90,7 +91,7 @@ export class MetasploitRunner extends DurableObject {
             signal: AbortSignal.timeout(5000),
           });
         await r.body?.cancel();
-        if ([200, 400, 405, 406].includes(r.status)) return token;
+        if ([200, 400, 405, 406].includes(r.status)) {await c.setInactivityTimeout(120000);return token;}
         if (r.status === 401)
           throw new Error("Internal MCP authentication failed");
       } catch (error) {
@@ -102,6 +103,12 @@ export class MetasploitRunner extends DurableObject {
       "Official Metasploit MCP server did not become ready within 180 seconds",
     );
   }
+  ready() {
+    return this.#serial(async () => {
+      await this.#ready();
+      return { image: this.ctx.container.images.metasploit, instance: "standard-2" };
+    });
+  }
   async fetch(request) {
     const url = new URL(request.url);
     if (
@@ -126,6 +133,14 @@ export class MetasploitRunner extends DurableObject {
         }),
       );
   }
+  retire() {
+    return this.#serial(async () => {
+      await this.ctx.storage.put("retired", true);
+      if (this.ctx.container.running) await this.ctx.container.destroy();
+      await this.ctx.storage.delete("mcp-token");
+      return { stopped: !this.ctx.container.running, retired: true };
+    });
+  }
   stop() {
     return this.#serial(async () => {
       if (this.ctx.container.running) await this.ctx.container.destroy();