@lark-apaas/client-toolkit 1.2.48-alpha.12 → 1.2.48-alpha.13

package/lib/integrations/dataloom.d.ts

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

package/lib/integrations/dataloom.js

@@ -1,19 +1,19 @@
-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 { getCsrfToken } from "../utils/getCsrfToken.js";
+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,
             brandName: 'miaoda',
             appId,
+            headers: {
+                'X-Suda-Csrf-Token': getCsrfToken() ?? ''
+            },
             accountServices: {
                 user: authClient.user,
                 session: authClient.session
@@ -26,10 +26,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/utils/getInitialInfo.d.ts

@@ -13,13 +13,6 @@ interface AppRuntimePublished {
 interface BucketConfig {
     default_bucket_id?: string;
 }
-/**
- * 从API获取已发布的应用信息（仅全栈沙箱模式下使用）
- */
-export declare function getAppPublished(): Promise<{
-    app_info?: AppRuntimePublished;
-    app_runtime_extra?: AppRuntimeExtra;
-} | undefined>;
 declare let initialInfo: {
     app_info?: AppRuntimePublished;
     app_runtime_extra?: AppRuntimeExtra;

package/lib/utils/getInitialInfo.js

@@ -59,4 +59,4 @@ function getInitialInfo(refresh = false) {
     });
     return pendingPromise;
 }
-export { getAppPublished, getInitialInfo };
+export { getInitialInfo };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.2.48-alpha.12",
+  "version": "1.2.48-alpha.13",
   "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-alpha.9",
+    "@lark-apaas/dataloom": "0.1.3-alpha.10",
     "@lark-apaas/internal-slardar": "^0.0.3",
     "@lark-apaas/miaoda-inspector": "^1.0.23",
     "@lark-apaas/observable-web": "^1.0.6",

package/lib/utils/url.d.ts

@@ -1,8 +0,0 @@
-export interface UrlParts {
-    baseUrl: string;
-    workspace: string;
-}
-/**
- * @internal
- */
-export declare function splitWorkspaceUrl(fullUrl: string): UrlParts;

package/lib/utils/url.js

@@ -1,22 +0,0 @@
-import { logger } from "../logger/index.js";
-function splitWorkspaceUrl(fullUrl) {
-    try {
-        const url = new URL(fullUrl);
-        const pathParts = url.pathname.split('/');
-        const workspacesIndex = pathParts.findIndex((part)=>'workspaces' === part);
-        if (-1 === workspacesIndex) throw new Error('Invalid workspace URL format');
-        const basePathParts = pathParts.slice(0, workspacesIndex);
-        const workspace = pathParts[workspacesIndex + 1];
-        return {
-            baseUrl: `${url.origin}${basePathParts.join('/')}`,
-            workspace
-        };
-    } catch (error) {
-        logger.error('Error splitting workspace URL:', error);
-    }
-    return {
-        baseUrl: fullUrl,
-        workspace: 'workspace'
-    };
-}
-export { splitWorkspaceUrl };