@data-loom/service-js 0.4.7 → 0.4.9-alpha.1
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/dist/main/services/DataloomServiceBase.d.ts +1 -0
- package/dist/main/services/DataloomServiceBase.d.ts.map +1 -1
- package/dist/main/services/DataloomServiceBase.js +1 -0
- package/dist/main/services/DataloomServiceBase.js.map +1 -1
- package/dist/main/services/session-service/index.d.ts +4 -0
- package/dist/main/services/session-service/index.d.ts.map +1 -1
- package/dist/main/services/session-service/index.js +56 -20
- package/dist/main/services/session-service/index.js.map +1 -1
- package/dist/main/services/user-service/index.js +2 -2
- package/dist/main/services/user-service/index.js.map +1 -1
- package/dist/main/utils/logger.d.ts.map +1 -1
- package/dist/main/utils/logger.js +4 -3
- package/dist/main/utils/logger.js.map +1 -1
- package/dist/module/services/DataloomServiceBase.d.ts +1 -0
- package/dist/module/services/DataloomServiceBase.d.ts.map +1 -1
- package/dist/module/services/DataloomServiceBase.js +1 -0
- package/dist/module/services/DataloomServiceBase.js.map +1 -1
- package/dist/module/services/session-service/index.d.ts +4 -0
- package/dist/module/services/session-service/index.d.ts.map +1 -1
- package/dist/module/services/session-service/index.js +56 -20
- package/dist/module/services/session-service/index.js.map +1 -1
- package/dist/module/services/user-service/index.js +2 -2
- package/dist/module/services/user-service/index.js.map +1 -1
- package/dist/module/utils/logger.d.ts.map +1 -1
- package/dist/module/utils/logger.js +4 -3
- package/dist/module/utils/logger.js.map +1 -1
- package/package.json +3 -3
|
@@ -8,6 +8,7 @@ export default abstract class DataloomServiceBase {
|
|
|
8
8
|
protected logger: boolean;
|
|
9
9
|
protected serviceName: ServiceName;
|
|
10
10
|
protected brandId: string;
|
|
11
|
+
protected bizSource: string;
|
|
11
12
|
protected appId: string;
|
|
12
13
|
protected onRequestError?: (error: OnRequestErrorType) => void;
|
|
13
14
|
constructor(baseUrl: string, options: DataloomServiceOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataloomServiceBase.d.ts","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,sBAAsB,EACtB,KAAK,EACL,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,kBAAkB,EAClB,SAAS,EACV,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,mBAAmB;IAC/C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;gBAEnD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB;
|
|
1
|
+
{"version":3,"file":"DataloomServiceBase.d.ts","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,sBAAsB,EACtB,KAAK,EACL,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,kBAAkB,EAClB,SAAS,EACV,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,mBAAmB;IAC/C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;gBAEnD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB;IAmBtD,SAAS,CAAC,CAAC,EACf,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;CAsIvC"}
|
|
@@ -17,6 +17,7 @@ class DataloomServiceBase {
|
|
|
17
17
|
this.logger = (_a = options.logger) !== null && _a !== void 0 ? _a : false;
|
|
18
18
|
this.serviceName = types_1.ServiceName.DEFAULT;
|
|
19
19
|
this.brandId = (0, helpers_1.serializeSessionBrandId)(options.brandName);
|
|
20
|
+
this.bizSource = options.brandName;
|
|
20
21
|
this.appId = options.appId;
|
|
21
22
|
this.onRequestError = options.onRequestError;
|
|
22
23
|
if (options.fetch) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataloomServiceBase.js","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":";;;;;AAAA,aAAa;AACb,uEAA8C;AAE9C,gDAAqD;AACrD,4CAA0D;AAC1D,8CAA4E;AAC5E,0CAQwB;AAExB,MAA8B,mBAAmB;
|
|
1
|
+
{"version":3,"file":"DataloomServiceBase.js","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,10 @@ export default class SessionService extends DataloomServiceBase {
|
|
|
12
12
|
* Sign out current user session.
|
|
13
13
|
*/
|
|
14
14
|
signOut(): Promise<DataloomServiceResponse<null>>;
|
|
15
|
+
/**
|
|
16
|
+
* Get current page URL with biz_source parameter
|
|
17
|
+
*/
|
|
18
|
+
getUrlWithBizSource(): string;
|
|
15
19
|
/**
|
|
16
20
|
* Gets the current user information if there is an existing session.
|
|
17
21
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAiB,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAgBjE,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB;IACpD,WAAW,cAA8B;IAElD;;OAEG;IACH,eAAe,CAAC,OAAO,CAAC,EAAE,wBAAwB,GAAG,uBAAuB,CAAC,SAAS,CAAC;IAiCvF;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAmBvD;;OAEG;IACH,mBAAmB,IAAI,MAAM;IAa7B;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAkDvE;;OAEG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;;;;;;;;;;;;;;;;CA0BrD"}
|
|
@@ -31,8 +31,13 @@ class SessionService extends DataloomServiceBase_1.default {
|
|
|
31
31
|
return browserEnvError;
|
|
32
32
|
}
|
|
33
33
|
const { returnUrl, newTab = false } = options !== null && options !== void 0 ? options : {};
|
|
34
|
-
const encodedRedirectUrl = encodeURIComponent(returnUrl || window.location.href);
|
|
35
|
-
|
|
34
|
+
const encodedRedirectUrl = encodeURIComponent(decodeURIComponent(returnUrl || window.location.href));
|
|
35
|
+
// 根据当前页面路径判断是否需要添加 /spark/faas 前缀
|
|
36
|
+
const isSparkFaasPath = window.location.pathname.startsWith('/spark/faas');
|
|
37
|
+
const baseLoginUrl = isSparkFaasPath
|
|
38
|
+
? `/spark/faas/${this.appId}/runtime/page/login`
|
|
39
|
+
: `/faas/${this.appId}/runtime/page/login`;
|
|
40
|
+
const loginPageUrl = `${baseLoginUrl}?biz_source=${this.bizSource}&redirect_uri=${encodedRedirectUrl}`;
|
|
36
41
|
if (newTab) {
|
|
37
42
|
window.open(loginPageUrl, '_blank');
|
|
38
43
|
}
|
|
@@ -54,32 +59,63 @@ class SessionService extends DataloomServiceBase_1.default {
|
|
|
54
59
|
console.log('[Dataloom][SessionService.SignOut] dataloom.service.session.signOut can only be invoked in browser environment.');
|
|
55
60
|
return browserEnvError;
|
|
56
61
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
62
|
+
const location = this.getUrlWithBizSource();
|
|
63
|
+
return this.fetchData('/runtime/api/v1/account/logout', {
|
|
64
|
+
method: 'POST',
|
|
65
|
+
body: {
|
|
66
|
+
redirectURI: location,
|
|
67
|
+
},
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
/**
|
|
71
|
+
* Get current page URL with biz_source parameter
|
|
72
|
+
*/
|
|
73
|
+
getUrlWithBizSource() {
|
|
74
|
+
if (!(0, helpers_1.isBrowser)()) {
|
|
75
|
+
console.log('[Dataloom][SessionService.GetUrlWithBizSource] dataloom.service.session.getUrlWithBizSource can only be invoked in browser environment.');
|
|
76
|
+
return '';
|
|
77
|
+
}
|
|
78
|
+
const currentUrl = new URL(window.location.href);
|
|
79
|
+
currentUrl.searchParams.set('biz_source', this.bizSource);
|
|
80
|
+
return currentUrl.toString();
|
|
60
81
|
}
|
|
61
82
|
/**
|
|
62
83
|
* Gets the current user information if there is an existing session.
|
|
63
84
|
*/
|
|
64
|
-
getUserInfo() {
|
|
85
|
+
async getUserInfo() {
|
|
86
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
65
87
|
if (!(0, helpers_1.isBrowser)()) {
|
|
66
88
|
console.log('[Dataloom][SessionService.GetUserInfo] dataloom.service.session.getUserInfo can only be invoked in browser environment.');
|
|
67
89
|
return Promise.resolve(browserEnvError);
|
|
68
90
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
91
|
+
const url = `/app/${this.appId}/runtime/api/v1/account/login/user?biz_source=${this.bizSource}`;
|
|
92
|
+
// Get tenantDomainName from current URL hostname
|
|
93
|
+
const urlObj = new URL(globalThis.location.href);
|
|
94
|
+
const pathSegments = urlObj.hostname.split('.');
|
|
95
|
+
const tenantDomainName = (_a = pathSegments[0]) !== null && _a !== void 0 ? _a : '';
|
|
96
|
+
const response = await this.fetchData(url, {
|
|
97
|
+
method: 'POST',
|
|
98
|
+
body: {
|
|
99
|
+
appID: this.appId,
|
|
100
|
+
tenantDomainName,
|
|
101
|
+
},
|
|
102
|
+
});
|
|
103
|
+
// 字段映射 - 确保包含所有必需的响应属性
|
|
104
|
+
const userInfoResponse = {
|
|
105
|
+
data: {
|
|
106
|
+
user_info: {
|
|
107
|
+
user_id: (_c = (_b = response.data) === null || _b === void 0 ? void 0 : _b.userInfo) === null || _c === void 0 ? void 0 : _c.userID,
|
|
108
|
+
name: (_e = (_d = response.data) === null || _d === void 0 ? void 0 : _d.userInfo) === null || _e === void 0 ? void 0 : _e.name,
|
|
109
|
+
avatar: (_g = (_f = response.data) === null || _f === void 0 ? void 0 : _f.userInfo) === null || _g === void 0 ? void 0 : _g.avatar,
|
|
110
|
+
email: (_j = (_h = response.data) === null || _h === void 0 ? void 0 : _h.userInfo) === null || _j === void 0 ? void 0 : _j.email,
|
|
111
|
+
phone_number: (_l = (_k = response.data) === null || _k === void 0 ? void 0 : _k.userInfo) === null || _l === void 0 ? void 0 : _l.desensitizedPhoneNumber,
|
|
112
|
+
},
|
|
113
|
+
},
|
|
114
|
+
error: null,
|
|
115
|
+
status: response.status,
|
|
116
|
+
statusText: response.statusText,
|
|
117
|
+
};
|
|
118
|
+
return userInfoResponse;
|
|
83
119
|
}
|
|
84
120
|
/**
|
|
85
121
|
* Navigate to user profile page within app runtime environment.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":";;;;;AAAA,iFAAyD;AACzD,6CAAgD;AAIhD,iDAAgD;AAEhD,MAAM,eAAe,GAAG;IACtB,IAAI,EAAE,IAAI;IACV,KAAK,EAAE;QACL,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,kCAAkC;QAC3C,IAAI,EAAE,qDAAqD;QAC3D,OAAO,EAAE,yDAAyD;KACnE;IACD,MAAM,EAAE,GAAG;IACX,UAAU,EAAE,aAAa;CAC1B,CAAC;AAEF,MAAqB,cAAe,SAAQ,6BAAmB;IAA/D;;QACW,gBAAW,GAAG,mBAAW,CAAC,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ class UserService extends DataloomServiceBase_1.default {
|
|
|
14
14
|
async search(params) {
|
|
15
15
|
var _a, _b, _c;
|
|
16
16
|
const { name, pageSize } = params;
|
|
17
|
-
const res = await this.fetchData(`/
|
|
17
|
+
const res = await this.fetchData(`/app/${this.appId}/__runtime__/api/v1/account/search_user`, {
|
|
18
18
|
method: 'POST',
|
|
19
19
|
body: {
|
|
20
20
|
query: name,
|
|
@@ -38,7 +38,7 @@ class UserService extends DataloomServiceBase_1.default {
|
|
|
38
38
|
} });
|
|
39
39
|
}
|
|
40
40
|
async getByIds(ids) {
|
|
41
|
-
const res = await this.fetchData(`/
|
|
41
|
+
const res = await this.fetchData(`/app/${this.appId}/__runtime__/api/v1/account/list_users`, {
|
|
42
42
|
method: 'POST',
|
|
43
43
|
body: {
|
|
44
44
|
userIDList: ids,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":";;;;;AAAA,iFAAyD;AACzD,6CAA8E;AAE9E,iDAA8E;AAE9E,MAAqB,WAAY,SAAQ,6BAAmB;IAA5D;;QACW,gBAAW,GAAG,mBAAW,CAAC,WAAW,CAAC;IAoEjD,CAAC;IAlEC,KAAK,CAAC,MAAM,CAAC,MAAoB;;QAC/B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":";;;;;AAAA,iFAAyD;AACzD,6CAA8E;AAE9E,iDAA8E;AAE9E,MAAqB,WAAY,SAAQ,6BAAmB;IAA5D;;QACW,gBAAW,GAAG,mBAAW,CAAC,WAAW,CAAC;IAoEjD,CAAC;IAlEC,KAAK,CAAC,MAAM,CAAC,MAAoB;;QAC/B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,QAAQ,IAAI,CAAC,KAAK,yCAAyC,EAC3D;YACE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,QAAQ;aACpB;SACF,EACD,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAClC,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC;SACZ;QAED,uCACK,GAAG,KACN,IAAI,EAAE;gBACJ,SAAS,EACP,MAAA,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,QAAQ,0CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;oBAAC,OAAA,CAAC;wBACjC,MAAM,EAAE,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE;wBACzB,KAAK,EAAE,MAAA,IAAI,CAAC,KAAK,mCAAI,EAAE;wBACvB,IAAI,EAAE,MAAA,IAAA,8BAAoB,EAAC,IAAI,CAAC,IAAI,CAAC,mCAAI,EAAE;wBAC3C,MAAM,EAAE,IAAA,2BAAiB,EAAC,IAAI,CAAC,UAAU,CAAC;wBAC1C,OAAO,EAAE,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE;qBAC3B,CAAC,CAAA;iBAAA,CAAC,mCAAI,EAAE;aACZ,IACD;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAwB;QACrC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,QAAQ,IAAI,CAAC,KAAK,wCAAwC,EAC1D;YACE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,UAAU,EAAE,GAAG;aAChB;SACF,EACD,EAAE,OAAO,EAAE,sBAAsB,EAAE,CACpC,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC;SACZ;QAED,uCACK,GAAG,KACN,IAAI,EAAE;gBACJ,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;;oBACxB,MAAM,IAAI,GAAG,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,WAAW,0CAAG,EAAE,CAAC,CAAC;oBACzC,OAAO;wBACL,MAAM,EAAE,MAAA,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,0CAAE,KAAK,0CAAE,KAAK,mCAAI,EAAE;wBACxC,KAAK,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,mCAAI,EAAE;wBACxB,IAAI,EAAE,MAAA,IAAA,8BAAoB,EAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,mCAAI,EAAE;wBAC5C,MAAM,EAAE,IAAA,2BAAiB,EAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAC;wBAC3C,OAAO,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;qBACjD,CAAC;gBACJ,CAAC,CAAC;aACH,IACD;IACJ,CAAC;CACF;AArED,8BAqEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,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,WAAY,SAAS,YAAW,MAAM,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,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,WAAY,SAAS,YAAW,MAAM,SAmB5D,CAAC;AAEF,eAAO,MAAM,WAAW,YACb,MAAM,YACL;IAAE,IAAI,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC;IAAC,QAAQ,MAAM,CAAA;CAAE,YAC1C,MAAM,SA0BhB,CAAC"}
|
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.logResponse = exports.logRequest = void 0;
|
|
4
4
|
const logRequest = (params, psmName = 'Service') => {
|
|
5
5
|
const { traceId, url, method, body } = params;
|
|
6
|
-
|
|
6
|
+
// 针对相对路径补齐 URL 参数
|
|
7
|
+
const decodedParams = Array.from(new URL(url, 'http://temp.invalid').searchParams.entries())
|
|
7
8
|
.filter(([key]) => !['count', 'tx', 'missing', 'resolution', 'column'].includes(key))
|
|
8
9
|
.map(([key, value]) => `${key}=${value}`);
|
|
9
10
|
console.log(`[Dataloom][${psmName}][Request]`, 'trace id:', traceId, 'method:', method, 'params:', decodedParams.join(','), 'body:', body);
|
|
@@ -13,10 +14,10 @@ const logResponse = (traceId, response, psmName = 'Service') => {
|
|
|
13
14
|
const { data, error, status } = response;
|
|
14
15
|
const hasError = !!error;
|
|
15
16
|
if (hasError) {
|
|
16
|
-
console.error(`[Dataloom][${psmName}][Response
|
|
17
|
+
console.error(`[Dataloom][${psmName}][Response Failed]`, 'trace id:', traceId, 'statusCode:', status, 'error:', error);
|
|
17
18
|
}
|
|
18
19
|
else {
|
|
19
|
-
console.log(`[Dataloom][${psmName}][Response
|
|
20
|
+
console.log(`[Dataloom][${psmName}][Response Success]`, 'trace id:', traceId, 'statusCode:', status, 'data:', data);
|
|
20
21
|
}
|
|
21
22
|
};
|
|
22
23
|
exports.logResponse = logResponse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":";;;AASO,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,UAAkB,SAAS,EAAE,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":";;;AASO,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,UAAkB,SAAS,EAAE,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAE9C,kBAAkB;IAClB,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;SACzF,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACpF,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;IAE5C,OAAO,CAAC,GAAG,CACT,cAAc,OAAO,YAAY,EACjC,WAAW,EACX,OAAO,EACP,SAAS,EACT,MAAM,EACN,SAAS,EACT,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EACvB,OAAO,EACP,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,UAAU,cAmBrB;AAEK,MAAM,WAAW,GAAG,CACzB,OAAe,EACf,QAAmD,EACnD,UAAkB,SAAS,EAC3B,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IACzC,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC;IAEzB,IAAI,QAAQ,EAAE;QACZ,OAAO,CAAC,KAAK,CACX,cAAc,OAAO,oBAAoB,EACzC,WAAW,EACX,OAAO,EACP,aAAa,EACb,MAAM,EACN,QAAQ,EACR,KAAK,CACN,CAAC;KACH;SAAM;QACL,OAAO,CAAC,GAAG,CACT,cAAc,OAAO,qBAAqB,EAC1C,WAAW,EACX,OAAO,EACP,aAAa,EACb,MAAM,EACN,OAAO,EACP,IAAI,CACL,CAAC;KACH;AACH,CAAC,CAAC;AA7BW,QAAA,WAAW,eA6BtB"}
|
|
@@ -8,6 +8,7 @@ export default abstract class DataloomServiceBase {
|
|
|
8
8
|
protected logger: boolean;
|
|
9
9
|
protected serviceName: ServiceName;
|
|
10
10
|
protected brandId: string;
|
|
11
|
+
protected bizSource: string;
|
|
11
12
|
protected appId: string;
|
|
12
13
|
protected onRequestError?: (error: OnRequestErrorType) => void;
|
|
13
14
|
constructor(baseUrl: string, options: DataloomServiceOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataloomServiceBase.d.ts","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,sBAAsB,EACtB,KAAK,EACL,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,kBAAkB,EAClB,SAAS,EACV,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,mBAAmB;IAC/C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;gBAEnD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB;
|
|
1
|
+
{"version":3,"file":"DataloomServiceBase.d.ts","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,sBAAsB,EACtB,KAAK,EACL,YAAY,EACZ,WAAW,EACX,uBAAuB,EACvB,kBAAkB,EAClB,SAAS,EACV,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,mBAAmB;IAC/C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC;IACnC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,CAAC;gBAEnD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB;IAmBtD,SAAS,CAAC,CAAC,EACf,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;CAsIvC"}
|
|
@@ -12,6 +12,7 @@ export default class DataloomServiceBase {
|
|
|
12
12
|
this.logger = (_a = options.logger) !== null && _a !== void 0 ? _a : false;
|
|
13
13
|
this.serviceName = ServiceName.DEFAULT;
|
|
14
14
|
this.brandId = serializeSessionBrandId(options.brandName);
|
|
15
|
+
this.bizSource = options.brandName;
|
|
15
16
|
this.appId = options.appId;
|
|
16
17
|
this.onRequestError = options.onRequestError;
|
|
17
18
|
if (options.fetch) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataloomServiceBase.js","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAE9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAIL,WAAW,GAIZ,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,OAAO,OAAgB,mBAAmB;
|
|
1
|
+
{"version":3,"file":"DataloomServiceBase.js","sourceRoot":"","sources":["../../../src/services/DataloomServiceBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,10 @@ export default class SessionService extends DataloomServiceBase {
|
|
|
12
12
|
* Sign out current user session.
|
|
13
13
|
*/
|
|
14
14
|
signOut(): Promise<DataloomServiceResponse<null>>;
|
|
15
|
+
/**
|
|
16
|
+
* Get current page URL with biz_source parameter
|
|
17
|
+
*/
|
|
18
|
+
getUrlWithBizSource(): string;
|
|
15
19
|
/**
|
|
16
20
|
* Gets the current user information if there is an existing session.
|
|
17
21
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAiB,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAgBjE,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB;IACpD,WAAW,cAA8B;IAElD;;OAEG;IACH,eAAe,CAAC,OAAO,CAAC,EAAE,wBAAwB,GAAG,uBAAuB,CAAC,SAAS,CAAC;IAiCvF;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAmBvD;;OAEG;IACH,mBAAmB,IAAI,MAAM;IAa7B;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAkDvE;;OAEG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;;;;;;;;;;;;;;;;CA0BrD"}
|
|
@@ -26,8 +26,13 @@ export default class SessionService extends DataloomServiceBase {
|
|
|
26
26
|
return browserEnvError;
|
|
27
27
|
}
|
|
28
28
|
const { returnUrl, newTab = false } = options !== null && options !== void 0 ? options : {};
|
|
29
|
-
const encodedRedirectUrl = encodeURIComponent(returnUrl || window.location.href);
|
|
30
|
-
|
|
29
|
+
const encodedRedirectUrl = encodeURIComponent(decodeURIComponent(returnUrl || window.location.href));
|
|
30
|
+
// 根据当前页面路径判断是否需要添加 /spark/faas 前缀
|
|
31
|
+
const isSparkFaasPath = window.location.pathname.startsWith('/spark/faas');
|
|
32
|
+
const baseLoginUrl = isSparkFaasPath
|
|
33
|
+
? `/spark/faas/${this.appId}/runtime/page/login`
|
|
34
|
+
: `/faas/${this.appId}/runtime/page/login`;
|
|
35
|
+
const loginPageUrl = `${baseLoginUrl}?biz_source=${this.bizSource}&redirect_uri=${encodedRedirectUrl}`;
|
|
31
36
|
if (newTab) {
|
|
32
37
|
window.open(loginPageUrl, '_blank');
|
|
33
38
|
}
|
|
@@ -49,32 +54,63 @@ export default class SessionService extends DataloomServiceBase {
|
|
|
49
54
|
console.log('[Dataloom][SessionService.SignOut] dataloom.service.session.signOut can only be invoked in browser environment.');
|
|
50
55
|
return browserEnvError;
|
|
51
56
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
57
|
+
const location = this.getUrlWithBizSource();
|
|
58
|
+
return this.fetchData('/runtime/api/v1/account/logout', {
|
|
59
|
+
method: 'POST',
|
|
60
|
+
body: {
|
|
61
|
+
redirectURI: location,
|
|
62
|
+
},
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Get current page URL with biz_source parameter
|
|
67
|
+
*/
|
|
68
|
+
getUrlWithBizSource() {
|
|
69
|
+
if (!isBrowser()) {
|
|
70
|
+
console.log('[Dataloom][SessionService.GetUrlWithBizSource] dataloom.service.session.getUrlWithBizSource can only be invoked in browser environment.');
|
|
71
|
+
return '';
|
|
72
|
+
}
|
|
73
|
+
const currentUrl = new URL(window.location.href);
|
|
74
|
+
currentUrl.searchParams.set('biz_source', this.bizSource);
|
|
75
|
+
return currentUrl.toString();
|
|
55
76
|
}
|
|
56
77
|
/**
|
|
57
78
|
* Gets the current user information if there is an existing session.
|
|
58
79
|
*/
|
|
59
|
-
getUserInfo() {
|
|
80
|
+
async getUserInfo() {
|
|
81
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
60
82
|
if (!isBrowser()) {
|
|
61
83
|
console.log('[Dataloom][SessionService.GetUserInfo] dataloom.service.session.getUserInfo can only be invoked in browser environment.');
|
|
62
84
|
return Promise.resolve(browserEnvError);
|
|
63
85
|
}
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
86
|
+
const url = `/app/${this.appId}/runtime/api/v1/account/login/user?biz_source=${this.bizSource}`;
|
|
87
|
+
// Get tenantDomainName from current URL hostname
|
|
88
|
+
const urlObj = new URL(globalThis.location.href);
|
|
89
|
+
const pathSegments = urlObj.hostname.split('.');
|
|
90
|
+
const tenantDomainName = (_a = pathSegments[0]) !== null && _a !== void 0 ? _a : '';
|
|
91
|
+
const response = await this.fetchData(url, {
|
|
92
|
+
method: 'POST',
|
|
93
|
+
body: {
|
|
94
|
+
appID: this.appId,
|
|
95
|
+
tenantDomainName,
|
|
96
|
+
},
|
|
97
|
+
});
|
|
98
|
+
// 字段映射 - 确保包含所有必需的响应属性
|
|
99
|
+
const userInfoResponse = {
|
|
100
|
+
data: {
|
|
101
|
+
user_info: {
|
|
102
|
+
user_id: (_c = (_b = response.data) === null || _b === void 0 ? void 0 : _b.userInfo) === null || _c === void 0 ? void 0 : _c.userID,
|
|
103
|
+
name: (_e = (_d = response.data) === null || _d === void 0 ? void 0 : _d.userInfo) === null || _e === void 0 ? void 0 : _e.name,
|
|
104
|
+
avatar: (_g = (_f = response.data) === null || _f === void 0 ? void 0 : _f.userInfo) === null || _g === void 0 ? void 0 : _g.avatar,
|
|
105
|
+
email: (_j = (_h = response.data) === null || _h === void 0 ? void 0 : _h.userInfo) === null || _j === void 0 ? void 0 : _j.email,
|
|
106
|
+
phone_number: (_l = (_k = response.data) === null || _k === void 0 ? void 0 : _k.userInfo) === null || _l === void 0 ? void 0 : _l.desensitizedPhoneNumber,
|
|
107
|
+
},
|
|
108
|
+
},
|
|
109
|
+
error: null,
|
|
110
|
+
status: response.status,
|
|
111
|
+
statusText: response.statusText,
|
|
112
|
+
};
|
|
113
|
+
return userInfoResponse;
|
|
78
114
|
}
|
|
79
115
|
/**
|
|
80
116
|
* Navigate to user profile page within app runtime environment.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIhD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,MAAM,eAAe,GAAG;IACtB,IAAI,EAAE,IAAI;IACV,KAAK,EAAE;QACL,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,kCAAkC;QAC3C,IAAI,EAAE,qDAAqD;QAC3D,OAAO,EAAE,yDAAyD;KACnE;IACD,MAAM,EAAE,GAAG;IACX,UAAU,EAAE,aAAa;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB;IAA/D;;QACW,gBAAW,GAAG,WAAW,CAAC,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/session-service/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export default class UserService extends DataloomServiceBase {
|
|
|
9
9
|
async search(params) {
|
|
10
10
|
var _a, _b, _c;
|
|
11
11
|
const { name, pageSize } = params;
|
|
12
|
-
const res = await this.fetchData(`/
|
|
12
|
+
const res = await this.fetchData(`/app/${this.appId}/__runtime__/api/v1/account/search_user`, {
|
|
13
13
|
method: 'POST',
|
|
14
14
|
body: {
|
|
15
15
|
query: name,
|
|
@@ -33,7 +33,7 @@ export default class UserService extends DataloomServiceBase {
|
|
|
33
33
|
} });
|
|
34
34
|
}
|
|
35
35
|
async getByIds(ids) {
|
|
36
|
-
const res = await this.fetchData(`/
|
|
36
|
+
const res = await this.fetchData(`/app/${this.appId}/__runtime__/api/v1/account/list_users`, {
|
|
37
37
|
method: 'POST',
|
|
38
38
|
body: {
|
|
39
39
|
userIDList: ids,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAgC,MAAM,mBAAmB,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,mBAAmB;IAA5D;;QACW,gBAAW,GAAG,WAAW,CAAC,WAAW,CAAC;IAoEjD,CAAC;IAlEC,KAAK,CAAC,MAAM,CAAC,MAAoB;;QAC/B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/services/user-service/index.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAgC,MAAM,mBAAmB,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,mBAAmB;IAA5D;;QACW,gBAAW,GAAG,WAAW,CAAC,WAAW,CAAC;IAoEjD,CAAC;IAlEC,KAAK,CAAC,MAAM,CAAC,MAAoB;;QAC/B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,QAAQ,IAAI,CAAC,KAAK,yCAAyC,EAC3D;YACE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,QAAQ;aACpB;SACF,EACD,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAClC,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC;SACZ;QAED,uCACK,GAAG,KACN,IAAI,EAAE;gBACJ,SAAS,EACP,MAAA,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,QAAQ,0CAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;oBAAC,OAAA,CAAC;wBACjC,MAAM,EAAE,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE;wBACzB,KAAK,EAAE,MAAA,IAAI,CAAC,KAAK,mCAAI,EAAE;wBACvB,IAAI,EAAE,MAAA,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,mCAAI,EAAE;wBAC3C,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC;wBAC1C,OAAO,EAAE,MAAA,IAAI,CAAC,MAAM,mCAAI,EAAE;qBAC3B,CAAC,CAAA;iBAAA,CAAC,mCAAI,EAAE;aACZ,IACD;IACJ,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAwB;QACrC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAC9B,QAAQ,IAAI,CAAC,KAAK,wCAAwC,EAC1D;YACE,MAAM,EAAE,MAAM;YACd,IAAI,EAAE;gBACJ,UAAU,EAAE,GAAG;aAChB;SACF,EACD,EAAE,OAAO,EAAE,sBAAsB,EAAE,CACpC,CAAC;QAEF,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,GAAG,CAAC;SACZ;QAED,uCACK,GAAG,KACN,IAAI,EAAE;gBACJ,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;;oBACxB,MAAM,IAAI,GAAG,MAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,WAAW,0CAAG,EAAE,CAAC,CAAC;oBACzC,OAAO;wBACL,MAAM,EAAE,MAAA,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,0CAAE,KAAK,0CAAE,KAAK,mCAAI,EAAE;wBACxC,KAAK,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,mCAAI,EAAE;wBACxB,IAAI,EAAE,MAAA,oBAAoB,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC,mCAAI,EAAE;wBAC5C,MAAM,EAAE,iBAAiB,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAC;wBAC3C,OAAO,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,EAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;qBACjD,CAAC;gBACJ,CAAC,CAAC;aACH,IACD;IACJ,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,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,WAAY,SAAS,YAAW,MAAM,
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,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,WAAY,SAAS,YAAW,MAAM,SAmB5D,CAAC;AAEF,eAAO,MAAM,WAAW,YACb,MAAM,YACL;IAAE,IAAI,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC;IAAC,QAAQ,MAAM,CAAA;CAAE,YAC1C,MAAM,SA0BhB,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export const logRequest = (params, psmName = 'Service') => {
|
|
2
2
|
const { traceId, url, method, body } = params;
|
|
3
|
-
|
|
3
|
+
// 针对相对路径补齐 URL 参数
|
|
4
|
+
const decodedParams = Array.from(new URL(url, 'http://temp.invalid').searchParams.entries())
|
|
4
5
|
.filter(([key]) => !['count', 'tx', 'missing', 'resolution', 'column'].includes(key))
|
|
5
6
|
.map(([key, value]) => `${key}=${value}`);
|
|
6
7
|
console.log(`[Dataloom][${psmName}][Request]`, 'trace id:', traceId, 'method:', method, 'params:', decodedParams.join(','), 'body:', body);
|
|
@@ -9,10 +10,10 @@ export const logResponse = (traceId, response, psmName = 'Service') => {
|
|
|
9
10
|
const { data, error, status } = response;
|
|
10
11
|
const hasError = !!error;
|
|
11
12
|
if (hasError) {
|
|
12
|
-
console.error(`[Dataloom][${psmName}][Response
|
|
13
|
+
console.error(`[Dataloom][${psmName}][Response Failed]`, 'trace id:', traceId, 'statusCode:', status, 'error:', error);
|
|
13
14
|
}
|
|
14
15
|
else {
|
|
15
|
-
console.log(`[Dataloom][${psmName}][Response
|
|
16
|
+
console.log(`[Dataloom][${psmName}][Response Success]`, 'trace id:', traceId, 'statusCode:', status, 'data:', data);
|
|
16
17
|
}
|
|
17
18
|
};
|
|
18
19
|
//# sourceMappingURL=logger.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,UAAkB,SAAS,EAAE,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/utils/logger.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAiB,EAAE,UAAkB,SAAS,EAAE,EAAE;IAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAE9C,kBAAkB;IAClB,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;SACzF,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SACpF,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;IAE5C,OAAO,CAAC,GAAG,CACT,cAAc,OAAO,YAAY,EACjC,WAAW,EACX,OAAO,EACP,SAAS,EACT,MAAM,EACN,SAAS,EACT,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EACvB,OAAO,EACP,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,OAAe,EACf,QAAmD,EACnD,UAAkB,SAAS,EAC3B,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IACzC,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC;IAEzB,IAAI,QAAQ,EAAE;QACZ,OAAO,CAAC,KAAK,CACX,cAAc,OAAO,oBAAoB,EACzC,WAAW,EACX,OAAO,EACP,aAAa,EACb,MAAM,EACN,QAAQ,EACR,KAAK,CACN,CAAC;KACH;SAAM;QACL,OAAO,CAAC,GAAG,CACT,cAAc,OAAO,qBAAqB,EAC1C,WAAW,EACX,OAAO,EACP,aAAa,EACb,MAAM,EACN,OAAO,EACP,IAAI,CACL,CAAC;KACH;AACH,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@data-loom/service-js",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.9-alpha.1",
|
|
4
4
|
"description": "Dataloom service",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"service",
|
|
@@ -33,10 +33,10 @@
|
|
|
33
33
|
"test:types:watch": "run-s build && tsd --files 'test/**/*.test-d.ts' --watch"
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
|
-
"@data-loom/node-fetch": "0.4.
|
|
36
|
+
"@data-loom/node-fetch": "0.4.9-alpha.1"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@types/jest": "
|
|
39
|
+
"@types/jest": "^29.5.14",
|
|
40
40
|
"cpy-cli": "^5.0.0",
|
|
41
41
|
"jest": "^29.6.1",
|
|
42
42
|
"node-abort-controller": "^3.0.1",
|