@lark-apaas/client-toolkit 1.1.8 → 1.1.9

package/lib/components/AppContainer/IframeBridge.d.ts

@@ -1,4 +1,3 @@
 import React from 'react';
 import './utils/listenHot';
-import './LogInterceptor';
 export default function IframeBridge(): React.JSX.Element;

package/lib/components/AppContainer/IframeBridge.js

@@ -7,7 +7,6 @@ import { postMessage } from "../../utils/postMessage.js";
 import { getPreviewParentOrigin } from "../../utils/getParentOrigin.js";
 import { childApi } from "./utils/childApi.js";
 import "./utils/listenHot.js";
-import "./LogInterceptor.js";
 var IframeBridge_RouteMessageType = /*#__PURE__*/ function(RouteMessageType) {
     RouteMessageType["RouteChange"] = "RouteChange";
     RouteMessageType["RouteBack"] = "RouteBack";

package/lib/components/NotFoundRender/index.js

@@ -9,7 +9,16 @@ const NotFound = ()=>{
     const navigate = useNavigate();
     const navigateRef = useUpdatingRef(navigate);
     useEffect(()=>{
-        logger.error('404 Error: User attempted to access non-existent route:', location.pathname);
+        logger.log({
+            level: 'error',
+            args: [
+                `页面 ${location.pathname} 不存在`
+            ],
+            meta: {
+                repairMessage: `页面 ${location.pathname} 不存在，帮我创建`,
+                noStacktrace: true
+            }
+        });
     }, [
         location.pathname
     ]);

package/lib/logger/intercept-global-error.d.ts

@@ -1 +1 @@
-export declare function interceptGlobalError(): void;
+export declare function interceptErrors(): void;

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

@@ -1,10 +1,35 @@
+import { levelSchema } from "./log-types.js";
 import { logger } from "./logger.js";
-function interceptGlobalError() {
+function interceptErrors() {
     window.addEventListener('error', (event)=>{
         logger.error(event.error);
     });
     window.addEventListener('unhandledrejection', (event)=>{
         logger.error(event.reason);
     });
+    const PROXY_CONSOLE_METHOD = [
+        'log',
+        'info',
+        'warn',
+        'error'
+    ];
+    PROXY_CONSOLE_METHOD.forEach((method)=>{
+        const originalMethod = window.console[method];
+        window.console[method] = (...args)=>{
+            originalMethod(...args);
+            const log = args[0];
+            if ('string' == typeof log && log.startsWith('[Dataloom]') && levelSchema.safeParse(method).success) {
+                logger.log({
+                    level: method,
+                    args
+                });
+                postMessage({
+                    type: 'Console',
+                    method,
+                    data: args
+                });
+            }
+        };
+    });
 }
-export { interceptGlobalError };
+export { interceptErrors };

package/lib/logger/log-types.d.ts

@@ -42,8 +42,10 @@ export declare const logMeta: z.ZodObject<{
     }, z.core.$strip>>>;
     logTraceID: z.ZodOptional<z.ZodString>;
     skipFrame: z.ZodOptional<z.ZodNumber>;
+    noStacktrace: z.ZodOptional<z.ZodBoolean>;
+    repairMessage: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
-export declare const selectedLogSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
+export declare const selectedLogSchema: z.ZodObject<{
     type: z.ZodLiteral<"typedLogV2">;
     level: z.ZodEnum<{
         success: "success";
@@ -63,8 +65,10 @@ export declare const selectedLogSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
         }, z.core.$strip>>>;
         logTraceID: z.ZodOptional<z.ZodString>;
         skipFrame: z.ZodOptional<z.ZodNumber>;
+        noStacktrace: z.ZodOptional<z.ZodBoolean>;
+        repairMessage: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>;
-}, z.core.$strip>], "type">;
+}, z.core.$strip>;
 export type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'success';
 export declare const logWithMetaSchema: z.ZodObject<{
     level: z.ZodEnum<{
@@ -75,7 +79,7 @@ export declare const logWithMetaSchema: z.ZodObject<{
         debug: "debug";
     }>;
     args: z.ZodArray<z.ZodUnknown>;
-    meta: z.ZodObject<{
+    meta: z.ZodOptional<z.ZodObject<{
         stacktrace: z.ZodOptional<z.ZodArray<z.ZodObject<{
             functionName: z.ZodString;
             fileName: z.ZodString;
@@ -84,7 +88,9 @@ export declare const logWithMetaSchema: z.ZodObject<{
         }, z.core.$strip>>>;
         logTraceID: z.ZodOptional<z.ZodString>;
         skipFrame: z.ZodOptional<z.ZodNumber>;
-    }, z.core.$strip>;
+        noStacktrace: z.ZodOptional<z.ZodBoolean>;
+        repairMessage: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
 }, z.core.$strip>;
 export type LogStackFrame = z.infer<typeof logStackFrameSchema>;
 export type LogWithMeta = z.infer<typeof logWithMetaSchema>;

package/lib/logger/log-types.js

@@ -36,20 +36,20 @@ const levelSchema = zod["enum"]([
 const logMeta = zod.object({
     stacktrace: zod.optional(zod.array(logStackFrameSchema)),
     logTraceID: zod.optional(zod.string()),
-    skipFrame: zod.optional(zod.number())
-});
-const selectedLogSchema = zod.discriminatedUnion('type', [
-    zod.object({
-        type: zod.literal('typedLogV2'),
-        level: levelSchema,
-        id: zod.string(),
-        args: zod.array(zod.unknown()),
-        meta: logMeta
-    })
-]);
-const logWithMetaSchema = zod.object({
+    skipFrame: zod.optional(zod.number()),
+    noStacktrace: zod.optional(zod.boolean()),
+    repairMessage: zod.optional(zod.string())
+});
+const selectedLogSchema = zod.object({
+    type: zod.literal('typedLogV2'),
     level: levelSchema,
+    id: zod.string(),
     args: zod.array(zod.unknown()),
     meta: logMeta
 });
+const logWithMetaSchema = zod.object({
+    level: levelSchema,
+    args: zod.array(zod.unknown()),
+    meta: zod.optional(logMeta)
+});
 export { genericErrorSchema, levelSchema, logMeta, logStackFrameSchema, logWithMetaSchema, networkRequestLogSchema, noCategoryLogSchema, routerErrorSchema, selectedLogSchema };

package/lib/logger/logger.js

@@ -1,5 +1,5 @@
 import { interceptors } from "./selected-logs.js";
-import { interceptGlobalError } from "./intercept-global-error.js";
+import { interceptErrors } from "./intercept-global-error.js";
 const LOG_LEVELS = [
     'debug',
     'info',
@@ -60,5 +60,5 @@ let logger = {
     }
 };
 for (const interceptor of interceptors)logger = interceptor(logger);
-interceptGlobalError();
+'production' !== process.env.NODE_ENV && interceptErrors();
 export { logger };

package/lib/logger/selected-logs.js

@@ -2,6 +2,7 @@ import { SourceMapConsumer as external_source_map_SourceMapConsumer } from "sour
 import "../utils/utils.js";
 import { mappingText } from "./source-map-mappings-wasm.js";
 import stacktrace_js from "stacktrace-js";
+import { batchLogInfo, initBatchLogger } from "./batch-logger.js";
 function hexToBuffer(hexString) {
     const hex = hexString.replace(/\s/g, '').toUpperCase();
     if (!/^[0-9A-F]+$/.test(hex)) throw new Error('Invalid hex string');
@@ -36,20 +37,25 @@ async function sendSelectedLog(logWithoutID) {
                 message: error.message,
                 stack: error.stack
             };
-            if (!log.meta.stacktrace) {
+            if (!log.meta.stacktrace) try {
                 const stacktrace = await stacktrace_js.fromError(error);
                 log.meta.stacktrace = mapStacktrace(stacktrace);
-            }
+            } catch (e) {}
             newParts.push(newError.message, newError);
         } else newParts.push(log.args[i]);
-        if (!log.meta.stacktrace) {
-            const frames = await getStacktrace();
+        if (!log.meta.stacktrace) try {
+            let frames = await getStacktrace();
+            const firstFrameIndex = frames.findIndex((frame)=>!frame.fileName.includes('node_modules/@lark-apaas/client-toolkit/lib/logger'));
+            frames = -1 === firstFrameIndex ? [] : frames.slice(firstFrameIndex);
             log.meta.stacktrace = frames;
-        }
+        } catch (e) {}
         if (void 0 === log.meta.skipFrame) log.meta.skipFrame = 2;
         const logJSON = JSON.stringify(log);
         console.log(JSON.parse(logJSON));
         console.log(logJSON);
+        try {
+            batchLogInfo('info', logJSON);
+        } catch (e) {}
         if (window.parent !== window) try {
             window.parent.postMessage({
                 type: 'SELECTED_LOG',
@@ -152,6 +158,7 @@ const typedLogInterceptor = (logger)=>({
             });
         }
     });
+'production' !== process.env.NODE_ENV && initBatchLogger(console);
 const interceptors = 'production' !== process.env.NODE_ENV ? [
     typedLogInterceptor
 ] : [];

package/lib/utils/axiosConfig.js

@@ -3,27 +3,27 @@ import { logger } from "../apis/logger.js";
 import { getStacktrace } from "../logger/selected-logs.js";
 async function logResponse(ok, response) {
     const okToTextMap = {
-        success: 'API 请求成功：',
-        error: 'API 请求失败：'
+        success: '请求成功：',
+        error: '请求失败：'
     };
+    const realOK = 'success' === ok && response.status >= 200 && response.status < 300;
     const parts = [
-        okToTextMap[ok],
-        (response.config.url || '').split('?')[0],
+        okToTextMap[realOK ? 'success' : 'error'],
+        (response.config.url || '').split('?')[0].replace(/^\/spark\/p\/app_\w+/, ''),
         ' - ',
         Date.now() - response.config._startTime,
         'ms'
     ];
     const logTraceID = response.headers['x-log-trace-id'];
     const args = [
-        '请求参数：',
-        response.config.data,
-        '返回数据：',
-        response.data,
-        '请求摘要：',
         {
-            TraceID: logTraceID,
-            状态: `${response.statusText}[状态码${response.status}]`,
-            时间: `${new Date().toLocaleString()}`
+            '请求参数：': response.config.data,
+            '返回数据：': response.data,
+            '请求摘要：': {
+                TraceID: logTraceID,
+                状态: `${response.statusText}[状态码${response.status}]`,
+                时间: `${new Date().toLocaleString()}`
+            }
         }
     ];
     const requestUUID = response.config._requestUUID;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [

package/lib/components/AppContainer/LogInterceptor.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/components/AppContainer/LogInterceptor.js

@@ -1,66 +0,0 @@
-import { batchLogInfo, destroyBatchLogger, initBatchLogger } from "../../logger/batch-logger.js";
-import { postMessage } from "../../utils/postMessage.js";
-const PROXY_CONSOLE_METHOD = [
-    'log',
-    'info',
-    'warn',
-    'error'
-];
-const LOG_FILTER_PREFIX = [
-    '[Dataloom]',
-    '[MiaoDa]'
-];
-function formatArg(arg) {
-    if (null === arg) return 'null';
-    if (void 0 === arg) return 'undefined';
-    if ('object' == typeof arg) {
-        if (arg instanceof Error) return `${arg.name}: ${arg.message}\n${arg.stack}`;
-        try {
-            return JSON.stringify(arg, this.getCircularReplacer(), 2);
-        } catch (e) {
-            return Object.prototype.toString.call(arg);
-        }
-    }
-    if ('function' == typeof arg) return arg.toString();
-    return String(arg);
-}
-const initHandleError = ()=>{
-    window.onerror = (message, source, lineno, colno, error)=>{
-        const errorList = [];
-        if (error) errorList.push(error);
-        else {
-            if ('string' == typeof message && [
-                'Script error.'
-            ].includes(message)) return;
-            if (message) errorList.push(message);
-            else if (source) errorList.push(source);
-        }
-        console.error('[MiaoDa]', ...errorList);
-    };
-};
-const initLogInterceptor = ()=>{
-    initBatchLogger(console);
-    window.addEventListener('beforeunload', ()=>{
-        destroyBatchLogger();
-    });
-    PROXY_CONSOLE_METHOD.forEach((method)=>{
-        const originalMethod = window.console[method];
-        window.console[method] = (...args)=>{
-            originalMethod(...args);
-            const log = args[0];
-            if ('string' == typeof log && LOG_FILTER_PREFIX.some((prefix)=>log.startsWith(prefix))) {
-                batchLogInfo(method, args.map(formatArg).join(' '));
-                postMessage({
-                    type: 'Console',
-                    method,
-                    data: args
-                });
-            }
-        };
-    });
-};
-function init() {
-    initHandleError();
-    initLogInterceptor();
-}
-'production' !== process.env.NODE_ENV && init();