openxiangda 1.0.87 → 1.0.89

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

@@ -846,18 +846,39 @@ var normalizeDynamicOrder = (value) => {
   }
   return `${value.id}:${value.isAsc === "n" ? "-" : "+"}`;
 };
+var hasOwn = (value, key) => Object.prototype.hasOwnProperty.call(value, key);
+var normalizeEnvelopeCode = (value) => {
+  if (value === void 0 || value === null || value === "") {
+    return 200;
+  }
+  const normalized = Number(value);
+  return Number.isFinite(normalized) ? normalized : String(value);
+};
+var isSuccessCode = (value) => {
+  if (value === void 0 || value === null || value === "") {
+    return true;
+  }
+  const normalized = Number(value);
+  return Number.isFinite(normalized) ? normalized === 0 || normalized >= 200 && normalized < 300 : false;
+};
+var getEnvelopeCode = (rawResponse) => {
+  if (isRecord(rawResponse) && hasOwn(rawResponse, "code")) {
+    return rawResponse.code;
+  }
+  const nestedData = rawResponse?.data;
+  if (isRecord(nestedData) && hasOwn(nestedData, "code")) {
+    return nestedData.code;
+  }
+  return void 0;
+};
 var normalizeJsonResponse = (rawResponse) => {
-  const topLevelCode = Number(rawResponse?.code);
-  const nestedCode = Number(
-    rawResponse?.data?.code
-  );
-  const code = Number.isFinite(topLevelCode) ? topLevelCode : Number.isFinite(nestedCode) ? nestedCode : 200;
+  const code = normalizeEnvelopeCode(getEnvelopeCode(rawResponse));
   const topLevelResult = isRecord(rawResponse) && "result" in rawResponse ? rawResponse.result : void 0;
   const nestedResult = isRecord(rawResponse?.data) && "result" in (rawResponse.data || {}) ? rawResponse.data?.result : void 0;
   const topLevelData = isRecord(rawResponse) && "data" in rawResponse ? rawResponse.data : void 0;
   const result = topLevelResult !== void 0 ? topLevelResult : nestedResult !== void 0 ? nestedResult : topLevelData !== void 0 ? topLevelData : isRecord(rawResponse) ? rawResponse : null;
   const nestedSuccess = typeof rawResponse?.data?.success === "boolean" ? rawResponse.data?.success : void 0;
-  const success = typeof rawResponse?.success === "boolean" ? Boolean(rawResponse.success) : typeof nestedSuccess === "boolean" ? Boolean(nestedSuccess) : code >= 200 && code < 300;
+  const success = rawResponse?.success === false || nestedSuccess === false ? false : isSuccessCode(code);
   return {
     code,
     success,
@@ -902,6 +923,9 @@ var normalizeBinaryResponse = (rawResponse) => {
   };
 };
 var toSdkError = (input, payload) => {
+  if (input instanceof Error && input.response) {
+    return input;
+  }
   const normalizedResponse = isRecord(input) ? normalizeJsonResponse(input) : void 0;
   const nextError = input instanceof Error ? input : new Error(
     normalizedResponse?.message || `\u8BF7\u6C42\u5931\u8D25: ${String(payload.method).toUpperCase()} ${payload.path}`
@@ -2560,7 +2584,8 @@ var createAuthClient = ({
     });
     const payload = await readPayload(response);
     const code = getRecordValue(payload, "code");
-    if (!response.ok || typeof code === "number" && code >= 400) {
+    const success = getRecordValue(payload, "success");
+    if (!response.ok || success === false || !isSuccessCode2(code)) {
       throw new AuthClientError(
         String(getRecordValue(payload, "message") || `Auth request failed: ${response.status}`),
         { status: response.status, code, payload }
@@ -2613,6 +2638,11 @@ var getRecordValue = (value, key) => {
   if (!value || typeof value !== "object") return void 0;
   return value[key];
 };
+var isSuccessCode2 = (code) => {
+  if (code === void 0 || code === null || code === "") return true;
+  const normalized = Number(code);
+  return Number.isFinite(normalized) ? normalized === 0 || normalized >= 200 && normalized < 300 : false;
+};
 var resolveLoginUrl = (appType, {
   callbackUrl = getCurrentHref2(),
   callbackParamName = "callback",
@@ -3149,12 +3179,23 @@ var OpenXiangdaProvider = ({
     () => appType || resolveAppTypeFromLocation(),
     [appType]
   );
+  const [accessToken, setAccessTokenState] = (0, import_react8.useState)(null);
+  const setAccessToken = (0, import_react8.useCallback)(
+    (nextAccessToken) => {
+      setAccessTokenState(nextAccessToken || null);
+    },
+    []
+  );
+  const authorizedFetch = (0, import_react8.useMemo)(
+    () => createAuthorizedFetch(resolvedFetch, accessToken),
+    [accessToken, resolvedFetch]
+  );
   const [state, setState] = (0, import_react8.useState)({
     data: null,
     loading: true,
     error: null
   });
-  const reload = (0, import_react8.useCallback)(async () => {
+  const reload = (0, import_react8.useCallback)(async (options = {}) => {
     if (!resolvedAppType) {
       setState({
         data: null,
@@ -3167,8 +3208,9 @@ var OpenXiangdaProvider = ({
       return;
     }
     setState((prev) => ({ ...prev, loading: true, error: null }));
+    const requestFetch = options.accessToken !== void 0 ? createAuthorizedFetch(resolvedFetch, options.accessToken || null) : authorizedFetch;
     try {
-      const response = await resolvedFetch(
+      const response = await requestFetch(
         buildServiceUrl2(
           servicePrefix,
           `/openxiangda-api/v1/apps/${encodeURIComponent(
@@ -3181,7 +3223,7 @@ var OpenXiangdaProvider = ({
         }
       );
       const payload = await readJsonPayload(response);
-      if (!response.ok || payload?.code >= 400) {
+      if (isRuntimeEnvelopeFailure(response, payload)) {
         throw createRuntimeHttpError(
           response,
           payload,
@@ -3200,7 +3242,7 @@ var OpenXiangdaProvider = ({
         error: normalizeRuntimeError(error)
       });
     }
-  }, [resolvedAppType, resolvedFetch, servicePrefix]);
+  }, [authorizedFetch, resolvedAppType, resolvedFetch, servicePrefix]);
   (0, import_react8.useEffect)(() => {
     void reload();
   }, [reload]);
@@ -3209,10 +3251,11 @@ var OpenXiangdaProvider = ({
       ...state,
       appType: resolvedAppType,
       servicePrefix,
-      fetchImpl: resolvedFetch,
-      reload
+      fetchImpl: authorizedFetch,
+      reload,
+      setAccessToken
     }),
-    [reload, resolvedAppType, resolvedFetch, servicePrefix, state]
+    [authorizedFetch, reload, resolvedAppType, servicePrefix, state]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(OpenXiangdaRuntimeContext.Provider, { value, children });
 };
@@ -3315,7 +3358,7 @@ var useCanAccessRoute = (input) => {
           payload
         };
         if (!disposed) {
-          const shouldTreatAsError = !response.ok || typeof code === "number" && code >= 500;
+          const shouldTreatAsError = !response.ok || isServerErrorCode(code);
           setState({
             data,
             loading: false,
@@ -3447,7 +3490,7 @@ var useRuntimeAuth = () => {
       }
     );
     const payload = await readJsonPayload(response);
-    if (!response.ok || payload?.code >= 400) {
+    if (isRuntimeEnvelopeFailure(response, payload)) {
       throw createRuntimeHttpError(
         response,
         payload,
@@ -3479,6 +3522,19 @@ var buildServiceUrl2 = (servicePrefix, path) => {
   const suffix = path.startsWith("/") ? path : `/${path}`;
   return `${prefix}${suffix}`;
 };
+var createAuthorizedFetch = (baseFetch, accessToken) => {
+  if (!accessToken) return baseFetch;
+  return ((input, init = {}) => {
+    const headers = new Headers(init.headers || {});
+    if (!headers.has("authorization")) {
+      headers.set("authorization", `Bearer ${accessToken}`);
+    }
+    return baseFetch(input, {
+      ...init,
+      headers
+    });
+  });
+};
 var readJsonPayload = async (response) => {
   try {
     return await response.json();
@@ -3524,6 +3580,15 @@ var classifyRuntimeError = (status, code) => {
   const normalizedCode = typeof code === "string" ? Number(code) : code;
   if (status === 401 || normalizedCode === 401) return "unauthenticated";
   if (status === 403 || normalizedCode === 403) return "forbidden";
+  if (typeof code === "string") {
+    const normalizedText = code.toUpperCase();
+    if (normalizedText.includes("DENIED") || normalizedText.includes("FORBIDDEN")) {
+      return "forbidden";
+    }
+    if (normalizedText.includes("UNAUTH") || normalizedText.includes("LOGIN")) {
+      return "unauthenticated";
+    }
+  }
   if (!status && !normalizedCode) return "network";
   return "unknown";
 };
@@ -3579,6 +3644,20 @@ var getRecordValue2 = (value, key) => {
   if (!value || typeof value !== "object") return void 0;
   return value[key];
 };
+var isSuccessCode3 = (code) => {
+  if (code === void 0 || code === null || code === "") return true;
+  const normalized = Number(code);
+  return Number.isFinite(normalized) ? normalized === 0 || normalized >= 200 && normalized < 300 : false;
+};
+var isRuntimeEnvelopeFailure = (response, payload) => {
+  const code = getRecordValue2(payload, "code");
+  const success = getRecordValue2(payload, "success");
+  return !response.ok || success === false || !isSuccessCode3(code);
+};
+var isServerErrorCode = (code) => {
+  const normalized = Number(code);
+  return Number.isFinite(normalized) && normalized >= 500;
+};
 var getRecordString = (value, key) => {
   const result = getRecordValue2(value, key);
   return typeof result === "string" ? result : void 0;
@@ -3642,7 +3721,8 @@ var createPublicAccessClient = ({
     );
     const payload = await readPayload2(response);
     const code = getRecordValue3(payload, "code");
-    if (!response.ok || typeof code === "number" && code >= 400) {
+    const success = getRecordValue3(payload, "success");
+    if (!response.ok || success === false || !isSuccessCode4(code)) {
       throw new PublicAccessClientError(
         String(
           getRecordValue3(payload, "message") || `Public access session failed: ${response.status}`
@@ -3680,6 +3760,11 @@ var getRecordValue3 = (value, key) => {
   if (!value || typeof value !== "object") return void 0;
   return value[key];
 };
+var isSuccessCode4 = (code) => {
+  if (code === void 0 || code === null || code === "") return true;
+  const normalized = Number(code);
+  return Number.isFinite(normalized) ? normalized === 0 || normalized >= 200 && normalized < 300 : false;
+};
 var getCurrentPathname = () => typeof window === "undefined" ? void 0 : window.location.pathname;
 var getCurrentDomain = () => typeof window === "undefined" ? void 0 : window.location.host;
 var getCurrentUserAgent = () => typeof navigator === "undefined" ? void 0 : navigator.userAgent;
@@ -3710,7 +3795,8 @@ var usePublicAccess = (options = {}) => {
     appType: runtimeAppType,
     servicePrefix: runtimeServicePrefix,
     fetchImpl: runtimeFetchImpl,
-    reload: reloadRuntime
+    reload: reloadRuntime,
+    setAccessToken
   } = runtime;
   const {
     appType = runtimeAppType,
@@ -3744,7 +3830,8 @@ var usePublicAccess = (options = {}) => {
           path: input.path || stableSessionInput.path || readPathFromLocation()
         });
         setSession(data);
-        await reloadRuntime();
+        setAccessToken(data.accessToken);
+        await reloadRuntime({ accessToken: data.accessToken });
         setLoading(false);
         return data;
       } catch (caught) {
@@ -3757,7 +3844,7 @@ var usePublicAccess = (options = {}) => {
         throw nextError;
       }
     },
-    [client, reloadRuntime, stableSessionInput]
+    [client, reloadRuntime, setAccessToken, stableSessionInput]
   );
   (0, import_react9.useEffect)(() => {
     if (!autoStart) return;