@pmeweb/plugin-chat 1.0.0 → 1.2.0

package/src/worker.js

@@ -10,7 +10,11 @@
 // - The host sent to pmeweb-chat is the one this request ARRIVED on, never a header or a body
 //   field: it is how pmeweb-chat finds the client's settings.
 // - start: Turnstile (@pmeweb/turnstile, action `chat`, solved on this host), then CHAT_LIMIT keyed
-//   on the visitor's IP, then pmeweb-chat. The IP goes to siteverify and the limiter only.
+//   on the visitor's IP, then pmeweb-chat, which applies the global limits (conversation starts per
+//   minute, conversations per day, messages, the daily cap; edited in the portal admin since 1.2.0).
+//   The IP goes to siteverify, the limiters and, in the `x-pmw-visitor-ip` header only, to
+//   pmeweb-chat, which counts conversations per visitor per day (10) and keeps only a daily hash
+//   of it. pmeweb-chat trusts that header because only service bindings reach it.
 //   Only named fields go on; `sms` is sent only as `voipms` (pmeweb-chat refuses any other value),
 //   `photos` only as true. pmeweb-chat's status and JSON pass through (426 rpc_version, 503
 //   not_configured, ...): the widget reads them.
@@ -28,7 +32,7 @@ import { verifyTurnstile } from '@pmeweb/turnstile/worker'
 import { RPC_HEADER, RPC_VERSION } from './protocol.js'
 
 /** This package's version, reported by the health route (a test holds it equal to package.json). */
-export const VERSION = '1.0.0'
+export const VERSION = '1.2.0'
 export { RPC_VERSION }
 
 const SERVICE = 'https://pmeweb-chat.internal'
@@ -52,10 +56,14 @@ function json(body, status = 200, headers = {}) {
 
 const langOf = (v) => (v === 'en' || v === 'fr' ? v : null)
 
-async function allowed(request, env) {
-  if (!env.CHAT_LIMIT) return true
+const VISITOR_IP_HEADER = 'x-pmw-visitor-ip'
+
+/** CHAT_LIMIT, the flood guard at the site's edge (starts, sockets, photos, the contact form). */
+async function allowed(request, env, { start = false } = {}) {
+  const [limiter, prefix] = [env.CHAT_LIMIT, 'chat']
+  if (!limiter) return true
   try {
-    return (await env.CHAT_LIMIT.limit({ key: `chat:${request.headers.get('cf-connecting-ip') ?? 'unknown'}` })).success
+    return (await limiter.limit({ key: `${prefix}:${request.headers.get('cf-connecting-ip') ?? 'unknown'}` })).success
   } catch (e) {
     // The limiter is approximate by design; a failure of it lets a Turnstile-verified visitor
     // through, and pmeweb-chat still caps turns and the day's spend.
@@ -102,7 +110,7 @@ async function start(request, url, env, { config, lang }) {
     console.warn(`[chat] turnstile refused: ${verdict.reason}`)
     return json({ ok: false, error: 'turnstile' }, 403)
   }
-  if (!(await allowed(request, env))) return json({ ok: false, error: 'too_many' }, 429)
+  if (!(await allowed(request, env, { start: !lead }))) return json({ ok: false, error: 'too_many' }, 429)
 
   const page = typeof b.page === 'string' && b.page.startsWith('/') && !b.page.startsWith('//') && b.page.length <= 512 ? b.page : null
   const body = { host: url.hostname.toLowerCase(), lang: langOf(b.lang) ?? langOf(lang) ?? 'fr', page }
@@ -110,11 +118,14 @@ async function start(request, url, env, { config, lang }) {
   if (config?.photos === true) body.photos = true
   if (lead) body.fallbackLead = lead
 
+  const headers = { 'content-type': 'application/json', [RPC_HEADER]: String(RPC_VERSION) }
+  const ip = request.headers.get('cf-connecting-ip')
+  if (ip) headers[VISITOR_IP_HEADER] = ip
   let res
   try {
     res = await env.CHAT.fetch(`${SERVICE}/start`, {
       method: 'POST',
-      headers: { 'content-type': 'application/json', [RPC_HEADER]: String(RPC_VERSION) },
+      headers,
       body: JSON.stringify(body),
     })
   } catch {
@@ -135,7 +146,7 @@ async function socket(request, url, env) {
   const q = new URLSearchParams()
   for (const k of ['c', 'k']) q.set(k, url.searchParams.get(k) ?? '')
   const headers = new Headers(request.headers)
-  for (const h of ['cookie', 'authorization']) headers.delete(h)
+  for (const h of ['cookie', 'authorization', VISITOR_IP_HEADER]) headers.delete(h)
   headers.set(RPC_HEADER, String(RPC_VERSION))
   try {
     return await env.CHAT.fetch(new Request(`${SERVICE}/ws?${q}`, { method: 'GET', headers }))