ima2-gen 1.1.7 → 1.1.9

package/lib/nodeStore.ts

@@ -0,0 +1,81 @@
+import { writeFile, readFile, access, mkdir } from "fs/promises";
+import { join, resolve, sep } from "path";
+import { randomBytes } from "crypto";
+import { config } from "../config.js";
+import { embedImageMetadataBestEffort } from "./imageMetadataStore.js";
+
+export function newNodeId() {
+  return "n_" + randomBytes(config.ids.nodeHexBytes).toString("hex");
+}
+
+export async function saveNode(rootDir, { nodeId, b64, meta, ext = "png", generatedDir = config.storage.generatedDir }) {
+  void rootDir;
+  const filename = `${nodeId}.${ext}`;
+  await mkdir(generatedDir, { recursive: true });
+  const imageMeta = {
+    ...meta,
+    kind: meta?.kind || "node",
+    nodeId: meta?.nodeId || nodeId,
+    format: meta?.format || ext,
+  };
+  const rawBuffer = Buffer.from(b64, "base64");
+  const embedded: any = await embedImageMetadataBestEffort(rawBuffer, ext, imageMeta);
+  if (!embedded.embedded) {
+    console.warn("[nodeStore] metadata embed skipped:", embedded.warning);
+  }
+  await writeFile(join(generatedDir, filename), embedded.buffer);
+  await writeFile(join(generatedDir, filename + ".json"), JSON.stringify(meta, null, 2));
+  return { filename };
+}
+
+export async function loadNodeB64(rootDir, filename, generatedDir = config.storage.generatedDir) {
+  const p = resolveGeneratedPath(rootDir, filename, generatedDir);
+  try { await access(p); } catch {
+    const err: any = new Error(`Node file not found: ${filename}`);
+    err.code = "NODE_NOT_FOUND";
+    err.status = 404;
+    throw err;
+  }
+  const buf = await readFile(p);
+  return buf.toString("base64");
+}
+
+export async function loadNodeMeta(rootDir, nodeId, ext = "png", generatedDir = config.storage.generatedDir) {
+  void rootDir;
+  try {
+    return JSON.parse(await readFile(join(generatedDir, `${nodeId}.${ext}.json`), "utf-8"));
+  } catch {
+    return null;
+  }
+}
+
+export async function loadAssetB64(rootDir, externalSrc, generatedDir = config.storage.generatedDir) {
+  const p = resolveGeneratedPath(rootDir, externalSrc, generatedDir);
+  try { await access(p); } catch {
+    const err: any = new Error(`Asset file not found: ${externalSrc}`);
+    err.code = "NODE_NOT_FOUND";
+    err.status = 404;
+    throw err;
+  }
+  const buf = await readFile(p);
+  return buf.toString("base64");
+}
+
+function resolveGeneratedPath(rootDir, relPath, generatedDir = config.storage.generatedDir) {
+  void rootDir;
+  if (typeof relPath !== "string" || relPath.length === 0) {
+    const err: any = new Error("Asset path is required");
+    err.code = "NODE_SOURCE_INVALID";
+    err.status = 400;
+    throw err;
+  }
+  const baseDir = resolve(generatedDir);
+  const target = resolve(baseDir, relPath);
+  if (target !== baseDir && !target.startsWith(baseDir + sep)) {
+    const err: any = new Error(`Asset path escapes generated/: ${relPath}`);
+    err.code = "NODE_SOURCE_INVALID";
+    err.status = 400;
+    throw err;
+  }
+  return target;
+}

package/lib/oauthLauncher.js

@@ -1,64 +1,66 @@
 import { spawnBin } from "../bin/lib/platform.js";
 import { config } from "../config.js";
 import { parseLocalhostPortFromUrl, parseOAuthReadyUrl } from "./runtimePorts.js";
-
 export function startOAuthProxy(options = {}) {
-  const oauthPort = options.oauthPort ?? config.oauth.proxyPort;
-  const restartDelayMs = options.restartDelayMs ?? config.oauth.restartDelayMs;
-  let currentChild = null;
-  let stopping = false;
-  let restartTimer = null;
-
-  const spawnProxy = () => {
-    console.log(`Starting openai-oauth on port ${oauthPort}...`);
-    const child = spawnBin("npx", ["openai-oauth", "--port", String(oauthPort)], {
-      stdio: ["ignore", "pipe", "pipe"],
-      env: { ...process.env },
-    });
-    currentChild = child;
-
-    child.stdout.on("data", (d) => {
-      const msg = d.toString().trim();
-      if (!msg) return;
-      console.log(`[oauth] ${msg}`);
-      for (const line of msg.split(/\r?\n/)) {
-        const url = parseOAuthReadyUrl(line);
-        if (!url) continue;
-        const port = parseLocalhostPortFromUrl(url);
-        if (port && port !== oauthPort) {
-          console.log(`[oauth] requested port ${oauthPort}, actual port ${port}`);
-        }
-        options.onReady?.({ url, port: port || oauthPort, requestedPort: oauthPort });
-      }
-    });
-
-    child.stderr.on("data", (d) => {
-      const msg = d.toString().trim();
-      if (msg && !msg.includes("npm warn")) console.error(`[oauth] ${msg}`);
-    });
-
-    child.on("exit", (code) => {
-      if (currentChild === child) currentChild = null;
-      if (stopping) return;
-      options.onExit?.({ code });
-      console.log(`[oauth] exited with code ${code}, restarting in ${Math.round(restartDelayMs / 1000)}s...`);
-      restartTimer = setTimeout(spawnProxy, restartDelayMs);
-    });
-  };
-
-  spawnProxy();
-
-  return {
-    get child() {
-      return currentChild;
-    },
-    kill(signal = "SIGTERM") {
-      this.stop(signal);
-    },
-    stop(signal = "SIGTERM") {
-      stopping = true;
-      if (restartTimer) clearTimeout(restartTimer);
-      try { currentChild?.kill(signal); } catch {}
-    },
-  };
+    const oauthPort = options.oauthPort ?? config.oauth.proxyPort;
+    const restartDelayMs = options.restartDelayMs ?? config.oauth.restartDelayMs;
+    let currentChild = null;
+    let stopping = false;
+    let restartTimer = null;
+    const spawnProxy = () => {
+        console.log(`Starting openai-oauth on port ${oauthPort}...`);
+        const child = spawnBin("npx", ["openai-oauth", "--port", String(oauthPort)], {
+            stdio: ["ignore", "pipe", "pipe"],
+            env: { ...process.env },
+        });
+        currentChild = child;
+        child.stdout.on("data", (d) => {
+            const msg = d.toString().trim();
+            if (!msg)
+                return;
+            console.log(`[oauth] ${msg}`);
+            for (const line of msg.split(/\r?\n/)) {
+                const url = parseOAuthReadyUrl(line);
+                if (!url)
+                    continue;
+                const port = parseLocalhostPortFromUrl(url);
+                if (port && port !== oauthPort) {
+                    console.log(`[oauth] requested port ${oauthPort}, actual port ${port}`);
+                }
+                options.onReady?.({ url, port: port || oauthPort, requestedPort: oauthPort });
+            }
+        });
+        child.stderr.on("data", (d) => {
+            const msg = d.toString().trim();
+            if (msg && !msg.includes("npm warn"))
+                console.error(`[oauth] ${msg}`);
+        });
+        child.on("exit", (code) => {
+            if (currentChild === child)
+                currentChild = null;
+            if (stopping)
+                return;
+            options.onExit?.({ code });
+            console.log(`[oauth] exited with code ${code}, restarting in ${Math.round(restartDelayMs / 1000)}s...`);
+            restartTimer = setTimeout(spawnProxy, restartDelayMs);
+        });
+    };
+    spawnProxy();
+    return {
+        get child() {
+            return currentChild;
+        },
+        kill(signal = "SIGTERM") {
+            this.stop(signal);
+        },
+        stop(signal = "SIGTERM") {
+            stopping = true;
+            if (restartTimer)
+                clearTimeout(restartTimer);
+            try {
+                currentChild?.kill(signal);
+            }
+            catch { }
+        },
+    };
 }

package/lib/oauthLauncher.ts

@@ -0,0 +1,64 @@
+import { spawnBin } from "../bin/lib/platform.js";
+import { config } from "../config.js";
+import { parseLocalhostPortFromUrl, parseOAuthReadyUrl } from "./runtimePorts.js";
+
+export function startOAuthProxy(options: any = {}) {
+  const oauthPort = options.oauthPort ?? config.oauth.proxyPort;
+  const restartDelayMs = options.restartDelayMs ?? config.oauth.restartDelayMs;
+  let currentChild = null;
+  let stopping = false;
+  let restartTimer = null;
+
+  const spawnProxy = () => {
+    console.log(`Starting openai-oauth on port ${oauthPort}...`);
+    const child = spawnBin("npx", ["openai-oauth", "--port", String(oauthPort)], {
+      stdio: ["ignore", "pipe", "pipe"],
+      env: { ...process.env },
+    });
+    currentChild = child;
+
+    child.stdout.on("data", (d) => {
+      const msg = d.toString().trim();
+      if (!msg) return;
+      console.log(`[oauth] ${msg}`);
+      for (const line of msg.split(/\r?\n/)) {
+        const url = parseOAuthReadyUrl(line);
+        if (!url) continue;
+        const port = parseLocalhostPortFromUrl(url);
+        if (port && port !== oauthPort) {
+          console.log(`[oauth] requested port ${oauthPort}, actual port ${port}`);
+        }
+        options.onReady?.({ url, port: port || oauthPort, requestedPort: oauthPort });
+      }
+    });
+
+    child.stderr.on("data", (d) => {
+      const msg = d.toString().trim();
+      if (msg && !msg.includes("npm warn")) console.error(`[oauth] ${msg}`);
+    });
+
+    child.on("exit", (code) => {
+      if (currentChild === child) currentChild = null;
+      if (stopping) return;
+      options.onExit?.({ code });
+      console.log(`[oauth] exited with code ${code}, restarting in ${Math.round(restartDelayMs / 1000)}s...`);
+      restartTimer = setTimeout(spawnProxy, restartDelayMs);
+    });
+  };
+
+  spawnProxy();
+
+  return {
+    get child() {
+      return currentChild;
+    },
+    kill(signal = "SIGTERM") {
+      this.stop(signal);
+    },
+    stop(signal = "SIGTERM") {
+      stopping = true;
+      if (restartTimer) clearTimeout(restartTimer);
+      try { currentChild?.kill(signal); } catch {}
+    },
+  };
+}

package/lib/oauthNormalize.js

@@ -1,30 +1,26 @@
 // 0.09.12.2 — Keep supported image tool qualities intact for OAuth.
 // The exposed app contract accepts low/medium/high; normalize only malformed input so
 // the API response, UI metadata, and actual image_generation payload stay aligned.
-
 export const DEFAULT_IMAGE_QUALITY = "medium";
 export const VALID_IMAGE_QUALITIES = new Set(["low", "medium", "high"]);
-
 /**
  * @param {{ provider?: string, quality?: string }} input
  * @returns {{ quality: string, warnings: Array<{code:string,field:string,normalizedTo:string,reason:string}> }}
  */
 export function normalizeOAuthParams(input) {
-  const requested = typeof input?.quality === "string" ? input.quality : DEFAULT_IMAGE_QUALITY;
-
-  if (VALID_IMAGE_QUALITIES.has(requested)) {
-    return { quality: requested, warnings: [] };
-  }
-
-  return {
-    quality: DEFAULT_IMAGE_QUALITY,
-    warnings: [
-      {
-        code: "QUALITY_DEFAULTED",
-        field: "quality",
-        normalizedTo: DEFAULT_IMAGE_QUALITY,
-        reason: "invalid-quality",
-      },
-    ],
-  };
+    const requested = typeof input?.quality === "string" ? input.quality : DEFAULT_IMAGE_QUALITY;
+    if (VALID_IMAGE_QUALITIES.has(requested)) {
+        return { quality: requested, warnings: [] };
+    }
+    return {
+        quality: DEFAULT_IMAGE_QUALITY,
+        warnings: [
+            {
+                code: "QUALITY_DEFAULTED",
+                field: "quality",
+                normalizedTo: DEFAULT_IMAGE_QUALITY,
+                reason: "invalid-quality",
+            },
+        ],
+    };
 }

package/lib/oauthNormalize.ts

@@ -0,0 +1,30 @@
+// 0.09.12.2 — Keep supported image tool qualities intact for OAuth.
+// The exposed app contract accepts low/medium/high; normalize only malformed input so
+// the API response, UI metadata, and actual image_generation payload stay aligned.
+
+export const DEFAULT_IMAGE_QUALITY = "medium";
+export const VALID_IMAGE_QUALITIES = new Set(["low", "medium", "high"]);
+
+/**
+ * @param {{ provider?: string, quality?: string }} input
+ * @returns {{ quality: string, warnings: Array<{code:string,field:string,normalizedTo:string,reason:string}> }}
+ */
+export function normalizeOAuthParams(input) {
+  const requested = typeof input?.quality === "string" ? input.quality : DEFAULT_IMAGE_QUALITY;
+
+  if (VALID_IMAGE_QUALITIES.has(requested)) {
+    return { quality: requested, warnings: [] };
+  }
+
+  return {
+    quality: DEFAULT_IMAGE_QUALITY,
+    warnings: [
+      {
+        code: "QUALITY_DEFAULTED",
+        field: "quality",
+        normalizedTo: DEFAULT_IMAGE_QUALITY,
+        reason: "invalid-quality",
+      },
+    ],
+  };
+}