flowscale 2.1.0-beta.3 → 2.1.0-beta.4

package/dist/operator-server.d.ts

@@ -1,26 +1,29 @@
 import type { NodePodsTransport } from './node-transport';
 /**
- * PodsOperatorServer — exposes a read-only pod list HTTP API so that remote
- * FlowScale Studio instances on the same network can discover and use pods
- * managed by this machine.
+ * PodsOperatorServer — exposes a pod management and workflow execution HTTP API
+ * so that remote FlowScale apps (e.g. AI OS) can discover pods and run workflows
+ * without any direct knowledge of ComfyUI.
  *
- * Serves on all interfaces (0.0.0.0) so any machine on the LAN can reach it.
- * Includes CORS headers for browser-based clients.
- *
- * Usage in creativeflow-electron (main process):
- *   import { NodePodsTransport, PodsOperatorServer } from 'flowscale/node'
- *   const server = new PodsOperatorServer(transport)  // default port 3001
- *   server.start()
+ * Endpoints:
+ *   GET  /api/pods                    — list all pods
+ *   GET  /api/pods/:id                — get a single pod
+ *   POST /api/pods/:id/upload         — upload a file to the pod's ComfyUI instance
+ *   POST /api/pods/:id/execute        — execute a workflow and wait for outputs
+ *   GET  /api/pods/:id/view?filename= — proxy a ComfyUI output image
  *
- * Remote clients connect via:
- *   import { RemotePodsTransport, LocalPodsAPI } from 'flowscale'
- *   const api = new LocalPodsAPI(new RemotePodsTransport('http://192.168.1.100:3001'))
+ * Serves on 0.0.0.0 so any machine on the LAN can reach it.
+ * Includes CORS headers for browser-based clients.
  */
 export declare class PodsOperatorServer {
     private server;
     private readonly transport;
+    private readonly api;
     private readonly port;
     constructor(transport: NodePodsTransport, port?: number);
     start(): void;
     stop(): void;
+    private _json;
+    private _readBody;
+    /** Returns the port of the first running instance in the given pod. */
+    private _runningPort;
 }

package/dist/operator-server.js

@@ -71,28 +71,28 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PodsOperatorServer = void 0;
 var http = __importStar(require("http"));
+var local_pods_1 = require("./local-pods");
 /**
- * PodsOperatorServer — exposes a read-only pod list HTTP API so that remote
- * FlowScale Studio instances on the same network can discover and use pods
- * managed by this machine.
+ * PodsOperatorServer — exposes a pod management and workflow execution HTTP API
+ * so that remote FlowScale apps (e.g. AI OS) can discover pods and run workflows
+ * without any direct knowledge of ComfyUI.
  *
- * Serves on all interfaces (0.0.0.0) so any machine on the LAN can reach it.
- * Includes CORS headers for browser-based clients.
- *
- * Usage in creativeflow-electron (main process):
- *   import { NodePodsTransport, PodsOperatorServer } from 'flowscale/node'
- *   const server = new PodsOperatorServer(transport)  // default port 3001
- *   server.start()
+ * Endpoints:
+ *   GET  /api/pods                    — list all pods
+ *   GET  /api/pods/:id                — get a single pod
+ *   POST /api/pods/:id/upload         — upload a file to the pod's ComfyUI instance
+ *   POST /api/pods/:id/execute        — execute a workflow and wait for outputs
+ *   GET  /api/pods/:id/view?filename= — proxy a ComfyUI output image
  *
- * Remote clients connect via:
- *   import { RemotePodsTransport, LocalPodsAPI } from 'flowscale'
- *   const api = new LocalPodsAPI(new RemotePodsTransport('http://192.168.1.100:3001'))
+ * Serves on 0.0.0.0 so any machine on the LAN can reach it.
+ * Includes CORS headers for browser-based clients.
  */
 var PodsOperatorServer = /** @class */ (function () {
     function PodsOperatorServer(transport, port) {
         if (port === void 0) { port = 3001; }
         this.server = null;
         this.transport = transport;
+        this.api = new local_pods_1.LocalPodsAPI(transport);
         this.port = port;
     }
     PodsOperatorServer.prototype.start = function () {
@@ -100,63 +100,107 @@ var PodsOperatorServer = /** @class */ (function () {
         if (this.server)
             return;
         this.server = http.createServer(function (req, res) { return __awaiter(_this, void 0, void 0, function () {
-            var url, pods, podMatch, id, pod, err_1;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var url, query, pods, podMatch, pod, uploadMatch, podId, port, body, contentType, upstream, data, executeMatch, podId, body, _a, _b, result, viewMatch, podId, port, params, upstream, imageBuffer, err_1;
+            var _c, _d, _e, _f, _g, _h, _j;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
-                        // CORS — allow any origin (LAN usage only, not a public service)
                         res.setHeader('Access-Control-Allow-Origin', '*');
-                        res.setHeader('Access-Control-Allow-Methods', 'GET, OPTIONS');
+                        res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
                         res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
                         if (req.method === 'OPTIONS') {
                             res.writeHead(204);
                             res.end();
                             return [2 /*return*/];
                         }
-                        if (req.method !== 'GET') {
-                            res.writeHead(405);
-                            res.end('Method Not Allowed');
-                            return [2 /*return*/];
-                        }
-                        url = ((_a = req.url) !== null && _a !== void 0 ? _a : '/').split('?')[0];
-                        _b.label = 1;
+                        url = ((_c = req.url) !== null && _c !== void 0 ? _c : '/').split('?')[0];
+                        query = new URLSearchParams((_e = ((_d = req.url) !== null && _d !== void 0 ? _d : '').split('?')[1]) !== null && _e !== void 0 ? _e : '');
+                        _k.label = 1;
                     case 1:
-                        _b.trys.push([1, 6, , 7]);
-                        if (!(url === '/api/pods' || url === '/api/pods/')) return [3 /*break*/, 3];
+                        _k.trys.push([1, 18, , 19]);
+                        if (!(req.method === 'GET' && (url === '/api/pods' || url === '/api/pods/'))) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.transport.list()];
                     case 2:
-                        pods = _b.sent();
-                        res.writeHead(200, { 'Content-Type': 'application/json' });
-                        res.end(JSON.stringify(pods));
-                        return [2 /*return*/];
+                        pods = _k.sent();
+                        return [2 /*return*/, this._json(res, 200, pods)];
                     case 3:
                         podMatch = url.match(/^\/api\/pods\/([^/]+)$/);
-                        if (!podMatch) return [3 /*break*/, 5];
-                        id = decodeURIComponent(podMatch[1]);
-                        return [4 /*yield*/, this.transport.get(id)];
+                        if (!(req.method === 'GET' && podMatch)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, this.transport.get(decodeURIComponent(podMatch[1]))];
                     case 4:
-                        pod = _b.sent();
-                        if (!pod) {
-                            res.writeHead(404, { 'Content-Type': 'application/json' });
-                            res.end(JSON.stringify({ error: 'Pod not found' }));
-                        }
-                        else {
-                            res.writeHead(200, { 'Content-Type': 'application/json' });
-                            res.end(JSON.stringify(pod));
+                        pod = _k.sent();
+                        if (!pod)
+                            return [2 /*return*/, this._json(res, 404, { error: 'Pod not found' })];
+                        return [2 /*return*/, this._json(res, 200, pod)];
+                    case 5:
+                        uploadMatch = url.match(/^\/api\/pods\/([^/]+)\/upload$/);
+                        if (!(req.method === 'POST' && uploadMatch)) return [3 /*break*/, 10];
+                        podId = decodeURIComponent(uploadMatch[1]);
+                        return [4 /*yield*/, this._runningPort(podId)];
+                    case 6:
+                        port = _k.sent();
+                        return [4 /*yield*/, this._readBody(req)];
+                    case 7:
+                        body = _k.sent();
+                        contentType = (_f = req.headers['content-type']) !== null && _f !== void 0 ? _f : 'application/octet-stream';
+                        return [4 /*yield*/, fetch("http://localhost:".concat(port, "/upload/image"), {
+                                method: 'POST',
+                                headers: { 'content-type': contentType },
+                                body: body,
+                            })];
+                    case 8:
+                        upstream = _k.sent();
+                        return [4 /*yield*/, upstream.json()];
+                    case 9:
+                        data = _k.sent();
+                        return [2 /*return*/, this._json(res, upstream.status, data)];
+                    case 10:
+                        executeMatch = url.match(/^\/api\/pods\/([^/]+)\/execute$/);
+                        if (!(req.method === 'POST' && executeMatch)) return [3 /*break*/, 13];
+                        podId = decodeURIComponent(executeMatch[1]);
+                        _b = (_a = JSON).parse;
+                        return [4 /*yield*/, this._readBody(req)];
+                    case 11:
+                        body = _b.apply(_a, [(_k.sent()).toString()]);
+                        return [4 /*yield*/, this.api.executeWorkflowAndWait(podId, body.workflow, (_g = body.options) !== null && _g !== void 0 ? _g : {})];
+                    case 12:
+                        result = _k.sent();
+                        return [2 /*return*/, this._json(res, 200, result)];
+                    case 13:
+                        viewMatch = url.match(/^\/api\/pods\/([^/]+)\/view$/);
+                        if (!(req.method === 'GET' && viewMatch)) return [3 /*break*/, 17];
+                        podId = decodeURIComponent(viewMatch[1]);
+                        return [4 /*yield*/, this._runningPort(podId)];
+                    case 14:
+                        port = _k.sent();
+                        params = new URLSearchParams(query.toString());
+                        return [4 /*yield*/, fetch("http://localhost:".concat(port, "/view?").concat(params))];
+                    case 15:
+                        upstream = _k.sent();
+                        if (!upstream.ok) {
+                            res.writeHead(upstream.status);
+                            res.end();
+                            return [2 /*return*/];
                         }
+                        return [4 /*yield*/, upstream.arrayBuffer()];
+                    case 16:
+                        imageBuffer = _k.sent();
+                        res.writeHead(200, {
+                            'Content-Type': (_h = upstream.headers.get('content-type')) !== null && _h !== void 0 ? _h : 'image/png',
+                            'Cache-Control': 'public, max-age=3600',
+                        });
+                        res.end(Buffer.from(imageBuffer));
                         return [2 /*return*/];
-                    case 5:
+                    case 17:
                         res.writeHead(404);
                         res.end('Not found');
-                        return [3 /*break*/, 7];
-                    case 6:
-                        err_1 = _b.sent();
+                        return [3 /*break*/, 19];
+                    case 18:
+                        err_1 = _k.sent();
                         console.error('[PodsOperatorServer] Error handling request:', err_1);
-                        res.writeHead(500, { 'Content-Type': 'application/json' });
-                        res.end(JSON.stringify({ error: 'Internal server error' }));
-                        return [3 /*break*/, 7];
-                    case 7: return [2 /*return*/];
+                        this._json(res, 500, { error: (_j = err_1 === null || err_1 === void 0 ? void 0 : err_1.message) !== null && _j !== void 0 ? _j : 'Internal server error' });
+                        return [3 /*break*/, 19];
+                    case 19: return [2 /*return*/];
                 }
             });
         }); });
@@ -173,6 +217,38 @@ var PodsOperatorServer = /** @class */ (function () {
             this.server = null;
         }
     };
+    // ── Private helpers ──────────────────────────────────────────────────────
+    PodsOperatorServer.prototype._json = function (res, status, data) {
+        res.writeHead(status, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify(data));
+    };
+    PodsOperatorServer.prototype._readBody = function (req) {
+        return new Promise(function (resolve, reject) {
+            var chunks = [];
+            req.on('data', function (chunk) { return chunks.push(chunk); });
+            req.on('end', function () { return resolve(Buffer.concat(chunks)); });
+            req.on('error', reject);
+        });
+    };
+    /** Returns the port of the first running instance in the given pod. */
+    PodsOperatorServer.prototype._runningPort = function (podId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var pod, running;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.transport.get(podId)];
+                    case 1:
+                        pod = _a.sent();
+                        if (!pod)
+                            throw new Error("Pod \"".concat(podId, "\" not found"));
+                        running = pod.instances.find(function (i) { return i.status === 'running'; });
+                        if (!running)
+                            throw new Error("No running instance in pod \"".concat(pod.name, "\""));
+                        return [2 /*return*/, running.port];
+                }
+            });
+        });
+    };
     return PodsOperatorServer;
 }());
 exports.PodsOperatorServer = PodsOperatorServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowscale",
-  "version": "2.1.0-beta.3",
+  "version": "2.1.0-beta.4",
   "description": "An NPM library for communicating with the Flowscale APIs",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",