npm - @lark-apaas/client-toolkit - Versions diffs - 1.2.51-alpha.5 → 1.2.51-alpha.6 - Mend

@lark-apaas/client-toolkit 1.2.51-alpha.5 → 1.2.51-alpha.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/lib/apis/components/UniversalLink.d.ts +0 -3
package/lib/apis/components/UniversalLink.js +3 -42
package/lib/integrations/__test__/dataloom.test.d.ts +1 -0
package/lib/integrations/__test__/dataloom.test.js +83 -0
package/lib/integrations/dataloom.d.ts +1 -1
package/lib/integrations/dataloom.js +5 -11
package/lib/types/iframe-events.d.ts +1 -12
package/lib/utils/postMessage.js +4 -5
package/package.json +2 -2

package/lib/apis/components/UniversalLink.d.ts CHANGED Viewed

@@ -8,8 +8,5 @@ export interface UniversalLinkProps extends Omit<React.AnchorHTMLAttributes<HTML
  * - 内部路由（/dashboard）→ react-router Link
  * - Hash 锚点（#section）→ <a>
  * - 外链（https://...）→ <a target="_blank">
- *
- * 预览态（iframe 内）时，通过 postMessage 通知父页面处理链接跳转，
- * 避免浏览器安全策略限制导致链接无法正常打开。
  */
 export declare const UniversalLink: React.ForwardRefExoticComponent<UniversalLinkProps & React.RefAttributes<HTMLAnchorElement>>;

package/lib/apis/components/UniversalLink.js CHANGED Viewed

@@ -1,62 +1,23 @@
 import { jsx } from "react/jsx-runtime";
 import react from "react";
 import { Link } from "react-router-dom";
-import { isPreview } from "../../utils/utils.js";
-import { submitPostMessage } from "../../utils/postMessage.js";
 function isInternalRoute(to) {
     return !to.startsWith('#') && !to.startsWith('http://') && !to.startsWith('https://') && !to.startsWith('//');
 }
 function isExternalLink(to) {
     return to.startsWith('http://') || to.startsWith('https://') || to.startsWith('//');
 }
-const MIAODA_PARENT_ORIGIN_RE = /^https:\/\/(miaoda|force)\.feishu(-pre|-boe|-staging)?\.cn$/;
-function isIframeUnderMiaoda() {
-    if ('undefined' == typeof window) return false;
-    if (window.parent === window) return false;
-    try {
-        if (!document.referrer) return false;
-        const refOrigin = new URL(document.referrer).origin;
-        return MIAODA_PARENT_ORIGIN_RE.test(refOrigin);
-    } catch  {
-        return false;
-    }
-}
-const UniversalLink_UniversalLink = /*#__PURE__*/ react.forwardRef(function({ to, onClick, ...props }, ref) {
-    const isExternal = isExternalLink(to);
-    const preview = (isPreview() || isIframeUnderMiaoda()) && isExternal;
-    if (preview) {
-        const handlePreviewClick = (e)=>{
-            e.preventDefault();
-            onClick?.(e);
-            submitPostMessage({
-                type: 'OpenIframeLink',
-                data: {
-                    href: to,
-                    external: true
-                }
-            });
-        };
-        return /*#__PURE__*/ jsx("a", {
-            href: to,
-            ref: ref,
-            ...props,
-            onClick: handlePreviewClick,
-            target: props.target ?? '_blank',
-            rel: props.rel ?? 'noopener noreferrer'
-        });
-    }
+const UniversalLink_UniversalLink = /*#__PURE__*/ react.forwardRef(function({ to, ...props }, ref) {
     if (isInternalRoute(to)) return /*#__PURE__*/ jsx(Link, {
         to: to,
         ref: ref,
-        ...props,
-        onClick: onClick
+        ...props
     });
     return /*#__PURE__*/ jsx("a", {
         href: to,
         ref: ref,
         ...props,
-        onClick: onClick,
-        ...isExternal && {
+        ...isExternalLink(to) && {
             target: props.target ?? '_blank',
             rel: props.rel ?? 'noopener noreferrer'
         }

package/lib/integrations/__test__/dataloom.test.d.ts ADDED Viewed

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

package/lib/integrations/__test__/dataloom.test.js ADDED Viewed

@@ -0,0 +1,83 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { getDataloom } from "../dataloom.js";
+const { getInitialInfoMock, getAppPublishedMock, getAppIdMock, createClientMock, authUserMock, authSessionMock } = vi.hoisted(()=>({
+        getInitialInfoMock: vi.fn(),
+        getAppPublishedMock: vi.fn(),
+        getAppIdMock: vi.fn(),
+        createClientMock: vi.fn(),
+        authUserMock: {},
+        authSessionMock: {}
+    }));
+vi.mock('../../utils/getInitialInfo', ()=>({
+        getInitialInfo: getInitialInfoMock,
+        getAppPublished: getAppPublishedMock
+    }));
+vi.mock('../../utils/getAppId', ()=>({
+        getAppId: getAppIdMock
+    }));
+vi.mock('@lark-apaas/dataloom', ()=>({
+        createClient: createClientMock
+    }));
+vi.mock('@lark-apaas/auth-sdk', ()=>({
+        authClient: {
+            user: authUserMock,
+            session: authSessionMock
+        }
+    }));
+beforeEach(()=>{
+    getInitialInfoMock.mockReset();
+    getAppPublishedMock.mockReset();
+    getAppIdMock.mockReset();
+    createClientMock.mockReset();
+});
+afterEach(()=>{
+    vi.restoreAllMocks();
+});
+describe('getDataloom', ()=>{
+    it('返回-createClient实例-改用getInitialInfo-新签名不取token/url-appId注入-并发去重-缓存复用', async ()=>{
+        getAppIdMock.mockReturnValue('app-1');
+        getInitialInfoMock.mockResolvedValue({
+            app_runtime_extra: {
+                token: 'pat',
+                url: 'https://x'
+            }
+        });
+        const client = {
+            __id: 'client-1'
+        };
+        createClientMock.mockReturnValue(client);
+        const p1 = getDataloom();
+        const p2 = getDataloom();
+        expect(p1).toBe(p2);
+        const [c1, c2] = await Promise.all([
+            p1,
+            p2
+        ]);
+        expect(c1).toBe(client);
+        expect(c2).toBe(client);
+        expect(getInitialInfoMock).toHaveBeenCalledTimes(1);
+        expect(getAppPublishedMock).not.toHaveBeenCalled();
+        expect(createClientMock).toHaveBeenCalledTimes(1);
+        const args = createClientMock.mock.calls[0];
+        expect(args).toHaveLength(1);
+        const options = args[0];
+        expect(typeof options).toBe('object');
+        expect(options).not.toBe('https://x');
+        expect(options).not.toBe('pat');
+        expect(options.global).toBeDefined();
+        expect(options.global).not.toHaveProperty('url');
+        expect(options.global).not.toHaveProperty('key');
+        expect(options.global?.appId).toBe('app-1');
+        expect(options.global?.accountServices).toEqual({
+            user: authUserMock,
+            session: authSessionMock
+        });
+        const cached1 = await getDataloom();
+        const cached2 = await getDataloom();
+        expect(cached1).toBe(client);
+        expect(cached2).toBe(client);
+        expect(cached1).toBe(cached2);
+        expect(getInitialInfoMock).toHaveBeenCalledTimes(1);
+        expect(createClientMock).toHaveBeenCalledTimes(1);
+    });
+});

package/lib/integrations/dataloom.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-declare const createDataLoomClient: (url?: string, pat?: string) => import("@lark-apaas/dataloom").DataloomClient;
+declare const createDataLoomClient: () => import("@lark-apaas/dataloom").DataloomClient;
 /** 获取dataloom实例 */
 export declare function getDataloom(): Promise<ReturnType<typeof createDataLoomClient>>;
 export {};

package/lib/integrations/dataloom.js CHANGED Viewed

@@ -1,14 +1,10 @@
-import { splitWorkspaceUrl } from "../utils/url.js";
 import { createClient } from "@lark-apaas/dataloom";
 import { authClient } from "@lark-apaas/auth-sdk";
 import { getAppId } from "../utils/getAppId.js";
-import { getAppPublished } from "../utils/getInitialInfo.js";
-const createDataLoomClient = (url, pat)=>{
-    const { baseUrl } = url ? splitWorkspaceUrl(url) : {
-        baseUrl: ''
-    };
+import { getInitialInfo } from "../utils/getInitialInfo.js";
+const createDataLoomClient = ()=>{
     const appId = getAppId();
-    return createClient(baseUrl, pat, {
+    return createClient({
         global: {
             enableDataloomLog: 'production' !== process.env.NODE_ENV,
             requestRateLimit: 'production' !== process.env.NODE_ENV ? 100 : void 0,
@@ -26,10 +22,8 @@ let pendingPromise = null;
 function getDataloom() {
     if (dataloom) return Promise.resolve(dataloom);
     if (pendingPromise) return pendingPromise;
-    pendingPromise = getAppPublished().then((info)=>{
-        const DATALOOM_CLIENT_URL = info?.app_runtime_extra?.url;
-        const DATALOOM_PAT = info?.app_runtime_extra?.token;
-        dataloom = createDataLoomClient(DATALOOM_CLIENT_URL, DATALOOM_PAT);
+    pendingPromise = getInitialInfo().then(()=>{
+        dataloom = createDataLoomClient();
         return dataloom;
     }).finally(()=>{
         pendingPromise = null;

package/lib/types/iframe-events.d.ts CHANGED Viewed

@@ -46,18 +46,7 @@ export interface DevServerMessage extends IframeMessage<{
 }> {
     type: 'DevServerMessage';
 }
-/**
- * 预览态下链接点击通知父页面处理。
- * iframe 内直接跳转可能被浏览器安全策略拦截，
- * 通过 postMessage 让父页面在新标签页或外壳中打开链接。
- */
-export interface OpenIframeLinkMessage extends IframeMessage<{
-    href: string;
-    external: boolean;
-}> {
-    type: 'OpenIframeLink';
-}
-export type OutgoingMessage = PreviewReadyMessage | HmrMessage | ConsoleMessage | ChildLocationChangeMessage | CreatePageMessage | RenderErrorMessage | RenderErrorRepairMessage | PageScreenshotMessage | DevServerMessage | UpdateRoutesMessage | OpenIframeLinkMessage;
+export type OutgoingMessage = PreviewReadyMessage | HmrMessage | ConsoleMessage | ChildLocationChangeMessage | CreatePageMessage | RenderErrorMessage | RenderErrorRepairMessage | PageScreenshotMessage | DevServerMessage | UpdateRoutesMessage;
 export interface GetRoutesMessage extends IframeMessage<Record<string, never>> {
     type: 'GetRoutes';
 }

package/lib/utils/postMessage.js CHANGED Viewed

@@ -23,23 +23,22 @@ function getLegacyParentOrigin() {
     if (origin.includes('fsapp.kundou.cn') || origin.includes('miaoda-pre.feishuapp.net')) return 'https://miaoda.feishu-pre.cn';
     return 'https://miaoda.feishu-boe.cn';
 }
-const MIAODA_PARENT_ORIGIN_RE = /^https:\/\/(miaoda|force)\.feishu(-pre|-boe|-staging)?\.cn$/;
 function resolveParentOrigin() {
-    const paramOrigin = getParentOriginFromParams();
-    if (paramOrigin) return paramOrigin;
     try {
         if (document.referrer) {
             const referrerOrigin = new URL(document.referrer).origin;
-            if (MIAODA_PARENT_ORIGIN_RE.test(referrerOrigin) || referrerOrigin.startsWith('http://localhost') || referrerOrigin.startsWith('http://127.0.0.1')) return referrerOrigin;
+            if (referrerOrigin.startsWith('http://localhost') || referrerOrigin.startsWith('http://127.0.0.1')) return referrerOrigin;
         }
     } catch  {}
+    const paramOrigin = getParentOriginFromParams();
+    if (paramOrigin) return paramOrigin;
     return process.env?.FORCE_FRAMEWORK_DOMAIN_MAIN ?? getLegacyParentOrigin();
 }
 function submitPostMessage(message, targetOrigin) {
     try {
         const parentOrigin = resolveParentOrigin();
         const origin = targetOrigin ?? parentOrigin;
-        if (!origin) return void console.error('postMessage skipped: cannot resolve parent origin');
+        if (!origin) return;
         window.parent.postMessage(message, origin);
     } catch (e) {
         console.error('postMessage error', e);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.51-alpha.5",
+  "version": "1.2.51-alpha.6",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -101,7 +101,7 @@
     "@lark-apaas/aily-web-sdk": "^0.0.11",
     "@lark-apaas/auth-sdk": "^0.1.5",
     "@lark-apaas/client-capability": "^0.1.7",
-    "@lark-apaas/dataloom": "^0.1.3",
+    "@lark-apaas/dataloom": "0.1.4-alpha.0",
     "@lark-apaas/internal-slardar": "^0.0.3",
     "@lark-apaas/miaoda-inspector": "^1.0.23",
     "@lark-apaas/observable-web": "^1.0.6",