@lark-apaas/client-toolkit 1.2.53-alpha.1 → 1.2.53-alpha.2

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

@@ -1,7 +1,19 @@
 import React from 'react';
 /**
- * 打开「投诉与举报」页：scene/entity_type 固定，entity_id 取当前妙搭 appId（getAppId →
- * window.appId，水印仅豆包应用展示，此时必有 appId），域名按环境选，params 整体 encode。
+ * 是否豆包来源应用。来源由 coding/canvas 构建链编译期把 MIAODA_APP_SOURCE 注入 process.env
+ * （define 整体替换 `process.env.MIAODA_APP_SOURCE` 这个 key）。但完整版 toolkit 同时被其它
+ * 全栈构建链（fullstack-vite/rspack-preset）消费——它们不注入该 key，且浏览器没有 process 全局，
+ * 此时裸读会抛 `ReferenceError: process is not defined`，把整个宿主应用白屏。故 try/catch 兜底：
+ * 未注入 → 返回 false（非豆包，回落 Safety），绝不让水印判定拖垮宿主应用。
+ *
+ * 注意：只能裸引用完整 key `process.env.MIAODA_APP_SOURCE`（define 替换的就是它）；不能写
+ * `typeof process` 之类——那段不会被 define 替换，注入构建里 process 仍可能未定义，反而误判。
+ */
+export declare const isDoubaoSource: () => boolean;
+/**
+ * 打开「投诉与举报」页：scene/entity_type 固定，entity_id 取当前妙搭 appId，域名按环境选，
+ * params 整体 encode。appId 为空（异常环境）时直接不跳转，避免带空 entity_id 打开举报中心
+ * （与 safety.tsx openReport 同口径）。
  */
 export declare const openDoubaoReport: () => void;
 export declare const FeedbackIcon: React.FC;

package/lib/components/AppContainer/Watermark.js

@@ -3,27 +3,37 @@ import { useRef, useState } from "react";
 import { Content, Portal, Root, Trigger } from "@radix-ui/react-popover";
 import { DOUBAO_LOGO_SRC, DOUBAO_PILL_MOBILE_PNG } from "./doubao-watermark-asset.js";
 import { getAppId } from "../../utils/getAppId.js";
+import { getEnv } from "../../utils/getParentOrigin.js";
 import { useIsMobile } from "../../hooks/index.js";
 const DOUBAO_SOURCE = '5';
+const isDoubaoSource = ()=>{
+    try {
+        return String(process.env.MIAODA_APP_SOURCE) === DOUBAO_SOURCE;
+    } catch  {
+        return false;
+    }
+};
 const REPORT_ENABLED = true;
 const BRAND_TEXT = '豆包 AI 生成';
 const POWERED_BY_TEXT = '由飞书妙搭提供支持';
 const FONT_FAMILY = "'PingFang SC', -apple-system, BlinkMacSystemFont, sans-serif";
 const PILL_SHADOW = '0px 8px 32px rgba(0,0,0,0.08), 0px 4px 16px rgba(0,0,0,0.04), 0px 2px 4px rgba(0,0,0,0.02)';
 const CARD_SHADOW = '0px 4px 16px rgba(0,0,0,0.03), 0px 4px 10px rgba(0,0,0,0.03), 0px 2px 4px rgba(0,0,0,0.02)';
-const reportDomainByEnv = (env)=>{
-    if ('boe' === env) return 'tns.feishu-boe.cn';
-    if ('pre' === env) return 'tns.feishu-pre.cn';
-    return 'tns.feishu.cn';
+const REPORT_DOMAIN = {
+    BOE: 'tns.feishu-boe.cn',
+    PRE: 'tns.feishu-pre.cn',
+    ONLINE: 'tns.feishu.cn'
 };
 const openDoubaoReport = ()=>{
+    const appId = getAppId();
+    if (!appId) return;
     const params = JSON.stringify({
         scene: 'miaoda_app_report',
-        entity_id: getAppId() ?? '',
+        entity_id: appId,
         entity_type: 'miaoda_app',
         extra: ''
     });
-    const domain = reportDomainByEnv(process.env.FORCE_FRAMEWORK_ENVIRONMENT);
+    const domain = REPORT_DOMAIN[getEnv()] ?? REPORT_DOMAIN.ONLINE;
     const url = `https://${domain}/cust/lark_report/?type=common&params=${encodeURIComponent(params)}&lang=zh-CN`;
     window.open(url, '_blank', 'noopener,noreferrer');
 };
@@ -303,7 +313,7 @@ const Watermark_Watermark = ()=>{
     const [open, setOpen] = useState(false);
     const timer = useRef(null);
     const isMobile = useIsMobile();
-    if (String(process.env.MIAODA_APP_SOURCE) !== DOUBAO_SOURCE) return null;
+    if (!isDoubaoSource()) return null;
     if (closed) return null;
     if (isMobile) return /*#__PURE__*/ jsx(MobileWatermark, {
         onDontShow: ()=>setClosed(true)
@@ -351,4 +361,4 @@ const Watermark_Watermark = ()=>{
     });
 };
 const Watermark = Watermark_Watermark;
-export { Avatar, CloseIcon, FeedbackIcon, MenuCard, MenuRow, Pill, Watermark as default, openDoubaoReport };
+export { Avatar, CloseIcon, FeedbackIcon, MenuCard, MenuRow, Pill, Watermark as default, isDoubaoSource, openDoubaoReport };

package/lib/components/AppContainer/__test__/Watermark.test.js

@@ -11,6 +11,8 @@ const setViewportWidth = (w)=>Object.defineProperty(window, 'innerWidth', {
 afterEach(()=>{
     vi.unstubAllEnvs();
     vi.restoreAllMocks();
+    delete globalThis.ENVIRONMENT;
+    delete window.appId;
     setViewportWidth(1024);
 });
 describe('Watermark（豆包来源水印）', ()=>{
@@ -96,10 +98,10 @@ describe('Watermark（豆包来源水印）', ()=>{
         });
     });
     describe('openDoubaoReport（举报跳转，后端就绪后启用）', ()=>{
-        it('按当前环境拼出飞书风控举报中心(tns) URL 并以新窗口打开', ()=>{
+        it('按当前环境(getEnv)拼出飞书风控举报中心(tns) URL 并以新窗口打开', ()=>{
             const openSpy = vi.spyOn(window, 'open').mockReturnValue(null);
             window.appId = 'app_abc';
-            vi.stubEnv('FORCE_FRAMEWORK_ENVIRONMENT', 'boe');
+            globalThis.ENVIRONMENT = 'staging';
             openDoubaoReport();
             expect(openSpy).toHaveBeenCalledTimes(1);
             const [url, target, features] = openSpy.mock.calls[0];
@@ -109,5 +111,11 @@ describe('Watermark（豆包来源水印）', ()=>{
             expect(target).toBe('_blank');
             expect(features).toBe('noopener,noreferrer');
         });
+        it('无 appId 时不跳转（避免带空 entity_id 打开举报中心）', ()=>{
+            const openSpy = vi.spyOn(window, 'open').mockReturnValue(null);
+            globalThis.ENVIRONMENT = 'online';
+            openDoubaoReport();
+            expect(openSpy).not.toHaveBeenCalled();
+        });
     });
 });

package/lib/components/AppContainer/index.js

@@ -11,13 +11,13 @@ import { SafetyErrorBoundary } from "./safety-error-boundary.js";
 import { useAppInfo } from "../../hooks/index.js";
 import { TrackKey } from "../../types/tea.js";
 import { slardar } from "@lark-apaas/internal-slardar";
+import Watermark, { isDoubaoSource } from "./Watermark.js";
 import { getAppId } from "../../utils/getAppId.js";
 import { isNewPathEnabled } from "../../utils/apiPath.js";
 import QueryProvider from "../QueryProvider/index.js";
 import { AuthProvider } from "@lark-apaas/auth-sdk";
 import "../../runtime/index.js";
 const Safety = /*#__PURE__*/ react.lazy(()=>import("./safety.js"));
-const Watermark = /*#__PURE__*/ react.lazy(()=>import("./Watermark.js"));
 const isMiaodaPreview = window.IS_MIAODA_PREVIEW;
 const readAllCssVarColors = ()=>{
     try {
@@ -196,13 +196,12 @@ const AppContainer_AppContainer = (props)=>{
         itemInputBg: cssColors.background,
         itemLinkBg: cssColors.background
     };
-    const isDoubaoSource = '5' === String(process.env.MIAODA_APP_SOURCE);
     return /*#__PURE__*/ jsxs(Fragment, {
         children: [
             /*#__PURE__*/ jsx(SafetyErrorBoundary, {
-                children: /*#__PURE__*/ jsx(Suspense, {
+                children: isDoubaoSource() ? /*#__PURE__*/ jsx(Watermark, {}) : /*#__PURE__*/ jsx(Suspense, {
                     fallback: null,
-                    children: isDoubaoSource ? /*#__PURE__*/ jsx(Watermark, {}) : /*#__PURE__*/ jsx(Safety, {})
+                    children: /*#__PURE__*/ jsx(Safety, {})
                 })
             }),
             /*#__PURE__*/ jsx(QueryProvider, {

package/package.json

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