sfcc-dev-mcp 1.0.20 → 1.0.22
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 +79 -30
- package/dist/clients/agent-instructions-client.d.ts +3 -0
- package/dist/clients/agent-instructions-client.d.ts.map +1 -1
- package/dist/clients/agent-instructions-client.js +42 -10
- package/dist/clients/agent-instructions-client.js.map +1 -1
- package/dist/clients/base/abstract-documentation-client.d.ts +4 -0
- package/dist/clients/base/abstract-documentation-client.d.ts.map +1 -1
- package/dist/clients/base/abstract-documentation-client.js +9 -1
- package/dist/clients/base/abstract-documentation-client.js.map +1 -1
- package/dist/clients/base/http-client.d.ts +10 -3
- package/dist/clients/base/http-client.d.ts.map +1 -1
- package/dist/clients/base/http-client.js +94 -16
- package/dist/clients/base/http-client.js.map +1 -1
- package/dist/clients/base/oauth-token.d.ts +3 -0
- package/dist/clients/base/oauth-token.d.ts.map +1 -1
- package/dist/clients/base/oauth-token.js +23 -3
- package/dist/clients/base/oauth-token.js.map +1 -1
- package/dist/clients/base/ocapi-auth-client.d.ts.map +1 -1
- package/dist/clients/base/ocapi-auth-client.js +22 -2
- package/dist/clients/base/ocapi-auth-client.js.map +1 -1
- package/dist/clients/docs/class-name-resolver.d.ts +7 -4
- package/dist/clients/docs/class-name-resolver.d.ts.map +1 -1
- package/dist/clients/docs/class-name-resolver.js.map +1 -1
- package/dist/clients/docs/documentation-scanner.d.ts +2 -0
- package/dist/clients/docs/documentation-scanner.d.ts.map +1 -1
- package/dist/clients/docs/documentation-scanner.js +39 -17
- package/dist/clients/docs/documentation-scanner.js.map +1 -1
- package/dist/clients/docs-client.d.ts +4 -3
- package/dist/clients/docs-client.d.ts.map +1 -1
- package/dist/clients/docs-client.js.map +1 -1
- package/dist/clients/logs/log-client.d.ts +1 -0
- package/dist/clients/logs/log-client.d.ts.map +1 -1
- package/dist/clients/logs/log-client.js +13 -21
- package/dist/clients/logs/log-client.js.map +1 -1
- package/dist/clients/logs/log-file-discovery.d.ts +1 -0
- package/dist/clients/logs/log-file-discovery.d.ts.map +1 -1
- package/dist/clients/logs/log-file-discovery.js +19 -6
- package/dist/clients/logs/log-file-discovery.js.map +1 -1
- package/dist/clients/logs/log-file-reader.d.ts +2 -0
- package/dist/clients/logs/log-file-reader.d.ts.map +1 -1
- package/dist/clients/logs/log-file-reader.js +31 -8
- package/dist/clients/logs/log-file-reader.js.map +1 -1
- package/dist/clients/logs/log-formatter.d.ts +2 -2
- package/dist/clients/logs/log-formatter.d.ts.map +1 -1
- package/dist/clients/logs/log-formatter.js.map +1 -1
- package/dist/clients/logs/log-types.d.ts +4 -0
- package/dist/clients/logs/log-types.d.ts.map +1 -1
- package/dist/clients/logs/webdav-client-manager.d.ts.map +1 -1
- package/dist/clients/logs/webdav-client-manager.js.map +1 -1
- package/dist/clients/ocapi/code-versions-client.d.ts +23 -4
- package/dist/clients/ocapi/code-versions-client.d.ts.map +1 -1
- package/dist/clients/ocapi/code-versions-client.js +2 -2
- package/dist/clients/ocapi/code-versions-client.js.map +1 -1
- package/dist/clients/ocapi/site-preferences-client.d.ts +2 -42
- package/dist/clients/ocapi/site-preferences-client.d.ts.map +1 -1
- package/dist/clients/ocapi/site-preferences-client.js.map +1 -1
- package/dist/clients/ocapi/system-objects-client.d.ts +7 -39
- package/dist/clients/ocapi/system-objects-client.d.ts.map +1 -1
- package/dist/clients/ocapi/system-objects-client.js.map +1 -1
- package/dist/clients/script-debugger/script-debugger-client.d.ts +9 -1
- package/dist/clients/script-debugger/script-debugger-client.d.ts.map +1 -1
- package/dist/clients/script-debugger/script-debugger-client.js +182 -127
- package/dist/clients/script-debugger/script-debugger-client.js.map +1 -1
- package/dist/clients/sfra-client.d.ts.map +1 -1
- package/dist/clients/sfra-client.js.map +1 -1
- package/dist/config/cli-options.d.ts +16 -0
- package/dist/config/cli-options.d.ts.map +1 -0
- package/dist/config/cli-options.js +56 -0
- package/dist/config/cli-options.js.map +1 -0
- package/dist/config/configuration-factory.d.ts.map +1 -1
- package/dist/config/configuration-factory.js +12 -6
- package/dist/config/configuration-factory.js.map +1 -1
- package/dist/config/credential-validation.d.ts +25 -0
- package/dist/config/credential-validation.d.ts.map +1 -0
- package/dist/config/credential-validation.js +42 -0
- package/dist/config/credential-validation.js.map +1 -0
- package/dist/config/dw-json-loader.d.ts.map +1 -1
- package/dist/config/dw-json-loader.js +19 -68
- package/dist/config/dw-json-loader.js.map +1 -1
- package/dist/config/path-security-policy.d.ts +6 -0
- package/dist/config/path-security-policy.d.ts.map +1 -0
- package/dist/config/path-security-policy.js +63 -0
- package/dist/config/path-security-policy.js.map +1 -0
- package/dist/config/workspace-roots.d.ts +1 -0
- package/dist/config/workspace-roots.d.ts.map +1 -1
- package/dist/config/workspace-roots.js +26 -77
- package/dist/config/workspace-roots.js.map +1 -1
- package/dist/core/handlers/abstract-client-handler.d.ts +23 -2
- package/dist/core/handlers/abstract-client-handler.d.ts.map +1 -1
- package/dist/core/handlers/abstract-client-handler.js +33 -3
- package/dist/core/handlers/abstract-client-handler.js.map +1 -1
- package/dist/core/handlers/agent-instructions-handler.d.ts +1 -1
- package/dist/core/handlers/agent-instructions-handler.d.ts.map +1 -1
- package/dist/core/handlers/agent-instructions-handler.js +2 -2
- package/dist/core/handlers/agent-instructions-handler.js.map +1 -1
- package/dist/core/handlers/base-handler.d.ts +14 -11
- package/dist/core/handlers/base-handler.d.ts.map +1 -1
- package/dist/core/handlers/base-handler.js +38 -22
- package/dist/core/handlers/base-handler.js.map +1 -1
- package/dist/core/handlers/cartridge-handler.d.ts +3 -8
- package/dist/core/handlers/cartridge-handler.d.ts.map +1 -1
- package/dist/core/handlers/cartridge-handler.js +10 -18
- package/dist/core/handlers/cartridge-handler.js.map +1 -1
- package/dist/core/handlers/code-version-handler.d.ts +3 -9
- package/dist/core/handlers/code-version-handler.d.ts.map +1 -1
- package/dist/core/handlers/code-version-handler.js +10 -21
- package/dist/core/handlers/code-version-handler.js.map +1 -1
- package/dist/core/handlers/job-log-handler.d.ts +3 -9
- package/dist/core/handlers/job-log-handler.d.ts.map +1 -1
- package/dist/core/handlers/job-log-handler.js +10 -21
- package/dist/core/handlers/job-log-handler.js.map +1 -1
- package/dist/core/handlers/lifecycle-utils.d.ts +5 -0
- package/dist/core/handlers/lifecycle-utils.d.ts.map +1 -0
- package/dist/core/handlers/lifecycle-utils.js +18 -0
- package/dist/core/handlers/lifecycle-utils.js.map +1 -0
- package/dist/core/handlers/log-handler.d.ts +3 -9
- package/dist/core/handlers/log-handler.d.ts.map +1 -1
- package/dist/core/handlers/log-handler.js +10 -21
- package/dist/core/handlers/log-handler.js.map +1 -1
- package/dist/core/handlers/script-debugger-handler.d.ts +3 -9
- package/dist/core/handlers/script-debugger-handler.d.ts.map +1 -1
- package/dist/core/handlers/script-debugger-handler.js +10 -21
- package/dist/core/handlers/script-debugger-handler.js.map +1 -1
- package/dist/core/handlers/simple-client-handler.d.ts +3 -3
- package/dist/core/handlers/simple-client-handler.d.ts.map +1 -1
- package/dist/core/handlers/simple-client-handler.js +5 -3
- package/dist/core/handlers/simple-client-handler.js.map +1 -1
- package/dist/core/handlers/system-object-handler.d.ts +3 -9
- package/dist/core/handlers/system-object-handler.d.ts.map +1 -1
- package/dist/core/handlers/system-object-handler.js +10 -21
- package/dist/core/handlers/system-object-handler.js.map +1 -1
- package/dist/core/handlers/validation-helpers.d.ts +5 -26
- package/dist/core/handlers/validation-helpers.d.ts.map +1 -1
- package/dist/core/handlers/validation-helpers.js +79 -81
- package/dist/core/handlers/validation-helpers.js.map +1 -1
- package/dist/core/instruction-advisor.d.ts +3 -0
- package/dist/core/instruction-advisor.d.ts.map +1 -1
- package/dist/core/instruction-advisor.js +25 -2
- package/dist/core/instruction-advisor.js.map +1 -1
- package/dist/core/server-tool-call-lifecycle.d.ts +38 -0
- package/dist/core/server-tool-call-lifecycle.d.ts.map +1 -0
- package/dist/core/server-tool-call-lifecycle.js +128 -0
- package/dist/core/server-tool-call-lifecycle.js.map +1 -0
- package/dist/core/server-tool-catalog.d.ts +19 -0
- package/dist/core/server-tool-catalog.d.ts.map +1 -0
- package/dist/core/server-tool-catalog.js +52 -0
- package/dist/core/server-tool-catalog.js.map +1 -0
- package/dist/core/server-workspace-discovery.d.ts +38 -0
- package/dist/core/server-workspace-discovery.d.ts.map +1 -0
- package/dist/core/server-workspace-discovery.js +68 -0
- package/dist/core/server-workspace-discovery.js.map +1 -0
- package/dist/core/server.d.ts +27 -3
- package/dist/core/server.d.ts.map +1 -1
- package/dist/core/server.js +247 -165
- package/dist/core/server.js.map +1 -1
- package/dist/core/tool-argument-validator.d.ts +24 -0
- package/dist/core/tool-argument-validator.d.ts.map +1 -0
- package/dist/core/tool-argument-validator.js +186 -0
- package/dist/core/tool-argument-validator.js.map +1 -0
- package/dist/core/tool-error-response.d.ts +21 -0
- package/dist/core/tool-error-response.d.ts.map +1 -0
- package/dist/core/tool-error-response.js +64 -0
- package/dist/core/tool-error-response.js.map +1 -0
- package/dist/core/tool-schemas/agent-instruction-tools.d.ts +4 -0
- package/dist/core/tool-schemas/agent-instruction-tools.d.ts.map +1 -1
- package/dist/core/tool-schemas/agent-instruction-tools.js +6 -2
- package/dist/core/tool-schemas/agent-instruction-tools.js.map +1 -1
- package/dist/core/tool-schemas/cartridge-tools.d.ts +3 -0
- package/dist/core/tool-schemas/cartridge-tools.d.ts.map +1 -1
- package/dist/core/tool-schemas/cartridge-tools.js +3 -0
- package/dist/core/tool-schemas/cartridge-tools.js.map +1 -1
- package/dist/core/tool-schemas/code-version-tools.d.ts +1 -0
- package/dist/core/tool-schemas/code-version-tools.d.ts.map +1 -1
- package/dist/core/tool-schemas/code-version-tools.js +1 -0
- package/dist/core/tool-schemas/code-version-tools.js.map +1 -1
- package/dist/core/tool-schemas/documentation-tools.d.ts +6 -0
- package/dist/core/tool-schemas/documentation-tools.d.ts.map +1 -1
- package/dist/core/tool-schemas/documentation-tools.js +6 -0
- package/dist/core/tool-schemas/documentation-tools.js.map +1 -1
- package/dist/core/tool-schemas/isml-tools.d.ts +3 -0
- package/dist/core/tool-schemas/isml-tools.d.ts.map +1 -1
- package/dist/core/tool-schemas/isml-tools.js +4 -1
- package/dist/core/tool-schemas/isml-tools.js.map +1 -1
- package/dist/core/tool-schemas/log-tools.d.ts +28 -0
- package/dist/core/tool-schemas/log-tools.d.ts.map +1 -1
- package/dist/core/tool-schemas/log-tools.js +21 -7
- package/dist/core/tool-schemas/log-tools.js.map +1 -1
- package/dist/core/tool-schemas/script-debugger-tools.d.ts +7 -0
- package/dist/core/tool-schemas/script-debugger-tools.d.ts.map +1 -1
- package/dist/core/tool-schemas/script-debugger-tools.js +9 -2
- package/dist/core/tool-schemas/script-debugger-tools.js.map +1 -1
- package/dist/core/tool-schemas/sfra-tools.d.ts +3 -0
- package/dist/core/tool-schemas/sfra-tools.d.ts.map +1 -1
- package/dist/core/tool-schemas/sfra-tools.js +3 -0
- package/dist/core/tool-schemas/sfra-tools.js.map +1 -1
- package/dist/core/tool-schemas/shared-schemas.d.ts +72 -4
- package/dist/core/tool-schemas/shared-schemas.d.ts.map +1 -1
- package/dist/core/tool-schemas/shared-schemas.js +29 -3
- package/dist/core/tool-schemas/shared-schemas.js.map +1 -1
- package/dist/core/tool-schemas/system-object-tools.d.ts +93 -4
- package/dist/core/tool-schemas/system-object-tools.d.ts.map +1 -1
- package/dist/core/tool-schemas/system-object-tools.js +13 -6
- package/dist/core/tool-schemas/system-object-tools.js.map +1 -1
- package/dist/docs/isml/isprint.md +1 -1
- package/dist/docs/isml/isredirect.md +1 -1
- package/dist/docs/isml/isremove.md +1 -1
- package/dist/docs/isml/isreplace.md +1 -1
- package/dist/docs/isml/isscript.md +1 -1
- package/dist/main.js +18 -33
- package/dist/main.js.map +1 -1
- package/dist/tool-configs/agent-instructions-tool-config.d.ts +1 -1
- package/dist/tool-configs/agent-instructions-tool-config.d.ts.map +1 -1
- package/dist/tool-configs/agent-instructions-tool-config.js +0 -33
- package/dist/tool-configs/agent-instructions-tool-config.js.map +1 -1
- package/dist/tool-configs/cartridge-tool-config.d.ts +1 -1
- package/dist/tool-configs/cartridge-tool-config.d.ts.map +1 -1
- package/dist/tool-configs/cartridge-tool-config.js +3 -5
- package/dist/tool-configs/cartridge-tool-config.js.map +1 -1
- package/dist/tool-configs/code-version-tool-config.d.ts +1 -1
- package/dist/tool-configs/code-version-tool-config.d.ts.map +1 -1
- package/dist/tool-configs/code-version-tool-config.js +0 -4
- package/dist/tool-configs/code-version-tool-config.js.map +1 -1
- package/dist/tool-configs/docs-tool-config.d.ts +1 -1
- package/dist/tool-configs/docs-tool-config.d.ts.map +1 -1
- package/dist/tool-configs/docs-tool-config.js +0 -13
- package/dist/tool-configs/docs-tool-config.js.map +1 -1
- package/dist/tool-configs/isml-tool-config.d.ts +1 -1
- package/dist/tool-configs/isml-tool-config.d.ts.map +1 -1
- package/dist/tool-configs/isml-tool-config.js +0 -10
- package/dist/tool-configs/isml-tool-config.js.map +1 -1
- package/dist/tool-configs/job-log-tool-config.d.ts +1 -1
- package/dist/tool-configs/job-log-tool-config.d.ts.map +1 -1
- package/dist/tool-configs/job-log-tool-config.js +1 -21
- package/dist/tool-configs/job-log-tool-config.js.map +1 -1
- package/dist/tool-configs/log-tool-config.d.ts +1 -1
- package/dist/tool-configs/log-tool-config.d.ts.map +1 -1
- package/dist/tool-configs/log-tool-config.js +6 -16
- package/dist/tool-configs/log-tool-config.js.map +1 -1
- package/dist/tool-configs/script-debugger-tool-config.d.ts +1 -1
- package/dist/tool-configs/script-debugger-tool-config.d.ts.map +1 -1
- package/dist/tool-configs/script-debugger-tool-config.js +0 -8
- package/dist/tool-configs/script-debugger-tool-config.js.map +1 -1
- package/dist/tool-configs/sfra-tool-config.d.ts +1 -1
- package/dist/tool-configs/sfra-tool-config.d.ts.map +1 -1
- package/dist/tool-configs/sfra-tool-config.js +0 -10
- package/dist/tool-configs/sfra-tool-config.js.map +1 -1
- package/dist/tool-configs/system-object-tool-config.d.ts +1 -1
- package/dist/tool-configs/system-object-tool-config.d.ts.map +1 -1
- package/dist/tool-configs/system-object-tool-config.js +14 -24
- package/dist/tool-configs/system-object-tool-config.js.map +1 -1
- package/dist/types/ocapi-search.d.ts +50 -0
- package/dist/types/ocapi-search.d.ts.map +1 -0
- package/dist/types/ocapi-search.js +7 -0
- package/dist/types/ocapi-search.js.map +1 -0
- package/dist/types/types.d.ts +4 -4
- package/dist/types/types.d.ts.map +1 -1
- package/dist/utils/abort-utils.d.ts +18 -0
- package/dist/utils/abort-utils.d.ts.map +1 -0
- package/dist/utils/abort-utils.js +60 -0
- package/dist/utils/abort-utils.js.map +1 -0
- package/dist/utils/cache.d.ts +7 -7
- package/dist/utils/cache.d.ts.map +1 -1
- package/dist/utils/cache.js.map +1 -1
- package/dist/utils/category-utils.d.ts +0 -10
- package/dist/utils/category-utils.d.ts.map +1 -1
- package/dist/utils/category-utils.js +0 -12
- package/dist/utils/category-utils.js.map +1 -1
- package/dist/utils/log-tool-constants.d.ts +3 -4
- package/dist/utils/log-tool-constants.d.ts.map +1 -1
- package/dist/utils/log-tool-constants.js +2 -13
- package/dist/utils/log-tool-constants.js.map +1 -1
- package/dist/utils/logger.d.ts +20 -7
- package/dist/utils/logger.d.ts.map +1 -1
- package/dist/utils/logger.js +72 -11
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/path-resolver.d.ts +5 -0
- package/dist/utils/path-resolver.d.ts.map +1 -1
- package/dist/utils/path-resolver.js +27 -5
- package/dist/utils/path-resolver.js.map +1 -1
- package/dist/utils/query-builder.d.ts +2 -5
- package/dist/utils/query-builder.d.ts.map +1 -1
- package/dist/utils/query-builder.js +1 -4
- package/dist/utils/query-builder.js.map +1 -1
- package/dist/utils/validator.d.ts +5 -3
- package/dist/utils/validator.d.ts.map +1 -1
- package/dist/utils/validator.js +20 -14
- package/dist/utils/validator.js.map +1 -1
- package/package.json +14 -7
- package/dist/clients/docs/index.d.ts +0 -10
- package/dist/clients/docs/index.d.ts.map +0 -1
- package/dist/clients/docs/index.js +0 -10
- package/dist/clients/docs/index.js.map +0 -1
- package/dist/constants/index.d.ts +0 -1
- package/dist/constants/index.d.ts.map +0 -1
- package/dist/constants/index.js +0 -3
- package/dist/constants/index.js.map +0 -1
- package/dist/utils/path-validation.d.ts +0 -40
- package/dist/utils/path-validation.d.ts.map +0 -1
- package/dist/utils/path-validation.js +0 -84
- package/dist/utils/path-validation.js.map +0 -1
|
@@ -5,10 +5,12 @@
|
|
|
5
5
|
* It handles common concerns like authentication, request/response formatting, and error handling.
|
|
6
6
|
*/
|
|
7
7
|
import { Logger } from '../../utils/logger.js';
|
|
8
|
+
import { createTimeoutAbortController, isAbortError } from '../../utils/abort-utils.js';
|
|
8
9
|
/**
|
|
9
10
|
* Base HTTP client for SFCC API communication
|
|
10
11
|
*/
|
|
11
12
|
export class BaseHttpClient {
|
|
13
|
+
static DEFAULT_REQUEST_TIMEOUT_MS = 15_000;
|
|
12
14
|
baseUrl;
|
|
13
15
|
logger;
|
|
14
16
|
constructor(baseUrl, loggerContext) {
|
|
@@ -28,19 +30,16 @@ export class BaseHttpClient {
|
|
|
28
30
|
async makeRequest(endpoint, options = {}) {
|
|
29
31
|
const url = `${this.baseUrl}${endpoint}`;
|
|
30
32
|
const method = options.method ?? 'GET';
|
|
33
|
+
const timeoutMs = options.timeoutMs ?? BaseHttpClient.DEFAULT_REQUEST_TIMEOUT_MS;
|
|
34
|
+
const deadline = timeoutMs > 0 ? Date.now() + timeoutMs : undefined;
|
|
31
35
|
this.logger.debug(`Making ${method} request to: ${endpoint}`);
|
|
36
|
+
const customHeaders = options.headers ?? {};
|
|
37
|
+
const baseRequestOptions = this.getBaseRequestOptions(options);
|
|
32
38
|
// Get authentication headers
|
|
33
39
|
const authHeaders = await this.getAuthHeaders();
|
|
34
|
-
const requestOptions = {
|
|
35
|
-
...options,
|
|
36
|
-
headers: {
|
|
37
|
-
'Content-Type': 'application/json',
|
|
38
|
-
...authHeaders,
|
|
39
|
-
...options.headers,
|
|
40
|
-
},
|
|
41
|
-
};
|
|
42
40
|
try {
|
|
43
|
-
|
|
41
|
+
let { requestOptions, timeoutController } = this.buildRequestOptions(baseRequestOptions, authHeaders, customHeaders, timeoutMs, deadline, endpoint);
|
|
42
|
+
const response = await this.fetchWithTimeout(url, requestOptions, endpoint, timeoutMs, timeoutController);
|
|
44
43
|
if (!response.ok) {
|
|
45
44
|
// Handle authentication errors
|
|
46
45
|
if (response.status === 401) {
|
|
@@ -48,29 +47,108 @@ export class BaseHttpClient {
|
|
|
48
47
|
await this.handleAuthError();
|
|
49
48
|
// Retry with fresh authentication
|
|
50
49
|
const newAuthHeaders = await this.getAuthHeaders();
|
|
51
|
-
requestOptions
|
|
52
|
-
|
|
53
|
-
...newAuthHeaders,
|
|
54
|
-
};
|
|
55
|
-
const retryResponse = await fetch(url, requestOptions);
|
|
50
|
+
({ requestOptions, timeoutController } = this.buildRequestOptions(baseRequestOptions, newAuthHeaders, customHeaders, timeoutMs, deadline, endpoint));
|
|
51
|
+
const retryResponse = await this.fetchWithTimeout(url, requestOptions, endpoint, timeoutMs, timeoutController);
|
|
56
52
|
if (!retryResponse.ok) {
|
|
57
53
|
const errorText = await retryResponse.text();
|
|
58
54
|
throw new Error(`Request failed after retry: ${retryResponse.status} ${retryResponse.statusText} - ${errorText}`);
|
|
59
55
|
}
|
|
60
56
|
this.logger.debug('Retry request successful');
|
|
61
|
-
return
|
|
57
|
+
return this.parseResponse(retryResponse);
|
|
62
58
|
}
|
|
63
59
|
const errorText = await response.text();
|
|
64
60
|
throw new Error(`Request failed: ${response.status} ${response.statusText} - ${errorText}`);
|
|
65
61
|
}
|
|
66
62
|
this.logger.debug(`Request to ${endpoint} completed successfully`);
|
|
67
|
-
return
|
|
63
|
+
return this.parseResponse(response);
|
|
68
64
|
}
|
|
69
65
|
catch (error) {
|
|
70
66
|
this.logger.error(`Network error during request to ${endpoint}: ${error}`);
|
|
71
67
|
throw error;
|
|
72
68
|
}
|
|
73
69
|
}
|
|
70
|
+
buildRequestOptions(baseRequestOptions, authHeaders, customHeaders, timeoutMs, deadline, endpoint) {
|
|
71
|
+
const remainingMs = this.getRemainingTimeoutMs(timeoutMs, deadline, endpoint);
|
|
72
|
+
const timeoutController = createTimeoutAbortController({
|
|
73
|
+
timeoutMs: remainingMs,
|
|
74
|
+
timeoutMessage: `Request timed out after ${timeoutMs}ms`,
|
|
75
|
+
externalSignal: baseRequestOptions.signal,
|
|
76
|
+
abortMessage: 'Request aborted',
|
|
77
|
+
});
|
|
78
|
+
const requestOptions = {
|
|
79
|
+
...baseRequestOptions,
|
|
80
|
+
signal: timeoutController?.signal ?? (baseRequestOptions.signal ?? undefined),
|
|
81
|
+
headers: {
|
|
82
|
+
'Content-Type': 'application/json',
|
|
83
|
+
...authHeaders,
|
|
84
|
+
...customHeaders,
|
|
85
|
+
},
|
|
86
|
+
};
|
|
87
|
+
return {
|
|
88
|
+
requestOptions,
|
|
89
|
+
timeoutController,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
getBaseRequestOptions(options) {
|
|
93
|
+
const requestOptions = { ...options };
|
|
94
|
+
delete requestOptions.timeoutMs;
|
|
95
|
+
delete requestOptions.headers;
|
|
96
|
+
return requestOptions;
|
|
97
|
+
}
|
|
98
|
+
getRemainingTimeoutMs(timeoutMs, deadline, endpoint) {
|
|
99
|
+
if (timeoutMs <= 0 || deadline === undefined) {
|
|
100
|
+
return undefined;
|
|
101
|
+
}
|
|
102
|
+
const remainingMs = deadline - Date.now();
|
|
103
|
+
if (remainingMs <= 0) {
|
|
104
|
+
throw new Error(`Request timed out after ${timeoutMs}ms: ${endpoint}`);
|
|
105
|
+
}
|
|
106
|
+
return remainingMs;
|
|
107
|
+
}
|
|
108
|
+
async fetchWithTimeout(url, requestOptions, endpoint, timeoutMs, timeoutController) {
|
|
109
|
+
try {
|
|
110
|
+
return await fetch(url, requestOptions);
|
|
111
|
+
}
|
|
112
|
+
catch (error) {
|
|
113
|
+
if (isAbortError(error)) {
|
|
114
|
+
if (timeoutController?.didTimeout()) {
|
|
115
|
+
throw new Error(`Request timed out after ${timeoutMs}ms: ${endpoint}`);
|
|
116
|
+
}
|
|
117
|
+
throw new Error(`Request aborted: ${endpoint}`);
|
|
118
|
+
}
|
|
119
|
+
throw error;
|
|
120
|
+
}
|
|
121
|
+
finally {
|
|
122
|
+
timeoutController?.clear();
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
async parseResponse(response) {
|
|
126
|
+
if (response.status === 204 || response.status === 205) {
|
|
127
|
+
return undefined;
|
|
128
|
+
}
|
|
129
|
+
const contentType = response.headers?.get?.('content-type')?.toLowerCase() ?? '';
|
|
130
|
+
if (contentType.includes('application/json')) {
|
|
131
|
+
return await response.json();
|
|
132
|
+
}
|
|
133
|
+
if (typeof response.json === 'function' && contentType.length === 0) {
|
|
134
|
+
try {
|
|
135
|
+
return await response.json();
|
|
136
|
+
}
|
|
137
|
+
catch {
|
|
138
|
+
// Fall through to text parsing.
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
const text = typeof response.text === 'function' ? await response.text() : '';
|
|
142
|
+
if (text.length === 0) {
|
|
143
|
+
return undefined;
|
|
144
|
+
}
|
|
145
|
+
try {
|
|
146
|
+
return JSON.parse(text);
|
|
147
|
+
}
|
|
148
|
+
catch {
|
|
149
|
+
return text;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
74
152
|
/**
|
|
75
153
|
* GET request
|
|
76
154
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../../src/clients/base/http-client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"http-client.js","sourceRoot":"","sources":["../../../src/clients/base/http-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,8 @@ import { OAuthTokenResponse } from '../../types/types.js';
|
|
|
18
18
|
export declare class TokenManager {
|
|
19
19
|
private static instance;
|
|
20
20
|
private tokens;
|
|
21
|
+
private static readonly MAX_TOKEN_ENTRIES;
|
|
22
|
+
private static readonly EXPIRATION_BUFFER_MS;
|
|
21
23
|
private constructor();
|
|
22
24
|
/**
|
|
23
25
|
* Get the singleton instance of TokenManager
|
|
@@ -65,5 +67,6 @@ export declare class TokenManager {
|
|
|
65
67
|
* This is called automatically during token validation but can be triggered manually
|
|
66
68
|
*/
|
|
67
69
|
cleanupExpiredTokens(): number;
|
|
70
|
+
private evictOldestToken;
|
|
68
71
|
}
|
|
69
72
|
//# sourceMappingURL=oauth-token.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-token.d.ts","sourceRoot":"","sources":["../../../src/clients/base/oauth-token.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAc,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAEtE;;;GAGG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAe;IACtC,OAAO,CAAC,MAAM,CAAsC;
|
|
1
|
+
{"version":3,"file":"oauth-token.d.ts","sourceRoot":"","sources":["../../../src/clients/base/oauth-token.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAc,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAEtE;;;GAGG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAe;IACtC,OAAO,CAAC,MAAM,CAAsC;IACpD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAQ;IACjD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAa;IAEzD,OAAO;IAEP;;OAEG;IACH,MAAM,CAAC,WAAW,IAAI,YAAY;IAOlC;;;OAGG;IACH,OAAO,CAAC,WAAW;IAKnB;;;OAGG;IACH,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO;IAoBzD;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAUhE;;;OAGG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,kBAAkB,GAAG,IAAI;IA4BvF;;OAEG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKpD;;OAEG;IACH,cAAc,IAAI,IAAI;IAItB;;;OAGG;IACH,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI;IAWnE;;OAEG;IACH,aAAa,IAAI,MAAM;IAIvB;;;OAGG;IACH,oBAAoB,IAAI,MAAM;IAe9B,OAAO,CAAC,gBAAgB;CAezB"}
|
|
@@ -17,6 +17,8 @@
|
|
|
17
17
|
export class TokenManager {
|
|
18
18
|
static instance;
|
|
19
19
|
tokens = new Map();
|
|
20
|
+
static MAX_TOKEN_ENTRIES = 1000;
|
|
21
|
+
static EXPIRATION_BUFFER_MS = 60 * 1000;
|
|
20
22
|
constructor() { }
|
|
21
23
|
/**
|
|
22
24
|
* Get the singleton instance of TokenManager
|
|
@@ -47,8 +49,7 @@ export class TokenManager {
|
|
|
47
49
|
}
|
|
48
50
|
// Add 60-second buffer to avoid using tokens that are about to expire
|
|
49
51
|
const now = Date.now();
|
|
50
|
-
const
|
|
51
|
-
const isValid = token.expiresAt > (now + expirationBuffer);
|
|
52
|
+
const isValid = token.expiresAt > (now + TokenManager.EXPIRATION_BUFFER_MS);
|
|
52
53
|
// Proactively clean up expired tokens
|
|
53
54
|
if (!isValid) {
|
|
54
55
|
this.tokens.delete(key);
|
|
@@ -80,6 +81,11 @@ export class TokenManager {
|
|
|
80
81
|
throw new Error('Invalid token response: missing or invalid expires_in');
|
|
81
82
|
}
|
|
82
83
|
const key = this.getTokenKey(hostname, clientId);
|
|
84
|
+
// Keep storage bounded and clear stale entries before inserting.
|
|
85
|
+
this.cleanupExpiredTokens();
|
|
86
|
+
if (!this.tokens.has(key) && this.tokens.size >= TokenManager.MAX_TOKEN_ENTRIES) {
|
|
87
|
+
this.evictOldestToken();
|
|
88
|
+
}
|
|
83
89
|
const now = Date.now();
|
|
84
90
|
const token = {
|
|
85
91
|
accessToken: tokenResponse.access_token,
|
|
@@ -125,14 +131,28 @@ export class TokenManager {
|
|
|
125
131
|
*/
|
|
126
132
|
cleanupExpiredTokens() {
|
|
127
133
|
const now = Date.now();
|
|
134
|
+
const cutoff = now + TokenManager.EXPIRATION_BUFFER_MS;
|
|
128
135
|
let cleanedCount = 0;
|
|
129
136
|
for (const [key, token] of this.tokens.entries()) {
|
|
130
|
-
if (token.expiresAt <=
|
|
137
|
+
if (token.expiresAt <= cutoff) {
|
|
131
138
|
this.tokens.delete(key);
|
|
132
139
|
cleanedCount++;
|
|
133
140
|
}
|
|
134
141
|
}
|
|
135
142
|
return cleanedCount;
|
|
136
143
|
}
|
|
144
|
+
evictOldestToken() {
|
|
145
|
+
let oldestKey;
|
|
146
|
+
let oldestExpiration = Number.POSITIVE_INFINITY;
|
|
147
|
+
for (const [key, token] of this.tokens.entries()) {
|
|
148
|
+
if (token.expiresAt < oldestExpiration) {
|
|
149
|
+
oldestExpiration = token.expiresAt;
|
|
150
|
+
oldestKey = key;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
if (oldestKey) {
|
|
154
|
+
this.tokens.delete(oldestKey);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
137
157
|
}
|
|
138
158
|
//# sourceMappingURL=oauth-token.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-token.js","sourceRoot":"","sources":["../../../src/clients/base/oauth-token.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH;;;GAGG;AACH,MAAM,OAAO,YAAY;IACf,MAAM,CAAC,QAAQ,CAAe;IAC9B,MAAM,GAA4B,IAAI,GAAG,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"oauth-token.js","sourceRoot":"","sources":["../../../src/clients/base/oauth-token.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH;;;GAGG;AACH,MAAM,OAAO,YAAY;IACf,MAAM,CAAC,QAAQ,CAAe;IAC9B,MAAM,GAA4B,IAAI,GAAG,EAAE,CAAC;IAC5C,MAAM,CAAU,iBAAiB,GAAG,IAAI,CAAC;IACzC,MAAM,CAAU,oBAAoB,GAAG,EAAE,GAAG,IAAI,CAAC;IAEzD,gBAAuB,CAAC;IAExB;;OAEG;IACH,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YAC3B,YAAY,CAAC,QAAQ,GAAG,IAAI,YAAY,EAAE,CAAC;QAC7C,CAAC;QACD,OAAO,YAAY,CAAC,QAAQ,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACK,WAAW,CAAC,QAAgB,EAAE,QAAgB;QACpD,oFAAoF;QACpF,OAAO,GAAG,QAAQ,IAAI,QAAQ,EAAE,CAAC;IACnC,CAAC;IAED;;;OAGG;IACH,YAAY,CAAC,QAAgB,EAAE,QAAgB;QAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QAED,sEAAsE;QACtE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,GAAG,CAAC,GAAG,GAAG,YAAY,CAAC,oBAAoB,CAAC,CAAC;QAE5E,sCAAsC;QACtC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,QAAgB,EAAE,QAAgB;QAC9C,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnC,OAAO,KAAK,EAAE,WAAW,IAAI,IAAI,CAAC;IACpC,CAAC;IAED;;;OAGG;IACH,UAAU,CAAC,QAAgB,EAAE,QAAgB,EAAE,aAAiC;QAC9E,0BAA0B;QAC1B,IAAI,CAAC,aAAa,CAAC,YAAY,IAAI,OAAO,aAAa,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YAClF,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAC7E,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,UAAU,IAAI,OAAO,aAAa,CAAC,UAAU,KAAK,QAAQ,IAAI,aAAa,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC;YAC/G,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAEjD,iEAAiE;QACjE,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,YAAY,CAAC,iBAAiB,EAAE,CAAC;YAChF,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,MAAM,KAAK,GAAe;YACxB,WAAW,EAAE,aAAa,CAAC,YAAY;YACvC,SAAS,EAAE,aAAa,CAAC,UAAU,IAAI,QAAQ;YAC/C,SAAS,EAAE,GAAG,GAAG,CAAC,aAAa,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,kCAAkC;SACvF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,QAAgB,EAAE,QAAgB;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,cAAc;QACZ,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED;;;OAGG;IACH,kBAAkB,CAAC,QAAgB,EAAE,QAAgB;QACnD,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,aAAa;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACH,oBAAoB;QAClB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,GAAG,GAAG,YAAY,CAAC,oBAAoB,CAAC;QACvD,IAAI,YAAY,GAAG,CAAC,CAAC;QAErB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACjD,IAAI,KAAK,CAAC,SAAS,IAAI,MAAM,EAAE,CAAC;gBAC9B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACxB,YAAY,EAAE,CAAC;YACjB,CAAC;QACH,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAEO,gBAAgB;QACtB,IAAI,SAA6B,CAAC;QAClC,IAAI,gBAAgB,GAAG,MAAM,CAAC,iBAAiB,CAAC;QAEhD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACjD,IAAI,KAAK,CAAC,SAAS,GAAG,gBAAgB,EAAE,CAAC;gBACvC,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAC;gBACnC,SAAS,GAAG,GAAG,CAAC;YAClB,CAAC;QACH,CAAC;QAED,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAChC,CAAC;IACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ocapi-auth-client.d.ts","sourceRoot":"","sources":["../../../src/clients/base/ocapi-auth-client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,WAAW,EAAsB,MAAM,sBAAsB,CAAC;AAEvE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"ocapi-auth-client.d.ts","sourceRoot":"","sources":["../../../src/clients/base/ocapi-auth-client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,WAAW,EAAsB,MAAM,sBAAsB,CAAC;AAEvE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAYlD;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,cAAc;IACjD,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,YAAY,CAAe;gBAEvB,MAAM,EAAE,WAAW;IAM/B;;OAEG;cACa,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAOjE;;OAEG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAKhD;;;OAGG;IACH,OAAO,CAAC,UAAU;IAIlB;;OAEG;YACW,cAAc;IAc5B;;OAEG;YACW,eAAe;IAwD7B;;OAEG;IACH,kBAAkB,IAAI,IAAI,GAAG,IAAI;IAIjC;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAMpC"}
|
|
@@ -7,11 +7,13 @@
|
|
|
7
7
|
import { TokenManager } from './oauth-token.js';
|
|
8
8
|
import { BaseHttpClient } from './http-client.js';
|
|
9
9
|
import { buildOCAPIAuthUrl } from '../../utils/ocapi-url-builder.js';
|
|
10
|
+
import { createTimeoutAbortController, isAbortError } from '../../utils/abort-utils.js';
|
|
10
11
|
// OCAPI authentication constants
|
|
11
12
|
const OCAPI_AUTH_CONSTANTS = {
|
|
12
13
|
DEFAULT_AUTH_URL: 'https://account.demandware.com/dwsso/oauth2/access_token',
|
|
13
14
|
GRANT_TYPE: 'client_credentials',
|
|
14
15
|
FORM_CONTENT_TYPE: 'application/x-www-form-urlencoded',
|
|
16
|
+
REQUEST_TIMEOUT_MS: 15000,
|
|
15
17
|
};
|
|
16
18
|
/**
|
|
17
19
|
* OCAPI Authentication Client
|
|
@@ -72,6 +74,10 @@ export class OCAPIAuthClient extends BaseHttpClient {
|
|
|
72
74
|
// Get the appropriate auth URL (localhost for mock, production for real SFCC)
|
|
73
75
|
const authUrl = this.getAuthUrl();
|
|
74
76
|
this.logger.debug(`Requesting token from: ${authUrl}`);
|
|
77
|
+
const timeoutController = createTimeoutAbortController({
|
|
78
|
+
timeoutMs: OCAPI_AUTH_CONSTANTS.REQUEST_TIMEOUT_MS,
|
|
79
|
+
timeoutMessage: `OAuth request timed out after ${OCAPI_AUTH_CONSTANTS.REQUEST_TIMEOUT_MS}ms`,
|
|
80
|
+
});
|
|
75
81
|
try {
|
|
76
82
|
const response = await fetch(authUrl, {
|
|
77
83
|
method: 'POST',
|
|
@@ -80,6 +86,7 @@ export class OCAPIAuthClient extends BaseHttpClient {
|
|
|
80
86
|
'Content-Type': OCAPI_AUTH_CONSTANTS.FORM_CONTENT_TYPE,
|
|
81
87
|
},
|
|
82
88
|
body: `grant_type=${OCAPI_AUTH_CONSTANTS.GRANT_TYPE}`,
|
|
89
|
+
signal: timeoutController?.signal,
|
|
83
90
|
});
|
|
84
91
|
if (!response.ok) {
|
|
85
92
|
const errorText = await response.text();
|
|
@@ -92,8 +99,21 @@ export class OCAPIAuthClient extends BaseHttpClient {
|
|
|
92
99
|
return tokenResponse.access_token;
|
|
93
100
|
}
|
|
94
101
|
catch (error) {
|
|
95
|
-
|
|
96
|
-
|
|
102
|
+
const isAbort = isAbortError(error);
|
|
103
|
+
if (isAbort) {
|
|
104
|
+
const timeoutError = `OAuth request timed out after ${OCAPI_AUTH_CONSTANTS.REQUEST_TIMEOUT_MS}ms`;
|
|
105
|
+
if (timeoutController?.didTimeout()) {
|
|
106
|
+
this.logger.error(timeoutError);
|
|
107
|
+
throw new Error(timeoutError, { cause: error });
|
|
108
|
+
}
|
|
109
|
+
throw new Error('OAuth request aborted', { cause: error });
|
|
110
|
+
}
|
|
111
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
112
|
+
this.logger.error(`Failed to get access token: ${message}`);
|
|
113
|
+
throw new Error(`Failed to get access token: ${message}`, { cause: error });
|
|
114
|
+
}
|
|
115
|
+
finally {
|
|
116
|
+
timeoutController?.clear();
|
|
97
117
|
}
|
|
98
118
|
}
|
|
99
119
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ocapi-auth-client.js","sourceRoot":"","sources":["../../../src/clients/base/ocapi-auth-client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"ocapi-auth-client.js","sourceRoot":"","sources":["../../../src/clients/base/ocapi-auth-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,17 +34,20 @@ export declare class ClassNameResolver {
|
|
|
34
34
|
* Find class matches by simple class name
|
|
35
35
|
* Useful when multiple packages contain classes with the same name
|
|
36
36
|
*/
|
|
37
|
-
static findClassMatches(targetClassName: string, classCache: Map<string,
|
|
37
|
+
static findClassMatches<T extends ClassCacheEntry>(targetClassName: string, classCache: Map<string, T>): Array<{
|
|
38
38
|
key: string;
|
|
39
|
-
info:
|
|
39
|
+
info: T;
|
|
40
40
|
}>;
|
|
41
41
|
/**
|
|
42
42
|
* Resolve class name with fallback logic
|
|
43
43
|
* First tries exact match, then falls back to simple name matching
|
|
44
44
|
*/
|
|
45
|
-
static resolveClassName(className: string, classCache: Map<string,
|
|
45
|
+
static resolveClassName<T extends ClassCacheEntry>(className: string, classCache: Map<string, T>): {
|
|
46
46
|
key: string;
|
|
47
|
-
info:
|
|
47
|
+
info: T;
|
|
48
48
|
} | null;
|
|
49
49
|
}
|
|
50
|
+
export interface ClassCacheEntry {
|
|
51
|
+
className: string;
|
|
52
|
+
}
|
|
50
53
|
//# sourceMappingURL=class-name-resolver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"class-name-resolver.d.ts","sourceRoot":"","sources":["../../../src/clients/docs/class-name-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,qBAAa,iBAAiB;IAC5B;;;;;;OAMG;IACH,MAAM,CAAC,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAcpD;;;;;OAKG;IACH,MAAM,CAAC,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKxD;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIlD;;;OAGG;IACH,MAAM,CAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"class-name-resolver.d.ts","sourceRoot":"","sources":["../../../src/clients/docs/class-name-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,qBAAa,iBAAiB;IAC5B;;;;;;OAMG;IACH,MAAM,CAAC,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAcpD;;;;;OAKG;IACH,MAAM,CAAC,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKxD;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIlD;;;OAGG;IACH,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,eAAe,EAC/C,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GACzB,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,CAAC,CAAA;KAAE,CAAC;IASlC;;;OAGG;IACH,MAAM,CAAC,gBAAgB,CAAC,CAAC,SAAS,eAAe,EAC/C,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,GACzB;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,CAAC,CAAA;KAAE,GAAG,IAAI;CAsBnC;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;CACnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"class-name-resolver.js","sourceRoot":"","sources":["../../../src/clients/docs/class-name-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,OAAO,iBAAiB;IAC5B;;;;;;OAMG;IACH,MAAM,CAAC,kBAAkB,CAAC,SAAiB;QACzC,2FAA2F;QAC3F,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxD,4EAA4E;YAC5E,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gBACxC,MAAM,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAChD,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,eAAe,EAAE,CAAC;YACxD,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,sBAAsB,CAAC,SAAiB;QAC7C,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnC,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CAAC,SAAiB;QACvC,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,gBAAgB,CACrB,eAAuB,EACvB,
|
|
1
|
+
{"version":3,"file":"class-name-resolver.js","sourceRoot":"","sources":["../../../src/clients/docs/class-name-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"documentation-scanner.d.ts","sourceRoot":"","sources":["../../../src/clients/docs/documentation-scanner.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAS;;IAMvB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAyBvB
|
|
1
|
+
{"version":3,"file":"documentation-scanner.d.ts","sourceRoot":"","sources":["../../../src/clients/docs/documentation-scanner.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,MAAM,CAAS;;IAMvB;;;;OAIG;IACH,OAAO,CAAC,eAAe;IAyBvB,OAAO,CAAC,gBAAgB;YAKV,oBAAoB;IASlC;;OAEG;IACH,OAAO,CAAC,gBAAgB;IA4BxB;;OAEG;YACW,gBAAgB;IA6B9B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAgB3B;;OAEG;YACW,qBAAqB;IA2CnC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAM;IAEjD;;;OAGG;YACW,oBAAoB;IAoDlC;;;;OAIG;IACG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;CAgC/E"}
|
|
@@ -39,6 +39,19 @@ export class DocumentationScanner {
|
|
|
39
39
|
// Exclude any other non-SFCC directories
|
|
40
40
|
return false;
|
|
41
41
|
}
|
|
42
|
+
isPathWithinRoot(rootPath, candidatePath) {
|
|
43
|
+
const rel = path.relative(rootPath, candidatePath);
|
|
44
|
+
return rel === '' || (!rel.startsWith('..') && !path.isAbsolute(rel));
|
|
45
|
+
}
|
|
46
|
+
async resolveCanonicalPath(inputPath) {
|
|
47
|
+
try {
|
|
48
|
+
return await fs.realpath(path.resolve(inputPath));
|
|
49
|
+
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
this.logger.warn(`Warning: Could not resolve canonical path for ${inputPath}: ${String(error)}`);
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
42
55
|
/**
|
|
43
56
|
* Validate file name for security concerns
|
|
44
57
|
*/
|
|
@@ -68,22 +81,25 @@ export class DocumentationScanner {
|
|
|
68
81
|
/**
|
|
69
82
|
* Validate file path for security concerns
|
|
70
83
|
*/
|
|
71
|
-
validateFilePath(filePath,
|
|
72
|
-
// Additional security validation - ensure the resolved path is within the package directory
|
|
84
|
+
async validateFilePath(filePath, canonicalPackagePath, canonicalDocsPath) {
|
|
73
85
|
const resolvedPath = path.resolve(filePath);
|
|
74
|
-
|
|
75
|
-
const resolvedDocsPath = path.resolve(docsPath);
|
|
76
|
-
// Ensure the file is within the package directory and docs directory
|
|
77
|
-
if (!resolvedPath.startsWith(resolvedPackagePath) || !resolvedPath.startsWith(resolvedDocsPath)) {
|
|
78
|
-
this.logger.warn(`Warning: File path outside allowed directory: ${filePath}`);
|
|
79
|
-
return false;
|
|
80
|
-
}
|
|
81
|
-
// Ensure the file still ends with .md after path resolution
|
|
86
|
+
// Ensure the file still ends with .md before touching the filesystem.
|
|
82
87
|
if (!resolvedPath.toLowerCase().endsWith('.md')) {
|
|
83
88
|
this.logger.warn(`Warning: File does not reference a markdown file: ${filePath}`);
|
|
84
|
-
return
|
|
89
|
+
return null;
|
|
85
90
|
}
|
|
86
|
-
|
|
91
|
+
const canonicalFilePath = await this.resolveCanonicalPath(filePath);
|
|
92
|
+
if (!canonicalFilePath) {
|
|
93
|
+
return null;
|
|
94
|
+
}
|
|
95
|
+
// Ensure the canonical path stays inside both package and docs roots.
|
|
96
|
+
const withinPackageRoot = this.isPathWithinRoot(canonicalPackagePath, canonicalFilePath);
|
|
97
|
+
const withinDocsRoot = this.isPathWithinRoot(canonicalDocsPath, canonicalFilePath);
|
|
98
|
+
if (!withinPackageRoot || !withinDocsRoot) {
|
|
99
|
+
this.logger.warn(`Warning: File path outside allowed directory: ${filePath}`);
|
|
100
|
+
return null;
|
|
101
|
+
}
|
|
102
|
+
return canonicalFilePath;
|
|
87
103
|
}
|
|
88
104
|
/**
|
|
89
105
|
* Validate file content for security concerns
|
|
@@ -104,18 +120,18 @@ export class DocumentationScanner {
|
|
|
104
120
|
/**
|
|
105
121
|
* Read and validate a single documentation file
|
|
106
122
|
*/
|
|
107
|
-
async readDocumentationFile(fileName, packagePath, packageName,
|
|
123
|
+
async readDocumentationFile(fileName, packagePath, packageName, canonicalPackagePath, canonicalDocsPath) {
|
|
108
124
|
if (!this.validateFileName(fileName)) {
|
|
109
125
|
return null;
|
|
110
126
|
}
|
|
111
127
|
const className = fileName.replace('.md', '');
|
|
112
128
|
const filePath = path.join(packagePath, fileName);
|
|
113
|
-
|
|
129
|
+
const canonicalFilePath = await this.validateFilePath(filePath, canonicalPackagePath, canonicalDocsPath);
|
|
130
|
+
if (!canonicalFilePath) {
|
|
114
131
|
return null;
|
|
115
132
|
}
|
|
116
133
|
try {
|
|
117
|
-
const
|
|
118
|
-
const content = await fs.readFile(resolvedPath, 'utf-8');
|
|
134
|
+
const content = await fs.readFile(canonicalFilePath, 'utf-8');
|
|
119
135
|
if (!this.validateFileContent(content, fileName)) {
|
|
120
136
|
return null;
|
|
121
137
|
}
|
|
@@ -139,6 +155,12 @@ export class DocumentationScanner {
|
|
|
139
155
|
*/
|
|
140
156
|
async scanPackageDirectory(packageName, packagePath, docsPath) {
|
|
141
157
|
try {
|
|
158
|
+
const canonicalPackagePath = await this.resolveCanonicalPath(packagePath);
|
|
159
|
+
const canonicalDocsPath = await this.resolveCanonicalPath(docsPath);
|
|
160
|
+
if (!canonicalPackagePath || !canonicalDocsPath) {
|
|
161
|
+
this.logger.warn(`Warning: Could not resolve canonical roots for package ${packageName}`);
|
|
162
|
+
return [];
|
|
163
|
+
}
|
|
142
164
|
const files = await fs.readdir(packagePath);
|
|
143
165
|
// Filter to only markdown files with valid names
|
|
144
166
|
const mdFiles = files.filter(file => {
|
|
@@ -152,7 +174,7 @@ export class DocumentationScanner {
|
|
|
152
174
|
const classInfos = [];
|
|
153
175
|
for (let i = 0; i < mdFiles.length; i += DocumentationScanner.PARALLEL_BATCH_SIZE) {
|
|
154
176
|
const batch = mdFiles.slice(i, i + DocumentationScanner.PARALLEL_BATCH_SIZE);
|
|
155
|
-
const results = await Promise.all(batch.map(file => this.readDocumentationFile(file, packagePath, packageName,
|
|
177
|
+
const results = await Promise.all(batch.map(file => this.readDocumentationFile(file, packagePath, packageName, canonicalPackagePath, canonicalDocsPath)));
|
|
156
178
|
// Filter out null results and add to classInfos
|
|
157
179
|
for (const result of results) {
|
|
158
180
|
if (result) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"documentation-scanner.js","sourceRoot":"","sources":["../../../src/clients/docs/documentation-scanner.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS/C,MAAM,OAAO,oBAAoB;IACvB,MAAM,CAAS;IAEvB;QACE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAC;IAC9D,CAAC;IAED;;;;OAIG;IACK,eAAe,CAAC,aAAqB;QAC3C,qDAAqD;QACrD,IAAI,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,gEAAgE;QAChE,IAAI,aAAa,KAAK,UAAU,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,iDAAiD;QACjD,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,gEAAgE;QAChE,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,yCAAyC;QACzC,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACK,gBAAgB,CAAC,QAAgB;QACvC,2EAA2E;QAC3E,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,QAAQ,EAAE,CAAC,CAAC;YACjE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,sEAAsE;QACtE,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACzD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,QAAQ,EAAE,CAAC,CAAC;YACxE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,oDAAoD;QACpD,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACjF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yDAAyD,QAAQ,EAAE,CAAC,CAAC;YACtF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,oFAAoF;QACpF,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,QAAQ,EAAE,CAAC,CAAC;YAChF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACK,
|
|
1
|
+
{"version":3,"file":"documentation-scanner.js","sourceRoot":"","sources":["../../../src/clients/docs/documentation-scanner.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,9 @@ export interface ClassDetailsFilterOptions {
|
|
|
24
24
|
includeInheritance?: boolean;
|
|
25
25
|
search?: string;
|
|
26
26
|
}
|
|
27
|
+
type ExpandedClassDetails = SFCCClassDetails & {
|
|
28
|
+
referencedTypes?: SFCCClassDetails[];
|
|
29
|
+
};
|
|
27
30
|
export declare class SFCCDocumentationClient {
|
|
28
31
|
private docsPath;
|
|
29
32
|
private classCache;
|
|
@@ -63,9 +66,7 @@ export declare class SFCCDocumentationClient {
|
|
|
63
66
|
/**
|
|
64
67
|
* Get class details with optional expansion of referenced types and filtering
|
|
65
68
|
*/
|
|
66
|
-
getClassDetailsExpanded(className: string, expand?: boolean, filterOptions?: ClassDetailsFilterOptions): Promise<
|
|
67
|
-
referencedTypes?: SFCCClassDetails[];
|
|
68
|
-
} | null>;
|
|
69
|
+
getClassDetailsExpanded(className: string, expand?: boolean, filterOptions?: ClassDetailsFilterOptions): Promise<ExpandedClassDetails | null>;
|
|
69
70
|
/**
|
|
70
71
|
* Apply filters and search to class details
|
|
71
72
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docs-client.d.ts","sourceRoot":"","sources":["../../src/clients/docs-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAKnF,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC;AAC5D,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEjF,MAAM,WAAW,yBAAyB;IACxC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,UAAU,CAAyC;IAC3D,OAAO,CAAC,WAAW,CAA4E;IAC/F,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,kBAAkB,CAAqB;;IAU/C;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBjC;;;OAGG;YACW,gBAAgB;IA4B9B;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAO9C;;OAEG;IACG,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAqBrD;;OAEG;IACG,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAqBtE;;OAEG;IACG,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAuB1E;;OAEG;IACG,uBAAuB,CAC3B,SAAS,EAAE,MAAM,EACjB,MAAM,GAAE,OAAe,EACvB,aAAa,CAAC,EAAE,yBAAyB,GACxC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"docs-client.d.ts","sourceRoot":"","sources":["../../src/clients/docs-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAKnF,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC;AAC5D,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEjF,MAAM,WAAW,yBAAyB;IACxC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,KAAK,oBAAoB,GAAG,gBAAgB,GAAG;IAAE,eAAe,CAAC,EAAE,gBAAgB,EAAE,CAAA;CAAE,CAAC;AAExF,qBAAa,uBAAuB;IAClC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,UAAU,CAAyC;IAC3D,OAAO,CAAC,WAAW,CAA4E;IAC/F,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,oBAAoB,CAAuB;IACnD,OAAO,CAAC,kBAAkB,CAAqB;;IAU/C;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBjC;;;OAGG;YACW,gBAAgB;IA4B9B;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAO9C;;OAEG;IACG,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAqBrD;;OAEG;IACG,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAqBtE;;OAEG;IACG,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAuB1E;;OAEG;IACG,uBAAuB,CAC3B,SAAS,EAAE,MAAM,EACjB,MAAM,GAAE,OAAe,EACvB,aAAa,CAAC,EAAE,yBAAyB,GACxC,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;IAkEvC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA4D7B;;OAEG;IACH,OAAO,CAAC,aAAa;IAQrB;;;;OAIG;IACG,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,EAAE,CAAC;IA0B7F;;OAEG;IACH,aAAa,IAAI,UAAU,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAIxD;;OAEG;IACH,UAAU,IAAI,IAAI;IAIlB;;OAEG;IACH,OAAO,IAAI,IAAI;CAGhB"}
|