@skopon-cool/form-sdk 0.2.3 → 0.2.5

package/src/submit/submit.test.ts

@@ -8,7 +8,7 @@ import {
   buildAskUserSubmitCurlFromPayload,
   buildCurlStatement,
 } from '../submit/buildCurlStatement'
-import { buildAnswerAgentBody } from '../submit/buildAnswerAgentBody'
+import { buildAnswerAgentBody, validateAnswerAgentBody } from '../submit/buildAnswerAgentBody'
 import {
   extractExtraBlockValues,
   getPayloadInputFieldNames,
@@ -17,7 +17,10 @@ import {
   parsePayloadBlocksJson,
   payloadHasInputBlocks,
 } from '../submit/intersectPayloadBlocksWithForm'
-import { submitAnswerAgent } from '../submit/submitAnswerAgent'
+import {
+  formatAnswerAgentSubmitMessage,
+  submitAnswerAgent,
+} from '../submit/submitAnswerAgent'
 import { submitFormJson } from '../submit/submitFormJson'
 import { validateFormSubmitValues } from '../submit/validateFormSubmit'
 import type { FormSchema } from '../types/index'
@@ -27,6 +30,16 @@ describe('buildCurlStatement', () => {
     const curl = buildCurlStatement({ name: "O'Brien" }, 'https://example.com/hook')
     expect(curl).toContain("curl -X POST 'https://example.com/hook'")
     expect(curl).toContain("O'\\''Brien")
+    expect(curl).toContain("Authorization: Bearer <token>")
+  })
+
+  it('includes Authorization header when provided', () => {
+    const curl = buildCurlStatement(
+      { a: 1 },
+      'https://example.com/hook',
+      { Authorization: 'Bearer tok-1' },
+    )
+    expect(curl).toContain("Authorization: Bearer tok-1")
   })
 
   it('uses placeholder when callback url missing', () => {
@@ -87,6 +100,21 @@ describe('buildAskUserSubmitCurlFromPayload', () => {
       buildCurlStatement(payload, callbackUrl),
     )
   })
+
+  it('includes Authorization header in submit-fields curl', () => {
+    const payload = {
+      title: 'Ask',
+      blocks: [
+        { id: 'p1', type: 'text', name: 'video_title', label: '标题', defaultValue: 'hello' },
+      ],
+    }
+    const curl = buildAskUserSubmitCurlFromPayload(
+      payload,
+      'https://example.com/hook',
+      { Authorization: 'Bearer tok-1' },
+    )
+    expect(curl).toContain("Authorization: Bearer tok-1")
+  })
 })
 
 describe('parsePayloadBlocksJson', () => {
@@ -298,17 +326,58 @@ describe('buildAnswerAgentBody', () => {
   })
 })
 
+describe('validateAnswerAgentBody', () => {
+  it('rejects missing request_id', () => {
+    const body = buildAnswerAgentBody({
+      context: {
+        missionId: 1,
+        tenantId: 1001,
+        tenantUserId: 'u1',
+        callbackUrl: 'https://example.com/cb',
+      },
+      payload: {},
+      answer: {},
+    })
+    expect(validateAnswerAgentBody(body)).toBe('request_id 缺失，无法提交')
+  })
+
+  it('accepts mission_id 0', () => {
+    const body = buildAnswerAgentBody({
+      context: {
+        missionId: 0,
+        tenantId: 1001,
+        tenantUserId: 'u1',
+        requestId: 'req-1',
+        callbackUrl: 'https://example.com/cb',
+      },
+      payload: {},
+      answer: {},
+    })
+    expect(validateAnswerAgentBody(body)).toBeNull()
+  })
+})
+
 describe('submitAnswerAgent', () => {
   it('POSTs to explicit answer agent callback url with auth headers', async () => {
     const fetchMock = vi.fn(async () => ({
       ok: true,
       status: 200,
       headers: { get: () => 'application/json' },
-      json: async () => ({ callback_ok: true }),
+      json: async () => ({
+        success: true,
+        data: { callback_ok: true },
+      }),
     })) as unknown as typeof fetch
 
     const result = await submitAnswerAgent(
-      { answer: { a: 1 } },
+      {
+        mission_id: 1,
+        tenant_id: 1001,
+        tenant_user_id: 'u1',
+        request_id: 'req-1',
+        callback_url: 'https://example.com/cb',
+        answer: { a: 1 },
+      },
       {
         answerAgentCallbackUrl: '/api/v1/mock/ask_user_answer_mock',
         headers: { Authorization: 'Bearer tok' },
@@ -324,16 +393,76 @@ describe('submitAnswerAgent', () => {
           Authorization: 'Bearer tok',
           'Content-Type': 'application/json',
         }),
-        body: JSON.stringify({ answer: { a: 1 } }),
       }),
     )
   })
 
-  it('throws when answer agent callback url is missing', async () => {
+  it('marks result not ok when callback_ok is false', async () => {
+    const fetchMock = vi.fn(async () => ({
+      ok: true,
+      status: 200,
+      headers: { get: () => 'application/json' },
+      json: async () => ({
+        success: true,
+        data: { callback_ok: false, error: 'connection refused' },
+      }),
+    })) as unknown as typeof fetch
+
+    const result = await submitAnswerAgent(
+      {
+        mission_id: 1,
+        tenant_id: 1001,
+        tenant_user_id: 'u1',
+        request_id: 'req-1',
+        callback_url: 'https://example.com/cb',
+        answer: {},
+      },
+      {
+        answerAgentCallbackUrl: '/api/v1/mock/ask_user_answer_mock',
+        fetch: fetchMock,
+      },
+    )
+    expect(result.ok).toBe(false)
+    expect(formatAnswerAgentSubmitMessage(result)).toEqual({
+      type: 'error',
+      message: '提交失败：connection refused',
+    })
+  })
+
+  it('throws when required body fields are missing', async () => {
     await expect(submitAnswerAgent({ answer: {} })).rejects.toThrow(
-      'answer_agent_callback_url 未配置，无法提交',
+      'callback_url 为空，无法提交',
     )
   })
+
+  it('throws when explicit answer agent callback url is empty', async () => {
+    await expect(
+      submitAnswerAgent(
+        {
+          mission_id: 1,
+          tenant_id: 1001,
+          tenant_user_id: 'u1',
+          request_id: 'req-1',
+          callback_url: 'https://example.com/cb',
+          answer: {},
+        },
+        { answerAgentCallbackUrl: '   ' },
+      ),
+    ).rejects.toThrow('answer_agent_callback_url 未配置，无法提交')
+  })
+
+  it('throws when answer agent callback url cannot be resolved', async () => {
+    await expect(
+      submitAnswerAgent({
+        mission_id: 1,
+        tenant_id: 1001,
+        tenant_user_id: 'u1',
+        request_id: 'req-1',
+        callback_url: 'https://example.com/cb',
+        answer: {},
+      }),
+    ).rejects.toThrow('answer_agent_callback_url 未配置，无法提交')
+  })
 })
 
 describe('submitFormJson', () => {
@@ -359,6 +488,33 @@ describe('submitFormJson', () => {
       }),
     )
   })
+
+  it('POSTs JSON payload with Authorization header', async () => {
+    const fetchMock = vi.fn(async () => ({
+      ok: true,
+      status: 200,
+      headers: { get: () => 'application/json' },
+      json: async () => ({ ok: true }),
+    })) as unknown as typeof fetch
+
+    await submitFormJson(
+      'https://example.com/hook',
+      { a: 1 },
+      {
+        fetch: fetchMock,
+        headers: { Authorization: 'Bearer tok-1' },
+      },
+    )
+    expect(fetchMock).toHaveBeenCalledWith(
+      'https://example.com/hook',
+      expect.objectContaining({
+        headers: expect.objectContaining({
+          Authorization: 'Bearer tok-1',
+          'Content-Type': 'application/json',
+        }),
+      }),
+    )
+  })
 })
 
 describe('validateFormSubmitValues', () => {

package/src/submit/submitAnswerAgent.ts

@@ -1,8 +1,9 @@
 import {
   resolveAnswerAgentCallbackUrl,
-  resolveSkoponAuthHeaders,
+  resolveSubmitAuthHeaders,
   type SkoponAuthStorageOptions,
 } from '../client/authStorage'
+import { validateAnswerAgentBody } from './buildAnswerAgentBody'
 import {
   submitFormJson,
   type SubmitFormJsonOptions,
@@ -15,25 +16,98 @@ export interface SubmitAnswerAgentOptions extends SubmitFormJsonOptions {
   answerAgentCallbackUrl?: string | null
 }
 
+const ANSWER_AGENT_CALLBACK_URL_MISSING_ERROR =
+  'answer_agent_callback_url 未配置，无法提交'
+
+function resolveSubmitAnswerAgentUrl(options?: SubmitAnswerAgentOptions): string {
+  if (options?.answerAgentCallbackUrl != null) {
+    const explicit = options.answerAgentCallbackUrl.trim()
+    if (!explicit) {
+      throw new Error(ANSWER_AGENT_CALLBACK_URL_MISSING_ERROR)
+    }
+    return explicit
+  }
+
+  const resolved = resolveAnswerAgentCallbackUrl(options?.authStorage).trim()
+  if (!resolved) {
+    throw new Error(ANSWER_AGENT_CALLBACK_URL_MISSING_ERROR)
+  }
+  return resolved
+}
+
+interface AnswerAgentResponseData {
+  callback_ok?: boolean
+  callback_status?: number
+  error?: string | null
+}
+
+function extractAnswerAgentData(body: unknown): AnswerAgentResponseData | null {
+  if (!body || typeof body !== 'object' || Array.isArray(body)) return null
+  const envelope = body as Record<string, unknown>
+  const data = envelope.data
+  if (!data || typeof data !== 'object' || Array.isArray(data)) return null
+  return data as AnswerAgentResponseData
+}
+
+function formatHttpErrorMessage(status: number, body: unknown): string {
+  if (body && typeof body === 'object' && body !== null && 'message' in body) {
+    const msg = (body as { message: unknown }).message
+    if (typeof msg === 'string' && msg.trim()) {
+      return `提交失败 (${status}): ${msg.trim()}`
+    }
+  }
+  if (typeof body === 'string' && body.trim()) {
+    return `提交失败 (${status}): ${body.trim()}`
+  }
+  return `提交失败 (${status})`
+}
+
+function formatCallbackFailureMessage(data: AnswerAgentResponseData): string {
+  const detail =
+    typeof data.error === 'string' && data.error.trim()
+      ? data.error.trim()
+      : `回调 HTTP ${data.callback_status ?? '失败'}`
+  return `提交失败：${detail}`
+}
+
+export function formatAnswerAgentSubmitMessage(
+  result: SubmitFormJsonResult,
+): { type: 'success' | 'error'; message: string } {
+  const data = extractAnswerAgentData(result.body)
+  if (data?.callback_ok === false) {
+    return { type: 'error', message: formatCallbackFailureMessage(data) }
+  }
+
+  if (!result.ok) {
+    return {
+      type: 'error',
+      message: formatHttpErrorMessage(result.status, result.body),
+    }
+  }
+
+  return { type: 'success', message: '提交成功' }
+}
+
 export async function submitAnswerAgent(
   body: Record<string, unknown>,
   options?: SubmitAnswerAgentOptions,
 ): Promise<SubmitFormJsonResult> {
-  const url = (
-    options?.answerAgentCallbackUrl ??
-    resolveAnswerAgentCallbackUrl(options?.authStorage)
-  ).trim()
-  if (!url) {
-    throw new Error('answer_agent_callback_url 未配置，无法提交')
+  const validationError = validateAnswerAgentBody(body)
+  if (validationError) {
+    throw new Error(validationError)
   }
 
-  const storageHeaders = resolveSkoponAuthHeaders(options?.authStorage)
+  const url = resolveSubmitAnswerAgentUrl(options)
 
-  return submitFormJson(url, body, {
+  const result = await submitFormJson(url, body, {
     ...options,
-    headers: {
-      ...storageHeaders,
-      ...(options?.headers ?? {}),
-    },
+    headers: resolveSubmitAuthHeaders(options?.headers, options?.authStorage),
   })
+
+  const data = extractAnswerAgentData(result.body)
+  if (result.ok && data?.callback_ok === false) {
+    return { ok: false, status: result.status, body: result.body }
+  }
+
+  return result
 }