修复订阅授权返回后生成中断
生成动作先进入拼图进度页并立即发起生成 订阅授权改为非阻塞尝试,避免闪回卡住提交 移除订阅结果回写 web-view URL 导致回首页的逻辑 更新小程序订阅消息授权与发送边界文档
This commit is contained in:
@@ -6748,7 +6748,6 @@ export function PlatformEntryFlowShellImpl({
|
||||
if (payload.action !== 'compile_puzzle_draft') {
|
||||
return;
|
||||
}
|
||||
await requestGenerationResultSubscribePermission();
|
||||
markDraftGenerating('puzzle', [
|
||||
session.sessionId,
|
||||
buildPuzzleResultWorkId(session.sessionId),
|
||||
@@ -6779,6 +6778,7 @@ export function PlatformEntryFlowShellImpl({
|
||||
error: null,
|
||||
},
|
||||
}));
|
||||
void requestGenerationResultSubscribePermission();
|
||||
},
|
||||
onActionError: async ({ payload, errorMessage, session, setSession }) => {
|
||||
if (payload.action !== 'compile_puzzle_draft') {
|
||||
@@ -7981,7 +7981,7 @@ export function PlatformEntryFlowShellImpl({
|
||||
|
||||
try {
|
||||
const actionPayload = buildPuzzleCompileActionFromFormPayload(payload);
|
||||
await requestGenerationResultSubscribePermission();
|
||||
void requestGenerationResultSubscribePermission();
|
||||
const response = await executePuzzleAgentAction(
|
||||
nextSession.sessionId,
|
||||
actionPayload,
|
||||
|
||||
@@ -34,15 +34,35 @@ describe('wechatMiniProgramSubscribe', () => {
|
||||
|
||||
expect(requested).toBe(true);
|
||||
expect(navigateTo).toHaveBeenCalledWith({
|
||||
url: expect.stringMatching(
|
||||
/^\/pages\/subscribe-message\/index\?.*autoRequest=1/u,
|
||||
),
|
||||
url: expect.stringMatching(/^\/pages\/subscribe-message\/index\?/u),
|
||||
success: expect.any(Function),
|
||||
fail: expect.any(Function),
|
||||
});
|
||||
expect(navigateTo.mock.calls[0]?.[0].url).not.toContain('autoRequest=1');
|
||||
expect(window.location.hash).toBe('');
|
||||
});
|
||||
|
||||
test('keeps waiting even when native page returns immediately after navigate success', async () => {
|
||||
const navigateTo = vi.fn((options) => {
|
||||
window.dispatchEvent(new Event('focus'));
|
||||
options.success?.();
|
||||
});
|
||||
window.history.replaceState(
|
||||
null,
|
||||
'',
|
||||
'/creation/puzzle?clientRuntime=wechat_mini_program',
|
||||
);
|
||||
window.wx = {
|
||||
miniProgram: {
|
||||
navigateTo,
|
||||
},
|
||||
};
|
||||
|
||||
const requested = await requestGenerationResultSubscribePermission();
|
||||
|
||||
expect(requested).toBe(true);
|
||||
});
|
||||
|
||||
test('still accepts legacy hash result from native mini program page', async () => {
|
||||
const navigateTo = vi.fn((options) => {
|
||||
options.success?.();
|
||||
|
||||
@@ -2,7 +2,7 @@ import { isWechatMiniProgramRuntime } from './payment/paymentPlatform';
|
||||
|
||||
const WECHAT_JS_SDK_URL = 'https://res.wx.qq.com/open/js/jweixin-1.6.0.js';
|
||||
const SUBSCRIBE_RESULT_HASH_KEY = 'wx_subscribe_result';
|
||||
const SUBSCRIBE_RESULT_TIMEOUT_MS = 30_000;
|
||||
const SUBSCRIBE_RESULT_TIMEOUT_MS = 2_500;
|
||||
const SUBSCRIBE_RESULT_RETURN_FALLBACK_MS = 800;
|
||||
|
||||
function clearSubscribeResultHash() {
|
||||
@@ -155,9 +155,10 @@ export async function requestGenerationResultSubscribePermission() {
|
||||
}
|
||||
|
||||
const requestId = `subscribe_generation_result_${Date.now()}`;
|
||||
const resultPromise = waitSubscribeResultFromHash();
|
||||
const navigated = await new Promise<boolean>((resolve) => {
|
||||
miniProgram.navigateTo?.({
|
||||
url: `/pages/subscribe-message/index?requestId=${encodeURIComponent(requestId)}&scene=generation-result&autoRequest=1`,
|
||||
url: `/pages/subscribe-message/index?requestId=${encodeURIComponent(requestId)}&scene=generation-result`,
|
||||
success() {
|
||||
resolve(true);
|
||||
},
|
||||
@@ -169,7 +170,6 @@ export async function requestGenerationResultSubscribePermission() {
|
||||
if (!navigated) {
|
||||
return false;
|
||||
}
|
||||
const resultPromise = waitSubscribeResultFromHash();
|
||||
const result = await resultPromise;
|
||||
return Boolean(result);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user