@lark-apaas/client-toolkit 1.2.56 → 1.2.57-beta.1

package/lib/components/AppContainer/index.js

@@ -77,7 +77,8 @@ const App = (props)=>{
                 },
                 categories: {
                     appId: appId ?? 'unknown',
-                    mode: isMiaodaPreview ? 'preview' : 'runtime'
+                    mode: isMiaodaPreview ? 'preview' : 'runtime',
+                    appType: String(process.env.MIAODA_APP_TYPE ?? 'unknown')
                 }
             });
         }

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

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

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

@@ -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

@@ -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

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.56",
+  "version": "1.2.57-beta.1",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -102,7 +102,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-beta.1",
     "@lark-apaas/internal-slardar": "^0.0.3",
     "@lark-apaas/miaoda-inspector": "^1.0.23",
     "@lark-apaas/observable-web": "^1.0.6",