@pixelbyte-software/pixcode 1.35.0 → 1.35.1

package/server/modules/orchestration/preview/preview-proxy.ts

@@ -1,60 +1,60 @@
-import type { RequestHandler, Router } from 'express';
-import express from 'express';
-
-import { getKnownPreviewPort } from '@/modules/orchestration/preview/port-watcher.js';
-
-function buildTargetUrl(port: number, path: string): string {
-  const event = getKnownPreviewPort(port);
-  const host = event?.host ?? '127.0.0.1';
-  return `http://${host}:${port}${path}`;
-}
-
-function proxyHandler(): RequestHandler {
-  return async (req, res) => {
-    const rawPort = Array.isArray(req.params.port) ? req.params.port[0] : req.params.port;
-    const port = Number.parseInt(rawPort, 10);
-    if (!Number.isFinite(port) || port <= 0 || !getKnownPreviewPort(port)) {
-      res.status(404).json({
-        error: {
-          code: 'PREVIEW_PORT_NOT_FOUND',
-          message: 'Preview port is not registered for an orchestration task.',
-        },
-      });
-      return;
-    }
-
-    const path = req.originalUrl.replace(/^\/preview\/\d+/, '') || '/';
-    const target = buildTargetUrl(port, path);
-    try {
-      const upstream = await fetch(target, {
-        method: req.method,
-        headers: {
-          accept: req.header('accept') ?? '*/*',
-          'user-agent': req.header('user-agent') ?? 'pixcode-preview-proxy',
-        },
-      });
-      res.status(upstream.status);
-      upstream.headers.forEach((value, key) => {
-        const lower = key.toLowerCase();
-        if (lower === 'content-encoding' || lower === 'content-length') return;
-        if (lower === 'x-frame-options' || lower === 'content-security-policy') return;
-        res.setHeader(key, value);
-      });
-      res.send(Buffer.from(await upstream.arrayBuffer()));
-    } catch (error) {
-      res.status(502).json({
-        error: {
-          code: 'PREVIEW_PROXY_FAILED',
-          message: error instanceof Error ? error.message : String(error),
-        },
-      });
-    }
-  };
-}
-
-export function createPreviewProxyRouter(): Router {
-  const router = express.Router();
-  router.use('/:port', proxyHandler());
-  router.use('/:port/*', proxyHandler());
-  return router;
-}
+import type { RequestHandler, Router } from 'express';
+import express from 'express';
+
+import { getKnownPreviewPort } from '@/modules/orchestration/preview/port-watcher.js';
+
+function buildTargetUrl(port: number, path: string): string {
+  const event = getKnownPreviewPort(port);
+  const host = event?.host ?? '127.0.0.1';
+  return `http://${host}:${port}${path}`;
+}
+
+function proxyHandler(): RequestHandler {
+  return async (req, res) => {
+    const portParam = req.params.port ?? req.params[0];
+    const rawPort = Array.isArray(portParam) ? portParam[0] : portParam;
+    const port = Number.parseInt(rawPort, 10);
+    if (!Number.isFinite(port) || port <= 0 || !getKnownPreviewPort(port)) {
+      res.status(404).json({
+        error: {
+          code: 'PREVIEW_PORT_NOT_FOUND',
+          message: 'Preview port is not registered for an orchestration task.',
+        },
+      });
+      return;
+    }
+
+    const path = req.originalUrl.replace(/^\/preview\/\d+/, '') || '/';
+    const target = buildTargetUrl(port, path);
+    try {
+      const upstream = await fetch(target, {
+        method: req.method,
+        headers: {
+          accept: req.header('accept') ?? '*/*',
+          'user-agent': req.header('user-agent') ?? 'pixcode-preview-proxy',
+        },
+      });
+      res.status(upstream.status);
+      upstream.headers.forEach((value, key) => {
+        const lower = key.toLowerCase();
+        if (lower === 'content-encoding' || lower === 'content-length') return;
+        if (lower === 'x-frame-options' || lower === 'content-security-policy') return;
+        res.setHeader(key, value);
+      });
+      res.send(Buffer.from(await upstream.arrayBuffer()));
+    } catch (error) {
+      res.status(502).json({
+        error: {
+          code: 'PREVIEW_PROXY_FAILED',
+          message: error instanceof Error ? error.message : String(error),
+        },
+      });
+    }
+  };
+}
+
+export function createPreviewProxyRouter(): Router {
+  const router = express.Router();
+  router.use(/^\/(\d+)(?:\/.*)?$/, proxyHandler());
+  return router;
+}

package/server/modules/orchestration/preview/types.ts

@@ -1,19 +1,19 @@
-export interface PortEvent {
-  taskId: string;
-  workspaceId?: string;
-  port: number;
-  host: string;
-  url: string;
-  processName?: string;
-  confidence: 'low' | 'medium' | 'high';
-  detectedAt: number;
-}
-
-export interface PreviewArtifactData {
-  url: string;
-  proxiedUrl: string;
-  port: number;
-  host: string;
-  processName?: string;
-  confidence: 'low' | 'medium' | 'high';
-}
+export interface PortEvent {
+  taskId: string;
+  workspaceId?: string;
+  port: number;
+  host: string;
+  url: string;
+  processName?: string;
+  confidence: 'low' | 'medium' | 'high';
+  detectedAt: number;
+}
+
+export interface PreviewArtifactData {
+  url: string;
+  proxiedUrl: string;
+  port: number;
+  host: string;
+  processName?: string;
+  confidence: 'low' | 'medium' | 'high';
+}

package/server/modules/orchestration/tasks/orchestration-task-store.ts

@@ -1,45 +1,45 @@
-import path from 'node:path';
-import os from 'node:os';
-
-import { JsonStore } from '@/database/json-store.js';
-import type { OrchestrationTask } from '@/modules/orchestration/tasks/orchestration-task.types.js';
-
-function defaultPath(): string {
-  return process.env.ORCHESTRATION_TASKS_PATH ??
-    path.join(os.homedir(), '.pixcode', 'orchestration-tasks.json');
-}
-
-export class OrchestrationTaskStore {
-  private store: JsonStore;
-
-  constructor(filePath = defaultPath()) {
-    this.store = new JsonStore(filePath, { orchestration_tasks: [] });
-  }
-
-  get(id: string): OrchestrationTask | undefined {
-    return this.store.findWhere('orchestration_tasks', (r: OrchestrationTask) => r.id === id) ?? undefined;
-  }
-
-  getByA2ATaskId(a2aTaskId: string): OrchestrationTask | undefined {
-    return this.store.findWhere('orchestration_tasks', (r: OrchestrationTask) => r.a2aTaskId === a2aTaskId) ?? undefined;
-  }
-
-  getByTaskMasterId(taskmasterId: string): OrchestrationTask | undefined {
-    return this.store.findWhere('orchestration_tasks', (r: OrchestrationTask) => r.taskmasterId === taskmasterId) ?? undefined;
-  }
-
-  list(projectId?: string): OrchestrationTask[] {
-    const tasks = this.store.filterWhere('orchestration_tasks', () => true) as OrchestrationTask[];
-    const sorted = tasks.sort((a, b) => b.createdAt - a.createdAt);
-    return projectId ? sorted.filter((task) => task.projectId === projectId) : sorted;
-  }
-
-  set(task: OrchestrationTask): void {
-    const existing = this.store.findWhere('orchestration_tasks', (r: OrchestrationTask) => r.id === task.id);
-    if (existing) {
-      this.store.updateWhere('orchestration_tasks', (r: OrchestrationTask) => r.id === task.id, task);
-    } else {
-      this.store.insert('orchestration_tasks', task, { autoId: false });
-    }
-  }
-}
+import path from 'node:path';
+import os from 'node:os';
+
+import { JsonStore } from '@/database/json-store.js';
+import type { OrchestrationTask } from '@/modules/orchestration/tasks/orchestration-task.types.js';
+
+function defaultPath(): string {
+  return process.env.ORCHESTRATION_TASKS_PATH ??
+    path.join(os.homedir(), '.pixcode', 'orchestration-tasks.json');
+}
+
+export class OrchestrationTaskStore {
+  private store: JsonStore;
+
+  constructor(filePath = defaultPath()) {
+    this.store = new JsonStore(filePath, { orchestration_tasks: [] });
+  }
+
+  get(id: string): OrchestrationTask | undefined {
+    return this.store.findWhere('orchestration_tasks', (r: OrchestrationTask) => r.id === id) ?? undefined;
+  }
+
+  getByA2ATaskId(a2aTaskId: string): OrchestrationTask | undefined {
+    return this.store.findWhere('orchestration_tasks', (r: OrchestrationTask) => r.a2aTaskId === a2aTaskId) ?? undefined;
+  }
+
+  getByTaskMasterId(taskmasterId: string): OrchestrationTask | undefined {
+    return this.store.findWhere('orchestration_tasks', (r: OrchestrationTask) => r.taskmasterId === taskmasterId) ?? undefined;
+  }
+
+  list(projectId?: string): OrchestrationTask[] {
+    const tasks = this.store.filterWhere('orchestration_tasks', () => true) as OrchestrationTask[];
+    const sorted = tasks.sort((a, b) => b.createdAt - a.createdAt);
+    return projectId ? sorted.filter((task) => task.projectId === projectId) : sorted;
+  }
+
+  set(task: OrchestrationTask): void {
+    const existing = this.store.findWhere('orchestration_tasks', (r: OrchestrationTask) => r.id === task.id);
+    if (existing) {
+      this.store.updateWhere('orchestration_tasks', (r: OrchestrationTask) => r.id === task.id, task);
+    } else {
+      this.store.insert('orchestration_tasks', task, { autoId: false });
+    }
+  }
+}

package/server/modules/orchestration/tasks/orchestration-task.routes.ts

@@ -1,73 +1,73 @@
-import express, { type Router } from 'express';
-import { orchestrationTaskService } from '@/modules/orchestration/tasks/orchestration-task.service.js';
-
-export function createOrchestrationTaskRouter(): Router {
-  const router = express.Router();
-  router.use(express.json({ limit: '2mb' }));
-
-  router.get('/tasks', (req, res) => {
-    const projectId = typeof req.query.projectId === 'string' ? req.query.projectId : undefined;
-    res.json({ tasks: orchestrationTaskService.list(projectId) });
-  });
-
-  router.post('/tasks', (req, res) => {
-    const projectId = typeof req.body?.projectId === 'string' ? req.body.projectId : 'default';
-    const title = typeof req.body?.title === 'string' ? req.body.title.trim() : '';
-    const description = typeof req.body?.description === 'string' ? req.body.description : undefined;
-    const taskmasterId = typeof req.body?.taskmasterId === 'string' ? req.body.taskmasterId : undefined;
-
-    if (!title) {
-      res.status(400).json({ error: { code: 'TITLE_REQUIRED', message: 'title is required' } });
-      return;
-    }
-
-    const task = orchestrationTaskService.create({ projectId, title, description, taskmasterId });
-    res.status(201).json(task);
-  });
-
-  router.post('/tasks/import-taskmaster', (req, res) => {
-    const projectId = typeof req.body?.projectId === 'string' ? req.body.projectId : 'default';
-    const entries = Array.isArray(req.body?.tasks) ? req.body.tasks : [];
-    const imported = entries
-      .map((entry: unknown) => {
-        if (!entry || typeof entry !== 'object') return null;
-        const record = entry as Record<string, unknown>;
-        const taskmasterId = typeof record.id === 'string' ? record.id : undefined;
-        const title = typeof record.title === 'string' ? record.title : undefined;
-        const description = typeof record.description === 'string' ? record.description : undefined;
-        if (!taskmasterId || !title) return null;
-        return orchestrationTaskService.upsertFromTaskMaster({ projectId, title, description, taskmasterId });
-      })
-      .filter(Boolean);
-
-    res.json({ tasks: imported, count: imported.length });
-  });
-
-  router.post('/tasks/:id/dispatch', async (req, res) => {
-    try {
-      const adapterId = typeof req.body?.adapterId === 'string' ? req.body.adapterId : '';
-      const isolation = req.body?.isolation;
-      if (!adapterId) {
-        res.status(400).json({ error: { code: 'ADAPTER_REQUIRED', message: 'adapterId is required' } });
-        return;
-      }
-      const task = await orchestrationTaskService.dispatch(req.params.id, { adapterId, isolation });
-      res.json(task);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      const status = message === 'TASK_NOT_FOUND' ? 404 : 400;
-      res.status(status).json({ error: { code: 'DISPATCH_FAILED', message } });
-    }
-  });
-
-  router.post('/tasks/:id/cancel', (req, res) => {
-    try {
-      const task = orchestrationTaskService.cancel(req.params.id);
-      res.json(task);
-    } catch {
-      res.status(404).json({ error: { code: 'TASK_NOT_FOUND', message: req.params.id } });
-    }
-  });
-
-  return router;
-}
+import express, { type Router } from 'express';
+import { orchestrationTaskService } from '@/modules/orchestration/tasks/orchestration-task.service.js';
+
+export function createOrchestrationTaskRouter(): Router {
+  const router = express.Router();
+  router.use(express.json({ limit: '2mb' }));
+
+  router.get('/tasks', (req, res) => {
+    const projectId = typeof req.query.projectId === 'string' ? req.query.projectId : undefined;
+    res.json({ tasks: orchestrationTaskService.list(projectId) });
+  });
+
+  router.post('/tasks', (req, res) => {
+    const projectId = typeof req.body?.projectId === 'string' ? req.body.projectId : 'default';
+    const title = typeof req.body?.title === 'string' ? req.body.title.trim() : '';
+    const description = typeof req.body?.description === 'string' ? req.body.description : undefined;
+    const taskmasterId = typeof req.body?.taskmasterId === 'string' ? req.body.taskmasterId : undefined;
+
+    if (!title) {
+      res.status(400).json({ error: { code: 'TITLE_REQUIRED', message: 'title is required' } });
+      return;
+    }
+
+    const task = orchestrationTaskService.create({ projectId, title, description, taskmasterId });
+    res.status(201).json(task);
+  });
+
+  router.post('/tasks/import-taskmaster', (req, res) => {
+    const projectId = typeof req.body?.projectId === 'string' ? req.body.projectId : 'default';
+    const entries = Array.isArray(req.body?.tasks) ? req.body.tasks : [];
+    const imported = entries
+      .map((entry: unknown) => {
+        if (!entry || typeof entry !== 'object') return null;
+        const record = entry as Record<string, unknown>;
+        const taskmasterId = typeof record.id === 'string' ? record.id : undefined;
+        const title = typeof record.title === 'string' ? record.title : undefined;
+        const description = typeof record.description === 'string' ? record.description : undefined;
+        if (!taskmasterId || !title) return null;
+        return orchestrationTaskService.upsertFromTaskMaster({ projectId, title, description, taskmasterId });
+      })
+      .filter(Boolean);
+
+    res.json({ tasks: imported, count: imported.length });
+  });
+
+  router.post('/tasks/:id/dispatch', async (req, res) => {
+    try {
+      const adapterId = typeof req.body?.adapterId === 'string' ? req.body.adapterId : '';
+      const isolation = req.body?.isolation;
+      if (!adapterId) {
+        res.status(400).json({ error: { code: 'ADAPTER_REQUIRED', message: 'adapterId is required' } });
+        return;
+      }
+      const task = await orchestrationTaskService.dispatch(req.params.id, { adapterId, isolation });
+      res.json(task);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      const status = message === 'TASK_NOT_FOUND' ? 404 : 400;
+      res.status(status).json({ error: { code: 'DISPATCH_FAILED', message } });
+    }
+  });
+
+  router.post('/tasks/:id/cancel', (req, res) => {
+    try {
+      const task = orchestrationTaskService.cancel(req.params.id);
+      res.json(task);
+    } catch {
+      res.status(404).json({ error: { code: 'TASK_NOT_FOUND', message: req.params.id } });
+    }
+  });
+
+  return router;
+}