@apimatic/cli 1.1.0-alpha.20 → 1.1.0-alpha.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 +119 -91
- package/lib/actions/action-result.d.ts +8 -3
- package/lib/actions/action-result.js +34 -15
- package/lib/actions/action-result.js.map +1 -1
- package/lib/actions/api/transform.d.ts +15 -0
- package/lib/actions/api/transform.js +48 -0
- package/lib/actions/api/transform.js.map +1 -0
- package/lib/actions/api/validate.d.ts +12 -0
- package/lib/actions/api/validate.js +41 -0
- package/lib/actions/api/validate.js.map +1 -0
- package/lib/actions/auth/login.d.ts +6 -5
- package/lib/actions/auth/login.js +25 -33
- package/lib/actions/auth/login.js.map +1 -1
- package/lib/actions/auth/logout.d.ts +8 -0
- package/lib/actions/auth/logout.js +15 -0
- package/lib/actions/auth/logout.js.map +1 -0
- package/lib/actions/auth/status.d.ts +11 -0
- package/lib/actions/auth/status.js +26 -0
- package/lib/actions/auth/status.js.map +1 -0
- package/lib/actions/portal/copilot.d.ts +7 -2
- package/lib/actions/portal/copilot.js +72 -32
- package/lib/actions/portal/copilot.js.map +1 -1
- package/lib/actions/portal/generate.d.ts +5 -5
- package/lib/actions/portal/generate.js +33 -35
- package/lib/actions/portal/generate.js.map +1 -1
- package/lib/actions/portal/quickstart.d.ts +16 -0
- package/lib/actions/portal/quickstart.js +145 -0
- package/lib/actions/portal/quickstart.js.map +1 -0
- package/lib/actions/portal/recipe/new-recipe.d.ts +11 -20
- package/lib/actions/portal/recipe/new-recipe.js +147 -221
- package/lib/actions/portal/recipe/new-recipe.js.map +1 -1
- package/lib/actions/portal/serve.d.ts +12 -10
- package/lib/actions/portal/serve.js +112 -17
- package/lib/actions/portal/serve.js.map +1 -1
- package/lib/actions/portal/toc/new-toc.d.ts +16 -15
- package/lib/actions/portal/toc/new-toc.js +80 -116
- package/lib/actions/portal/toc/new-toc.js.map +1 -1
- package/lib/actions/sdk/generate.d.ts +5 -6
- package/lib/actions/sdk/generate.js +22 -47
- package/lib/actions/sdk/generate.js.map +1 -1
- package/lib/application/portal/recipe/portal-recipe.d.ts +2 -2
- package/lib/application/portal/recipe/portal-recipe.js +9 -9
- package/lib/application/portal/recipe/portal-recipe.js.map +1 -1
- package/lib/application/portal/recipe/recipe-generator.d.ts +7 -2
- package/lib/application/portal/recipe/recipe-generator.js +21 -22
- package/lib/application/portal/recipe/recipe-generator.js.map +1 -1
- package/lib/client-utils/auth-manager.d.ts +1 -1
- package/lib/client-utils/auth-manager.js +3 -4
- package/lib/client-utils/auth-manager.js.map +1 -1
- package/lib/commands/api/transform.d.ts +6 -3
- package/lib/commands/api/transform.js +43 -91
- package/lib/commands/api/transform.js.map +1 -1
- package/lib/commands/api/validate.d.ts +6 -3
- package/lib/commands/api/validate.js +27 -60
- package/lib/commands/api/validate.js.map +1 -1
- package/lib/commands/auth/login.d.ts +2 -1
- package/lib/commands/auth/login.js +15 -9
- package/lib/commands/auth/login.js.map +1 -1
- package/lib/commands/auth/logout.d.ts +3 -1
- package/lib/commands/auth/logout.js +12 -13
- package/lib/commands/auth/logout.js.map +1 -1
- package/lib/commands/auth/status.d.ts +1 -0
- package/lib/commands/auth/status.js +13 -11
- package/lib/commands/auth/status.js.map +1 -1
- package/lib/commands/portal/copilot.d.ts +3 -2
- package/lib/commands/portal/copilot.js +23 -21
- package/lib/commands/portal/copilot.js.map +1 -1
- package/lib/commands/portal/generate.d.ts +3 -4
- package/lib/commands/portal/generate.js +18 -13
- package/lib/commands/portal/generate.js.map +1 -1
- package/lib/commands/portal/quickstart.d.ts +3 -4
- package/lib/commands/portal/quickstart.js +27 -95
- package/lib/commands/portal/quickstart.js.map +1 -1
- package/lib/commands/portal/recipe/new.d.ts +3 -1
- package/lib/commands/portal/recipe/new.js +31 -23
- package/lib/commands/portal/recipe/new.js.map +1 -1
- package/lib/commands/portal/serve.d.ts +5 -5
- package/lib/commands/portal/serve.js +31 -57
- package/lib/commands/portal/serve.js.map +1 -1
- package/lib/commands/portal/toc/new.d.ts +2 -2
- package/lib/commands/portal/toc/new.js +35 -26
- package/lib/commands/portal/toc/new.js.map +1 -1
- package/lib/commands/sdk/generate.d.ts +5 -4
- package/lib/commands/sdk/generate.js +26 -17
- package/lib/commands/sdk/generate.js.map +1 -1
- package/lib/hooks/not-found.d.ts +3 -0
- package/lib/hooks/not-found.js +52 -0
- package/lib/hooks/not-found.js.map +1 -0
- package/lib/hooks/utils.d.ts +5 -0
- package/lib/hooks/utils.js +51 -0
- package/lib/hooks/utils.js.map +1 -0
- package/lib/infrastructure/api-utils.js +3 -2
- package/lib/infrastructure/api-utils.js.map +1 -1
- package/lib/{application/portal/serve/watcher-handler.d.ts → infrastructure/debounce-service.d.ts} +3 -3
- package/lib/{application/portal/serve/watcher-handler.js → infrastructure/debounce-service.js} +5 -4
- package/lib/infrastructure/debounce-service.js.map +1 -0
- package/lib/infrastructure/env-info.d.ts +5 -1
- package/lib/infrastructure/env-info.js +23 -2
- package/lib/infrastructure/env-info.js.map +1 -1
- package/lib/infrastructure/file-service.d.ts +7 -2
- package/lib/infrastructure/file-service.js +49 -8
- package/lib/infrastructure/file-service.js.map +1 -1
- package/lib/infrastructure/launcher-service.d.ts +7 -0
- package/lib/infrastructure/launcher-service.js +51 -0
- package/lib/infrastructure/launcher-service.js.map +1 -0
- package/lib/infrastructure/network-service.d.ts +3 -0
- package/lib/infrastructure/network-service.js +7 -0
- package/lib/infrastructure/network-service.js.map +1 -0
- package/lib/infrastructure/services/api-client-factory.d.ts +6 -0
- package/lib/infrastructure/services/api-client-factory.js +20 -0
- package/lib/infrastructure/services/api-client-factory.js.map +1 -0
- package/lib/infrastructure/services/api-service.d.ts +2 -2
- package/lib/infrastructure/services/api-service.js +8 -7
- package/lib/infrastructure/services/api-service.js.map +1 -1
- package/lib/infrastructure/services/auth-service.d.ts +1 -1
- package/lib/infrastructure/services/auth-service.js +10 -6
- package/lib/infrastructure/services/auth-service.js.map +1 -1
- package/lib/infrastructure/services/file-download-service.d.ts +15 -0
- package/lib/infrastructure/services/file-download-service.js +104 -0
- package/lib/infrastructure/services/file-download-service.js.map +1 -0
- package/lib/infrastructure/services/portal-service.d.ts +12 -11
- package/lib/infrastructure/services/portal-service.js +77 -83
- package/lib/infrastructure/services/portal-service.js.map +1 -1
- package/lib/infrastructure/services/telemetry-service.d.ts +3 -2
- package/lib/infrastructure/services/telemetry-service.js +4 -6
- package/lib/infrastructure/services/telemetry-service.js.map +1 -1
- package/lib/infrastructure/services/transformation-service.d.ts +23 -0
- package/lib/infrastructure/services/transformation-service.js +56 -0
- package/lib/infrastructure/services/transformation-service.js.map +1 -0
- package/lib/infrastructure/services/validation-service.d.ts +17 -0
- package/lib/infrastructure/services/validation-service.js +49 -0
- package/lib/infrastructure/services/validation-service.js.map +1 -0
- package/lib/prompts/api/transform.d.ts +11 -0
- package/lib/prompts/api/transform.js +30 -0
- package/lib/prompts/api/transform.js.map +1 -0
- package/lib/prompts/api/validate.d.ts +12 -0
- package/lib/prompts/api/validate.js +41 -0
- package/lib/prompts/api/validate.js.map +1 -0
- package/lib/prompts/auth/login.d.ts +6 -1
- package/lib/prompts/auth/login.js +12 -3
- package/lib/prompts/auth/login.js.map +1 -1
- package/lib/prompts/auth/logout.d.ts +3 -0
- package/lib/prompts/auth/logout.js +7 -0
- package/lib/prompts/auth/logout.js.map +1 -0
- package/lib/prompts/auth/status.d.ts +8 -0
- package/lib/prompts/auth/status.js +21 -0
- package/lib/prompts/auth/status.js.map +1 -0
- package/lib/prompts/format.d.ts +33 -0
- package/lib/prompts/format.js +99 -0
- package/lib/prompts/format.js.map +1 -0
- package/lib/prompts/portal/copilot.d.ts +15 -5
- package/lib/prompts/portal/copilot.js +49 -21
- package/lib/prompts/portal/copilot.js.map +1 -1
- package/lib/prompts/portal/generate.d.ts +9 -7
- package/lib/prompts/portal/generate.js +22 -23
- package/lib/prompts/portal/generate.js.map +1 -1
- package/lib/prompts/portal/quickstart.d.ts +30 -29
- package/lib/prompts/portal/quickstart.js +99 -193
- package/lib/prompts/portal/quickstart.js.map +1 -1
- package/lib/prompts/portal/recipe/new-recipe.d.ts +23 -18
- package/lib/prompts/portal/recipe/new-recipe.js +70 -108
- package/lib/prompts/portal/recipe/new-recipe.js.map +1 -1
- package/lib/prompts/portal/serve.d.ts +10 -3
- package/lib/prompts/portal/serve.js +30 -11
- package/lib/prompts/portal/serve.js.map +1 -1
- package/lib/prompts/portal/toc/new-toc.d.ts +12 -8
- package/lib/prompts/portal/toc/new-toc.js +20 -22
- package/lib/prompts/portal/toc/new-toc.js.map +1 -1
- package/lib/prompts/sdk/generate.d.ts +7 -7
- package/lib/prompts/sdk/generate.js +17 -23
- package/lib/prompts/sdk/generate.js.map +1 -1
- package/lib/types/api/account.d.ts +1 -1
- package/lib/types/api/transform.d.ts +14 -25
- package/lib/types/api/transform.js +16 -16
- package/lib/types/api/transform.js.map +1 -1
- package/lib/types/build/build.d.ts +9 -1
- package/lib/types/build/build.js +5 -2
- package/lib/types/build/build.js.map +1 -1
- package/lib/types/build-context.d.ts +5 -1
- package/lib/types/build-context.js +21 -4
- package/lib/types/build-context.js.map +1 -1
- package/lib/types/common/command-metadata.d.ts +4 -0
- package/lib/types/common/command-metadata.js +2 -0
- package/lib/types/common/command-metadata.js.map +1 -0
- package/lib/types/events/domain-event.d.ts +1 -1
- package/lib/types/events/domain-event.js.map +1 -1
- package/lib/types/events/quickstart-completed.d.ts +7 -0
- package/lib/types/events/quickstart-completed.js +10 -0
- package/lib/types/events/quickstart-completed.js.map +1 -0
- package/lib/types/events/quickstart-initiated.d.ts +7 -0
- package/lib/types/events/quickstart-initiated.js +10 -0
- package/lib/types/events/quickstart-initiated.js.map +1 -0
- package/lib/types/events/recipe-creation-failed.d.ts +1 -1
- package/lib/types/events/recipe-creation-failed.js +1 -1
- package/lib/types/events/recipe-creation-failed.js.map +1 -1
- package/lib/types/events/toc-creation-failed.d.ts +1 -1
- package/lib/types/events/toc-creation-failed.js +1 -1
- package/lib/types/events/toc-creation-failed.js.map +1 -1
- package/lib/types/file/directory.d.ts +17 -0
- package/lib/types/file/directory.js +86 -0
- package/lib/types/file/directory.js.map +1 -0
- package/lib/types/file/directoryPath.d.ts +3 -1
- package/lib/types/file/directoryPath.js +8 -2
- package/lib/types/file/directoryPath.js.map +1 -1
- package/lib/types/file/fileName.d.ts +3 -1
- package/lib/types/file/fileName.js +14 -2
- package/lib/types/file/fileName.js.map +1 -1
- package/lib/types/file/filePath.d.ts +2 -0
- package/lib/types/file/filePath.js +21 -0
- package/lib/types/file/filePath.js.map +1 -1
- package/lib/types/file/resource-input.d.ts +5 -0
- package/lib/types/file/resource-input.js +42 -0
- package/lib/types/file/resource-input.js.map +1 -0
- package/lib/types/file/urlPath.d.ts +6 -0
- package/lib/types/file/urlPath.js +22 -0
- package/lib/types/file/urlPath.js.map +1 -0
- package/lib/types/portal-context.d.ts +3 -1
- package/lib/types/portal-context.js +10 -0
- package/lib/types/portal-context.js.map +1 -1
- package/lib/types/recipe/recipe.d.ts +2 -17
- package/lib/types/recipe-context.d.ts +8 -0
- package/lib/types/recipe-context.js +21 -0
- package/lib/types/recipe-context.js.map +1 -0
- package/lib/types/resource-context.d.ts +12 -0
- package/lib/types/resource-context.js +30 -0
- package/lib/types/resource-context.js.map +1 -0
- package/lib/types/sdk/generate.d.ts +2 -15
- package/lib/types/sdk/generate.js +24 -10
- package/lib/types/sdk/generate.js.map +1 -1
- package/lib/types/sdk-context.d.ts +6 -5
- package/lib/types/sdk-context.js +12 -8
- package/lib/types/sdk-context.js.map +1 -1
- package/lib/types/sdl/sdl.d.ts +9 -0
- package/lib/types/sdl/sdl.js +46 -1
- package/lib/types/sdl/sdl.js.map +1 -1
- package/lib/types/spec-context.d.ts +3 -0
- package/lib/types/spec-context.js +7 -2
- package/lib/types/spec-context.js.map +1 -1
- package/lib/types/temp-context.d.ts +11 -0
- package/lib/types/temp-context.js +27 -0
- package/lib/types/temp-context.js.map +1 -0
- package/lib/types/toc-context.d.ts +12 -0
- package/lib/types/toc-context.js +26 -0
- package/lib/types/toc-context.js.map +1 -0
- package/lib/types/transform-context.d.ts +13 -0
- package/lib/types/transform-context.js +30 -0
- package/lib/types/transform-context.js.map +1 -0
- package/lib/types/utils.d.ts +0 -9
- package/lib/utils/string-utils.d.ts +1 -0
- package/lib/utils/string-utils.js +10 -0
- package/lib/utils/string-utils.js.map +1 -0
- package/lib/utils/utils.d.ts +2 -27
- package/lib/utils/utils.js +6 -145
- package/lib/utils/utils.js.map +1 -1
- package/package.json +11 -10
- package/lib/application/portal/serve/portal-watcher.d.ts +0 -11
- package/lib/application/portal/serve/portal-watcher.js +0 -64
- package/lib/application/portal/serve/portal-watcher.js.map +0 -1
- package/lib/application/portal/serve/serve-handler.d.ts +0 -16
- package/lib/application/portal/serve/serve-handler.js +0 -91
- package/lib/application/portal/serve/serve-handler.js.map +0 -1
- package/lib/application/portal/serve/watcher-handler.js.map +0 -1
- package/lib/application/portal/toc/sdl-parser.d.ts +0 -19
- package/lib/application/portal/toc/sdl-parser.js +0 -90
- package/lib/application/portal/toc/sdl-parser.js.map +0 -1
- package/lib/client-utils/sdk-client.d.ts +0 -22
- package/lib/client-utils/sdk-client.js +0 -89
- package/lib/client-utils/sdk-client.js.map +0 -1
- package/lib/config/env.d.ts +0 -26
- package/lib/config/env.js +0 -27
- package/lib/config/env.js.map +0 -1
- package/lib/controllers/api/transform.d.ts +0 -5
- package/lib/controllers/api/transform.js +0 -50
- package/lib/controllers/api/transform.js.map +0 -1
- package/lib/controllers/api/validate.d.ts +0 -3
- package/lib/controllers/api/validate.js +0 -29
- package/lib/controllers/api/validate.js.map +0 -1
- package/lib/controllers/portal/quickstart.d.ts +0 -15
- package/lib/controllers/portal/quickstart.js +0 -217
- package/lib/controllers/portal/quickstart.js.map +0 -1
- package/lib/prompts/portal/common/base-prompts.d.ts +0 -7
- package/lib/prompts/portal/common/base-prompts.js +0 -19
- package/lib/prompts/portal/common/base-prompts.js.map +0 -1
- package/lib/types/api/validate.d.ts +0 -12
- package/lib/types/api/validate.js +0 -2
- package/lib/types/api/validate.js.map +0 -1
- package/lib/types/common/result.d.ts +0 -17
- package/lib/types/common/result.js +0 -32
- package/lib/types/common/result.js.map +0 -1
- package/lib/types/portal/generate.d.ts +0 -13
- package/lib/types/portal/generate.js +0 -3
- package/lib/types/portal/generate.js.map +0 -1
- package/lib/types/portal/quickstart.d.ts +0 -17
- package/lib/types/portal/quickstart.js +0 -2
- package/lib/types/portal/quickstart.js.map +0 -1
- package/lib/types/portal/serve.d.ts +0 -12
- package/lib/types/portal/serve.js +0 -2
- package/lib/types/portal/serve.js.map +0 -1
- package/lib/validators/common/directoryValidator.d.ts +0 -5
- package/lib/validators/common/directoryValidator.js +0 -22
- package/lib/validators/common/directoryValidator.js.map +0 -1
- package/lib/validators/portal/serve-validator.d.ts +0 -6
- package/lib/validators/portal/serve-validator.js +0 -15
- package/lib/validators/portal/serve-validator.js.map +0 -1
package/lib/{application/portal/serve/watcher-handler.js → infrastructure/debounce-service.js}
RENAMED
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
|
|
1
|
+
import { clearTimeout, setTimeout } from "timers";
|
|
2
|
+
export class DebounceService {
|
|
2
3
|
constructor(debounceMs = 500) {
|
|
3
4
|
this.isProcessing = false;
|
|
4
5
|
this.latestHandler = null;
|
|
5
6
|
this.debounceTimer = null;
|
|
6
7
|
this.debounceMs = debounceMs;
|
|
7
8
|
}
|
|
8
|
-
async
|
|
9
|
+
async batchSingleRequest(handler) {
|
|
9
10
|
// Always store the latest handler
|
|
10
11
|
this.latestHandler = handler;
|
|
11
12
|
// If already processing, don't start a new timer. Just update the latest handler
|
|
@@ -40,7 +41,7 @@ export class WatcherHandler {
|
|
|
40
41
|
}, this.debounceMs);
|
|
41
42
|
}
|
|
42
43
|
// Method to clear any pending execution.
|
|
43
|
-
|
|
44
|
+
close() {
|
|
44
45
|
if (this.debounceTimer) {
|
|
45
46
|
clearTimeout(this.debounceTimer);
|
|
46
47
|
this.debounceTimer = null;
|
|
@@ -48,4 +49,4 @@ export class WatcherHandler {
|
|
|
48
49
|
this.latestHandler = null;
|
|
49
50
|
}
|
|
50
51
|
}
|
|
51
|
-
//# sourceMappingURL=
|
|
52
|
+
//# sourceMappingURL=debounce-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"debounce-service.js","sourceRoot":"","sources":["../../src/infrastructure/debounce-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAElD,MAAM,OAAO,eAAe;IAM1B,YAAY,aAAqB,GAAG;QAL5B,iBAAY,GAAG,KAAK,CAAC;QACrB,kBAAa,GAAiC,IAAI,CAAC;QACnD,kBAAa,GAA0B,IAAI,CAAC;QAIlD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAA4B;QACnD,kCAAkC;QAClC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;QAE7B,iFAAiF;QACjF,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QAED,2BAA2B;QAC3B,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACnC,CAAC;QAED,6BAA6B;QAC7B,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAEO,iBAAiB;QACvB,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,KAAK,IAAI,EAAE;YACzC,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,OAAO;YACT,CAAC;YAED,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAE1B,IAAI,CAAC;gBACH,0CAA0C;gBAC1C,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;oBACvB,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;oBAC1C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;oBAC1B,MAAM,cAAc,EAAE,CAAC;gBACzB,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;YAC5B,CAAC;QACH,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACtB,CAAC;IAED,yCAAyC;IAClC,KAAK;QACV,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACjC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;IAC5B,CAAC;CACF"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
declare class EnvInfo {
|
|
2
2
|
private static cachedCliVersion;
|
|
3
3
|
private static cachedUserAgent;
|
|
4
|
-
|
|
4
|
+
private static cachedBaseUrl;
|
|
5
|
+
private static cachedAuthBaseUrl;
|
|
6
|
+
getUserAgent(shell: string): string;
|
|
5
7
|
getCLIVersion(): string;
|
|
8
|
+
getBaseUrl(): string | undefined;
|
|
9
|
+
getAuthBaseUrl(): string | undefined;
|
|
6
10
|
}
|
|
7
11
|
export declare const envInfo: EnvInfo;
|
|
8
12
|
export {};
|
|
@@ -3,12 +3,12 @@ import { fileURLToPath } from "url";
|
|
|
3
3
|
import { dirname, join } from "path";
|
|
4
4
|
import fs from "fs-extra";
|
|
5
5
|
class EnvInfo {
|
|
6
|
-
getUserAgent() {
|
|
6
|
+
getUserAgent(shell) {
|
|
7
7
|
if (!EnvInfo.cachedUserAgent) {
|
|
8
8
|
const osInfo = `${os.platform()} ${os.release()}`;
|
|
9
9
|
const engine = "Node.js";
|
|
10
10
|
const engineVersion = process.version;
|
|
11
|
-
EnvInfo.cachedUserAgent = `APIMATIC CLI/${this.getCLIVersion()} - (OS: ${osInfo}, Engine: ${engine}/${engineVersion})`;
|
|
11
|
+
EnvInfo.cachedUserAgent = `APIMATIC CLI/${this.getCLIVersion()} - (OS: ${osInfo}, Engine: ${engine}/${engineVersion}, Shell: ${shell})`;
|
|
12
12
|
}
|
|
13
13
|
return EnvInfo.cachedUserAgent;
|
|
14
14
|
}
|
|
@@ -30,6 +30,27 @@ class EnvInfo {
|
|
|
30
30
|
return "unknown";
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
|
+
getBaseUrl() {
|
|
34
|
+
if (EnvInfo.cachedBaseUrl) {
|
|
35
|
+
return EnvInfo.cachedBaseUrl;
|
|
36
|
+
}
|
|
37
|
+
const envBaseUrls = process.env.APIMATIC_BASE_URL;
|
|
38
|
+
if (envBaseUrls) {
|
|
39
|
+
EnvInfo.cachedBaseUrl = envBaseUrls.split(";")[0];
|
|
40
|
+
}
|
|
41
|
+
return EnvInfo.cachedBaseUrl;
|
|
42
|
+
}
|
|
43
|
+
getAuthBaseUrl() {
|
|
44
|
+
if (EnvInfo.cachedAuthBaseUrl) {
|
|
45
|
+
return EnvInfo.cachedAuthBaseUrl;
|
|
46
|
+
}
|
|
47
|
+
const envBaseUrls = process.env.APIMATIC_BASE_URL;
|
|
48
|
+
if (envBaseUrls) {
|
|
49
|
+
const baseUrls = envBaseUrls.split(";");
|
|
50
|
+
EnvInfo.cachedAuthBaseUrl = baseUrls.length === 2 ? baseUrls[1] : undefined;
|
|
51
|
+
}
|
|
52
|
+
return EnvInfo.cachedAuthBaseUrl;
|
|
53
|
+
}
|
|
33
54
|
}
|
|
34
55
|
EnvInfo.cachedCliVersion = null;
|
|
35
56
|
EnvInfo.cachedUserAgent = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-info.js","sourceRoot":"","sources":["../../src/infrastructure/env-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,MAAM,UAAU,CAAC;AAE1B,MAAM,OAAO;
|
|
1
|
+
{"version":3,"file":"env-info.js","sourceRoot":"","sources":["../../src/infrastructure/env-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,MAAM,UAAU,CAAC;AAE1B,MAAM,OAAO;IAMJ,YAAY,CAAC,KAAa;QAC/B,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC;YAClD,MAAM,MAAM,GAAG,SAAS,CAAC;YACzB,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;YACtC,OAAO,CAAC,eAAe,GAAG,gBAAgB,IAAI,CAAC,aAAa,EAAE,WAAW,MAAM,aAAa,MAAM,IAAI,aAAa,YAAY,KAAK,GAAG,CAAC;QAC1I,CAAC;QACD,OAAO,OAAO,CAAC,eAAe,CAAC;IACjC,CAAC;IAEM,aAAa;QAClB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC7B,OAAO,OAAO,CAAC,gBAAgB,CAAC;QAClC,CAAC;QAED,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAClD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;YACtC,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;YACtD,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAClD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAChC,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,SAAS,CAAC;YACzC,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC;YACnC,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAEM,UAAU;QACf,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC1B,OAAO,OAAO,CAAC,aAAa,CAAC;QAC/B,CAAC;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAClD,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,CAAC,aAAa,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,OAAO,CAAC,aAAa,CAAC;IAC/B,CAAC;IAEM,cAAc;QACnB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC9B,OAAO,OAAO,CAAC,iBAAiB,CAAC;QACnC,CAAC;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAClD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxC,OAAO,CAAC,iBAAiB,GAAG,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9E,CAAC;QACD,OAAO,OAAO,CAAC,iBAAiB,CAAC;IACnC,CAAC;;AAvDc,wBAAgB,GAAkB,IAAI,CAAC;AACvC,uBAAe,GAAkB,IAAI,CAAC;AAwDvD,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC"}
|
|
@@ -1,18 +1,23 @@
|
|
|
1
1
|
import fs from "fs";
|
|
2
2
|
import { FilePath } from "../types/file/filePath.js";
|
|
3
3
|
import { DirectoryPath } from "../types/file/directoryPath.js";
|
|
4
|
+
import { Directory } from "../types/file/directory.js";
|
|
4
5
|
export declare class FileService {
|
|
5
6
|
fileExists(file: FilePath): Promise<boolean>;
|
|
6
7
|
directoryExists(dir: DirectoryPath): Promise<boolean>;
|
|
7
8
|
directoryEmpty(dir: DirectoryPath): Promise<boolean>;
|
|
8
9
|
cleanDirectory(dir: DirectoryPath): Promise<void>;
|
|
9
|
-
|
|
10
|
+
createDirectoryIfNotExists(dir: DirectoryPath): Promise<void>;
|
|
11
|
+
getDirectory(directoryPath: DirectoryPath): Promise<Directory>;
|
|
10
12
|
copyDirectoryContents(source: DirectoryPath, destination: DirectoryPath): Promise<void>;
|
|
11
13
|
deleteFile(filePath: FilePath): Promise<void>;
|
|
14
|
+
deleteDirectory(dirPath: DirectoryPath): Promise<void>;
|
|
15
|
+
getRelativePath(filePath: FilePath, basePath: DirectoryPath): string;
|
|
12
16
|
getStream(filePath: FilePath): Promise<fs.ReadStream>;
|
|
13
17
|
getContents(filePath: FilePath): Promise<string>;
|
|
14
18
|
writeFile(filePath: FilePath, stream: NodeJS.ReadableStream): Promise<void>;
|
|
19
|
+
ensurePathExists(filePath: FilePath): Promise<void>;
|
|
15
20
|
writeContents(filePath: FilePath, contents: string): Promise<void>;
|
|
16
|
-
writeBuffer(filePath: FilePath, buffer: Buffer): Promise<void>;
|
|
17
21
|
copy(source: FilePath, destination: FilePath): Promise<void>;
|
|
22
|
+
isZipFile(filePath: FilePath): Promise<boolean>;
|
|
18
23
|
}
|
|
@@ -3,6 +3,9 @@ import fsExtra from "fs-extra";
|
|
|
3
3
|
import * as path from "path";
|
|
4
4
|
import { pipeline } from "stream";
|
|
5
5
|
import { promisify } from "util";
|
|
6
|
+
import { DirectoryPath } from "../types/file/directoryPath.js";
|
|
7
|
+
import { Directory } from "../types/file/directory.js";
|
|
8
|
+
import { FileName } from "../types/file/fileName.js";
|
|
6
9
|
export class FileService {
|
|
7
10
|
async fileExists(file) {
|
|
8
11
|
try {
|
|
@@ -28,15 +31,24 @@ export class FileService {
|
|
|
28
31
|
return files.length === 0;
|
|
29
32
|
}
|
|
30
33
|
catch (error) {
|
|
31
|
-
return error instanceof Error &&
|
|
34
|
+
return error instanceof Error && "code" in error && error.code === "ENOENT";
|
|
32
35
|
}
|
|
33
36
|
}
|
|
34
37
|
async cleanDirectory(dir) {
|
|
35
38
|
await fsExtra.ensureDir(dir.toString());
|
|
36
39
|
await fsExtra.emptyDir(dir.toString()); // removes everything inside, keeps the dir
|
|
37
40
|
}
|
|
38
|
-
async
|
|
39
|
-
await fsExtra.
|
|
41
|
+
async createDirectoryIfNotExists(dir) {
|
|
42
|
+
await fsExtra.ensureDir(dir.toString());
|
|
43
|
+
}
|
|
44
|
+
async getDirectory(directoryPath) {
|
|
45
|
+
const entries = await fsExtra.readdir(directoryPath.toString());
|
|
46
|
+
const results = await Promise.all(entries.map(async (entry) => {
|
|
47
|
+
const fullPath = path.join(directoryPath.toString(), entry);
|
|
48
|
+
const stat = await fsExtra.stat(fullPath);
|
|
49
|
+
return stat.isDirectory() ? await this.getDirectory(new DirectoryPath(fullPath)) : new FileName(entry);
|
|
50
|
+
}));
|
|
51
|
+
return new Directory(directoryPath, results);
|
|
40
52
|
}
|
|
41
53
|
async copyDirectoryContents(source, destination) {
|
|
42
54
|
const entries = await fsExtra.readdir(source.toString());
|
|
@@ -52,25 +64,54 @@ export class FileService {
|
|
|
52
64
|
await fsExtra.remove(filePath.toString());
|
|
53
65
|
}
|
|
54
66
|
}
|
|
67
|
+
async deleteDirectory(dirPath) {
|
|
68
|
+
const exists = await this.directoryExists(dirPath);
|
|
69
|
+
if (exists) {
|
|
70
|
+
await fsExtra.remove(dirPath.toString());
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
getRelativePath(filePath, basePath) {
|
|
74
|
+
const filePathStr = filePath.toString();
|
|
75
|
+
const basePathStr = basePath.toString();
|
|
76
|
+
if (filePathStr.startsWith(basePathStr)) {
|
|
77
|
+
const relativePath = filePathStr.substring(basePathStr.length).replace(/^[/\\]/, "");
|
|
78
|
+
return relativePath.replace(/\\/g, "/");
|
|
79
|
+
}
|
|
80
|
+
// Normalize the full path if it doesn't start with basePath
|
|
81
|
+
return filePathStr.replace(/\\/g, "/");
|
|
82
|
+
}
|
|
55
83
|
async getStream(filePath) {
|
|
56
84
|
return fs.createReadStream(filePath.toString());
|
|
57
85
|
}
|
|
58
86
|
async getContents(filePath) {
|
|
59
|
-
return await fsExtra.readFile(filePath.toString(),
|
|
87
|
+
return await fsExtra.readFile(filePath.toString(), "utf-8");
|
|
60
88
|
}
|
|
61
89
|
async writeFile(filePath, stream) {
|
|
62
90
|
const writeStream = fs.createWriteStream(filePath.toString());
|
|
63
91
|
await streamPipeline(stream, writeStream);
|
|
64
92
|
}
|
|
65
|
-
async
|
|
66
|
-
await fsExtra.
|
|
93
|
+
async ensurePathExists(filePath) {
|
|
94
|
+
await fsExtra.ensureFile(filePath.toString());
|
|
67
95
|
}
|
|
68
|
-
async
|
|
69
|
-
await fsExtra.writeFile(filePath.toString(),
|
|
96
|
+
async writeContents(filePath, contents) {
|
|
97
|
+
await fsExtra.writeFile(filePath.toString(), contents, "utf-8");
|
|
70
98
|
}
|
|
71
99
|
async copy(source, destination) {
|
|
72
100
|
await fsExtra.copyFile(source.toString(), destination.toString());
|
|
73
101
|
}
|
|
102
|
+
async isZipFile(filePath) {
|
|
103
|
+
try {
|
|
104
|
+
const buffer = await fsExtra.readFile(filePath.toString());
|
|
105
|
+
return (buffer.length >= 4 &&
|
|
106
|
+
buffer[0] === 0x50 && // P
|
|
107
|
+
buffer[1] === 0x4b && // K
|
|
108
|
+
buffer[2] === 0x03 && // \x03
|
|
109
|
+
buffer[3] === 0x04); // \x04
|
|
110
|
+
}
|
|
111
|
+
catch (_a) {
|
|
112
|
+
return false;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
74
115
|
}
|
|
75
116
|
const streamPipeline = promisify(pipeline);
|
|
76
117
|
//# sourceMappingURL=file-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-service.js","sourceRoot":"","sources":["../../src/infrastructure/file-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,OAAO,MAAM,UAAU,CAAC;AAC/B,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"file-service.js","sourceRoot":"","sources":["../../src/infrastructure/file-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { FilePath } from "../types/file/filePath.js";
|
|
2
|
+
import { UrlPath } from "../types/file/urlPath.js";
|
|
3
|
+
export declare class LauncherService {
|
|
4
|
+
openInEditor(filePath: FilePath): Promise<void>;
|
|
5
|
+
openFile(filePath: FilePath): Promise<void>;
|
|
6
|
+
openUrlInBrowser(url: UrlPath): Promise<import("child_process").ChildProcess>;
|
|
7
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { execa } from "execa";
|
|
2
|
+
import os from "os";
|
|
3
|
+
import { spawn } from "child_process";
|
|
4
|
+
import open from "open";
|
|
5
|
+
export class LauncherService {
|
|
6
|
+
async openInEditor(filePath) {
|
|
7
|
+
try {
|
|
8
|
+
await execa("code", ["--wait", filePath.toString()]);
|
|
9
|
+
}
|
|
10
|
+
catch (_a) {
|
|
11
|
+
// TODO: check for fallback (start)
|
|
12
|
+
if (process.platform === "win32") {
|
|
13
|
+
await execa("cmd", ["/c", "start", "/wait", "notepad", filePath.toString()], { stdio: "ignore" });
|
|
14
|
+
}
|
|
15
|
+
else if (process.platform === "darwin") {
|
|
16
|
+
await execa("vim", [filePath.toString()], { stdio: "inherit" });
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
async openFile(filePath) {
|
|
21
|
+
const targetPath = filePath.toString();
|
|
22
|
+
// Determine the command and args without using the shell
|
|
23
|
+
let command;
|
|
24
|
+
let args;
|
|
25
|
+
switch (os.platform()) {
|
|
26
|
+
case "win32":
|
|
27
|
+
command = "cmd";
|
|
28
|
+
args = ["/c", "start", "", targetPath];
|
|
29
|
+
break;
|
|
30
|
+
case "darwin":
|
|
31
|
+
command = "open";
|
|
32
|
+
args = [targetPath];
|
|
33
|
+
break;
|
|
34
|
+
default:
|
|
35
|
+
command = "xdg-open";
|
|
36
|
+
args = [targetPath];
|
|
37
|
+
break;
|
|
38
|
+
}
|
|
39
|
+
try {
|
|
40
|
+
const child = spawn(command, args, { stdio: "ignore", detached: true });
|
|
41
|
+
child.unref(); // Let it run without blocking
|
|
42
|
+
}
|
|
43
|
+
catch (_a) {
|
|
44
|
+
// Silently ignore errors
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
openUrlInBrowser(url) {
|
|
48
|
+
return open(url.toString());
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=launcher-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"launcher-service.js","sourceRoot":"","sources":["../../src/infrastructure/launcher-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,MAAM,OAAO,eAAe;IAEnB,KAAK,CAAC,YAAY,CAAC,QAAkB;QAC1C,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACvD,CAAC;QAAC,WAAM,CAAC;YACP,mCAAmC;YACnC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACjC,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YACpG,CAAC;iBAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACzC,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAC,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,QAAkB;QACtC,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;QAEvC,yDAAyD;QACzD,IAAI,OAAe,CAAC;QACpB,IAAI,IAAc,CAAC;QAEnB,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;YACtB,KAAK,OAAO;gBACV,OAAO,GAAG,KAAK,CAAC;gBAChB,IAAI,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;gBACvC,MAAM;YACR,KAAK,QAAQ;gBACX,OAAO,GAAG,MAAM,CAAC;gBACjB,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;gBACpB,MAAM;YACR;gBACE,OAAO,GAAG,UAAU,CAAC;gBACrB,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;gBACpB,MAAM;QACV,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;YACxE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,8BAA8B;QAC/C,CAAC;QAAC,WAAM,CAAC;YACP,yBAAyB;QAC3B,CAAC;IACH,CAAC;IAEM,gBAAgB,CAAC,GAAY;QAClC,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9B,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"network-service.js","sourceRoot":"","sources":["../../src/infrastructure/network-service.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAC;AAE/B,MAAM,OAAO,cAAc;IAClB,KAAK,CAAC,aAAa,CAAC,cAAwB;QACjD,OAAO,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;IACjD,CAAC;CACF"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { Client, Environment } from "@apimatic/sdk";
|
|
2
|
+
import { envInfo } from "../env-info.js";
|
|
3
|
+
export class ApiClientFactory {
|
|
4
|
+
constructor() {
|
|
5
|
+
this.TIMEOUT = 0;
|
|
6
|
+
this.createApiClient = (authorizationHeader, shell) => {
|
|
7
|
+
const baseConfig = {
|
|
8
|
+
customHeaderAuthenticationCredentials: {
|
|
9
|
+
Authorization: authorizationHeader
|
|
10
|
+
},
|
|
11
|
+
userAgent: envInfo.getUserAgent(shell),
|
|
12
|
+
timeout: this.TIMEOUT
|
|
13
|
+
};
|
|
14
|
+
const baseUrl = envInfo.getBaseUrl();
|
|
15
|
+
return new Client(Object.assign(Object.assign(Object.assign({}, baseConfig), { environment: baseUrl ? Environment.Testing : Environment.Production }), (baseUrl && { customUrl: baseUrl })));
|
|
16
|
+
};
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
export const apiClientFactory = new ApiClientFactory();
|
|
20
|
+
//# sourceMappingURL=api-client-factory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"api-client-factory.js","sourceRoot":"","sources":["../../../src/infrastructure/services/api-client-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,MAAM,OAAO,gBAAgB;IAA7B;QACmB,YAAO,GAAG,CAAC,CAAC;QAEtB,oBAAe,GAAG,CAAC,mBAA2B,EAAE,KAAa,EAAU,EAAE;YAC9E,MAAM,UAAU,GAAG;gBACjB,qCAAqC,EAAE;oBACrC,aAAa,EAAE,mBAAmB;iBACnC;gBACD,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC;gBACtC,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;YAEF,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;YACrC,OAAO,IAAI,MAAM,+CACZ,UAAU,KACb,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,KAChE,CAAC,OAAO,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EACtC,CAAC;QACL,CAAC,CAAC;IACJ,CAAC;CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { Result } from "neverthrow";
|
|
|
4
4
|
import { ServiceError } from "../api-utils.js";
|
|
5
5
|
export declare class ApiService {
|
|
6
6
|
private readonly apiBaseUrl;
|
|
7
|
-
getAccountInfo(configDir: DirectoryPath, authKey: string | null): Promise<Result<SubscriptionInfo, ServiceError>>;
|
|
8
|
-
sendTelemetry(payload: string, authKey: string): Promise<Result<string, string>>;
|
|
7
|
+
getAccountInfo(configDir: DirectoryPath, shell: string, authKey: string | null): Promise<Result<SubscriptionInfo, ServiceError>>;
|
|
8
|
+
sendTelemetry(payload: string, authKey: string, shell: string): Promise<Result<string, string>>;
|
|
9
9
|
private axiosInstance;
|
|
10
10
|
}
|
|
@@ -7,14 +7,14 @@ export class ApiService {
|
|
|
7
7
|
constructor() {
|
|
8
8
|
this.apiBaseUrl = "https://api.apimatic.io";
|
|
9
9
|
}
|
|
10
|
-
async getAccountInfo(configDir, authKey) {
|
|
10
|
+
async getAccountInfo(configDir, shell, authKey) {
|
|
11
11
|
const authInfo = await getAuthInfo(configDir.toString());
|
|
12
12
|
if (authInfo === null && !authKey) {
|
|
13
13
|
return err("UNAUTHORIZED" /* ServiceError.UnAuthorized */);
|
|
14
14
|
}
|
|
15
15
|
try {
|
|
16
16
|
const token = authKey || (authInfo === null || authInfo === void 0 ? void 0 : authInfo.authKey);
|
|
17
|
-
const response = await this.axiosInstance(token).get("/account/profile");
|
|
17
|
+
const response = await this.axiosInstance(shell, token).get("/account/profile");
|
|
18
18
|
if (response.status === 200) {
|
|
19
19
|
return ok(response.data);
|
|
20
20
|
}
|
|
@@ -24,9 +24,9 @@ export class ApiService {
|
|
|
24
24
|
return err(handleServiceError(error));
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
-
async sendTelemetry(payload, authKey) {
|
|
27
|
+
async sendTelemetry(payload, authKey, shell) {
|
|
28
28
|
try {
|
|
29
|
-
const response = await this.axiosInstance(authKey).post("/telemetry/track", payload, {
|
|
29
|
+
const response = await this.axiosInstance(shell, authKey).post("/telemetry/track", payload, {
|
|
30
30
|
headers: { "Content-Type": "application/json" }
|
|
31
31
|
});
|
|
32
32
|
if (response.status === 200) {
|
|
@@ -38,15 +38,16 @@ export class ApiService {
|
|
|
38
38
|
return err(handleServiceError(error));
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
|
-
axiosInstance(apiKey) {
|
|
41
|
+
axiosInstance(shell, apiKey) {
|
|
42
|
+
var _a;
|
|
42
43
|
const headers = {
|
|
43
|
-
"User-Agent": envInfo.getUserAgent()
|
|
44
|
+
"User-Agent": envInfo.getUserAgent(shell)
|
|
44
45
|
};
|
|
45
46
|
if (apiKey) {
|
|
46
47
|
headers.Authorization = `X-Auth-Key ${apiKey}`;
|
|
47
48
|
}
|
|
48
49
|
return axios.create({
|
|
49
|
-
baseURL: this.apiBaseUrl,
|
|
50
|
+
baseURL: (_a = envInfo.getBaseUrl()) !== null && _a !== void 0 ? _a : this.apiBaseUrl,
|
|
50
51
|
headers
|
|
51
52
|
});
|
|
52
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-service.js","sourceRoot":"","sources":["../../../src/infrastructure/services/api-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAY,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAG3E,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,EAAE,EAAU,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAgB,MAAM,iBAAiB,CAAC;AAEnE,MAAM,OAAO,UAAU;IAAvB;QACmB,eAAU,GAAG,yBAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"api-service.js","sourceRoot":"","sources":["../../../src/infrastructure/services/api-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAY,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAG3E,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,EAAE,EAAU,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAgB,MAAM,iBAAiB,CAAC;AAEnE,MAAM,OAAO,UAAU;IAAvB;QACmB,eAAU,GAAG,yBAAkC,CAAC;IAsDnE,CAAC;IApDQ,KAAK,CAAC,cAAc,CACzB,SAAwB,EACxB,KAAa,EACb,OAAsB;QAEtB,MAAM,QAAQ,GAAoB,MAAM,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,IAAI,QAAQ,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,OAAO,GAAG,gDAA2B,CAAC;QACxC,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,OAAO,KAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAA,CAAC;YAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YAEhF,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC5B,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAwB,CAAC,CAAC;YAC/C,CAAC;YACD,OAAO,GAAG,uDAA8B,CAAC;QAC3C,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,GAAG,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAAe,EAAE,OAAe,EAAE,KAAa;QACxE,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,OAAO,EAAE;gBAC1F,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;aAChD,CAAC,CAAC;YAEH,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC5B,OAAO,EAAE,CAAC,gBAAgB,CAAC,CAAC;YAC9B,CAAC;YACD,OAAO,GAAG,CAAC,+BAA+B,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,OAAO,GAAG,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,KAAa,EAAE,MAA0B;;QAC7D,MAAM,OAAO,GAA2B;YACtC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC;SAC1C,CAAC;QAEF,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,aAAa,GAAG,cAAc,MAAM,EAAE,CAAC;QACjD,CAAC;QAED,OAAO,KAAK,CAAC,MAAM,CAAC;YAClB,OAAO,EAAE,MAAA,OAAO,CAAC,UAAU,EAAE,mCAAI,IAAI,CAAC,UAAU;YAChD,OAAO;SACR,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -7,5 +7,5 @@ export declare class AuthService {
|
|
|
7
7
|
private readonly apiBaseUrl;
|
|
8
8
|
private axiosInstance;
|
|
9
9
|
getDeviceLoginUrl(state: string): string;
|
|
10
|
-
getDeviceLoginToken(state: string): Promise<Result<DeviceAuthToken, ServiceError>>;
|
|
10
|
+
getDeviceLoginToken(state: string, shell: string): Promise<Result<DeviceAuthToken, ServiceError>>;
|
|
11
11
|
}
|
|
@@ -5,21 +5,25 @@ import { handleServiceError } from "../api-utils.js";
|
|
|
5
5
|
export class AuthService {
|
|
6
6
|
constructor() {
|
|
7
7
|
this.apiBaseUrl = "https://auth.apimatic.io";
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
}
|
|
9
|
+
axiosInstance(shell) {
|
|
10
|
+
var _a;
|
|
11
|
+
return axios.create({
|
|
12
|
+
baseURL: (_a = envInfo.getAuthBaseUrl()) !== null && _a !== void 0 ? _a : this.apiBaseUrl,
|
|
10
13
|
timeout: 20000,
|
|
11
14
|
headers: {
|
|
12
|
-
"User-Agent": envInfo.getUserAgent()
|
|
15
|
+
"User-Agent": envInfo.getUserAgent(shell)
|
|
13
16
|
}
|
|
14
17
|
});
|
|
15
18
|
}
|
|
16
19
|
getDeviceLoginUrl(state) {
|
|
17
|
-
|
|
20
|
+
var _a;
|
|
21
|
+
return `${(_a = envInfo.getAuthBaseUrl()) !== null && _a !== void 0 ? _a : this.apiBaseUrl}/device-auth/login?state=${state}`;
|
|
18
22
|
}
|
|
19
|
-
async getDeviceLoginToken(state) {
|
|
23
|
+
async getDeviceLoginToken(state, shell) {
|
|
20
24
|
var _a;
|
|
21
25
|
try {
|
|
22
|
-
const response = await this.axiosInstance.get(`/device-auth/token?state=${state}`);
|
|
26
|
+
const response = await this.axiosInstance(shell).get(`/device-auth/token?state=${state}`);
|
|
23
27
|
if (response.status === 200 && ((_a = response.data) === null || _a === void 0 ? void 0 : _a.apiKey)) {
|
|
24
28
|
return ok({ apiKey: response.data.apiKey });
|
|
25
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-service.js","sourceRoot":"","sources":["../../../src/infrastructure/services/auth-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,EAAE,EAAU,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAgB,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-service.js","sourceRoot":"","sources":["../../../src/infrastructure/services/auth-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,GAAG,EAAE,EAAE,EAAU,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAgB,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAMnE,MAAM,OAAO,WAAW;IAAxB;QACmB,eAAU,GAAG,0BAAmC,CAAC;IA0BpE,CAAC;IAxBS,aAAa,CAAC,KAAa;;QACjC,OAAO,KAAK,CAAC,MAAM,CAAC;YAClB,OAAO,EAAE,MAAA,OAAO,CAAC,cAAc,EAAE,mCAAI,IAAI,CAAC,UAAU;YACpD,OAAO,EAAE,KAAK;YACd,OAAO,EAAE;gBACP,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC;aAC1C;SACF,CAAC,CAAC;IACL,CAAC;IAEM,iBAAiB,CAAC,KAAa;;QACpC,OAAO,GAAG,MAAA,OAAO,CAAC,cAAc,EAAE,mCAAI,IAAI,CAAC,UAAU,4BAA4B,KAAK,EAAE,CAAC;IAC3F,CAAC;IACM,KAAK,CAAC,mBAAmB,CAAC,KAAa,EAAE,KAAa;;QAC3D,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,4BAA4B,KAAK,EAAE,CAAC,CAAC;YAC1F,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,KAAI,MAAA,QAAQ,CAAC,IAAI,0CAAE,MAAM,CAAA,EAAE,CAAC;gBACrD,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;YAC9C,CAAC;YACD,OAAO,GAAG,uDAA8B,CAAC;QAC3C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,GAAG,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { UrlPath } from "../../types/file/urlPath.js";
|
|
2
|
+
import { Result } from "neverthrow";
|
|
3
|
+
import { ServiceError } from "../api-utils.js";
|
|
4
|
+
import { FileName } from "../../types/file/fileName.js";
|
|
5
|
+
export type FileDownloadResponse = {
|
|
6
|
+
stream: NodeJS.ReadableStream;
|
|
7
|
+
filename: FileName;
|
|
8
|
+
};
|
|
9
|
+
export declare class FileDownloadService {
|
|
10
|
+
downloadFile(url: UrlPath): Promise<Result<FileDownloadResponse, ServiceError>>;
|
|
11
|
+
private parseFilenameFromContentDisposition;
|
|
12
|
+
private getFilenameFromUrl;
|
|
13
|
+
private safeDecodeURIComponent;
|
|
14
|
+
private sanitizeFilename;
|
|
15
|
+
}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import axios from "axios";
|
|
2
|
+
import { err, ok } from "neverthrow";
|
|
3
|
+
import { handleServiceError } from "../api-utils.js";
|
|
4
|
+
import { FileName } from "../../types/file/fileName.js";
|
|
5
|
+
export class FileDownloadService {
|
|
6
|
+
async downloadFile(url) {
|
|
7
|
+
try {
|
|
8
|
+
const response = await axios.get(url.toString(), {
|
|
9
|
+
responseType: "stream"
|
|
10
|
+
});
|
|
11
|
+
const contentDisposition = response.headers["content-disposition"];
|
|
12
|
+
let filename;
|
|
13
|
+
// Try to parse filename from Content-Disposition (supports filename* as per RFC 5987 and plain filename)
|
|
14
|
+
if (contentDisposition) {
|
|
15
|
+
const parsed = this.parseFilenameFromContentDisposition(contentDisposition);
|
|
16
|
+
if (parsed) {
|
|
17
|
+
filename = new FileName(parsed);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
// ... existing code ...
|
|
21
|
+
// If no filename derived from headers, fallback to URL
|
|
22
|
+
if (!filename) {
|
|
23
|
+
const fromUrl = this.getFilenameFromUrl(url.toString());
|
|
24
|
+
if (fromUrl) {
|
|
25
|
+
filename = new FileName(fromUrl);
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
filename = new FileName("file");
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
// Basic guard — responseType: "stream" should always yield a stream
|
|
32
|
+
const data = response.data;
|
|
33
|
+
const isReadableStream = data && typeof data.pipe === "function";
|
|
34
|
+
if (!isReadableStream) {
|
|
35
|
+
return err("INVALID_RESPONSE" /* ServiceError.InvalidResponse */);
|
|
36
|
+
}
|
|
37
|
+
return ok({
|
|
38
|
+
stream: response.data,
|
|
39
|
+
filename
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
catch (error) {
|
|
43
|
+
return err(handleServiceError(error));
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
parseFilenameFromContentDisposition(headerValue) {
|
|
47
|
+
// Try RFC 5987: filename*=UTF-8''encoded%20name.ext
|
|
48
|
+
const filenameStarMatch = headerValue.match(/filename\*\s*=\s*([^']*)''([^;]+)/i); // NOSONAR - safe regex for CLI use
|
|
49
|
+
if (filenameStarMatch) {
|
|
50
|
+
const encoded = filenameStarMatch[2].trim();
|
|
51
|
+
try {
|
|
52
|
+
const decoded = decodeURIComponent(encoded);
|
|
53
|
+
return this.sanitizeFilename(decoded);
|
|
54
|
+
}
|
|
55
|
+
catch (_a) {
|
|
56
|
+
// fall through to other strategies
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
// Try plain: filename="name.ext" or filename=name.ext
|
|
60
|
+
const filenameMatch = headerValue.match(/filename\s*=\s*"?([^";]+)"?/i);
|
|
61
|
+
if (filenameMatch) {
|
|
62
|
+
return this.sanitizeFilename(filenameMatch[1]);
|
|
63
|
+
}
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
getFilenameFromUrl(rawUrl) {
|
|
67
|
+
try {
|
|
68
|
+
const u = new URL(rawUrl);
|
|
69
|
+
const last = u.pathname.split("/").filter(Boolean).pop();
|
|
70
|
+
if (!last)
|
|
71
|
+
return null;
|
|
72
|
+
// Remove any spurious trailing spaces and decode
|
|
73
|
+
const decoded = this.safeDecodeURIComponent(last.trim());
|
|
74
|
+
return this.sanitizeFilename(decoded);
|
|
75
|
+
}
|
|
76
|
+
catch (_a) {
|
|
77
|
+
// Fallback for non-URL-safe strings
|
|
78
|
+
const parts = rawUrl.split("/").filter(Boolean);
|
|
79
|
+
const last = parts.pop();
|
|
80
|
+
if (!last)
|
|
81
|
+
return null;
|
|
82
|
+
return this.sanitizeFilename(this.safeDecodeURIComponent(last));
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
safeDecodeURIComponent(value) {
|
|
86
|
+
try {
|
|
87
|
+
return decodeURIComponent(value);
|
|
88
|
+
}
|
|
89
|
+
catch (_a) {
|
|
90
|
+
return value;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
sanitizeFilename(name) {
|
|
94
|
+
// Replace characters not allowed in common filesystems and trim dots/spaces
|
|
95
|
+
const sanitized = name
|
|
96
|
+
.replace('/[<>:"/\\|?*\x00-\x1F]/g', "_")
|
|
97
|
+
.replace(/\s+/g, " ")
|
|
98
|
+
.trim();
|
|
99
|
+
// Avoid names that are empty or only dots/spaces
|
|
100
|
+
const safe = sanitized.replace(/^[. ]+|[. ]+$/g, ""); // NOSONAR - safe regex for CLI use
|
|
101
|
+
return safe.length > 0 ? safe : "file";
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=file-download-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"file-download-service.js","sourceRoot":"","sources":["../../../src/infrastructure/services/file-download-service.ts"],"names":[],"mappings":"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"}
|