@hyperdrive.bot/fleet-server 0.3.101 → 0.3.102

package/dist/server/server/ingestion/service.d.ts

@@ -66,6 +66,15 @@ export declare class IngestionService {
      */
     connect(kind: SourceKind, appSlug: string): Promise<SourceConnectResult>;
     list(): Promise<SourceSummary[]>;
+    /**
+     * sourceId -> number of filters watching it.
+     *
+     * Best-effort: a filter store that cannot be read must not blank the sources
+     * list, because the count is a decoration on a row whose real subject is the
+     * connection. Degrades to an empty map, so every row reports zero rather than
+     * the whole screen reporting nothing.
+     */
+    private filterCounts;
     /** Check one source and persist the verdict. Null when the source is gone. */
     check(sourceId: string): Promise<SourceSummary | null>;
     private hasConfiguredGateway;

package/dist/server/server/ingestion/service.js

@@ -130,11 +130,37 @@ export class IngestionService {
             lastError: null,
         });
         this.startConnectPoll(source);
-        return { source: this.toSummary(source), redirectUrl: handoff.redirectUrl };
+        // 0 is correct and not a placeholder: a source created moments ago cannot
+        // have a filter bound to it yet.
+        return { source: this.toSummary(source, 0), redirectUrl: handoff.redirectUrl };
     }
     async list() {
         const sources = await this.store.list();
-        return sources.map((source) => this.toSummary(source));
+        // ONE filter read for the whole list, not one per source. `list()` is
+        // readdir + parse of every filter file, so calling it inside the map would
+        // make a nine-source list do nine full scans of the same directory.
+        const counts = await this.filterCounts();
+        return sources.map((source) => this.toSummary(source, counts.get(source.id) ?? 0));
+    }
+    /**
+     * sourceId -> number of filters watching it.
+     *
+     * Best-effort: a filter store that cannot be read must not blank the sources
+     * list, because the count is a decoration on a row whose real subject is the
+     * connection. Degrades to an empty map, so every row reports zero rather than
+     * the whole screen reporting nothing.
+     */
+    async filterCounts() {
+        const counts = new Map();
+        try {
+            for (const filter of await this.filterStore.list()) {
+                counts.set(filter.sourceId, (counts.get(filter.sourceId) ?? 0) + 1);
+            }
+        }
+        catch (error) {
+            this.logger.warn({ err: error }, "Filter count unavailable; reporting zero per source");
+        }
+        return counts;
     }
     /** Check one source and persist the verdict. Null when the source is gone. */
     async check(sourceId) {
@@ -144,7 +170,14 @@ export class IngestionService {
         }
         const health = await checkSource(source, this.healthDeps());
         const updated = await this.persistHealth(sourceId, health);
-        return updated ? this.toSummary(updated) : null;
+        if (!updated) {
+            return null;
+        }
+        // Counted, not defaulted: `check` returns an existing source, and reporting
+        // zero filters for a source that has some would let a re-check silently
+        // blank the row's work line.
+        const counts = await this.filterCounts();
+        return this.toSummary(updated, counts.get(updated.id) ?? 0);
     }
     hasConfiguredGateway() {
         return SOURCE_CAPABLE_KINDS.some((kind) => this.resolveGateway(kind).configured);
@@ -421,7 +454,7 @@ export class IngestionService {
      * StoredSource later reaches the wire the day it is added, with no diff on
      * this file to review.
      */
-    toSummary(source) {
+    toSummary(source, filterCount = 0) {
         return {
             id: source.id,
             kind: source.kind,
@@ -435,6 +468,7 @@ export class IngestionService {
             updatedAt: source.updatedAt,
             lastCheckedAt: source.lastCheckedAt,
             lastError: source.lastError,
+            filterCount,
         };
     }
 }