@foss.global/codefeed 1.6.3 → 1.6.5

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.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@foss.global/codefeed',
6
- version: '1.6.3',
6
+ version: '1.6.5',
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=
@@ -28,4 +28,5 @@ export declare class CodeFeed {
28
28
  private fetchTags;
29
29
  private fetchRecentCommitsForRepo;
30
30
  fetchAllCommitsFromInstance(): Promise<plugins.interfaces.ICommitResult[]>;
31
+ fetchFunction(urlArg: string, optionsArg: RequestInit): Promise<Response>;
31
32
  }
package/dist_ts/index.js CHANGED
@@ -6,19 +6,19 @@ export class CodeFeed {
6
6
  this.baseUrl = baseUrl;
7
7
  this.token = token;
8
8
  this.lastRunTimestamp =
9
- lastRunTimestamp || new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString();
9
+ lastRunTimestamp || new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString();
10
10
  console.log('CodeFeed initialized with last run timestamp:', this.lastRunTimestamp);
11
11
  }
12
12
  /**
13
13
  * Load the changelog directly from the Gitea repository.
14
14
  */
15
15
  async loadChangelogFromRepo(owner, repo) {
16
- const url = `${this.baseUrl}/api/v1/repos/${owner}/${repo}/contents/changelog.md`;
16
+ const url = `/api/v1/repos/${owner}/${repo}/contents/changelog.md`;
17
17
  const headers = {};
18
18
  if (this.token) {
19
19
  headers['Authorization'] = `token ${this.token}`;
20
20
  }
21
- const response = await fetch(url, { headers });
21
+ const response = await this.fetchFunction(url, { headers });
22
22
  if (!response.ok) {
23
23
  console.error(`Could not fetch CHANGELOG.md from ${owner}/${repo}: ${response.status} ${response.statusText}`);
24
24
  this.changelogContent = '';
@@ -63,8 +63,8 @@ export class CodeFeed {
63
63
  return changelogLines.join('\n').trim();
64
64
  }
65
65
  async fetchAllOrganizations() {
66
- const url = `${this.baseUrl}/api/v1/orgs`;
67
- const response = await fetch(url, {
66
+ const url = `/api/v1/orgs`;
67
+ const response = await this.fetchFunction(url, {
68
68
  headers: this.token ? { Authorization: `token ${this.token}` } : {},
69
69
  });
70
70
  if (!response.ok) {
@@ -76,15 +76,15 @@ export class CodeFeed {
76
76
  async fetchOrgRssFeed(optionsArg) {
77
77
  let rssUrl;
78
78
  if (optionsArg.orgName && !optionsArg.repoName) {
79
- rssUrl = `${this.baseUrl}/${optionsArg.orgName}.atom`;
79
+ rssUrl = `/${optionsArg.orgName}.atom`;
80
80
  }
81
81
  else if (optionsArg.orgName && optionsArg.repoName) {
82
- rssUrl = `${this.baseUrl}/${optionsArg.orgName}/${optionsArg.repoName}.atom`;
82
+ rssUrl = `/${optionsArg.orgName}/${optionsArg.repoName}.atom`;
83
83
  }
84
84
  else {
85
85
  throw new Error('Invalid arguments provided to fetchOrgRssFeed.');
86
86
  }
87
- const response = await fetch(rssUrl);
87
+ const response = await this.fetchFunction(rssUrl, {});
88
88
  if (!response.ok) {
89
89
  throw new Error(`Failed to fetch RSS feed for organization ${optionsArg.orgName}/${optionsArg.repoName}: ${response.statusText}`);
90
90
  }
@@ -103,10 +103,8 @@ export class CodeFeed {
103
103
  let page = 1;
104
104
  const allRepos = [];
105
105
  while (true) {
106
- const url = new URL(`${this.baseUrl}/api/v1/repos/search`);
107
- url.searchParams.set('limit', '50');
108
- url.searchParams.set('page', page.toString());
109
- const resp = await fetch(url.href, {
106
+ const url = `/api/v1/repos/search?limit=50&page=${page.toString()}`;
107
+ const resp = await this.fetchFunction(url, {
110
108
  headers: this.token ? { Authorization: `token ${this.token}` } : {},
111
109
  });
112
110
  if (!resp.ok) {
@@ -125,14 +123,12 @@ export class CodeFeed {
125
123
  let page = 1;
126
124
  const tags = [];
127
125
  while (true) {
128
- const url = new URL(`${this.baseUrl}/api/v1/repos/${owner}/${repo}/tags`);
129
- url.searchParams.set('limit', '50');
130
- url.searchParams.set('page', page.toString());
131
- const resp = await fetch(url.href, {
126
+ const url = `/api/v1/repos/${owner}/${repo}/tags?limit=50&page=${page.toString()}`;
127
+ const resp = await this.fetchFunction(url, {
132
128
  headers: this.token ? { Authorization: `token ${this.token}` } : {},
133
129
  });
134
130
  if (!resp.ok) {
135
- console.error(`Failed to fetch tags for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url.href}`);
131
+ console.error(`Failed to fetch tags for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url}`);
136
132
  throw new Error(`Failed to fetch tags for ${owner}/${repo}: ${resp.statusText}`);
137
133
  }
138
134
  const data = await resp.json();
@@ -151,18 +147,16 @@ export class CodeFeed {
151
147
  return taggedCommitShas;
152
148
  }
153
149
  async fetchRecentCommitsForRepo(owner, repo) {
154
- const twentyFourHoursAgo = new Date(Date.now() - 24 * 60 * 60 * 1000);
150
+ const commitTimeframe = new Date(Date.now() - (7 * 24 * 60 * 60 * 1000));
155
151
  let page = 1;
156
152
  const recentCommits = [];
157
153
  while (true) {
158
- const url = new URL(`${this.baseUrl}/api/v1/repos/${owner}/${repo}/commits`);
159
- url.searchParams.set('limit', '50');
160
- url.searchParams.set('page', page.toString());
161
- const resp = await fetch(url.href, {
154
+ const url = `/api/v1/repos/${owner}/${repo}/commits?limit=50&page=${page.toString()}`;
155
+ const resp = await this.fetchFunction(url, {
162
156
  headers: this.token ? { Authorization: `token ${this.token}` } : {},
163
157
  });
164
158
  if (!resp.ok) {
165
- console.error(`Failed to fetch commits for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url.href}`);
159
+ console.error(`Failed to fetch commits for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url}`);
166
160
  throw new Error(`Failed to fetch commits for ${owner}/${repo}: ${resp.statusText}`);
167
161
  }
168
162
  const data = await resp.json();
@@ -171,7 +165,7 @@ export class CodeFeed {
171
165
  }
172
166
  for (const commit of data) {
173
167
  const commitDate = new Date(commit.commit.author.date);
174
- if (commitDate > twentyFourHoursAgo) {
168
+ if (commitDate > commitTimeframe) {
175
169
  recentCommits.push(commit);
176
170
  }
177
171
  else {
@@ -293,5 +287,9 @@ export class CodeFeed {
293
287
  }
294
288
  return allCommits;
295
289
  }
290
+ async fetchFunction(urlArg, optionsArg) {
291
+ const response = await fetch(`${this.baseUrl}${urlArg}`, optionsArg);
292
+ return response;
293
+ }
296
294
  }
297
- //# 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",
3
+ "version": "1.6.5",
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": {
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@foss.global/codefeed',
6
- version: '1.6.3',
6
+ version: '1.6.5',
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
@@ -12,7 +12,7 @@ export class CodeFeed {
12
12
  this.baseUrl = baseUrl;
13
13
  this.token = token;
14
14
  this.lastRunTimestamp =
15
- lastRunTimestamp || new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString();
15
+ lastRunTimestamp || new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString();
16
16
  console.log('CodeFeed initialized with last run timestamp:', this.lastRunTimestamp);
17
17
  }
18
18
 
@@ -20,13 +20,13 @@ export class CodeFeed {
20
20
  * Load the changelog directly from the Gitea repository.
21
21
  */
22
22
  private async loadChangelogFromRepo(owner: string, repo: string): Promise<void> {
23
- const url = `${this.baseUrl}/api/v1/repos/${owner}/${repo}/contents/changelog.md`;
23
+ const url = `/api/v1/repos/${owner}/${repo}/contents/changelog.md`;
24
24
  const headers: Record<string, string> = {};
25
25
  if (this.token) {
26
26
  headers['Authorization'] = `token ${this.token}`;
27
27
  }
28
28
 
29
- const response = await fetch(url, { headers });
29
+ const response = await this.fetchFunction(url, { headers });
30
30
 
31
31
  if (!response.ok) {
32
32
  console.error(
@@ -80,8 +80,8 @@ export class CodeFeed {
80
80
  }
81
81
 
82
82
  private async fetchAllOrganizations(): Promise<string[]> {
83
- const url = `${this.baseUrl}/api/v1/orgs`;
84
- const response = await fetch(url, {
83
+ const url = `/api/v1/orgs`;
84
+ const response = await this.fetchFunction(url, {
85
85
  headers: this.token ? { Authorization: `token ${this.token}` } : {},
86
86
  });
87
87
 
@@ -99,14 +99,14 @@ export class CodeFeed {
99
99
  }): Promise<any[]> {
100
100
  let rssUrl: string;
101
101
  if (optionsArg.orgName && !optionsArg.repoName) {
102
- rssUrl = `${this.baseUrl}/${optionsArg.orgName}.atom`;
102
+ rssUrl = `/${optionsArg.orgName}.atom`;
103
103
  } else if (optionsArg.orgName && optionsArg.repoName) {
104
- rssUrl = `${this.baseUrl}/${optionsArg.orgName}/${optionsArg.repoName}.atom`;
104
+ rssUrl = `/${optionsArg.orgName}/${optionsArg.repoName}.atom`;
105
105
  } else {
106
106
  throw new Error('Invalid arguments provided to fetchOrgRssFeed.');
107
107
  }
108
108
 
109
- const response = await fetch(rssUrl);
109
+ const response = await this.fetchFunction(rssUrl, {});
110
110
  if (!response.ok) {
111
111
  throw new Error(
112
112
  `Failed to fetch RSS feed for organization ${optionsArg.orgName}/${optionsArg.repoName}: ${response.statusText}`
@@ -135,11 +135,9 @@ export class CodeFeed {
135
135
  const allRepos: plugins.interfaces.IRepository[] = [];
136
136
 
137
137
  while (true) {
138
- const url = new URL(`${this.baseUrl}/api/v1/repos/search`);
139
- url.searchParams.set('limit', '50');
140
- url.searchParams.set('page', page.toString());
138
+ const url = `/api/v1/repos/search?limit=50&page=${page.toString()}`;
141
139
 
142
- const resp = await fetch(url.href, {
140
+ const resp = await this.fetchFunction(url, {
143
141
  headers: this.token ? { Authorization: `token ${this.token}` } : {},
144
142
  });
145
143
 
@@ -164,17 +162,15 @@ export class CodeFeed {
164
162
  const tags: plugins.interfaces.ITag[] = [];
165
163
 
166
164
  while (true) {
167
- const url = new URL(`${this.baseUrl}/api/v1/repos/${owner}/${repo}/tags`);
168
- url.searchParams.set('limit', '50');
169
- url.searchParams.set('page', page.toString());
165
+ const url = `/api/v1/repos/${owner}/${repo}/tags?limit=50&page=${page.toString()}`;
170
166
 
171
- const resp = await fetch(url.href, {
167
+ const resp = await this.fetchFunction(url, {
172
168
  headers: this.token ? { Authorization: `token ${this.token}` } : {},
173
169
  });
174
170
 
175
171
  if (!resp.ok) {
176
172
  console.error(
177
- `Failed to fetch tags for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url.href}`
173
+ `Failed to fetch tags for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url}`
178
174
  );
179
175
  throw new Error(`Failed to fetch tags for ${owner}/${repo}: ${resp.statusText}`);
180
176
  }
@@ -202,22 +198,20 @@ export class CodeFeed {
202
198
  owner: string,
203
199
  repo: string
204
200
  ): Promise<plugins.interfaces.ICommit[]> {
205
- const twentyFourHoursAgo = new Date(Date.now() - 24 * 60 * 60 * 1000);
201
+ const commitTimeframe = new Date(Date.now() - (7 * 24 * 60 * 60 * 1000));
206
202
  let page = 1;
207
203
  const recentCommits: plugins.interfaces.ICommit[] = [];
208
204
 
209
205
  while (true) {
210
- const url = new URL(`${this.baseUrl}/api/v1/repos/${owner}/${repo}/commits`);
211
- url.searchParams.set('limit', '50');
212
- url.searchParams.set('page', page.toString());
206
+ const url = `/api/v1/repos/${owner}/${repo}/commits?limit=50&page=${page.toString()}`;
213
207
 
214
- const resp = await fetch(url.href, {
208
+ const resp = await this.fetchFunction(url, {
215
209
  headers: this.token ? { Authorization: `token ${this.token}` } : {},
216
210
  });
217
211
 
218
212
  if (!resp.ok) {
219
213
  console.error(
220
- `Failed to fetch commits for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url.href}`
214
+ `Failed to fetch commits for ${owner}/${repo}: ${resp.status} ${resp.statusText} at ${url}`
221
215
  );
222
216
  throw new Error(`Failed to fetch commits for ${owner}/${repo}: ${resp.statusText}`);
223
217
  }
@@ -229,7 +223,7 @@ export class CodeFeed {
229
223
 
230
224
  for (const commit of data) {
231
225
  const commitDate = new Date(commit.commit.author.date);
232
- if (commitDate > twentyFourHoursAgo) {
226
+ if (commitDate > commitTimeframe) {
233
227
  recentCommits.push(commit);
234
228
  } else {
235
229
  return recentCommits;
@@ -369,4 +363,9 @@ export class CodeFeed {
369
363
 
370
364
  return allCommits;
371
365
  }
366
+
367
+ public async fetchFunction(urlArg: string, optionsArg: RequestInit): Promise<Response> {
368
+ const response = await fetch(`${this.baseUrl}${urlArg}`, optionsArg);
369
+ return response;
370
+ }
372
371
  }