@lark-apaas/client-toolkit 1.2.3 → 1.2.4-alpha.0

package/lib/components/AppContainer/IframeBridge.js

@@ -3,8 +3,7 @@ import { useCallback, useEffect, useMemo, useRef } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
 import { connectToParent } from "penpal";
 import { useUpdatingRef } from "../../hooks/useUpdatingRef.js";
-import { submitPostMessage } from "../../utils/postMessage.js";
-import { getPreviewParentOrigin } from "../../utils/getParentOrigin.js";
+import { resolveParentOrigin, submitPostMessage } from "../../utils/postMessage.js";
 import { childApi } from "./utils/childApi.js";
 import "./utils/listenHot.js";
 var IframeBridge_RouteMessageType = /*#__PURE__*/ function(RouteMessageType) {
@@ -21,8 +20,10 @@ async function connectParent() {
         type: 'PreviewReady',
         data: {}
     });
+    const parentOrigin = resolveParentOrigin();
+    if (!parentOrigin) return;
     const connection = connectToParent({
-        parentOrigin: getPreviewParentOrigin(),
+        parentOrigin,
         methods: {
             ...childApi
         }
@@ -35,13 +36,13 @@ function IframeBridge() {
     const navigate = useNavigate();
     const navigateRef = useUpdatingRef(navigate);
     const isActive = useRef(false);
-    const historyBack = useCallback(()=>{
+    const historyBack = useCallback((_payload)=>{
         navigateRef.current(-1);
         isActive.current = true;
     }, [
         navigateRef
     ]);
-    const historyForward = useCallback(()=>{
+    const historyForward = useCallback((_payload)=>{
         navigateRef.current(1);
         isActive.current = true;
     }, [
@@ -69,8 +70,8 @@ function IframeBridge() {
         location
     ]);
     const handleMessage = useCallback((event)=>{
-        const { data } = event;
-        if (isRouteMessageType(data?.type)) operatorMessage[data?.type](data?.data);
+        const data = event.data ?? {};
+        if ('string' == typeof data.type && isRouteMessageType(data.type)) operatorMessage[data.type](data.data);
     }, [
         operatorMessage
     ]);

package/lib/utils/getParentOrigin.d.ts

@@ -1,6 +1 @@
 export declare function getEnv(): 'BOE' | 'PRE' | 'ONLINE';
-/**
- * @internal
- * 获取预览环境父级域名
- */
-export declare function getPreviewParentOrigin(): "https://force.feishu.cn" | "https://force.feishu-pre.cn" | "https://force.feishu-boe.cn" | "https://miaoda.feishu.cn" | "https://miaoda.feishu-pre.cn" | "https://miaoda.feishu-boe.cn";

package/lib/utils/getParentOrigin.js

@@ -4,13 +4,4 @@ function getEnv() {
     if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'PRE';
     return 'BOE';
 }
-function getPreviewParentOrigin() {
-    const { origin } = window.location;
-    if (origin.includes('force.feishuapp.net')) return 'https://force.feishu.cn';
-    if (origin.includes('force-pre.feishuapp.net')) return 'https://force.feishu-pre.cn';
-    if (origin.includes('force.byted.org')) return 'https://force.feishu-boe.cn';
-    if (origin.includes('feishuapp.cn') || origin.includes('miaoda.feishuapp.net')) return 'https://miaoda.feishu.cn';
-    if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'https://miaoda.feishu-pre.cn';
-    return 'https://miaoda.feishu-boe.cn';
-}
-export { getEnv, getPreviewParentOrigin };
+export { getEnv };

package/lib/utils/postMessage.d.ts

@@ -1,6 +1,7 @@
 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: any): 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

@@ -1,14 +1,31 @@
-import { getPreviewParentOrigin } from "./getParentOrigin.js";
+function getEnvOrigin() {
+    return 'undefined' != typeof process ? process.env?.FORCE_FRAMEWORK_DOMAIN_MAIN : void 0;
+}
+function getLegacyParentOrigin() {
+    const { origin } = window.location;
+    if (origin.includes('force.feishuapp.net')) return 'https://force.feishu.cn';
+    if (origin.includes('force-pre.feishuapp.net')) return 'https://force.feishu-pre.cn';
+    if (origin.includes('force.byted.org')) return 'https://force.feishu-boe.cn';
+    if (origin.includes('feishuapp.cn') || origin.includes('miaoda.feishuapp.net')) return 'https://miaoda.feishu.cn';
+    if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'https://miaoda.feishu-pre.cn';
+    return 'https://miaoda.feishu-boe.cn';
+}
+function resolveParentOrigin() {
+    return getEnvOrigin() ?? getLegacyParentOrigin();
+}
 function submitPostMessage(message, targetOrigin) {
     try {
-        window.parent.postMessage(message, targetOrigin ?? getPreviewParentOrigin());
+        const parentOrigin = resolveParentOrigin();
+        const origin = targetOrigin ?? parentOrigin;
+        if (!origin) return;
+        window.parent.postMessage(message, origin);
     } catch (e) {
         console.error('postMessage error', e);
     }
 }
 function submitSlardarEvent(event) {
-    const slardar = window['KSlardarWeb'];
-    if (slardar && 'function' == typeof slardar) slardar('sendEvent', event);
+    const slardar = window.KSlardarWeb;
+    if ('function' == typeof slardar) slardar('sendEvent', event);
     else console.warn('hmr listen function not found');
 }
 function isOutgoingMessage(msg, type) {
@@ -17,4 +34,4 @@ function isOutgoingMessage(msg, type) {
 function isIncomingMessage(msg, type) {
     return msg.type === type;
 }
-export { isIncomingMessage, isOutgoingMessage, submitPostMessage, submitSlardarEvent };
+export { isIncomingMessage, isOutgoingMessage, resolveParentOrigin, submitPostMessage, submitSlardarEvent };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.3",
+  "version": "1.2.4-alpha.0",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -156,5 +156,6 @@
     "react-dom": ">=16.14.0",
     "react-router-dom": ">=6.26.2",
     "styled-jsx": ">=5.0.0"
-  }
+  },
+  "gitHead": "28506f3a156791edda1f6b56946b781cea9aca8a"
 }