@foss.global/codefeed 1.6.2 → 1.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +41 -32
- package/package.json +1 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/index.ts +68 -42
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@foss.global/codefeed',
|
|
6
|
-
version: '1.6.
|
|
6
|
+
version: '1.6.4',
|
|
7
7
|
description: 'The @foss.global/codefeed module is designed for generating feeds from Gitea repositories, enhancing development workflows by processing commit data and repository activities.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx1QkFBdUI7SUFDN0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLGlMQUFpTDtDQUMvTCxDQUFBIn0=
|
package/dist_ts/index.d.ts
CHANGED
package/dist_ts/index.js
CHANGED
|
@@ -5,19 +5,20 @@ export class CodeFeed {
|
|
|
5
5
|
this.smartxmlInstance = new plugins.smartxml.SmartXml();
|
|
6
6
|
this.baseUrl = baseUrl;
|
|
7
7
|
this.token = token;
|
|
8
|
-
this.lastRunTimestamp =
|
|
8
|
+
this.lastRunTimestamp =
|
|
9
|
+
lastRunTimestamp || new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString();
|
|
9
10
|
console.log('CodeFeed initialized with last run timestamp:', this.lastRunTimestamp);
|
|
10
11
|
}
|
|
11
12
|
/**
|
|
12
13
|
* Load the changelog directly from the Gitea repository.
|
|
13
14
|
*/
|
|
14
15
|
async loadChangelogFromRepo(owner, repo) {
|
|
15
|
-
const url =
|
|
16
|
+
const url = `/api/v1/repos/${owner}/${repo}/contents/changelog.md`;
|
|
16
17
|
const headers = {};
|
|
17
18
|
if (this.token) {
|
|
18
19
|
headers['Authorization'] = `token ${this.token}`;
|
|
19
20
|
}
|
|
20
|
-
const response = await
|
|
21
|
+
const response = await this.fetchFunction(url, { headers });
|
|
21
22
|
if (!response.ok) {
|
|
22
23
|
console.error(`Could not fetch CHANGELOG.md from ${owner}/${repo}: ${response.status} ${response.statusText}`);
|
|
23
24
|
this.changelogContent = '';
|
|
@@ -62,8 +63,8 @@ export class CodeFeed {
|
|
|
62
63
|
return changelogLines.join('\n').trim();
|
|
63
64
|
}
|
|
64
65
|
async fetchAllOrganizations() {
|
|
65
|
-
const url =
|
|
66
|
-
const response = await
|
|
66
|
+
const url = `/api/v1/orgs`;
|
|
67
|
+
const response = await this.fetchFunction(url, {
|
|
67
68
|
headers: this.token ? { Authorization: `token ${this.token}` } : {},
|
|
68
69
|
});
|
|
69
70
|
if (!response.ok) {
|
|
@@ -75,15 +76,15 @@ export class CodeFeed {
|
|
|
75
76
|
async fetchOrgRssFeed(optionsArg) {
|
|
76
77
|
let rssUrl;
|
|
77
78
|
if (optionsArg.orgName && !optionsArg.repoName) {
|
|
78
|
-
rssUrl =
|
|
79
|
+
rssUrl = `/${optionsArg.orgName}.atom`;
|
|
79
80
|
}
|
|
80
81
|
else if (optionsArg.orgName && optionsArg.repoName) {
|
|
81
|
-
rssUrl =
|
|
82
|
+
rssUrl = `/${optionsArg.orgName}/${optionsArg.repoName}.atom`;
|
|
82
83
|
}
|
|
83
84
|
else {
|
|
84
85
|
throw new Error('Invalid arguments provided to fetchOrgRssFeed.');
|
|
85
86
|
}
|
|
86
|
-
const response = await
|
|
87
|
+
const response = await this.fetchFunction(rssUrl, {});
|
|
87
88
|
if (!response.ok) {
|
|
88
89
|
throw new Error(`Failed to fetch RSS feed for organization ${optionsArg.orgName}/${optionsArg.repoName}: ${response.statusText}`);
|
|
89
90
|
}
|
|
@@ -102,11 +103,9 @@ export class CodeFeed {
|
|
|
102
103
|
let page = 1;
|
|
103
104
|
const allRepos = [];
|
|
104
105
|
while (true) {
|
|
105
|
-
const url =
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
const resp = await fetch(url.href, {
|
|
109
|
-
headers: this.token ? { 'Authorization': `token ${this.token}` } : {},
|
|
106
|
+
const url = `/api/v1/repos/search?limit=50&page=${page.toString()}`;
|
|
107
|
+
const resp = await this.fetchFunction(url, {
|
|
108
|
+
headers: this.token ? { Authorization: `token ${this.token}` } : {},
|
|
110
109
|
});
|
|
111
110
|
if (!resp.ok) {
|
|
112
111
|
throw new Error(`Failed to fetch repositories: ${resp.statusText}`);
|
|
@@ -124,14 +123,12 @@ export class CodeFeed {
|
|
|
124
123
|
let page = 1;
|
|
125
124
|
const tags = [];
|
|
126
125
|
while (true) {
|
|
127
|
-
const url =
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
const resp = await fetch(url.href, {
|
|
131
|
-
headers: this.token ? { 'Authorization': `token ${this.token}` } : {},
|
|
126
|
+
const url = `/api/v1/repos/${owner}/${repo}/tags?limit=50&page=${page.toString()}`;
|
|
127
|
+
const resp = await this.fetchFunction(url, {
|
|
128
|
+
headers: this.token ? { Authorization: `token ${this.token}` } : {},
|
|
132
129
|
});
|
|
133
130
|
if (!resp.ok) {
|
|
134
|
-
console.error(`Failed to fetch tags for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url
|
|
131
|
+
console.error(`Failed to fetch tags for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url}`);
|
|
135
132
|
throw new Error(`Failed to fetch tags for ${owner}/${repo}: ${resp.statusText}`);
|
|
136
133
|
}
|
|
137
134
|
const data = await resp.json();
|
|
@@ -154,14 +151,12 @@ export class CodeFeed {
|
|
|
154
151
|
let page = 1;
|
|
155
152
|
const recentCommits = [];
|
|
156
153
|
while (true) {
|
|
157
|
-
const url =
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
const resp = await fetch(url.href, {
|
|
161
|
-
headers: this.token ? { 'Authorization': `token ${this.token}` } : {},
|
|
154
|
+
const url = `/api/v1/repos/${owner}/${repo}/commits?limit=50&page=${page.toString()}`;
|
|
155
|
+
const resp = await this.fetchFunction(url, {
|
|
156
|
+
headers: this.token ? { Authorization: `token ${this.token}` } : {},
|
|
162
157
|
});
|
|
163
158
|
if (!resp.ok) {
|
|
164
|
-
console.error(`Failed to fetch commits for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url
|
|
159
|
+
console.error(`Failed to fetch commits for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url}`);
|
|
165
160
|
throw new Error(`Failed to fetch commits for ${owner}/${repo}: ${resp.statusText}`);
|
|
166
161
|
}
|
|
167
162
|
const data = await resp.json();
|
|
@@ -236,7 +231,7 @@ export class CodeFeed {
|
|
|
236
231
|
commitMessage: c.commit.message,
|
|
237
232
|
tagged: taggedCommitShas.has(c.sha),
|
|
238
233
|
publishedOnNpm: false,
|
|
239
|
-
changelog: undefined
|
|
234
|
+
changelog: undefined,
|
|
240
235
|
};
|
|
241
236
|
return commit;
|
|
242
237
|
});
|
|
@@ -250,16 +245,24 @@ export class CodeFeed {
|
|
|
250
245
|
});
|
|
251
246
|
if (correspondingVersion) {
|
|
252
247
|
commitResult.publishedOnNpm = true;
|
|
253
|
-
const changelogEntry = this.getChangelogForVersion(versionCandidate);
|
|
254
|
-
if (changelogEntry) {
|
|
255
|
-
commitResult.changelog = changelogEntry;
|
|
256
|
-
}
|
|
257
248
|
}
|
|
258
249
|
}
|
|
259
250
|
}
|
|
260
251
|
catch (error) {
|
|
261
252
|
console.error(`Failed to fetch package info for ${org}/${repo}:`, error.message);
|
|
262
253
|
}
|
|
254
|
+
try {
|
|
255
|
+
for (const commitResult of commitResults.filter((c) => c.tagged)) {
|
|
256
|
+
const versionCandidate = commitResult.commitMessage.replace('\n', '').trim();
|
|
257
|
+
const changelogEntry = this.getChangelogForVersion(versionCandidate);
|
|
258
|
+
if (changelogEntry) {
|
|
259
|
+
commitResult.changelog = changelogEntry;
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
catch (error) {
|
|
264
|
+
console.error(`Failed to fetch changelog info for ${org}/${repo}:`, error.message);
|
|
265
|
+
}
|
|
263
266
|
}
|
|
264
267
|
allCommits.push(...commitResults);
|
|
265
268
|
}
|
|
@@ -269,7 +272,9 @@ export class CodeFeed {
|
|
|
269
272
|
}
|
|
270
273
|
}
|
|
271
274
|
console.log(`Processed ${allCommits.length} commits in total.`);
|
|
272
|
-
allCommits = allCommits
|
|
275
|
+
allCommits = allCommits
|
|
276
|
+
.filter((commitArg) => commitArg.tagged)
|
|
277
|
+
.sort((a, b) => b.timestamp.localeCompare(a.timestamp));
|
|
273
278
|
console.log(`Filtered to ${allCommits.length} commits with tagged statuses.`);
|
|
274
279
|
for (const c of allCommits) {
|
|
275
280
|
console.log(` ==========================================================================
|
|
@@ -282,5 +287,9 @@ export class CodeFeed {
|
|
|
282
287
|
}
|
|
283
288
|
return allCommits;
|
|
284
289
|
}
|
|
290
|
+
async fetchFunction(urlArg, optionsArg) {
|
|
291
|
+
const response = await fetch(`${this.baseUrl}${urlArg}`, optionsArg);
|
|
292
|
+
return response;
|
|
293
|
+
}
|
|
285
294
|
}
|
|
286
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":"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"}
|
|
295
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@foss.global/codefeed",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.4",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The @foss.global/codefeed module is designed for generating feeds from Gitea repositories, enhancing development workflows by processing commit data and repository activities.",
|
|
6
6
|
"exports": {
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@foss.global/codefeed',
|
|
6
|
-
version: '1.6.
|
|
6
|
+
version: '1.6.4',
|
|
7
7
|
description: 'The @foss.global/codefeed module is designed for generating feeds from Gitea repositories, enhancing development workflows by processing commit data and repository activities.'
|
|
8
8
|
}
|
package/ts/index.ts
CHANGED
|
@@ -11,7 +11,8 @@ export class CodeFeed {
|
|
|
11
11
|
constructor(baseUrl: string, token?: string, lastRunTimestamp?: string) {
|
|
12
12
|
this.baseUrl = baseUrl;
|
|
13
13
|
this.token = token;
|
|
14
|
-
this.lastRunTimestamp =
|
|
14
|
+
this.lastRunTimestamp =
|
|
15
|
+
lastRunTimestamp || new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString();
|
|
15
16
|
console.log('CodeFeed initialized with last run timestamp:', this.lastRunTimestamp);
|
|
16
17
|
}
|
|
17
18
|
|
|
@@ -19,16 +20,18 @@ export class CodeFeed {
|
|
|
19
20
|
* Load the changelog directly from the Gitea repository.
|
|
20
21
|
*/
|
|
21
22
|
private async loadChangelogFromRepo(owner: string, repo: string): Promise<void> {
|
|
22
|
-
const url =
|
|
23
|
+
const url = `/api/v1/repos/${owner}/${repo}/contents/changelog.md`;
|
|
23
24
|
const headers: Record<string, string> = {};
|
|
24
25
|
if (this.token) {
|
|
25
26
|
headers['Authorization'] = `token ${this.token}`;
|
|
26
27
|
}
|
|
27
28
|
|
|
28
|
-
const response = await
|
|
29
|
+
const response = await this.fetchFunction(url, { headers });
|
|
29
30
|
|
|
30
31
|
if (!response.ok) {
|
|
31
|
-
console.error(
|
|
32
|
+
console.error(
|
|
33
|
+
`Could not fetch CHANGELOG.md from ${owner}/${repo}: ${response.status} ${response.statusText}`
|
|
34
|
+
);
|
|
32
35
|
this.changelogContent = '';
|
|
33
36
|
return;
|
|
34
37
|
}
|
|
@@ -77,8 +80,8 @@ export class CodeFeed {
|
|
|
77
80
|
}
|
|
78
81
|
|
|
79
82
|
private async fetchAllOrganizations(): Promise<string[]> {
|
|
80
|
-
const url =
|
|
81
|
-
const response = await
|
|
83
|
+
const url = `/api/v1/orgs`;
|
|
84
|
+
const response = await this.fetchFunction(url, {
|
|
82
85
|
headers: this.token ? { Authorization: `token ${this.token}` } : {},
|
|
83
86
|
});
|
|
84
87
|
|
|
@@ -91,21 +94,23 @@ export class CodeFeed {
|
|
|
91
94
|
}
|
|
92
95
|
|
|
93
96
|
private async fetchOrgRssFeed(optionsArg: {
|
|
94
|
-
orgName: string
|
|
95
|
-
repoName?: string
|
|
97
|
+
orgName: string;
|
|
98
|
+
repoName?: string;
|
|
96
99
|
}): Promise<any[]> {
|
|
97
100
|
let rssUrl: string;
|
|
98
101
|
if (optionsArg.orgName && !optionsArg.repoName) {
|
|
99
|
-
rssUrl =
|
|
102
|
+
rssUrl = `/${optionsArg.orgName}.atom`;
|
|
100
103
|
} else if (optionsArg.orgName && optionsArg.repoName) {
|
|
101
|
-
rssUrl =
|
|
104
|
+
rssUrl = `/${optionsArg.orgName}/${optionsArg.repoName}.atom`;
|
|
102
105
|
} else {
|
|
103
106
|
throw new Error('Invalid arguments provided to fetchOrgRssFeed.');
|
|
104
107
|
}
|
|
105
108
|
|
|
106
|
-
const response = await
|
|
109
|
+
const response = await this.fetchFunction(rssUrl, {});
|
|
107
110
|
if (!response.ok) {
|
|
108
|
-
throw new Error(
|
|
111
|
+
throw new Error(
|
|
112
|
+
`Failed to fetch RSS feed for organization ${optionsArg.orgName}/${optionsArg.repoName}: ${response.statusText}`
|
|
113
|
+
);
|
|
109
114
|
}
|
|
110
115
|
|
|
111
116
|
const rssText = await response.text();
|
|
@@ -114,8 +119,8 @@ export class CodeFeed {
|
|
|
114
119
|
}
|
|
115
120
|
|
|
116
121
|
private async hasNewActivity(optionsArg: {
|
|
117
|
-
orgName: string
|
|
118
|
-
repoName?: string
|
|
122
|
+
orgName: string;
|
|
123
|
+
repoName?: string;
|
|
119
124
|
}): Promise<boolean> {
|
|
120
125
|
const entries = await this.fetchOrgRssFeed(optionsArg);
|
|
121
126
|
|
|
@@ -130,12 +135,10 @@ export class CodeFeed {
|
|
|
130
135
|
const allRepos: plugins.interfaces.IRepository[] = [];
|
|
131
136
|
|
|
132
137
|
while (true) {
|
|
133
|
-
const url =
|
|
134
|
-
url.searchParams.set('limit', '50');
|
|
135
|
-
url.searchParams.set('page', page.toString());
|
|
138
|
+
const url = `/api/v1/repos/search?limit=50&page=${page.toString()}`;
|
|
136
139
|
|
|
137
|
-
const resp = await
|
|
138
|
-
headers: this.token ? {
|
|
140
|
+
const resp = await this.fetchFunction(url, {
|
|
141
|
+
headers: this.token ? { Authorization: `token ${this.token}` } : {},
|
|
139
142
|
});
|
|
140
143
|
|
|
141
144
|
if (!resp.ok) {
|
|
@@ -159,16 +162,16 @@ export class CodeFeed {
|
|
|
159
162
|
const tags: plugins.interfaces.ITag[] = [];
|
|
160
163
|
|
|
161
164
|
while (true) {
|
|
162
|
-
const url =
|
|
163
|
-
url.searchParams.set('limit', '50');
|
|
164
|
-
url.searchParams.set('page', page.toString());
|
|
165
|
+
const url = `/api/v1/repos/${owner}/${repo}/tags?limit=50&page=${page.toString()}`;
|
|
165
166
|
|
|
166
|
-
const resp = await
|
|
167
|
-
headers: this.token ? {
|
|
167
|
+
const resp = await this.fetchFunction(url, {
|
|
168
|
+
headers: this.token ? { Authorization: `token ${this.token}` } : {},
|
|
168
169
|
});
|
|
169
170
|
|
|
170
171
|
if (!resp.ok) {
|
|
171
|
-
console.error(
|
|
172
|
+
console.error(
|
|
173
|
+
`Failed to fetch tags for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url}`
|
|
174
|
+
);
|
|
172
175
|
throw new Error(`Failed to fetch tags for ${owner}/${repo}: ${resp.statusText}`);
|
|
173
176
|
}
|
|
174
177
|
|
|
@@ -191,22 +194,25 @@ export class CodeFeed {
|
|
|
191
194
|
return taggedCommitShas;
|
|
192
195
|
}
|
|
193
196
|
|
|
194
|
-
private async fetchRecentCommitsForRepo(
|
|
197
|
+
private async fetchRecentCommitsForRepo(
|
|
198
|
+
owner: string,
|
|
199
|
+
repo: string
|
|
200
|
+
): Promise<plugins.interfaces.ICommit[]> {
|
|
195
201
|
const twentyFourHoursAgo = new Date(Date.now() - 24 * 60 * 60 * 1000);
|
|
196
202
|
let page = 1;
|
|
197
203
|
const recentCommits: plugins.interfaces.ICommit[] = [];
|
|
198
204
|
|
|
199
205
|
while (true) {
|
|
200
|
-
const url =
|
|
201
|
-
url.searchParams.set('limit', '50');
|
|
202
|
-
url.searchParams.set('page', page.toString());
|
|
206
|
+
const url = `/api/v1/repos/${owner}/${repo}/commits?limit=50&page=${page.toString()}`;
|
|
203
207
|
|
|
204
|
-
const resp = await
|
|
205
|
-
headers: this.token ? {
|
|
208
|
+
const resp = await this.fetchFunction(url, {
|
|
209
|
+
headers: this.token ? { Authorization: `token ${this.token}` } : {},
|
|
206
210
|
});
|
|
207
211
|
|
|
208
212
|
if (!resp.ok) {
|
|
209
|
-
console.error(
|
|
213
|
+
console.error(
|
|
214
|
+
`Failed to fetch commits for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url}`
|
|
215
|
+
);
|
|
210
216
|
throw new Error(`Failed to fetch commits for ${owner}/${repo}: ${resp.statusText}`);
|
|
211
217
|
}
|
|
212
218
|
|
|
@@ -265,7 +271,10 @@ export class CodeFeed {
|
|
|
265
271
|
continue;
|
|
266
272
|
}
|
|
267
273
|
} catch (error: any) {
|
|
268
|
-
console.error(
|
|
274
|
+
console.error(
|
|
275
|
+
`Error fetching activity for repository ${orgName}/${r.name}:`,
|
|
276
|
+
error.message
|
|
277
|
+
);
|
|
269
278
|
continue;
|
|
270
279
|
}
|
|
271
280
|
|
|
@@ -286,12 +295,14 @@ export class CodeFeed {
|
|
|
286
295
|
org,
|
|
287
296
|
repo,
|
|
288
297
|
timestamp: c.commit.author.date,
|
|
289
|
-
prettyAgoTime: plugins.smarttime.getMilliSecondsAsHumanReadableAgoTime(
|
|
298
|
+
prettyAgoTime: plugins.smarttime.getMilliSecondsAsHumanReadableAgoTime(
|
|
299
|
+
new Date(c.commit.author.date).getTime()
|
|
300
|
+
),
|
|
290
301
|
hash: c.sha,
|
|
291
302
|
commitMessage: c.commit.message,
|
|
292
303
|
tagged: taggedCommitShas.has(c.sha),
|
|
293
304
|
publishedOnNpm: false,
|
|
294
|
-
changelog: undefined
|
|
305
|
+
changelog: undefined,
|
|
295
306
|
};
|
|
296
307
|
return commit;
|
|
297
308
|
});
|
|
@@ -306,15 +317,23 @@ export class CodeFeed {
|
|
|
306
317
|
});
|
|
307
318
|
if (correspondingVersion) {
|
|
308
319
|
commitResult.publishedOnNpm = true;
|
|
309
|
-
const changelogEntry = this.getChangelogForVersion(versionCandidate);
|
|
310
|
-
if (changelogEntry) {
|
|
311
|
-
commitResult.changelog = changelogEntry;
|
|
312
|
-
}
|
|
313
320
|
}
|
|
314
321
|
}
|
|
315
322
|
} catch (error: any) {
|
|
316
323
|
console.error(`Failed to fetch package info for ${org}/${repo}:`, error.message);
|
|
317
324
|
}
|
|
325
|
+
|
|
326
|
+
try {
|
|
327
|
+
for (const commitResult of commitResults.filter((c) => c.tagged)) {
|
|
328
|
+
const versionCandidate = commitResult.commitMessage.replace('\n', '').trim();
|
|
329
|
+
const changelogEntry = this.getChangelogForVersion(versionCandidate);
|
|
330
|
+
if (changelogEntry) {
|
|
331
|
+
commitResult.changelog = changelogEntry;
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
} catch (error: any) {
|
|
335
|
+
console.error(`Failed to fetch changelog info for ${org}/${repo}:`, error.message);
|
|
336
|
+
}
|
|
318
337
|
}
|
|
319
338
|
|
|
320
339
|
allCommits.push(...commitResults);
|
|
@@ -326,7 +345,9 @@ export class CodeFeed {
|
|
|
326
345
|
|
|
327
346
|
console.log(`Processed ${allCommits.length} commits in total.`);
|
|
328
347
|
|
|
329
|
-
allCommits = allCommits
|
|
348
|
+
allCommits = allCommits
|
|
349
|
+
.filter((commitArg) => commitArg.tagged)
|
|
350
|
+
.sort((a, b) => b.timestamp.localeCompare(a.timestamp));
|
|
330
351
|
|
|
331
352
|
console.log(`Filtered to ${allCommits.length} commits with tagged statuses.`);
|
|
332
353
|
|
|
@@ -337,9 +358,14 @@ export class CodeFeed {
|
|
|
337
358
|
${c.commitMessage}
|
|
338
359
|
Published on npm: ${c.publishedOnNpm}
|
|
339
360
|
${c.changelog ? `Changelog:\n${c.changelog}\n` : ''}
|
|
340
|
-
`);
|
|
361
|
+
`);
|
|
341
362
|
}
|
|
342
363
|
|
|
343
364
|
return allCommits;
|
|
344
365
|
}
|
|
345
|
-
|
|
366
|
+
|
|
367
|
+
public async fetchFunction(urlArg: string, optionsArg: RequestInit): Promise<Response> {
|
|
368
|
+
const response = await fetch(`${this.baseUrl}${urlArg}`, optionsArg);
|
|
369
|
+
return response;
|
|
370
|
+
}
|
|
371
|
+
}
|