@eldrforge/kodrdriv 0.0.51 → 1.2.0
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 +3 -1
- package/dist/application.js +29 -5
- package/dist/application.js.map +1 -1
- package/dist/arguments.js +187 -75
- package/dist/arguments.js.map +1 -1
- package/dist/commands/audio-commit.js +35 -14
- package/dist/commands/audio-commit.js.map +1 -1
- package/dist/commands/audio-review.js +41 -20
- package/dist/commands/audio-review.js.map +1 -1
- package/dist/commands/clean.js +2 -2
- package/dist/commands/clean.js.map +1 -1
- package/dist/commands/commit.js +369 -47
- package/dist/commands/commit.js.map +1 -1
- package/dist/commands/development.js +264 -0
- package/dist/commands/development.js.map +1 -0
- package/dist/commands/link.js +357 -182
- package/dist/commands/link.js.map +1 -1
- package/dist/commands/publish.js +419 -306
- package/dist/commands/publish.js.map +1 -1
- package/dist/commands/release.js +240 -18
- package/dist/commands/release.js.map +1 -1
- package/dist/commands/review.js +56 -40
- package/dist/commands/review.js.map +1 -1
- package/dist/commands/select-audio.js +4 -4
- package/dist/commands/select-audio.js.map +1 -1
- package/dist/commands/tree.js +779 -40
- package/dist/commands/tree.js.map +1 -1
- package/dist/commands/unlink.js +267 -372
- package/dist/commands/unlink.js.map +1 -1
- package/dist/commands/versions.js +224 -0
- package/dist/commands/versions.js.map +1 -0
- package/dist/constants.js +50 -12
- package/dist/constants.js.map +1 -1
- package/dist/content/diff.js +122 -1
- package/dist/content/diff.js.map +1 -1
- package/dist/content/files.js +192 -0
- package/dist/content/files.js.map +1 -0
- package/dist/content/issues.js +17 -46
- package/dist/content/issues.js.map +1 -1
- package/dist/content/log.js +16 -0
- package/dist/content/log.js.map +1 -1
- package/dist/logging.js +3 -3
- package/dist/logging.js.map +1 -1
- package/dist/main.js +0 -0
- package/dist/prompt/commit.js +11 -4
- package/dist/prompt/commit.js.map +1 -1
- package/dist/prompt/instructions/commit.md +20 -2
- package/dist/prompt/instructions/release.md +27 -10
- package/dist/prompt/instructions/review.md +75 -8
- package/dist/prompt/release.js +15 -7
- package/dist/prompt/release.js.map +1 -1
- package/dist/prompt/review.js +2 -2
- package/dist/prompt/review.js.map +1 -1
- package/dist/types.js +36 -7
- package/dist/types.js.map +1 -1
- package/dist/util/child.js +146 -4
- package/dist/util/child.js.map +1 -1
- package/dist/util/countdown.js +215 -0
- package/dist/util/countdown.js.map +1 -0
- package/dist/util/general.js +157 -13
- package/dist/util/general.js.map +1 -1
- package/dist/util/git.js +587 -0
- package/dist/util/git.js.map +1 -0
- package/dist/util/github.js +531 -11
- package/dist/util/github.js.map +1 -1
- package/dist/util/interactive.js +463 -0
- package/dist/util/interactive.js.map +1 -0
- package/dist/util/openai.js +152 -25
- package/dist/util/openai.js.map +1 -1
- package/dist/util/performance.js +5 -73
- package/dist/util/performance.js.map +1 -1
- package/dist/util/safety.js +4 -4
- package/dist/util/safety.js.map +1 -1
- package/dist/util/storage.js +30 -3
- package/dist/util/storage.js.map +1 -1
- package/dist/util/validation.js +1 -25
- package/dist/util/validation.js.map +1 -1
- package/package.json +12 -10
- package/test-increment.js +0 -0
- package/test-multiline/cli/package.json +8 -0
- package/test-multiline/core/package.json +5 -0
- package/test-multiline/mobile/package.json +8 -0
- package/test-multiline/web/package.json +8 -0
- package/dist/util/npmOptimizations.js +0 -174
- package/dist/util/npmOptimizations.js.map +0 -1
package/dist/util/openai.js
CHANGED
|
@@ -2,13 +2,67 @@ import { OpenAI } from 'openai';
|
|
|
2
2
|
import { create } from './storage.js';
|
|
3
3
|
import { getLogger } from '../logging.js';
|
|
4
4
|
import { archiveAudio } from './general.js';
|
|
5
|
+
import { safeJsonParse } from './validation.js';
|
|
5
6
|
|
|
7
|
+
function _define_property(obj, key, value) {
|
|
8
|
+
if (key in obj) {
|
|
9
|
+
Object.defineProperty(obj, key, {
|
|
10
|
+
value: value,
|
|
11
|
+
enumerable: true,
|
|
12
|
+
configurable: true,
|
|
13
|
+
writable: true
|
|
14
|
+
});
|
|
15
|
+
} else {
|
|
16
|
+
obj[key] = value;
|
|
17
|
+
}
|
|
18
|
+
return obj;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Get the appropriate model to use based on command-specific configuration
|
|
22
|
+
* Command-specific model overrides the global model setting
|
|
23
|
+
*/ function getModelForCommand(config, commandName) {
|
|
24
|
+
let commandModel;
|
|
25
|
+
switch(commandName){
|
|
26
|
+
case 'commit':
|
|
27
|
+
case 'audio-commit':
|
|
28
|
+
var _config_commit;
|
|
29
|
+
commandModel = (_config_commit = config.commit) === null || _config_commit === void 0 ? void 0 : _config_commit.model;
|
|
30
|
+
break;
|
|
31
|
+
case 'release':
|
|
32
|
+
var _config_release;
|
|
33
|
+
commandModel = (_config_release = config.release) === null || _config_release === void 0 ? void 0 : _config_release.model;
|
|
34
|
+
break;
|
|
35
|
+
case 'review':
|
|
36
|
+
case 'audio-review':
|
|
37
|
+
var _config_review;
|
|
38
|
+
commandModel = (_config_review = config.review) === null || _config_review === void 0 ? void 0 : _config_review.model;
|
|
39
|
+
break;
|
|
40
|
+
}
|
|
41
|
+
// Return command-specific model if available, otherwise global model
|
|
42
|
+
return commandModel || config.model || 'gpt-4o-mini';
|
|
43
|
+
}
|
|
6
44
|
class OpenAIError extends Error {
|
|
7
|
-
constructor(message){
|
|
8
|
-
super(message);
|
|
45
|
+
constructor(message, isTokenLimitError = false){
|
|
46
|
+
super(message), _define_property(this, "isTokenLimitError", void 0), this.isTokenLimitError = isTokenLimitError;
|
|
9
47
|
this.name = 'OpenAIError';
|
|
10
48
|
}
|
|
11
49
|
}
|
|
50
|
+
// Check if an error is a token limit exceeded error
|
|
51
|
+
function isTokenLimitError(error) {
|
|
52
|
+
if (!(error === null || error === void 0 ? void 0 : error.message)) return false;
|
|
53
|
+
const message = error.message.toLowerCase();
|
|
54
|
+
return message.includes('maximum context length') || message.includes('context_length_exceeded') || message.includes('token limit') || message.includes('too many tokens') || message.includes('reduce the length');
|
|
55
|
+
}
|
|
56
|
+
// Check if an error is a rate limit error
|
|
57
|
+
function isRateLimitError(error) {
|
|
58
|
+
if (!(error === null || error === void 0 ? void 0 : error.message) && !(error === null || error === void 0 ? void 0 : error.code) && !(error === null || error === void 0 ? void 0 : error.status)) return false;
|
|
59
|
+
// Check for OpenAI specific rate limit indicators
|
|
60
|
+
if (error.status === 429 || error.code === 'rate_limit_exceeded') {
|
|
61
|
+
return true;
|
|
62
|
+
}
|
|
63
|
+
const message = error.message.toLowerCase();
|
|
64
|
+
return message.includes('rate limit exceeded') || message.includes('too many requests') || message.includes('quota exceeded') || message.includes('rate') && message.includes('limit');
|
|
65
|
+
}
|
|
12
66
|
async function createCompletion(messages, options = {
|
|
13
67
|
model: "gpt-4o-mini"
|
|
14
68
|
}) {
|
|
@@ -24,17 +78,20 @@ async function createCompletion(messages, options = {
|
|
|
24
78
|
throw new OpenAIError('OPENAI_API_KEY environment variable is not set');
|
|
25
79
|
}
|
|
26
80
|
// Create the client which we'll close in the finally block.
|
|
81
|
+
const timeoutMs = parseInt(process.env.OPENAI_TIMEOUT_MS || '300000'); // Default to 5 minutes
|
|
27
82
|
openai = new OpenAI({
|
|
28
83
|
apiKey: apiKey,
|
|
29
|
-
timeout:
|
|
84
|
+
timeout: timeoutMs
|
|
30
85
|
});
|
|
86
|
+
const modelToUse = options.model || "gpt-4o-mini";
|
|
87
|
+
logger.info('🤖 Making request to OpenAI using model: %s', modelToUse);
|
|
31
88
|
logger.debug('Sending prompt to OpenAI: %j', messages);
|
|
32
89
|
// Use provided maxTokens or default to 10000
|
|
33
90
|
const maxCompletionTokens = options.maxTokens || 10000;
|
|
34
91
|
// Save request debug file if enabled
|
|
35
92
|
if (options.debug && (options.debugRequestFile || options.debugFile)) {
|
|
36
93
|
const requestData = {
|
|
37
|
-
model:
|
|
94
|
+
model: modelToUse,
|
|
38
95
|
messages,
|
|
39
96
|
max_completion_tokens: maxCompletionTokens,
|
|
40
97
|
response_format: options.responseFormat
|
|
@@ -45,18 +102,29 @@ async function createCompletion(messages, options = {
|
|
|
45
102
|
}
|
|
46
103
|
// Add timeout wrapper to the OpenAI API call
|
|
47
104
|
const completionPromise = openai.chat.completions.create({
|
|
48
|
-
model:
|
|
105
|
+
model: modelToUse,
|
|
49
106
|
messages,
|
|
50
107
|
max_completion_tokens: maxCompletionTokens,
|
|
51
108
|
response_format: options.responseFormat
|
|
52
109
|
});
|
|
110
|
+
// Create timeout promise with proper cleanup to prevent memory leaks
|
|
111
|
+
let timeoutId = null;
|
|
53
112
|
const timeoutPromise = new Promise((_, reject)=>{
|
|
54
|
-
|
|
113
|
+
const timeoutMs = parseInt(process.env.OPENAI_TIMEOUT_MS || '300000'); // Default to 5 minutes
|
|
114
|
+
timeoutId = setTimeout(()=>reject(new OpenAIError(`OpenAI API call timed out after ${timeoutMs / 1000} seconds`)), timeoutMs);
|
|
55
115
|
});
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
116
|
+
let completion;
|
|
117
|
+
try {
|
|
118
|
+
completion = await Promise.race([
|
|
119
|
+
completionPromise,
|
|
120
|
+
timeoutPromise
|
|
121
|
+
]);
|
|
122
|
+
} finally{
|
|
123
|
+
// Clear the timeout to prevent memory leaks
|
|
124
|
+
if (timeoutId !== null) {
|
|
125
|
+
clearTimeout(timeoutId);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
60
128
|
// Save response debug file if enabled
|
|
61
129
|
if (options.debug && (options.debugResponseFile || options.debugFile)) {
|
|
62
130
|
const debugFile = options.debugResponseFile || options.debugFile;
|
|
@@ -69,18 +137,49 @@ async function createCompletion(messages, options = {
|
|
|
69
137
|
}
|
|
70
138
|
logger.debug('Received response from OpenAI: %s...', response.substring(0, 30));
|
|
71
139
|
if (options.responseFormat) {
|
|
72
|
-
return
|
|
140
|
+
return safeJsonParse(response, 'OpenAI API response');
|
|
73
141
|
} else {
|
|
74
142
|
return response;
|
|
75
143
|
}
|
|
76
144
|
} catch (error) {
|
|
77
145
|
logger.error('Error calling OpenAI API: %s %s', error.message, error.stack);
|
|
78
|
-
|
|
146
|
+
const isTokenError = isTokenLimitError(error);
|
|
147
|
+
throw new OpenAIError(`Failed to create completion: ${error.message}`, isTokenError);
|
|
79
148
|
} finally{
|
|
80
149
|
// OpenAI client cleanup is handled automatically by the library
|
|
81
150
|
// No manual cleanup needed for newer versions
|
|
82
151
|
}
|
|
83
152
|
}
|
|
153
|
+
// Create completion with automatic retry on token limit errors
|
|
154
|
+
async function createCompletionWithRetry(messages, options = {
|
|
155
|
+
model: "gpt-4o-mini"
|
|
156
|
+
}, retryCallback) {
|
|
157
|
+
const logger = getLogger();
|
|
158
|
+
const maxRetries = 3;
|
|
159
|
+
for(let attempt = 1; attempt <= maxRetries; attempt++){
|
|
160
|
+
try {
|
|
161
|
+
const messagesToSend = attempt === 1 ? messages : retryCallback ? await retryCallback(attempt) : messages;
|
|
162
|
+
return await createCompletion(messagesToSend, options);
|
|
163
|
+
} catch (error) {
|
|
164
|
+
if (error instanceof OpenAIError && error.isTokenLimitError && attempt < maxRetries && retryCallback) {
|
|
165
|
+
logger.warn('Token limit exceeded on attempt %d/%d, retrying with reduced content...', attempt, maxRetries);
|
|
166
|
+
// Add exponential backoff for token limit errors
|
|
167
|
+
const backoffMs = Math.min(1000 * Math.pow(2, attempt - 1), 10000);
|
|
168
|
+
await new Promise((resolve)=>setTimeout(resolve, backoffMs));
|
|
169
|
+
continue;
|
|
170
|
+
} else if (isRateLimitError(error) && attempt < maxRetries) {
|
|
171
|
+
// Handle rate limiting with exponential backoff
|
|
172
|
+
const backoffMs = Math.min(2000 * Math.pow(2, attempt - 1), 15000); // More reasonable backoff: 2s, 4s, 8s, max 15s
|
|
173
|
+
logger.warn(`Rate limit hit on attempt ${attempt}/${maxRetries}, waiting ${backoffMs}ms before retry...`);
|
|
174
|
+
await new Promise((resolve)=>setTimeout(resolve, backoffMs));
|
|
175
|
+
continue;
|
|
176
|
+
}
|
|
177
|
+
throw error;
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
// This should never be reached, but TypeScript requires it
|
|
181
|
+
throw new OpenAIError('Max retries exceeded');
|
|
182
|
+
}
|
|
84
183
|
async function transcribeAudio(filePath, options = {
|
|
85
184
|
model: "whisper-1"
|
|
86
185
|
}) {
|
|
@@ -90,6 +189,23 @@ async function transcribeAudio(filePath, options = {
|
|
|
90
189
|
});
|
|
91
190
|
let openai = null;
|
|
92
191
|
let audioStream = null;
|
|
192
|
+
let streamClosed = false;
|
|
193
|
+
// Helper function to safely close the stream
|
|
194
|
+
const closeAudioStream = ()=>{
|
|
195
|
+
if (audioStream && !streamClosed) {
|
|
196
|
+
try {
|
|
197
|
+
// Only call destroy if it exists and the stream isn't already destroyed
|
|
198
|
+
if (typeof audioStream.destroy === 'function' && !audioStream.destroyed) {
|
|
199
|
+
audioStream.destroy();
|
|
200
|
+
}
|
|
201
|
+
streamClosed = true;
|
|
202
|
+
logger.debug('Audio stream closed successfully');
|
|
203
|
+
} catch (streamErr) {
|
|
204
|
+
logger.debug('Failed to destroy audio read stream: %s', streamErr.message);
|
|
205
|
+
streamClosed = true; // Mark as closed even if destroy failed
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
};
|
|
93
209
|
try {
|
|
94
210
|
const apiKey = process.env.OPENAI_API_KEY;
|
|
95
211
|
if (!apiKey) {
|
|
@@ -111,11 +227,28 @@ async function transcribeAudio(filePath, options = {
|
|
|
111
227
|
logger.debug('Wrote request debug file to %s', debugFile);
|
|
112
228
|
}
|
|
113
229
|
audioStream = await storage.readStream(filePath);
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
230
|
+
// Set up error handler for the stream to ensure cleanup on stream errors
|
|
231
|
+
// Only add handler if the stream has the 'on' method (real streams)
|
|
232
|
+
if (audioStream && typeof audioStream.on === 'function') {
|
|
233
|
+
audioStream.on('error', (streamError)=>{
|
|
234
|
+
logger.error('Audio stream error: %s', streamError.message);
|
|
235
|
+
closeAudioStream();
|
|
236
|
+
});
|
|
237
|
+
}
|
|
238
|
+
let transcription;
|
|
239
|
+
try {
|
|
240
|
+
transcription = await openai.audio.transcriptions.create({
|
|
241
|
+
model: options.model || "whisper-1",
|
|
242
|
+
file: audioStream,
|
|
243
|
+
response_format: "json"
|
|
244
|
+
});
|
|
245
|
+
// Close the stream immediately after successful API call to prevent race conditions
|
|
246
|
+
closeAudioStream();
|
|
247
|
+
} catch (apiError) {
|
|
248
|
+
// Close the stream immediately if the API call fails
|
|
249
|
+
closeAudioStream();
|
|
250
|
+
throw apiError;
|
|
251
|
+
}
|
|
119
252
|
// Save response debug file if enabled
|
|
120
253
|
if (options.debug && (options.debugResponseFile || options.debugFile)) {
|
|
121
254
|
const debugFile = options.debugResponseFile || options.debugFile;
|
|
@@ -141,17 +274,11 @@ async function transcribeAudio(filePath, options = {
|
|
|
141
274
|
throw new OpenAIError(`Failed to transcribe audio: ${error.message}`);
|
|
142
275
|
} finally{
|
|
143
276
|
// Ensure the audio stream is properly closed to release file handles
|
|
144
|
-
|
|
145
|
-
if (audioStream) {
|
|
146
|
-
audioStream.close();
|
|
147
|
-
}
|
|
148
|
-
} catch (streamErr) {
|
|
149
|
-
logger.debug('Failed to close audio read stream: %s', streamErr.message);
|
|
150
|
-
}
|
|
277
|
+
closeAudioStream();
|
|
151
278
|
// OpenAI client cleanup is handled automatically by the library
|
|
152
279
|
// No manual cleanup needed for newer versions
|
|
153
280
|
}
|
|
154
281
|
}
|
|
155
282
|
|
|
156
|
-
export { OpenAIError, createCompletion, transcribeAudio };
|
|
283
|
+
export { OpenAIError, createCompletion, createCompletionWithRetry, getModelForCommand, isRateLimitError, isTokenLimitError, transcribeAudio };
|
|
157
284
|
//# sourceMappingURL=openai.js.map
|
package/dist/util/openai.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sources":["../../src/util/openai.ts"],"sourcesContent":["import { OpenAI } from 'openai';\nimport { ChatCompletionMessageParam } from 'openai/resources';\nimport * as Storage from './storage';\nimport { getLogger } from '../logging';\nimport { archiveAudio } from './general';\n// eslint-disable-next-line no-restricted-imports\nimport fs from 'fs';\n\nexport interface Transcription {\n text: string;\n}\n\nexport class OpenAIError extends Error {\n constructor(message: string) {\n super(message);\n this.name = 'OpenAIError';\n }\n}\n\nexport async function createCompletion(messages: ChatCompletionMessageParam[], options: { responseFormat?: any, model?: string, debug?: boolean, debugFile?: string, debugRequestFile?: string, debugResponseFile?: string, maxTokens?: number } = { model: \"gpt-4o-mini\" }): Promise<string | any> {\n const logger = getLogger();\n const storage = Storage.create({ log: logger.debug });\n let openai: OpenAI | null = null;\n try {\n const apiKey = process.env.OPENAI_API_KEY;\n if (!apiKey) {\n throw new OpenAIError('OPENAI_API_KEY environment variable is not set');\n }\n\n // Create the client which we'll close in the finally block.\n openai = new OpenAI({\n apiKey: apiKey,\n timeout: 180000, // 180 seconds timeout\n });\n\n logger.debug('Sending prompt to OpenAI: %j', messages);\n\n // Use provided maxTokens or default to 10000\n const maxCompletionTokens = options.maxTokens || 10000;\n\n // Save request debug file if enabled\n if (options.debug && (options.debugRequestFile || options.debugFile)) {\n const requestData = {\n model: options.model || \"gpt-4o-mini\",\n messages,\n max_completion_tokens: maxCompletionTokens,\n response_format: options.responseFormat,\n };\n const debugFile = options.debugRequestFile || options.debugFile;\n await storage.writeFile(debugFile!, JSON.stringify(requestData, null, 2), 'utf8');\n logger.debug('Wrote request debug file to %s', debugFile);\n }\n\n // Add timeout wrapper to the OpenAI API call\n const completionPromise = openai.chat.completions.create({\n model: options.model || \"gpt-4o-mini\",\n messages,\n max_completion_tokens: maxCompletionTokens,\n response_format: options.responseFormat,\n });\n\n const timeoutPromise = new Promise<never>((_, reject) => {\n setTimeout(() => reject(new OpenAIError('OpenAI API call timed out after 180 seconds')), 180000);\n });\n\n const completion = await Promise.race([completionPromise, timeoutPromise]);\n\n // Save response debug file if enabled\n if (options.debug && (options.debugResponseFile || options.debugFile)) {\n const debugFile = options.debugResponseFile || options.debugFile;\n await storage.writeFile(debugFile!, JSON.stringify(completion, null, 2), 'utf8');\n logger.debug('Wrote response debug file to %s', debugFile);\n }\n\n const response = completion.choices[0]?.message?.content?.trim();\n if (!response) {\n throw new OpenAIError('No response received from OpenAI');\n }\n\n logger.debug('Received response from OpenAI: %s...', response.substring(0, 30));\n if (options.responseFormat) {\n return JSON.parse(response);\n } else {\n return response;\n }\n\n } catch (error: any) {\n logger.error('Error calling OpenAI API: %s %s', error.message, error.stack);\n throw new OpenAIError(`Failed to create completion: ${error.message}`);\n } finally {\n // OpenAI client cleanup is handled automatically by the library\n // No manual cleanup needed for newer versions\n }\n}\n\nexport async function transcribeAudio(filePath: string, options: { model?: string, debug?: boolean, debugFile?: string, debugRequestFile?: string, debugResponseFile?: string, outputDirectory?: string } = { model: \"whisper-1\" }): Promise<Transcription> {\n const logger = getLogger();\n const storage = Storage.create({ log: logger.debug });\n let openai: OpenAI | null = null;\n let audioStream: fs.ReadStream | null = null;\n try {\n const apiKey = process.env.OPENAI_API_KEY;\n if (!apiKey) {\n throw new OpenAIError('OPENAI_API_KEY environment variable is not set');\n }\n\n openai = new OpenAI({\n apiKey: apiKey,\n });\n\n logger.debug('Transcribing audio file: %s', filePath);\n\n // Save request debug file if enabled\n if (options.debug && (options.debugRequestFile || options.debugFile)) {\n const requestData = {\n model: options.model || \"whisper-1\",\n file: filePath, // Can't serialize the stream, so just save the file path\n response_format: \"json\",\n };\n const debugFile = options.debugRequestFile || options.debugFile;\n await storage.writeFile(debugFile!, JSON.stringify(requestData, null, 2), 'utf8');\n logger.debug('Wrote request debug file to %s', debugFile);\n }\n\n audioStream = await storage.readStream(filePath);\n const transcription = await openai.audio.transcriptions.create({\n model: options.model || \"whisper-1\",\n file: audioStream,\n response_format: \"json\",\n });\n\n // Save response debug file if enabled\n if (options.debug && (options.debugResponseFile || options.debugFile)) {\n const debugFile = options.debugResponseFile || options.debugFile;\n await storage.writeFile(debugFile!, JSON.stringify(transcription, null, 2), 'utf8');\n logger.debug('Wrote response debug file to %s', debugFile);\n }\n\n const response = transcription;\n if (!response) {\n throw new OpenAIError('No transcription received from OpenAI');\n }\n\n logger.debug('Received transcription from OpenAI: %s', response);\n\n // Archive the audio file and transcription\n try {\n const outputDir = options.outputDirectory || 'output';\n await archiveAudio(filePath, response.text, outputDir);\n } catch (archiveError: any) {\n // Don't fail the transcription if archiving fails, just log the error\n logger.warn('Failed to archive audio file: %s', archiveError.message);\n }\n\n return response;\n\n } catch (error: any) {\n logger.error('Error transcribing audio file: %s %s', error.message, error.stack);\n throw new OpenAIError(`Failed to transcribe audio: ${error.message}`);\n } finally {\n // Ensure the audio stream is properly closed to release file handles\n try {\n if (audioStream) {\n audioStream.close();\n }\n } catch (streamErr) {\n logger.debug('Failed to close audio read stream: %s', (streamErr as Error).message);\n }\n // OpenAI client cleanup is handled automatically by the library\n // No manual cleanup needed for newer versions\n }\n}\n"],"names":["OpenAIError","Error","message","name","createCompletion","messages","options","model","logger","getLogger","storage","Storage","log","debug","openai","completion","apiKey","process","env","OPENAI_API_KEY","OpenAI","timeout","maxCompletionTokens","maxTokens","debugRequestFile","debugFile","requestData","max_completion_tokens","response_format","responseFormat","writeFile","JSON","stringify","completionPromise","chat","completions","create","timeoutPromise","Promise","_","reject","setTimeout","race","debugResponseFile","response","choices","content","trim","substring","parse","error","stack","transcribeAudio","filePath","audioStream","file","readStream","transcription","audio","transcriptions","outputDir","outputDirectory","archiveAudio","text","archiveError","warn","close","streamErr"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"openai.js","sources":["../../src/util/openai.ts"],"sourcesContent":["import { OpenAI } from 'openai';\nimport { ChatCompletionMessageParam } from 'openai/resources';\nimport * as Storage from './storage';\nimport { getLogger } from '../logging';\nimport { archiveAudio } from './general';\nimport { Config } from '../types';\nimport { safeJsonParse } from './validation';\n// eslint-disable-next-line no-restricted-imports\nimport fs from 'fs';\n\nexport interface Transcription {\n text: string;\n}\n\n/**\n * Get the appropriate model to use based on command-specific configuration\n * Command-specific model overrides the global model setting\n */\nexport function getModelForCommand(config: Config, commandName: string): string {\n let commandModel: string | undefined;\n\n switch (commandName) {\n case 'commit':\n case 'audio-commit':\n commandModel = config.commit?.model;\n break;\n case 'release':\n commandModel = config.release?.model;\n break;\n case 'review':\n case 'audio-review':\n commandModel = config.review?.model;\n break;\n default:\n // For other commands, just use global model\n break;\n }\n\n // Return command-specific model if available, otherwise global model\n return commandModel || config.model || 'gpt-4o-mini';\n}\n\nexport class OpenAIError extends Error {\n constructor(message: string, public readonly isTokenLimitError: boolean = false) {\n super(message);\n this.name = 'OpenAIError';\n }\n}\n\n// Check if an error is a token limit exceeded error\nexport function isTokenLimitError(error: any): boolean {\n if (!error?.message) return false;\n\n const message = error.message.toLowerCase();\n return message.includes('maximum context length') ||\n message.includes('context_length_exceeded') ||\n message.includes('token limit') ||\n message.includes('too many tokens') ||\n message.includes('reduce the length');\n}\n\n// Check if an error is a rate limit error\nexport function isRateLimitError(error: any): boolean {\n if (!error?.message && !error?.code && !error?.status) return false;\n\n // Check for OpenAI specific rate limit indicators\n if (error.status === 429 || error.code === 'rate_limit_exceeded') {\n return true;\n }\n\n const message = error.message.toLowerCase();\n return message.includes('rate limit exceeded') ||\n message.includes('too many requests') ||\n message.includes('quota exceeded') ||\n (message.includes('rate') && message.includes('limit'));\n}\n\nexport async function createCompletion(messages: ChatCompletionMessageParam[], options: { responseFormat?: any, model?: string, debug?: boolean, debugFile?: string, debugRequestFile?: string, debugResponseFile?: string, maxTokens?: number } = { model: \"gpt-4o-mini\" }): Promise<string | any> {\n const logger = getLogger();\n const storage = Storage.create({ log: logger.debug });\n let openai: OpenAI | null = null;\n try {\n const apiKey = process.env.OPENAI_API_KEY;\n if (!apiKey) {\n throw new OpenAIError('OPENAI_API_KEY environment variable is not set');\n }\n\n // Create the client which we'll close in the finally block.\n const timeoutMs = parseInt(process.env.OPENAI_TIMEOUT_MS || '300000'); // Default to 5 minutes\n openai = new OpenAI({\n apiKey: apiKey,\n timeout: timeoutMs,\n });\n\n const modelToUse = options.model || \"gpt-4o-mini\";\n logger.info('🤖 Making request to OpenAI using model: %s', modelToUse);\n logger.debug('Sending prompt to OpenAI: %j', messages);\n\n // Use provided maxTokens or default to 10000\n const maxCompletionTokens = options.maxTokens || 10000;\n\n // Save request debug file if enabled\n if (options.debug && (options.debugRequestFile || options.debugFile)) {\n const requestData = {\n model: modelToUse,\n messages,\n max_completion_tokens: maxCompletionTokens,\n response_format: options.responseFormat,\n };\n const debugFile = options.debugRequestFile || options.debugFile;\n await storage.writeFile(debugFile!, JSON.stringify(requestData, null, 2), 'utf8');\n logger.debug('Wrote request debug file to %s', debugFile);\n }\n\n // Add timeout wrapper to the OpenAI API call\n const completionPromise = openai.chat.completions.create({\n model: modelToUse,\n messages,\n max_completion_tokens: maxCompletionTokens,\n response_format: options.responseFormat,\n });\n\n // Create timeout promise with proper cleanup to prevent memory leaks\n let timeoutId: NodeJS.Timeout | null = null;\n const timeoutPromise = new Promise<never>((_, reject) => {\n const timeoutMs = parseInt(process.env.OPENAI_TIMEOUT_MS || '300000'); // Default to 5 minutes\n timeoutId = setTimeout(() => reject(new OpenAIError(`OpenAI API call timed out after ${timeoutMs/1000} seconds`)), timeoutMs);\n });\n\n let completion;\n try {\n completion = await Promise.race([completionPromise, timeoutPromise]);\n } finally {\n // Clear the timeout to prevent memory leaks\n if (timeoutId !== null) {\n clearTimeout(timeoutId);\n }\n }\n\n // Save response debug file if enabled\n if (options.debug && (options.debugResponseFile || options.debugFile)) {\n const debugFile = options.debugResponseFile || options.debugFile;\n await storage.writeFile(debugFile!, JSON.stringify(completion, null, 2), 'utf8');\n logger.debug('Wrote response debug file to %s', debugFile);\n }\n\n const response = completion.choices[0]?.message?.content?.trim();\n if (!response) {\n throw new OpenAIError('No response received from OpenAI');\n }\n\n logger.debug('Received response from OpenAI: %s...', response.substring(0, 30));\n if (options.responseFormat) {\n return safeJsonParse(response, 'OpenAI API response');\n } else {\n return response;\n }\n\n } catch (error: any) {\n logger.error('Error calling OpenAI API: %s %s', error.message, error.stack);\n const isTokenError = isTokenLimitError(error);\n throw new OpenAIError(`Failed to create completion: ${error.message}`, isTokenError);\n } finally {\n // OpenAI client cleanup is handled automatically by the library\n // No manual cleanup needed for newer versions\n }\n}\n\n// Create completion with automatic retry on token limit errors\nexport async function createCompletionWithRetry(\n messages: ChatCompletionMessageParam[],\n options: { responseFormat?: any, model?: string, debug?: boolean, debugFile?: string, debugRequestFile?: string, debugResponseFile?: string, maxTokens?: number } = { model: \"gpt-4o-mini\" },\n retryCallback?: (attempt: number) => Promise<ChatCompletionMessageParam[]>\n): Promise<string | any> {\n const logger = getLogger();\n const maxRetries = 3;\n\n for (let attempt = 1; attempt <= maxRetries; attempt++) {\n try {\n const messagesToSend = attempt === 1 ? messages : (retryCallback ? await retryCallback(attempt) : messages);\n return await createCompletion(messagesToSend, options);\n } catch (error: any) {\n if (error instanceof OpenAIError && error.isTokenLimitError && attempt < maxRetries && retryCallback) {\n logger.warn('Token limit exceeded on attempt %d/%d, retrying with reduced content...', attempt, maxRetries);\n // Add exponential backoff for token limit errors\n const backoffMs = Math.min(1000 * Math.pow(2, attempt - 1), 10000);\n await new Promise(resolve => setTimeout(resolve, backoffMs));\n continue;\n } else if (isRateLimitError(error) && attempt < maxRetries) {\n // Handle rate limiting with exponential backoff\n const backoffMs = Math.min(2000 * Math.pow(2, attempt - 1), 15000); // More reasonable backoff: 2s, 4s, 8s, max 15s\n logger.warn(`Rate limit hit on attempt ${attempt}/${maxRetries}, waiting ${backoffMs}ms before retry...`);\n await new Promise(resolve => setTimeout(resolve, backoffMs));\n continue;\n }\n throw error;\n }\n }\n\n // This should never be reached, but TypeScript requires it\n throw new OpenAIError('Max retries exceeded');\n}\n\nexport async function transcribeAudio(filePath: string, options: { model?: string, debug?: boolean, debugFile?: string, debugRequestFile?: string, debugResponseFile?: string, outputDirectory?: string } = { model: \"whisper-1\" }): Promise<Transcription> {\n const logger = getLogger();\n const storage = Storage.create({ log: logger.debug });\n let openai: OpenAI | null = null;\n let audioStream: fs.ReadStream | null = null;\n let streamClosed = false;\n\n // Helper function to safely close the stream\n const closeAudioStream = () => {\n if (audioStream && !streamClosed) {\n try {\n // Only call destroy if it exists and the stream isn't already destroyed\n if (typeof audioStream.destroy === 'function' && !audioStream.destroyed) {\n audioStream.destroy();\n }\n streamClosed = true;\n logger.debug('Audio stream closed successfully');\n } catch (streamErr) {\n logger.debug('Failed to destroy audio read stream: %s', (streamErr as Error).message);\n streamClosed = true; // Mark as closed even if destroy failed\n }\n }\n };\n\n try {\n const apiKey = process.env.OPENAI_API_KEY;\n if (!apiKey) {\n throw new OpenAIError('OPENAI_API_KEY environment variable is not set');\n }\n\n openai = new OpenAI({\n apiKey: apiKey,\n });\n\n logger.debug('Transcribing audio file: %s', filePath);\n\n // Save request debug file if enabled\n if (options.debug && (options.debugRequestFile || options.debugFile)) {\n const requestData = {\n model: options.model || \"whisper-1\",\n file: filePath, // Can't serialize the stream, so just save the file path\n response_format: \"json\",\n };\n const debugFile = options.debugRequestFile || options.debugFile;\n await storage.writeFile(debugFile!, JSON.stringify(requestData, null, 2), 'utf8');\n logger.debug('Wrote request debug file to %s', debugFile);\n }\n\n audioStream = await storage.readStream(filePath);\n\n // Set up error handler for the stream to ensure cleanup on stream errors\n // Only add handler if the stream has the 'on' method (real streams)\n if (audioStream && typeof audioStream.on === 'function') {\n audioStream.on('error', (streamError) => {\n logger.error('Audio stream error: %s', streamError.message);\n closeAudioStream();\n });\n }\n\n let transcription;\n try {\n transcription = await openai.audio.transcriptions.create({\n model: options.model || \"whisper-1\",\n file: audioStream,\n response_format: \"json\",\n });\n // Close the stream immediately after successful API call to prevent race conditions\n closeAudioStream();\n } catch (apiError) {\n // Close the stream immediately if the API call fails\n closeAudioStream();\n throw apiError;\n }\n\n // Save response debug file if enabled\n if (options.debug && (options.debugResponseFile || options.debugFile)) {\n const debugFile = options.debugResponseFile || options.debugFile;\n await storage.writeFile(debugFile!, JSON.stringify(transcription, null, 2), 'utf8');\n logger.debug('Wrote response debug file to %s', debugFile);\n }\n\n const response = transcription;\n if (!response) {\n throw new OpenAIError('No transcription received from OpenAI');\n }\n\n logger.debug('Received transcription from OpenAI: %s', response);\n\n // Archive the audio file and transcription\n try {\n const outputDir = options.outputDirectory || 'output';\n await archiveAudio(filePath, response.text, outputDir);\n } catch (archiveError: any) {\n // Don't fail the transcription if archiving fails, just log the error\n logger.warn('Failed to archive audio file: %s', archiveError.message);\n }\n\n return response;\n\n } catch (error: any) {\n logger.error('Error transcribing audio file: %s %s', error.message, error.stack);\n throw new OpenAIError(`Failed to transcribe audio: ${error.message}`);\n } finally {\n // Ensure the audio stream is properly closed to release file handles\n closeAudioStream();\n // OpenAI client cleanup is handled automatically by the library\n // No manual cleanup needed for newer versions\n }\n}\n"],"names":["getModelForCommand","config","commandName","commandModel","commit","model","release","review","OpenAIError","Error","message","isTokenLimitError","name","error","toLowerCase","includes","isRateLimitError","code","status","createCompletion","messages","options","logger","getLogger","storage","Storage","log","debug","openai","completion","apiKey","process","env","OPENAI_API_KEY","timeoutMs","parseInt","OPENAI_TIMEOUT_MS","OpenAI","timeout","modelToUse","info","maxCompletionTokens","maxTokens","debugRequestFile","debugFile","requestData","max_completion_tokens","response_format","responseFormat","writeFile","JSON","stringify","completionPromise","chat","completions","create","timeoutId","timeoutPromise","Promise","_","reject","setTimeout","race","clearTimeout","debugResponseFile","response","choices","content","trim","substring","safeJsonParse","stack","isTokenError","createCompletionWithRetry","retryCallback","maxRetries","attempt","messagesToSend","warn","backoffMs","Math","min","pow","resolve","transcribeAudio","filePath","audioStream","streamClosed","closeAudioStream","destroy","destroyed","streamErr","file","readStream","on","streamError","transcription","audio","transcriptions","apiError","outputDir","outputDirectory","archiveAudio","text","archiveError"],"mappings":"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"}
|
package/dist/util/performance.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import path__default from 'path';
|
|
2
2
|
import { getLogger } from '../logging.js';
|
|
3
3
|
import { safeJsonParse, validatePackageJson } from './validation.js';
|
|
4
4
|
|
|
@@ -55,7 +55,7 @@ const batchReadPackageJsonFiles = async (packageJsonPaths, storage, rootDir)=>{
|
|
|
55
55
|
const packageJsonContent = await storage.readFile(packageJsonPath, 'utf-8');
|
|
56
56
|
const parsed = safeJsonParse(packageJsonContent, packageJsonPath);
|
|
57
57
|
const packageJson = validatePackageJson(parsed, packageJsonPath, false);
|
|
58
|
-
const relativePath =
|
|
58
|
+
const relativePath = path__default.relative(rootDir, path__default.dirname(packageJsonPath));
|
|
59
59
|
return {
|
|
60
60
|
path: packageJsonPath,
|
|
61
61
|
packageJson,
|
|
@@ -88,7 +88,7 @@ const findAllPackageJsonFiles = async (rootDir, storage)=>{
|
|
|
88
88
|
const foundPaths = [];
|
|
89
89
|
// Check for package.json in current directory
|
|
90
90
|
if (items.includes('package.json')) {
|
|
91
|
-
const packageJsonPath =
|
|
91
|
+
const packageJsonPath = path__default.join(currentDir, 'package.json');
|
|
92
92
|
foundPaths.push(packageJsonPath);
|
|
93
93
|
}
|
|
94
94
|
// Process subdirectories in parallel
|
|
@@ -97,7 +97,7 @@ const findAllPackageJsonFiles = async (rootDir, storage)=>{
|
|
|
97
97
|
if (EXCLUDED_DIRECTORIES.includes(item)) {
|
|
98
98
|
continue;
|
|
99
99
|
}
|
|
100
|
-
const itemPath =
|
|
100
|
+
const itemPath = path__default.join(currentDir, item);
|
|
101
101
|
subdirPromises.push((async ()=>{
|
|
102
102
|
try {
|
|
103
103
|
if (await storage.isDirectory(itemPath)) {
|
|
@@ -129,74 +129,6 @@ const findAllPackageJsonFiles = async (rootDir, storage)=>{
|
|
|
129
129
|
timer.end(`Found ${packageJsonFiles.length} valid package.json files`);
|
|
130
130
|
return packageJsonFiles;
|
|
131
131
|
};
|
|
132
|
-
// Optimized package scanning with parallel processing
|
|
133
|
-
const scanDirectoryForPackages = async (rootDir, storage)=>{
|
|
134
|
-
const logger = getLogger();
|
|
135
|
-
const timer = PerformanceTimer.start(logger, `Optimized package scanning: ${rootDir}`);
|
|
136
|
-
const packageMap = new Map(); // packageName -> relativePath
|
|
137
|
-
const absoluteRootDir = path.resolve(process.cwd(), rootDir);
|
|
138
|
-
logger.verbose(`Scanning directory for packages: ${absoluteRootDir}`);
|
|
139
|
-
try {
|
|
140
|
-
// Quick existence and directory check
|
|
141
|
-
const existsTimer = PerformanceTimer.start(logger, `Checking directory: ${absoluteRootDir}`);
|
|
142
|
-
if (!await storage.exists(absoluteRootDir) || !await storage.isDirectory(absoluteRootDir)) {
|
|
143
|
-
existsTimer.end(`Directory not found or not a directory: ${absoluteRootDir}`);
|
|
144
|
-
timer.end(`Directory invalid: ${rootDir}`);
|
|
145
|
-
return packageMap;
|
|
146
|
-
}
|
|
147
|
-
existsTimer.end(`Directory verified: ${absoluteRootDir}`);
|
|
148
|
-
// Get all items and process in parallel
|
|
149
|
-
const listTimer = PerformanceTimer.start(logger, `Listing contents: ${absoluteRootDir}`);
|
|
150
|
-
const items = await storage.listFiles(absoluteRootDir);
|
|
151
|
-
listTimer.end(`Listed ${items.length} items`);
|
|
152
|
-
// Create batched promises for better performance
|
|
153
|
-
const BATCH_SIZE = 10; // Process directories in batches to avoid overwhelming filesystem
|
|
154
|
-
const batches = [];
|
|
155
|
-
for(let i = 0; i < items.length; i += BATCH_SIZE){
|
|
156
|
-
const batch = items.slice(i, i + BATCH_SIZE);
|
|
157
|
-
batches.push(batch);
|
|
158
|
-
}
|
|
159
|
-
const processTimer = PerformanceTimer.start(logger, `Processing ${batches.length} batches of directories`);
|
|
160
|
-
for (const batch of batches){
|
|
161
|
-
const batchPromises = batch.map(async (item)=>{
|
|
162
|
-
const itemPath = path.join(absoluteRootDir, item);
|
|
163
|
-
try {
|
|
164
|
-
if (await storage.isDirectory(itemPath)) {
|
|
165
|
-
const packageJsonPath = path.join(itemPath, 'package.json');
|
|
166
|
-
if (await storage.exists(packageJsonPath)) {
|
|
167
|
-
const packageJsonContent = await storage.readFile(packageJsonPath, 'utf-8');
|
|
168
|
-
const parsed = safeJsonParse(packageJsonContent, packageJsonPath);
|
|
169
|
-
const packageJson = validatePackageJson(parsed, packageJsonPath);
|
|
170
|
-
if (packageJson.name) {
|
|
171
|
-
const relativePath = path.relative(process.cwd(), itemPath);
|
|
172
|
-
return {
|
|
173
|
-
name: packageJson.name,
|
|
174
|
-
path: relativePath
|
|
175
|
-
};
|
|
176
|
-
}
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
} catch (error) {
|
|
180
|
-
logger.debug(`Skipped ${itemPath}: ${error.message || error}`);
|
|
181
|
-
}
|
|
182
|
-
return null;
|
|
183
|
-
});
|
|
184
|
-
const batchResults = await Promise.all(batchPromises);
|
|
185
|
-
for (const result of batchResults){
|
|
186
|
-
if (result) {
|
|
187
|
-
packageMap.set(result.name, result.path);
|
|
188
|
-
logger.debug(`Found package: ${result.name} at ${result.path}`);
|
|
189
|
-
}
|
|
190
|
-
}
|
|
191
|
-
}
|
|
192
|
-
processTimer.end(`Processed ${items.length} directories in ${batches.length} batches`);
|
|
193
|
-
logger.verbose(`Found ${packageMap.size} packages in ${items.length} subdirectories`);
|
|
194
|
-
} catch (error) {
|
|
195
|
-
logger.warn(`Failed to read directory ${absoluteRootDir}: ${error}`);
|
|
196
|
-
}
|
|
197
|
-
timer.end(`Found ${packageMap.size} packages in: ${rootDir}`);
|
|
198
|
-
return packageMap;
|
|
199
|
-
};
|
|
200
132
|
|
|
201
|
-
export { PerformanceTimer, batchReadPackageJsonFiles, findAllPackageJsonFiles
|
|
133
|
+
export { PerformanceTimer, batchReadPackageJsonFiles, findAllPackageJsonFiles };
|
|
202
134
|
//# sourceMappingURL=performance.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performance.js","sources":["../../src/util/performance.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-unused-vars */\nimport path from 'path';\nimport { getLogger } from '../logging';\nimport { safeJsonParse, validatePackageJson } from './validation';\n\n// Performance timing helper\nexport class PerformanceTimer {\n private startTime: number;\n private logger: any;\n\n constructor(logger: any) {\n this.logger = logger;\n this.startTime = Date.now();\n }\n\n static start(logger: any, operation: string): PerformanceTimer {\n logger.verbose(`⏱️ Starting: ${operation}`);\n return new PerformanceTimer(logger);\n }\n\n end(operation: string): number {\n const duration = Date.now() - this.startTime;\n this.logger.verbose(`⏱️ Completed: ${operation} (${duration}ms)`);\n return duration;\n }\n}\n\nexport interface PackageJson {\n name?: string;\n dependencies?: Record<string, string>;\n devDependencies?: Record<string, string>;\n peerDependencies?: Record<string, string>;\n}\n\nexport interface PackageJsonLocation {\n path: string;\n packageJson: PackageJson;\n relativePath: string;\n}\n\nconst EXCLUDED_DIRECTORIES = [\n 'node_modules',\n 'dist',\n 'build',\n 'coverage',\n '.git',\n '.next',\n '.nuxt',\n 'out',\n 'public',\n 'static',\n 'assets'\n];\n\n// Batch read multiple package.json files in parallel\nexport const batchReadPackageJsonFiles = async (\n packageJsonPaths: string[],\n storage: any,\n rootDir: string\n): Promise<PackageJsonLocation[]> => {\n const logger = getLogger();\n const timer = PerformanceTimer.start(logger, `Batch reading ${packageJsonPaths.length} package.json files`);\n\n const readPromises = packageJsonPaths.map(async (packageJsonPath): Promise<PackageJsonLocation | null> => {\n try {\n const packageJsonContent = await storage.readFile(packageJsonPath, 'utf-8');\n const parsed = safeJsonParse(packageJsonContent, packageJsonPath);\n const packageJson = validatePackageJson(parsed, packageJsonPath, false);\n const relativePath = path.relative(rootDir, path.dirname(packageJsonPath));\n\n return {\n path: packageJsonPath,\n packageJson,\n relativePath: relativePath || '.'\n };\n } catch (error: any) {\n logger.debug(`Skipped invalid package.json at ${packageJsonPath}: ${error.message}`);\n return null;\n }\n });\n\n const results = await Promise.all(readPromises);\n const validResults = results.filter((result): result is PackageJsonLocation => result !== null);\n\n timer.end(`Successfully read ${validResults.length}/${packageJsonPaths.length} package.json files`);\n return validResults;\n};\n\n// Optimized recursive package.json finder with parallel processing\nexport const findAllPackageJsonFiles = async (rootDir: string, storage: any): Promise<PackageJsonLocation[]> => {\n const logger = getLogger();\n const timer = PerformanceTimer.start(logger, 'Optimized scanning for package.json files');\n\n // Phase 1: Find all package.json file paths in parallel\n const packageJsonPaths: string[] = [];\n\n const scanForPaths = async (currentDir: string, depth: number = 0): Promise<string[]> => {\n // Prevent infinite recursion and overly deep scanning\n if (depth > 5) {\n return [];\n }\n\n try {\n if (!await storage.exists(currentDir) || !await storage.isDirectory(currentDir)) {\n return [];\n }\n\n const items = await storage.listFiles(currentDir);\n const foundPaths: string[] = [];\n\n // Check for package.json in current directory\n if (items.includes('package.json')) {\n const packageJsonPath = path.join(currentDir, 'package.json');\n foundPaths.push(packageJsonPath);\n }\n\n // Process subdirectories in parallel\n const subdirPromises: Promise<string[]>[] = [];\n for (const item of items) {\n if (EXCLUDED_DIRECTORIES.includes(item)) {\n continue;\n }\n\n const itemPath = path.join(currentDir, item);\n subdirPromises.push(\n (async () => {\n try {\n if (await storage.isDirectory(itemPath)) {\n return await scanForPaths(itemPath, depth + 1);\n }\n } catch (error: any) {\n logger.debug(`Skipped directory ${itemPath}: ${error.message}`);\n }\n return [];\n })()\n );\n }\n\n if (subdirPromises.length > 0) {\n const subdirResults = await Promise.all(subdirPromises);\n for (const subdirPaths of subdirResults) {\n foundPaths.push(...subdirPaths);\n }\n }\n\n return foundPaths;\n } catch (error: any) {\n logger.debug(`Failed to scan directory ${currentDir}: ${error.message}`);\n return [];\n }\n };\n\n const pathsTimer = PerformanceTimer.start(logger, 'Finding all package.json paths');\n const allPaths = await scanForPaths(rootDir);\n pathsTimer.end(`Found ${allPaths.length} package.json file paths`);\n\n // Phase 2: Batch read all package.json files in parallel\n const packageJsonFiles = await batchReadPackageJsonFiles(allPaths, storage, rootDir);\n\n timer.end(`Found ${packageJsonFiles.length} valid package.json files`);\n return packageJsonFiles;\n};\n\n// Optimized package scanning with parallel processing\nexport const scanDirectoryForPackages = async (rootDir: string, storage: any): Promise<Map<string, string>> => {\n const logger = getLogger();\n const timer = PerformanceTimer.start(logger, `Optimized package scanning: ${rootDir}`);\n const packageMap = new Map<string, string>(); // packageName -> relativePath\n\n const absoluteRootDir = path.resolve(process.cwd(), rootDir);\n logger.verbose(`Scanning directory for packages: ${absoluteRootDir}`);\n\n try {\n // Quick existence and directory check\n const existsTimer = PerformanceTimer.start(logger, `Checking directory: ${absoluteRootDir}`);\n if (!await storage.exists(absoluteRootDir) || !await storage.isDirectory(absoluteRootDir)) {\n existsTimer.end(`Directory not found or not a directory: ${absoluteRootDir}`);\n timer.end(`Directory invalid: ${rootDir}`);\n return packageMap;\n }\n existsTimer.end(`Directory verified: ${absoluteRootDir}`);\n\n // Get all items and process in parallel\n const listTimer = PerformanceTimer.start(logger, `Listing contents: ${absoluteRootDir}`);\n const items = await storage.listFiles(absoluteRootDir);\n listTimer.end(`Listed ${items.length} items`);\n\n // Create batched promises for better performance\n const BATCH_SIZE = 10; // Process directories in batches to avoid overwhelming filesystem\n const batches = [];\n\n for (let i = 0; i < items.length; i += BATCH_SIZE) {\n const batch = items.slice(i, i + BATCH_SIZE);\n batches.push(batch);\n }\n\n const processTimer = PerformanceTimer.start(logger, `Processing ${batches.length} batches of directories`);\n\n for (const batch of batches) {\n const batchPromises = batch.map(async (item: string) => {\n const itemPath = path.join(absoluteRootDir, item);\n try {\n if (await storage.isDirectory(itemPath)) {\n const packageJsonPath = path.join(itemPath, 'package.json');\n\n if (await storage.exists(packageJsonPath)) {\n const packageJsonContent = await storage.readFile(packageJsonPath, 'utf-8');\n const parsed = safeJsonParse(packageJsonContent, packageJsonPath);\n const packageJson = validatePackageJson(parsed, packageJsonPath);\n\n if (packageJson.name) {\n const relativePath = path.relative(process.cwd(), itemPath);\n return { name: packageJson.name, path: relativePath };\n }\n }\n }\n } catch (error: any) {\n logger.debug(`Skipped ${itemPath}: ${error.message || error}`);\n }\n return null;\n });\n\n const batchResults = await Promise.all(batchPromises);\n\n for (const result of batchResults) {\n if (result) {\n packageMap.set(result.name, result.path);\n logger.debug(`Found package: ${result.name} at ${result.path}`);\n }\n }\n }\n\n processTimer.end(`Processed ${items.length} directories in ${batches.length} batches`);\n logger.verbose(`Found ${packageMap.size} packages in ${items.length} subdirectories`);\n } catch (error) {\n logger.warn(`Failed to read directory ${absoluteRootDir}: ${error}`);\n }\n\n timer.end(`Found ${packageMap.size} packages in: ${rootDir}`);\n return packageMap;\n};\n\n// Parallel scope processing for better performance\nexport const findPackagesByScope = async (\n dependencies: Record<string, string>,\n scopeRoots: Record<string, string>,\n storage: any\n): Promise<Map<string, string>> => {\n const logger = getLogger();\n const timer = PerformanceTimer.start(logger, 'Finding packages by scope (optimized)');\n const workspacePackages = new Map<string, string>();\n\n logger.silly(`Checking dependencies against scope roots: ${JSON.stringify(scopeRoots)}`);\n\n // Process all scopes in parallel for maximum performance\n const scopeTimer = PerformanceTimer.start(logger, 'Parallel scope scanning');\n const scopePromises = Object.entries(scopeRoots).map(async ([scope, rootDir]) => {\n logger.verbose(`Scanning scope ${scope} at root directory: ${rootDir}`);\n const scopePackages = await scanDirectoryForPackages(rootDir, storage);\n\n // Filter packages that match the scope\n const matchingPackages: Array<[string, string]> = [];\n for (const [packageName, packagePath] of scopePackages) {\n if (packageName.startsWith(scope)) {\n matchingPackages.push([packageName, packagePath]);\n logger.debug(`Registered package: ${packageName} -> ${packagePath}`);\n }\n }\n return { scope, packages: matchingPackages };\n });\n\n const allScopeResults = await Promise.all(scopePromises);\n\n // Aggregate all packages from all scopes\n const allPackages = new Map<string, string>();\n for (const { scope, packages } of allScopeResults) {\n for (const [packageName, packagePath] of packages) {\n allPackages.set(packageName, packagePath);\n }\n }\n\n scopeTimer.end(`Scanned ${Object.keys(scopeRoots).length} scope roots, found ${allPackages.size} packages`);\n\n // Match dependencies to available packages\n const matchTimer = PerformanceTimer.start(logger, 'Matching dependencies to packages');\n for (const [depName, depVersion] of Object.entries(dependencies)) {\n logger.debug(`Processing dependency: ${depName}@${depVersion}`);\n\n if (allPackages.has(depName)) {\n const packagePath = allPackages.get(depName)!;\n workspacePackages.set(depName, packagePath);\n logger.verbose(`Found sibling package: ${depName} at ${packagePath}`);\n }\n }\n matchTimer.end(`Matched ${workspacePackages.size} dependencies to workspace packages`);\n\n timer.end(`Found ${workspacePackages.size} packages to link`);\n return workspacePackages;\n};\n\n// Utility to collect all dependencies from package.json files efficiently\nexport const collectAllDependencies = (packageJsonFiles: PackageJsonLocation[]): Record<string, string> => {\n const logger = getLogger();\n const timer = PerformanceTimer.start(logger, 'Collecting all dependencies');\n\n const allDependencies: Record<string, string> = {};\n for (const { packageJson } of packageJsonFiles) {\n Object.assign(allDependencies, packageJson.dependencies);\n Object.assign(allDependencies, packageJson.devDependencies);\n Object.assign(allDependencies, packageJson.peerDependencies);\n }\n\n timer.end(`Collected ${Object.keys(allDependencies).length} unique dependencies`);\n return allDependencies;\n};\n\n// Utility to check for file: dependencies\nexport const checkForFileDependencies = (packageJsonFiles: PackageJsonLocation[]): void => {\n const logger = getLogger();\n const timer = PerformanceTimer.start(logger, 'Checking for file: dependencies');\n const filesWithFileDepedencies: Array<{path: string, dependencies: string[]}> = [];\n\n for (const { path: packagePath, packageJson, relativePath } of packageJsonFiles) {\n const fileDeps: string[] = [];\n\n // Check all dependency types for file: paths\n const allDeps = {\n ...packageJson.dependencies,\n ...packageJson.devDependencies,\n ...packageJson.peerDependencies\n };\n\n for (const [name, version] of Object.entries(allDeps)) {\n if (version.startsWith('file:')) {\n fileDeps.push(`${name}: ${version}`);\n }\n }\n\n if (fileDeps.length > 0) {\n filesWithFileDepedencies.push({\n path: relativePath,\n dependencies: fileDeps\n });\n }\n }\n\n if (filesWithFileDepedencies.length > 0) {\n logger.warn('⚠️ WARNING: Found file: dependencies that should not be committed:');\n for (const file of filesWithFileDepedencies) {\n logger.warn(` 📄 ${file.path}:`);\n for (const dep of file.dependencies) {\n logger.warn(` - ${dep}`);\n }\n }\n logger.warn('');\n logger.warn('💡 Remember to run \"kodrdriv unlink\" before committing to restore registry versions!');\n logger.warn(' Or add a pre-commit hook to prevent accidental commits of linked dependencies.');\n }\n\n timer.end(`Checked ${packageJsonFiles.length} files, found ${filesWithFileDepedencies.length} with file: dependencies`);\n};\n"],"names":["PerformanceTimer","start","logger","operation","verbose","end","duration","Date","now","startTime","EXCLUDED_DIRECTORIES","batchReadPackageJsonFiles","packageJsonPaths","storage","rootDir","getLogger","timer","length","readPromises","map","packageJsonPath","packageJsonContent","readFile","parsed","safeJsonParse","packageJson","validatePackageJson","relativePath","path","relative","dirname","error","debug","message","results","Promise","all","validResults","filter","result","findAllPackageJsonFiles","scanForPaths","currentDir","depth","exists","isDirectory","items","listFiles","foundPaths","includes","join","push","subdirPromises","item","itemPath","subdirResults","subdirPaths","pathsTimer","allPaths","packageJsonFiles","scanDirectoryForPackages","packageMap","Map","absoluteRootDir","resolve","process","cwd","existsTimer","listTimer","BATCH_SIZE","batches","i","batch","slice","processTimer","batchPromises","name","batchResults","set","size","warn"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"performance.js","sources":["../../src/util/performance.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-unused-vars */\nimport path from 'path';\nimport { getLogger } from '../logging';\nimport { safeJsonParse, validatePackageJson } from './validation';\n\n// Performance timing helper\nexport class PerformanceTimer {\n private startTime: number;\n private logger: any;\n\n constructor(logger: any) {\n this.logger = logger;\n this.startTime = Date.now();\n }\n\n static start(logger: any, operation: string): PerformanceTimer {\n logger.verbose(`⏱️ Starting: ${operation}`);\n return new PerformanceTimer(logger);\n }\n\n end(operation: string): number {\n const duration = Date.now() - this.startTime;\n this.logger.verbose(`⏱️ Completed: ${operation} (${duration}ms)`);\n return duration;\n }\n}\n\nexport interface PackageJson {\n name?: string;\n dependencies?: Record<string, string>;\n devDependencies?: Record<string, string>;\n peerDependencies?: Record<string, string>;\n}\n\nexport interface PackageJsonLocation {\n path: string;\n packageJson: PackageJson;\n relativePath: string;\n}\n\nconst EXCLUDED_DIRECTORIES = [\n 'node_modules',\n 'dist',\n 'build',\n 'coverage',\n '.git',\n '.next',\n '.nuxt',\n 'out',\n 'public',\n 'static',\n 'assets'\n];\n\n// Batch read multiple package.json files in parallel\nexport const batchReadPackageJsonFiles = async (\n packageJsonPaths: string[],\n storage: any,\n rootDir: string\n): Promise<PackageJsonLocation[]> => {\n const logger = getLogger();\n const timer = PerformanceTimer.start(logger, `Batch reading ${packageJsonPaths.length} package.json files`);\n\n const readPromises = packageJsonPaths.map(async (packageJsonPath): Promise<PackageJsonLocation | null> => {\n try {\n const packageJsonContent = await storage.readFile(packageJsonPath, 'utf-8');\n const parsed = safeJsonParse(packageJsonContent, packageJsonPath);\n const packageJson = validatePackageJson(parsed, packageJsonPath, false);\n const relativePath = path.relative(rootDir, path.dirname(packageJsonPath));\n\n return {\n path: packageJsonPath,\n packageJson,\n relativePath: relativePath || '.'\n };\n } catch (error: any) {\n logger.debug(`Skipped invalid package.json at ${packageJsonPath}: ${error.message}`);\n return null;\n }\n });\n\n const results = await Promise.all(readPromises);\n const validResults = results.filter((result): result is PackageJsonLocation => result !== null);\n\n timer.end(`Successfully read ${validResults.length}/${packageJsonPaths.length} package.json files`);\n return validResults;\n};\n\n// Optimized recursive package.json finder with parallel processing\nexport const findAllPackageJsonFiles = async (rootDir: string, storage: any): Promise<PackageJsonLocation[]> => {\n const logger = getLogger();\n const timer = PerformanceTimer.start(logger, 'Optimized scanning for package.json files');\n\n // Phase 1: Find all package.json file paths in parallel\n const packageJsonPaths: string[] = [];\n\n const scanForPaths = async (currentDir: string, depth: number = 0): Promise<string[]> => {\n // Prevent infinite recursion and overly deep scanning\n if (depth > 5) {\n return [];\n }\n\n try {\n if (!await storage.exists(currentDir) || !await storage.isDirectory(currentDir)) {\n return [];\n }\n\n const items = await storage.listFiles(currentDir);\n const foundPaths: string[] = [];\n\n // Check for package.json in current directory\n if (items.includes('package.json')) {\n const packageJsonPath = path.join(currentDir, 'package.json');\n foundPaths.push(packageJsonPath);\n }\n\n // Process subdirectories in parallel\n const subdirPromises: Promise<string[]>[] = [];\n for (const item of items) {\n if (EXCLUDED_DIRECTORIES.includes(item)) {\n continue;\n }\n\n const itemPath = path.join(currentDir, item);\n subdirPromises.push(\n (async () => {\n try {\n if (await storage.isDirectory(itemPath)) {\n return await scanForPaths(itemPath, depth + 1);\n }\n } catch (error: any) {\n logger.debug(`Skipped directory ${itemPath}: ${error.message}`);\n }\n return [];\n })()\n );\n }\n\n if (subdirPromises.length > 0) {\n const subdirResults = await Promise.all(subdirPromises);\n for (const subdirPaths of subdirResults) {\n foundPaths.push(...subdirPaths);\n }\n }\n\n return foundPaths;\n } catch (error: any) {\n logger.debug(`Failed to scan directory ${currentDir}: ${error.message}`);\n return [];\n }\n };\n\n const pathsTimer = PerformanceTimer.start(logger, 'Finding all package.json paths');\n const allPaths = await scanForPaths(rootDir);\n pathsTimer.end(`Found ${allPaths.length} package.json file paths`);\n\n // Phase 2: Batch read all package.json files in parallel\n const packageJsonFiles = await batchReadPackageJsonFiles(allPaths, storage, rootDir);\n\n timer.end(`Found ${packageJsonFiles.length} valid package.json files`);\n return packageJsonFiles;\n};\n\n// Optimized package scanning with parallel processing\nexport const scanDirectoryForPackages = async (rootDir: string, storage: any): Promise<Map<string, string>> => {\n const logger = getLogger();\n const timer = PerformanceTimer.start(logger, `Optimized package scanning: ${rootDir}`);\n const packageMap = new Map<string, string>(); // packageName -> relativePath\n\n const absoluteRootDir = path.resolve(process.cwd(), rootDir);\n logger.verbose(`Scanning directory for packages: ${absoluteRootDir}`);\n\n try {\n // Quick existence and directory check\n const existsTimer = PerformanceTimer.start(logger, `Checking directory: ${absoluteRootDir}`);\n if (!await storage.exists(absoluteRootDir) || !await storage.isDirectory(absoluteRootDir)) {\n existsTimer.end(`Directory not found or not a directory: ${absoluteRootDir}`);\n timer.end(`Directory invalid: ${rootDir}`);\n return packageMap;\n }\n existsTimer.end(`Directory verified: ${absoluteRootDir}`);\n\n // Get all items and process in parallel\n const listTimer = PerformanceTimer.start(logger, `Listing contents: ${absoluteRootDir}`);\n const items = await storage.listFiles(absoluteRootDir);\n listTimer.end(`Listed ${items.length} items`);\n\n // Create batched promises for better performance\n const BATCH_SIZE = 10; // Process directories in batches to avoid overwhelming filesystem\n const batches = [];\n\n for (let i = 0; i < items.length; i += BATCH_SIZE) {\n const batch = items.slice(i, i + BATCH_SIZE);\n batches.push(batch);\n }\n\n const processTimer = PerformanceTimer.start(logger, `Processing ${batches.length} batches of directories`);\n\n for (const batch of batches) {\n const batchPromises = batch.map(async (item: string) => {\n const itemPath = path.join(absoluteRootDir, item);\n try {\n if (await storage.isDirectory(itemPath)) {\n const packageJsonPath = path.join(itemPath, 'package.json');\n\n if (await storage.exists(packageJsonPath)) {\n const packageJsonContent = await storage.readFile(packageJsonPath, 'utf-8');\n const parsed = safeJsonParse(packageJsonContent, packageJsonPath);\n const packageJson = validatePackageJson(parsed, packageJsonPath);\n\n if (packageJson.name) {\n const relativePath = path.relative(process.cwd(), itemPath);\n return { name: packageJson.name, path: relativePath };\n }\n }\n }\n } catch (error: any) {\n logger.debug(`Skipped ${itemPath}: ${error.message || error}`);\n }\n return null;\n });\n\n const batchResults = await Promise.all(batchPromises);\n\n for (const result of batchResults) {\n if (result) {\n packageMap.set(result.name, result.path);\n logger.debug(`Found package: ${result.name} at ${result.path}`);\n }\n }\n }\n\n processTimer.end(`Processed ${items.length} directories in ${batches.length} batches`);\n logger.verbose(`Found ${packageMap.size} packages in ${items.length} subdirectories`);\n } catch (error) {\n logger.warn(`Failed to read directory ${absoluteRootDir}: ${error}`);\n }\n\n timer.end(`Found ${packageMap.size} packages in: ${rootDir}`);\n return packageMap;\n};\n\n// Parallel scope processing for better performance\nexport const findPackagesByScope = async (\n dependencies: Record<string, string>,\n scopeRoots: Record<string, string>,\n storage: any\n): Promise<Map<string, string>> => {\n const logger = getLogger();\n const timer = PerformanceTimer.start(logger, 'Finding packages by scope (optimized)');\n const workspacePackages = new Map<string, string>();\n\n logger.silly(`Checking dependencies against scope roots: ${JSON.stringify(scopeRoots)}`);\n\n // Process all scopes in parallel for maximum performance\n const scopeTimer = PerformanceTimer.start(logger, 'Parallel scope scanning');\n const scopePromises = Object.entries(scopeRoots).map(async ([scope, rootDir]) => {\n logger.verbose(`Scanning scope ${scope} at root directory: ${rootDir}`);\n const scopePackages = await scanDirectoryForPackages(rootDir, storage);\n\n // Filter packages that match the scope\n const matchingPackages: Array<[string, string]> = [];\n for (const [packageName, packagePath] of scopePackages) {\n if (packageName.startsWith(scope)) {\n matchingPackages.push([packageName, packagePath]);\n logger.debug(`Registered package: ${packageName} -> ${packagePath}`);\n }\n }\n return { scope, packages: matchingPackages };\n });\n\n const allScopeResults = await Promise.all(scopePromises);\n\n // Aggregate all packages from all scopes\n const allPackages = new Map<string, string>();\n for (const { scope, packages } of allScopeResults) {\n for (const [packageName, packagePath] of packages) {\n allPackages.set(packageName, packagePath);\n }\n }\n\n scopeTimer.end(`Scanned ${Object.keys(scopeRoots).length} scope roots, found ${allPackages.size} packages`);\n\n // Match dependencies to available packages\n const matchTimer = PerformanceTimer.start(logger, 'Matching dependencies to packages');\n for (const [depName, depVersion] of Object.entries(dependencies)) {\n logger.debug(`Processing dependency: ${depName}@${depVersion}`);\n\n if (allPackages.has(depName)) {\n const packagePath = allPackages.get(depName)!;\n workspacePackages.set(depName, packagePath);\n logger.verbose(`Found sibling package: ${depName} at ${packagePath}`);\n }\n }\n matchTimer.end(`Matched ${workspacePackages.size} dependencies to workspace packages`);\n\n timer.end(`Found ${workspacePackages.size} packages to link`);\n return workspacePackages;\n};\n\n// Utility to collect all dependencies from package.json files efficiently\nexport const collectAllDependencies = (packageJsonFiles: PackageJsonLocation[]): Record<string, string> => {\n const logger = getLogger();\n const timer = PerformanceTimer.start(logger, 'Collecting all dependencies');\n\n const allDependencies: Record<string, string> = {};\n for (const { packageJson } of packageJsonFiles) {\n Object.assign(allDependencies, packageJson.dependencies);\n Object.assign(allDependencies, packageJson.devDependencies);\n Object.assign(allDependencies, packageJson.peerDependencies);\n }\n\n timer.end(`Collected ${Object.keys(allDependencies).length} unique dependencies`);\n return allDependencies;\n};\n\n// Utility to check for file: dependencies\nexport const checkForFileDependencies = (packageJsonFiles: PackageJsonLocation[]): void => {\n const logger = getLogger();\n const timer = PerformanceTimer.start(logger, 'Checking for file: dependencies');\n const filesWithFileDepedencies: Array<{path: string, dependencies: string[]}> = [];\n\n for (const { path: packagePath, packageJson, relativePath } of packageJsonFiles) {\n const fileDeps: string[] = [];\n\n // Check all dependency types for file: paths\n const allDeps = {\n ...packageJson.dependencies,\n ...packageJson.devDependencies,\n ...packageJson.peerDependencies\n };\n\n for (const [name, version] of Object.entries(allDeps)) {\n if (version.startsWith('file:')) {\n fileDeps.push(`${name}: ${version}`);\n }\n }\n\n if (fileDeps.length > 0) {\n filesWithFileDepedencies.push({\n path: relativePath,\n dependencies: fileDeps\n });\n }\n }\n\n if (filesWithFileDepedencies.length > 0) {\n logger.warn('⚠️ WARNING: Found file: dependencies that should not be committed:');\n for (const file of filesWithFileDepedencies) {\n logger.warn(` 📄 ${file.path}:`);\n for (const dep of file.dependencies) {\n logger.warn(` - ${dep}`);\n }\n }\n logger.warn('');\n logger.warn('💡 Remember to run \"kodrdriv unlink\" before committing to restore registry versions!');\n logger.warn(' Or add a pre-commit hook to prevent accidental commits of linked dependencies.');\n }\n\n timer.end(`Checked ${packageJsonFiles.length} files, found ${filesWithFileDepedencies.length} with file: dependencies`);\n};\n"],"names":["PerformanceTimer","start","logger","operation","verbose","end","duration","Date","now","startTime","EXCLUDED_DIRECTORIES","batchReadPackageJsonFiles","packageJsonPaths","storage","rootDir","getLogger","timer","length","readPromises","map","packageJsonPath","packageJsonContent","readFile","parsed","safeJsonParse","packageJson","validatePackageJson","relativePath","path","relative","dirname","error","debug","message","results","Promise","all","validResults","filter","result","findAllPackageJsonFiles","scanForPaths","currentDir","depth","exists","isDirectory","items","listFiles","foundPaths","includes","join","push","subdirPromises","item","itemPath","subdirResults","subdirPaths","pathsTimer","allPaths","packageJsonFiles"],"mappings":"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"}
|
package/dist/util/safety.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import path__default from 'path';
|
|
2
2
|
import { getLogger } from '../logging.js';
|
|
3
3
|
import { safeJsonParse, validatePackageJson } from './validation.js';
|
|
4
4
|
|
|
@@ -30,12 +30,12 @@ const findAllPackageJsonFiles = async (rootDir, storage)=>{
|
|
|
30
30
|
const items = await storage.listFiles(currentDir);
|
|
31
31
|
// Check for package.json in current directory
|
|
32
32
|
if (items.includes('package.json')) {
|
|
33
|
-
const packageJsonPath =
|
|
33
|
+
const packageJsonPath = path__default.join(currentDir, 'package.json');
|
|
34
34
|
try {
|
|
35
35
|
const packageJsonContent = await storage.readFile(packageJsonPath, 'utf-8');
|
|
36
36
|
const parsed = safeJsonParse(packageJsonContent, packageJsonPath);
|
|
37
37
|
const packageJson = validatePackageJson(parsed, packageJsonPath);
|
|
38
|
-
const relativePath =
|
|
38
|
+
const relativePath = path__default.relative(rootDir, currentDir);
|
|
39
39
|
packageJsonFiles.push({
|
|
40
40
|
path: packageJsonPath,
|
|
41
41
|
packageJson,
|
|
@@ -51,7 +51,7 @@ const findAllPackageJsonFiles = async (rootDir, storage)=>{
|
|
|
51
51
|
if (EXCLUDED_DIRECTORIES.includes(item)) {
|
|
52
52
|
continue;
|
|
53
53
|
}
|
|
54
|
-
const itemPath =
|
|
54
|
+
const itemPath = path__default.join(currentDir, item);
|
|
55
55
|
try {
|
|
56
56
|
if (await storage.isDirectory(itemPath)) {
|
|
57
57
|
await scanDirectory(itemPath, depth + 1);
|