@lark-apaas/dataloom 0.1.4-alpha.7 → 0.1.4-alpha.9

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

@@ -122,6 +122,10 @@ export default class StorageFileApi {
     /**
      * Downloads a file from a private bucket. For public buckets, make a request to the URL returned from `getPublicUrl` instead.
      *
+     * 实现：先调 createSignedUrl 拿一个 10 分钟有效的签名链接，再用 fetch 直接拉
+     * 该链接的二进制返回。绕开「直连 storage GET → 302 跳 CDN，CDN 响应头
+     * `access-control-allow-origin: *` 与 `credentials: 'include'` 冲突」的跨域问题。
+     *
      * @param path The full path and file name of the file to be downloaded. For example `folder/image.png`.
      * @param options.transform Transform the asset before serving it to the client.
      */

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

@@ -33,12 +33,12 @@ class StorageFileApi {
             if (options?.contentDisposition) contentDisposition = options?.contentDisposition;
             else if (fileBody instanceof File) contentDisposition = fileBody?.name;
             const preUploadBody = {
-                bucket_id: this.bucketId ?? '',
-                file_size: getUpdateFileSize(fileBody),
+                fileSize: getUpdateFileSize(fileBody),
                 upsert: options.upsert ?? false,
-                file_path: cleanPath,
-                file_name: fileBody instanceof File ? fileBody?.name : ''
+                filePath: cleanPath,
+                fileName: fileBody instanceof File ? fileBody?.name : ''
             };
+            if (options.contentType) preUploadBody.contentType = options.contentType;
             const res = await post(this.fetch, `${this.url}/object/${this.bucketId}/pre_upload`, preUploadBody, {
                 headers: this.headers,
                 logFetch: this.loggerEnabled,
@@ -46,18 +46,19 @@ class StorageFileApi {
             }, void 0, {
                 psmName: 'Storage.Upload.PreUpload'
             });
-            const { upload_id, upload_url } = res?.data ?? {};
-            if (!upload_url || !upload_id) return {
+            const { uploadID, uploadUrl } = res?.data ?? {};
+            if (!uploadUrl || !uploadID) return {
                 data: null,
-                error: new StorageError('upload_url or upload_id is empty')
+                error: new StorageError('uploadUrl or uploadID is empty')
             };
             {
                 const tosHeaders = {};
                 if (contentDisposition) tosHeaders['content-disposition'] = `attachment; filename="${sanitizeFileName(contentDisposition)}"`;
                 if (options.cacheControl || 0 === options.cacheControl) tosHeaders['cache-control'] = `max-age=${options.cacheControl}`;
                 if (options.contentType) tosHeaders['content-type'] = options.contentType;
-                const tosRes = await put(this.fetch, upload_url, fileBody, {
+                const tosRes = await put(this.fetch, uploadUrl, fileBody, {
                     noResolveJson: true,
+                    noCredentials: true,
                     headers: tosHeaders,
                     logFetch: this.loggerEnabled,
                     onRequestError: this.onRequestError
@@ -66,9 +67,8 @@ class StorageFileApi {
                 });
                 const etag = tosRes?.headers?.get('Etag') ?? '';
                 const callbackRes = await post(this.fetch, `${this.url}/object/callback`, {
-                    upload_id,
-                    etag,
-                    app_id: this.appId
+                    uploadID,
+                    eTag: etag
                 }, {
                     headers: this.headers,
                     logFetch: this.loggerEnabled,
@@ -76,12 +76,13 @@ class StorageFileApi {
                 }, void 0, {
                     psmName: 'Storage.Upload.Callback'
                 });
+                const callbackData = callbackRes?.data;
                 return {
-                    data: callbackRes?.data ?? {
-                        id: '',
-                        file_path: '',
-                        bucket_id: '',
-                        download_url: ''
+                    data: {
+                        id: callbackData?.id ?? '',
+                        file_path: callbackData?.filePath ?? '',
+                        bucket_id: callbackData?.bucketID ?? '',
+                        download_url: callbackData?.downloadURL ?? ''
                     },
                     error: null
                 };
@@ -113,7 +114,7 @@ class StorageFileApi {
         try {
             const _path = this._getFinalPath(path);
             const res = await post(this.fetch, `${this.url}/object/sign/${_path}`, {
-                expires_in: toValidExpiresIn(expiresIn)
+                expiresIn: toValidExpiresIn(expiresIn)
             }, {
                 headers: this.headers,
                 logFetch: this.loggerEnabled,
@@ -140,7 +141,7 @@ class StorageFileApi {
         try {
             const _paths = paths.map((path)=>this._retrieveFilePathFromDownloadUrl(path));
             const res = await post(this.fetch, `${this.url}/object/sign/${this.bucketId}`, {
-                expires_in: toValidExpiresIn(expiresIn),
+                expiresIn: toValidExpiresIn(expiresIn),
                 paths: _paths
             }, {
                 headers: this.headers,
@@ -166,42 +167,30 @@ class StorageFileApi {
     }
     async download(path, _options) {
         try {
-            const _path = this._retrieveFilePathFromDownloadUrl(path);
-            const res = await get(this.fetch, `${this.url}/object/${this.bucketId}/${_path}`, {
-                headers: this.headers,
+            const SIGNED_URL_EXPIRES_IN_SECONDS = 600;
+            const { data: signed, error: signedError } = await this.createSignedUrl(path, SIGNED_URL_EXPIRES_IN_SECONDS);
+            if (signedError || !signed?.signedUrl) return {
+                data: null,
+                error: signedError ?? new StorageError('failed to create signed url for download')
+            };
+            const res = await get(this.fetch, signed.signedUrl, {
                 noResolveJson: true,
+                noCredentials: true,
                 logFetch: this.loggerEnabled,
                 onRequestError: this.onRequestError
             }, void 0, {
                 psmName: 'Storage.Download'
             });
-            if (res.redirected) {
-                const resBody = await res.blob();
-                return {
-                    data: resBody,
-                    error: null
-                };
-            }
-            const resBody = await res.json();
-            return {
+            if (!res.ok) return {
                 data: null,
-                error: resBody
+                error: new StorageError(`download file error: ${res.status} ${res.statusText}`)
+            };
+            const blob = await res.blob();
+            return {
+                data: blob,
+                error: null
             };
         } catch (error) {
-            if (error && 'object' == typeof error && 'originalError' in error) {
-                const originalError = error.originalError;
-                if (originalError instanceof Response && originalError.redirected) try {
-                    return {
-                        data: null,
-                        error: new StorageError(await originalError.text())
-                    };
-                } catch (_e) {
-                    return {
-                        data: null,
-                        error: new StorageUnknownError('download file error', error)
-                    };
-                }
-            }
             if (isCustomError(error) || isStorageError(error)) return {
                 data: null,
                 error: error
@@ -359,7 +348,7 @@ class StorageFileApi {
         return '';
     }
     async _copyWithinVolcEngine(url) {
-        const res = await post(this.fetch, `${this.url}/runtime/app/${this.appId}/object/${this.bucketId}/copy`, {
+        const res = await post(this.fetch, `${this.url}/object/${this.bucketId}/copy`, {
             source: {
                 type: 'externalTOS',
                 externalURL: url

package/lib/storage/utils/csrf.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 获取cookie中存放的suda-csrf-token值
+ * @returns {string | null} - suda-csrf-token的值，如果不存在则返回null
+ */
+export declare function getCsrfToken(): string | null;
+declare global {
+    interface Window {
+        csrfToken?: string;
+    }
+}
+//# sourceMappingURL=csrf.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"csrf.d.ts","sourceRoot":"","sources":["../../../src/storage/utils/csrf.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,YAAY,kBAiB3B;AAID,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB;CACF"}

package/lib/storage/utils/csrf.js

@@ -0,0 +1,10 @@
+function getCsrfToken() {
+    const cookieName = 'suda-csrf-token';
+    const cookies = document.cookie.split('; ');
+    for (const cookie of cookies){
+        const [name, value] = cookie.split('=');
+        if (name === cookieName) return decodeURIComponent(value);
+    }
+    return window.csrfToken ?? null;
+}
+export { getCsrfToken };

package/lib/utils/fetch.d.ts

@@ -1,5 +1,12 @@
 import type RateLimiter from '../RateLimiter';
 import type { Fetch } from './types';
 export declare const resolveFetch: (customFetch?: Fetch) => Fetch;
-export declare const fetchWithAuth: (dataloomKey: string, rateLimiter?: RateLimiter, customFetch?: Fetch) => Fetch;
+/**
+ * Wrap a fetch implementation with client-side rate limiting.
+ *
+ * Storage now relies on cookie session authentication (`credentials: 'include'`
+ * is added at the storage request layer), so no `apikey` header is injected
+ * here any more.
+ */
+export declare const createRateLimitedFetch: (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,eAAO,MAAM,aAAa,GACxB,aAAa,MAAM,EACnB,cAAc,WAAW,EACzB,cAAc,KAAK,KAClB,KAqBF,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;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,GACjC,cAAc,WAAW,EACzB,cAAc,KAAK,KAClB,KAeF,CAAC"}

package/lib/utils/fetch.js

@@ -3,19 +3,14 @@ const resolveFetch = (customFetch)=>{
     _fetch = customFetch ? customFetch : fetch;
     return (input, init)=>_fetch(input, init);
 };
-const fetchWithAuth = (dataloomKey, rateLimiter, customFetch)=>{
+const createRateLimitedFetch = (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 headers = new Headers(init?.headers);
-        if (!headers.has('apikey') && dataloomKey) headers.set('apikey', dataloomKey);
-        return resolvedFetch(input, {
-            ...init,
-            headers
-        });
+        return resolvedFetch(input, init);
     };
 };
-export { fetchWithAuth, resolveFetch };
+export { createRateLimitedFetch, resolveFetch };

package/lib/utils/helpers.d.ts

@@ -1,5 +1,4 @@
 import type { DataloomClientOptions } from './types';
-export declare function stripTrailingSlash(url: string): string;
 export declare const isBrowser: () => boolean;
 export declare function applySettingDefaults(options: DataloomClientOptions, defaults: DataloomClientOptions): Required<DataloomClientOptions>;
 //# sourceMappingURL=helpers.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAErD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,eAAO,MAAM,SAAS,eAAsC,CAAC;AAE7D,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,qBAAqB,GAC9B,QAAQ,CAAC,qBAAqB,CAAC,CAYjC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAErD,eAAO,MAAM,SAAS,eAAsC,CAAC;AAE7D,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,qBAAqB,GAC9B,QAAQ,CAAC,qBAAqB,CAAC,CAYjC"}

package/lib/utils/helpers.js

@@ -1,6 +1,3 @@
-function stripTrailingSlash(url) {
-    return url.replace(/\/$/, '');
-}
 const isBrowser = ()=>'undefined' != typeof window;
 function applySettingDefaults(options, defaults) {
     const { global: globalOptions } = options;
@@ -14,4 +11,4 @@ function applySettingDefaults(options, defaults) {
         }
     };
 }
-export { applySettingDefaults, isBrowser, stripTrailingSlash };
+export { applySettingDefaults, isBrowser };

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 = {
@@ -30,6 +31,15 @@ export type DataloomClientOptions = {
          * Optional. The global hook that will be called when a request fails.
          */
         onError?: OnError;
+        /**
+         * 由 client-toolkit 注入的 account services 引用（user/session）。
+         * 老调用方式 `(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?: 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;KACnB,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.4-alpha.7",
+  "version": "0.1.4-alpha.9",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [

package/lib/service/services/DataloomServiceBase.d.ts

@@ -1,17 +0,0 @@
-import { type DataloomServiceOptions, type DataloomServiceResponse, type ExtraInfo, type Fetch, type FetchOptions, type OnRequestErrorType, ServiceName } from '../utils/types';
-export default abstract class DataloomServiceBase {
-    protected baseUrl: string;
-    protected headers: {
-        [key: string]: string;
-    };
-    protected fetch: Fetch;
-    protected logger: boolean;
-    protected serviceName: ServiceName;
-    protected brandId: string;
-    protected bizSource: string;
-    protected appId: string;
-    protected onRequestError?: (error: OnRequestErrorType) => void;
-    constructor(baseUrl: string, options: DataloomServiceOptions);
-    fetchData<T>(url: string, options: FetchOptions, extras?: ExtraInfo): Promise<DataloomServiceResponse<T>>;
-}
-//# sourceMappingURL=DataloomServiceBase.d.ts.map

package/lib/service/services/DataloomServiceBase.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataloomServiceBase.d.ts","sourceRoot":"","sources":["../../../src/service/services/DataloomServiceBase.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC5B,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,WAAW,EACZ,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;IAoBtD,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"}

package/lib/service/services/DataloomServiceBase.js

@@ -1,126 +0,0 @@
-import { getCookieByName, serializeSessionBrandId } from "../utils/helpers.js";
-import { logRequest, logResponse } from "../utils/logger.js";
-import { traceIdGenerator } from "../utils/trace-id.js";
-import { ServiceName } from "../utils/types.js";
-class DataloomServiceBase {
-    constructor(baseUrl, options){
-        this.baseUrl = baseUrl;
-        this.headers = {
-            ...options.headers,
-            'X-Suda-Csrf-Token': getCookieByName('suda-csrf-token')
-        };
-        this.logger = options.logger ?? false;
-        this.serviceName = ServiceName.DEFAULT;
-        this.brandId = serializeSessionBrandId(options.brandName);
-        this.bizSource = options.brandName;
-        this.appId = options.appId;
-        this.onRequestError = options.onRequestError;
-        if (options.fetch) this.fetch = options.fetch;
-        else this.fetch = fetch;
-    }
-    async fetchData(url, options, extras) {
-        const fetchUrl = `${this.baseUrl.toString()}${url}`;
-        let traceId = -1;
-        if (this.logger) {
-            traceId = traceIdGenerator.next();
-            logRequest({
-                traceId,
-                url: fetchUrl,
-                method: options.method,
-                body: options.body
-            }, extras?.psmName);
-        }
-        try {
-            const res = await this.fetch(fetchUrl, {
-                method: options.method,
-                mode: 'cors',
-                redirect: 'manual',
-                credentials: 'include',
-                headers: this.headers,
-                body: JSON.stringify(options.body)
-            });
-            let error = null;
-            let data = null;
-            let status = res.status;
-            let statusText = res.statusText;
-            if (res.ok) {
-                const body = await res.text();
-                const parsedBody = JSON.parse(body);
-                if (parsedBody.status_code && parsedBody.error_msg) {
-                    data = null;
-                    error = {
-                        code: parsedBody.status_code || res.status,
-                        details: '',
-                        hint: '',
-                        message: parsedBody.error_msg || body
-                    };
-                } else {
-                    data = parsedBody.data;
-                    error = null;
-                }
-            } else {
-                const body = await res.text();
-                const parsedBody = JSON.parse(body);
-                try {
-                    error = 429 === res.status ? {
-                        code: 429,
-                        message: 'Too many requests received within 5 seconds.',
-                        details: '',
-                        hint: 'Retry after 5 seconds.'
-                    } : {
-                        code: parsedBody.status_code || res.status,
-                        message: parsedBody.error_msg || body,
-                        details: '',
-                        hint: ''
-                    };
-                } catch (_e) {
-                    error = {
-                        code: parsedBody.status_code || res.status,
-                        message: parsedBody.error_msg || body,
-                        details: '',
-                        hint: ''
-                    };
-                    data = null;
-                    status = 500;
-                    statusText = 'Dataloom Internal Error';
-                }
-            }
-            const serviceResponse = {
-                data,
-                error,
-                status,
-                statusText
-            };
-            if (error) this.onRequestError?.({
-                ...error,
-                status,
-                statusText
-            });
-            if (this.logger) logResponse(traceId, serviceResponse, extras?.psmName);
-            return serviceResponse;
-        } catch (e) {
-            const internalError = {
-                error: {
-                    code: 500,
-                    message: e instanceof Error ? e.message : String(e),
-                    details: '',
-                    hint: ''
-                },
-                status: 500,
-                statusText: 'Dataloom Internal Error'
-            };
-            this.onRequestError?.({
-                ...internalError.error,
-                status: internalError.status,
-                statusText: internalError.statusText
-            });
-            const serviceResponse = {
-                data: null,
-                ...internalError
-            };
-            if (this.logger) logResponse(traceId, serviceResponse, extras?.psmName);
-            return serviceResponse;
-        }
-    }
-}
-export { DataloomServiceBase as default };

package/lib/service/services/session-service/index.d.ts

@@ -1,45 +0,0 @@
-import type { DataloomServiceResponse } from '../../utils/types';
-import { ServiceName } from '../../utils/types';
-import DataloomServiceBase from '../DataloomServiceBase';
-import type { SignInRedirectionOptions, UserInfoResponse } from './types';
-export default class SessionService extends DataloomServiceBase {
-    serviceName: ServiceName;
-    /**
-     * Redirect to login page within app runtime environment.
-     */
-    redirectToLogin(options?: SignInRedirectionOptions): DataloomServiceResponse<'success'>;
-    /**
-     * Sign out current user session.
-     */
-    signOut(): Promise<DataloomServiceResponse<null>>;
-    /**
-     * Get current page URL with biz_source parameter
-     */
-    getUrlWithBizSource(): string;
-    /**
-     * Gets the current user information if there is an existing session.
-     */
-    getUserInfo(): Promise<DataloomServiceResponse<UserInfoResponse>>;
-    /**
-     * Navigate to user profile page within app runtime environment.
-     */
-    navigateToUserProfile(options?: {
-        newTab?: boolean;
-    }): {
-        data: null;
-        error: {
-            code: number;
-            message: string;
-            hint: string;
-            details: string;
-        };
-        status: number;
-        statusText: string;
-    } | {
-        data: string;
-        error: null;
-        status: number;
-        statusText: string;
-    };
-}
-//# sourceMappingURL=index.d.ts.map

package/lib/service/services/session-service/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/services/session-service/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAGV,wBAAwB,EACxB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AAcjB,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,mBAAmB;IACpD,WAAW,cAA8B;IAElD;;OAEG;IACH,eAAe,CACb,OAAO,CAAC,EAAE,wBAAwB,GACjC,uBAAuB,CAAC,SAAS,CAAC;IAsCrC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAyBvD;;OAEG;IACH,mBAAmB,IAAI,MAAM;IAkB7B;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IAuDvE;;OAEG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE;;;;;;;;;;;;;;;;CA+BrD"}