openxiangda 1.0.103 → 1.0.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.103",
+  "version": "1.0.104",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {

package/packages/sdk/dist/runtime/index.cjs

@@ -607,7 +607,7 @@ var require_react_is_development = __commonJS({
         var ContextProvider = REACT_PROVIDER_TYPE;
         var Element2 = REACT_ELEMENT_TYPE;
         var ForwardRef2 = REACT_FORWARD_REF_TYPE;
-        var Fragment18 = REACT_FRAGMENT_TYPE2;
+        var Fragment19 = REACT_FRAGMENT_TYPE2;
         var Lazy = REACT_LAZY_TYPE;
         var Memo = REACT_MEMO_TYPE;
         var Portal = REACT_PORTAL_TYPE;
@@ -675,7 +675,7 @@ var require_react_is_development = __commonJS({
         exports.ContextProvider = ContextProvider;
         exports.Element = Element2;
         exports.ForwardRef = ForwardRef2;
-        exports.Fragment = Fragment18;
+        exports.Fragment = Fragment19;
         exports.Lazy = Lazy;
         exports.Memo = Memo;
         exports.Portal = Portal;
@@ -842,6 +842,10 @@ __export(runtime_exports, {
   createReactPage: () => createReactPage,
   extractFieldsFromComponentsTree: () => extractFieldsFromComponentsTree,
   fetchBrowserRuntimeBootstrap: () => fetchBrowserRuntimeBootstrap,
+  getAuthErrorExtra: () => getAuthErrorExtra,
+  getAuthErrorReason: () => getAuthErrorReason,
+  isAuthChallengeRequired: () => isAuthChallengeRequired,
+  isAuthClientError: () => isAuthClientError,
   loadCustomPageModule: () => loadCustomPageModule,
   loadRuntimeScriptModules: () => loadRuntimeScriptModules,
   mountBrowserPageRuntime: () => mountBrowserPageRuntime,
@@ -2296,8 +2300,43 @@ var AuthClientError = class extends Error {
     this.status = options.status;
     this.code = options.code;
     this.payload = options.payload;
+    this.extra = normalizeAuthErrorExtra(
+      options.extra || getRecordValue(options.payload, "extra")
+    );
+    this.reason = this.extra?.reason || this.extra?.guardCode || (typeof options.code === "string" ? options.code : void 0);
+    this.challenge = this.extra?.challenge;
+    this.retryAfter = readNumber(
+      this.extra?.retryAfter ?? this.extra?.retryAfterSeconds
+    );
+    this.remainingAttempts = readNumber(this.extra?.remainingAttempts);
+    this.lockUntil = this.extra?.lockUntil ?? null;
   }
 };
+var isAuthClientError = (error) => {
+  if (error instanceof AuthClientError) return true;
+  return Boolean(
+    error && typeof error === "object" && error.name === "AuthClientError"
+  );
+};
+var getAuthErrorExtra = (error) => {
+  if (!error || typeof error !== "object") return void 0;
+  const record2 = error;
+  return normalizeAuthErrorExtra(record2.extra || getRecordValue(record2.payload, "extra"));
+};
+var getAuthErrorReason = (error) => {
+  if (!error || typeof error !== "object") return void 0;
+  const record2 = error;
+  const extra = getAuthErrorExtra(error);
+  return extra?.reason || extra?.guardCode || (typeof record2.reason === "string" ? record2.reason : void 0) || (typeof record2.code === "string" ? record2.code : void 0);
+};
+var isAuthChallengeRequired = (error) => {
+  if (!error || typeof error !== "object") return false;
+  const record2 = error;
+  const code = record2.code;
+  const reason = getAuthErrorReason(error);
+  const extra = getAuthErrorExtra(error);
+  return code === 460 || code === "460" || code === "LOGIN_CHALLENGE_REQUIRED" || reason === "LOGIN_CHALLENGE_REQUIRED" || reason === "CHALLENGE_REQUIRED" || extra?.guardCode === "LOGIN_CHALLENGE_REQUIRED";
+};
 var createAuthClient = ({
   appType,
   servicePrefix = "/service",
@@ -2324,7 +2363,12 @@ var createAuthClient = ({
     if (!response.ok || success === false || !isSuccessCode2(code)) {
       throw new AuthClientError(
         String(getRecordValue(payload, "message") || `Auth request failed: ${response.status}`),
-        { status: response.status, code, payload }
+        {
+          status: response.status,
+          code,
+          payload,
+          extra: normalizeAuthErrorExtra(getRecordValue(payload, "extra"))
+        }
       );
     }
     return unwrapPayload(payload);
@@ -2374,6 +2418,27 @@ var getRecordValue = (value, key) => {
   if (!value || typeof value !== "object") return void 0;
   return value[key];
 };
+var normalizeAuthErrorExtra = (value) => {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
+  const record2 = value;
+  const challenge = record2.challenge && typeof record2.challenge === "object" && !Array.isArray(record2.challenge) ? record2.challenge : void 0;
+  const reason = readString(record2.reason);
+  const guardCode = readString(record2.guardCode);
+  return {
+    ...record2,
+    ...reason ? { reason } : {},
+    ...guardCode ? { guardCode } : {},
+    ...challenge ? { challenge } : {},
+    ...readNumber(record2.retryAfter) !== void 0 ? { retryAfter: readNumber(record2.retryAfter) } : {},
+    ...readNumber(record2.retryAfterSeconds) !== void 0 ? { retryAfterSeconds: readNumber(record2.retryAfterSeconds) } : {},
+    ...readNumber(record2.remainingAttempts) !== void 0 ? { remainingAttempts: readNumber(record2.remainingAttempts) } : {}
+  };
+};
+var readString = (value) => typeof value === "string" ? value : void 0;
+var readNumber = (value) => {
+  const numberValue = Number(value);
+  return Number.isFinite(numberValue) ? numberValue : void 0;
+};
 var isSuccessCode2 = (code) => {
   if (code === void 0 || code === null || code === "") return true;
   const normalized = Number(code);
@@ -4114,6 +4179,7 @@ var LoginPage = ({
     "login"
   );
   const [phoneChallengeId, setPhoneChallengeId] = (0, import_react7.useState)("");
+  const [passwordChallenge, setPasswordChallenge] = (0, import_react7.useState)(null);
   const [submitting, setSubmitting] = (0, import_react7.useState)(false);
   const [sendingCode, setSendingCode] = (0, import_react7.useState)(false);
   const [error, setError] = (0, import_react7.useState)(null);
@@ -4136,6 +4202,7 @@ var LoginPage = ({
         children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
           PasswordLoginForm,
           {
+            challenge: passwordChallenge,
             form: passwordForm,
             loading: submitting,
             onFinish: async (values) => {
@@ -4144,12 +4211,25 @@ var LoginPage = ({
               try {
                 await handleSuccess(
                   await auth.passwordLogin({
+                    challengeAnswer: passwordChallenge ? values.challengeAnswer : void 0,
+                    challengeId: readChallengeId(passwordChallenge),
+                    clientFingerprint: getOrCreateLoginFingerprint(auth.client),
                     username: values.username,
                     password: values.password
                   })
                 );
+                setPasswordChallenge(null);
               } catch (loginError) {
-                setError(normalizeError(loginError).message);
+                if (isAuthChallengeRequired(loginError)) {
+                  const nextChallenge = getAuthErrorExtra(loginError)?.challenge;
+                  if (nextChallenge) {
+                    setPasswordChallenge(nextChallenge);
+                    passwordForm.setFieldValue("challengeAnswer", "");
+                  }
+                } else {
+                  setPasswordChallenge(null);
+                }
+                setError(formatAuthErrorMessage(loginError));
               } finally {
                 setSubmitting(false);
               }
@@ -4219,6 +4299,7 @@ var LoginPage = ({
     allowRegister,
     auth,
     handleSuccess,
+    passwordChallenge,
     passwordForm,
     passwordMethod,
     phoneChallengeId,
@@ -4372,7 +4453,7 @@ var LoginPage = ({
     }
   );
 };
-var PasswordLoginForm = ({ form, loading, onFinish }) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_antd2.Form, { form, layout: "vertical", requiredMark: false, onFinish, children: [
+var PasswordLoginForm = ({ challenge, form, loading, onFinish }) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_antd2.Form, { form, layout: "vertical", requiredMark: false, onFinish, children: [
   /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
     import_antd2.Form.Item,
     {
@@ -4391,6 +4472,26 @@ var PasswordLoginForm = ({ form, loading, onFinish }) => /* @__PURE__ */ (0, imp
       children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_antd2.Input.Password, { autoComplete: "current-password" })
     }
   ),
+  challenge ? /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+      import_antd2.Alert,
+      {
+        showIcon: true,
+        type: "warning",
+        message: "\u8BF7\u5B8C\u6210\u989D\u5916\u9A8C\u8BC1",
+        description: readChallengeQuestion(challenge) || "\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801\u540E\u7EE7\u7EED\u767B\u5F55\u3002"
+      }
+    ),
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+      import_antd2.Form.Item,
+      {
+        label: "\u9A8C\u8BC1\u7B54\u6848",
+        name: "challengeAnswer",
+        rules: [{ required: true, message: "\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7B54\u6848" }],
+        children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_antd2.Input, { autoComplete: "one-time-code" })
+      }
+    )
+  ] }) : null,
   /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_antd2.Button, { block: true, htmlType: "submit", icon: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_icons.LoginOutlined, {}), loading, type: "primary", children: "\u767B\u5F55" })
 ] });
 var PhoneCodeLoginForm = ({
@@ -4452,6 +4553,22 @@ var PhoneCodeLoginForm = ({
 ] });
 var findMethod = (methods, type4) => methods.find((method4) => method4.type === type4);
 var normalizeError = (error) => error instanceof Error ? error : new Error(String(error || "\u8BF7\u6C42\u5931\u8D25"));
+var formatAuthErrorMessage = (error) => {
+  const normalized = normalizeError(error);
+  const extra = getAuthErrorExtra(error);
+  const reason = getAuthErrorReason(error);
+  if (isAuthChallengeRequired(error)) {
+    return extra?.challenge?.question ? "\u8BF7\u5B8C\u6210\u4E0B\u65B9\u9A8C\u8BC1\u540E\u518D\u767B\u5F55" : normalized.message || "\u8BF7\u5148\u5B8C\u6210\u989D\u5916\u9A8C\u8BC1\u540E\u518D\u5C1D\u8BD5\u767B\u5F55";
+  }
+  if (reason === "LOGIN_BLOCKED" || reason === "USERNAME_BLOCKED" || reason === "IP_BLOCKED" || reason === "ACCOUNT_LOCKED") {
+    const retryAfter = Number(extra?.retryAfter ?? extra?.retryAfterSeconds);
+    if (Number.isFinite(retryAfter) && retryAfter > 0) {
+      const minutes = Math.ceil(retryAfter / 60);
+      return `\u767B\u5F55\u53D7\u9650\uFF0C\u8BF7\u7EA6 ${minutes} \u5206\u949F\u540E\u518D\u8BD5\u6216\u8054\u7CFB\u7BA1\u7406\u5458`;
+    }
+  }
+  return normalized.message || "\u767B\u5F55\u5931\u8D25";
+};
 var getString = (value, key) => {
   if (!value || typeof value !== "object") return void 0;
   const result = value[key];
@@ -4485,7 +4602,21 @@ var getOrCreateGuestIdentifier = (client) => {
   window.localStorage.setItem(key, next);
   return next;
 };
+var getOrCreateLoginFingerprint = (client) => {
+  const key = `openxiangda:${client.appType}:login_fingerprint`;
+  if (typeof window === "undefined") return createGuestIdentifier();
+  const current = window.localStorage.getItem(key);
+  const id = current || createGuestIdentifier();
+  if (!current) window.localStorage.setItem(key, id);
+  return `${id}:${window.navigator?.userAgent || "unknown"}`;
+};
 var createGuestIdentifier = () => `guest_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
+var readChallengeId = (challenge) => {
+  if (!challenge) return void 0;
+  const id = challenge.id || challenge.challengeId;
+  return typeof id === "string" && id.trim() ? id.trim() : void 0;
+};
+var readChallengeQuestion = (challenge) => typeof challenge.question === "string" ? challenge.question : void 0;
 var getCurrentHref3 = () => typeof window === "undefined" ? "" : window.location.href;
 var getCurrentHostname = () => typeof window === "undefined" ? "" : window.location.hostname;
 var getCallbackUrl = () => {