@clickraft/cli 0.8.7 → 0.8.8

package/dist/index.js

@@ -813,6 +813,44 @@ function matchesPrefix(content, prefix) {
   }
   return true;
 }
+function waitForGeneration(params) {
+  return longPoll({
+    // Forward the iteration signal so the in-flight server hold is aborted as
+    // soon as the overall deadline expires — otherwise `--timeout 1` would still
+    // block for the full server long-poll round.
+    fetcher: (args) => params.client.request({
+      method: "GET",
+      path: `/jobs/${encodeURIComponent(params.jobId)}`,
+      query: { wait: params.serverWaitSeconds },
+      responseSchema: params.resultSchema,
+      signal: args?.signal
+    }),
+    isTerminal: params.isTerminal,
+    timeoutMs: params.timeoutMs,
+    signal: params.signal
+  });
+}
+async function createGeneration(params) {
+  const created = await params.client.request({
+    method: "POST",
+    path: "/jobs",
+    body: params.body,
+    responseSchema: params.createSchema,
+    signal: params.signal
+  });
+  if (!params.wait) {
+    return params.projectCreated(created, params.modelSlug);
+  }
+  return waitForGeneration({
+    client: params.client,
+    jobId: created.jobId,
+    timeoutMs: params.timeoutMs,
+    serverWaitSeconds: params.serverWaitSeconds,
+    signal: params.signal,
+    resultSchema: params.resultSchema,
+    isTerminal: params.isTerminal
+  });
+}
 
 // src/errors/codes.ts
 var LOGIN_HINT = "Run `clickraft login` to authenticate.";
@@ -1902,37 +1940,19 @@ function isUrlLike(value) {
   return value.startsWith("http://") || value.startsWith("https://");
 }
 
-// src/commands/generate/get.ts
-async function generateGet(opts) {
-  const client = opts.client ?? await buildGenerateClient(opts);
-  return client.request({
-    method: "GET",
-    path: `/jobs/${encodeURIComponent(opts.jobId)}`,
-    query: opts.waitSeconds && opts.waitSeconds > 0 ? { wait: opts.waitSeconds } : void 0,
-    responseSchema: GenerationResultSchema,
-    signal: opts.signal
-  });
-}
-
 // src/commands/generate/wait.ts
 var DEFAULT_WAIT_TIMEOUT_SECONDS = 120;
 var SERVER_LONG_POLL_SECONDS = 30;
 async function generateWait(opts) {
   const client = opts.client ?? await buildGenerateClient(opts);
-  const timeoutSeconds = opts.timeoutSeconds ?? DEFAULT_WAIT_TIMEOUT_SECONDS;
-  return longPoll({
-    // Forward the iteration signal so the in-flight server hold is aborted
-    // as soon as the overall deadline expires — otherwise `--timeout 1` would
-    // still block for the full 30s server long-poll round.
-    fetcher: (args) => generateGet({
-      jobId: opts.jobId,
-      waitSeconds: SERVER_LONG_POLL_SECONDS,
-      client,
-      signal: args?.signal
-    }),
-    isTerminal: (r) => isTerminalStatus(r.status),
-    timeoutMs: timeoutSeconds * 1e3,
-    signal: opts.signal
+  return waitForGeneration({
+    client,
+    jobId: opts.jobId,
+    timeoutMs: (opts.timeoutSeconds ?? DEFAULT_WAIT_TIMEOUT_SECONDS) * 1e3,
+    serverWaitSeconds: SERVER_LONG_POLL_SECONDS,
+    signal: opts.signal,
+    resultSchema: GenerationResultSchema,
+    isTerminal: (r) => isTerminalStatus(r.status)
   });
 }
 
@@ -1950,22 +1970,18 @@ async function generateCreate(opts) {
     signal: opts.signal
   });
   const body = buildRequestBody({ ...opts, referenceImages });
-  const created = await client.request({
-    method: "POST",
-    path: "/jobs",
-    body,
-    responseSchema: GenerateCreateResponseSchema,
-    signal: opts.signal
-  });
-  const wait = opts.wait ?? true;
-  if (!wait) {
-    return projectCreateToResult(created, opts.modelSlug);
-  }
-  return generateWait({
-    jobId: created.jobId,
-    timeoutSeconds: opts.timeoutSeconds ?? DEFAULT_WAIT_TIMEOUT_SECONDS,
+  return createGeneration({
     client,
-    signal: opts.signal
+    body,
+    modelSlug: opts.modelSlug,
+    wait: opts.wait ?? true,
+    timeoutMs: (opts.timeoutSeconds ?? DEFAULT_WAIT_TIMEOUT_SECONDS) * 1e3,
+    serverWaitSeconds: SERVER_LONG_POLL_SECONDS,
+    signal: opts.signal,
+    createSchema: GenerateCreateResponseSchema,
+    resultSchema: GenerationResultSchema,
+    isTerminal: (r) => isTerminalStatus(r.status),
+    projectCreated: projectCreateToResult
   });
 }
 async function resolveReferenceImages(args) {
@@ -2048,6 +2064,18 @@ function projectCreateToResult(response, modelSlug) {
   };
 }
 
+// src/commands/generate/get.ts
+async function generateGet(opts) {
+  const client = opts.client ?? await buildGenerateClient(opts);
+  return client.request({
+    method: "GET",
+    path: `/jobs/${encodeURIComponent(opts.jobId)}`,
+    query: opts.waitSeconds && opts.waitSeconds > 0 ? { wait: opts.waitSeconds } : void 0,
+    responseSchema: GenerationResultSchema,
+    signal: opts.signal
+  });
+}
+
 // src/cli/args.ts
 var ArgError = class extends Error {
   constructor(message) {