@lark-apaas/dataloom 0.1.3-alpha.7 → 0.1.3-alpha.8
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.
- package/README.md +9 -16
- package/lib/DataloomClient.d.ts +2 -5
- package/lib/DataloomClient.d.ts.map +1 -1
- package/lib/DataloomClient.js +6 -8
- package/lib/index.d.ts +3 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -1
- package/lib/service/index.d.ts +8 -4
- package/lib/service/index.d.ts.map +1 -1
- package/lib/service/index.js +1 -1
- package/lib/service/types.d.ts +5 -105
- package/lib/service/types.d.ts.map +1 -1
- package/lib/storage/StorageClient.d.ts +4 -0
- package/lib/storage/StorageClient.d.ts.map +1 -1
- package/lib/storage/libs/helpers.d.ts +1 -1
- package/lib/storage/libs/helpers.d.ts.map +1 -1
- package/lib/storage/libs/helpers.js +40 -24
- package/lib/storage/libs/types.d.ts +8 -6
- package/lib/storage/libs/types.d.ts.map +1 -1
- package/lib/storage/packages/StorageFileApi.d.ts +3 -2
- package/lib/storage/packages/StorageFileApi.d.ts.map +1 -1
- package/lib/storage/packages/StorageFileApi.js +23 -21
- package/lib/storage/utils/logger.d.ts.map +1 -1
- package/lib/storage/utils/logger.js +11 -7
- package/lib/utils/constants.d.ts +4 -0
- package/lib/utils/constants.d.ts.map +1 -1
- package/lib/utils/constants.js +0 -19
- package/lib/utils/fetch.d.ts +7 -1
- package/lib/utils/fetch.d.ts.map +1 -1
- package/lib/utils/fetch.js +4 -5
- package/lib/utils/types.d.ts +5 -2
- package/lib/utils/types.d.ts.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -47,16 +47,12 @@ import { createClient } from '@lark-apaas/dataloom';
|
|
|
47
47
|
```ts
|
|
48
48
|
import { createClient } from '@lark-apaas/dataloom';
|
|
49
49
|
|
|
50
|
-
const client = createClient(
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
global: {
|
|
55
|
-
brandName: 'miaoda',
|
|
56
|
-
appId: 'app_xxx',
|
|
57
|
-
},
|
|
50
|
+
const client = createClient({
|
|
51
|
+
global: {
|
|
52
|
+
brandName: 'miaoda',
|
|
53
|
+
appId: 'app_xxx',
|
|
58
54
|
},
|
|
59
|
-
);
|
|
55
|
+
});
|
|
60
56
|
```
|
|
61
57
|
|
|
62
58
|
创建完成后,可以通过以下入口访问能力:
|
|
@@ -70,19 +66,16 @@ const client = createClient(
|
|
|
70
66
|
### `createClient(...)`
|
|
71
67
|
|
|
72
68
|
```ts
|
|
73
|
-
createClient(
|
|
74
|
-
dataloomUrl: string,
|
|
75
|
-
dataloomKey: string,
|
|
76
|
-
options?: DataloomClientOptions,
|
|
77
|
-
)
|
|
69
|
+
createClient(options?: DataloomClientOptions)
|
|
78
70
|
```
|
|
79
71
|
|
|
72
|
+
storage 网关前缀由 `options.global.appId` 自动拼接为
|
|
73
|
+
`/app/${appId}/__runtime__/api/v1/storage`,浏览器自动携带 session cookie 完成鉴权。
|
|
74
|
+
|
|
80
75
|
#### 入参
|
|
81
76
|
|
|
82
77
|
| 参数 | 类型 | 必填 | 说明 |
|
|
83
78
|
| --- | --- | --- | --- |
|
|
84
|
-
| `dataloomUrl` | `string` | 是 | Dataloom 服务地址 |
|
|
85
|
-
| `dataloomKey` | `string` | 是 | 访问 Dataloom 的 key |
|
|
86
79
|
| `options` | `DataloomClientOptions` | 否 | 初始化配置 |
|
|
87
80
|
|
|
88
81
|
#### 返回
|
package/lib/DataloomClient.d.ts
CHANGED
|
@@ -9,8 +9,6 @@ import type { OnRequestErrorType } from './storage/libs/types';
|
|
|
9
9
|
* An isomorphic Javascript client for interacting with Dataloom service and storage.
|
|
10
10
|
*/
|
|
11
11
|
export default class DataloomClient {
|
|
12
|
-
protected dataloomUrl: string;
|
|
13
|
-
protected dataloomKey: string;
|
|
14
12
|
service: DataloomService;
|
|
15
13
|
storage: StorageClient;
|
|
16
14
|
protected storageUrl: string;
|
|
@@ -20,11 +18,10 @@ export default class DataloomClient {
|
|
|
20
18
|
protected headers: Record<string, string>;
|
|
21
19
|
/**
|
|
22
20
|
* Create a new client for use in the browser.
|
|
23
|
-
* @param
|
|
24
|
-
* @param dataloomKey The unique Dataloom Key which is supplied when you create a new project.
|
|
21
|
+
* @param options.global.appId 业务 appId;storage 网关前缀由此拼接。
|
|
25
22
|
* @param options.global.fetch A custom fetch implementation.
|
|
26
23
|
* @param options.global.headers Any additional headers to send with each network request.
|
|
27
24
|
*/
|
|
28
|
-
constructor(
|
|
25
|
+
constructor(options?: DataloomClientOptions);
|
|
29
26
|
}
|
|
30
27
|
//# sourceMappingURL=DataloomClient.d.ts.map
|
|
@@ -1 +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;
|
|
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"}
|
package/lib/DataloomClient.js
CHANGED
|
@@ -2,19 +2,17 @@ import RateLimiter from "./RateLimiter.js";
|
|
|
2
2
|
import service from "./service/index.js";
|
|
3
3
|
import { StorageClient } from "./storage/index.js";
|
|
4
4
|
import { DEFAULT_GLOBAL_OPTIONS } from "./utils/constants.js";
|
|
5
|
-
import {
|
|
6
|
-
import { applySettingDefaults
|
|
5
|
+
import { withCredentialsFetch } from "./utils/fetch.js";
|
|
6
|
+
import { applySettingDefaults } from "./utils/helpers.js";
|
|
7
7
|
import { reportDataloomException } from "./utils/slardar.js";
|
|
8
|
+
const buildStorageUrl = (appId)=>`/app/${appId}/__runtime__/api/v1/storage`;
|
|
8
9
|
class DataloomClient {
|
|
9
|
-
constructor(
|
|
10
|
-
this.dataloomUrl = dataloomUrl;
|
|
11
|
-
this.dataloomKey = dataloomKey;
|
|
12
|
-
const normalizedDataloomUrl = stripTrailingSlash(dataloomUrl);
|
|
13
|
-
this.storageUrl = `${normalizedDataloomUrl}/storage`;
|
|
10
|
+
constructor(options){
|
|
14
11
|
const DEFAULTS = {
|
|
15
12
|
global: DEFAULT_GLOBAL_OPTIONS
|
|
16
13
|
};
|
|
17
14
|
const settings = applySettingDefaults(options ?? {}, DEFAULTS);
|
|
15
|
+
this.storageUrl = buildStorageUrl(settings.global.appId);
|
|
18
16
|
this.headers = settings.global.headers ?? {};
|
|
19
17
|
this.onRequestError = (error)=>{
|
|
20
18
|
reportDataloomException(error, {
|
|
@@ -25,7 +23,7 @@ class DataloomClient {
|
|
|
25
23
|
if (settings.global.onError) settings.global.onError(error, this);
|
|
26
24
|
};
|
|
27
25
|
if (settings.global.requestRateLimit && settings.global.requestRateLimit > 0) this.rateLimiter = new RateLimiter(settings.global.requestRateLimit);
|
|
28
|
-
this.fetch =
|
|
26
|
+
this.fetch = withCredentialsFetch(this.rateLimiter, settings.global.fetch);
|
|
29
27
|
this.service = new service({
|
|
30
28
|
accountServices: settings.global.accountServices
|
|
31
29
|
});
|
package/lib/index.d.ts
CHANGED
|
@@ -4,6 +4,8 @@ export { default as DataloomClient } from './DataloomClient';
|
|
|
4
4
|
export type { DataloomClientOptions } from './utils/types';
|
|
5
5
|
/**
|
|
6
6
|
* Creates a new Dataloom Client.
|
|
7
|
+
*
|
|
8
|
+
* @param options 客户端配置;`options.global.appId` 决定 storage 网关前缀。
|
|
7
9
|
*/
|
|
8
|
-
export declare const createClient: (
|
|
10
|
+
export declare const createClient: (options?: DataloomClientOptions) => DataloomClient;
|
|
9
11
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +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
|
|
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"}
|
package/lib/index.js
CHANGED
package/lib/service/index.d.ts
CHANGED
|
@@ -1,14 +1,18 @@
|
|
|
1
|
-
import type { AccountServicesInjection
|
|
1
|
+
import type { AccountServicesInjection } from './types';
|
|
2
2
|
export interface DataloomServiceOptions {
|
|
3
3
|
accountServices?: AccountServicesInjection;
|
|
4
4
|
}
|
|
5
5
|
/**
|
|
6
6
|
* @deprecated Service 实现已迁移到 @lark-apaas/auth-sdk。
|
|
7
|
+
* dataloom v0.2.x 仅保留壳层做兼容(实例由 client-toolkit 在创建时注入),
|
|
8
|
+
* v0.3.0 计划移除。
|
|
7
9
|
*/
|
|
8
10
|
export default class DataloomService {
|
|
9
|
-
|
|
10
|
-
readonly
|
|
11
|
+
/** @deprecated 见 DataloomService 注释 */
|
|
12
|
+
readonly user: unknown;
|
|
13
|
+
/** @deprecated 见 DataloomService 注释 */
|
|
14
|
+
readonly session: unknown;
|
|
11
15
|
constructor(options: DataloomServiceOptions);
|
|
12
16
|
}
|
|
13
|
-
export type { AccountServicesInjection
|
|
17
|
+
export type { AccountServicesInjection };
|
|
14
18
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
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"}
|
package/lib/service/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const MIGRATION_HINT = "[dataloom] service.user / service.session has moved to @lark-apaas/auth-sdk
|
|
1
|
+
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.";
|
|
2
2
|
const ALLOWED_REFLECTION_KEYS = new Set([
|
|
3
3
|
'constructor',
|
|
4
4
|
'then',
|
package/lib/service/types.d.ts
CHANGED
|
@@ -1,113 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
3
|
-
*
|
|
4
|
-
* dataloom 自身不持有 user/session 实现(已迁出至 @lark-apaas/auth-sdk),
|
|
5
|
-
* 但仍需要类型上的"形状契约"以保证:
|
|
6
|
-
* 1. DataloomService.user/session 字段对老调用方有完整类型提示;
|
|
7
|
-
* 2. client-toolkit 注入 authClient.user/session 时编译期可结构性校验。
|
|
2
|
+
* 注入到 DataloomService 的 account services 引用。
|
|
8
3
|
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
4
|
+
* dataloom v0.2.0 起,service.user/session 的实现迁出至 @lark-apaas/auth-sdk。
|
|
5
|
+
* 此接口仅定义"形状契约",不 import auth-sdk,依赖方向单向解耦。
|
|
11
6
|
*
|
|
12
|
-
* @see packages/client/auth-sdk/src/account/services/user-service/types.ts
|
|
13
|
-
* @see packages/client/auth-sdk/src/account/services/session-service/types.ts
|
|
14
|
-
*/
|
|
15
|
-
export interface AccountServiceError {
|
|
16
|
-
code: number;
|
|
17
|
-
details: string;
|
|
18
|
-
hint: string | null;
|
|
19
|
-
message: string;
|
|
20
|
-
}
|
|
21
|
-
interface AccountServiceBase {
|
|
22
|
-
status: number;
|
|
23
|
-
statusText: string;
|
|
24
|
-
}
|
|
25
|
-
export interface AccountServiceSuccess<T> extends AccountServiceBase {
|
|
26
|
-
error: null;
|
|
27
|
-
data: T;
|
|
28
|
-
}
|
|
29
|
-
export interface AccountServiceFailure extends AccountServiceBase {
|
|
30
|
-
error: AccountServiceError;
|
|
31
|
-
data: null;
|
|
32
|
-
}
|
|
33
|
-
export type AccountServiceResponse<T> = AccountServiceSuccess<T> | AccountServiceFailure;
|
|
34
|
-
/** 与 auth-sdk UserStatus 对齐:1 = active / 2 = inactive */
|
|
35
|
-
export type UserStatus = 1 | 2;
|
|
36
|
-
export interface User {
|
|
37
|
-
user_id: string;
|
|
38
|
-
email: string;
|
|
39
|
-
name: string;
|
|
40
|
-
avatar: string;
|
|
41
|
-
status: UserStatus;
|
|
42
|
-
}
|
|
43
|
-
export interface SearchParams {
|
|
44
|
-
name: string;
|
|
45
|
-
pageSize?: number;
|
|
46
|
-
}
|
|
47
|
-
export interface UserResponse {
|
|
48
|
-
user_list: User[];
|
|
49
|
-
}
|
|
50
|
-
/**
|
|
51
|
-
* 用户服务形状契约(与 auth-sdk `UserService` public 方法对齐)。
|
|
52
|
-
*/
|
|
53
|
-
export interface UserServiceShape {
|
|
54
|
-
search(params: SearchParams): Promise<AccountServiceResponse<UserResponse>>;
|
|
55
|
-
getByIds(ids: string[] | number[]): Promise<AccountServiceResponse<UserResponse>>;
|
|
56
|
-
}
|
|
57
|
-
export interface I18n {
|
|
58
|
-
language_code: number;
|
|
59
|
-
text: string;
|
|
60
|
-
}
|
|
61
|
-
export type I18ns = I18n[];
|
|
62
|
-
export interface Avatar {
|
|
63
|
-
source?: string;
|
|
64
|
-
image?: {
|
|
65
|
-
large?: string;
|
|
66
|
-
};
|
|
67
|
-
color?: string;
|
|
68
|
-
}
|
|
69
|
-
export interface UserBaseInfo {
|
|
70
|
-
user_id?: number;
|
|
71
|
-
name?: I18ns;
|
|
72
|
-
avatar?: Avatar;
|
|
73
|
-
email?: string;
|
|
74
|
-
phone_number?: string;
|
|
75
|
-
tenant_name?: string;
|
|
76
|
-
}
|
|
77
|
-
export interface UserInfoResponse {
|
|
78
|
-
user_info?: UserBaseInfo;
|
|
79
|
-
}
|
|
80
|
-
export interface SignInRedirectionOptions {
|
|
81
|
-
/** The URL to redirect to after a successful login. Defaults to the current URL. */
|
|
82
|
-
returnUrl?: string;
|
|
83
|
-
/** Whether to open the login page in a new tab. Defaults to `false`. */
|
|
84
|
-
newTab?: boolean;
|
|
85
|
-
}
|
|
86
|
-
export interface NavigateToUserProfileOptions {
|
|
87
|
-
newTab?: boolean;
|
|
88
|
-
}
|
|
89
|
-
/**
|
|
90
|
-
* 会话服务形状契约(与 auth-sdk `SessionService` public 方法对齐)。
|
|
91
|
-
*
|
|
92
|
-
* 注意:`redirectToLogin` / `navigateToUserProfile` 的成功分支在 auth-sdk
|
|
93
|
-
* 实现中返回 `data: 'success'`;但其中 `navigateToUserProfile` 未显式标注
|
|
94
|
-
* 返回类型,TS 会把字面量推断为 `string`。为了让 auth-sdk 的实例可结构性
|
|
95
|
-
* 赋值到本契约,这里成功分支用 `string` 而非 `'success'` 字面量。
|
|
96
|
-
*/
|
|
97
|
-
export interface SessionServiceShape {
|
|
98
|
-
redirectToLogin(options?: SignInRedirectionOptions): AccountServiceResponse<string>;
|
|
99
|
-
signOut(): Promise<AccountServiceResponse<null>>;
|
|
100
|
-
getUrlWithBizSource(): string;
|
|
101
|
-
getUserInfo(): Promise<AccountServiceResponse<UserInfoResponse>>;
|
|
102
|
-
navigateToUserProfile(options?: NavigateToUserProfileOptions): AccountServiceResponse<string>;
|
|
103
|
-
}
|
|
104
|
-
/**
|
|
105
|
-
* 注入到 DataloomService 的 account services 引用。
|
|
106
7
|
* 由 client-toolkit 在创建 DataloomClient 时通过 options.global.accountServices 注入。
|
|
107
8
|
*/
|
|
108
9
|
export interface AccountServicesInjection {
|
|
109
|
-
user:
|
|
110
|
-
session:
|
|
10
|
+
user: unknown;
|
|
11
|
+
session: unknown;
|
|
111
12
|
}
|
|
112
|
-
export {};
|
|
113
13
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/service/types.ts"],"names":[],"mappings":"AAAA
|
|
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"}
|
|
@@ -8,6 +8,10 @@ export interface StorageClientOptions {
|
|
|
8
8
|
onRequestError: (error: OnRequestErrorType) => void;
|
|
9
9
|
}
|
|
10
10
|
export declare class StorageClient {
|
|
11
|
+
/**
|
|
12
|
+
* Storage 网关前缀,形如 `/app/${appId}/__runtime__/api/v1/storage`,
|
|
13
|
+
* 浏览器同源 + cookie 鉴权。
|
|
14
|
+
*/
|
|
11
15
|
protected url: string;
|
|
12
16
|
protected headers: {
|
|
13
17
|
[key: string]: string;
|
|
@@ -1 +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,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"}
|
|
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"}
|
|
@@ -9,7 +9,7 @@ export declare const recursiveToCamel: (item: Record<string, unknown>) => unknow
|
|
|
9
9
|
* source: https://github.com/sindresorhus/is-plain-obj
|
|
10
10
|
*/
|
|
11
11
|
export declare const isPlainObject: (value: object) => boolean;
|
|
12
|
-
export declare const getUpdateFileSize: (file: FileBody) =>
|
|
12
|
+
export declare const getUpdateFileSize: (file: FileBody) => number;
|
|
13
13
|
export declare const toValidExpiresIn: (expiresIn: number) => number;
|
|
14
14
|
export declare const transformFilePayload: (file: Record<string, unknown> | null | undefined) => FileObject;
|
|
15
15
|
export declare const sanitizeFileName: (fileName: string) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/storage/libs/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAIpD,KAAK,KAAK,GAAG,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEjF,eAAO,MAAM,YAAY,GAAI,cAAc,KAAK,KAAG,KAQlD,CAAC;AAEF,eAAO,MAAM,eAAe,QAAa,OAAO,CAAC,OAAO,QAAQ,CAE/D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAG,OAmBhE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,KAAG,OAa7C,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,MAAM,QAAQ,KAAG,MAqBlD,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,WAAW,MAAM,WAQjD,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/storage/libs/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAIpD,KAAK,KAAK,GAAG,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEjF,eAAO,MAAM,YAAY,GAAI,cAAc,KAAK,KAAG,KAQlD,CAAC;AAEF,eAAO,MAAM,eAAe,QAAa,OAAO,CAAC,OAAO,QAAQ,CAE/D,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAG,OAmBhE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,OAAO,MAAM,KAAG,OAa7C,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,MAAM,QAAQ,KAAG,MAqBlD,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,WAAW,MAAM,WAQjD,CAAC;AAkBF,eAAO,MAAM,oBAAoB,GAC/B,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,GAAG,SAAS,KAC/C,UAgDF,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,UAAU,MAAM,WAMhD,CAAC;AAKF,eAAO,MAAM,oBAAoB,GAAI,KAAK,MAAM,YAE/C,CAAC"}
|
|
@@ -21,43 +21,59 @@ const isPlainObject = (value)=>{
|
|
|
21
21
|
return (null === prototype || prototype === Object.prototype || null === Object.getPrototypeOf(prototype)) && !(Symbol.toStringTag in value) && !(Symbol.iterator in value);
|
|
22
22
|
};
|
|
23
23
|
const getUpdateFileSize = (file)=>{
|
|
24
|
-
if ('undefined' != typeof File && file instanceof File) return file.size
|
|
25
|
-
if (file instanceof Blob) return file.size
|
|
26
|
-
if (file instanceof URLSearchParams) return file.size
|
|
27
|
-
if ('string' == typeof file) return file.length
|
|
28
|
-
if (ArrayBuffer.isView(file)) return file.byteLength
|
|
29
|
-
if (file instanceof ArrayBuffer) return file.byteLength
|
|
30
|
-
return
|
|
24
|
+
if ('undefined' != typeof File && file instanceof File) return file.size;
|
|
25
|
+
if (file instanceof Blob) return file.size;
|
|
26
|
+
if (file instanceof URLSearchParams) return file.size;
|
|
27
|
+
if ('string' == typeof file) return file.length;
|
|
28
|
+
if (ArrayBuffer.isView(file)) return file.byteLength;
|
|
29
|
+
if (file instanceof ArrayBuffer) return file.byteLength;
|
|
30
|
+
return 0;
|
|
31
31
|
};
|
|
32
32
|
const toValidExpiresIn = (expiresIn)=>{
|
|
33
33
|
if (expiresIn < 1) return 1;
|
|
34
34
|
if (expiresIn > THIRTY_DAYS_IN_SECONDS) return THIRTY_DAYS_IN_SECONDS;
|
|
35
35
|
return expiresIn;
|
|
36
36
|
};
|
|
37
|
+
const pickUserId = (user)=>{
|
|
38
|
+
if (!user) return '';
|
|
39
|
+
if ('string' == typeof user) return user;
|
|
40
|
+
if ('object' == typeof user) {
|
|
41
|
+
const u = user;
|
|
42
|
+
return u.userID ?? u.user_id ?? '';
|
|
43
|
+
}
|
|
44
|
+
return '';
|
|
45
|
+
};
|
|
37
46
|
const transformFilePayload = (file)=>{
|
|
38
47
|
const safeFile = file ?? {};
|
|
39
|
-
const
|
|
48
|
+
const bucketID = safeFile.bucketID ?? safeFile.bucket_id ?? '';
|
|
49
|
+
const createdAt = safeFile.createdAt ?? safeFile.created_at ?? '';
|
|
50
|
+
const updatedAt = safeFile.updatedAt ?? safeFile.updated_at ?? '';
|
|
51
|
+
const lastAccessedAt = safeFile.lastAccessedAt ?? safeFile.last_accessed_at;
|
|
52
|
+
const createdBy = pickUserId(safeFile.createdBy ?? safeFile.created_by);
|
|
53
|
+
const updatedBy = pickUserId(safeFile.updatedBy ?? safeFile.updated_by);
|
|
54
|
+
const owner = createdBy;
|
|
55
|
+
const buckets = safeFile.bucket ?? safeFile.buckets ?? {};
|
|
40
56
|
return {
|
|
41
57
|
name: safeFile.name ?? '',
|
|
42
|
-
bucket_id:
|
|
43
|
-
owner
|
|
58
|
+
bucket_id: bucketID,
|
|
59
|
+
owner,
|
|
44
60
|
id: safeFile.id ?? '',
|
|
45
|
-
updated_at:
|
|
46
|
-
created_at:
|
|
47
|
-
created_by:
|
|
48
|
-
updated_by:
|
|
49
|
-
last_accessed_at:
|
|
61
|
+
updated_at: updatedAt,
|
|
62
|
+
created_at: createdAt,
|
|
63
|
+
created_by: createdBy,
|
|
64
|
+
updated_by: updatedBy,
|
|
65
|
+
last_accessed_at: lastAccessedAt,
|
|
50
66
|
metadata: safeFile.metadata ?? {},
|
|
51
67
|
buckets: {
|
|
52
|
-
allowed_mime_types: buckets
|
|
53
|
-
created_at: buckets
|
|
54
|
-
file_size_limit: buckets
|
|
55
|
-
id: buckets
|
|
56
|
-
name: buckets
|
|
57
|
-
public: buckets
|
|
58
|
-
updated_at: buckets
|
|
59
|
-
updated_by: buckets
|
|
60
|
-
owner: buckets
|
|
68
|
+
allowed_mime_types: buckets.allowedMimeTypes ?? buckets.allowed_mime_types ?? [],
|
|
69
|
+
created_at: buckets.createdAt ?? buckets.created_at ?? '',
|
|
70
|
+
file_size_limit: buckets.fileSizeLimit ?? buckets.file_size_limit ?? 0,
|
|
71
|
+
id: buckets.id ?? '',
|
|
72
|
+
name: buckets.name ?? '',
|
|
73
|
+
public: buckets.public ?? false,
|
|
74
|
+
updated_at: buckets.updatedAt ?? buckets.updated_at ?? '',
|
|
75
|
+
updated_by: pickUserId(buckets.updatedBy ?? buckets.updated_by),
|
|
76
|
+
owner: pickUserId(buckets.createdBy ?? buckets.created_by)
|
|
61
77
|
}
|
|
62
78
|
};
|
|
63
79
|
};
|
|
@@ -114,14 +114,16 @@ export interface FileOptionsV2 {
|
|
|
114
114
|
*/
|
|
115
115
|
contentDisposition?: string;
|
|
116
116
|
}
|
|
117
|
+
/**
|
|
118
|
+
* pre_upload 请求体(按 §5.1 规范,驼峰)。
|
|
119
|
+
* 注意:bucketId 已在 path 段提供,不重复传;contentDisposition 不在规范字段内。
|
|
120
|
+
*/
|
|
117
121
|
export interface PreUploadBody {
|
|
118
|
-
|
|
119
|
-
file_size: string;
|
|
122
|
+
fileSize: number;
|
|
120
123
|
upsert?: boolean;
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
file_name?: string;
|
|
124
|
+
filePath?: string;
|
|
125
|
+
fileName?: string;
|
|
126
|
+
contentType?: string;
|
|
125
127
|
}
|
|
126
128
|
export interface DestinationOptions {
|
|
127
129
|
destinationBucket?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/storage/libs/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/storage/libs/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -178,8 +178,9 @@ export default class StorageFileApi {
|
|
|
178
178
|
private _isValidDownloadUrl;
|
|
179
179
|
/**
|
|
180
180
|
* Get the filePath from download url with format like
|
|
181
|
-
* /spark/app/app_xxxx/
|
|
182
|
-
* or /app/app_xxxx/
|
|
181
|
+
* /spark/app/app_xxxx/__runtime__/api/v1/storage/object/bucket_xxx/123%2Fimage.png
|
|
182
|
+
* or /app/app_xxxx/__runtime__/api/v1/storage/object/bucket_xxx/123%2Fimage.png
|
|
183
|
+
* (兼容历史 `/runtime/` 形态)
|
|
183
184
|
*/
|
|
184
185
|
private _retrieveFilePathFromDownloadUrl;
|
|
185
186
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageFileApi.d.ts","sourceRoot":"","sources":["../../../src/storage/packages/StorageFileApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EAEb,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,KAAK,EAA0B,MAAM,eAAe,CAAC;AASnE,OAAO,KAAK,EACV,eAAe,EACf,QAAQ,EACR,UAAU,EACV,WAAW,EACX,aAAa,EACb,kBAAkB,EAElB,aAAa,EACb,gBAAgB,EAChB,cAAc,EACf,MAAM,eAAe,CAAC;AAqDvB,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC5B,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,QAAQ,CAAC,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,KAAK,EACb,aAAa,CAAC,EAAE,OAAO,EACvB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI;IAWtD;;;;;;OAMG;YACW,cAAc;
|
|
1
|
+
{"version":3,"file":"StorageFileApi.d.ts","sourceRoot":"","sources":["../../../src/storage/packages/StorageFileApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,11 +33,13 @@ class StorageFileApi {
|
|
|
33
33
|
if (options?.contentDisposition) contentDisposition = options?.contentDisposition;
|
|
34
34
|
else if (fileBody instanceof File) contentDisposition = fileBody?.name;
|
|
35
35
|
const preUploadBody = {
|
|
36
|
-
|
|
37
|
-
file_size: getUpdateFileSize(fileBody),
|
|
36
|
+
fileSize: getUpdateFileSize(fileBody),
|
|
38
37
|
upsert: options.upsert ?? false,
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
filePath: cleanPath,
|
|
39
|
+
fileName: fileBody instanceof File ? fileBody?.name : '',
|
|
40
|
+
...options.contentType ? {
|
|
41
|
+
contentType: options.contentType
|
|
42
|
+
} : {}
|
|
41
43
|
};
|
|
42
44
|
const res = await post(this.fetch, `${this.url}/object/${this.bucketId}/pre_upload`, preUploadBody, {
|
|
43
45
|
headers: this.headers,
|
|
@@ -46,17 +48,17 @@ class StorageFileApi {
|
|
|
46
48
|
}, void 0, {
|
|
47
49
|
psmName: 'Storage.Upload.PreUpload'
|
|
48
50
|
});
|
|
49
|
-
const {
|
|
50
|
-
if (!
|
|
51
|
+
const { uploadID, uploadUrl } = res?.data ?? {};
|
|
52
|
+
if (!uploadUrl || !uploadID) return {
|
|
51
53
|
data: null,
|
|
52
|
-
error: new StorageError('
|
|
54
|
+
error: new StorageError('uploadUrl or uploadID is empty')
|
|
53
55
|
};
|
|
54
56
|
{
|
|
55
57
|
const tosHeaders = {};
|
|
56
58
|
if (contentDisposition) tosHeaders['content-disposition'] = `attachment; filename="${sanitizeFileName(contentDisposition)}"`;
|
|
57
59
|
if (options.cacheControl || 0 === options.cacheControl) tosHeaders['cache-control'] = `max-age=${options.cacheControl}`;
|
|
58
60
|
if (options.contentType) tosHeaders['content-type'] = options.contentType;
|
|
59
|
-
const tosRes = await put(this.fetch,
|
|
61
|
+
const tosRes = await put(this.fetch, uploadUrl, fileBody, {
|
|
60
62
|
noResolveJson: true,
|
|
61
63
|
headers: tosHeaders,
|
|
62
64
|
logFetch: this.loggerEnabled,
|
|
@@ -66,9 +68,8 @@ class StorageFileApi {
|
|
|
66
68
|
});
|
|
67
69
|
const etag = tosRes?.headers?.get('Etag') ?? '';
|
|
68
70
|
const callbackRes = await post(this.fetch, `${this.url}/object/callback`, {
|
|
69
|
-
|
|
70
|
-
etag
|
|
71
|
-
app_id: this.appId
|
|
71
|
+
uploadID,
|
|
72
|
+
eTag: etag
|
|
72
73
|
}, {
|
|
73
74
|
headers: this.headers,
|
|
74
75
|
logFetch: this.loggerEnabled,
|
|
@@ -76,12 +77,13 @@ class StorageFileApi {
|
|
|
76
77
|
}, void 0, {
|
|
77
78
|
psmName: 'Storage.Upload.Callback'
|
|
78
79
|
});
|
|
80
|
+
const vo = callbackRes?.data ?? {};
|
|
79
81
|
return {
|
|
80
|
-
data:
|
|
81
|
-
id: '',
|
|
82
|
-
file_path: '',
|
|
83
|
-
bucket_id: '',
|
|
84
|
-
download_url: ''
|
|
82
|
+
data: {
|
|
83
|
+
id: vo.id ?? '',
|
|
84
|
+
file_path: vo.filePath ?? vo.file_path ?? '',
|
|
85
|
+
bucket_id: vo.bucketID ?? vo.bucket_id ?? '',
|
|
86
|
+
download_url: vo.downloadURL ?? vo.download_url ?? ''
|
|
85
87
|
},
|
|
86
88
|
error: null
|
|
87
89
|
};
|
|
@@ -113,7 +115,7 @@ class StorageFileApi {
|
|
|
113
115
|
try {
|
|
114
116
|
const _path = this._getFinalPath(path);
|
|
115
117
|
const res = await post(this.fetch, `${this.url}/object/sign/${_path}`, {
|
|
116
|
-
|
|
118
|
+
expiresIn: toValidExpiresIn(expiresIn)
|
|
117
119
|
}, {
|
|
118
120
|
headers: this.headers,
|
|
119
121
|
logFetch: this.loggerEnabled,
|
|
@@ -140,7 +142,7 @@ class StorageFileApi {
|
|
|
140
142
|
try {
|
|
141
143
|
const _paths = paths.map((path)=>this._retrieveFilePathFromDownloadUrl(path));
|
|
142
144
|
const res = await post(this.fetch, `${this.url}/object/sign/${this.bucketId}`, {
|
|
143
|
-
|
|
145
|
+
expiresIn: toValidExpiresIn(expiresIn),
|
|
144
146
|
paths: _paths
|
|
145
147
|
}, {
|
|
146
148
|
headers: this.headers,
|
|
@@ -325,7 +327,7 @@ class StorageFileApi {
|
|
|
325
327
|
}
|
|
326
328
|
}
|
|
327
329
|
generateDownloadUrlFromFilePath(filePath) {
|
|
328
|
-
return `/app/${this.appId}/
|
|
330
|
+
return `/app/${this.appId}/__runtime__/api/v1/storage/object/${this.bucketId}/${encodeURIComponent(this._removeEmptyFolders(filePath))}`;
|
|
329
331
|
}
|
|
330
332
|
encodeMetadata(metadata) {
|
|
331
333
|
return JSON.stringify(metadata);
|
|
@@ -343,7 +345,7 @@ class StorageFileApi {
|
|
|
343
345
|
return path.replace(/^\/|\/$/g, '').replace(/\/+/g, '/');
|
|
344
346
|
}
|
|
345
347
|
_isValidDownloadUrl(url) {
|
|
346
|
-
return /^(\/spark)?\/app\/app_[\w]+\/runtime\/api\/v1\/storage\/object\//.test(url);
|
|
348
|
+
return /^(\/spark)?\/app\/app_[\w]+\/(__runtime__|runtime)\/api\/v1\/storage\/object\//.test(url);
|
|
347
349
|
}
|
|
348
350
|
_retrieveFilePathFromDownloadUrl(url) {
|
|
349
351
|
if (!this._isValidDownloadUrl(url)) return url;
|
|
@@ -359,7 +361,7 @@ class StorageFileApi {
|
|
|
359
361
|
return '';
|
|
360
362
|
}
|
|
361
363
|
async _copyWithinVolcEngine(url) {
|
|
362
|
-
const res = await post(this.fetch, `${this.url}/
|
|
364
|
+
const res = await post(this.fetch, `${this.url}/object/${this.bucketId}/copy`, {
|
|
363
365
|
source: {
|
|
364
366
|
type: 'externalTOS',
|
|
365
367
|
externalURL: url
|
|
@@ -1 +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,
|
|
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"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
const logRequest = (params, psmName = 'Storage')=>{
|
|
2
2
|
const { traceId, url, method, body } = params;
|
|
3
|
-
const
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
3
|
+
const base = 'undefined' != typeof window && window.location?.origin ? window.location.origin : 'http://localhost';
|
|
4
|
+
let decodedParams = [];
|
|
5
|
+
try {
|
|
6
|
+
decodedParams = Array.from(new URL(url, base).searchParams.entries()).filter(([key])=>![
|
|
7
|
+
'count',
|
|
8
|
+
'tx',
|
|
9
|
+
'missing',
|
|
10
|
+
'resolution',
|
|
11
|
+
'column'
|
|
12
|
+
].includes(key)).map(([key, value])=>`${key}=${value}`);
|
|
13
|
+
} catch {}
|
|
10
14
|
console.log(`[Dataloom][${psmName}][Request]`, 'trace id:', traceId, 'method:', method, 'params:', decodedParams.join(','), 'body:', body);
|
|
11
15
|
};
|
|
12
16
|
const logResponse = (traceId, response, psmName = 'Storage')=>{
|
package/lib/utils/constants.d.ts
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `X-Suda-Csrf-Token`(CSRF 防护)由调用方在初始化 client 时通过
|
|
3
|
+
* `options.global.headers` 注入,避免本包反向依赖上游的 `getCsrfToken`。
|
|
4
|
+
*/
|
|
1
5
|
export declare const DEFAULT_HEADERS: Record<string, string>;
|
|
2
6
|
export declare const DEFAULT_GLOBAL_OPTIONS: {
|
|
3
7
|
headers: Record<string, string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"
|
|
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"}
|
package/lib/utils/constants.js
CHANGED
|
@@ -2,27 +2,8 @@ import { isBrowser } from "./helpers.js";
|
|
|
2
2
|
import { version } from "./version.js";
|
|
3
3
|
let JS_ENV = '';
|
|
4
4
|
JS_ENV = 'undefined' != typeof Deno ? 'deno' : 'undefined' != typeof document ? 'web' : 'undefined' != typeof navigator && 'ReactNative' === navigator.product ? 'react-native' : 'node';
|
|
5
|
-
const getToken = ()=>{
|
|
6
|
-
if (!isBrowser()) return '';
|
|
7
|
-
const host = window.location.host.replace(/\./g, '-');
|
|
8
|
-
const urlParams = new URLSearchParams(window.location.search);
|
|
9
|
-
const token = urlParams.get('suda_token');
|
|
10
|
-
if (token) {
|
|
11
|
-
localStorage.setItem(`suda_token_${host}`, `${token}`);
|
|
12
|
-
const url = new URL(window.location.href);
|
|
13
|
-
const params = new URLSearchParams(url.search);
|
|
14
|
-
params.delete('suda_token');
|
|
15
|
-
url.search = params.toString();
|
|
16
|
-
history.replaceState(null, '', url.toString());
|
|
17
|
-
return token;
|
|
18
|
-
}
|
|
19
|
-
const localToken = localStorage.getItem(`suda_token_${host}`);
|
|
20
|
-
if (localToken) return localToken;
|
|
21
|
-
return '';
|
|
22
|
-
};
|
|
23
5
|
const DEFAULT_HEADERS = {
|
|
24
6
|
'X-Client-Info': `dataloom-js-${JS_ENV}/${version}`,
|
|
25
|
-
'X-Suda-Token': getToken(),
|
|
26
7
|
'X-Suda-Referer': isBrowser() ? window.location.href : ''
|
|
27
8
|
};
|
|
28
9
|
const DEFAULT_GLOBAL_OPTIONS = {
|
package/lib/utils/fetch.d.ts
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import type RateLimiter from '../RateLimiter';
|
|
2
2
|
import type { Fetch } from './types';
|
|
3
3
|
export declare const resolveFetch: (customFetch?: Fetch) => Fetch;
|
|
4
|
-
|
|
4
|
+
/**
|
|
5
|
+
* 同源 cookie 鉴权下的 fetch 包装:
|
|
6
|
+
* - 默认注入 `credentials: 'include'`,保证浏览器自动携带 session cookie;
|
|
7
|
+
* 若调用方显式传入 `'omit'` / `'same-origin'`,遵循其值(兜底逻辑只在缺省时生效)。
|
|
8
|
+
* - 保留 RateLimiter 的 429 短路能力。
|
|
9
|
+
*/
|
|
10
|
+
export declare const withCredentialsFetch: (rateLimiter?: RateLimiter, customFetch?: Fetch) => Fetch;
|
|
5
11
|
//# sourceMappingURL=fetch.d.ts.map
|
package/lib/utils/fetch.d.ts.map
CHANGED
|
@@ -1 +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,eAAO,MAAM,
|
|
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"}
|
package/lib/utils/fetch.js
CHANGED
|
@@ -3,19 +3,18 @@ const resolveFetch = (customFetch)=>{
|
|
|
3
3
|
_fetch = customFetch ? customFetch : fetch;
|
|
4
4
|
return (input, init)=>_fetch(input, init);
|
|
5
5
|
};
|
|
6
|
-
const
|
|
6
|
+
const withCredentialsFetch = (rateLimiter, customFetch)=>{
|
|
7
7
|
const resolvedFetch = resolveFetch(customFetch);
|
|
8
8
|
return async (input, init)=>{
|
|
9
9
|
if (rateLimiter && !rateLimiter.canRequest()) return Promise.resolve(new Response(`{"limit": ${rateLimiter.maxRequests}}`, {
|
|
10
10
|
status: 429,
|
|
11
11
|
statusText: 'Too Many Requests'
|
|
12
12
|
}));
|
|
13
|
-
const
|
|
14
|
-
if (!headers.has('apikey') && dataloomKey) headers.set('apikey', dataloomKey);
|
|
13
|
+
const credentials = init?.credentials ?? 'include';
|
|
15
14
|
return resolvedFetch(input, {
|
|
16
15
|
...init,
|
|
17
|
-
|
|
16
|
+
credentials
|
|
18
17
|
});
|
|
19
18
|
};
|
|
20
19
|
};
|
|
21
|
-
export {
|
|
20
|
+
export { resolveFetch, withCredentialsFetch };
|
package/lib/utils/types.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { AccountServicesInjection } from '../service/types';
|
|
2
1
|
export type Fetch = (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
|
|
3
2
|
export type OnError = (error: unknown, instance: unknown) => void;
|
|
4
3
|
export type DataloomClientOptions = {
|
|
@@ -33,13 +32,17 @@ export type DataloomClientOptions = {
|
|
|
33
32
|
onError?: OnError;
|
|
34
33
|
/**
|
|
35
34
|
* 由 client-toolkit 注入的 account services 引用(user/session)。
|
|
35
|
+
* dataloom v0.2.0 起,service.user/session 的实现迁出至 @lark-apaas/auth-sdk;
|
|
36
36
|
* 老调用方式 `(await getDataloom()).service.user/session` 仍可用,但底层实例由本字段提供。
|
|
37
37
|
*
|
|
38
38
|
* 直接构造 DataloomClient(不通过 toolkit)时若未传此字段,访问 service.user/session 会抛错并指向迁移文档。
|
|
39
39
|
*
|
|
40
40
|
* @see docs/superpowers/specs/2026-05-13-auth-sdk-account-services-split-design.md §4.4
|
|
41
41
|
*/
|
|
42
|
-
accountServices?:
|
|
42
|
+
accountServices?: {
|
|
43
|
+
user: unknown;
|
|
44
|
+
session: unknown;
|
|
45
|
+
};
|
|
43
46
|
};
|
|
44
47
|
};
|
|
45
48
|
//# sourceMappingURL=types.d.ts.map
|
package/lib/utils/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA,
|
|
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"}
|