@foss.global/codefeed 1.7.2 → 1.8.0

package/{npmextra.json → .smartconfig.json}

@@ -1,5 +1,5 @@
 {
-  "gitzone": {
+  "@git.zone/cli": {
     "projectType": "npm",
     "module": {
       "githost": "code.foss.global",
@@ -22,10 +22,18 @@
         "activity feed",
         "version control"
       ]
-    }
-  },
-  "npmci": {
-    "npmGlobalTools": [],
-    "npmAccessLevel": "public"
+    },
+    "release": {
+      "targets": {
+        "npm": {
+          "registries": [
+            "https://verdaccio.lossless.digital",
+            "https://registry.npmjs.org"
+          ],
+          "accessLevel": "public"
+        }
+      }
+    },
+    "schemaVersion": 2
   }
-}
+}

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@foss.global/codefeed',
-    version: '1.7.2',
+    version: '1.8.0',
     description: 'The @foss.global/codefeed module is designed for generating feeds from Gitea repositories, enhancing development workflows by processing commit data and repository activities.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx1QkFBdUI7SUFDN0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLGlMQUFpTDtDQUMvTCxDQUFBIn0=

package/dist_ts/index.d.ts

@@ -5,10 +5,11 @@ export declare class CodeFeed {
     private lastRunTimestamp;
     private pageLimit;
     private changelogContent;
-    private npmRegistry;
+    private npmRegistry?;
     private enableCache;
     private cacheWindowMs?;
     private cache;
+    private provider;
     private enableNpmCheck;
     private enableTaggedOnly;
     private orgAllowlist?;
@@ -17,18 +18,7 @@ export declare class CodeFeed {
     private repoDenylist?;
     private untilTimestamp?;
     private verbose?;
-    constructor(baseUrl: string, token?: string, lastRunTimestamp?: string, options?: {
-        enableCache?: boolean;
-        cacheWindowMs?: number;
-        enableNpmCheck?: boolean;
-        taggedOnly?: boolean;
-        orgAllowlist?: string[];
-        orgDenylist?: string[];
-        repoAllowlist?: string[];
-        repoDenylist?: string[];
-        untilTimestamp?: string;
-        verbose?: boolean;
-    });
+    constructor(baseUrl: string, token?: string, lastRunTimestamp?: string, options?: plugins.interfaces.ICodeFeedOptions);
     /**
      * Fetch all new commits (since lastRunTimestamp) across all orgs and repos.
      */
@@ -36,6 +26,9 @@ export declare class CodeFeed {
     /**
      * Load the changelog directly from the Gitea repository.
      */
+    private createDefaultProvider;
+    private createAuthHeaders;
+    private getNpmRegistry;
     private loadChangelogFromRepo;
     /**
      * Parse the changelog to find the entry for a given version.
@@ -51,6 +44,7 @@ export declare class CodeFeed {
      * Fetch all tags for a given repo and return the set of tagged commit SHAs
      */
     private fetchTags;
+    private fetchLatestCommitForRepo;
     private fetchAllOrganizations;
     private fetchRepositoriesForOrg;
     private fetchRecentCommitsForRepo;

package/dist_ts/index.js

@@ -27,8 +27,7 @@ export class CodeFeed {
         this.untilTimestamp = options?.untilTimestamp;
         this.verbose = options?.verbose ?? false;
         this.cache = [];
-        // npm registry instance for version lookups
-        this.npmRegistry = new plugins.smartnpm.NpmRegistry();
+        this.provider = options?.provider ?? this.createDefaultProvider();
         console.log('CodeFeed initialized with last run timestamp:', this.lastRunTimestamp);
     }
     /**
@@ -45,7 +44,7 @@ export class CodeFeed {
             effectiveSince = this.cache.reduce((max, c) => (c.timestamp > max ? c.timestamp : max), effectiveSince);
         }
         // 1) get all organizations
-        let orgs = await this.fetchAllOrganizations();
+        let orgs = await this.provider.listOrganizations();
         // apply allow/deny filters
         if (this.orgAllowlist && this.orgAllowlist.length > 0) {
             orgs = orgs.filter((o) => this.orgAllowlist.includes(o));
@@ -54,7 +53,7 @@ export class CodeFeed {
             orgs = orgs.filter((o) => !this.orgDenylist.includes(o));
         }
         // 2) fetch repos per org in parallel
-        const repoLists = await Promise.all(orgs.map((org) => stack.getNonExclusiveExecutionSlot(() => this.fetchRepositoriesForOrg(org))));
+        const repoLists = await Promise.all(orgs.map((org) => stack.getNonExclusiveExecutionSlot(() => this.provider.listRepositoriesForOrg(org))));
         // flatten to [{ owner, name }]
         let allRepos = orgs.flatMap((org, i) => repoLists[i].map((r) => ({ owner: org, name: r.name })));
         // apply repo allow/deny filters using slug "org/repo"
@@ -69,20 +68,14 @@ export class CodeFeed {
         // 3) probe latest commit per repo and fetch full list only if new commits exist
         const commitJobs = allRepos.map(({ owner, name }) => stack.getNonExclusiveExecutionSlot(async () => {
             try {
-                // 3a) Probe the most recent commit (limit=1)
-                const probeResp = await this.fetchFunction(`/api/v1/repos/${owner}/${name}/commits?limit=1`, { headers: this.token ? { Authorization: `token ${this.token}` } : {} });
-                if (!probeResp.ok) {
-                    throw new Error(`Probe failed for ${owner}/${name}: ${probeResp.statusText}`);
-                }
-                const probeData = await probeResp.json();
+                const latestCommit = await this.provider.getLatestCommitForRepo(owner, name);
                 // If no commits or no new commits since last run, skip
-                if (probeData.length === 0 ||
-                    new Date(probeData[0].commit.author.date).getTime() <=
-                        new Date(effectiveSince).getTime()) {
+                if (!latestCommit ||
+                    new Date(latestCommit.commit.author.date).getTime() <= new Date(effectiveSince).getTime()) {
                     return { owner, name, commits: [] };
                 }
                 // 3b) Fetch commits since last run
-                const commits = await this.fetchRecentCommitsForRepo(owner, name, effectiveSince);
+                const commits = await this.provider.listCommitsForRepo(owner, name, effectiveSince);
                 return { owner, name, commits };
             }
             catch (e) {
@@ -102,12 +95,12 @@ export class CodeFeed {
             }
             reposWithNewCommits++;
             // load changelog for this repo
-            await this.loadChangelogFromRepo(owner, name);
+            this.changelogContent = await this.provider.readChangelogForRepo(owner, name);
             // fetch tags for this repo
             let taggedShas;
             let tagNameBySha;
             try {
-                const tagInfo = await this.fetchTags(owner, name);
+                const tagInfo = await this.provider.listTagsForRepo(owner, name);
                 taggedShas = tagInfo.shas;
                 tagNameBySha = tagInfo.map;
             }
@@ -121,7 +114,8 @@ export class CodeFeed {
             let pkgInfo = null;
             if (hasTaggedCommit && this.enableNpmCheck) {
                 try {
-                    pkgInfo = await this.npmRegistry.getPackageInfo(`@${owner}/${name}`);
+                    const npmRegistry = await this.getNpmRegistry();
+                    pkgInfo = await npmRegistry.getPackageInfo(`@${owner}/${name}`);
                 }
                 catch (e) {
                     console.error(`Failed to fetch package info for ${owner}/${name}:`, e.message);
@@ -211,10 +205,35 @@ export class CodeFeed {
     /**
      * Load the changelog directly from the Gitea repository.
      */
-    async loadChangelogFromRepo(owner, repo) {
+    createDefaultProvider() {
+        return {
+            listOrganizations: () => this.fetchAllOrganizations(),
+            listRepositoriesForOrg: (org) => this.fetchRepositoriesForOrg(org),
+            getLatestCommitForRepo: (owner, repo) => this.fetchLatestCommitForRepo(owner, repo),
+            listCommitsForRepo: (owner, repo, sinceTimestamp) => this.fetchRecentCommitsForRepo(owner, repo, sinceTimestamp),
+            listTagsForRepo: (owner, repo) => this.fetchTags(owner, repo),
+            readChangelogForRepo: async (owner, repo) => {
+                await this.loadChangelogFromRepo(owner, repo);
+                return this.changelogContent;
+            },
+        };
+    }
+    createAuthHeaders() {
         const headers = {};
-        if (this.token)
-            headers['Authorization'] = `token ${this.token}`;
+        if (this.token) {
+            headers.Authorization = `token ${this.token}`;
+        }
+        return headers;
+    }
+    async getNpmRegistry() {
+        if (!this.npmRegistry) {
+            const smartnpm = await plugins.getSmartnpm();
+            this.npmRegistry = new smartnpm.NpmRegistry();
+        }
+        return this.npmRegistry;
+    }
+    async loadChangelogFromRepo(owner, repo) {
+        const headers = this.createAuthHeaders();
         const candidates = [
             'CHANGELOG.md',
             'changelog.md',
@@ -279,7 +298,7 @@ export class CodeFeed {
         while (true) {
             const url = `/api/v1/repos/${owner}/${repo}/tags?limit=${this.pageLimit}&page=${page}`;
             const resp = await this.fetchFunction(url, {
-                headers: this.token ? { Authorization: `token ${this.token}` } : {},
+                headers: this.createAuthHeaders(),
             });
             if (!resp.ok) {
                 console.error(`Failed to fetch tags for ${owner}/${repo}: ${resp.status} ${resp.statusText}`);
@@ -302,8 +321,16 @@ export class CodeFeed {
         }
         return { shas: taggedShas, map: tagNameBySha };
     }
+    async fetchLatestCommitForRepo(owner, repo) {
+        const resp = await this.fetchFunction(`/api/v1/repos/${owner}/${repo}/commits?limit=1`, { headers: this.createAuthHeaders() });
+        if (!resp.ok) {
+            throw new Error(`Probe failed for ${owner}/${repo}: ${resp.statusText}`);
+        }
+        const data = await resp.json();
+        return data[0];
+    }
     async fetchAllOrganizations() {
-        const headers = this.token ? { Authorization: `token ${this.token}` } : {};
+        const headers = this.createAuthHeaders();
         let page = 1;
         const orgs = [];
         while (true) {
@@ -322,7 +349,7 @@ export class CodeFeed {
         return orgs;
     }
     async fetchRepositoriesForOrg(org) {
-        const headers = this.token ? { Authorization: `token ${this.token}` } : {};
+        const headers = this.createAuthHeaders();
         let page = 1;
         const repos = [];
         while (true) {
@@ -342,7 +369,7 @@ export class CodeFeed {
     }
     async fetchRecentCommitsForRepo(owner, repo, sinceTimestamp) {
         const since = sinceTimestamp ?? this.lastRunTimestamp;
-        const headers = this.token ? { Authorization: `token ${this.token}` } : {};
+        const headers = this.createAuthHeaders();
         let page = 1;
         const commits = [];
         while (true) {
@@ -390,4 +417,4 @@ export class CodeFeed {
         throw new Error(`fetchFunction failed after retries for ${urlArg}: ${lastError?.message ?? 'unknown error'}`);
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts/index.ts"],"names":[],"mappings":"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"}

package/dist_ts/interfaces/index.d.ts

@@ -1,3 +1,5 @@
+import type { ICodefeedCommitResult } from '@foss.global/interfaces';
+export type { ICodefeedCommitResult } from '@foss.global/interfaces';
 export interface IRepositoryOwner {
     login: string;
 }
@@ -25,15 +27,30 @@ export interface ITag {
 export interface IRepoSearchResponse {
     data: IRepository[];
 }
-export interface ICommitResult {
-    baseUrl: string;
-    org: string;
-    repo: string;
-    timestamp: string;
-    hash: string;
-    commitMessage: string;
-    tagged: boolean;
-    publishedOnNpm: boolean;
-    prettyAgoTime: string;
-    changelog: string | undefined;
+export interface ICommitResult extends ICodefeedCommitResult {
+}
+export interface ICodeFeedTagInfo {
+    shas: Set<string>;
+    map: Map<string, string>;
+}
+export interface ICodeFeedProvider {
+    listOrganizations(): Promise<string[]>;
+    listRepositoriesForOrg(org: string): Promise<IRepository[]>;
+    getLatestCommitForRepo(owner: string, repo: string): Promise<ICommit | undefined>;
+    listCommitsForRepo(owner: string, repo: string, sinceTimestamp?: string): Promise<ICommit[]>;
+    listTagsForRepo(owner: string, repo: string): Promise<ICodeFeedTagInfo>;
+    readChangelogForRepo(owner: string, repo: string): Promise<string>;
+}
+export interface ICodeFeedOptions {
+    enableCache?: boolean;
+    cacheWindowMs?: number;
+    enableNpmCheck?: boolean;
+    taggedOnly?: boolean;
+    orgAllowlist?: string[];
+    orgDenylist?: string[];
+    repoAllowlist?: string[];
+    repoDenylist?: string[];
+    untilTimestamp?: string;
+    verbose?: boolean;
+    provider?: ICodeFeedProvider;
 }

package/dist_ts/plugins.d.ts

@@ -1,8 +1,7 @@
 import * as interfaces from './interfaces/index.js';
 export { interfaces, };
-import * as qenv from '@push.rocks/qenv';
-import * as smartnpm from '@push.rocks/smartnpm';
-import * as smartxml from '@push.rocks/smartxml';
 import * as smarttime from '@push.rocks/smarttime';
 import * as lik from '@push.rocks/lik';
-export { qenv, smartnpm, smartxml, smarttime, lik, };
+export type TNpmRegistry = import('@push.rocks/smartnpm').NpmRegistry;
+export declare const getSmartnpm: () => Promise<typeof import("@push.rocks/smartnpm")>;
+export { smarttime, lik, };

package/dist_ts/plugins.js

@@ -2,10 +2,8 @@
 import * as interfaces from './interfaces/index.js';
 export { interfaces, };
 // @push.rocks
-import * as qenv from '@push.rocks/qenv';
-import * as smartnpm from '@push.rocks/smartnpm';
-import * as smartxml from '@push.rocks/smartxml';
 import * as smarttime from '@push.rocks/smarttime';
 import * as lik from '@push.rocks/lik';
-export { qenv, smartnpm, smartxml, smarttime, lik, };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsU0FBUztBQUNULE9BQU8sS0FBSyxVQUFVLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxFQUNMLFVBQVUsR0FDWCxDQUFBO0FBRUQsY0FBYztBQUNkLE9BQU8sS0FBSyxJQUFJLE1BQU0sa0JBQWtCLENBQUM7QUFDekMsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEdBQUcsTUFBTSxpQkFBaUIsQ0FBQztBQUV2QyxPQUFPLEVBQ0wsSUFBSSxFQUNKLFFBQVEsRUFDUixRQUFRLEVBQ1IsU0FBUyxFQUNULEdBQUcsR0FDSixDQUFBIn0=
+export const getSmartnpm = async () => import('@push.rocks/smartnpm');
+export { smarttime, lik, };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsU0FBUztBQUNULE9BQU8sS0FBSyxVQUFVLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxFQUNMLFVBQVUsR0FDWCxDQUFBO0FBRUQsY0FBYztBQUNkLE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLEdBQUcsTUFBTSxpQkFBaUIsQ0FBQztBQUl2QyxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsS0FBSyxJQUFJLEVBQUUsQ0FBQyxNQUFNLENBQUMsc0JBQXNCLENBQUMsQ0FBQztBQUV0RSxPQUFPLEVBQ0wsU0FBUyxFQUNULEdBQUcsR0FDSixDQUFBIn0=

package/license.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Task Venture Capital GmbH
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foss.global/codefeed",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "private": false,
   "description": "The @foss.global/codefeed module is designed for generating feeds from Gitea repositories, enhancing development workflows by processing commit data and repository activities.",
   "exports": {
@@ -11,14 +11,14 @@
   "author": "Task Venture Capital GmbH",
   "license": "MIT",
   "devDependencies": {
-    "@git.zone/tsbuild": "^2.6.8",
-    "@git.zone/tsbundle": "^2.5.1",
-    "@git.zone/tsrun": "^1.2.46",
-    "@git.zone/tstest": "^2.3.8",
-    "@push.rocks/tapbundle": "^6.0.3",
-    "@types/node": "^22.15.2"
+    "@git.zone/tsbuild": "^4.4.2",
+    "@git.zone/tsbundle": "^2.11.0",
+    "@git.zone/tsrun": "^2.0.4",
+    "@git.zone/tstest": "^3.6.6",
+    "@types/node": "^26.0.0"
   },
   "dependencies": {
+    "@foss.global/interfaces": "^0.2.0",
     "@push.rocks/lik": "^6.2.2",
     "@push.rocks/qenv": "^6.1.3",
     "@push.rocks/smartnpm": "^2.0.6",
@@ -42,8 +42,9 @@
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
-    "npmextra.json",
-    "readme.md"
+    ".smartconfig.json",
+    "readme.md",
+    "license.md"
   ],
   "keywords": [
     "codefeed",

package/readme.md

@@ -2,12 +2,14 @@
 
 Generate an activity feed from a Gitea instance. Scans orgs and repos, retrieves commits since a configurable timestamp, enriches with tags, optional npm publish detection, and CHANGELOG snippets.
 
+## Issue Reporting and Security
+
+For reporting bugs, issues, or security vulnerabilities, please visit [community.foss.global/](https://community.foss.global/). This is the central community hub for all issue reporting. Developers who sign and comply with our contribution agreement and go through identification can also get a [code.foss.global/](https://code.foss.global/) account to submit Pull Requests directly.
+
 ## Install
 
 ```bash
 pnpm add @foss.global/codefeed
-# or
-npm i @foss.global/codefeed
 ```
 
 Requires Node.js 18+ (global fetch/Request/Response) and ESM.
@@ -45,6 +47,8 @@ const feed = new CodeFeed('https://code.example.com', 'gitea_token', since, {
 const commits = await feed.fetchAllCommitsFromInstance();
 ```
 
+Advanced callers can provide a custom `ICodeFeedProvider` through the constructor options. The default provider keeps the existing Gitea HTTP behavior, while the provider contract lets adapters supply organizations, repositories, commits, tags, and changelog content from another backend.
+
 Each returned item follows this shape:
 
 ```ts
@@ -62,6 +66,8 @@ interface ICommitResult {
 }
 ```
 
+The canonical public result contract is exported as `ICodefeedCommitResult` from `@foss.global/interfaces`. `@foss.global/codefeed/interfaces` keeps `ICommitResult` as a package-local alias for that contract.
+
 ## Features
 
 - Pagination for orgs, repos, commits, and tags (no missing pages)
@@ -81,7 +87,7 @@ interface ICommitResult {
 ## Testing
 
 The repo contains:
-- An integration test using a `GITEA_TOKEN` from `.nogit/` via `@push.rocks/qenv`.
+- An opt-in integration test using a `GITEA_TOKEN` from `.nogit/` via `@push.rocks/qenv`.
 - A mocked pagination test that does not require network.
 
 Run tests:
@@ -90,10 +96,31 @@ Run tests:
 pnpm test
 ```
 
-For the integration test, ensure `GITEA_TOKEN` is provided (e.g., via `.nogit/` as used in `test/test.ts`).
+For the integration test, set `CODEFEED_RUN_LIVE=true` and ensure `GITEA_TOKEN` is provided, e.g. via `.nogit/` as used by `test/test.live.node.ts`.
 
 ## Notes
 
 - When `taggedOnly` is enabled, the feed includes only commits associated with tags.
 - `publishedOnNpm` is computed by matching the tag-derived version against the npm registry for `@org/repo`.
 - For very large instances, consider using allowlists/denylists and enabling caching for incremental runs.
+
+## License and Legal Information
+
+This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the repository license file.
+
+**Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
+
+### Trademarks
+
+This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH or third parties, and are not included within the scope of the MIT license granted herein.
+
+Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines or the guidelines of the respective third-party owners, and any usage must be approved in writing. Third-party trademarks used herein are the property of their respective owners and used only in a descriptive manner, e.g. for an implementation of an API or similar.
+
+### Company Information
+
+Task Venture Capital GmbH<br>
+Registered at District Court Bremen HRB 35230 HB, Germany
+
+For any legal inquiries or further information, please contact us via email at hello@task.vc.
+
+By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@foss.global/codefeed',
-  version: '1.7.2',
+  version: '1.8.0',
   description: 'The @foss.global/codefeed module is designed for generating feeds from Gitea repositories, enhancing development workflows by processing commit data and repository activities.'
 }

package/ts/index.ts

@@ -7,12 +7,12 @@ export class CodeFeed {
   private pageLimit = 50;
   // Raw changelog content for the current repository
   private changelogContent: string = '';
-  // npm registry helper for published-on-npm checks
-  private npmRegistry: plugins.smartnpm.NpmRegistry;
+  private npmRegistry?: plugins.TNpmRegistry;
   // In-memory stateful cache of commits
   private enableCache: boolean = false;
   private cacheWindowMs?: number;
   private cache: plugins.interfaces.ICommitResult[] = [];
+  private provider: plugins.interfaces.ICodeFeedProvider;
   // enable or disable npm publishedOnNpm checks (true by default)
   private enableNpmCheck: boolean = true;
   // return only tagged commits (false by default)
@@ -29,18 +29,7 @@ export class CodeFeed {
     baseUrl: string,
     token?: string,
     lastRunTimestamp?: string,
-    options?: {
-      enableCache?: boolean;
-      cacheWindowMs?: number;
-      enableNpmCheck?: boolean;
-      taggedOnly?: boolean;
-      orgAllowlist?: string[];
-      orgDenylist?: string[];
-      repoAllowlist?: string[];
-      repoDenylist?: string[];
-      untilTimestamp?: string;
-      verbose?: boolean;
-    }
+    options?: plugins.interfaces.ICodeFeedOptions
   ) {
     this.baseUrl = baseUrl;
     this.token = token;
@@ -58,8 +47,7 @@ export class CodeFeed {
     this.untilTimestamp = options?.untilTimestamp;
     this.verbose = options?.verbose ?? false;
     this.cache = [];
-    // npm registry instance for version lookups
-    this.npmRegistry = new plugins.smartnpm.NpmRegistry();
+    this.provider = options?.provider ?? this.createDefaultProvider();
     console.log('CodeFeed initialized with last run timestamp:', this.lastRunTimestamp);
   }
 
@@ -81,7 +69,7 @@ export class CodeFeed {
     }
 
     // 1) get all organizations
-    let orgs = await this.fetchAllOrganizations();
+    let orgs = await this.provider.listOrganizations();
     // apply allow/deny filters
     if (this.orgAllowlist && this.orgAllowlist.length > 0) {
       orgs = orgs.filter((o) => this.orgAllowlist!.includes(o));
@@ -93,7 +81,7 @@ export class CodeFeed {
     // 2) fetch repos per org in parallel
     const repoLists = await Promise.all(
       orgs.map((org) =>
-        stack.getNonExclusiveExecutionSlot(() => this.fetchRepositoriesForOrg(org))
+        stack.getNonExclusiveExecutionSlot(() => this.provider.listRepositoriesForOrg(org))
       )
     );
     // flatten to [{ owner, name }]
@@ -114,25 +102,16 @@ export class CodeFeed {
     const commitJobs = allRepos.map(({ owner, name }) =>
       stack.getNonExclusiveExecutionSlot(async () => {
         try {
-          // 3a) Probe the most recent commit (limit=1)
-          const probeResp = await this.fetchFunction(
-            `/api/v1/repos/${owner}/${name}/commits?limit=1`,
-            { headers: this.token ? { Authorization: `token ${this.token}` } : {} }
-          );
-          if (!probeResp.ok) {
-            throw new Error(`Probe failed for ${owner}/${name}: ${probeResp.statusText}`);
-          }
-          const probeData: plugins.interfaces.ICommit[] = await probeResp.json();
+          const latestCommit = await this.provider.getLatestCommitForRepo(owner, name);
           // If no commits or no new commits since last run, skip
           if (
-            probeData.length === 0 ||
-            new Date(probeData[0].commit.author.date).getTime() <=
-              new Date(effectiveSince).getTime()
+            !latestCommit ||
+            new Date(latestCommit.commit.author.date).getTime() <= new Date(effectiveSince).getTime()
           ) {
             return { owner, name, commits: [] };
           }
           // 3b) Fetch commits since last run
-          const commits = await this.fetchRecentCommitsForRepo(
+          const commits = await this.provider.listCommitsForRepo(
             owner,
             name,
             effectiveSince
@@ -157,12 +136,12 @@ export class CodeFeed {
       }
       reposWithNewCommits++;
       // load changelog for this repo
-      await this.loadChangelogFromRepo(owner, name);
+      this.changelogContent = await this.provider.readChangelogForRepo(owner, name);
       // fetch tags for this repo
       let taggedShas: Set<string>;
       let tagNameBySha: Map<string, string>;
       try {
-        const tagInfo = await this.fetchTags(owner, name);
+        const tagInfo = await this.provider.listTagsForRepo(owner, name);
         taggedShas = tagInfo.shas;
         tagNameBySha = tagInfo.map;
       } catch (e: any) {
@@ -175,7 +154,8 @@ export class CodeFeed {
       let pkgInfo: { allVersions: Array<{ version: string }> } | null = null;
       if (hasTaggedCommit && this.enableNpmCheck) {
         try {
-          pkgInfo = await this.npmRegistry.getPackageInfo(`@${owner}/${name}`);
+          const npmRegistry = await this.getNpmRegistry();
+          pkgInfo = await npmRegistry.getPackageInfo(`@${owner}/${name}`);
         } catch (e: any) {
           console.error(`Failed to fetch package info for ${owner}/${name}:`, e.message);
           pkgInfo = null;
@@ -270,9 +250,38 @@ export class CodeFeed {
   /**
    * Load the changelog directly from the Gitea repository.
    */
-  private async loadChangelogFromRepo(owner: string, repo: string): Promise<void> {
+  private createDefaultProvider(): plugins.interfaces.ICodeFeedProvider {
+    return {
+      listOrganizations: () => this.fetchAllOrganizations(),
+      listRepositoriesForOrg: (org) => this.fetchRepositoriesForOrg(org),
+      getLatestCommitForRepo: (owner, repo) => this.fetchLatestCommitForRepo(owner, repo),
+      listCommitsForRepo: (owner, repo, sinceTimestamp) => this.fetchRecentCommitsForRepo(owner, repo, sinceTimestamp),
+      listTagsForRepo: (owner, repo) => this.fetchTags(owner, repo),
+      readChangelogForRepo: async (owner, repo) => {
+        await this.loadChangelogFromRepo(owner, repo);
+        return this.changelogContent;
+      },
+    };
+  }
+
+  private createAuthHeaders(): Record<string, string> {
     const headers: Record<string, string> = {};
-    if (this.token) headers['Authorization'] = `token ${this.token}`;
+    if (this.token) {
+      headers.Authorization = `token ${this.token}`;
+    }
+    return headers;
+  }
+
+  private async getNpmRegistry(): Promise<plugins.TNpmRegistry> {
+    if (!this.npmRegistry) {
+      const smartnpm = await plugins.getSmartnpm();
+      this.npmRegistry = new smartnpm.NpmRegistry();
+    }
+    return this.npmRegistry;
+  }
+
+  private async loadChangelogFromRepo(owner: string, repo: string): Promise<void> {
+    const headers = this.createAuthHeaders();
     const candidates = [
       'CHANGELOG.md',
       'changelog.md',
@@ -332,14 +341,14 @@ export class CodeFeed {
   /**
    * Fetch all tags for a given repo and return the set of tagged commit SHAs
    */
-  private async fetchTags(owner: string, repo: string): Promise<{ shas: Set<string>; map: Map<string, string> }> {
+  private async fetchTags(owner: string, repo: string): Promise<plugins.interfaces.ICodeFeedTagInfo> {
     const taggedShas = new Set<string>();
     const tagNameBySha = new Map<string, string>();
     let page = 1;
     while (true) {
       const url = `/api/v1/repos/${owner}/${repo}/tags?limit=${this.pageLimit}&page=${page}`;
       const resp = await this.fetchFunction(url, {
-        headers: this.token ? { Authorization: `token ${this.token}` } : {},
+        headers: this.createAuthHeaders(),
       });
       if (!resp.ok) {
         console.error(`Failed to fetch tags for ${owner}/${repo}: ${resp.status} ${resp.statusText}`);
@@ -360,8 +369,20 @@ export class CodeFeed {
     return { shas: taggedShas, map: tagNameBySha };
   }
 
+  private async fetchLatestCommitForRepo(owner: string, repo: string): Promise<plugins.interfaces.ICommit | undefined> {
+    const resp = await this.fetchFunction(
+      `/api/v1/repos/${owner}/${repo}/commits?limit=1`,
+      { headers: this.createAuthHeaders() }
+    );
+    if (!resp.ok) {
+      throw new Error(`Probe failed for ${owner}/${repo}: ${resp.statusText}`);
+    }
+    const data: plugins.interfaces.ICommit[] = await resp.json();
+    return data[0];
+  }
+
   private async fetchAllOrganizations(): Promise<string[]> {
-    const headers = this.token ? { Authorization: `token ${this.token}` } : {};
+    const headers = this.createAuthHeaders();
     let page = 1;
     const orgs: string[] = [];
     while (true) {
@@ -379,7 +400,7 @@ export class CodeFeed {
   }
 
   private async fetchRepositoriesForOrg(org: string): Promise<plugins.interfaces.IRepository[]> {
-    const headers = this.token ? { Authorization: `token ${this.token}` } : {};
+    const headers = this.createAuthHeaders();
     let page = 1;
     const repos: plugins.interfaces.IRepository[] = [];
     while (true) {
@@ -402,7 +423,7 @@ export class CodeFeed {
     sinceTimestamp?: string
   ): Promise<plugins.interfaces.ICommit[]> {
     const since = sinceTimestamp ?? this.lastRunTimestamp;
-    const headers = this.token ? { Authorization: `token ${this.token}` } : {};
+    const headers = this.createAuthHeaders();
     let page = 1;
     const commits: plugins.interfaces.ICommit[] = [];
     while (true) {

package/ts/interfaces/index.ts

@@ -1,3 +1,7 @@
+import type { ICodefeedCommitResult } from '@foss.global/interfaces';
+
+export type { ICodefeedCommitResult } from '@foss.global/interfaces';
+
 export interface IRepositoryOwner {
   login: string;
 }
@@ -32,15 +36,32 @@ export interface IRepoSearchResponse {
   data: IRepository[];
 }
 
-export interface ICommitResult {
-  baseUrl: string;
-  org: string;
-  repo: string;
-  timestamp: string;
-  hash: string;
-  commitMessage: string;
-  tagged: boolean;
-  publishedOnNpm: boolean;
-  prettyAgoTime: string;
-  changelog: string | undefined;
+export interface ICommitResult extends ICodefeedCommitResult {}
+
+export interface ICodeFeedTagInfo {
+  shas: Set<string>;
+  map: Map<string, string>;
+}
+
+export interface ICodeFeedProvider {
+  listOrganizations(): Promise<string[]>;
+  listRepositoriesForOrg(org: string): Promise<IRepository[]>;
+  getLatestCommitForRepo(owner: string, repo: string): Promise<ICommit | undefined>;
+  listCommitsForRepo(owner: string, repo: string, sinceTimestamp?: string): Promise<ICommit[]>;
+  listTagsForRepo(owner: string, repo: string): Promise<ICodeFeedTagInfo>;
+  readChangelogForRepo(owner: string, repo: string): Promise<string>;
+}
+
+export interface ICodeFeedOptions {
+  enableCache?: boolean;
+  cacheWindowMs?: number;
+  enableNpmCheck?: boolean;
+  taggedOnly?: boolean;
+  orgAllowlist?: string[];
+  orgDenylist?: string[];
+  repoAllowlist?: string[];
+  repoDenylist?: string[];
+  untilTimestamp?: string;
+  verbose?: boolean;
+  provider?: ICodeFeedProvider;
 }

package/ts/plugins.ts

@@ -6,16 +6,14 @@ export {
 }
 
 // @push.rocks
-import * as qenv from '@push.rocks/qenv';
-import * as smartnpm from '@push.rocks/smartnpm';
-import * as smartxml from '@push.rocks/smartxml';
 import * as smarttime from '@push.rocks/smarttime';
 import * as lik from '@push.rocks/lik';
 
+export type TNpmRegistry = import('@push.rocks/smartnpm').NpmRegistry;
+
+export const getSmartnpm = async () => import('@push.rocks/smartnpm');
+
 export {
-  qenv,
-  smartnpm,
-  smartxml,
   smarttime,
   lik,
-}
+}

package/dist_ts/codefeed.plugins.d.ts

@@ -1,7 +0,0 @@
-import * as interfaces from './interfaces/index.js';
-export { interfaces, };
-import * as qenv from '@push.rocks/qenv';
-import * as smartnpm from '@push.rocks/smartnpm';
-import * as smartxml from '@push.rocks/smartxml';
-import * as smarttime from '@push.rocks/smarttime';
-export { qenv, smartnpm, smartxml, smarttime, };

package/dist_ts/codefeed.plugins.js

@@ -1,10 +0,0 @@
-// module
-import * as interfaces from './interfaces/index.js';
-export { interfaces, };
-// @push.rocks
-import * as qenv from '@push.rocks/qenv';
-import * as smartnpm from '@push.rocks/smartnpm';
-import * as smartxml from '@push.rocks/smartxml';
-import * as smarttime from '@push.rocks/smarttime';
-export { qenv, smartnpm, smartxml, smarttime, };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZWZlZWQucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL2NvZGVmZWVkLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsU0FBUztBQUNULE9BQU8sS0FBSyxVQUFVLE1BQU0sdUJBQXVCLENBQUM7QUFFcEQsT0FBTyxFQUNMLFVBQVUsR0FDWCxDQUFBO0FBRUQsY0FBYztBQUNkLE9BQU8sS0FBSyxJQUFJLE1BQU0sa0JBQWtCLENBQUM7QUFDekMsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFFbkQsT0FBTyxFQUNMLElBQUksRUFDSixRQUFRLEVBQ1IsUUFBUSxFQUNSLFNBQVMsR0FDVixDQUFBIn0=