hanseol-dev 4.0.12 → 4.0.14
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/cli.js +24 -104
- package/dist/cli.js.map +1 -1
- package/dist/constants.d.ts +2 -1
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +2 -1
- package/dist/constants.js.map +1 -1
- package/dist/core/auth/auth-gate.d.ts +4 -0
- package/dist/core/auth/auth-gate.d.ts.map +1 -0
- package/dist/core/auth/auth-gate.js +115 -0
- package/dist/core/auth/auth-gate.js.map +1 -0
- package/dist/core/auth/oauth-login.d.ts +1 -0
- package/dist/core/auth/oauth-login.d.ts.map +1 -1
- package/dist/core/auth/oauth-login.js +56 -1
- package/dist/core/auth/oauth-login.js.map +1 -1
- package/dist/core/config/config-manager.d.ts +0 -4
- package/dist/core/config/config-manager.d.ts.map +1 -1
- package/dist/core/config/config-manager.js +0 -49
- package/dist/core/config/config-manager.js.map +1 -1
- package/dist/core/llm/llm-client.d.ts +0 -2
- package/dist/core/llm/llm-client.d.ts.map +1 -1
- package/dist/core/llm/llm-client.js +1 -16
- package/dist/core/llm/llm-client.js.map +1 -1
- package/dist/core/slash-command-handler.js +2 -2
- package/dist/core/slash-command-handler.js.map +1 -1
- package/dist/core/usage-tracker.js +1 -1
- package/dist/errors/quota.d.ts +8 -18
- package/dist/errors/quota.d.ts.map +1 -1
- package/dist/errors/quota.js +1 -1
- package/dist/errors/quota.js.map +1 -1
- package/dist/eval/eval-runner.d.ts.map +1 -1
- package/dist/eval/eval-runner.js +7 -3
- package/dist/eval/eval-runner.js.map +1 -1
- package/dist/ui/components/ModelSelector.d.ts.map +1 -1
- package/dist/ui/components/ModelSelector.js +1 -6
- package/dist/ui/components/ModelSelector.js.map +1 -1
- package/dist/ui/components/PlanExecuteApp.d.ts.map +1 -1
- package/dist/ui/components/PlanExecuteApp.js +12 -47
- package/dist/ui/components/PlanExecuteApp.js.map +1 -1
- package/dist/ui/components/dialogs/SettingsDialog.d.ts.map +1 -1
- package/dist/ui/components/dialogs/SettingsDialog.js +26 -471
- package/dist/ui/components/dialogs/SettingsDialog.js.map +1 -1
- package/dist/ui/ink-entry.js +6 -2
- package/dist/ui/ink-entry.js.map +1 -1
- package/package.json +2 -1
package/dist/cli.js
CHANGED
|
@@ -5,8 +5,9 @@ import React from 'react';
|
|
|
5
5
|
import { render } from 'ink';
|
|
6
6
|
import { createRequire } from 'module';
|
|
7
7
|
import { configManager } from './core/config/config-manager.js';
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
8
|
+
import { LLMClient } from './core/llm/llm-client.js';
|
|
9
|
+
import { DASHBOARD_URL } from './constants.js';
|
|
10
|
+
import { ensureAuthenticated, syncModelsFromDashboard } from './core/auth/auth-gate.js';
|
|
10
11
|
import { PlanExecuteApp } from './ui/components/PlanExecuteApp.js';
|
|
11
12
|
import { setupLogging, logger } from './utils/logger.js';
|
|
12
13
|
import { runEvalMode } from './eval/index.js';
|
|
@@ -54,39 +55,41 @@ program
|
|
|
54
55
|
logger.flow('Initializing optional tools');
|
|
55
56
|
await initializeOptionalTools();
|
|
56
57
|
logger.flow('Optional tools initialized');
|
|
57
|
-
|
|
58
|
+
logger.flow('Starting Dashboard authentication');
|
|
59
|
+
const creds = await ensureAuthenticated(DASHBOARD_URL);
|
|
60
|
+
logger.flow('Authentication complete', { email: creds.email });
|
|
61
|
+
logger.flow('Syncing models from Dashboard');
|
|
62
|
+
await syncModelsFromDashboard(DASHBOARD_URL, creds.token);
|
|
63
|
+
logger.flow('Model sync complete');
|
|
64
|
+
let llmClient;
|
|
58
65
|
let modelInfo = { model: 'Not configured', endpoint: 'Not configured' };
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
modelInfo = llmClient.getModelInfo();
|
|
64
|
-
logger.flow('LLM client created', { model: modelInfo.model, endpoint: modelInfo.endpoint });
|
|
65
|
-
}
|
|
66
|
-
catch (error) {
|
|
67
|
-
logger.warn('Failed to create LLM client', { error: error instanceof Error ? error.message : String(error) });
|
|
68
|
-
}
|
|
66
|
+
try {
|
|
67
|
+
llmClient = new LLMClient(creds.token);
|
|
68
|
+
modelInfo = llmClient.getModelInfo();
|
|
69
|
+
logger.flow('LLM client created', { model: modelInfo.model, endpoint: modelInfo.endpoint });
|
|
69
70
|
}
|
|
70
|
-
|
|
71
|
-
|
|
71
|
+
catch (error) {
|
|
72
|
+
console.log(chalk.red('\n LLM 클라이언트 생성 실패.'));
|
|
73
|
+
console.log(chalk.red(` ${error instanceof Error ? error.message : String(error)}\n`));
|
|
74
|
+
process.exit(1);
|
|
72
75
|
}
|
|
73
76
|
if (options.verbose || options.debug) {
|
|
74
|
-
console.log(chalk.cyan('
|
|
77
|
+
console.log(chalk.cyan('Starting...\n'));
|
|
75
78
|
}
|
|
76
79
|
try {
|
|
77
80
|
const { waitUntilExit } = render(React.createElement(PlanExecuteApp, { llmClient, modelInfo }), { exitOnCtrlC: false });
|
|
78
81
|
await waitUntilExit();
|
|
79
82
|
}
|
|
80
83
|
catch (error) {
|
|
81
|
-
console.log(chalk.yellow('\n
|
|
84
|
+
console.log(chalk.yellow('\n Ink UI를 시작할 수 없습니다.\n'));
|
|
82
85
|
console.log(chalk.dim(`Error: ${error instanceof Error ? error.message : String(error)}\n`));
|
|
83
86
|
process.exit(1);
|
|
84
87
|
}
|
|
85
88
|
}
|
|
86
89
|
catch (error) {
|
|
87
|
-
console.error(chalk.red('\n
|
|
90
|
+
console.error(chalk.red('\n 에러 발생:'));
|
|
88
91
|
if (error instanceof Error) {
|
|
89
|
-
console.error(chalk.red(error.message));
|
|
92
|
+
console.error(chalk.red(` ${error.message}`));
|
|
90
93
|
}
|
|
91
94
|
console.log();
|
|
92
95
|
process.exit(1);
|
|
@@ -101,94 +104,11 @@ program
|
|
|
101
104
|
}
|
|
102
105
|
}
|
|
103
106
|
});
|
|
104
|
-
program
|
|
105
|
-
.command('login')
|
|
106
|
-
.description('Dashboard에 OAuth 로그인 (브라우저)')
|
|
107
|
-
.argument('[dashboard-url]', 'Dashboard URL (예: http://ec2-ip:4090)')
|
|
108
|
-
.action(async (dashboardUrl) => {
|
|
109
|
-
const existing = await loadCredentials();
|
|
110
|
-
if (existing && !dashboardUrl) {
|
|
111
|
-
dashboardUrl = existing.dashboardUrl;
|
|
112
|
-
}
|
|
113
|
-
if (!dashboardUrl) {
|
|
114
|
-
console.log(chalk.yellow('\n Dashboard URL을 입력해주세요.'));
|
|
115
|
-
console.log(chalk.dim(' 예: hanseol login http://your-ec2-ip:4090\n'));
|
|
116
|
-
process.exit(1);
|
|
117
|
-
}
|
|
118
|
-
dashboardUrl = dashboardUrl.replace(/\/$/, '');
|
|
119
|
-
if (!dashboardUrl.startsWith('http')) {
|
|
120
|
-
dashboardUrl = `http://${dashboardUrl}`;
|
|
121
|
-
}
|
|
122
|
-
console.log(chalk.cyan(`\n Dashboard: ${dashboardUrl}`));
|
|
123
|
-
const creds = await performOAuthLogin(dashboardUrl);
|
|
124
|
-
if (creds) {
|
|
125
|
-
console.log(chalk.green(' 로그인 성공!'));
|
|
126
|
-
if (creds.displayName) {
|
|
127
|
-
console.log(chalk.dim(` 사용자: ${creds.displayName} (${creds.provider || ''})`));
|
|
128
|
-
}
|
|
129
|
-
if (creds.email) {
|
|
130
|
-
console.log(chalk.dim(` 이메일: ${creds.email}`));
|
|
131
|
-
}
|
|
132
|
-
try {
|
|
133
|
-
const meRes = await fetch(`${dashboardUrl}/api/auth/me`, {
|
|
134
|
-
headers: { Authorization: `Bearer ${creds.token}` },
|
|
135
|
-
});
|
|
136
|
-
if (meRes.ok) {
|
|
137
|
-
const meData = await meRes.json();
|
|
138
|
-
if (meData.plan) {
|
|
139
|
-
creds.plan = meData.plan;
|
|
140
|
-
const { saveCredentials: saveCreds } = await import('./core/auth/oauth-login.js');
|
|
141
|
-
await saveCreds(creds);
|
|
142
|
-
console.log(chalk.dim(` 플랜: ${meData.plan.displayName}`));
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
|
-
catch {
|
|
147
|
-
}
|
|
148
|
-
console.log(chalk.dim(` 만료: ${new Date(creds.expiresAt).toLocaleString()}\n`));
|
|
149
|
-
}
|
|
150
|
-
else {
|
|
151
|
-
console.log(chalk.red('\n 로그인 실패 또는 타임아웃.\n'));
|
|
152
|
-
process.exit(1);
|
|
153
|
-
}
|
|
154
|
-
});
|
|
155
|
-
program
|
|
156
|
-
.command('logout')
|
|
157
|
-
.description('Dashboard 로그인 정보 삭제')
|
|
158
|
-
.action(async () => {
|
|
159
|
-
const existing = await loadCredentials();
|
|
160
|
-
if (existing) {
|
|
161
|
-
await clearCredentials();
|
|
162
|
-
console.log(chalk.green('\n 로그아웃 완료.'));
|
|
163
|
-
if (existing.email) {
|
|
164
|
-
console.log(chalk.dim(` (${existing.email})\n`));
|
|
165
|
-
}
|
|
166
|
-
}
|
|
167
|
-
else {
|
|
168
|
-
console.log(chalk.dim('\n 저장된 로그인 정보가 없습니다.\n'));
|
|
169
|
-
}
|
|
170
|
-
});
|
|
171
|
-
program
|
|
172
|
-
.command('whoami')
|
|
173
|
-
.description('현재 로그인 상태 확인')
|
|
174
|
-
.action(async () => {
|
|
175
|
-
const creds = await loadCredentials();
|
|
176
|
-
if (creds) {
|
|
177
|
-
console.log(chalk.green(`\n 로그인됨: ${creds.displayName || creds.email || '(unknown)'}`));
|
|
178
|
-
console.log(chalk.dim(` Provider: ${creds.provider || '(unknown)'}`));
|
|
179
|
-
console.log(chalk.dim(` Dashboard: ${creds.dashboardUrl}`));
|
|
180
|
-
console.log(chalk.dim(` 만료: ${new Date(creds.expiresAt).toLocaleString()}\n`));
|
|
181
|
-
}
|
|
182
|
-
else {
|
|
183
|
-
console.log(chalk.yellow('\n 로그인되어 있지 않습니다.'));
|
|
184
|
-
console.log(chalk.dim(' hanseol login <dashboard-url> 로 로그인하세요.\n'));
|
|
185
|
-
}
|
|
186
|
-
});
|
|
187
107
|
program.showHelpAfterError(false);
|
|
188
108
|
program.configureOutput({
|
|
189
109
|
outputError: (str, write) => {
|
|
190
110
|
if (str.includes('--help') || str.includes('-h')) {
|
|
191
|
-
write(chalk.yellow('
|
|
111
|
+
write(chalk.yellow('For help, use /help command after starting the app.\n'));
|
|
192
112
|
}
|
|
193
113
|
else {
|
|
194
114
|
write(chalk.red(str));
|
|
@@ -196,7 +116,7 @@ program.configureOutput({
|
|
|
196
116
|
}
|
|
197
117
|
});
|
|
198
118
|
program.on('command:*', () => {
|
|
199
|
-
console.error(chalk.red('
|
|
119
|
+
console.error(chalk.red('Unknown command.'));
|
|
200
120
|
console.log(chalk.white('Usage: hanseol [--verbose] [--debug]\n'));
|
|
201
121
|
console.log(chalk.white('Use /help in interactive mode for help.\n'));
|
|
202
122
|
process.exit(1);
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAUA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAGnE,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,MAAM,WAAW,GAAG,OAAO,CAAC,iBAAiB,CAAwB,CAAC;AAEtE,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAK9B,OAAO;KACJ,IAAI,CAAC,aAAa,CAAC;KACnB,WAAW,CAAC,uBAAuB,CAAC;KACpC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;KAC5B,UAAU,CAAC,KAAK,CAAC,CAAC;AAKrB,OAAO;KACJ,MAAM,CAAC,WAAW,EAAE,wBAAwB,CAAC;KAC7C,MAAM,CAAC,SAAS,EAAE,sBAAsB,CAAC;KACzC,MAAM,CAAC,WAAW,EAAE,oBAAoB,CAAC;KACzC,MAAM,CAAC,QAAQ,EAAE,6DAA6D,CAAC;KAC/E,MAAM,CAAC,KAAK,EAAE,OAAiF,EAAE,EAAE;IAElG,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,MAAM,WAAW,EAAE,CAAC;QACpB,OAAO;IACT,CAAC;IAED,IAAI,OAAO,GAAiC,IAAI,CAAC;IACjD,IAAI,CAAC;QAEH,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAGvC,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC;YACtC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAC;QACH,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;QAG/B,MAAM,CAAC,YAAY,CAAC;YAClB,SAAS,EAAE,cAAc,CAAC,mBAAmB,EAAE;YAC/C,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;YAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,WAAW,EAAE,OAAO,CAAC,OAAO;SAC7B,CAAC,CAAC;QAGH,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAC3C,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAG1C,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAC3C,MAAM,uBAAuB,EAAE,CAAC;QAChC,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAG1C,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;QACjD,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,aAAa,CAAC,CAAC;QACvD,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QAG/D,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC7C,MAAM,uBAAuB,CAAC,aAAa,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1D,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAGnC,IAAI,SAAoB,CAAC;QACzB,IAAI,SAAS,GAAG,EAAE,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;QAExE,IAAI,CAAC;YACH,SAAS,GAAG,IAAI,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACvC,SAAS,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;YACrC,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9F,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC;YAC/C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YACxF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAGD,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YACrC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,CAAC;YACH,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,CAC9B,KAAK,CAAC,aAAa,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAC7D,EAAE,WAAW,EAAE,KAAK,EAAE,CACvB,CAAC;YACF,MAAM,aAAa,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,2BAA2B,CAAC,CAAC,CAAC;YACvD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;QACvC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QACjD,CAAC;QACD,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;YAAS,CAAC;QAET,MAAM,CAAC,UAAU,CAAC;YAChB,SAAS,EAAE,cAAc,CAAC,mBAAmB,EAAE;YAC/C,UAAU,EAAE,QAAQ;SACrB,CAAC,CAAC;QAGH,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,OAAO,EAAE,CAAC;QAClB,CAAC;IACH,CAAC;AACH,CAAC,CAAC,CAAC;AAML,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;AAClC,OAAO,CAAC,eAAe,CAAC;IACtB,WAAW,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;QAC1B,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACjD,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,uDAAuD,CAAC,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;CACF,CAAC,CAAC;AAEH,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE;IAC3B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;IACnE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC,CAAC;IACtE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC;AAKH,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -6,5 +6,6 @@ export declare const BACKUPS_DIR: string;
|
|
|
6
6
|
export declare const PROJECTS_DIR: string;
|
|
7
7
|
export declare const CREDENTIALS_FILE_PATH: string;
|
|
8
8
|
export declare const APP_NAME = "hanseol-dev";
|
|
9
|
-
export declare const APP_VERSION = "4.0.
|
|
9
|
+
export declare const APP_VERSION = "4.0.14";
|
|
10
|
+
export declare const DASHBOARD_URL = "https://54.180.85.143.nip.io";
|
|
10
11
|
//# sourceMappingURL=constants.d.ts.map
|
package/dist/constants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,cAAc,QAA0C,CAAC;AAGtE,eAAO,MAAM,aAAa,QAAiB,CAAC;AAM5C,eAAO,MAAM,gBAAgB,QAA2C,CAAC;AAMzE,eAAO,MAAM,QAAQ,QAAoC,CAAC;AAM1D,eAAO,MAAM,WAAW,QAAuC,CAAC;AAMhE,eAAO,MAAM,YAAY,QAAwC,CAAC;AAOlE,eAAO,MAAM,qBAAqB,QAAgD,CAAC;AAMnF,eAAO,MAAM,QAAQ,gBAAgB,CAAC;AAKtC,eAAO,MAAM,WAAW,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,cAAc,QAA0C,CAAC;AAGtE,eAAO,MAAM,aAAa,QAAiB,CAAC;AAM5C,eAAO,MAAM,gBAAgB,QAA2C,CAAC;AAMzE,eAAO,MAAM,QAAQ,QAAoC,CAAC;AAM1D,eAAO,MAAM,WAAW,QAAuC,CAAC;AAMhE,eAAO,MAAM,YAAY,QAAwC,CAAC;AAOlE,eAAO,MAAM,qBAAqB,QAAgD,CAAC;AAMnF,eAAO,MAAM,QAAQ,gBAAgB,CAAC;AAKtC,eAAO,MAAM,WAAW,WAAW,CAAC;AAMpC,eAAO,MAAM,aAAa,iCAAiC,CAAC"}
|
package/dist/constants.js
CHANGED
|
@@ -8,5 +8,6 @@ export const BACKUPS_DIR = path.join(LOCAL_HOME_DIR, 'backups');
|
|
|
8
8
|
export const PROJECTS_DIR = path.join(LOCAL_HOME_DIR, 'projects');
|
|
9
9
|
export const CREDENTIALS_FILE_PATH = path.join(LOCAL_HOME_DIR, 'credentials.json');
|
|
10
10
|
export const APP_NAME = 'hanseol-dev';
|
|
11
|
-
export const APP_VERSION = '4.0.
|
|
11
|
+
export const APP_VERSION = '4.0.14';
|
|
12
|
+
export const DASHBOARD_URL = 'https://54.180.85.143.nip.io';
|
|
12
13
|
//# sourceMappingURL=constants.js.map
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAMzB,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,cAAc,CAAC,CAAC;AAGtE,MAAM,CAAC,MAAM,aAAa,GAAG,cAAc,CAAC;AAM5C,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;AAMzE,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;AAM1D,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;AAMhE,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAOlE,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;AAMnF,MAAM,CAAC,MAAM,QAAQ,GAAG,aAAa,CAAC;AAKtC,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAMzB,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,cAAc,CAAC,CAAC;AAGtE,MAAM,CAAC,MAAM,aAAa,GAAG,cAAc,CAAC;AAM5C,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;AAMzE,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;AAM1D,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;AAMhE,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAOlE,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;AAMnF,MAAM,CAAC,MAAM,QAAQ,GAAG,aAAa,CAAC;AAKtC,MAAM,CAAC,MAAM,WAAW,GAAG,QAAQ,CAAC;AAMpC,MAAM,CAAC,MAAM,aAAa,GAAG,8BAA8B,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { type DashboardCredentials } from './oauth-login.js';
|
|
2
|
+
export declare function ensureAuthenticated(dashboardUrl: string): Promise<DashboardCredentials>;
|
|
3
|
+
export declare function syncModelsFromDashboard(dashboardUrl: string, token: string): Promise<void>;
|
|
4
|
+
//# sourceMappingURL=auth-gate.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-gate.d.ts","sourceRoot":"","sources":["../../../src/core/auth/auth-gate.ts"],"names":[],"mappings":"AAcA,OAAO,EAKL,KAAK,oBAAoB,EAC1B,MAAM,kBAAkB,CAAC;AAS1B,wBAAsB,mBAAmB,CACvC,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAkE/B;AAQD,wBAAsB,uBAAuB,CAC3C,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAqFf"}
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import chalk from 'chalk';
|
|
2
|
+
import { loadCredentials, performOAuthLogin, saveCredentials, refreshTokenFromServer, } from './oauth-login.js';
|
|
3
|
+
import { configManager } from '../config/config-manager.js';
|
|
4
|
+
import { logger } from '../../utils/logger.js';
|
|
5
|
+
export async function ensureAuthenticated(dashboardUrl) {
|
|
6
|
+
const existing = await loadCredentials();
|
|
7
|
+
if (existing) {
|
|
8
|
+
const expiresAt = new Date(existing.expiresAt);
|
|
9
|
+
const now = new Date();
|
|
10
|
+
const oneHourMs = 60 * 60 * 1000;
|
|
11
|
+
const timeUntilExpiry = expiresAt.getTime() - now.getTime();
|
|
12
|
+
if (timeUntilExpiry > oneHourMs) {
|
|
13
|
+
return existing;
|
|
14
|
+
}
|
|
15
|
+
if (timeUntilExpiry > 0) {
|
|
16
|
+
const refreshed = await refreshTokenFromServer(existing);
|
|
17
|
+
if (refreshed) {
|
|
18
|
+
return refreshed;
|
|
19
|
+
}
|
|
20
|
+
return existing;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
console.log(chalk.cyan(`\n Dashboard: ${dashboardUrl}`));
|
|
24
|
+
const creds = await performOAuthLogin(dashboardUrl);
|
|
25
|
+
if (!creds) {
|
|
26
|
+
console.log(chalk.red('\n 로그인 실패. 프로그램을 종료합니다.\n'));
|
|
27
|
+
process.exit(1);
|
|
28
|
+
}
|
|
29
|
+
console.log(chalk.green(' 로그인 성공!'));
|
|
30
|
+
if (creds.displayName) {
|
|
31
|
+
console.log(chalk.dim(` 사용자: ${creds.displayName} (${creds.provider || ''})`));
|
|
32
|
+
}
|
|
33
|
+
if (creds.email) {
|
|
34
|
+
console.log(chalk.dim(` 이메일: ${creds.email}`));
|
|
35
|
+
}
|
|
36
|
+
try {
|
|
37
|
+
const meRes = await fetch(`${dashboardUrl}/api/auth/me`, {
|
|
38
|
+
headers: { Authorization: `Bearer ${creds.token}` },
|
|
39
|
+
});
|
|
40
|
+
if (meRes.ok) {
|
|
41
|
+
const meData = (await meRes.json());
|
|
42
|
+
if (meData.plan) {
|
|
43
|
+
creds.plan = meData.plan;
|
|
44
|
+
await saveCredentials(creds);
|
|
45
|
+
console.log(chalk.dim(` 플랜: ${meData.plan.displayName}`));
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
}
|
|
51
|
+
console.log(chalk.dim(` 만료: ${new Date(creds.expiresAt).toLocaleString()}\n`));
|
|
52
|
+
return creds;
|
|
53
|
+
}
|
|
54
|
+
export async function syncModelsFromDashboard(dashboardUrl, token) {
|
|
55
|
+
logger.flow('Syncing models from Dashboard');
|
|
56
|
+
const DASHBOARD_ENDPOINT_ID = 'dashboard';
|
|
57
|
+
try {
|
|
58
|
+
const res = await fetch(`${dashboardUrl}/v1/models`, {
|
|
59
|
+
headers: { Authorization: `Bearer ${token}` },
|
|
60
|
+
});
|
|
61
|
+
if (!res.ok) {
|
|
62
|
+
throw new Error(`GET /v1/models failed: ${res.status} ${res.statusText}`);
|
|
63
|
+
}
|
|
64
|
+
const data = (await res.json());
|
|
65
|
+
if (!data.data || data.data.length === 0) {
|
|
66
|
+
logger.warn('Dashboard returned no models');
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
const models = data.data.map((m) => ({
|
|
70
|
+
id: m._hanseol?.id || m.id,
|
|
71
|
+
name: m._hanseol?.displayName || m.id,
|
|
72
|
+
maxTokens: m._hanseol?.maxTokens || 128000,
|
|
73
|
+
enabled: true,
|
|
74
|
+
}));
|
|
75
|
+
logger.flow('Models fetched from Dashboard', {
|
|
76
|
+
count: models.length,
|
|
77
|
+
models: models.map((m) => m.id),
|
|
78
|
+
});
|
|
79
|
+
const config = configManager.getConfig();
|
|
80
|
+
const existingIndex = config.endpoints.findIndex((ep) => ep.id === DASHBOARD_ENDPOINT_ID);
|
|
81
|
+
if (existingIndex >= 0) {
|
|
82
|
+
config.endpoints[existingIndex].models = models;
|
|
83
|
+
config.endpoints[existingIndex].updatedAt = new Date();
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
const endpoint = {
|
|
87
|
+
id: DASHBOARD_ENDPOINT_ID,
|
|
88
|
+
name: 'Dashboard',
|
|
89
|
+
baseUrl: `${dashboardUrl}/v1`,
|
|
90
|
+
models,
|
|
91
|
+
createdAt: new Date(),
|
|
92
|
+
updatedAt: new Date(),
|
|
93
|
+
};
|
|
94
|
+
config.endpoints.push(endpoint);
|
|
95
|
+
}
|
|
96
|
+
config.currentEndpoint = DASHBOARD_ENDPOINT_ID;
|
|
97
|
+
const currentModelExists = models.some((m) => m.id === config.currentModel);
|
|
98
|
+
if (!config.currentModel || !currentModelExists) {
|
|
99
|
+
config.currentModel = models[0]?.id;
|
|
100
|
+
}
|
|
101
|
+
await configManager.saveConfig();
|
|
102
|
+
logger.flow('Dashboard models synced to configManager', {
|
|
103
|
+
endpointId: DASHBOARD_ENDPOINT_ID,
|
|
104
|
+
modelCount: models.length,
|
|
105
|
+
currentModel: config.currentModel,
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
catch (error) {
|
|
109
|
+
logger.error('Failed to sync models from Dashboard', {
|
|
110
|
+
error: error instanceof Error ? error.message : String(error),
|
|
111
|
+
});
|
|
112
|
+
throw error;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
//# sourceMappingURL=auth-gate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-gate.js","sourceRoot":"","sources":["../../../src/core/auth/auth-gate.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,5 +15,6 @@ export interface DashboardCredentials {
|
|
|
15
15
|
export declare function loadCredentials(): Promise<DashboardCredentials | null>;
|
|
16
16
|
export declare function saveCredentials(creds: DashboardCredentials): Promise<void>;
|
|
17
17
|
export declare function clearCredentials(): Promise<void>;
|
|
18
|
+
export declare function refreshTokenFromServer(creds: DashboardCredentials): Promise<DashboardCredentials | null>;
|
|
18
19
|
export declare function performOAuthLogin(dashboardUrl: string, timeoutMs?: number): Promise<DashboardCredentials | null>;
|
|
19
20
|
//# sourceMappingURL=oauth-login.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-login.d.ts","sourceRoot":"","sources":["../../../src/core/auth/oauth-login.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,MAAM,CAAC;KACd,GAAG,IAAI,CAAC;CACV;AAKD,wBAAsB,eAAe,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAc5E;AAKD,wBAAsB,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhF;AAKD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAMtD;
|
|
1
|
+
{"version":3,"file":"oauth-login.d.ts","sourceRoot":"","sources":["../../../src/core/auth/oauth-login.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,oBAAoB;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,MAAM,CAAC;KACd,GAAG,IAAI,CAAC;CACV;AAKD,wBAAsB,eAAe,IAAI,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAc5E;AAKD,wBAAsB,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhF;AAKD,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAMtD;AASD,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAwCtC;AA+FD,wBAAsB,iBAAiB,CACrC,YAAY,EAAE,MAAM,EACpB,SAAS,GAAE,MAAe,GACzB,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CA8GtC"}
|
|
@@ -27,6 +27,43 @@ export async function clearCredentials() {
|
|
|
27
27
|
catch {
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
|
+
export async function refreshTokenFromServer(creds) {
|
|
31
|
+
try {
|
|
32
|
+
const res = await fetch(`${creds.dashboardUrl}/api/auth/refresh`, {
|
|
33
|
+
method: 'POST',
|
|
34
|
+
headers: {
|
|
35
|
+
'Content-Type': 'application/json',
|
|
36
|
+
Authorization: `Bearer ${creds.token}`,
|
|
37
|
+
},
|
|
38
|
+
});
|
|
39
|
+
if (!res.ok) {
|
|
40
|
+
return null;
|
|
41
|
+
}
|
|
42
|
+
const data = (await res.json());
|
|
43
|
+
if (!data.token) {
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
const payload = parseJwtPayload(data.token);
|
|
47
|
+
const now = new Date();
|
|
48
|
+
const expiresAt = payload?.['exp']
|
|
49
|
+
? new Date(payload['exp'] * 1000)
|
|
50
|
+
: new Date(now.getTime() + 24 * 60 * 60 * 1000);
|
|
51
|
+
const newCreds = {
|
|
52
|
+
...creds,
|
|
53
|
+
token: data.token,
|
|
54
|
+
email: payload?.['email'] || creds.email,
|
|
55
|
+
displayName: payload?.['displayName'] || creds.displayName,
|
|
56
|
+
provider: payload?.['provider'] || creds.provider,
|
|
57
|
+
issuedAt: now.toISOString(),
|
|
58
|
+
expiresAt: expiresAt.toISOString(),
|
|
59
|
+
};
|
|
60
|
+
await saveCredentials(newCreds);
|
|
61
|
+
return newCreds;
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
30
67
|
function parseJwtPayload(token) {
|
|
31
68
|
try {
|
|
32
69
|
const parts = token.split('.');
|
|
@@ -68,10 +105,28 @@ async function openBrowser(url) {
|
|
|
68
105
|
await execAsync(`start "" "${url}"`);
|
|
69
106
|
}
|
|
70
107
|
else {
|
|
108
|
+
const { readFileSync } = await import('fs');
|
|
109
|
+
let isWSL = false;
|
|
71
110
|
try {
|
|
72
|
-
|
|
111
|
+
const procVersion = readFileSync('/proc/version', 'utf-8');
|
|
112
|
+
isWSL = /microsoft/i.test(procVersion);
|
|
73
113
|
}
|
|
74
114
|
catch {
|
|
115
|
+
}
|
|
116
|
+
if (isWSL) {
|
|
117
|
+
try {
|
|
118
|
+
await execAsync(`cmd.exe /c start "" "${url.replace(/&/g, '^&')}"`);
|
|
119
|
+
}
|
|
120
|
+
catch {
|
|
121
|
+
try {
|
|
122
|
+
await execAsync(`wslview "${url}"`);
|
|
123
|
+
}
|
|
124
|
+
catch {
|
|
125
|
+
await execAsync(`explorer.exe "${url}"`);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
else {
|
|
75
130
|
try {
|
|
76
131
|
await execAsync(`xdg-open "${url}"`);
|
|
77
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-login.js","sourceRoot":"","sources":["../../../src/core/auth/oauth-login.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAoB3E,MAAM,CAAC,KAAK,UAAU,eAAe;IACnC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAyB,CAAC;QAGvD,IAAI,KAAK,CAAC,SAAS,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;YAC9D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAKD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,KAA2B;IAC/D,MAAM,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpD,MAAM,EAAE,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAEnF,MAAM,EAAE,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;AAC/C,CAAC;AAKD,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;AACH,CAAC;AAKD,SAAS,eAAe,CAAC,KAAa;IACpC,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAE,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAKD,SAAS,iBAAiB;IACxB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACnC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE;YACjC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YAC9B,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACrC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;gBACvB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC;YACzE,CAAC;QACH,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC;AAKD,KAAK,UAAU,WAAW,CAAC,GAAW;IACpC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;IAC/C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IAElC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,IAAI,CAAC;QACH,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC1B,MAAM,SAAS,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC;QACnC,CAAC;aAAM,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YAChC,MAAM,SAAS,CAAC,aAAa,GAAG,GAAG,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YAGN,IAAI,CAAC;gBACH,MAAM,SAAS,CAAC,YAAY,GAAG,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"oauth-login.js","sourceRoot":"","sources":["../../../src/core/auth/oauth-login.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,16 +9,12 @@ export declare class ConfigManager {
|
|
|
9
9
|
getCurrentEndpoint(): EndpointConfig | null;
|
|
10
10
|
getCurrentModel(): ModelInfo | null;
|
|
11
11
|
getAllEndpoints(): EndpointConfig[];
|
|
12
|
-
addEndpoint(endpoint: EndpointConfig): Promise<void>;
|
|
13
|
-
removeEndpoint(endpointId: string): Promise<void>;
|
|
14
12
|
setCurrentEndpoint(endpointId: string): Promise<void>;
|
|
15
13
|
setCurrentModel(modelId: string): Promise<void>;
|
|
16
14
|
updateSettings(settings: Partial<OpenConfig['settings']>): Promise<void>;
|
|
17
15
|
isInitialized(): Promise<boolean>;
|
|
18
16
|
hasEndpoints(): boolean;
|
|
19
|
-
createInitialEndpoint(endpoint: EndpointConfig): Promise<void>;
|
|
20
17
|
reset(): Promise<void>;
|
|
21
|
-
updateEndpoint(endpointId: string, updates: Partial<Omit<EndpointConfig, 'id' | 'createdAt'>>): Promise<void>;
|
|
22
18
|
updateModelHealth(endpointId: string, modelId: string, status: 'healthy' | 'degraded' | 'unhealthy', _latency?: number): Promise<void>;
|
|
23
19
|
updateAllHealthStatus(healthResults: Map<string, {
|
|
24
20
|
modelId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-manager.d.ts","sourceRoot":"","sources":["../../../src/core/config/config-manager.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAqC7E,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,WAAW,CAAS;IAMtB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAyBnB,kBAAkB;IAe1B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAcjC,SAAS,IAAI,UAAU;IAWvB,kBAAkB,IAAI,cAAc,GAAG,IAAI;IAa3C,eAAe,IAAI,SAAS,GAAG,IAAI;IAanC,eAAe,IAAI,cAAc,EAAE;IAO7B,
|
|
1
|
+
{"version":3,"file":"config-manager.d.ts","sourceRoot":"","sources":["../../../src/core/config/config-manager.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAqC7E,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,WAAW,CAAS;IAMtB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;YAyBnB,kBAAkB;IAe1B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAcjC,SAAS,IAAI,UAAU;IAWvB,kBAAkB,IAAI,cAAc,GAAG,IAAI;IAa3C,eAAe,IAAI,SAAS,GAAG,IAAI;IAanC,eAAe,IAAI,cAAc,EAAE;IAO7B,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBrD,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB/C,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IASxE,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAOvC,YAAY,IAAI,OAAO;IAUjB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAQtB,iBAAiB,CACrB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,SAAS,GAAG,UAAU,GAAG,WAAW,EAC5C,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC;IAsBV,qBAAqB,CACzB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,GACpF,OAAO,CAAC,IAAI,CAAC;IAsBhB,gBAAgB,IAAI;QAAE,QAAQ,EAAE,cAAc,CAAC;QAAC,KAAK,EAAE,SAAS,CAAA;KAAE,EAAE;IAkBpE,YAAY,IAAI;QAAE,QAAQ,EAAE,cAAc,CAAC;QAAC,KAAK,EAAE,SAAS,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,EAAE;IAkBpF,eAAe,IAAI,MAAM,EAAE;IAQrB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASjD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAazC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUjD;AAKD,eAAO,MAAM,aAAa,eAAsB,CAAC"}
|
|
@@ -72,31 +72,6 @@ export class ConfigManager {
|
|
|
72
72
|
getAllEndpoints() {
|
|
73
73
|
return this.getConfig().endpoints;
|
|
74
74
|
}
|
|
75
|
-
async addEndpoint(endpoint) {
|
|
76
|
-
const config = this.getConfig();
|
|
77
|
-
const exists = config.endpoints.some((ep) => ep.id === endpoint.id);
|
|
78
|
-
if (exists) {
|
|
79
|
-
throw new Error(`Endpoint with ID ${endpoint.id} already exists`);
|
|
80
|
-
}
|
|
81
|
-
config.endpoints.push(endpoint);
|
|
82
|
-
await this.saveConfig();
|
|
83
|
-
}
|
|
84
|
-
async removeEndpoint(endpointId) {
|
|
85
|
-
const config = this.getConfig();
|
|
86
|
-
config.endpoints = config.endpoints.filter((ep) => ep.id !== endpointId);
|
|
87
|
-
if (config.currentEndpoint === endpointId) {
|
|
88
|
-
const firstEndpoint = config.endpoints[0];
|
|
89
|
-
config.currentEndpoint = firstEndpoint?.id;
|
|
90
|
-
if (firstEndpoint) {
|
|
91
|
-
const firstModel = firstEndpoint.models.find((m) => m.enabled);
|
|
92
|
-
config.currentModel = firstModel?.id;
|
|
93
|
-
}
|
|
94
|
-
else {
|
|
95
|
-
config.currentModel = undefined;
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
await this.saveConfig();
|
|
99
|
-
}
|
|
100
75
|
async setCurrentEndpoint(endpointId) {
|
|
101
76
|
const config = this.getConfig();
|
|
102
77
|
const endpoint = config.endpoints.find((ep) => ep.id === endpointId);
|
|
@@ -140,34 +115,10 @@ export class ConfigManager {
|
|
|
140
115
|
}
|
|
141
116
|
return this.config.endpoints.length > 0;
|
|
142
117
|
}
|
|
143
|
-
async createInitialEndpoint(endpoint) {
|
|
144
|
-
const config = this.getConfig();
|
|
145
|
-
config.endpoints.push(endpoint);
|
|
146
|
-
config.currentEndpoint = endpoint.id;
|
|
147
|
-
const activeModel = endpoint.models.find((m) => m.enabled);
|
|
148
|
-
if (activeModel) {
|
|
149
|
-
config.currentModel = activeModel.id;
|
|
150
|
-
}
|
|
151
|
-
await this.saveConfig();
|
|
152
|
-
}
|
|
153
118
|
async reset() {
|
|
154
119
|
this.config = { ...DEFAULT_CONFIG };
|
|
155
120
|
await this.saveConfig();
|
|
156
121
|
}
|
|
157
|
-
async updateEndpoint(endpointId, updates) {
|
|
158
|
-
const config = this.getConfig();
|
|
159
|
-
const endpointIndex = config.endpoints.findIndex((ep) => ep.id === endpointId);
|
|
160
|
-
if (endpointIndex === -1) {
|
|
161
|
-
throw new Error(`Endpoint ${endpointId} not found`);
|
|
162
|
-
}
|
|
163
|
-
const endpoint = config.endpoints[endpointIndex];
|
|
164
|
-
config.endpoints[endpointIndex] = {
|
|
165
|
-
...endpoint,
|
|
166
|
-
...updates,
|
|
167
|
-
updatedAt: new Date(),
|
|
168
|
-
};
|
|
169
|
-
await this.saveConfig();
|
|
170
|
-
}
|
|
171
122
|
async updateModelHealth(endpointId, modelId, status, _latency) {
|
|
172
123
|
const config = this.getConfig();
|
|
173
124
|
const endpoint = config.endpoints.find((ep) => ep.id === endpointId);
|