@lark-apaas/client-toolkit 1.2.23 → 1.2.24-alpha.0

package/lib/components/AppContainer/safety.js

@@ -14,18 +14,32 @@ const Component = ()=>{
     const isMobile = useIsMobile();
     const [userinfo, setUserinfo] = useState(null);
     const [isInternetVisible, setIsInternetVisible] = useState(false);
+    const [showBadge, setShowBadge] = useState(true);
+    const [badgeLoaded, setBadgeLoaded] = useState(false);
     const timeoutRef = useRef(null);
     useEffect(()=>{
         const appId = getAppId();
+        const csrfHeaders = {
+            'X-Suda-Csrf-Token': getCsrfToken()
+        };
         const tenantInfoUrl = isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/studio/tenant_info` : `/spark/b/${appId}/tenant_info`;
         fetch(tenantInfoUrl, {
-            headers: {
-                'X-Suda-Csrf-Token': getCsrfToken()
-            }
+            headers: csrfHeaders
         }).then((res)=>res.json()).then((data)=>{
             setUserinfo(data?.data?.tenant_info);
             setIsInternetVisible(data?.data?.is_internet_visible);
         });
+        const getPublishedUrl = isNewPathEnabled() ? `/app/${appId}/__runtime__/api/v1/studio/get_published` : `/spark/b/${appId}/get_published`;
+        fetch(getPublishedUrl, {
+            headers: csrfHeaders
+        }).then((res)=>res.json()).then((data)=>{
+            const badge = data?.data?.app_info?.show_badge;
+            setShowBadge(false !== badge);
+        }).catch(()=>{
+            setShowBadge(true);
+        }).finally(()=>{
+            setBadgeLoaded(true);
+        });
     }, []);
     useEffect(()=>{
         if (isMobile) {
@@ -39,6 +53,8 @@ const Component = ()=>{
         isMobile
     ]);
     if ('production' !== process.env.NODE_ENV) return null;
+    if (!badgeLoaded) return null;
+    if (!showBadge) return null;
     if (!visible) return null;
     if (isMobile) return /*#__PURE__*/ jsxs(Sheet, {
         open: open,

package/lib/logger/intercept-global-error.js

@@ -1,5 +1,6 @@
+import { slardar } from "@lark-apaas/internal-slardar";
 import { getHmrApi } from "../utils/hmr-api.js";
-import { submitPostMessage, submitSlardarEvent } from "../utils/postMessage.js";
+import { submitPostMessage } from "../utils/postMessage.js";
 import { levelSchema } from "./log-types.js";
 import { logger } from "./logger.js";
 let devServerDisconnectInfo = null;
@@ -19,22 +20,26 @@ function processDevServerLog(log) {
                 status: 'disconnected'
             }
         });
-        submitSlardarEvent({
+        slardar.sendEvent({
             name: 'sandbox-devServer',
-            categories: {
-                type: 'disconnected',
+            metrics: {
                 time
+            },
+            categories: {
+                type: 'disconnected'
             }
         });
         return;
     }
     if (!devServerDisconnectInfo) return;
     if (devFlag && log.includes('Trying to reconnect')) {
-        if (retryCount) submitSlardarEvent({
+        if (retryCount) slardar.sendEvent({
             name: 'sandbox-devServer',
-            categories: {
-                type: 'reconnect-failed',
+            metrics: {
                 retryCount: retryCount + 1
+            },
+            categories: {
+                type: 'reconnect-failed'
             }
         });
         retryCount++;
@@ -52,12 +57,14 @@ function processDevServerLog(log) {
         const startTime = devServerDisconnectInfo.time;
         const duration = Date.now() - startTime;
         devServerDisconnectInfo = null;
-        submitSlardarEvent({
+        slardar.sendEvent({
             name: 'sandbox-devServer',
-            categories: {
-                type: 'devServer-reconnected',
+            metrics: {
                 startTime,
                 duration
+            },
+            categories: {
+                type: 'devServer-reconnected'
             }
         });
     }
@@ -76,7 +83,7 @@ function listenModuleHmr() {
         });
         hmr.onError((error)=>{
             console.warn('hmr apply failed', error);
-            submitSlardarEvent({
+            slardar.sendEvent({
                 name: 'sandbox-devServer',
                 categories: {
                     type: 'hmr-apply-failed',

package/lib/utils/axiosConfig.js

@@ -3,6 +3,7 @@ import { observable } from "@lark-apaas/observable-web";
 import { logger } from "../apis/logger.js";
 import { getStacktrace } from "../logger/selected-logs.js";
 import { safeStringify } from "./safeStringify.js";
+import { slardar } from "@lark-apaas/internal-slardar";
 const isValidResponse = (resp)=>null != resp && 'object' == typeof resp && 'config' in resp && null !== resp.config && void 0 !== resp.config && 'object' == typeof resp.config && 'status' in resp && 'number' == typeof resp.status && 'data' in resp;
 async function logResponse(ok, responseOrError) {
     if (isValidResponse(responseOrError)) {
@@ -193,6 +194,10 @@ AxiosProto.request = function(configOrUrl, config) {
         return response;
     }, (error)=>{
         handleSpanEnd(error.config || finalConfig, null, error);
+        slardar.captureException(error, {
+            source: 'toolkit',
+            module: 'axios-request'
+        });
         throw error;
     });
 };
@@ -253,9 +258,24 @@ function initAxiosConfig(axiosInstance) {
                     ],
                     meta: {}
                 });
+                slardar.sendEvent({
+                    name: 'toolkit_axios_403_downgrade',
+                    categories: {
+                        url: String(error.config?.url || ''),
+                        method: String(error.config?.method || '')
+                    }
+                });
                 return error.response;
             }
         } catch (e) {}
+        slardar.sendEvent({
+            name: 'toolkit_axios_response_error',
+            categories: {
+                url: String(error.config?.url || ''),
+                method: String(error.config?.method || ''),
+                status: String(error.response?.status || '')
+            }
+        });
         return Promise.reject(error);
     });
     'production' !== process.env.NODE_ENV && instance.interceptors.response.use((response)=>{

package/lib/utils/postMessage.d.ts

@@ -1,7 +1,6 @@
 import type { IncomingMessage, OutgoingMessage } from '../types/iframe-events';
 export declare function resolveParentOrigin(): string;
 export declare function submitPostMessage<T extends OutgoingMessage>(message: T, targetOrigin?: string): void;
-export declare function submitSlardarEvent(event: unknown): void;
 export declare function isOutgoingMessage<T extends OutgoingMessage['type']>(msg: OutgoingMessage, type: T): msg is Extract<OutgoingMessage, {
     type: T;
 }>;

package/lib/utils/postMessage.js

@@ -38,15 +38,10 @@ function submitPostMessage(message, targetOrigin) {
         console.error('postMessage error', e);
     }
 }
-function submitSlardarEvent(event) {
-    const slardar = window.KSlardarWeb;
-    if ('function' == typeof slardar) slardar('sendEvent', event);
-    else console.warn('hmr listen function not found');
-}
 function isOutgoingMessage(msg, type) {
     return msg.type === type;
 }
 function isIncomingMessage(msg, type) {
     return msg.type === type;
 }
-export { isIncomingMessage, isOutgoingMessage, resolveParentOrigin, submitPostMessage, submitSlardarEvent };
+export { isIncomingMessage, isOutgoingMessage, resolveParentOrigin, submitPostMessage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.23",
+  "version": "1.2.24-alpha.0",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -99,11 +99,12 @@
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
     "@data-loom/js": "0.4.9",
-    "@lark-apaas/aily-web-sdk": ">=0.0.1",
-    "@lark-apaas/auth-sdk": "^0.1.1",
-    "@lark-apaas/client-capability": "^0.1.5",
+    "@lark-apaas/aily-web-sdk": "^0.0.7",
+    "@lark-apaas/auth-sdk": "^0.1.2",
+    "@lark-apaas/client-capability": "^0.1.6",
+    "@lark-apaas/internal-slardar": "^0.0.3",
     "@lark-apaas/miaoda-inspector": "^1.0.20",
-    "@lark-apaas/observable-web": "^1.0.3",
+    "@lark-apaas/observable-web": "^1.0.4",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-slot": "^1.2.3",