@goodandready/dsh-image-gen 0.10.28 → 0.10.29

package/lib/index.js

@@ -469,7 +469,7 @@ export function apply(ctx, config) {
           // Content-addressed: the bytes behind an id never change.
           'Cache-Control': 'public, max-age=31536000, immutable',
         })
-        res.end(Buffer.from(stored.data))
+        res.end(Buffer.isBuffer(stored.data) ? stored.data : Buffer.from(stored.data))
       } catch (error) {
         res.writeHead(404, { 'Content-Type': 'application/json' })
         res.end(JSON.stringify({ error: 'image not found or reference mismatch' }))

package/lib/providers/backends/gemini.js

@@ -15,6 +15,12 @@ export function createGeminiGenerator(deps, job) {
   async function gemini(seedArg = seed, promptArg = prompt) {
     const key = await resolveKey(cfg.geminiKeyEnv)
     const model = cfg.geminiModel || 'gemini-2.0-flash-exp-image-generation'
+    const timeoutSignal = typeof AbortSignal !== 'undefined' && AbortSignal.timeout
+      ? AbortSignal.timeout(cfg.timeoutMs || 120000)
+      : undefined
+    const effectiveSignal = signal && timeoutSignal && AbortSignal.any
+      ? AbortSignal.any([signal, timeoutSignal])
+      : (signal || timeoutSignal)
     const res = await fetchImpl(`https://generativelanguage.googleapis.com/v1beta/models/${model}:generateContent?key=${encodeURIComponent(key)}`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
@@ -22,7 +28,7 @@ export function createGeminiGenerator(deps, job) {
         contents: [{ parts: [{ text: promptArg }] }],
         generationConfig: { responseModalities: ['IMAGE'], ...(quality !== undefined ? { imageConfig: { imageQuality: quality } } : {}), ...(style !== undefined ? { imageConfig: { imageStyle: style } } : {}) },
       }),
-      signal,
+      signal: effectiveSignal,
     })
     const data = await res.json().catch(() => ({}))
     if (!res.ok) {

package/lib/providers/backends/seedream.js

@@ -16,6 +16,12 @@ export function createSeedreamGenerator(deps, job) {
   async function seedream(seedArg = seed, promptArg = prompt) {
     const key = await resolveKey(cfg.seedreamKeyEnv)
     const base = (cfg.seedreamBaseURL || 'https://api.bytedanceapi.com/v1').replace(/\/+$/, '')
+    const timeoutSignal = typeof AbortSignal !== 'undefined' && AbortSignal.timeout
+      ? AbortSignal.timeout(cfg.timeoutMs || 120000)
+      : undefined
+    const effectiveSignal = signal && timeoutSignal && AbortSignal.any
+      ? AbortSignal.any([signal, timeoutSignal])
+      : (signal || timeoutSignal)
     const res = await fetchImpl(`${base}/images/generations`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${key}` },
@@ -28,7 +34,7 @@ export function createSeedreamGenerator(deps, job) {
         ...(quality !== undefined ? { quality } : {}),
         ...(style !== undefined ? { style } : {}),
       }),
-      signal,
+      signal: effectiveSignal,
     })
     const data = await res.json().catch(() => ({}))
     if (!res.ok) {
@@ -41,7 +47,7 @@ export function createSeedreamGenerator(deps, job) {
       return { bytes: Buffer.from(item.b64_json, 'base64'), mediaType: normalizeMediaType('image/png', format), width: 0, height: 0, seed: seedArg ?? 0, sourceUrl: '' }
     }
     if (!item.url) throw new Error('Seedream returned neither b64_json nor url')
-    const dl = await fetchImpl(item.url, { signal })
+    const dl = await fetchImpl(item.url, { signal: effectiveSignal })
     if (!dl.ok) throw new Error(`Seedream download failed (HTTP ${dl.status})`)
     return { bytes: Buffer.from(await dl.arrayBuffer()), mediaType: normalizeMediaType('image/png', format), width: 0, height: 0, seed: seedArg ?? 0, sourceUrl: item.url }
   }

package/lib/tools/editing.js

@@ -27,6 +27,8 @@ import {
   blendImagesFal,
   toLosslessJson,
   saveAttachmentSafe,
+  editImageDirect,
+  varyImageDirect,
 } from '../providers.js'
 import { resolveConversationImage, analyzeImageWithVision, buildDualOutputMarkdown } from '../resolve-image.js'
 import { sanitizeNegativePrompt, supportsNegativePrompt } from '../negative-sanitizer.js'
@@ -156,11 +158,10 @@ export function registerEditingTools(ctx, deps) {
             mask,
             strength,
             provider,
+            signal: exec?.signal,
           }
 
-          const providers = makeProviders(deps, job)
-          const fn = providers[provider] || providers.fal || providers.custom
-          const gen = await fn(seed, effectivePrompt)
+          const gen = await editImageDirect(deps, job)
 
           const stem = args.output_name ? slugify(args.output_name) : `${source.name}-edit-${seed}`
           const name = `${stem}.${format}`
@@ -287,11 +288,10 @@ export function registerEditingTools(ctx, deps) {
               source,
               strength: variationStrength,
               provider,
+              signal: exec?.signal,
             }
 
-            const providers = makeProviders(deps, job)
-            const fn = providers[provider] || providers.fal || providers.custom
-            const gen = await fn(currentSeed, promptText)
+            const gen = await varyImageDirect(deps, job)
 
             const stem = args.output_name
               ? `${slugify(args.output_name)}-var-${i + 1}`
@@ -432,6 +432,7 @@ export function registerEditingTools(ctx, deps) {
                 source,
                 strength,
                 provider,
+                signal: exec?.signal,
               }
 
               const providers = makeProviders(deps, job)

package/lib/tools/frontend.js

@@ -6,13 +6,6 @@ import { mkdir, writeFile } from 'node:fs/promises'
 import {
   computeGenerationHash,
   IMAGE_SIZES,
-  OUTPUT_FORMATS,
-  PROVIDER_KEYS,
-  buildSidecar,
-  makeProviders,
-  ASPECT_RATIOS,
-  pixelDiff,
-  normalizeCount,
   tryGenerate,
   fallbackOrder,
   embedPngMetadata,

package/lib/tools/inspect.js

@@ -6,13 +6,7 @@ import { mkdir, writeFile } from 'node:fs/promises'
 import {
   computeGenerationHash,
   IMAGE_SIZES,
-  OUTPUT_FORMATS,
-  PROVIDER_KEYS,
-  buildSidecar,
-  makeProviders,
-  ASPECT_RATIOS,
   pixelDiff,
-  normalizeCount,
   tryGenerate,
   fallbackOrder,
   embedPngMetadata,

package/lib/tools/pattern.js

@@ -76,7 +76,7 @@ export function registerPatternTools(ctx, deps) {
               resolveKey: (ref) => resolveApiKey(ctx, ref),
               cfg,
             }
-            const job = { prompt, size, format, seed, provider }
+            const job = { prompt, size, format, seed, provider, signal: exec?.signal }
             const providers = makeProviders(pdeps, job)
             const fn = providers[provider] || providers.fal || providers.custom
             const gen = await fn(seed, prompt)

package/lib/tools/processing-advanced.js

@@ -8,13 +8,6 @@ import { mkdir, writeFile } from 'node:fs/promises'
 import {
   computeGenerationHash,
   IMAGE_SIZES,
-  OUTPUT_FORMATS,
-  PROVIDER_KEYS,
-  buildSidecar,
-  makeProviders,
-  ASPECT_RATIOS,
-  pixelDiff,
-  normalizeCount,
   tryGenerate,
   fallbackOrder,
   embedPngMetadata,

package/lib/tools/processing-basic.js

@@ -8,13 +8,6 @@ import { mkdir, writeFile } from 'node:fs/promises'
 import {
   computeGenerationHash,
   IMAGE_SIZES,
-  OUTPUT_FORMATS,
-  PROVIDER_KEYS,
-  buildSidecar,
-  makeProviders,
-  ASPECT_RATIOS,
-  pixelDiff,
-  normalizeCount,
   tryGenerate,
   fallbackOrder,
   embedPngMetadata,

package/lib/tools/responsive.js

@@ -143,6 +143,7 @@ export function registerResponsiveTools(ctx, deps) {
                 provider,
                 ...(stylePreset ? { style: stylePreset, style_preset: stylePreset } : {}),
                 ...(paletteColors ? { palette_colors: paletteColors } : {}),
+                signal: exec?.signal,
               }
               const providers = makeProviders(pdeps, job)
               const generators = Object.fromEntries(PROVIDER_KEYS.map((k) => [

package/lib/tools/sketch.js

@@ -129,6 +129,7 @@ export function registerSketchTools(ctx, deps) {
               source,
               strength,
               provider,
+              signal: exec?.signal,
             }
             const providers = makeProviders(pdeps, job)
             const fn = providers[provider] || providers.fal || providers.custom

package/lib/tools/spritesheet.js

@@ -90,7 +90,7 @@ export function registerSpritesheetTools(ctx, deps) {
                 resolveKey: (ref) => resolveApiKey(ctx, ref),
                 cfg,
               }
-              const job = { prompt: prompts[i], size, format, seed: seed + i, provider }
+              const job = { prompt: prompts[i], size, format, seed: seed + i, provider, signal: exec?.signal }
               const providers = makeProviders(pdeps, job)
               const fn = providers[provider] || providers.fal || providers.custom
               const gen = await fn(seed + i, prompts[i])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-image-gen",
-  "version": "0.10.28",
+  "version": "0.10.29",
   "description": "Image generation for DeepSeek Harness: a generate_image tool with pluggable providers — the FAL queue, any OpenAI-compatible images API, or a ChatGPT/Grok subscription with no API key at all. The picture is shown inline in the conversation; the model receives either a link (works with any chat model) or the image itself (needs dsh-vision-bridge or a vision-capable model).",
   "keywords": [
     "deepseek-harness",