funolio-agent 1.0.49 → 1.0.51
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/auth/auto-detect.d.ts +3 -5
- package/dist/auth/auto-detect.d.ts.map +1 -1
- package/dist/auth/auto-detect.js +30 -43
- package/dist/auth/auto-detect.js.map +1 -1
- package/dist/commands/service.d.ts.map +1 -1
- package/dist/commands/service.js +5 -1
- package/dist/commands/service.js.map +1 -1
- package/package.json +1 -1
|
@@ -14,11 +14,9 @@ export interface ResolvedAuth {
|
|
|
14
14
|
/**
|
|
15
15
|
* Resolve the best available authentication method.
|
|
16
16
|
*
|
|
17
|
-
* Priority:
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
* 3. Local OAuth credentials on disk
|
|
21
|
-
* 4. Environment variable API key
|
|
17
|
+
* Priority is access-mode aware:
|
|
18
|
+
* - subscription modes: OAuth/subscription credentials only
|
|
19
|
+
* - API modes: API key/env first, OAuth as fallback
|
|
22
20
|
*/
|
|
23
21
|
export declare function resolveAuth(config: {
|
|
24
22
|
provider?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-detect.d.ts","sourceRoot":"","sources":["../../src/auth/auto-detect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA0D,MAAM,qBAAqB,CAAC;AAK9G,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,GAAG,SAAS,GAAG,KAAK,CAAC;IACpC,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,QAAQ,CAAC,EAAE,SAAS,GAAG,cAAc,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,yBAAyB,GAAG,yBAAyB,CAAC;IACjE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAuGD
|
|
1
|
+
{"version":3,"file":"auto-detect.d.ts","sourceRoot":"","sources":["../../src/auth/auto-detect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAA0D,MAAM,qBAAqB,CAAC;AAK9G,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,GAAG,SAAS,GAAG,KAAK,CAAC;IACpC,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,QAAQ,CAAC,EAAE,SAAS,GAAG,cAAc,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,yBAAyB,GAAG,yBAAyB,CAAC;IACjE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAuGD;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CA8E/B;AAID;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CA+BhF"}
|
package/dist/auth/auto-detect.js
CHANGED
|
@@ -91,31 +91,25 @@ function buildResolvedOauth(provider, model, credential) {
|
|
|
91
91
|
/**
|
|
92
92
|
* Resolve the best available authentication method.
|
|
93
93
|
*
|
|
94
|
-
* Priority:
|
|
95
|
-
*
|
|
96
|
-
*
|
|
97
|
-
* 3. Local OAuth credentials on disk
|
|
98
|
-
* 4. Environment variable API key
|
|
94
|
+
* Priority is access-mode aware:
|
|
95
|
+
* - subscription modes: OAuth/subscription credentials only
|
|
96
|
+
* - API modes: API key/env first, OAuth as fallback
|
|
99
97
|
*/
|
|
100
98
|
async function resolveAuth(config) {
|
|
101
99
|
const requestedProvider = config.provider || 'anthropic';
|
|
102
100
|
const provider = normalizeProvider(requestedProvider);
|
|
103
101
|
const model = normalizeModel(requestedProvider, config.model);
|
|
104
102
|
const isSubscriptionMode = /_subscription$/i.test(String(config.accessMode || ''));
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
// 1. Explicit OAuth/subscription token from config
|
|
108
|
-
const configCredential = mergeCredential(requestedProvider, config.oauthToken, config.oauthRefreshToken, config.oauthExpiresAt);
|
|
109
|
-
if (configCredential) {
|
|
110
|
-
if (configCredential.refreshToken && (0, credential_reader_1.isExpired)(configCredential)) {
|
|
103
|
+
const resolveCredential = async (credential, sourceLabel) => {
|
|
104
|
+
if (credential.refreshToken && (0, credential_reader_1.isExpired)(credential)) {
|
|
111
105
|
try {
|
|
112
|
-
const refreshed = await (0, token_refresh_1.refreshToken)(
|
|
106
|
+
const refreshed = await (0, token_refresh_1.refreshToken)(credential);
|
|
113
107
|
return buildResolvedOauth(requestedProvider, model, refreshed.credential);
|
|
114
108
|
}
|
|
115
109
|
catch (err) {
|
|
116
110
|
if (err instanceof token_refresh_1.TokenRefreshError) {
|
|
117
111
|
return {
|
|
118
|
-
...buildResolvedOauth(requestedProvider, model,
|
|
112
|
+
...buildResolvedOauth(requestedProvider, model, credential),
|
|
119
113
|
expired: true,
|
|
120
114
|
error: `OAuth token refresh failed for ${provider}${err.httpStatus ? ` (HTTP ${err.httpStatus})` : ''}: ${err.message}`,
|
|
121
115
|
};
|
|
@@ -123,33 +117,24 @@ async function resolveAuth(config) {
|
|
|
123
117
|
throw err;
|
|
124
118
|
}
|
|
125
119
|
}
|
|
126
|
-
console.log(`[auto-detect] Using OAuth/subscription token (provider: ${provider})`);
|
|
127
|
-
return buildResolvedOauth(requestedProvider, model,
|
|
128
|
-
}
|
|
129
|
-
|
|
120
|
+
console.log(`[auto-detect] Using ${sourceLabel} OAuth/subscription token (provider: ${provider})`);
|
|
121
|
+
return buildResolvedOauth(requestedProvider, model, credential);
|
|
122
|
+
};
|
|
123
|
+
const configCredential = mergeCredential(requestedProvider, config.oauthToken, config.oauthRefreshToken, config.oauthExpiresAt);
|
|
130
124
|
const detectedCredential = readProviderCredentials(requestedProvider);
|
|
131
|
-
if (
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
return buildResolvedOauth(requestedProvider, model, refreshed.credential);
|
|
136
|
-
}
|
|
137
|
-
catch (err) {
|
|
138
|
-
if (err instanceof token_refresh_1.TokenRefreshError) {
|
|
139
|
-
return {
|
|
140
|
-
...buildResolvedOauth(requestedProvider, model, detectedCredential),
|
|
141
|
-
expired: true,
|
|
142
|
-
error: `OAuth token refresh failed for ${provider}${err.httpStatus ? ` (HTTP ${err.httpStatus})` : ''}: ${err.message}`,
|
|
143
|
-
};
|
|
144
|
-
}
|
|
145
|
-
throw err;
|
|
146
|
-
}
|
|
125
|
+
if (isSubscriptionMode) {
|
|
126
|
+
// Subscription mode must never silently fall back to API key/env credentials.
|
|
127
|
+
if (configCredential?.accessToken) {
|
|
128
|
+
return resolveCredential(configCredential, 'config');
|
|
147
129
|
}
|
|
148
|
-
|
|
149
|
-
|
|
130
|
+
if (detectedCredential?.accessToken) {
|
|
131
|
+
return resolveCredential(detectedCredential, 'local');
|
|
132
|
+
}
|
|
133
|
+
console.log(`[auto-detect] No subscription credentials found for provider: ${provider}`);
|
|
134
|
+
return null;
|
|
150
135
|
}
|
|
151
|
-
//
|
|
152
|
-
if (config.apiKey
|
|
136
|
+
// API mode precedence: explicit key/env first, OAuth fallback.
|
|
137
|
+
if (config.apiKey) {
|
|
153
138
|
console.log(`[auto-detect] Using explicit API key (source: api-key, provider: ${provider})`);
|
|
154
139
|
return {
|
|
155
140
|
provider,
|
|
@@ -158,9 +143,8 @@ async function resolveAuth(config) {
|
|
|
158
143
|
source: 'api-key',
|
|
159
144
|
};
|
|
160
145
|
}
|
|
161
|
-
// 5. Check environment variable API keys
|
|
162
146
|
const envKey = getEnvApiKey(provider);
|
|
163
|
-
if (envKey
|
|
147
|
+
if (envKey) {
|
|
164
148
|
console.log(`[auto-detect] Using environment variable API key (source: env, provider: ${provider})`);
|
|
165
149
|
return {
|
|
166
150
|
provider,
|
|
@@ -169,10 +153,13 @@ async function resolveAuth(config) {
|
|
|
169
153
|
source: 'env',
|
|
170
154
|
};
|
|
171
155
|
}
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
156
|
+
if (configCredential?.accessToken) {
|
|
157
|
+
return resolveCredential(configCredential, 'config');
|
|
158
|
+
}
|
|
159
|
+
if (detectedCredential?.accessToken) {
|
|
160
|
+
return resolveCredential(detectedCredential, 'local');
|
|
161
|
+
}
|
|
162
|
+
console.log(`[auto-detect] No credentials found for provider: ${provider}`);
|
|
176
163
|
return null;
|
|
177
164
|
}
|
|
178
165
|
// ── ensureFreshToken ────────────────────────────────────────────────────────
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-detect.js","sourceRoot":"","sources":["../../src/auth/auto-detect.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"auto-detect.js","sourceRoot":"","sources":["../../src/auth/auto-detect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/commands/service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/commands/service.ts"],"names":[],"mappings":"AAuGA,wBAAsB,qBAAqB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuC7E;AAED,wBAAsB,mBAAmB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB3E;AAED,wBAAsB,kBAAkB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB1E;AAED,wBAAsB,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB5E;AAED,wBAAsB,uBAAuB,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA2B/E"}
|
package/dist/commands/service.js
CHANGED
|
@@ -49,11 +49,15 @@ const path = __importStar(require("path"));
|
|
|
49
49
|
const config_1 = require("../config");
|
|
50
50
|
const windows_service_1 = require("../windows-service");
|
|
51
51
|
function getBinaryPath() {
|
|
52
|
+
const wrapperPath = '/usr/local/bin/funolio-agent';
|
|
53
|
+
if (fs.existsSync(wrapperPath)) {
|
|
54
|
+
return wrapperPath;
|
|
55
|
+
}
|
|
52
56
|
try {
|
|
53
57
|
return (0, child_process_1.execSync)('which funolio-agent', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
|
|
54
58
|
}
|
|
55
59
|
catch {
|
|
56
|
-
return
|
|
60
|
+
return wrapperPath;
|
|
57
61
|
}
|
|
58
62
|
}
|
|
59
63
|
function hasSystemd() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/commands/service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/commands/service.ts"],"names":[],"mappings":"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"}
|