@lark-apaas/dataloom 0.1.3-alpha.5 → 0.1.3-alpha.6

package/README.md

@@ -47,12 +47,16 @@ import { createClient } from '@lark-apaas/dataloom';
 ```ts
 import { createClient } from '@lark-apaas/dataloom';
 
-const client = createClient({
-  global: {
-    brandName: 'miaoda',
-    appId: 'app_xxx',
+const client = createClient(
+  'https://example.com',
+  'dataloom-key',
+  {
+    global: {
+      brandName: 'miaoda',
+      appId: 'app_xxx',
+    },
   },
-});
+);
 ```
 
 创建完成后，可以通过以下入口访问能力：
@@ -66,16 +70,19 @@ const client = createClient({
 ### `createClient(...)`
 
 ```ts
-createClient(options?: DataloomClientOptions)
+createClient(
+  dataloomUrl: string,
+  dataloomKey: string,
+  options?: DataloomClientOptions,
+)
 ```
 
-storage 网关前缀由 `options.global.appId` 自动拼接为
-`/app/${appId}/__runtime__/api/v1/storage`，浏览器自动携带 session cookie 完成鉴权。
-
 #### 入参
 
 | 参数 | 类型 | 必填 | 说明 |
 | --- | --- | --- | --- |
+| `dataloomUrl` | `string` | 是 | Dataloom 服务地址 |
+| `dataloomKey` | `string` | 是 | 访问 Dataloom 的 key |
 | `options` | `DataloomClientOptions` | 否 | 初始化配置 |
 
 #### 返回

package/lib/DataloomClient.d.ts

@@ -9,6 +9,8 @@ import type { OnRequestErrorType } from './storage/libs/types';
  * An isomorphic Javascript client for interacting with Dataloom service and storage.
  */
 export default class DataloomClient {
+    protected dataloomUrl: string;
+    protected dataloomKey: string;
     service: DataloomService;
     storage: StorageClient;
     protected storageUrl: string;
@@ -18,10 +20,11 @@ export default class DataloomClient {
     protected headers: Record<string, string>;
     /**
      * Create a new client for use in the browser.
-     * @param options.global.appId 业务 appId；storage 网关前缀由此拼接。
+     * @param dataloomUrl The unique Dataloom URL which is supplied when you create a new project.
+     * @param dataloomKey The unique Dataloom Key which is supplied when you create a new project.
      * @param options.global.fetch A custom fetch implementation.
      * @param options.global.headers Any additional headers to send with each network request.
      */
-    constructor(options?: DataloomClientOptions);
+    constructor(dataloomUrl: string, dataloomKey: string, options?: DataloomClientOptions);
 }
 //# sourceMappingURL=DataloomClient.d.ts.map

package/lib/DataloomClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataloomClient.d.ts","sourceRoot":"","sources":["../src/DataloomClient.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,eAAe,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAK1C,OAAO,KAAK,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAS/D;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC,OAAO,EAAE,eAAe,CAAC;IACzB,OAAO,EAAE,aAAa,CAAC;IAEvB,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IACxB,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;IACpC,SAAS,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAE9D,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE1C;;;;;OAKG;gBACS,OAAO,CAAC,EAAE,qBAAqB;CA6C5C"}
+{"version":3,"file":"DataloomClient.d.ts","sourceRoot":"","sources":["../src/DataloomClient.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,eAAe,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAK1C,OAAO,KAAK,EAAE,qBAAqB,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE/D;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc;IAmB/B,SAAS,CAAC,WAAW,EAAE,MAAM;IAC7B,SAAS,CAAC,WAAW,EAAE,MAAM;IAnB/B,OAAO,EAAE,eAAe,CAAC;IACzB,OAAO,EAAE,aAAa,CAAC;IAEvB,SAAS,CAAC,UAAU,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IACxB,SAAS,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC;IACpC,SAAS,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAE9D,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE1C;;;;;;OAMG;gBAES,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EAC7B,OAAO,CAAC,EAAE,qBAAqB;CAqDlC"}

package/lib/DataloomClient.js

@@ -2,17 +2,19 @@ import RateLimiter from "./RateLimiter.js";
 import service from "./service/index.js";
 import { StorageClient } from "./storage/index.js";
 import { DEFAULT_GLOBAL_OPTIONS } from "./utils/constants.js";
-import { withCredentialsFetch } from "./utils/fetch.js";
-import { applySettingDefaults } from "./utils/helpers.js";
+import { fetchWithAuth } from "./utils/fetch.js";
+import { applySettingDefaults, stripTrailingSlash } from "./utils/helpers.js";
 import { reportDataloomException } from "./utils/slardar.js";
-const buildStorageUrl = (appId)=>`/app/${appId}/__runtime__/api/v1/storage`;
 class DataloomClient {
-    constructor(options){
+    constructor(dataloomUrl, dataloomKey, options){
+        this.dataloomUrl = dataloomUrl;
+        this.dataloomKey = dataloomKey;
+        const normalizedDataloomUrl = stripTrailingSlash(dataloomUrl);
+        this.storageUrl = `${normalizedDataloomUrl}/storage`;
         const DEFAULTS = {
             global: DEFAULT_GLOBAL_OPTIONS
         };
         const settings = applySettingDefaults(options ?? {}, DEFAULTS);
-        this.storageUrl = buildStorageUrl(settings.global.appId);
         this.headers = settings.global.headers ?? {};
         this.onRequestError = (error)=>{
             reportDataloomException(error, {
@@ -23,7 +25,7 @@ class DataloomClient {
             if (settings.global.onError) settings.global.onError(error, this);
         };
         if (settings.global.requestRateLimit && settings.global.requestRateLimit > 0) this.rateLimiter = new RateLimiter(settings.global.requestRateLimit);
-        this.fetch = withCredentialsFetch(this.rateLimiter, settings.global.fetch);
+        this.fetch = fetchWithAuth(dataloomKey, this.rateLimiter, settings.global.fetch);
         this.service = new service({
             accountServices: settings.global.accountServices
         });

package/lib/index.d.ts

@@ -4,8 +4,6 @@ export { default as DataloomClient } from './DataloomClient';
 export type { DataloomClientOptions } from './utils/types';
 /**
  * Creates a new Dataloom Client.
- *
- * @param options 客户端配置；`options.global.appId` 决定 storage 网关前缀。
  */
-export declare const createClient: (options?: DataloomClientOptions) => DataloomClient;
+export declare const createClient: (dataloomUrl: string, dataloomKey: string, options?: DataloomClientOptions) => DataloomClient;
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAE3D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAE3D;;;;GAIG;AACH,eAAO,MAAM,YAAY,GACvB,UAAU,qBAAqB,KAC9B,cAEF,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAE3D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAE3D;;GAEG;AACH,eAAO,MAAM,YAAY,GACvB,aAAa,MAAM,EACnB,aAAa,MAAM,EACnB,UAAU,qBAAqB,KAC9B,cAEF,CAAC"}

package/lib/index.js

@@ -1,3 +1,3 @@
 import DataloomClient from "./DataloomClient.js";
-const createClient = (options)=>new DataloomClient(options);
+const createClient = (dataloomUrl, dataloomKey, options)=>new DataloomClient(dataloomUrl, dataloomKey, options);
 export { DataloomClient, createClient };

package/lib/service/index.d.ts

@@ -1,18 +1,16 @@
-import type { AccountServicesInjection } from './types';
+import type { AccountServicesInjection, SessionServiceShape, UserServiceShape } from './types';
 export interface DataloomServiceOptions {
     accountServices?: AccountServicesInjection;
 }
 /**
  * @deprecated Service 实现已迁移到 @lark-apaas/auth-sdk。
- * dataloom v0.2.x 仅保留壳层做兼容（实例由 client-toolkit 在创建时注入），
- * v0.3.0 计划移除。
  */
 export default class DataloomService {
     /** @deprecated 见 DataloomService 注释 */
-    readonly user: unknown;
+    readonly user: UserServiceShape;
     /** @deprecated 见 DataloomService 注释 */
-    readonly session: unknown;
+    readonly session: SessionServiceShape;
     constructor(options: DataloomServiceOptions);
 }
-export type { AccountServicesInjection };
+export type { AccountServicesInjection, SessionServiceShape, UserServiceShape };
 //# sourceMappingURL=index.d.ts.map

package/lib/service/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAExD,MAAM,WAAW,sBAAsB;IACrC,eAAe,CAAC,EAAE,wBAAwB,CAAC;CAC5C;AAwCD;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,uCAAuC;IACvC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,uCAAuC;IACvC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;gBAEd,OAAO,EAAE,sBAAsB;CAU5C;AAED,YAAY,EAAE,wBAAwB,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EACxB,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,sBAAsB;IACrC,eAAe,CAAC,EAAE,wBAAwB,CAAC;CAC5C;AAwCD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,uCAAuC;IACvC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,uCAAuC;IACvC,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC;gBAE1B,OAAO,EAAE,sBAAsB;CAU5C;AAED,YAAY,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,CAAC"}

package/lib/service/index.js

@@ -1,4 +1,4 @@
-const MIGRATION_HINT = "[dataloom] service.user / service.session has moved to @lark-apaas/auth-sdk in v0.2.0.\nUse `authClient` from @lark-apaas/client-toolkit/auth (or @lark-apaas/auth-sdk), e.g.:\n  import { authClient } from '@lark-apaas/client-toolkit/auth';\n  await authClient.user.search({ name: '张三' });\nIf you really need to keep using dataloom.service.*, ensure client-toolkit injects accountServices when constructing DataloomClient.";
+const MIGRATION_HINT = "[dataloom] service.user / service.session has moved to @lark-apaas/auth-sdk\nUse `authClient` from @lark-apaas/client-toolkit/auth (or @lark-apaas/auth-sdk), e.g.:\n  import { authClient } from '@lark-apaas/client-toolkit/auth';\n  await authClient.user.search({ name: 'zhangsan' });\nIf you really need to keep using dataloom.service.*, ensure client-toolkit injects accountServices when constructing DataloomClient.";
 const ALLOWED_REFLECTION_KEYS = new Set([
     'constructor',
     'then',

package/lib/service/types.d.ts

@@ -1,13 +1,113 @@
 /**
- * 注入到 DataloomService 的 account services 引用。
+ * Account services 形状契约。
+ *
+ * dataloom 自身不持有 user/session 实现（已迁出至 @lark-apaas/auth-sdk），
+ * 但仍需要类型上的"形状契约"以保证：
+ *   1. DataloomService.user/session 字段对老调用方有完整类型提示；
+ *   2. client-toolkit 注入 authClient.user/session 时编译期可结构性校验。
  *
- * dataloom v0.2.0 起，service.user/session 的实现迁出至 @lark-apaas/auth-sdk。
- * 此接口仅定义"形状契约"，不 import auth-sdk，依赖方向单向解耦。
+ * 此处类型镜像自 auth-sdk 的 public 类型（保持结构一致），
+ * 但**不 import auth-sdk**，避免 dataloom → auth-sdk 的反向依赖。
  *
+ * @see packages/client/auth-sdk/src/account/services/user-service/types.ts
+ * @see packages/client/auth-sdk/src/account/services/session-service/types.ts
+ */
+export interface AccountServiceError {
+    code: number;
+    details: string;
+    hint: string | null;
+    message: string;
+}
+interface AccountServiceBase {
+    status: number;
+    statusText: string;
+}
+export interface AccountServiceSuccess<T> extends AccountServiceBase {
+    error: null;
+    data: T;
+}
+export interface AccountServiceFailure extends AccountServiceBase {
+    error: AccountServiceError;
+    data: null;
+}
+export type AccountServiceResponse<T> = AccountServiceSuccess<T> | AccountServiceFailure;
+/** 与 auth-sdk UserStatus 对齐：1 = active / 2 = inactive */
+export type UserStatus = 1 | 2;
+export interface User {
+    user_id: string;
+    email: string;
+    name: string;
+    avatar: string;
+    status: UserStatus;
+}
+export interface SearchParams {
+    name: string;
+    pageSize?: number;
+}
+export interface UserResponse {
+    user_list: User[];
+}
+/**
+ * 用户服务形状契约（与 auth-sdk `UserService` public 方法对齐）。
+ */
+export interface UserServiceShape {
+    search(params: SearchParams): Promise<AccountServiceResponse<UserResponse>>;
+    getByIds(ids: string[] | number[]): Promise<AccountServiceResponse<UserResponse>>;
+}
+export interface I18n {
+    language_code: number;
+    text: string;
+}
+export type I18ns = I18n[];
+export interface Avatar {
+    source?: string;
+    image?: {
+        large?: string;
+    };
+    color?: string;
+}
+export interface UserBaseInfo {
+    user_id?: number;
+    name?: I18ns;
+    avatar?: Avatar;
+    email?: string;
+    phone_number?: string;
+    tenant_name?: string;
+}
+export interface UserInfoResponse {
+    user_info?: UserBaseInfo;
+}
+export interface SignInRedirectionOptions {
+    /** The URL to redirect to after a successful login. Defaults to the current URL. */
+    returnUrl?: string;
+    /** Whether to open the login page in a new tab. Defaults to `false`. */
+    newTab?: boolean;
+}
+export interface NavigateToUserProfileOptions {
+    newTab?: boolean;
+}
+/**
+ * 会话服务形状契约（与 auth-sdk `SessionService` public 方法对齐）。
+ *
+ * 注意：`redirectToLogin` / `navigateToUserProfile` 的成功分支在 auth-sdk
+ * 实现中返回 `data: 'success'`；但其中 `navigateToUserProfile` 未显式标注
+ * 返回类型，TS 会把字面量推断为 `string`。为了让 auth-sdk 的实例可结构性
+ * 赋值到本契约，这里成功分支用 `string` 而非 `'success'` 字面量。
+ */
+export interface SessionServiceShape {
+    redirectToLogin(options?: SignInRedirectionOptions): AccountServiceResponse<string>;
+    signOut(): Promise<AccountServiceResponse<null>>;
+    getUrlWithBizSource(): string;
+    getUserInfo(): Promise<AccountServiceResponse<UserInfoResponse>>;
+    navigateToUserProfile(options?: NavigateToUserProfileOptions): AccountServiceResponse<string>;
+}
+/**
+ * 注入到 DataloomService 的 account services 引用。
  * 由 client-toolkit 在创建 DataloomClient 时通过 options.global.accountServices 注入。
  */
 export interface AccountServicesInjection {
-    user: unknown;
-    session: unknown;
+    user: UserServiceShape;
+    session: SessionServiceShape;
 }
+export {};
 //# sourceMappingURL=types.d.ts.map

package/lib/service/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/service/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CAClB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/service/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,kBAAkB;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB,CAAC,CAAC,CAAE,SAAQ,kBAAkB;IAClE,KAAK,EAAE,IAAI,CAAC;IACZ,IAAI,EAAE,CAAC,CAAC;CACT;AAED,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,KAAK,EAAE,mBAAmB,CAAC;IAC3B,IAAI,EAAE,IAAI,CAAC;CACZ;AAED,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAChC,qBAAqB,CAAC,CAAC,CAAC,GACxB,qBAAqB,CAAC;AAI1B,yDAAyD;AACzD,MAAM,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,CAAC;AAE/B,MAAM,WAAW,IAAI;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,IAAI,EAAE,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC,CAAC;IAC5E,QAAQ,CACN,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GACvB,OAAO,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC,CAAC;CAClD;AAID,MAAM,WAAW,IAAI;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,KAAK,GAAG,IAAI,EAAE,CAAC;AAE3B,MAAM,WAAW,MAAM;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE;QACN,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,YAAY,CAAC;CAC1B;AAED,MAAM,WAAW,wBAAwB;IACvC,oFAAoF;IACpF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,mBAAmB;IAClC,eAAe,CACb,OAAO,CAAC,EAAE,wBAAwB,GACjC,sBAAsB,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO,IAAI,OAAO,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,mBAAmB,IAAI,MAAM,CAAC;IAC9B,WAAW,IAAI,OAAO,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACjE,qBAAqB,CACnB,OAAO,CAAC,EAAE,4BAA4B,GACrC,sBAAsB,CAAC,MAAM,CAAC,CAAC;CACnC;AAID;;;GAGG;AACH,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,EAAE,mBAAmB,CAAC;CAC9B"}

package/lib/storage/StorageClient.d.ts

@@ -8,10 +8,6 @@ export interface StorageClientOptions {
     onRequestError: (error: OnRequestErrorType) => void;
 }
 export declare class StorageClient {
-    /**
-     * Storage 网关前缀，形如 `/app/${appId}/__runtime__/api/v1/storage`，
-     * 浏览器同源 + cookie 鉴权。
-     */
     protected url: string;
     protected headers: {
         [key: string]: string;

package/lib/storage/StorageClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageClient.d.ts","sourceRoot":"","sources":["../../src/storage/StorageClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAEvD,MAAM,WAAW,oBAAoB;IACnC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACrD;AAED,qBAAa,aAAa;IACxB;;;OAGG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IAClC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;gBAG7D,GAAG,EAAE,MAAM,EACX,OAAO,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,EACvC,KAAK,CAAC,EAAE,KAAK,EACb,IAAI,CAAC,EAAE,oBAAoB;IAa7B;;;;OAIG;IACH,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc;CAWjC"}
+{"version":3,"file":"StorageClient.d.ts","sourceRoot":"","sources":["../../src/storage/StorageClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAG1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAEvD,MAAM,WAAW,oBAAoB;IACnC,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACrD;AAED,qBAAa,aAAa;IACxB,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IAClC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;gBAG7D,GAAG,EAAE,MAAM,EACX,OAAO,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAO,EACvC,KAAK,CAAC,EAAE,KAAK,EACb,IAAI,CAAC,EAAE,oBAAoB;IAa7B;;;;OAIG;IACH,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc;CAWjC"}

package/lib/storage/packages/StorageFileApi.d.ts

@@ -178,9 +178,8 @@ export default class StorageFileApi {
     private _isValidDownloadUrl;
     /**
      * Get the filePath from download url with format like
-     * /spark/app/app_xxxx/__runtime__/api/v1/storage/object/bucket_xxx/123%2Fimage.png
-     * or /app/app_xxxx/__runtime__/api/v1/storage/object/bucket_xxx/123%2Fimage.png
-     * （兼容历史 `/runtime/` 形态）
+     * /spark/app/app_xxxx/runtime/api/v1/storage/object/bucket_xxx/123%2Fimage.png
+     * or /app/app_xxxx/runtime/api/v1/storage/object/bucket_xxx/123%2Fimage.png
      */
     private _retrieveFilePathFromDownloadUrl;
     /**

package/lib/storage/packages/StorageFileApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StorageFileApi.d.ts","sourceRoot":"","sources":["../../../src/storage/packages/StorageFileApi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StorageFileApi.d.ts","sourceRoot":"","sources":["../../../src/storage/packages/StorageFileApi.ts"],"names":[],"mappings":"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"}

package/lib/storage/packages/StorageFileApi.js

@@ -325,7 +325,7 @@ class StorageFileApi {
         }
     }
     generateDownloadUrlFromFilePath(filePath) {
-        return `/app/${this.appId}/__runtime__/api/v1/storage/object/${this.bucketId}/${encodeURIComponent(this._removeEmptyFolders(filePath))}`;
+        return `/app/${this.appId}/runtime/api/v1/storage/object/${this.bucketId}/${encodeURIComponent(this._removeEmptyFolders(filePath))}`;
     }
     encodeMetadata(metadata) {
         return JSON.stringify(metadata);
@@ -343,7 +343,7 @@ class StorageFileApi {
         return path.replace(/^\/|\/$/g, '').replace(/\/+/g, '/');
     }
     _isValidDownloadUrl(url) {
-        return /^(\/spark)?\/app\/app_[\w]+\/(__runtime__|runtime)\/api\/v1\/storage\/object\//.test(url);
+        return /^(\/spark)?\/app\/app_[\w]+\/runtime\/api\/v1\/storage\/object\//.test(url);
     }
     _retrieveFilePathFromDownloadUrl(url) {
         if (!this._isValidDownloadUrl(url)) return url;
@@ -359,7 +359,7 @@ class StorageFileApi {
         return '';
     }
     async _copyWithinVolcEngine(url) {
-        const res = await post(this.fetch, `${this.url}/object/${this.bucketId}/copy`, {
+        const res = await post(this.fetch, `${this.url}/runtime/app/${this.appId}/object/${this.bucketId}/copy`, {
             source: {
                 type: 'externalTOS',
                 externalURL: url

package/lib/storage/utils/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/storage/utils/logger.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE9D,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,QAAQ,SAAS,EAAE,gBAAmB,SA+BhE,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,SAAS,MAAM,EACf,UAAU;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC3D,gBAAmB,SA0BpB,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/storage/utils/logger.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE9D,KAAK,SAAS,GAAG;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,QAAQ,SAAS,EAAE,gBAAmB,SAoBhE,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,SAAS,MAAM,EACf,UAAU;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC3D,gBAAmB,SA0BpB,CAAC"}

package/lib/storage/utils/logger.js

@@ -1,16 +1,12 @@
 const logRequest = (params, psmName = 'Storage')=>{
     const { traceId, url, method, body } = params;
-    const base = 'undefined' != typeof window && window.location?.origin ? window.location.origin : 'http://localhost';
-    let decodedParams = [];
-    try {
-        decodedParams = Array.from(new URL(url, base).searchParams.entries()).filter(([key])=>![
-                'count',
-                'tx',
-                'missing',
-                'resolution',
-                'column'
-            ].includes(key)).map(([key, value])=>`${key}=${value}`);
-    } catch  {}
+    const decodedParams = Array.from(new URL(url).searchParams.entries()).filter(([key])=>![
+            'count',
+            'tx',
+            'missing',
+            'resolution',
+            'column'
+        ].includes(key)).map(([key, value])=>`${key}=${value}`);
     console.log(`[Dataloom][${psmName}][Request]`, 'trace id:', traceId, 'method:', method, 'params:', decodedParams.join(','), 'body:', body);
 };
 const logResponse = (traceId, response, psmName = 'Storage')=>{

package/lib/utils/constants.d.ts

@@ -1,7 +1,3 @@
-/**
- * `X-Suda-Csrf-Token`（CSRF 防护）由调用方在初始化 client 时通过
- * `options.global.headers` 注入，避免本包反向依赖上游的 `getCsrfToken`。
- */
 export declare const DEFAULT_HEADERS: Record<string, string>;
 export declare const DEFAULT_GLOBAL_OPTIONS: {
     headers: Record<string, string>;

package/lib/utils/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAkBA;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAGlD,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;CAIlC,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAyCA,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAIlD,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;CAIlC,CAAC"}

package/lib/utils/constants.js

@@ -2,8 +2,27 @@ import { isBrowser } from "./helpers.js";
 import { version } from "./version.js";
 let JS_ENV = '';
 JS_ENV = 'undefined' != typeof Deno ? 'deno' : 'undefined' != typeof document ? 'web' : 'undefined' != typeof navigator && 'ReactNative' === navigator.product ? 'react-native' : 'node';
+const getToken = ()=>{
+    if (!isBrowser()) return '';
+    const host = window.location.host.replace(/\./g, '-');
+    const urlParams = new URLSearchParams(window.location.search);
+    const token = urlParams.get('suda_token');
+    if (token) {
+        localStorage.setItem(`suda_token_${host}`, `${token}`);
+        const url = new URL(window.location.href);
+        const params = new URLSearchParams(url.search);
+        params.delete('suda_token');
+        url.search = params.toString();
+        history.replaceState(null, '', url.toString());
+        return token;
+    }
+    const localToken = localStorage.getItem(`suda_token_${host}`);
+    if (localToken) return localToken;
+    return '';
+};
 const DEFAULT_HEADERS = {
     'X-Client-Info': `dataloom-js-${JS_ENV}/${version}`,
+    'X-Suda-Token': getToken(),
     'X-Suda-Referer': isBrowser() ? window.location.href : ''
 };
 const DEFAULT_GLOBAL_OPTIONS = {

package/lib/utils/fetch.d.ts

@@ -1,11 +1,5 @@
 import type RateLimiter from '../RateLimiter';
 import type { Fetch } from './types';
 export declare const resolveFetch: (customFetch?: Fetch) => Fetch;
-/**
- * 同源 cookie 鉴权下的 fetch 包装：
- * - 默认注入 `credentials: 'include'`，保证浏览器自动携带 session cookie；
- *   若调用方显式传入 `'omit'` / `'same-origin'`，遵循其值（兜底逻辑只在缺省时生效）。
- * - 保留 RateLimiter 的 429 短路能力。
- */
-export declare const withCredentialsFetch: (rateLimiter?: RateLimiter, customFetch?: Fetch) => Fetch;
+export declare const fetchWithAuth: (dataloomKey: string, rateLimiter?: RateLimiter, customFetch?: Fetch) => Fetch;
 //# sourceMappingURL=fetch.d.ts.map

package/lib/utils/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/utils/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,eAAO,MAAM,YAAY,GAAI,cAAc,KAAK,KAAG,KAQlD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,cAAc,WAAW,EACzB,cAAc,KAAK,KAClB,KAgBF,CAAC"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/utils/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC,eAAO,MAAM,YAAY,GAAI,cAAc,KAAK,KAAG,KAQlD,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,aAAa,MAAM,EACnB,cAAc,WAAW,EACzB,cAAc,KAAK,KAClB,KAqBF,CAAC"}

package/lib/utils/fetch.js

@@ -3,18 +3,19 @@ const resolveFetch = (customFetch)=>{
     _fetch = customFetch ? customFetch : fetch;
     return (input, init)=>_fetch(input, init);
 };
-const withCredentialsFetch = (rateLimiter, customFetch)=>{
+const fetchWithAuth = (dataloomKey, rateLimiter, customFetch)=>{
     const resolvedFetch = resolveFetch(customFetch);
     return async (input, init)=>{
         if (rateLimiter && !rateLimiter.canRequest()) return Promise.resolve(new Response(`{"limit": ${rateLimiter.maxRequests}}`, {
             status: 429,
             statusText: 'Too Many Requests'
         }));
-        const credentials = init?.credentials ?? 'include';
+        const headers = new Headers(init?.headers);
+        if (!headers.has('apikey') && dataloomKey) headers.set('apikey', dataloomKey);
         return resolvedFetch(input, {
             ...init,
-            credentials
+            headers
         });
     };
 };
-export { resolveFetch, withCredentialsFetch };
+export { fetchWithAuth, resolveFetch };

package/lib/utils/types.d.ts

@@ -1,3 +1,4 @@
+import type { AccountServicesInjection } from '../service/types';
 export type Fetch = (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
 export type OnError = (error: unknown, instance: unknown) => void;
 export type DataloomClientOptions = {
@@ -32,17 +33,13 @@ export type DataloomClientOptions = {
         onError?: OnError;
         /**
          * 由 client-toolkit 注入的 account services 引用（user/session）。
-         * dataloom v0.2.0 起，service.user/session 的实现迁出至 @lark-apaas/auth-sdk；
          * 老调用方式 `(await getDataloom()).service.user/session` 仍可用，但底层实例由本字段提供。
          *
          * 直接构造 DataloomClient（不通过 toolkit）时若未传此字段，访问 service.user/session 会抛错并指向迁移文档。
          *
          * @see docs/superpowers/specs/2026-05-13-auth-sdk-account-services-split-design.md §4.4
          */
-        accountServices?: {
-            user: unknown;
-            session: unknown;
-        };
+        accountServices?: AccountServicesInjection;
     };
 };
 //# sourceMappingURL=types.d.ts.map

package/lib/utils/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAExF,MAAM,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;AAElE,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,CAAC,EAAE;QACP;;WAEG;QACH,SAAS,EAAE,MAAM,CAAC;QAClB;;WAEG;QACH,KAAK,EAAE,MAAM,CAAC;QACd;;WAEG;QACH,KAAK,CAAC,EAAE,KAAK,CAAC;QACd;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEjC;;WAEG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAE5B;;WAEG;QACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAE1B;;WAEG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC;QAElB;;;;;;;;WAQG;QACH,eAAe,CAAC,EAAE;YAChB,IAAI,EAAE,OAAO,CAAC;YACd,OAAO,EAAE,OAAO,CAAC;SAClB,CAAC;KACH,CAAC;CACH,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAEjE,MAAM,MAAM,KAAK,GAAG,CAClB,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,KACf,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEvB,MAAM,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;AAElE,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,CAAC,EAAE;QACP;;WAEG;QACH,SAAS,EAAE,MAAM,CAAC;QAClB;;WAEG;QACH,KAAK,EAAE,MAAM,CAAC;QACd;;WAEG;QACH,KAAK,CAAC,EAAE,KAAK,CAAC;QACd;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEjC;;WAEG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAE5B;;WAEG;QACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAE1B;;WAEG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC;QAElB;;;;;;;WAOG;QACH,eAAe,CAAC,EAAE,wBAAwB,CAAC;KAC5C,CAAC;CACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/dataloom",
-  "version": "0.1.3-alpha.5",
+  "version": "0.1.3-alpha.6",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [