android-midscene-automation 0.1.32 → 0.1.34

package/src/appium-recorder/flow-graph.ts

@@ -45,6 +45,7 @@ export type InsertAction =
   | 'waitDisappear'
   | 'waitActivity'
   | 'runScript'
+  | 'extractVariable'
   | 'noop'
   | 'log'
   | 'visualChangeStart'
@@ -232,6 +233,24 @@ function addUniqueLink(links: Link[], seen: Set<string>, link: Link) {
   links.push(link);
 }
 
+// 与回放的默认分支返回一致；循环体的虚拟回边不参与有向无环布局。
+function continuationTargetId(items: StepItem[], step: AppiumRecordedStep, seen = new Set<string>()): string {
+  if (seen.has(step.id)) return '';
+  seen.add(step.id);
+  if (step.flow?.successTargetId) return step.flow.successTargetId;
+  if (defaultKind(step) === 'condition') {
+    const index = items.findIndex(item => item.step.id === step.id);
+    const sibling = items.slice(index + 1).find(({ step: candidate }) => (
+      candidate.flow?.parentConditionId === step.flow?.parentConditionId
+      && candidate.flow?.parentBranch === step.flow?.parentBranch
+    ));
+    if (sibling) return sibling.step.id;
+  }
+  const parent = items.find(item => item.step.id === step.flow?.parentConditionId)?.step;
+  if (!parent || (parent.type === 'loop' && step.flow?.parentBranch === 'yes')) return '';
+  return continuationTargetId(items, parent, seen);
+}
+
 function branchConnectionTargetId(items: StepItem[], condition: AppiumRecordedStep, branch: FlowBranch) {
   const branchItems = directBranchItems(items, condition.id, branch);
   if (branchItems.length) {
@@ -239,6 +258,7 @@ function branchConnectionTargetId(items: StepItem[], condition: AppiumRecordedSt
     return defaultKind(last) === 'condition' ? '' : last.flow?.successTargetId || '';
   }
   const targetId = branch === 'yes' ? condition.flow?.yesTargetId : condition.flow?.noTargetId;
+  if (!targetId) return condition.type === 'loop' && branch === 'yes' ? '' : continuationTargetId(items, condition);
   const target = items.find(({ step }) => step.id === targetId)?.step;
   return target && target.flow?.parentConditionId === condition.flow?.parentConditionId ? target.id : '';
 }
@@ -546,11 +566,8 @@ export function buildFlowGraph(
 
     const targetId = item.step.flow?.successTargetId;
     const explicitTarget = targetId ? stepById.get(targetId) : undefined;
-    const explicitMainTarget = explicitTarget && (!explicitTarget.step.flow?.parentConditionId
-      || explicitTarget.step.flow.parentConditionId !== item.step.flow?.parentConditionId)
-      ? explicitTarget
-      : undefined;
-    const target = explicitMainTarget || nextSibling;
+    // 显式跳转优先于顺序关系，包括同一分支内的跳转；失效目标不能悄悄改走相邻节点。
+    const target = targetId ? explicitTarget : nextSibling || stepById.get(continuationTargetId(items, item.step));
     const insertId = addInsertNode(
       item.index,
       branch,
@@ -558,10 +575,6 @@ export function buildFlowGraph(
     );
     addVisibleLink(nodeIdForStep(item.step), insertId, branch);
     if (!target) return;
-    if (branch && explicitMainTarget) {
-      addVisibleLink(insertId, nodeIdForStep(target.step), branch);
-      return;
-    }
     addVisibleLink(insertId, nodeIdForStep(target.step), branch);
   }
 
@@ -741,7 +754,7 @@ export function buildFlowGraph(
   // 公共起点从两侧汇入，不能被最后一条分支连线拉到左列或右列。
   const joins = new Map<string, string>();
   items.forEach(({ step }) => {
-    const target = step.flow?.successTargetId && stepById.get(step.flow.successTargetId);
+    const target = defaultKind(step) === 'condition' && stepById.get(continuationTargetId(items, step));
     if (defaultKind(step) === 'condition' && target && !joins.has(nodeIdForStep(target.step))) {
       joins.set(nodeIdForStep(target.step), nodeIdForStep(step));
     }

package/src/appium-recorder/flow-labels.ts

@@ -10,6 +10,7 @@ export function isBooleanCondition(step: Pick<AppiumRecordedStep, 'type'>) {
 }
 
 export function defaultFlowKind(step: AppiumRecordedStep): FlowKind {
+  if (step.type === 'extractVariable') return 'action';
   if (step.type === 'loop') return 'condition';
   if (step.type === 'breakLoop') return 'action';
   if (step.type === 'log' || step.type === 'openGallery' || step.type === 'endFlow') return 'action';
@@ -65,12 +66,14 @@ export function flowTypeLabel(step: AppiumRecordedStep) {
     runScript: '连接脚本',
     noop: '空节点',
     log: '输出日志',
+    extractVariable: '提取变量',
     visualChange: '检测画面变化',
   };
   return labelMap[step.type] || step.type;
 }
 
 export function flowStepMeta(step: AppiumRecordedStep) {
+  if (step.type === 'extractVariable') return `${step.extractVariable?.attribute || 'text'} → ${step.extractVariable?.name || '未设置变量名'}`;
   if (step.type === 'loop') return `最多 ${step.loop?.maxIterations ?? '?'} 次 · ${step.loop?.exitWhen === 'exists' ? '元素出现时退出' : step.loop?.exitWhen === 'notExists' ? '元素消失时退出' : '固定次数'}${step.loop?.exitWhen !== 'never' ? ` ${step.selector?.value || ''}` : ''}`;
   if (step.type === 'breakLoop') return step.breakLoopTargetId ? '退出指定循环，继续循环结束后的流程' : '退出当前循环，继续循环结束后的流程';
   if (step.type === 'log') return `${step.logPrefix ?? DEFAULT_LOG_PREFIX}:${step.value || ''}`;
@@ -103,7 +106,7 @@ export function flowStepMeta(step: AppiumRecordedStep) {
   }
   if (step.type === 'pinch') return step.pinch?.direction === 'out' ? '放大' : '缩小';
   if (step.type === 'coordinateTap') {
-    return `${step.fallback?.centerX || ''},${step.fallback?.centerY || ''}`;
+    return `${step.fallback?.centerX ?? ''},${step.fallback?.centerY ?? ''}`;
   }
   if (step.type === 'assertText') return step.value || '';
   return `${step.selector?.strategy || ''} ${step.selector?.value || ''}`.trim();

package/src/appium-recorder/types.ts

@@ -1,3 +1,5 @@
+import type { TestVariable, VariableExtraction, ScriptReturn } from './variables';
+
 export type AppiumBounds = {
   left: number;
   top: number;
@@ -99,6 +101,7 @@ export type AppiumRecordedStep = {
     | 'pinch'
     | 'runScript'
     | 'noop'
+    | 'extractVariable'
     | 'log'
     | 'visualChange';
   label: string;
@@ -109,6 +112,9 @@ export type AppiumRecordedStep = {
   fallback?: AppiumSelector;
   value?: string;
   logPrefix?: string;
+  extractVariable?: VariableExtraction;
+  parameters?: TestVariable[];
+  returns?: ScriptReturn[];
   keyCode?: number;
   timeoutMs?: number;
   longPressMode?: 'element' | 'coordinates';
@@ -158,6 +164,7 @@ export type AppiumRecordedScript = {
   appPackage: string;
   appActivity: string;
   deviceId: string;
+  variables?: TestVariable[];
   steps: AppiumRecordedStep[];
   createdAt: string;
   updatedAt: string;

package/src/appium-recorder/variables.ts

@@ -0,0 +1,34 @@
+export type TestVariable = { name: string; value: string; sensitive?: boolean };
+export type VariableExtraction = { name: string; attribute: string; sensitive?: boolean };
+export type ScriptReturn = { name: string; target: string };
+export const VARIABLE_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
+export const sensitiveVariableName = (name: string) => /password|passwd|secret|token|api_?key|密码|令牌/i.test(name);
+
+export function validateVariables(input: unknown): TestVariable[] {
+  if (input === undefined) return [];
+  if (!Array.isArray(input) || input.length > 200) throw new Error('变量必须为列表，最多 200 项');
+  const names = new Set<string>();
+  return input.map(item => {
+    if (!item || typeof item.name !== 'string' || !VARIABLE_NAME.test(item.name) || item.name.length > 80) throw new Error('变量名须以字母或下划线开头，仅含字母、数字、下划线，最长 80 字符');
+    if (names.has(item.name)) throw new Error(`变量名重复：${item.name}`);
+    names.add(item.name);
+    if (typeof item.value !== 'string' || item.value.length > 20000) throw new Error(`变量 ${item.name} 的值必须为文本且不超过 20000 字符`);
+    return { name: item.name, value: item.value, sensitive: Boolean(item.sensitive) || sensitiveVariableName(item.name) };
+  });
+}
+
+export function validateExtraction(input: VariableExtraction | undefined) {
+  if (!input || !VARIABLE_NAME.test(input.name) || !input.attribute?.trim()) throw new Error('请填写有效变量名和组件属性');
+  if (!/^[A-Za-z][A-Za-z0-9_-]*$/.test(input.attribute)) throw new Error('组件属性名称无效');
+  return input;
+}
+
+export function validateReturns(input: ScriptReturn[] = []) {
+  if (!Array.isArray(input) || input.length > 200) throw new Error('返回值映射无效');
+  const targets = new Set<string>();
+  for (const item of input) {
+    if (!item || !VARIABLE_NAME.test(item.name) || !VARIABLE_NAME.test(item.target) || targets.has(item.target)) throw new Error('返回变量名或目标变量名无效、重复');
+    targets.add(item.target);
+  }
+  return input;
+}