@evanp/activitypub-bot 0.21.2 → 0.22.0

package/bin/activitypub-bot.js

@@ -53,7 +53,9 @@ const LOG_LEVEL =
 
 const bots = (await import(BOTS_CONFIG_FILE)).default
 
-const app = await makeApp(DATABASE_URL, ORIGIN, bots, LOG_LEVEL)
+const app = await makeApp({
+  databaseUrl: DATABASE_URL, origin: ORIGIN, bots, logLevel: LOG_LEVEL
+})
 
 const server = app.listen(parseInt(PORT), () => {
   app.locals.logger.info(`Listening on port ${PORT}`)

package/lib/app.js

@@ -1,8 +1,12 @@
+import http from 'node:http'
+import { resolve, dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
 import { Sequelize } from 'sequelize'
 import express from 'express'
 import Logger from 'pino'
 import HTTPLogger from 'pino-http'
-import http from 'node:http'
+
 import { ActivityDistributor } from './activitydistributor.js'
 import { ActivityPubClient } from './activitypubclient.js'
 import { ActorStorage } from './actorstorage.js'
@@ -34,7 +38,10 @@ import { JobReaper } from './jobreaper.js'
 import { DeliveryWorker } from './deliveryworker.js'
 import { DistributionWorker } from './distributionworker.js'
 
-export async function makeApp (databaseUrl, origin, bots, logLevel = 'silent', deliveryWorkerCount = 2, distributionWorkerCount = 8) {
+const currentDir = dirname(fileURLToPath(import.meta.url))
+const DEFAULT_INDEX_FILENAME = resolve(currentDir, '..', 'web', 'index.html')
+
+export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent', deliveryWorkerCount = 2, distributionWorkerCount = 8, indexFileName = DEFAULT_INDEX_FILENAME }) {
   const logger = Logger({
     level: logLevel
   })
@@ -159,7 +166,8 @@ export async function makeApp (databaseUrl, origin, bots, logLevel = 'silent', d
     activityHandler,
     origin,
     deliverer,
-    deliveryWorkers
+    deliveryWorkers,
+    indexFileName
   }
 
   app.use(HTTPLogger({

package/lib/jobreaper.js

@@ -1,7 +1,7 @@
 import { setTimeout as sleep } from 'node:timers/promises'
 
-const DEFAULT_TIMEOUT = 5 * 60 * 1000   // 5 minutes
-const DEFAULT_INTERVAL = 60 * 1000       // 1 minute
+const DEFAULT_TIMEOUT = 5 * 60 * 1000 // 5 minutes
+const DEFAULT_INTERVAL = 60 * 1000 // 1 minute
 
 export class JobReaper {
   #jobQueue

package/lib/routes/server.js

@@ -4,22 +4,34 @@ import as2 from '../activitystreams.js'
 const router = express.Router()
 
 router.get('/', async (req, res) => {
-  const { formatter } = req.app.locals
-  const server = await as2.import({
-    '@context': [
-      'https://www.w3.org/ns/activitystreams',
-      'https://w3id.org/security/v1'
-    ],
-    id: formatter.format({ server: true }),
-    type: 'Service',
-    publicKey: formatter.format({ server: true, type: 'publickey' })
+  const fullUrl = `${req.protocol}://${req.get('host')}${req.originalUrl}`
+  res.format({
+    html: async () => {
+      const { indexFileName } = req.app.locals
+      res.sendFile(indexFileName)
+    },
+    json: async () => {
+      const { formatter } = req.app.locals
+      const server = await as2.import({
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          'https://w3id.org/security/v1'
+        ],
+        id: formatter.format({ server: true }),
+        type: 'Service',
+        publicKey: formatter.format({ server: true, type: 'publickey' }),
+        url: {
+          type: 'Link',
+          mediaType: 'text/html',
+          href: fullUrl
+        }
+      })
+      const body = await server.export({ useOriginalContext: true })
+      res.status(200)
+      res.type(as2.mediaType)
+      res.json(body)
+    }
   })
-  res.status(200)
-  res.type(as2.mediaType)
-  const body = await server.prettyWrite(
-    { additional_context: 'https://w3id.org/security/v1' }
-  )
-  res.end(body)
 })
 
 router.get('/publickey', async (req, res) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanp/activitypub-bot",
-  "version": "0.21.2",
+  "version": "0.22.0",
   "description": "server-side ActivityPub bot framework",
   "type": "module",
   "main": "lib/index.js",

package/web/index.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>activitypub.bot</title>
+</head>
+<body>
+  <h1>activitypub.bot</h1>
+  <p>
+    This is an activitypub.bot server. It hosts automated &quot;bot&quot; accounts on the <a href="https://en.wikipedia.org/wiki/Fediverse">Fediverse</a>.
+  </p>
+  <p>
+    <a href="https://github.com/evanp/activitypub-bot">Source</a>
+  </p>
+</body>
+</html>