@stubber/virtual-worker 1.5.1 → 1.5.2

package/app/commands/browser/browser_manage_sessions.js

@@ -21,7 +21,7 @@ export const browser_manage_sessions = async (params, stubber_context) => {
     return await clear_chromium_sessions(session_ids);
   } else if (operation === "delete_all") {
     const sessions_result = await list_chromium_sessions();
-    const all_session_ids = sessions_result.payload.sessions;
+    const all_session_ids = sessions_result.payload.session_ids;
     return await clear_chromium_sessions(all_session_ids);
   } else {
     return create_error_conceptual({ message: "Invalid operation. Must be 'list', 'delete', or 'delete_all'." });

package/app/commands/run_commands.js

@@ -5,18 +5,11 @@ import { all_commands } from "./index.js";
 import { create_success } from "#app/functions/create_success.js";
 import { create_error_technical } from "#app/functions/create_error_technical.js";
 import { create_error_conceptual } from "#app/functions/create_error_conceptual.js";
+import * as z from "zod";
 
 /**
- * @typedef {object} Command
- * @property {string} commandtype - The type of command to run.
- * @property {object} [params] - The parameters for the command.
- * @property {bool} [continue_on_error] - Whether to continue on error.
- * @property {number} [__order] - The order in which to run the command.
- * @property {string[]} [conditions] - Array of jsonata conditions to evaluate.
- */
-
-/**
- * @param {{[key: string]: Command}} commands
+ * @param {object} task
+ * @param {z.infer<typeof import("#app/controllers/virtual_worker_task.js").params_schema>} task.params
  * @param {object} _stubber - The context this task is being ran in.
  */
 export const run_commands = async (task, _stubber) => {
@@ -41,6 +34,10 @@ export const run_commands = async (task, _stubber) => {
   for (const [command_name, command] of command_entries) {
     console.log(`Starting command: ${command_name}`, command);
 
+    if (task.params.browser_session_id) {
+      command.params.session_id = task.params.browser_session_id;
+    }
+
     // Check if the command has conditions and evaluate them
     const conditions_met = await evaluate_command_conditions(command, cloned_context);
     if (!conditions_met) {

package/app/controllers/virtual_worker_task.js

@@ -2,6 +2,7 @@ import { run_commands } from "#app/commands/run_commands.js";
 import { task_schema } from "#lib/interfaces/http/routers/stubber_task_schema.js";
 import * as z from "zod";
 import { worker_status } from "./virtual_worker_status.js";
+import { config } from "#root/config/main.js";
 
 const command_schema = z.looseObject({
   commandtype: z.string().min(1),
@@ -11,8 +12,9 @@ const command_schema = z.looseObject({
   conditions: z.array(z.string().or(z.boolean())).optional(),
 });
 
-const params_schema = z.looseObject({
+export const params_schema = z.looseObject({
   commands: z.record(z.string(), command_schema),
+  browser_session_id: z.string().min(1).optional(),
 });
 
 /**
@@ -27,5 +29,22 @@ export const virtual_worker_task = async (task) => {
 
   const task_result = await run_commands(task, stubber);
 
+  let vnc_url = `${config.vnc_origin}/vnc?worker_name=${encodeURIComponent(config.worker_name)}&orguuid=${
+    task._stubber.orguuid
+  }`;
+
+  if (config.api_key) {
+    vnc_url += `&api_key=${config.api_key}`;
+  }
+
+  const worker_name = config.worker_name;
+
+  task_result.details = {
+    worker_info: {
+      vnc_url: config.vnc_origin ? vnc_url : null,
+      worker_name,
+    },
+  };
+
   return task_result;
 };

package/app/helpers/get_chromium_page.js

@@ -22,6 +22,8 @@ export const get_chromium_page = async (params, stubber_context) => {
     return create_error_conceptual({ message: "session_id is required to get a Chromium page." });
   }
 
+  console.log("get_chromium_page called with session_id:", session_id);
+
   let slow_mo = params?.slow_mo || process.env.SLOW_MO || 0;
 
   slow_mo = Number(slow_mo);
@@ -40,6 +42,10 @@ export const get_chromium_page = async (params, stubber_context) => {
       // eslint-disable-next-line id-match
       slowMo: slow_mo,
     });
+    browser.on("disconnected", () => {
+      console.log("Chromium browser disconnected. Cleaning up browser instance.");
+      browser = null;
+    });
   }
 
   // Create a new context per stubref if not already created
@@ -52,6 +58,10 @@ export const get_chromium_page = async (params, stubber_context) => {
     contexts[session_id] = {
       context,
     };
+    context.on("close", () => {
+      console.log(`Chromium context for session_id=${session_id} closed. Cleaning up.`);
+      delete contexts[session_id];
+    });
   }
 
   const context = contexts[session_id].context;
@@ -71,27 +81,27 @@ export const list_chromium_sessions = () => {
   return create_success({
     message: "Successfully listed Chromium sessions.",
     payload: {
-      sessions: Object.keys(contexts),
+      session_ids: Object.keys(contexts),
     },
   });
 };
 
 export const clear_chromium_sessions = async (session_ids) => {
   try {
-    let cleared_sessions = [];
+    let cleared_session_ids = [];
     for (const session_id of session_ids) {
       const context_entry = contexts[session_id];
       if (context_entry) {
         await context_entry.context.close();
         delete contexts[session_id];
-        cleared_sessions.push(session_id);
+        cleared_session_ids.push(session_id);
       }
     }
     return create_success({
       message: "Successfully cleared specified Chromium sessions.",
       payload: {
-        cleared_sessions,
-        sessions: Object.keys(contexts),
+        cleared_session_ids,
+        session_ids: Object.keys(contexts),
       },
     });
   } catch (error) {

package/devel/tests.sh

@@ -0,0 +1,24 @@
+curl -X POST "http://localhost:3000/api/v1/task-gateway/virtual_worker_send_commands" \
+  -H "Content-Type: application/json" \
+  -H "stubber-virtual-worker-apikey: 123-456-789" \
+  -d '{
+    "task": {
+      "tasktype": "virtual_worker_send_commands",
+      "task_name": "virtual_worker_send_commands",
+      "params": {
+        "commands": {
+            "command_1": {
+                "commandtype": "browser_navigate",
+                "params": {
+                    "url": "https://fast.com",
+                    "session_id": "test-session-002"
+                }
+            }
+        }
+      },
+      "_stubber": {
+        "orguuid": "c8cfd7f1-8015-43ff-8878-d22c136a2325",
+        "stubref": "my-stub-ref"
+      }
+    }
+  }'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stubber/virtual-worker",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Template to easily create a node app and keep development standards",
   "main": "app.js",
   "directories": {

package/app_config.js

@@ -1,6 +0,0 @@
-export const config = {
-  WORKER_CONNECT_URL: process.env.WORKER_CONNECT_URL,
-  WORKER_SIGNATURE: process.env.WORKER_SIGNATURE,
-  WORKER_WORKERUUID: process.env.WORKER_WORKERUUID,
-  WORKER_GROUPS: process.env.WORKER_GROUPS?.split(",") || [],
-};