ima2-gen 1.1.7 → 1.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ima2-gen",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "Local OAuth image generation studio with classic and node workflows",
   "type": "module",
   "bin": {
@@ -9,7 +9,7 @@
   "scripts": {
     "start": "node bin/ima2.js serve",
     "dev": "node scripts/dev.mjs",
-    "dev:server": "node --watch server.js",
+    "dev:server": "tsx watch server.ts",
     "ui:install": "cd ui && npm install",
     "ui:dev": "cd ui && npm run dev",
     "ui:build": "cd ui && npm run build",
@@ -17,11 +17,15 @@
     "test": "node scripts/run-tests.mjs",
     "test:package-install": "node --test tests/package-install-smoke.mjs",
     "setup": "node bin/ima2.js setup",
-    "prepublishOnly": "npm test && npm run build && npm run test:package-install && npm run lint:pkg",
-    "lint:pkg": "node -e \"const p=require('./package.json'); const req=['name','version','bin']; for(const k of req){if(!p[k])throw new Error('missing '+k)} const mustInclude=['bin/','lib/','routes/','integrations/','server.js']; for(const f of mustInclude){if(!p.files.includes(f))throw new Error('files[] must include '+f)}\"",
+    "prepack": "npm run ui:build && npm run build:server && npm run build:cli",
+    "prepublishOnly": "npm run typecheck && npm run ui:build && npm run build:server && npm run build:cli && npm run lint:pkg && npm run test:package-install",
+    "lint:pkg": "node -e \"const p=require('./package.json'); const req=['name','version','bin']; for(const k of req){if(!p[k])throw new Error('missing '+k)} const mustInclude=['bin/','lib/','routes/','integrations/comfyui/ima2_gen_bridge/__init__.py','integrations/comfyui/ima2_gen_bridge/nodes.py','integrations/comfyui/ima2_gen_bridge/README.md','assets/card-news/templates/','server.js']; for(const f of mustInclude){if(!p.files.includes(f))throw new Error('files[] must include '+f)}\"",
     "release:patch": "npm version patch && npm publish && git push origin main --tags",
     "release:minor": "npm version minor && npm publish && git push origin main --tags",
-    "release:major": "npm version major && npm publish && git push origin main --tags"
+    "release:major": "npm version major && npm publish && git push origin main --tags",
+    "typecheck": "tsc --noEmit -p tsconfig.json",
+    "build:server": "tsc -p tsconfig.build.json",
+    "build:cli": "tsc -p tsconfig.bin.json && node scripts/fix-shebangs.mjs"
   },
   "keywords": [
     "openai",
@@ -39,14 +43,18 @@
     "bin/",
     "lib/",
     "routes/",
-    "integrations/",
+    "integrations/comfyui/ima2_gen_bridge/__init__.py",
+    "integrations/comfyui/ima2_gen_bridge/nodes.py",
+    "integrations/comfyui/ima2_gen_bridge/README.md",
     "ui/dist/",
     "docs/",
-    "assets/",
-    "server.js",
-    "config.js",
+    "assets/card-news/templates/",
+    "server.ts",
+    "config.ts",
     ".env.example",
-    "README.md"
+    "README.md",
+    "server.js",
+    "config.js"
   ],
   "engines": {
     "node": ">=20"
@@ -58,6 +66,14 @@
     "openai": "^5.8.2",
     "openai-oauth": "^1.0.2",
     "sharp": "^0.34.5",
+    "trash": "^10.1.1",
     "ulid": "^3.0.2"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^7.6.13",
+    "@types/express": "^5.0.6",
+    "@types/node": "^22.19.17",
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3"
   }
 }

package/routes/annotations.js

@@ -1,69 +1,64 @@
 import { getDb } from "../lib/db.js";
-
 const MAX_ANNOTATION_PAYLOAD_CHARS = 256 * 1024;
-
 function getBrowserId(req) {
-  const browserId = req.headers["x-ima2-browser-id"];
-  return typeof browserId === "string" && browserId.trim() ? browserId.trim() : null;
+    const browserId = req.headers["x-ima2-browser-id"];
+    return typeof browserId === "string" && browserId.trim() ? browserId.trim() : null;
 }
-
 function isSafeFilename(filename) {
-  return (
-    typeof filename === "string" &&
-    filename.length > 0 &&
-    filename.length <= 240 &&
-    !filename.includes("..") &&
-    !filename.startsWith("/") &&
-    !filename.includes("\\")
-  );
+    return (typeof filename === "string" &&
+        filename.length > 0 &&
+        filename.length <= 240 &&
+        !filename.includes("..") &&
+        !filename.startsWith("/") &&
+        !filename.includes("\\"));
 }
-
 function normalizePayload(value) {
-  const payload = value?.annotations ?? value;
-  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
-    return { error: "annotations payload is required" };
-  }
-  const paths = Array.isArray(payload.paths) ? payload.paths : [];
-  const boxes = Array.isArray(payload.boxes) ? payload.boxes : [];
-  const memos = Array.isArray(payload.memos) ? payload.memos : [];
-  const normalized = { paths, boxes, memos };
-  const text = JSON.stringify(normalized);
-  if (text.length > MAX_ANNOTATION_PAYLOAD_CHARS) {
-    return { error: "annotations payload is too large" };
-  }
-  return { payload: normalized, text };
-}
-
-export function registerAnnotationRoutes(app) {
-  app.get("/api/annotations/:filename", (req, res) => {
-    try {
-      const browserId = getBrowserId(req);
-      const filename = decodeURIComponent(req.params.filename);
-      if (!browserId) return res.status(400).json({ error: "X-Ima2-Browser-Id header is required" });
-      if (!isSafeFilename(filename)) return res.status(400).json({ error: "invalid filename" });
-
-      const row = getDb()
-        .prepare("SELECT payload FROM image_annotations WHERE browser_id = ? AND filename = ?")
-        .get(browserId, filename);
-      const annotations = row ? JSON.parse(row.payload) : null;
-      res.json({ annotations });
-    } catch (err) {
-      res.status(500).json({ error: err.message });
+    const payload = value?.annotations ?? value;
+    if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
+        return { error: "annotations payload is required" };
+    }
+    const paths = Array.isArray(payload.paths) ? payload.paths : [];
+    const boxes = Array.isArray(payload.boxes) ? payload.boxes : [];
+    const memos = Array.isArray(payload.memos) ? payload.memos : [];
+    const normalized = { paths, boxes, memos };
+    const text = JSON.stringify(normalized);
+    if (text.length > MAX_ANNOTATION_PAYLOAD_CHARS) {
+        return { error: "annotations payload is too large" };
     }
-  });
-
-  app.put("/api/annotations/:filename", (req, res) => {
-    try {
-      const browserId = getBrowserId(req);
-      const filename = decodeURIComponent(req.params.filename);
-      if (!browserId) return res.status(400).json({ error: "X-Ima2-Browser-Id header is required" });
-      if (!isSafeFilename(filename)) return res.status(400).json({ error: "invalid filename" });
-
-      const normalized = normalizePayload(req.body);
-      if (normalized.error) return res.status(400).json({ error: normalized.error });
-
-      const id = `${browserId}:${filename}`;
-      getDb().prepare(`
+    return { payload: normalized, text };
+}
+export function registerAnnotationRoutes(app, _ctx) {
+    app.get("/api/annotations/:filename", (req, res) => {
+        try {
+            const browserId = getBrowserId(req);
+            const filename = decodeURIComponent(req.params.filename);
+            if (!browserId)
+                return res.status(400).json({ error: "X-Ima2-Browser-Id header is required" });
+            if (!isSafeFilename(filename))
+                return res.status(400).json({ error: "invalid filename" });
+            const row = getDb()
+                .prepare("SELECT payload FROM image_annotations WHERE browser_id = ? AND filename = ?")
+                .get(browserId, filename);
+            const annotations = row ? JSON.parse(row.payload) : null;
+            res.json({ annotations });
+        }
+        catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
+    app.put("/api/annotations/:filename", (req, res) => {
+        try {
+            const browserId = getBrowserId(req);
+            const filename = decodeURIComponent(req.params.filename);
+            if (!browserId)
+                return res.status(400).json({ error: "X-Ima2-Browser-Id header is required" });
+            if (!isSafeFilename(filename))
+                return res.status(400).json({ error: "invalid filename" });
+            const normalized = normalizePayload(req.body);
+            if (normalized.error)
+                return res.status(400).json({ error: normalized.error });
+            const id = `${browserId}:${filename}`;
+            getDb().prepare(`
         INSERT INTO image_annotations (id, browser_id, filename, payload, schema_version, updated_at)
         VALUES (?, ?, ?, ?, 1, unixepoch())
         ON CONFLICT(browser_id, filename) DO UPDATE SET
@@ -71,25 +66,27 @@ export function registerAnnotationRoutes(app) {
           schema_version = excluded.schema_version,
           updated_at = unixepoch()
       `).run(id, browserId, filename, normalized.text);
-      res.json({ ok: true });
-    } catch (err) {
-      res.status(500).json({ error: err.message });
-    }
-  });
-
-  app.delete("/api/annotations/:filename", (req, res) => {
-    try {
-      const browserId = getBrowserId(req);
-      const filename = decodeURIComponent(req.params.filename);
-      if (!browserId) return res.status(400).json({ error: "X-Ima2-Browser-Id header is required" });
-      if (!isSafeFilename(filename)) return res.status(400).json({ error: "invalid filename" });
-
-      getDb()
-        .prepare("DELETE FROM image_annotations WHERE browser_id = ? AND filename = ?")
-        .run(browserId, filename);
-      res.json({ ok: true });
-    } catch (err) {
-      res.status(500).json({ error: err.message });
-    }
-  });
+            res.json({ ok: true });
+        }
+        catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
+    app.delete("/api/annotations/:filename", (req, res) => {
+        try {
+            const browserId = getBrowserId(req);
+            const filename = decodeURIComponent(req.params.filename);
+            if (!browserId)
+                return res.status(400).json({ error: "X-Ima2-Browser-Id header is required" });
+            if (!isSafeFilename(filename))
+                return res.status(400).json({ error: "invalid filename" });
+            getDb()
+                .prepare("DELETE FROM image_annotations WHERE browser_id = ? AND filename = ?")
+                .run(browserId, filename);
+            res.json({ ok: true });
+        }
+        catch (err) {
+            res.status(500).json({ error: err.message });
+        }
+    });
 }

package/routes/annotations.ts

@@ -0,0 +1,95 @@
+import { getDb } from "../lib/db.js";
+
+const MAX_ANNOTATION_PAYLOAD_CHARS = 256 * 1024;
+
+function getBrowserId(req) {
+  const browserId = req.headers["x-ima2-browser-id"];
+  return typeof browserId === "string" && browserId.trim() ? browserId.trim() : null;
+}
+
+function isSafeFilename(filename) {
+  return (
+    typeof filename === "string" &&
+    filename.length > 0 &&
+    filename.length <= 240 &&
+    !filename.includes("..") &&
+    !filename.startsWith("/") &&
+    !filename.includes("\\")
+  );
+}
+
+function normalizePayload(value) {
+  const payload = value?.annotations ?? value;
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
+    return { error: "annotations payload is required" };
+  }
+  const paths = Array.isArray(payload.paths) ? payload.paths : [];
+  const boxes = Array.isArray(payload.boxes) ? payload.boxes : [];
+  const memos = Array.isArray(payload.memos) ? payload.memos : [];
+  const normalized = { paths, boxes, memos };
+  const text = JSON.stringify(normalized);
+  if (text.length > MAX_ANNOTATION_PAYLOAD_CHARS) {
+    return { error: "annotations payload is too large" };
+  }
+  return { payload: normalized, text };
+}
+
+export function registerAnnotationRoutes(app, _ctx?: any) {
+  app.get("/api/annotations/:filename", (req, res) => {
+    try {
+      const browserId = getBrowserId(req);
+      const filename = decodeURIComponent(req.params.filename);
+      if (!browserId) return res.status(400).json({ error: "X-Ima2-Browser-Id header is required" });
+      if (!isSafeFilename(filename)) return res.status(400).json({ error: "invalid filename" });
+
+      const row = getDb()
+        .prepare("SELECT payload FROM image_annotations WHERE browser_id = ? AND filename = ?")
+        .get(browserId, filename);
+      const annotations = row ? JSON.parse(row.payload) : null;
+      res.json({ annotations });
+    } catch (err) {
+      res.status(500).json({ error: err.message });
+    }
+  });
+
+  app.put("/api/annotations/:filename", (req, res) => {
+    try {
+      const browserId = getBrowserId(req);
+      const filename = decodeURIComponent(req.params.filename);
+      if (!browserId) return res.status(400).json({ error: "X-Ima2-Browser-Id header is required" });
+      if (!isSafeFilename(filename)) return res.status(400).json({ error: "invalid filename" });
+
+      const normalized = normalizePayload(req.body);
+      if (normalized.error) return res.status(400).json({ error: normalized.error });
+
+      const id = `${browserId}:${filename}`;
+      getDb().prepare(`
+        INSERT INTO image_annotations (id, browser_id, filename, payload, schema_version, updated_at)
+        VALUES (?, ?, ?, ?, 1, unixepoch())
+        ON CONFLICT(browser_id, filename) DO UPDATE SET
+          payload = excluded.payload,
+          schema_version = excluded.schema_version,
+          updated_at = unixepoch()
+      `).run(id, browserId, filename, normalized.text);
+      res.json({ ok: true });
+    } catch (err) {
+      res.status(500).json({ error: err.message });
+    }
+  });
+
+  app.delete("/api/annotations/:filename", (req, res) => {
+    try {
+      const browserId = getBrowserId(req);
+      const filename = decodeURIComponent(req.params.filename);
+      if (!browserId) return res.status(400).json({ error: "X-Ima2-Browser-Id header is required" });
+      if (!isSafeFilename(filename)) return res.status(400).json({ error: "invalid filename" });
+
+      getDb()
+        .prepare("DELETE FROM image_annotations WHERE browser_id = ? AND filename = ?")
+        .run(browserId, filename);
+      res.json({ ok: true });
+    } catch (err) {
+      res.status(500).json({ error: err.message });
+    }
+  });
+}

package/routes/canvasVersions.js

@@ -1,64 +1,60 @@
 import express from "express";
 import { createCanvasVersion, updateCanvasVersion } from "../lib/canvasVersionStore.js";
-
 function decodeHeader(value) {
-  if (typeof value !== "string" || !value) return null;
-  try {
-    return decodeURIComponent(value);
-  } catch {
-    return value;
-  }
+    if (typeof value !== "string" || !value)
+        return null;
+    try {
+        return decodeURIComponent(value);
+    }
+    catch {
+        return value;
+    }
 }
-
 function getRequestBuffer(req) {
-  return Buffer.isBuffer(req.body) ? req.body : Buffer.alloc(0);
+    return Buffer.isBuffer(req.body) ? req.body : Buffer.alloc(0);
 }
-
 function getPrompt(req) {
-  return decodeHeader(req.headers["x-ima2-canvas-prompt"]);
+    return decodeHeader(req.headers["x-ima2-canvas-prompt"]);
 }
-
 export function registerCanvasVersionRoutes(app, ctx) {
-  const rawPng = express.raw({ type: "image/png", limit: ctx.config.server.bodyLimit });
-
-  app.post("/api/canvas-versions", rawPng, async (req, res) => {
-    try {
-      const sourceFilename =
-        typeof req.query.sourceFilename === "string"
-          ? req.query.sourceFilename
-          : decodeHeader(req.headers["x-ima2-canvas-source-filename"]);
-      const item = await createCanvasVersion(ctx, {
-        sourceFilename,
-        prompt: getPrompt(req),
-        buffer: getRequestBuffer(req),
-      });
-      res.status(201).json({ item });
-    } catch (err) {
-      res.status(err.status || 500).json({
-        error: err.message,
-        code: err.code || "CANVAS_VERSION_SAVE_FAILED",
-      });
-    }
-  });
-
-  app.put("/api/canvas-versions/:filename", rawPng, async (req, res) => {
-    try {
-      const filename = decodeURIComponent(req.params.filename);
-      const sourceFilename =
-        typeof req.query.sourceFilename === "string"
-          ? req.query.sourceFilename
-          : decodeHeader(req.headers["x-ima2-canvas-source-filename"]);
-      const item = await updateCanvasVersion(ctx, filename, {
-        sourceFilename,
-        prompt: getPrompt(req),
-        buffer: getRequestBuffer(req),
-      });
-      res.json({ item });
-    } catch (err) {
-      res.status(err.status || 500).json({
-        error: err.message,
-        code: err.code || "CANVAS_VERSION_SAVE_FAILED",
-      });
-    }
-  });
+    const rawPng = express.raw({ type: "image/png", limit: ctx.config.server.bodyLimit });
+    app.post("/api/canvas-versions", rawPng, async (req, res) => {
+        try {
+            const sourceFilename = typeof req.query.sourceFilename === "string"
+                ? req.query.sourceFilename
+                : decodeHeader(req.headers["x-ima2-canvas-source-filename"]);
+            const item = await createCanvasVersion(ctx, {
+                sourceFilename,
+                prompt: getPrompt(req),
+                buffer: getRequestBuffer(req),
+            });
+            res.status(201).json({ item });
+        }
+        catch (err) {
+            res.status(err.status || 500).json({
+                error: err.message,
+                code: err.code || "CANVAS_VERSION_SAVE_FAILED",
+            });
+        }
+    });
+    app.put("/api/canvas-versions/:filename", rawPng, async (req, res) => {
+        try {
+            const filename = decodeURIComponent(req.params.filename);
+            const sourceFilename = typeof req.query.sourceFilename === "string"
+                ? req.query.sourceFilename
+                : decodeHeader(req.headers["x-ima2-canvas-source-filename"]);
+            const item = await updateCanvasVersion(ctx, filename, {
+                sourceFilename,
+                prompt: getPrompt(req),
+                buffer: getRequestBuffer(req),
+            });
+            res.json({ item });
+        }
+        catch (err) {
+            res.status(err.status || 500).json({
+                error: err.message,
+                code: err.code || "CANVAS_VERSION_SAVE_FAILED",
+            });
+        }
+    });
 }

package/routes/canvasVersions.ts

@@ -0,0 +1,64 @@
+import express from "express";
+import { createCanvasVersion, updateCanvasVersion } from "../lib/canvasVersionStore.js";
+
+function decodeHeader(value) {
+  if (typeof value !== "string" || !value) return null;
+  try {
+    return decodeURIComponent(value);
+  } catch {
+    return value;
+  }
+}
+
+function getRequestBuffer(req) {
+  return Buffer.isBuffer(req.body) ? req.body : Buffer.alloc(0);
+}
+
+function getPrompt(req) {
+  return decodeHeader(req.headers["x-ima2-canvas-prompt"]);
+}
+
+export function registerCanvasVersionRoutes(app, ctx) {
+  const rawPng = express.raw({ type: "image/png", limit: ctx.config.server.bodyLimit });
+
+  app.post("/api/canvas-versions", rawPng, async (req, res) => {
+    try {
+      const sourceFilename =
+        typeof req.query.sourceFilename === "string"
+          ? req.query.sourceFilename
+          : decodeHeader(req.headers["x-ima2-canvas-source-filename"]);
+      const item = await createCanvasVersion(ctx, {
+        sourceFilename,
+        prompt: getPrompt(req),
+        buffer: getRequestBuffer(req),
+      });
+      res.status(201).json({ item });
+    } catch (err) {
+      res.status(err.status || 500).json({
+        error: err.message,
+        code: err.code || "CANVAS_VERSION_SAVE_FAILED",
+      });
+    }
+  });
+
+  app.put("/api/canvas-versions/:filename", rawPng, async (req, res) => {
+    try {
+      const filename = decodeURIComponent(req.params.filename);
+      const sourceFilename =
+        typeof req.query.sourceFilename === "string"
+          ? req.query.sourceFilename
+          : decodeHeader(req.headers["x-ima2-canvas-source-filename"]);
+      const item = await updateCanvasVersion(ctx, filename, {
+        sourceFilename,
+        prompt: getPrompt(req),
+        buffer: getRequestBuffer(req),
+      });
+      res.json({ item });
+    } catch (err) {
+      res.status(err.status || 500).json({
+        error: err.message,
+        code: err.code || "CANVAS_VERSION_SAVE_FAILED",
+      });
+    }
+  });
+}