@ai-support-agent/cli 0.0.4-beta.1 → 0.0.4-beta.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agent-runner.d.ts +1 -0
- package/dist/agent-runner.d.ts.map +1 -1
- package/dist/agent-runner.js +5 -5
- package/dist/agent-runner.js.map +1 -1
- package/dist/api-client.d.ts +4 -2
- package/dist/api-client.d.ts.map +1 -1
- package/dist/api-client.js +19 -3
- package/dist/api-client.js.map +1 -1
- package/dist/appsync-subscriber.d.ts.map +1 -1
- package/dist/appsync-subscriber.js +8 -2
- package/dist/appsync-subscriber.js.map +1 -1
- package/dist/auth-server.js +1 -1
- package/dist/auth-server.js.map +1 -1
- package/dist/aws-credential-builder.d.ts +19 -0
- package/dist/aws-credential-builder.d.ts.map +1 -0
- package/dist/aws-credential-builder.js +116 -0
- package/dist/aws-credential-builder.js.map +1 -0
- package/dist/aws-profile.d.ts +38 -0
- package/dist/aws-profile.d.ts.map +1 -0
- package/dist/aws-profile.js +162 -0
- package/dist/aws-profile.js.map +1 -0
- package/dist/chat-mode-detector.d.ts.map +1 -1
- package/dist/chat-mode-detector.js +2 -2
- package/dist/chat-mode-detector.js.map +1 -1
- package/dist/commands/api-chat-executor.d.ts.map +1 -1
- package/dist/commands/api-chat-executor.js +40 -15
- package/dist/commands/api-chat-executor.js.map +1 -1
- package/dist/commands/chat-executor.d.ts +3 -2
- package/dist/commands/chat-executor.d.ts.map +1 -1
- package/dist/commands/chat-executor.js +91 -91
- package/dist/commands/chat-executor.js.map +1 -1
- package/dist/commands/claude-code-runner.d.ts +24 -0
- package/dist/commands/claude-code-runner.d.ts.map +1 -0
- package/dist/commands/claude-code-runner.js +126 -0
- package/dist/commands/claude-code-runner.js.map +1 -0
- package/dist/commands/file-executor.js +1 -1
- package/dist/commands/file-executor.js.map +1 -1
- package/dist/commands/index.d.ts +5 -1
- package/dist/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +16 -3
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/process-executor.js +1 -1
- package/dist/commands/process-executor.js.map +1 -1
- package/dist/commands/set-project-dir.d.ts +3 -0
- package/dist/commands/set-project-dir.d.ts.map +1 -0
- package/dist/commands/set-project-dir.js +42 -0
- package/dist/commands/set-project-dir.js.map +1 -0
- package/dist/commands/shared-chat-utils.d.ts.map +1 -1
- package/dist/commands/shared-chat-utils.js +2 -1
- package/dist/commands/shared-chat-utils.js.map +1 -1
- package/dist/commands/shell-executor.js +1 -1
- package/dist/commands/shell-executor.js.map +1 -1
- package/dist/config-manager.d.ts +8 -0
- package/dist/config-manager.d.ts.map +1 -1
- package/dist/config-manager.js +23 -0
- package/dist/config-manager.js.map +1 -1
- package/dist/constants.d.ts +28 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +36 -2
- package/dist/constants.js.map +1 -1
- package/dist/index.js +53 -0
- package/dist/index.js.map +1 -1
- package/dist/locales/en.json +13 -1
- package/dist/locales/ja.json +13 -1
- package/dist/locales/locales/en.json +13 -1
- package/dist/locales/locales/ja.json +13 -1
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +8 -1
- package/dist/logger.js.map +1 -1
- package/dist/project-agent.d.ts +12 -1
- package/dist/project-agent.d.ts.map +1 -1
- package/dist/project-agent.js +138 -72
- package/dist/project-agent.js.map +1 -1
- package/dist/project-config-sync.d.ts +18 -0
- package/dist/project-config-sync.d.ts.map +1 -0
- package/dist/project-config-sync.js +126 -0
- package/dist/project-config-sync.js.map +1 -0
- package/dist/project-dir.d.ts +38 -0
- package/dist/project-dir.d.ts.map +1 -0
- package/dist/project-dir.js +147 -0
- package/dist/project-dir.js.map +1 -0
- package/dist/retry-strategy.d.ts +6 -0
- package/dist/retry-strategy.d.ts.map +1 -1
- package/dist/retry-strategy.js +10 -2
- package/dist/retry-strategy.js.map +1 -1
- package/dist/security.d.ts.map +1 -1
- package/dist/security.js +2 -1
- package/dist/security.js.map +1 -1
- package/dist/types.d.ts +76 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/utils.d.ts +1 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +6 -0
- package/dist/utils.js.map +1 -1
- package/package.json +1 -1
package/dist/agent-runner.d.ts
CHANGED
|
@@ -13,6 +13,7 @@ export declare function startProjectAgent(project: ProjectRegistration, agentId:
|
|
|
13
13
|
pollInterval: number;
|
|
14
14
|
heartbeatInterval: number;
|
|
15
15
|
agentChatMode?: AgentChatMode;
|
|
16
|
+
defaultProjectDir?: string;
|
|
16
17
|
}): {
|
|
17
18
|
stop: () => void;
|
|
18
19
|
client: import('./api-client').ApiClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-runner.d.ts","sourceRoot":"","sources":["../src/agent-runner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,iBAAiB,EAAoB,MAAM,gBAAgB,CAAA;AAOzE,OAAO,KAAK,EAAE,aAAa,EAAoB,mBAAmB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAGnG,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,cAAc,CAAA;CAC/B;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IACP,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"agent-runner.d.ts","sourceRoot":"","sources":["../src/agent-runner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,iBAAiB,EAAoB,MAAM,gBAAgB,CAAA;AAOzE,OAAO,KAAK,EAAE,aAAa,EAAoB,mBAAmB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAGnG,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,cAAc,CAAA;CAC/B;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IACP,YAAY,EAAE,MAAM,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,GACA;IAAE,IAAI,EAAE,MAAM,IAAI,CAAC;IAAC,MAAM,EAAE,OAAO,cAAc,EAAE,SAAS,CAAA;CAAE,CAOhE;AAYD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,IAAI,CAAA;CAAE,EAAE,EAC9B,OAAO,CAAC,EAAE,iBAAiB,GAC1B,IAAI,CAUN;AA4CD,wBAAsB,UAAU,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAuGtE"}
|
package/dist/agent-runner.js
CHANGED
|
@@ -46,7 +46,7 @@ const project_agent_1 = require("./project-agent");
|
|
|
46
46
|
const system_info_1 = require("./system-info");
|
|
47
47
|
const utils_1 = require("./utils");
|
|
48
48
|
function startProjectAgent(project, agentId, options) {
|
|
49
|
-
const agent = new project_agent_1.ProjectAgent(project, agentId, options, undefined, options.agentChatMode);
|
|
49
|
+
const agent = new project_agent_1.ProjectAgent(project, agentId, options, undefined, options.agentChatMode, options.defaultProjectDir);
|
|
50
50
|
agent.start();
|
|
51
51
|
return {
|
|
52
52
|
stop: () => agent.stop(),
|
|
@@ -81,10 +81,10 @@ function resolveAutoUpdateConfig(options, config) {
|
|
|
81
81
|
...(options.updateChannel && { channel: options.updateChannel }),
|
|
82
82
|
};
|
|
83
83
|
}
|
|
84
|
-
function runSingleProject(project, agentId, options, agentChatMode) {
|
|
84
|
+
function runSingleProject(project, agentId, options, agentChatMode, defaultProjectDir) {
|
|
85
85
|
const { pollInterval, heartbeatInterval } = resolveIntervals(options);
|
|
86
86
|
logger_1.logger.info((0, i18n_1.t)('runner.starting'));
|
|
87
|
-
const agent = startProjectAgent(project, agentId, { pollInterval, heartbeatInterval, agentChatMode });
|
|
87
|
+
const agent = startProjectAgent(project, agentId, { pollInterval, heartbeatInterval, agentChatMode, defaultProjectDir });
|
|
88
88
|
const autoUpdateConfig = resolveAutoUpdateConfig(options);
|
|
89
89
|
let updater;
|
|
90
90
|
if (autoUpdateConfig.enabled) {
|
|
@@ -126,7 +126,7 @@ async function startAgent(options) {
|
|
|
126
126
|
token: options.token,
|
|
127
127
|
apiUrl: options.apiUrl,
|
|
128
128
|
};
|
|
129
|
-
runSingleProject(project, agentId, options, config?.agentChatMode);
|
|
129
|
+
runSingleProject(project, agentId, options, config?.agentChatMode, config?.defaultProjectDir);
|
|
130
130
|
(0, config_manager_1.saveConfig)({ lastConnected: new Date().toISOString() });
|
|
131
131
|
return;
|
|
132
132
|
}
|
|
@@ -159,7 +159,7 @@ async function startAgent(options) {
|
|
|
159
159
|
const agentId = config.agentId ?? os.hostname();
|
|
160
160
|
const { pollInterval, heartbeatInterval } = resolveIntervals(options);
|
|
161
161
|
logger_1.logger.info((0, i18n_1.t)('runner.startingMulti', { count: projects.length }));
|
|
162
|
-
const agents = projects.map((project) => startProjectAgent(project, agentId, { pollInterval, heartbeatInterval, agentChatMode: config.agentChatMode }));
|
|
162
|
+
const agents = projects.map((project) => startProjectAgent(project, agentId, { pollInterval, heartbeatInterval, agentChatMode: config.agentChatMode, defaultProjectDir: config.defaultProjectDir }));
|
|
163
163
|
(0, config_manager_1.saveConfig)({ lastConnected: new Date().toISOString() });
|
|
164
164
|
const autoUpdateConfig = resolveAutoUpdateConfig(options, config);
|
|
165
165
|
let updater;
|
package/dist/agent-runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-runner.js","sourceRoot":"","sources":["../src/agent-runner.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBA,
|
|
1
|
+
{"version":3,"file":"agent-runner.js","sourceRoot":"","sources":["../src/agent-runner.ts"],"names":[],"mappings":"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"}
|
package/dist/api-client.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type { AgentCommand, AgentServerConfig, ChatChunk, CommandResult, PendingCommand, ReleaseChannel, RegisterRequest, RegisterResponse, SystemInfo, VersionInfo } from './types';
|
|
1
|
+
import type { AgentCommand, AgentServerConfig, AwsCredentials, ChatChunk, CommandResult, HeartbeatResponse, PendingCommand, ProjectConfigResponse, ReleaseChannel, RegisterRequest, RegisterResponse, SystemInfo, VersionInfo } from './types';
|
|
2
2
|
export declare class ApiClient {
|
|
3
3
|
private readonly client;
|
|
4
4
|
private readonly retry;
|
|
5
5
|
constructor(apiUrl: string, token: string);
|
|
6
6
|
register(request: RegisterRequest): Promise<RegisterResponse>;
|
|
7
|
-
heartbeat(agentId: string, systemInfo: SystemInfo, updateError?: string, availableChatModes?: string[], activeChatMode?: string): Promise<void>;
|
|
7
|
+
heartbeat(agentId: string, systemInfo: SystemInfo, updateError?: string, availableChatModes?: string[], activeChatMode?: string, ipAddress?: string): Promise<HeartbeatResponse | void>;
|
|
8
8
|
getVersionInfo(channel?: ReleaseChannel): Promise<VersionInfo>;
|
|
9
9
|
getPendingCommands(agentId: string): Promise<PendingCommand[]>;
|
|
10
10
|
private validateCommandId;
|
|
@@ -12,6 +12,8 @@ export declare class ApiClient {
|
|
|
12
12
|
submitResult(commandId: string, result: CommandResult, agentId: string): Promise<void>;
|
|
13
13
|
reportConnectionStatus(agentId: string, status: 'connected' | 'disconnected'): Promise<void>;
|
|
14
14
|
getConfig(): Promise<AgentServerConfig>;
|
|
15
|
+
getProjectConfig(): Promise<ProjectConfigResponse>;
|
|
16
|
+
getAwsCredentials(awsAccountId: string): Promise<AwsCredentials>;
|
|
15
17
|
submitChatChunk(commandId: string, chunk: ChatChunk, agentId: string): Promise<void>;
|
|
16
18
|
}
|
|
17
19
|
//# sourceMappingURL=api-client.d.ts.map
|
package/dist/api-client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,SAAS,EACT,aAAa,EACb,cAAc,EACd,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,WAAW,EACZ,MAAM,SAAS,CAAA;AAEhB,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;gBAEzB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAqBnC,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkB7D,SAAS,CACb,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAAE,EAC7B,cAAc,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,cAAc,EACd,qBAAqB,EACrB,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,WAAW,EACZ,MAAM,SAAS,CAAA;AAEhB,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;gBAEzB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAqBnC,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkB7D,SAAS,CACb,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,kBAAkB,CAAC,EAAE,MAAM,EAAE,EAC7B,cAAc,CAAC,EAAE,MAAM,EACvB,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAiB9B,cAAc,CAAC,OAAO,GAAE,cAAyB,GAAG,OAAO,CAAC,WAAW,CAAC;IASxE,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAWpE,OAAO,CAAC,iBAAiB;IAMnB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAYrE,YAAY,CAChB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IAUV,sBAAsB,CAC1B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,WAAW,GAAG,cAAc,GACnC,OAAO,CAAC,IAAI,CAAC;IAUV,SAAS,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAUvC,gBAAgB,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAUlD,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAWhE,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;CASjB"}
|
package/dist/api-client.js
CHANGED
|
@@ -43,10 +43,10 @@ class ApiClient {
|
|
|
43
43
|
return data;
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
|
-
async heartbeat(agentId, systemInfo, updateError, availableChatModes, activeChatMode) {
|
|
46
|
+
async heartbeat(agentId, systemInfo, updateError, availableChatModes, activeChatMode, ipAddress) {
|
|
47
47
|
logger_1.logger.debug('Sending heartbeat');
|
|
48
|
-
|
|
49
|
-
await this.client.post(constants_1.API_ENDPOINTS.HEARTBEAT, {
|
|
48
|
+
return this.retry.withRetry(async () => {
|
|
49
|
+
const { data } = await this.client.post(constants_1.API_ENDPOINTS.HEARTBEAT, {
|
|
50
50
|
agentId,
|
|
51
51
|
timestamp: Date.now(),
|
|
52
52
|
version: constants_1.AGENT_VERSION,
|
|
@@ -54,7 +54,9 @@ class ApiClient {
|
|
|
54
54
|
...(updateError && { updateError }),
|
|
55
55
|
...(availableChatModes !== undefined && { availableChatModes }),
|
|
56
56
|
...(activeChatMode !== undefined && { activeChatMode }),
|
|
57
|
+
...(ipAddress && { ipAddress }),
|
|
57
58
|
});
|
|
59
|
+
return data;
|
|
58
60
|
});
|
|
59
61
|
}
|
|
60
62
|
async getVersionInfo(channel = 'latest') {
|
|
@@ -108,6 +110,20 @@ class ApiClient {
|
|
|
108
110
|
return data;
|
|
109
111
|
});
|
|
110
112
|
}
|
|
113
|
+
async getProjectConfig() {
|
|
114
|
+
logger_1.logger.debug('Fetching project config from server');
|
|
115
|
+
return this.retry.withRetry(async () => {
|
|
116
|
+
const { data } = await this.client.get(constants_1.API_ENDPOINTS.PROJECT_CONFIG);
|
|
117
|
+
return data;
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
async getAwsCredentials(awsAccountId) {
|
|
121
|
+
logger_1.logger.debug(`Fetching AWS credentials for account: ${awsAccountId}`);
|
|
122
|
+
return this.retry.withRetry(async () => {
|
|
123
|
+
const { data } = await this.client.get(constants_1.API_ENDPOINTS.AWS_CREDENTIALS, { params: { awsAccountId } });
|
|
124
|
+
return data;
|
|
125
|
+
});
|
|
126
|
+
}
|
|
111
127
|
async submitChatChunk(commandId, chunk, agentId) {
|
|
112
128
|
this.validateCommandId(commandId);
|
|
113
129
|
logger_1.logger.debug(`Submitting chat chunk ${chunk.index} (${chunk.type}) for command: ${commandId}`);
|
package/dist/api-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAiD;AAEjD,2CAAmH;AACnH,qCAAiC;AACjC,qDAAgD;
|
|
1
|
+
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appsync-subscriber.d.ts","sourceRoot":"","sources":["../src/appsync-subscriber.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"appsync-subscriber.d.ts","sourceRoot":"","sources":["../src/appsync-subscriber.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACjC;AAuBD,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,EAAE,CAAyB;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;IAC/B,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,UAAU,CAAsB;IACxC,OAAO,CAAC,cAAc,CAA6D;IACnF,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,iBAAiB,CAAI;IAC7B,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,cAAc,CAA6C;IACnE,OAAO,CAAC,kBAAkB,CAAI;gBAElB,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAU9C,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAMxB,SAAS,CACP,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,CAAC,YAAY,EAAE,mBAAmB,KAAK,IAAI,GACrD,IAAI;IAQP,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAIvC,UAAU,IAAI,IAAI;IAqBlB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,SAAS;IAyCjB,OAAO,CAAC,aAAa;IA8CrB,OAAO,CAAC,gBAAgB;YA6BV,gBAAgB;IAiC9B,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,mBAAmB;CAM5B"}
|
|
@@ -5,7 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.AppSyncSubscriber = void 0;
|
|
7
7
|
const ws_1 = __importDefault(require("ws"));
|
|
8
|
+
const constants_1 = require("./constants");
|
|
8
9
|
const logger_1 = require("./logger");
|
|
10
|
+
const retry_strategy_1 = require("./retry-strategy");
|
|
9
11
|
const utils_1 = require("./utils");
|
|
10
12
|
const SUBSCRIPTION_QUERY = `subscription OnMessage($tenantCode: String!) {
|
|
11
13
|
onMessage(tenantCode: $tenantCode) {
|
|
@@ -126,7 +128,7 @@ class AppSyncSubscriber {
|
|
|
126
128
|
handleMessage(msg, resolveConnect) {
|
|
127
129
|
switch (msg.type) {
|
|
128
130
|
case 'connection_ack': {
|
|
129
|
-
const timeoutMs = msg.payload?.connectionTimeoutMs ??
|
|
131
|
+
const timeoutMs = msg.payload?.connectionTimeoutMs ?? constants_1.DEFAULT_APPSYNC_TIMEOUT_MS;
|
|
130
132
|
this.keepAliveTimeoutMs = timeoutMs;
|
|
131
133
|
this.resetKeepAliveTimer();
|
|
132
134
|
logger_1.logger.debug(`AppSync: Connection acknowledged (timeout: ${timeoutMs}ms)`);
|
|
@@ -194,7 +196,11 @@ class AppSyncSubscriber {
|
|
|
194
196
|
return;
|
|
195
197
|
}
|
|
196
198
|
this.reconnectAttempts++;
|
|
197
|
-
const delay =
|
|
199
|
+
const delay = (0, retry_strategy_1.calculateBackoff)({
|
|
200
|
+
baseDelayMs: RECONNECT_BASE_DELAY_MS,
|
|
201
|
+
attempt: this.reconnectAttempts - 1,
|
|
202
|
+
jitter: false,
|
|
203
|
+
});
|
|
198
204
|
logger_1.logger.info(`AppSync: Reconnecting in ${delay}ms (attempt ${this.reconnectAttempts}/${MAX_RECONNECT_RETRIES})`);
|
|
199
205
|
await new Promise((resolve) => setTimeout(resolve, delay));
|
|
200
206
|
if (this.closed)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appsync-subscriber.js","sourceRoot":"","sources":["../src/appsync-subscriber.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA0B;AAE1B,qCAAiC;AACjC,mCAAyC;AAkBzC,MAAM,kBAAkB,GAAG;;;;;;;;;;EAUzB,CAAA;AAEF,MAAM,qBAAqB,GAAG,CAAC,CAAA;AAC/B,MAAM,uBAAuB,GAAG,IAAI,CAAA;AAEpC,MAAa,iBAAiB;IACpB,EAAE,GAAqB,IAAI,CAAA;IAClB,WAAW,CAAQ;IACnB,IAAI,CAAQ;IACZ,MAAM,CAAQ;IACvB,cAAc,GAAkB,IAAI,CAAA;IACpC,UAAU,GAAkB,IAAI,CAAA;IAChC,cAAc,GAAyD,IAAI,CAAA;IAC3E,iBAAiB,GAAwB,IAAI,CAAA;IAC7C,iBAAiB,GAAG,CAAC,CAAA;IACrB,MAAM,GAAG,KAAK,CAAA;IACd,cAAc,GAAyC,IAAI,CAAA;IAC3D,kBAAkB,GAAG,CAAC,CAAA;IAE9B,YAAY,UAAkB,EAAE,MAAc;QAC5C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAA;QAC/B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,WAAW,GAAG,UAAU;aAC1B,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC;aAC7B,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC;cAC1B,WAAW,CAAA;IACjB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAA;QAC1B,OAAO,IAAI,CAAC,SAAS,EAAE,CAAA;IACzB,CAAC;IAED,SAAS,CACP,UAAkB,EAClB,SAAsD;QAEtD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,cAAc,GAAG,SAAS,CAAA;QAC/B,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,KAAK,YAAS,CAAC,IAAI,EAAE,CAAC;YACrD,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAA;QACnC,CAAC;IACH,CAAC;IAED,WAAW,CAAC,QAAoB;QAC9B,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAA;IACnC,CAAC;IAED,UAAU;QACR,IAAI,CAAC,MAAM,GAAG,IAAI,CAAA;QAClB,IAAI,CAAC,mBAAmB,EAAE,CAAA;QAC1B,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACZ,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,MAAM,WAAW,GAAmB;oBAClC,EAAE,EAAE,IAAI,CAAC,cAAc;oBACvB,IAAI,EAAE,MAAM;iBACb,CAAA;gBACD,IAAI,CAAC;oBACH,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;gBAC3C,CAAC;gBAAC,MAAM,CAAC;oBACP,uCAAuC;gBACzC,CAAC;YACH,CAAC;YACD,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAA;YACf,IAAI,CAAC,EAAE,GAAG,IAAI,CAAA;QAChB,CAAC;QACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAA;IAC5B,CAAC;IAEO,kBAAkB;QACxB,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,MAAM;YACxB,cAAc,EAAE,kBAAkB;SACnC,CAAA;QACD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAC5E,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;QACzE,OAAO,GAAG,IAAI,CAAC,WAAW,WAAW,aAAa,YAAY,cAAc,EAAE,CAAA;IAChF,CAAC;IAEO,SAAS;QACf,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAA;YACrC,MAAM,EAAE,GAAG,IAAI,YAAS,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;YAE7C,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACjB,MAAM,WAAW,GAAmB,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAA;gBAC/D,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;YACtC,CAAC,CAAC,CAAA;YAEF,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAoB,EAAE,EAAE;gBACxC,IAAI,GAAmB,CAAA;gBACvB,IAAI,CAAC;oBACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAmB,CAAA;gBACrD,CAAC;gBAAC,MAAM,CAAC;oBACP,eAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;oBAChD,OAAM;gBACR,CAAC;gBAED,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;YAClC,CAAC,CAAC,CAAA;YAEF,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAY,EAAE,EAAE;gBAC9B,eAAM,CAAC,KAAK,CAAC,4BAA4B,IAAA,uBAAe,EAAC,KAAK,CAAC,EAAE,CAAC,CAAA;gBAClE,IAAI,IAAI,CAAC,iBAAiB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;oBAC7C,MAAM,CAAC,KAAK,CAAC,CAAA;gBACf,CAAC;YACH,CAAC,CAAC,CAAA;YAEF,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBAClB,IAAI,CAAC,mBAAmB,EAAE,CAAA;gBAC1B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;oBACjB,eAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAA;oBACrD,KAAK,IAAI,CAAC,gBAAgB,EAAE,CAAA;gBAC9B,CAAC;YACH,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACd,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,aAAa,CAAC,GAAmB,EAAE,cAAsC;QAC/E,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;YACjB,KAAK,gBAAgB,CAAC,CAAC,CAAC;gBACtB,MAAM,SAAS,GAAI,GAAG,CAAC,OAAO,EAAE,mBAA8B,IAAI,
|
|
1
|
+
{"version":3,"file":"appsync-subscriber.js","sourceRoot":"","sources":["../src/appsync-subscriber.ts"],"names":[],"mappings":"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"}
|
package/dist/auth-server.js
CHANGED
|
@@ -118,7 +118,7 @@ function startAuthServer(port, allowedOrigin) {
|
|
|
118
118
|
server.listen(listenPort, '127.0.0.1', () => {
|
|
119
119
|
const addr = server.address();
|
|
120
120
|
if (!addr || typeof addr === 'string') {
|
|
121
|
-
reject(new Error(
|
|
121
|
+
reject(new Error(constants_1.ERR_AUTH_SERVER_START_FAILED));
|
|
122
122
|
return;
|
|
123
123
|
}
|
|
124
124
|
const serverUrl = `http://127.0.0.1:${addr.port}`;
|
package/dist/auth-server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-server.js","sourceRoot":"","sources":["../src/auth-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaA,0CAgIC;AA7ID,+CAAgC;AAChC,2CAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"auth-server.js","sourceRoot":"","sources":["../src/auth-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { ApiClient } from './api-client';
|
|
2
|
+
import type { ProjectConfigResponse } from './types';
|
|
3
|
+
export interface AwsCredentialResult {
|
|
4
|
+
env?: Record<string, string>;
|
|
5
|
+
errors: string[];
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* プロファイル方式でAWS認証情報を構築する。
|
|
9
|
+
* 全アカウントの認証情報をサーバーから取得し、プロファイルファイルに書き込んで
|
|
10
|
+
* 環境変数（AWS_CONFIG_FILE, AWS_SHARED_CREDENTIALS_FILE 等）を返す。
|
|
11
|
+
*/
|
|
12
|
+
export declare function buildAwsProfileCredentials(client: ApiClient, projectDir: string, projectConfig: ProjectConfigResponse): Promise<AwsCredentialResult>;
|
|
13
|
+
/**
|
|
14
|
+
* 従来方式（単一アカウント）でAWS認証情報を環境変数として構築する。
|
|
15
|
+
* awsAccountId が指定されている場合にサーバーから認証情報を取得し、
|
|
16
|
+
* AWS_ACCESS_KEY_ID 等の環境変数マップを返す。
|
|
17
|
+
*/
|
|
18
|
+
export declare function buildSingleAccountAwsEnv(client: ApiClient, awsAccountId: string | undefined): Promise<AwsCredentialResult>;
|
|
19
|
+
//# sourceMappingURL=aws-credential-builder.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aws-credential-builder.d.ts","sourceRoot":"","sources":["../src/aws-credential-builder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAE7C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAGpD,MAAM,WAAW,mBAAmB;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB;AAeD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAC9C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,qBAAqB,GACnC,OAAO,CAAC,mBAAmB,CAAC,CAqC9B;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,MAAM,GAAG,SAAS,GAC/B,OAAO,CAAC,mBAAmB,CAAC,CAmB9B"}
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
exports.buildAwsProfileCredentials = buildAwsProfileCredentials;
|
|
40
|
+
exports.buildSingleAccountAwsEnv = buildSingleAccountAwsEnv;
|
|
41
|
+
const axios_1 = __importDefault(require("axios"));
|
|
42
|
+
const logger_1 = require("./logger");
|
|
43
|
+
const utils_1 = require("./utils");
|
|
44
|
+
/**
|
|
45
|
+
* HTTPエラーレスポンスからAWS認証エラーメッセージを抽出する
|
|
46
|
+
*/
|
|
47
|
+
function extractAwsCredentialError(error, accountName) {
|
|
48
|
+
if (axios_1.default.isAxiosError(error) && error.response?.data) {
|
|
49
|
+
const data = error.response.data;
|
|
50
|
+
if (data.error === 'SSO_AUTH_REQUIRED') {
|
|
51
|
+
return `AWS SSO認証の有効期限が切れています（${accountName}）。管理画面からSSO再認証を実行してください。`;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return `AWS認証情報の取得に失敗しました（${accountName}）: ${(0, utils_1.getErrorMessage)(error)}`;
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* プロファイル方式でAWS認証情報を構築する。
|
|
58
|
+
* 全アカウントの認証情報をサーバーから取得し、プロファイルファイルに書き込んで
|
|
59
|
+
* 環境変数（AWS_CONFIG_FILE, AWS_SHARED_CREDENTIALS_FILE 等）を返す。
|
|
60
|
+
*/
|
|
61
|
+
async function buildAwsProfileCredentials(client, projectDir, projectConfig) {
|
|
62
|
+
const accounts = projectConfig.aws?.accounts;
|
|
63
|
+
if (!accounts?.length)
|
|
64
|
+
return { errors: [] };
|
|
65
|
+
const projectCode = projectConfig.project.projectCode;
|
|
66
|
+
const { writeAwsCredentials, buildAwsProfileEnv } = await Promise.resolve().then(() => __importStar(require('./aws-profile')));
|
|
67
|
+
const credentialMap = new Map();
|
|
68
|
+
const errors = [];
|
|
69
|
+
for (const account of accounts) {
|
|
70
|
+
try {
|
|
71
|
+
logger_1.logger.info(`[chat] Fetching AWS credentials for profile: ${account.name} (${account.id})`);
|
|
72
|
+
const creds = await client.getAwsCredentials(account.id);
|
|
73
|
+
credentialMap.set(account.name, creds);
|
|
74
|
+
}
|
|
75
|
+
catch (error) {
|
|
76
|
+
const errorMsg = extractAwsCredentialError(error, account.name);
|
|
77
|
+
errors.push(errorMsg);
|
|
78
|
+
logger_1.logger.warn(`[chat] Failed to get AWS credentials for ${account.name}: ${(0, utils_1.getErrorMessage)(error)}`);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
if (credentialMap.size === 0)
|
|
82
|
+
return { errors };
|
|
83
|
+
// credentials ファイルに書き込み
|
|
84
|
+
writeAwsCredentials(projectDir, projectCode, credentialMap);
|
|
85
|
+
// デフォルトアカウントを特定
|
|
86
|
+
const defaultAccount = accounts.find((a) => a.isDefault) ?? accounts[0];
|
|
87
|
+
const env = buildAwsProfileEnv(projectDir, projectCode, defaultAccount.name, defaultAccount.region);
|
|
88
|
+
return { env, errors };
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* 従来方式（単一アカウント）でAWS認証情報を環境変数として構築する。
|
|
92
|
+
* awsAccountId が指定されている場合にサーバーから認証情報を取得し、
|
|
93
|
+
* AWS_ACCESS_KEY_ID 等の環境変数マップを返す。
|
|
94
|
+
*/
|
|
95
|
+
async function buildSingleAccountAwsEnv(client, awsAccountId) {
|
|
96
|
+
if (!awsAccountId)
|
|
97
|
+
return { errors: [] };
|
|
98
|
+
try {
|
|
99
|
+
logger_1.logger.info(`[chat] Fetching AWS credentials for account: ${awsAccountId}`);
|
|
100
|
+
const creds = await client.getAwsCredentials(awsAccountId);
|
|
101
|
+
const env = {
|
|
102
|
+
AWS_ACCESS_KEY_ID: creds.accessKeyId,
|
|
103
|
+
AWS_SECRET_ACCESS_KEY: creds.secretAccessKey,
|
|
104
|
+
AWS_DEFAULT_REGION: creds.region,
|
|
105
|
+
...(creds.sessionToken ? { AWS_SESSION_TOKEN: creds.sessionToken } : {}),
|
|
106
|
+
};
|
|
107
|
+
logger_1.logger.info(`[chat] AWS credentials obtained for region=${creds.region}`);
|
|
108
|
+
return { env, errors: [] };
|
|
109
|
+
}
|
|
110
|
+
catch (error) {
|
|
111
|
+
const errorMsg = extractAwsCredentialError(error, awsAccountId);
|
|
112
|
+
logger_1.logger.warn(`[chat] Failed to get AWS credentials: ${(0, utils_1.getErrorMessage)(error)}`);
|
|
113
|
+
return { errors: [errorMsg] };
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
//# sourceMappingURL=aws-credential-builder.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aws-credential-builder.js","sourceRoot":"","sources":["../src/aws-credential-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { AwsCredentials, ProjectConfigResponse } from './types';
|
|
2
|
+
type AwsAccount = NonNullable<ProjectConfigResponse['aws']>['accounts'][number];
|
|
3
|
+
/**
|
|
4
|
+
* Generate profile name from project code and account.
|
|
5
|
+
* Uses profileName if available, otherwise falls back to name.
|
|
6
|
+
* Format: {projectCode}-{profileName|name}
|
|
7
|
+
*/
|
|
8
|
+
export declare function getProfileName(projectCode: string, account: string | {
|
|
9
|
+
name: string;
|
|
10
|
+
profileName?: string;
|
|
11
|
+
}): string;
|
|
12
|
+
/**
|
|
13
|
+
* Generate AWS config file content in INI format.
|
|
14
|
+
* Contains profile definitions with region and SSO settings (if applicable).
|
|
15
|
+
*/
|
|
16
|
+
export declare function generateAwsConfig(projectCode: string, accounts: AwsAccount[]): string;
|
|
17
|
+
/**
|
|
18
|
+
* Write AWS config file to project's aws directory.
|
|
19
|
+
* Uses atomic write (temp + rename) with 0o600 permissions.
|
|
20
|
+
*/
|
|
21
|
+
export declare function writeAwsConfig(projectDir: string, projectCode: string, accounts: AwsAccount[]): void;
|
|
22
|
+
/**
|
|
23
|
+
* Generate AWS credentials file content in INI format.
|
|
24
|
+
*/
|
|
25
|
+
export declare function generateAwsCredentials(projectCode: string, credentialMap: Map<string, AwsCredentials>): string;
|
|
26
|
+
/**
|
|
27
|
+
* Write AWS credentials file to project's aws directory.
|
|
28
|
+
* Uses atomic write (temp + rename) with 0o600 permissions.
|
|
29
|
+
*/
|
|
30
|
+
export declare function writeAwsCredentials(projectDir: string, projectCode: string, credentialMap: Map<string, AwsCredentials>): void;
|
|
31
|
+
/**
|
|
32
|
+
* Build environment variables for Claude Code to use AWS profiles.
|
|
33
|
+
* Sets AWS_CONFIG_FILE and AWS_SHARED_CREDENTIALS_FILE to project-specific paths.
|
|
34
|
+
* Optionally sets AWS_PROFILE and AWS_DEFAULT_REGION for the default account.
|
|
35
|
+
*/
|
|
36
|
+
export declare function buildAwsProfileEnv(projectDir: string, projectCode: string, defaultAccountName?: string, defaultRegion?: string): Record<string, string>;
|
|
37
|
+
export {};
|
|
38
|
+
//# sourceMappingURL=aws-profile.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aws-profile.d.ts","sourceRoot":"","sources":["../src/aws-profile.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAEpE,KAAK,UAAU,GAAG,WAAW,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAA;AAE/E;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAGpH;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,MAAM,CAuBrF;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,UAAU,EAAE,GACrB,IAAI,CAiBN;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GACzC,MAAM,CAoBR;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GACzC,IAAI,CAiBN;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgBxB"}
|