feat: support probe paramName optional

Author: ReaJason

generator/src/main/java/com/reajason/javaweb/probe/config/ResponseBodyConfig.java

@@ -1,8 +1,11 @@
 package com.reajason.javaweb.probe.config;
 
+import com.reajason.javaweb.utils.CommonUtil;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author ReaJason
@@ -17,7 +20,8 @@ public class ResponseBodyConfig extends ProbeContentConfig {
     /**
      * 获取参数的请求头或请求参数名称
      */
-    private String reqParamName;
+    @Builder.Default
+    private String reqParamName = CommonUtil.getRandomString(8);
 
     /**
      * 内置执行类加载的字节码
@@ -28,4 +32,15 @@ public class ResponseBodyConfig extends ProbeContentConfig {
      * 命令执行模板，例如 sh -c "{command}" 2>&1，使用 {command} 作为占位符
      */
     private String commandTemplate;
+
+    public static abstract class ResponseBodyConfigBuilder<C extends ResponseBodyConfig, B extends ResponseBodyConfig.ResponseBodyConfigBuilder<C, B>>
+            extends ProbeContentConfig.ProbeContentConfigBuilder<C, B> {
+        public B reqParamName(String reqParamName) {
+            if (StringUtils.isNotBlank(reqParamName)) {
+                reqParamName$value = reqParamName;
+                reqParamName$set = true;
+            }
+            return self();
+        }
+    }
 }

web/app/components/probeshell/basic-info.tsx

@@ -3,12 +3,17 @@ import { useTranslation } from "react-i18next";
 import { CopyableField } from "@/components/copyable-field";
 import { FeedbackAlert } from "@/components/memshell/results/feedback-alert";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import type { ProbeShellResult } from "@/types/probeshell";
+import type { ProbeShellResult, ResponseBodyConfig } from "@/types/probeshell";
 
 export function BasicInfo({
   generateResult,
 }: Readonly<{ generateResult?: ProbeShellResult }>) {
   const { t } = useTranslation();
+  console.log(generateResult);
+  const isBodyContent =
+    generateResult?.probeConfig.probeMethod === "ResponseBody";
+  const isBodyCommand =
+    isBodyContent && generateResult?.probeConfig.probeContent === "Command";
   return (
     <Card>
       <CardHeader>
@@ -22,6 +27,34 @@ export function BasicInfo({
       </CardHeader>
       <CardContent>
         <div className="grid grid-cols-1 gap-2">
+          {isBodyContent && (
+            <CopyableField
+              label={t("common:paramName")}
+              value={
+                (generateResult?.probeContentConfig as ResponseBodyConfig)
+                  .reqParamName
+              }
+              text={
+                (generateResult?.probeContentConfig as ResponseBodyConfig)
+                  .reqParamName
+              }
+            />
+          )}
+          {isBodyCommand &&
+            (generateResult?.probeContentConfig as ResponseBodyConfig)
+              .commandTemplate && (
+              <CopyableField
+                label={t("common:commandTemplate")}
+                value={
+                  (generateResult?.probeContentConfig as ResponseBodyConfig)
+                    .commandTemplate
+                }
+                text={
+                  (generateResult?.probeContentConfig as ResponseBodyConfig)
+                    .commandTemplate
+                }
+              />
+            )}
           <CopyableField
             label={t("probeshell:shellClassName")}
             value={generateResult?.shellClassName}

web/app/components/probeshell/main-config-card.tsx

@@ -51,13 +51,12 @@ const MIDDLEWARE_OPTIONS = [
 ] as const;
 
 const PROBE_METHOD_OPTIONS = [
-  { value: "Sleep", label: "Sleep" },
-  { value: "DNSLog", label: "DNSLog" },
   { value: "ResponseBody", label: "ResponseBody" },
+  { value: "DNSLog", label: "DNSLog" },
+  { value: "Sleep", label: "Sleep" },
 ] as const;
 
 const DEFAULT_FORM_VALUES = {
-  reqParamName: "payload",
   sleepServer: "Tomcat",
   seconds: 5,
 } as const;
@@ -143,7 +142,9 @@ export default function MainConfigCard({ form, servers }: MainConfigCardProps) {
           name="reqParamName"
           render={({ field }) => (
             <FormFieldItem>
-              <FormFieldLabel>{t("common:paramName")}</FormFieldLabel>
+              <FormFieldLabel>
+                {t("common:paramName")} {t("common:optional")}
+              </FormFieldLabel>
               <FormControl>
                 <Input placeholder={t("placeholders.input")} {...field} />
               </FormControl>
@@ -158,45 +159,28 @@ export default function MainConfigCard({ form, servers }: MainConfigCardProps) {
 
   const CommandTemplateField = useMemo(
     () => (
-      <>
-        <div className="space-y-2 pt-4 border-t mt-4">
-          <FormField
-            control={form.control}
-            name="reqParamName"
-            render={({ field }) => (
-              <FormFieldItem>
-                <FormFieldLabel>{t("common:paramName")}</FormFieldLabel>
-                <FormControl>
-                  <Input placeholder={t("placeholders.input")} {...field} />
-                </FormControl>
-                <FormMessage />
-              </FormFieldItem>
-            )}
-          />
-        </div>
-        <div className="space-y-2">
-          <FormField
-            control={form.control}
-            name="commandTemplate"
-            render={({ field }) => (
-              <FormFieldItem>
-                <FormFieldLabel>
-                  {t("common:commandTemplate")} {t("common:optional")}
-                </FormFieldLabel>
-                <FormControl>
-                  <Input
-                    {...field}
-                    placeholder={t("common:commandTemplate.placeholder")}
-                  />
-                </FormControl>
-                <p className="text-xs text-muted-foreground mt-1">
-                  {t("common:commandTemplate.description")}
-                </p>
-              </FormFieldItem>
-            )}
-          />
-        </div>
-      </>
+      <div className="space-y-2">
+        <FormField
+          control={form.control}
+          name="commandTemplate"
+          render={({ field }) => (
+            <FormFieldItem>
+              <FormFieldLabel>
+                {t("common:commandTemplate")} {t("common:optional")}
+              </FormFieldLabel>
+              <FormControl>
+                <Input
+                  {...field}
+                  placeholder={t("common:commandTemplate.placeholder")}
+                />
+              </FormControl>
+              <p className="text-xs text-muted-foreground mt-1">
+                {t("common:commandTemplate.description")}
+              </p>
+            </FormFieldItem>
+          )}
+        />
+      </div>
     ),
     [form.control, t],
   );
@@ -251,35 +235,6 @@ export default function MainConfigCard({ form, servers }: MainConfigCardProps) {
     [form.control, t],
   );
 
-  const renderDynamicFields = useCallback(() => {
-    const isBodyMethod = watchedProbeMethod === "ResponseBody";
-    const needParam =
-      watchedProbeContent === "Command" ||
-      watchedProbeContent === "Bytecode" ||
-      watchedProbeContent === "ScriptEngine";
-    const isSleepMethod = watchedProbeMethod === "Sleep";
-    const isServerContent = watchedProbeContent === "Server";
-
-    if (isBodyMethod && needParam) {
-      if (watchedProbeContent === "Command") {
-        return CommandTemplateField;
-      }
-      return RequestParamField;
-    }
-
-    if (isSleepMethod && isServerContent) {
-      return SleepFields;
-    }
-
-    return null;
-  }, [
-    watchedProbeMethod,
-    watchedProbeContent,
-    RequestParamField,
-    SleepFields,
-    CommandTemplateField,
-  ]);
-
   const DNSLogSection = useMemo(
     () => (
       <FormField
@@ -421,6 +376,15 @@ export default function MainConfigCard({ form, servers }: MainConfigCardProps) {
     [form.control, t],
   );
 
+  const isBodyMethod = watchedProbeMethod === "ResponseBody";
+  const isCommandBody = watchedProbeContent === "Command";
+  const needParam =
+    isCommandBody ||
+    watchedProbeContent === "Bytecode" ||
+    watchedProbeContent === "ScriptEngine";
+  const isSleepMethod = watchedProbeMethod === "Sleep";
+  const isServerContent = watchedProbeContent === "Server";
+
   return (
     <FormProvider {...form}>
       <Card>
@@ -463,7 +427,9 @@ export default function MainConfigCard({ form, servers }: MainConfigCardProps) {
           {watchedProbeMethod === "DNSLog" && DNSLogSection}
           {watchedProbeMethod && ContentOptionsSelect}
           {SwitchGroup}
-          {renderDynamicFields()}
+          {isBodyMethod && needParam && RequestParamField}
+          {isBodyMethod && isCommandBody && CommandTemplateField}
+          {isSleepMethod && isServerContent && SleepFields}
           <Separator />
           <FormField
             control={form.control}

web/app/routes/probeshell.tsx

@@ -51,11 +51,11 @@ export default function ProbeShellGenerator() {
   const form = useForm<ProbeShellFormSchema>({
     resolver: useYupValidationProbeResolver(probeShellFormSchema, t),
     defaultValues: {
-      probeMethod: "Sleep",
-      probeContent: "Server",
+      probeMethod: "ResponseBody",
+      probeContent: "Command",
       host: "",
       server: "Tomcat",
-      reqParamName: "payload",
+      reqParamName: "",
       seconds: 5,
       sleepServer: "Tomcat",
       shrink: true,

web/app/types/probeshell.ts

@@ -41,6 +41,7 @@ export interface SleepConfig {
 export interface ResponseBodyConfig {
   server: string;
   reqParamName: string;
+  commandTemplate: string;
 }
 
 export interface PayloadFormValues {

web/app/types/schema.ts

@@ -189,7 +189,6 @@ export const useYupValidationProbeResolver = (
         })) as ProbeShellFormSchema;
 
         const host: keyof ProbeShellFormSchema = "host";
-        const reqParamName: keyof ProbeShellFormSchema = "reqParamName";
         const errors = {} as any;
 
         if (values.probeMethod === "DNSLog" && !values.host) {
@@ -198,13 +197,6 @@ export const useYupValidationProbeResolver = (
             message: t("probeshell:tips.dnslog.host.required"),
           };
         }
-
-        if (values.probeMethod === "ResponseBody" && !values.reqParamName) {
-          errors[reqParamName] = {
-            type: "custom",
-            message: t("probeshell:tips.response.reqParamName.required"),
-          };
-        }
         return {
           values,
           errors,