chore: upgrade deps

Author: ginkoid

Dockerfile

@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1.4.3
+
 FROM node:18.9.0-buster-slim AS build
 WORKDIR /app
 RUN apt-get update && apt-get install -y \
@@ -11,7 +13,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libglib2.0-0 libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libdrm2 \
   libxkbcommon0 libxcomposite1 libxdamage1 libxrandr2 libgbm1 libgtk-3-0 \
   libasound2 libxshmfence1 libx11-xcb1 && rm -rf /var/lib/apt/lists/*
-COPY --from=build app/node_modules node_modules
-COPY src .
+COPY --link --from=build app/node_modules node_modules
+COPY --link --from=build root/.cache/puppeteer /home/node/.cache/puppeteer
+COPY --link src .
 USER node
 ENTRYPOINT ["node", "--unhandled-rejections=strict"]

package-lock.json

@@ -8,16 +8,16 @@
     "start:visit": "PORT=8081 nodemon -L src/visit.js"
   },
   "dependencies": {
-    "@aws-sdk/client-sqs": "^3.14.0",
-    "@google-cloud/pubsub": "^3.1.1",
+    "@aws-sdk/client-sqs": "^3.196.0",
+    "@google-cloud/pubsub": "^3.2.0",
     "aws-lambda-ric": "^2.0.0",
     "got": "^11.8.2",
     "mustache": "^4.2.0",
-    "puppeteer": "^18.0.4",
+    "puppeteer": "^19.1.2",
     "raw-body": "^2.4.1"
   },
   "devDependencies": {
-    "concurrently": "^7.4.0",
+    "concurrently": "^7.5.0",
     "nodemon": "^2.0.7"
   }
 }

package.json

@@ -14,7 +14,7 @@ const listen = (opts, handler) => {
         reqBody = await getRawBody(req, {
           length: req.headers['content-length'],
           limit: '20kb',
-          encoding: 'utf8'
+          encoding: 'utf8',
         })
       } catch {
         res.writeHead(413).end()
@@ -32,7 +32,7 @@ const listen = (opts, handler) => {
       }
       const data = JSON.parse(reqBody).message.data
       await handler({
-        message: JSON.parse(Buffer.from(data, 'base64').toString())
+        message: JSON.parse(Buffer.from(data, 'base64').toString()),
       })
       res.writeHead(204).end()
     } else {
@@ -51,7 +51,7 @@ const listen = (opts, handler) => {
         query,
         method: req.method,
         headers: req.headers,
-        body: reqBody
+        body: reqBody,
       })
       res.writeHead(statusCode, headers).end(body)
     }
@@ -91,7 +91,7 @@ if (process.env.AWS_EXECUTION_ENV) {
           await handler({ message: body })
           await sqs.deleteMessage({
             QueueUrl: process.env.APP_SQS_URL,
-            ReceiptHandle: msg.ReceiptHandle
+            ReceiptHandle: msg.ReceiptHandle,
           })
         }
       })()
@@ -113,7 +113,7 @@ if (process.env.AWS_EXECUTION_ENV) {
         query,
         method: evt.httpMethod,
         headers: evt.headers,
-        body
+        body,
       })
     }
     ric.run('.', 'server._ricHandler')
@@ -128,7 +128,7 @@ if (process.env.AWS_EXECUTION_ENV) {
   }
   exports.publish = message => sqs.sendMessage({
     MessageBody: Buffer.from(JSON.stringify(message)).toString('base64'),
-    QueueUrl: process.env.APP_SQS_URL
+    QueueUrl: process.env.APP_SQS_URL,
   })
 } else if (process.env.K_SERVICE) {
   exports.runtime = 'gcp'
@@ -151,8 +151,8 @@ if (process.env.AWS_EXECUTION_ENV) {
     const req = http.request('http://localhost:8081', { method: 'POST' })
     req.end(JSON.stringify({
       message: {
-        data: Buffer.from(JSON.stringify(message)).toString('base64')
-      }
+        data: Buffer.from(JSON.stringify(message)).toString('base64'),
+      },
     }))
   }
 }

src/server.js

@@ -69,12 +69,12 @@ <h2>{{ challenge_name }} Admin Bot</h2>
         theme: 'dark',
         sitekey: '{{ . }}',
         callback: function (token) {
-          recaptcha_code.value = token
+          document.getElementById('recaptcha_code').value = token
           form.submit()
         }
       })
     })
-    form.addEventListener('submit', function (evt) {
+    document.getElementById('form').addEventListener('submit', function (evt) {
       evt.preventDefault()
       grecaptcha.execute()
     })

src/submit.html

@@ -23,7 +23,7 @@ server.run({}, async (req) => {
     return {
       statusCode: 200,
       headers: { 'content-type': 'text/html' },
-      body: page
+      body: page,
     }
   }
   if (req.method !== 'POST') {
@@ -33,8 +33,8 @@ server.run({}, async (req) => {
   const send = msg => ({
     statusCode: 302,
     headers: {
-      location: `?url=${encodeURIComponent(body.get('url'))}&msg=${encodeURIComponent(msg)}`
-    }
+      location: `?url=${encodeURIComponent(body.get('url'))}&msg=${encodeURIComponent(msg)}`,
+    },
   })
   if (process.env.APP_RECAPTCHA_SITE) {
     const recaptchaRes = await got({
@@ -43,23 +43,18 @@ server.run({}, async (req) => {
       responseType: 'json',
       form: {
         secret: process.env.APP_RECAPTCHA_SECRET,
-        response: body.get('recaptcha_code')
-      }
+        response: body.get('recaptcha_code'),
+      },
     })
     if (!recaptchaRes.body.success) {
       return send('The reCAPTCHA is invalid.')
     }
   }
   const url = body.get('url')
-  const regex = challenge.urlRegex || /^https?:\/\//
+  const regex = challenge.urlRegex ?? /^https?:\/\//
   if (!regex.test(url)) {
-    return send('The URL must match ' + regex.source)
-  }
-  const payload = {
-    challengeId,
-    url,
+    return send(`The URL must match ${regex.source}`)
   }
-  console.log('publishing', JSON.stringify(payload))
-  await server.publish(payload)
+  await server.publish({ challengeId, url })
   return send('The admin will visit your URL.')
 })

src/submit.js

@@ -24,7 +24,7 @@ server.run({ subscribe: true }, async ({ message }) => {
     ctx = await (await browser).createIncognitoBrowserContext()
     await Promise.race([
       challenge.handler(url, ctx),
-      sleep(challenge.timeout)
+      sleep(challenge.timeout),
     ])
   } catch (e) {
     console.error(e)