@igstack/app-catalog-backend-core 6.11.0 → 6.12.1

package/src/__tests__/communityTools.test.ts

@@ -30,10 +30,9 @@ describe('Community tools service', () => {
       findMany: vi.fn(),
       findUnique: vi.fn(),
     },
-    dbCommunityToolView: {
-      upsert: vi.fn(),
+    dbCommunityToolOpen: {
+      create: vi.fn(),
       count: vi.fn(),
-      findMany: vi.fn(),
     },
     dbCommunityToolPin: {
       findMany: vi.fn(),
@@ -87,61 +86,99 @@ describe('Community tools service', () => {
     })
   })
 
-  describe('recordView', () => {
-    it('counts view twice same day once', async () => {
-      const actor = {
-        hash: 'test-hash',
-        publicId: 'test-public',
-        alias: 'Test User',
-        kind: 'visitor' as const,
+  describe('recordOpen', () => {
+    const actor = {
+      hash: 'test-hash',
+      publicId: 'test-public',
+      alias: 'Test User',
+      kind: 'visitor' as const,
+    }
+
+    /** The open table in memory: what was written is what is counted. */
+    function opensTable() {
+      const rows: { toolId: string; actorHash: string; at: Date }[] = []
+      type Where = {
+        toolId: string
+        actorHash?: string
+        at?: { gte?: Date; gt?: Date }
       }
+      const matches = (r: (typeof rows)[number], w: Where) =>
+        r.toolId === w.toolId &&
+        (w.actorHash === undefined || r.actorHash === w.actorHash) &&
+        (!w.at?.gte || r.at >= w.at.gte) &&
+        (!w.at?.gt || r.at > w.at.gt)
+      mockDb.dbCommunityToolOpen.create = vi.fn(
+        ({ data }: { data: (typeof rows)[number] }) => {
+          rows.push(data)
+          return Promise.resolve(data)
+        },
+      ) as never
+      mockDb.dbCommunityToolOpen.count = vi.fn(({ where }: { where: Where }) =>
+        Promise.resolve(rows.filter((r) => matches(r, where)).length),
+      ) as never
+      return rows
+    }
 
+    beforeEach(() => {
       mockDb.dbCommunityTool.findUnique = vi
         .fn()
         .mockResolvedValue({ id: 'tool-1' })
-      mockDb.dbCommunityToolView.upsert = vi.fn().mockResolvedValue({})
+    })
 
-      // Mock count to return different values for each call
-      let countCallIndex = 0
-      mockDb.dbCommunityToolView.count = vi.fn().mockImplementation(() => {
-        const results = [1, 5, 1, 5] // views30d, viewsAll for each recordView call
-        return Promise.resolve(results[countCallIndex++])
-      })
+    it('counts every open, two on the same day as two', async () => {
+      const rows = opensTable()
+      const at = new Date('2024-01-15T10:00:00Z')
 
-      // First view
-      const result1 = await service.recordView(
+      await service.recordOpen('test-slug', 'card', actor, null, at)
+      const second = await service.recordOpen(
         'test-slug',
+        'site',
         actor,
         null,
-        new Date('2024-01-15'),
+        new Date(at.getTime() + 5 * 60_000),
       )
 
-      // Second view same day
-      const result2 = await service.recordView(
+      expect(second).toEqual({ views30d: 2, viewsAll: 2 })
+      expect(rows.map((r) => (r as unknown as { kind: string }).kind)).toEqual([
+        'card',
+        'site',
+      ])
+    })
+
+    it('counts the last 30 days in views30d, every open in viewsAll', async () => {
+      const rows = opensTable()
+      rows.push({
+        toolId: 'tool-1',
+        actorHash: 'someone',
+        at: new Date('2023-12-01T00:00:00Z'),
+      })
+
+      const counts = await service.recordOpen(
         'test-slug',
+        'card',
         actor,
         null,
-        new Date('2024-01-15'),
+        new Date('2024-01-15T10:00:00Z'),
       )
 
-      // Both calls should upsert the same row (same day)
-      expect(mockDb.dbCommunityToolView.upsert).toHaveBeenCalledTimes(2)
-      const calls = vi.mocked(mockDb.dbCommunityToolView.upsert).mock.calls
-      const call1 = calls[0]?.[0]
-      const call2 = calls[1]?.[0]
-
-      // Same composite key (toolId, actorHash, day)
-      expect(call1?.where).toEqual({
-        toolId_actorHash_day: {
-          toolId: 'tool-1',
-          actorHash: 'test-hash',
-          day: new Date('2024-01-15T00:00:00.000Z'),
-        },
-      })
-      expect(call2?.where).toEqual(call1?.where)
+      expect(counts).toEqual({ views30d: 1, viewsAll: 2 })
+    })
+
+    it('ignores a visitor opening one tool more than 30 times a minute', async () => {
+      opensTable()
+      const at = new Date('2024-01-15T10:00:00Z')
+      let counts = { views30d: 0, viewsAll: 0 }
+      for (let i = 0; i < 35; i++) {
+        counts = await service.recordOpen(
+          'test-slug',
+          'site',
+          actor,
+          null,
+          new Date(at.getTime() + i * 1000),
+        )
+      }
 
-      expect(result1).toEqual({ views30d: 1, viewsAll: 5 })
-      expect(result2).toEqual({ views30d: 1, viewsAll: 5 })
+      expect(counts.viewsAll).toBe(30)
     })
   })
 
@@ -173,10 +210,12 @@ describe('Community tools service', () => {
             failingSince: null,
             archivedAt: null,
             archivedBy: null,
+            unreachableSince: null,
             archivedReason: null,
             owners: [],
             namedOwners: [],
             likes: [] as { userId: string; userName: string }[],
+            _count: { feedback: 0 },
             tags: [],
           },
         },
@@ -202,10 +241,12 @@ describe('Community tools service', () => {
             failingSince: null,
             archivedAt: null,
             archivedBy: null,
+            unreachableSince: null,
             archivedReason: null,
             owners: [],
             namedOwners: [],
             likes: [] as { userId: string; userName: string }[],
+            _count: { feedback: 0 },
             tags: [],
           },
         },
@@ -231,17 +272,19 @@ describe('Community tools service', () => {
             failingSince: null,
             archivedAt: null,
             archivedBy: null,
+            unreachableSince: null,
             archivedReason: null,
             owners: [],
             namedOwners: [],
             likes: [] as { userId: string; userName: string }[],
+            _count: { feedback: 0 },
             tags: [],
           },
         },
       ])
 
       mockDb.dbPerson.findMany = vi.fn().mockResolvedValue([])
-      mockDb.dbCommunityToolView.count = vi.fn().mockResolvedValue(0)
+      mockDb.dbCommunityToolOpen.count = vi.fn().mockResolvedValue(0)
 
       const now = new Date('2024-01-15T12:00:00Z')
       const result = await service.listPins(
@@ -407,10 +450,12 @@ describe('Community tools service', () => {
           failingSince: null,
           archivedAt: null,
           archivedBy: null,
+          unreachableSince: null,
           archivedReason: null,
           owners: [],
           namedOwners: [],
           likes: [] as { userId: string; userName: string }[],
+          _count: { feedback: 0 },
           tags: [],
         },
         {
@@ -432,16 +477,18 @@ describe('Community tools service', () => {
           failingSince: new Date('2024-01-10T00:00:00Z'),
           archivedAt: null,
           archivedBy: null,
+          unreachableSince: null,
           archivedReason: null,
           owners: [],
           namedOwners: [],
           likes: [] as { userId: string; userName: string }[],
+          _count: { feedback: 0 },
           tags: [],
         },
       ])
 
       mockDb.dbPerson.findMany = vi.fn().mockResolvedValue([])
-      mockDb.dbCommunityToolView.count = vi.fn().mockResolvedValue(0)
+      mockDb.dbCommunityToolOpen.count = vi.fn().mockResolvedValue(0)
 
       const result = await service.listTools(null, false, now, NO_CAPTURE)
 
@@ -481,6 +528,7 @@ describe('Community tools service', () => {
         archivedAt: null,
         archivedReason: null,
         archivedBy: null,
+        unreachableSince: null,
         screenshotAssetId: null,
         faviconAssetId: null,
         capturedAt: null,
@@ -488,6 +536,7 @@ describe('Community tools service', () => {
         owners: [],
         namedOwners: [],
         likes: [] as { userId: string; userName: string }[],
+        _count: { feedback: 0 },
         tags: [],
         ...over,
       }) as Parameters<typeof toView>[0]
@@ -542,6 +591,19 @@ describe('Community tools service', () => {
       expect(anonymous.likedByMe).toBe(false)
     })
 
+    it('counts the comments the query counted', async () => {
+      const view = await toView(
+        row({ _count: { feedback: 3 } }),
+        new Map(),
+        { views30d: 0, viewsAll: 0 },
+        null,
+        false,
+        new Date('2024-01-15T12:00:00Z'),
+        CAPTURES,
+      )
+      expect(view.comments).toBe(3)
+    })
+
     it('lists an owner outside the directory by name, with no slug', async () => {
       const view = await toView(
         row({
@@ -593,6 +655,7 @@ describe('Community tools service', () => {
             failingSince: null,
             archivedAt: null,
             archivedBy: null,
+            unreachableSince: null,
           },
           { ...CAPTURES, capturer: launchFails },
           now,
@@ -636,6 +699,7 @@ describe('Community tools service', () => {
             failingSince: null,
             archivedAt: null,
             archivedBy: null,
+            unreachableSince: null,
           },
           { ...CAPTURES, capturer: { capture } },
           new Date('2024-01-15T12:00:00Z'),

package/src/__tests__/communityToolsCapture.test.ts

@@ -5,6 +5,7 @@ import {
   allowRequest,
   capturePage,
   chromiumFenceArgs,
+  failureOf,
   fenceRoute,
   followWithinHosts,
   oneAtATime,
@@ -55,6 +56,39 @@ describe('Community tools capture', () => {
     expect(page.screenshot).not.toHaveBeenCalled()
   })
 
+  it('tells an error status and an unknown name from no answer at all', async () => {
+    const { page } = fakePage({})
+    page.goto.mockResolvedValueOnce({
+      ok: () => false,
+      status: () => 500,
+      headers: () => ({}),
+    })
+    expect(await capturePage(page, URL_OK, HOSTS)).toEqual({
+      ok: false,
+      error: 'HTTP 500',
+    })
+    page.goto.mockResolvedValueOnce(null)
+    expect(await capturePage(page, URL_OK, HOSTS)).toEqual({
+      ok: false,
+      error: 'No response',
+      unreachable: true,
+    })
+    expect(
+      failureOf(new Error('getaddrinfo ENOTFOUND gone.pages.example.com')),
+    ).toEqual({
+      ok: false,
+      error: 'getaddrinfo ENOTFOUND gone.pages.example.com',
+    })
+    expect(failureOf(new Error('connect ETIMEDOUT 10.0.0.1:443'))).toEqual({
+      ok: false,
+      error: 'connect ETIMEDOUT 10.0.0.1:443',
+      unreachable: true,
+    })
+    expect(failureOf(new Error('connect ECONNREFUSED'))).toMatchObject({
+      unreachable: true,
+    })
+  })
+
   it('skips the favicon fetch for an off-list href', async () => {
     const { page } = fakePage({
       iconHref: 'https://intranet.example.org/x.ico',

package/src/__tests__/communityToolsHealth.test.ts

@@ -2,6 +2,7 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import * as dbClient from '../db/client'
 import type { PrismaClient } from '../generated/prisma/client'
+import { failureOf } from '../modules/communityTools/capture'
 import type { ScreenshotCapturer } from '../modules/communityTools/capture'
 import {
   runHealthCheckOnce,
@@ -20,6 +21,7 @@ function tool(id: string, fields: Record<string, unknown> = {}) {
     failingSince: null,
     archivedAt: null,
     archivedBy: null,
+    unreachableSince: null,
     ...fields,
   }
 }
@@ -82,6 +84,66 @@ describe('Community tools health job', () => {
     })
   })
 
+  it('a timeout is not a failure; a 500 and an unknown name are', async () => {
+    const since = new Date(NOW.getTime() - 5 * DAY)
+    db.dbCommunityTool.findMany.mockResolvedValue([
+      tool('timeout', { failingSince: since }),
+      tool('http-500'),
+      tool('nxdomain'),
+    ])
+    const results: Record<string, unknown> = {
+      'https://timeout.pages.example.com/': failureOf(
+        new Error('connect ETIMEDOUT 10.0.0.1:443'),
+      ),
+      'https://http-500.pages.example.com/': { ok: false, error: 'HTTP 500' },
+      'https://nxdomain.pages.example.com/': failureOf(
+        new Error('getaddrinfo ENOTFOUND nxdomain.pages.example.com'),
+      ),
+    }
+    const capturer: ScreenshotCapturer = {
+      capture: vi.fn((url: string) => Promise.resolve(results[url] as never)),
+    }
+
+    await runHealthCheckOnce({ ...opts, capturer }, NOW)
+
+    expect(db.dbCommunityTool.update.mock.calls.map((c) => c[0])).toEqual([
+      // The streak is left as it was, and nothing is archived.
+      {
+        where: { id: 'timeout' },
+        data: { lastCheckAt: NOW, unreachableSince: NOW },
+      },
+      {
+        where: { id: 'http-500' },
+        data: { lastCheckAt: NOW, failingSince: NOW },
+      },
+      {
+        where: { id: 'nxdomain' },
+        data: { lastCheckAt: NOW, failingSince: NOW },
+      },
+    ])
+  })
+
+  it('a month of timeouts never archives', async () => {
+    db.dbCommunityTool.findMany.mockResolvedValue([
+      tool('timeout', {
+        failingSince: new Date(NOW.getTime() - 40 * DAY),
+        unreachableSince: new Date(NOW.getTime() - 35 * DAY),
+      }),
+    ])
+    const capturer: ScreenshotCapturer = {
+      capture: vi
+        .fn()
+        .mockResolvedValue(failureOf(new Error('Timeout 20000ms exceeded'))),
+    }
+
+    await runHealthCheckOnce({ ...opts, capturer }, NOW)
+
+    expect(db.dbCommunityTool.update).toHaveBeenCalledWith({
+      where: { id: 'timeout' },
+      data: { lastCheckAt: NOW },
+    })
+  })
+
   it('health run continues with the next tool after an error', async () => {
     db.dbCommunityTool.findMany.mockResolvedValue([tool('a'), tool('b')])
     const flaky: ScreenshotCapturer = {

package/src/__tests__/communityToolsWrite.test.ts

@@ -50,6 +50,7 @@ const dbTool = {
   archivedAt: null,
   archivedReason: null,
   archivedBy: null,
+  unreachableSince: null,
   screenshotAssetId: null,
   faviconAssetId: null,
   capturedAt: null,
@@ -57,6 +58,7 @@ const dbTool = {
   owners: [{ toolId: 'tool-1', personSlug: 'ann@example.com' }],
   namedOwners: [] as { toolId: string; name: string }[],
   likes: [] as { userId: string; userName: string }[],
+  _count: { feedback: 0 },
   tags: [],
 }
 
@@ -86,7 +88,7 @@ describe('Community tools write service', () => {
       dbCommunityToolOwner: {
         findMany: vi.fn().mockResolvedValue(dbTool.owners),
       },
-      dbCommunityToolView: { count: vi.fn().mockResolvedValue(0) },
+      dbCommunityToolOpen: { count: vi.fn().mockResolvedValue(0) },
       dbPerson: {
         findMany: vi
           .fn()
@@ -354,6 +356,7 @@ describe('Community tools write service', () => {
       failingSince: NOW,
       archivedAt: NOW,
       archivedBy: 'auto',
+      unreachableSince: null,
       archivedReason: 'Not working for 14 days',
     })
     const capture = vi.fn().mockResolvedValue({ ok: false, error: 'x' })
@@ -371,6 +374,7 @@ describe('Community tools write service', () => {
       lastCheckAt: null,
       archivedAt: null,
       archivedBy: null,
+      unreachableSince: null,
       archivedReason: null,
     })
     await vi.waitFor(() => expect(capture).toHaveBeenCalled())
@@ -382,6 +386,7 @@ describe('Community tools write service', () => {
       failingSince: NOW,
       archivedAt: NOW,
       archivedBy: 'Ann Owner',
+      unreachableSince: null,
     })
 
     await write.editTool(

package/src/generated/prisma/browser.ts

@@ -132,9 +132,14 @@ export type DbCommunityToolNamedOwner = Prisma.DbCommunityToolNamedOwnerModel
  * Tags attached to community tools (app associations and topics).
  */
 export type DbCommunityToolTag = Prisma.DbCommunityToolTagModel
+/**
+ * Model DbCommunityToolOpen
+ * One card open or click through to the site.
+ */
+export type DbCommunityToolOpen = Prisma.DbCommunityToolOpenModel
 /**
  * Model DbCommunityToolView
- * View tracking for community tools (one row per viewer per tool per day).
+ * Superseded by DbCommunityToolOpen and no longer written; kept so the schema stays additive.
  */
 export type DbCommunityToolView = Prisma.DbCommunityToolViewModel
 /**

package/src/generated/prisma/client.ts

@@ -156,9 +156,14 @@ export type DbCommunityToolNamedOwner = Prisma.DbCommunityToolNamedOwnerModel
  * Tags attached to community tools (app associations and topics).
  */
 export type DbCommunityToolTag = Prisma.DbCommunityToolTagModel
+/**
+ * Model DbCommunityToolOpen
+ * One card open or click through to the site.
+ */
+export type DbCommunityToolOpen = Prisma.DbCommunityToolOpenModel
 /**
  * Model DbCommunityToolView
- * View tracking for community tools (one row per viewer per tool per day).
+ * Superseded by DbCommunityToolOpen and no longer written; kept so the schema stays additive.
  */
 export type DbCommunityToolView = Prisma.DbCommunityToolViewModel
 /**