@structured-world/gitlab-mcp 6.45.1 → 6.46.1
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 +1 -1
- package/dist/src/cli-utils.js +4 -4
- package/dist/src/cli-utils.js.map +1 -1
- package/dist/src/discovery/auto.js +14 -14
- package/dist/src/discovery/auto.js.map +1 -1
- package/dist/src/discovery/git-remote.js +7 -7
- package/dist/src/discovery/git-remote.js.map +1 -1
- package/dist/src/discovery/profile-matcher.js +11 -3
- package/dist/src/discovery/profile-matcher.js.map +1 -1
- package/dist/src/entities/context/context-manager.js +13 -9
- package/dist/src/entities/context/context-manager.js.map +1 -1
- package/dist/src/entities/context/handlers.d.ts +4 -3
- package/dist/src/entities/context/handlers.js +7 -0
- package/dist/src/entities/context/handlers.js.map +1 -1
- package/dist/src/entities/context/registry.js +1 -1
- package/dist/src/entities/context/registry.js.map +1 -1
- package/dist/src/entities/context/schema.d.ts +6 -0
- package/dist/src/entities/context/schema.js +9 -0
- package/dist/src/entities/context/schema.js.map +1 -1
- package/dist/src/entities/context/types.d.ts +63 -0
- package/dist/src/entities/context/whoami.d.ts +2 -0
- package/dist/src/entities/context/whoami.js +267 -0
- package/dist/src/entities/context/whoami.js.map +1 -0
- package/dist/src/entities/pipelines/registry.js +9 -2
- package/dist/src/entities/pipelines/registry.js.map +1 -1
- package/dist/src/graphql/DynamicWorkItemsQuery.js +2 -2
- package/dist/src/graphql/DynamicWorkItemsQuery.js.map +1 -1
- package/dist/src/handlers.js +17 -13
- package/dist/src/handlers.js.map +1 -1
- package/dist/src/logger.d.ts +4 -0
- package/dist/src/logger.js +64 -0
- package/dist/src/logger.js.map +1 -1
- package/dist/src/logging/connection-tracker.js +4 -4
- package/dist/src/logging/connection-tracker.js.map +1 -1
- package/dist/src/logging/request-tracker.js +8 -4
- package/dist/src/logging/request-tracker.js.map +1 -1
- package/dist/src/main.js +30 -21
- package/dist/src/main.js.map +1 -1
- package/dist/src/middleware/oauth-auth.js +11 -5
- package/dist/src/middleware/oauth-auth.js.map +1 -1
- package/dist/src/middleware/rate-limiter.js +9 -9
- package/dist/src/middleware/rate-limiter.js.map +1 -1
- package/dist/src/oauth/config.js +3 -3
- package/dist/src/oauth/config.js.map +1 -1
- package/dist/src/oauth/endpoints/authorize.js +10 -10
- package/dist/src/oauth/endpoints/authorize.js.map +1 -1
- package/dist/src/oauth/endpoints/callback.js +7 -5
- package/dist/src/oauth/endpoints/callback.js.map +1 -1
- package/dist/src/oauth/endpoints/register.js +3 -3
- package/dist/src/oauth/endpoints/register.js.map +1 -1
- package/dist/src/oauth/endpoints/token.js +8 -8
- package/dist/src/oauth/endpoints/token.js.map +1 -1
- package/dist/src/oauth/gitlab-device-flow.js +15 -15
- package/dist/src/oauth/gitlab-device-flow.js.map +1 -1
- package/dist/src/oauth/session-store.js +38 -29
- package/dist/src/oauth/session-store.js.map +1 -1
- package/dist/src/oauth/storage/factory.js +3 -5
- package/dist/src/oauth/storage/factory.js.map +1 -1
- package/dist/src/oauth/storage/file.d.ts +0 -2
- package/dist/src/oauth/storage/file.js +39 -19
- package/dist/src/oauth/storage/file.js.map +1 -1
- package/dist/src/oauth/storage/memory.js +22 -19
- package/dist/src/oauth/storage/memory.js.map +1 -1
- package/dist/src/oauth/storage/postgresql.js +12 -7
- package/dist/src/oauth/storage/postgresql.js.map +1 -1
- package/dist/src/oauth/storage/types.d.ts +0 -1
- package/dist/src/oauth/storage/types.js.map +1 -1
- package/dist/src/profiles/applicator.js +13 -11
- package/dist/src/profiles/applicator.js.map +1 -1
- package/dist/src/profiles/loader.js +11 -8
- package/dist/src/profiles/loader.js.map +1 -1
- package/dist/src/profiles/project-loader.js +10 -10
- package/dist/src/profiles/project-loader.js.map +1 -1
- package/dist/src/profiles/scope-enforcer.js +10 -8
- package/dist/src/profiles/scope-enforcer.js.map +1 -1
- package/dist/src/registry-manager.d.ts +10 -0
- package/dist/src/registry-manager.js +70 -9
- package/dist/src/registry-manager.js.map +1 -1
- package/dist/src/server.js +66 -54
- package/dist/src/server.js.map +1 -1
- package/dist/src/services/ConnectionManager.d.ts +1 -0
- package/dist/src/services/ConnectionManager.js +56 -18
- package/dist/src/services/ConnectionManager.js.map +1 -1
- package/dist/src/services/GitLabVersionDetector.js +12 -4
- package/dist/src/services/GitLabVersionDetector.js.map +1 -1
- package/dist/src/services/SchemaIntrospector.js +6 -4
- package/dist/src/services/SchemaIntrospector.js.map +1 -1
- package/dist/src/services/TokenScopeDetector.js +29 -15
- package/dist/src/services/TokenScopeDetector.js.map +1 -1
- package/dist/src/services/ToolAvailability.js +12 -5
- package/dist/src/services/ToolAvailability.js.map +1 -1
- package/dist/src/services/WidgetAvailability.js +1 -1
- package/dist/src/services/WidgetAvailability.js.map +1 -1
- package/dist/src/session-manager.js +14 -11
- package/dist/src/session-manager.js.map +1 -1
- package/dist/src/utils/fetch.js +36 -21
- package/dist/src/utils/fetch.js.map +1 -1
- package/dist/src/utils/schema-utils.js +11 -8
- package/dist/src/utils/schema-utils.js.map +1 -1
- package/dist/structured-world-gitlab-mcp-6.46.1.tgz +0 -0
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/structured-world-gitlab-mcp-6.45.1.tgz +0 -0
|
@@ -32,11 +32,11 @@ class SessionStore {
|
|
|
32
32
|
this.refreshTokenToSession.set(session.mcpRefreshToken, session.id);
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
|
-
logger_1.
|
|
35
|
+
(0, logger_1.logInfo)("Loaded sessions from storage backend", { loadedSessions: sessions.length });
|
|
36
36
|
}
|
|
37
37
|
this.startCleanupInterval();
|
|
38
38
|
this.initialized = true;
|
|
39
|
-
logger_1.
|
|
39
|
+
(0, logger_1.logInfo)("Session store initialized", { backendType: this.backend.type });
|
|
40
40
|
}
|
|
41
41
|
getBackendType() {
|
|
42
42
|
return this.backend.type;
|
|
@@ -50,9 +50,9 @@ class SessionStore {
|
|
|
50
50
|
this.refreshTokenToSession.set(session.mcpRefreshToken, session.id);
|
|
51
51
|
}
|
|
52
52
|
this.backend.createSession(session).catch(err => {
|
|
53
|
-
|
|
53
|
+
(0, logger_1.logError)("Failed to persist session to backend", { err, sessionId: session.id });
|
|
54
54
|
});
|
|
55
|
-
logger_1.
|
|
55
|
+
(0, logger_1.logDebug)("Session created", { sessionId: session.id, userId: session.gitlabUserId });
|
|
56
56
|
}
|
|
57
57
|
getSession(sessionId) {
|
|
58
58
|
return this.sessions.get(sessionId);
|
|
@@ -68,7 +68,7 @@ class SessionStore {
|
|
|
68
68
|
updateSession(sessionId, updates) {
|
|
69
69
|
const session = this.sessions.get(sessionId);
|
|
70
70
|
if (!session) {
|
|
71
|
-
logger_1.
|
|
71
|
+
(0, logger_1.logWarn)("Attempted to update non-existent session", { sessionId });
|
|
72
72
|
return false;
|
|
73
73
|
}
|
|
74
74
|
if (updates.mcpAccessToken && updates.mcpAccessToken !== session.mcpAccessToken) {
|
|
@@ -81,9 +81,9 @@ class SessionStore {
|
|
|
81
81
|
}
|
|
82
82
|
Object.assign(session, updates, { updatedAt: Date.now() });
|
|
83
83
|
this.backend.updateSession(sessionId, updates).catch(err => {
|
|
84
|
-
logger_1.
|
|
84
|
+
(0, logger_1.logError)("Failed to update session in backend", { err, sessionId });
|
|
85
85
|
});
|
|
86
|
-
logger_1.
|
|
86
|
+
(0, logger_1.logDebug)("Session updated", { sessionId });
|
|
87
87
|
return true;
|
|
88
88
|
}
|
|
89
89
|
deleteSession(sessionId) {
|
|
@@ -99,9 +99,9 @@ class SessionStore {
|
|
|
99
99
|
}
|
|
100
100
|
this.sessions.delete(sessionId);
|
|
101
101
|
this.backend.deleteSession(sessionId).catch(err => {
|
|
102
|
-
logger_1.
|
|
102
|
+
(0, logger_1.logError)("Failed to delete session from backend", { err, sessionId });
|
|
103
103
|
});
|
|
104
|
-
logger_1.
|
|
104
|
+
(0, logger_1.logDebug)("Session deleted", { sessionId });
|
|
105
105
|
return true;
|
|
106
106
|
}
|
|
107
107
|
getAllSessions() {
|
|
@@ -113,9 +113,9 @@ class SessionStore {
|
|
|
113
113
|
storeDeviceFlow(state, flow) {
|
|
114
114
|
this.deviceFlows.set(state, flow);
|
|
115
115
|
this.backend.storeDeviceFlow(state, flow).catch(err => {
|
|
116
|
-
logger_1.
|
|
116
|
+
(0, logger_1.logError)("Failed to persist device flow to backend", { err, state });
|
|
117
117
|
});
|
|
118
|
-
logger_1.
|
|
118
|
+
(0, logger_1.logDebug)("Device flow stored", { state, userCode: flow.userCode });
|
|
119
119
|
}
|
|
120
120
|
getDeviceFlow(state) {
|
|
121
121
|
return this.deviceFlows.get(state);
|
|
@@ -132,9 +132,9 @@ class SessionStore {
|
|
|
132
132
|
const deleted = this.deviceFlows.delete(state);
|
|
133
133
|
if (deleted) {
|
|
134
134
|
this.backend.deleteDeviceFlow(state).catch(err => {
|
|
135
|
-
logger_1.
|
|
135
|
+
(0, logger_1.logError)("Failed to delete device flow from backend", { err, state });
|
|
136
136
|
});
|
|
137
|
-
logger_1.
|
|
137
|
+
(0, logger_1.logDebug)("Device flow deleted", { state });
|
|
138
138
|
}
|
|
139
139
|
return deleted;
|
|
140
140
|
}
|
|
@@ -144,9 +144,12 @@ class SessionStore {
|
|
|
144
144
|
storeAuthCodeFlow(internalState, flow) {
|
|
145
145
|
this.authCodeFlows.set(internalState, flow);
|
|
146
146
|
this.backend.storeAuthCodeFlow(internalState, flow).catch(err => {
|
|
147
|
-
|
|
147
|
+
(0, logger_1.logError)("Failed to persist auth code flow", {
|
|
148
|
+
err,
|
|
149
|
+
internalState: internalState.substring(0, 8) + "...",
|
|
150
|
+
});
|
|
148
151
|
});
|
|
149
|
-
logger_1.
|
|
152
|
+
(0, logger_1.logDebug)("Auth code flow stored", { internalState: internalState.substring(0, 8) + "..." });
|
|
150
153
|
}
|
|
151
154
|
getAuthCodeFlow(internalState) {
|
|
152
155
|
return this.authCodeFlows.get(internalState);
|
|
@@ -155,9 +158,12 @@ class SessionStore {
|
|
|
155
158
|
const deleted = this.authCodeFlows.delete(internalState);
|
|
156
159
|
if (deleted) {
|
|
157
160
|
this.backend.deleteAuthCodeFlow(internalState).catch(err => {
|
|
158
|
-
|
|
161
|
+
(0, logger_1.logError)("Failed to delete auth code flow", {
|
|
162
|
+
err,
|
|
163
|
+
internalState: internalState.substring(0, 8) + "...",
|
|
164
|
+
});
|
|
159
165
|
});
|
|
160
|
-
logger_1.
|
|
166
|
+
(0, logger_1.logDebug)("Auth code flow deleted", { internalState: internalState.substring(0, 8) + "..." });
|
|
161
167
|
}
|
|
162
168
|
return deleted;
|
|
163
169
|
}
|
|
@@ -167,9 +173,9 @@ class SessionStore {
|
|
|
167
173
|
storeAuthCode(code) {
|
|
168
174
|
this.authCodes.set(code.code, code);
|
|
169
175
|
this.backend.storeAuthCode(code).catch(err => {
|
|
170
|
-
logger_1.
|
|
176
|
+
(0, logger_1.logError)("Failed to persist auth code", { err, code: code.code.substring(0, 8) + "..." });
|
|
171
177
|
});
|
|
172
|
-
logger_1.
|
|
178
|
+
(0, logger_1.logDebug)("Auth code stored", { code: code.code.substring(0, 8) + "..." });
|
|
173
179
|
}
|
|
174
180
|
getAuthCode(code) {
|
|
175
181
|
return this.authCodes.get(code);
|
|
@@ -178,9 +184,9 @@ class SessionStore {
|
|
|
178
184
|
const deleted = this.authCodes.delete(code);
|
|
179
185
|
if (deleted) {
|
|
180
186
|
this.backend.deleteAuthCode(code).catch(err => {
|
|
181
|
-
logger_1.
|
|
187
|
+
(0, logger_1.logError)("Failed to delete auth code", { err, code: code.substring(0, 8) + "..." });
|
|
182
188
|
});
|
|
183
|
-
logger_1.
|
|
189
|
+
(0, logger_1.logDebug)("Auth code deleted", { code: code.substring(0, 8) + "..." });
|
|
184
190
|
}
|
|
185
191
|
return deleted;
|
|
186
192
|
}
|
|
@@ -190,9 +196,12 @@ class SessionStore {
|
|
|
190
196
|
associateMcpSession(mcpSessionId, oauthSessionId) {
|
|
191
197
|
this.mcpSessionToOAuthSession.set(mcpSessionId, oauthSessionId);
|
|
192
198
|
this.backend.associateMcpSession(mcpSessionId, oauthSessionId).catch(err => {
|
|
193
|
-
logger_1.
|
|
199
|
+
(0, logger_1.logError)("Failed to persist MCP session association", { err, mcpSessionId });
|
|
200
|
+
});
|
|
201
|
+
(0, logger_1.logDebug)("MCP session associated with OAuth session", {
|
|
202
|
+
mcpSessionId,
|
|
203
|
+
oauthSessionId: oauthSessionId.substring(0, 8) + "...",
|
|
194
204
|
});
|
|
195
|
-
logger_1.logger.debug({ mcpSessionId, oauthSessionId: oauthSessionId.substring(0, 8) + "..." }, "MCP session associated with OAuth session");
|
|
196
205
|
}
|
|
197
206
|
getSessionByMcpSessionId(mcpSessionId) {
|
|
198
207
|
const oauthSessionId = this.mcpSessionToOAuthSession.get(mcpSessionId);
|
|
@@ -209,9 +218,9 @@ class SessionStore {
|
|
|
209
218
|
const deleted = this.mcpSessionToOAuthSession.delete(mcpSessionId);
|
|
210
219
|
if (deleted) {
|
|
211
220
|
this.backend.removeMcpSessionAssociation(mcpSessionId).catch(err => {
|
|
212
|
-
logger_1.
|
|
221
|
+
(0, logger_1.logError)("Failed to remove MCP session association from backend", { err, mcpSessionId });
|
|
213
222
|
});
|
|
214
|
-
logger_1.
|
|
223
|
+
(0, logger_1.logDebug)("MCP session association removed", { mcpSessionId });
|
|
215
224
|
}
|
|
216
225
|
return deleted;
|
|
217
226
|
}
|
|
@@ -250,13 +259,13 @@ class SessionStore {
|
|
|
250
259
|
expiredDeviceFlows > 0 ||
|
|
251
260
|
expiredAuthCodeFlows > 0 ||
|
|
252
261
|
expiredAuthCodes > 0) {
|
|
253
|
-
logger_1.
|
|
262
|
+
(0, logger_1.logDebug)("Session store cleanup completed", {
|
|
254
263
|
expiredSessions,
|
|
255
264
|
expiredDeviceFlows,
|
|
256
265
|
expiredAuthCodeFlows,
|
|
257
266
|
expiredAuthCodes,
|
|
258
267
|
remainingSessions: this.sessions.size,
|
|
259
|
-
}
|
|
268
|
+
});
|
|
260
269
|
}
|
|
261
270
|
}
|
|
262
271
|
startCleanupInterval() {
|
|
@@ -281,12 +290,12 @@ class SessionStore {
|
|
|
281
290
|
this.tokenToSession.clear();
|
|
282
291
|
this.refreshTokenToSession.clear();
|
|
283
292
|
this.mcpSessionToOAuthSession.clear();
|
|
284
|
-
logger_1.
|
|
293
|
+
(0, logger_1.logDebug)("Session store cleared");
|
|
285
294
|
}
|
|
286
295
|
async close() {
|
|
287
296
|
this.stopCleanupInterval();
|
|
288
297
|
await this.backend.close();
|
|
289
|
-
logger_1.
|
|
298
|
+
(0, logger_1.logInfo)("Session store closed");
|
|
290
299
|
}
|
|
291
300
|
getStats() {
|
|
292
301
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/oauth/session-store.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-store.js","sourceRoot":"","sources":["../../../src/oauth/session-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,18 +27,16 @@ function getEnvStorageType() {
|
|
|
27
27
|
return "memory";
|
|
28
28
|
}
|
|
29
29
|
function createMemoryBackend() {
|
|
30
|
-
logger_1.
|
|
30
|
+
(0, logger_1.logInfo)("Using in-memory session storage (sessions will be lost on restart)");
|
|
31
31
|
return new memory_1.MemoryStorageBackend();
|
|
32
32
|
}
|
|
33
33
|
function createFileBackend(config) {
|
|
34
34
|
const filePath = config?.file?.path ?? process.env.OAUTH_STORAGE_FILE_PATH ?? "./data/oauth-sessions.json";
|
|
35
35
|
const saveInterval = config?.file?.saveInterval ?? parseInt(process.env.OAUTH_STORAGE_SAVE_INTERVAL ?? "30000", 10);
|
|
36
|
-
|
|
37
|
-
logger_1.logger.info({ filePath, saveInterval }, "Using file-based session storage");
|
|
36
|
+
(0, logger_1.logInfo)("Using file-based session storage", { filePath, saveInterval });
|
|
38
37
|
return new file_1.FileStorageBackend({
|
|
39
38
|
filePath,
|
|
40
39
|
saveInterval,
|
|
41
|
-
prettyPrint,
|
|
42
40
|
});
|
|
43
41
|
}
|
|
44
42
|
function createPostgreSQLBackend() {
|
|
@@ -47,7 +45,7 @@ function createPostgreSQLBackend() {
|
|
|
47
45
|
throw new Error("PostgreSQL storage requires a connection string. " +
|
|
48
46
|
"Set OAUTH_STORAGE_POSTGRESQL_URL or DATABASE_URL environment variable");
|
|
49
47
|
}
|
|
50
|
-
logger_1.
|
|
48
|
+
(0, logger_1.logInfo)("Using PostgreSQL session storage (via Prisma)");
|
|
51
49
|
return new postgresql_1.PostgreSQLStorageBackend();
|
|
52
50
|
}
|
|
53
51
|
function getStorageType(config) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../src/oauth/storage/factory.ts"],"names":[],"mappings":";;AAyBA,oDAaC;
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../src/oauth/storage/factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ import { SessionStorageBackend, SessionStorageStats } from "./types";
|
|
|
3
3
|
export interface FileStorageOptions {
|
|
4
4
|
filePath: string;
|
|
5
5
|
saveInterval?: number;
|
|
6
|
-
prettyPrint?: boolean;
|
|
7
6
|
saveDebounce?: number;
|
|
8
7
|
}
|
|
9
8
|
export declare class FileStorageBackend implements SessionStorageBackend {
|
|
@@ -11,7 +10,6 @@ export declare class FileStorageBackend implements SessionStorageBackend {
|
|
|
11
10
|
private memory;
|
|
12
11
|
private filePath;
|
|
13
12
|
private saveInterval;
|
|
14
|
-
private prettyPrint;
|
|
15
13
|
private saveDebounce;
|
|
16
14
|
private saveIntervalId;
|
|
17
15
|
private saveDebounceId;
|
|
@@ -44,7 +44,6 @@ class FileStorageBackend {
|
|
|
44
44
|
memory;
|
|
45
45
|
filePath;
|
|
46
46
|
saveInterval;
|
|
47
|
-
prettyPrint;
|
|
48
47
|
saveDebounce;
|
|
49
48
|
saveIntervalId = null;
|
|
50
49
|
saveDebounceId = null;
|
|
@@ -54,7 +53,6 @@ class FileStorageBackend {
|
|
|
54
53
|
this.memory = new memory_1.MemoryStorageBackend({ silent: true });
|
|
55
54
|
this.filePath = options.filePath;
|
|
56
55
|
this.saveInterval = options.saveInterval ?? 30000;
|
|
57
|
-
this.prettyPrint = options.prettyPrint ?? false;
|
|
58
56
|
this.saveDebounce = options.saveDebounce ?? 1000;
|
|
59
57
|
}
|
|
60
58
|
async initialize() {
|
|
@@ -63,38 +61,54 @@ class FileStorageBackend {
|
|
|
63
61
|
if (!fs.existsSync(dir)) {
|
|
64
62
|
fs.mkdirSync(dir, { recursive: true });
|
|
65
63
|
dirCreated = true;
|
|
66
|
-
logger_1.
|
|
64
|
+
(0, logger_1.logInfo)("Created storage directory", { dir });
|
|
67
65
|
}
|
|
68
66
|
const fileExists = fs.existsSync(this.filePath);
|
|
69
67
|
if (fileExists) {
|
|
70
68
|
const stats = fs.statSync(this.filePath);
|
|
71
|
-
|
|
69
|
+
(0, logger_1.logInfo)("Found existing session file", {
|
|
70
|
+
filePath: this.filePath,
|
|
71
|
+
size: stats.size,
|
|
72
|
+
mtime: stats.mtime.toISOString(),
|
|
73
|
+
});
|
|
72
74
|
await this.loadFromFile();
|
|
73
75
|
}
|
|
74
76
|
else {
|
|
75
|
-
logger_1.
|
|
77
|
+
(0, logger_1.logInfo)("No existing session file, will create on first save", {
|
|
78
|
+
filePath: this.filePath,
|
|
79
|
+
});
|
|
76
80
|
}
|
|
77
81
|
try {
|
|
78
82
|
const testPath = `${this.filePath}.test`;
|
|
79
83
|
fs.writeFileSync(testPath, "test", "utf-8");
|
|
80
84
|
fs.unlinkSync(testPath);
|
|
81
|
-
logger_1.
|
|
85
|
+
(0, logger_1.logDebug)("Write access verified", { filePath: this.filePath });
|
|
82
86
|
}
|
|
83
87
|
catch (error) {
|
|
84
|
-
|
|
88
|
+
(0, logger_1.logError)("Cannot write to storage file path - sessions will NOT persist!", {
|
|
89
|
+
err: error,
|
|
90
|
+
filePath: this.filePath,
|
|
91
|
+
});
|
|
85
92
|
throw new Error(`File storage path not writable: ${this.filePath}`);
|
|
86
93
|
}
|
|
87
94
|
await this.memory.initialize();
|
|
88
95
|
this.startSaveInterval();
|
|
89
96
|
this.initialized = true;
|
|
90
|
-
logger_1.
|
|
97
|
+
(0, logger_1.logInfo)("File storage backend initialized", {
|
|
98
|
+
filePath: this.filePath,
|
|
99
|
+
dirCreated,
|
|
100
|
+
fileExisted: fileExists,
|
|
101
|
+
});
|
|
91
102
|
}
|
|
92
103
|
async loadFromFile() {
|
|
93
104
|
try {
|
|
94
105
|
const content = fs.readFileSync(this.filePath, "utf-8");
|
|
95
106
|
const data = JSON.parse(content);
|
|
96
107
|
if (data.version !== types_1.STORAGE_DATA_VERSION) {
|
|
97
|
-
|
|
108
|
+
(0, logger_1.logWarn)("Storage file version mismatch, migrating data", {
|
|
109
|
+
fileVersion: data.version,
|
|
110
|
+
currentVersion: types_1.STORAGE_DATA_VERSION,
|
|
111
|
+
});
|
|
98
112
|
}
|
|
99
113
|
const now = Date.now();
|
|
100
114
|
const validSessions = data.sessions.filter(s => {
|
|
@@ -112,15 +126,18 @@ class FileStorageBackend {
|
|
|
112
126
|
mcpSessionMappings: data.mcpSessionMappings,
|
|
113
127
|
});
|
|
114
128
|
const stats = await this.memory.getStats();
|
|
115
|
-
logger_1.
|
|
129
|
+
(0, logger_1.logInfo)("Loaded sessions from file", {
|
|
116
130
|
loadedSessions: stats.sessions,
|
|
117
131
|
expiredSessions: data.sessions.length - validSessions.length,
|
|
118
132
|
loadedDeviceFlows: stats.deviceFlows,
|
|
119
133
|
loadedAuthCodes: stats.authCodes,
|
|
120
|
-
}
|
|
134
|
+
});
|
|
121
135
|
}
|
|
122
136
|
catch (error) {
|
|
123
|
-
|
|
137
|
+
(0, logger_1.logError)("Failed to load sessions from file", {
|
|
138
|
+
err: error,
|
|
139
|
+
filePath: this.filePath,
|
|
140
|
+
});
|
|
124
141
|
}
|
|
125
142
|
}
|
|
126
143
|
async saveToFile() {
|
|
@@ -138,17 +155,20 @@ class FileStorageBackend {
|
|
|
138
155
|
mcpSessionMappings: exportedData.mcpSessionMappings,
|
|
139
156
|
};
|
|
140
157
|
const tempPath = `${this.filePath}.tmp`;
|
|
141
|
-
const content =
|
|
158
|
+
const content = JSON.stringify(data);
|
|
142
159
|
fs.writeFileSync(tempPath, content, "utf-8");
|
|
143
160
|
fs.renameSync(tempPath, this.filePath);
|
|
144
|
-
logger_1.
|
|
161
|
+
(0, logger_1.logDebug)("Saved sessions to file", {
|
|
145
162
|
sessions: data.sessions.length,
|
|
146
163
|
deviceFlows: data.deviceFlows.length,
|
|
147
164
|
authCodes: data.authCodes.length,
|
|
148
|
-
}
|
|
165
|
+
});
|
|
149
166
|
}
|
|
150
167
|
catch (error) {
|
|
151
|
-
|
|
168
|
+
(0, logger_1.logError)("Failed to save sessions to file", {
|
|
169
|
+
err: error,
|
|
170
|
+
filePath: this.filePath,
|
|
171
|
+
});
|
|
152
172
|
}
|
|
153
173
|
}
|
|
154
174
|
scheduleSave() {
|
|
@@ -159,13 +179,13 @@ class FileStorageBackend {
|
|
|
159
179
|
this.saveDebounceId = setTimeout(() => {
|
|
160
180
|
if (this.pendingSave) {
|
|
161
181
|
this.pendingSave = false;
|
|
162
|
-
this.saveToFile().catch(err => logger_1.
|
|
182
|
+
this.saveToFile().catch(err => (0, logger_1.logError)("Failed to save to file", { err }));
|
|
163
183
|
}
|
|
164
184
|
}, this.saveDebounce);
|
|
165
185
|
}
|
|
166
186
|
startSaveInterval() {
|
|
167
187
|
this.saveIntervalId = setInterval(() => {
|
|
168
|
-
this.saveToFile().catch(err => logger_1.
|
|
188
|
+
this.saveToFile().catch(err => (0, logger_1.logError)("Failed to save to file", { err }));
|
|
169
189
|
}, this.saveInterval);
|
|
170
190
|
if (this.saveIntervalId.unref) {
|
|
171
191
|
this.saveIntervalId.unref();
|
|
@@ -269,7 +289,7 @@ class FileStorageBackend {
|
|
|
269
289
|
}
|
|
270
290
|
await this.saveToFile();
|
|
271
291
|
await this.memory.close();
|
|
272
|
-
logger_1.
|
|
292
|
+
(0, logger_1.logInfo)("File storage backend closed");
|
|
273
293
|
}
|
|
274
294
|
async getStats() {
|
|
275
295
|
return this.memory.getStats();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../src/oauth/storage/file.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaA,uCAAyB;AACzB,2CAA6B;AAE7B,mCAKiB;AACjB,qCAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../src/oauth/storage/file.ts"],"names":[],"mappings":"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"}
|