@evanp/activitypub-bot 0.40.1 → 0.41.0

package/bin/activitypub-bot.js

@@ -17,7 +17,10 @@ const { values } = parseArgs({
     fanout: { type: 'string' },
     intake: { type: 'string' },
     'index-file': { type: 'string' },
+    'profile-file': { type: 'string' },
     'allow-private': { type: 'boolean' },
+    'redis-url': { type: 'string' },
+    'trust-proxy': { type: 'string' },
     help: { type: 'boolean', short: 'h' }
   },
   allowPositionals: false
@@ -39,6 +42,8 @@ Options:
   --index-file <path>        HTML page to show at root path
   --profile-file <path>      HTML page to show for bot profiles
   --allow-private            flag to allow private network requests
+  --redis-url <url>          Redis connection URL for rate limiting
+  --trust-proxy <value>      Express 'trust proxy' setting (e.g. "1", "loopback", "true")
   -h, --help                 Show this help
 `)
   process.exit(0)
@@ -78,6 +83,16 @@ const FANOUT = parseNumber(values.fanout) || parseNumber(process.env.FANOUT) ||
 const INTAKE = parseNumber(values.intake) || parseNumber(process.env.INTAKE) || 2
 const INDEX_FILE = values['index-file'] || process.env.INDEX_FILE || DEFAULT_INDEX_FILE
 const PROFILE_FILE = values['profile-file'] || process.env.PROFILE_FILE || DEFAULT_PROFILE_FILE
+const REDIS_URL = normalize(values['redis-url']) || process.env.REDIS_URL || undefined
+const TRUST_PROXY_RAW = normalize(values['trust-proxy']) || process.env.TRUST_PROXY
+const TRUST_PROXY = (() => {
+  if (TRUST_PROXY_RAW == null) return undefined
+  const bool = parseBoolean(TRUST_PROXY_RAW)
+  if (bool !== undefined) return bool
+  const num = Number.parseInt(TRUST_PROXY_RAW, 10)
+  if (!Number.isNaN(num) && String(num) === TRUST_PROXY_RAW.trim()) return num
+  return TRUST_PROXY_RAW
+})()
 const ALLOW_PRIVATE = values['allow-private'] ||
   ('ALLOW_PRIVATE' in process.env)
   ? parseBoolean(process.env.ALLOW_PRIVATE)
@@ -96,7 +111,9 @@ const app = await makeApp({
   intakeWorkerCount: INTAKE,
   indexFileName: INDEX_FILE,
   profileFileName: PROFILE_FILE,
-  allowPrivateNetworkRequests: ALLOW_PRIVATE
+  allowPrivateNetworkRequests: ALLOW_PRIVATE,
+  redisUrl: REDIS_URL,
+  trustProxy: TRUST_PROXY
 })
 
 const server = app.listen(parseInt(PORT), () => {

package/lib/app.js

@@ -63,7 +63,7 @@ function createWorkers (logger, count, WorkerClass, ...args) {
   return { workers, runs }
 }
 
-export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent', deliveryWorkerCount = 2, distributionWorkerCount = 8, fanoutWorkerCount = 4, intakeWorkerCount = 2, indexFileName = DEFAULT_INDEX_FILENAME, profileFileName = DEFAULT_PROFILE_FILENAME, allowPrivateNetworkRequests = false, redisUrl }) {
+export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent', deliveryWorkerCount = 2, distributionWorkerCount = 8, fanoutWorkerCount = 4, intakeWorkerCount = 2, indexFileName = DEFAULT_INDEX_FILENAME, profileFileName = DEFAULT_PROFILE_FILENAME, allowPrivateNetworkRequests = false, redisUrl, trustProxy }) {
   const logger = Logger({
     level: logLevel
   })
@@ -202,6 +202,10 @@ export async function makeApp ({ databaseUrl, origin, bots, logLevel = 'silent',
 
   app.disable('x-powered-by')
 
+  if (trustProxy !== undefined) {
+    app.set('trust proxy', trustProxy)
+  }
+
   const rateLimitHandler = (req, res) => {
     res.status(429)
       .set('Content-Type', 'application/problem+json')

package/package.json

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