From 32d643e138854bc1c3a7fce793cd4c6cd8faa139 Mon Sep 17 00:00:00 2001 From: Aras Abbasi Date: Thu, 16 Oct 2025 22:38:07 +0200 Subject: [PATCH 1/4] fix: improve ui --- lib/server.js | 30 ++++++++++++++-- src/components/App.jsx | 54 +++++++++++++++++------------ src/components/Blank.jsx | 2 +- src/components/EventDescription.jsx | 12 +++---- src/components/ListItem.jsx | 41 +++++++++++++--------- 5 files changed, 90 insertions(+), 49 deletions(-) diff --git a/lib/server.js b/lib/server.js index ea733c0..b6ce51b 100644 --- a/lib/server.js +++ b/lib/server.js @@ -27,6 +27,7 @@ const EventBus = require('./event-bus') const KeepAlive = require('./keep-alive') const isProd = process.env.NODE_ENV === 'production' +const port = parseInt(process.env.PORT, 10) || 3000 const [ faviconIco, @@ -54,8 +55,32 @@ const [ Sentry.setupFastifyErrorHandler(fastify) } - await fastify.register(fastifySwagger) - await fastify.register(fastifySwaggerUi) + await fastify.register(fastifySwagger, { + openapi: { + openapi: '3.0.0', + info: { + title: 'smee.io', + description: 'The smee.io REST-API', + version: '0.1.0' + }, + servers: [ + { + url: `http://localhost:${port}`, + description: 'Development server' + }, + { + url: 'https://smee.io', + description: 'Production server' + } + ] + } + }) + await fastify.register(fastifySwaggerUi, { + logo: false, + theme: { + title: 'smee.io API', + } + }) await fastify.register(fastifyCors) await fastify.register(fastifyHelmet) @@ -322,7 +347,6 @@ const [ return reply.status(200) }) - const port = parseInt(process.env.PORT, 10) || 3000 fastify.listen({ port, host: '0.0.0.0' }, (err, address) => { if (err) { console.error(err) diff --git a/src/components/App.jsx b/src/components/App.jsx index eaaec9a..4185323 100644 --- a/src/components/App.jsx +++ b/src/components/App.jsx @@ -17,9 +17,26 @@ export default class App extends Component { const ref = localStorage.getItem(this.ref) const pinnedRef = localStorage.getItem(this.pinnedRef) + let log = [] + let pinnedDeliveries = [] + + try { + log = JSON.parse(ref) + } catch { + localStorage.removeItem(this.ref) + } + + if (pinnedRef) { + try { + pinnedDeliveries = JSON.parse(pinnedRef) + } catch { + localStorage.removeItem(this.pinnedRef) + } + } + this.state = { - log: ref ? JSON.parse(ref) : [], - pinnedDeliveries: pinnedRef ? JSON.parse(pinnedRef) : [], + log, + pinnedDeliveries, filter: '', connection: false } @@ -34,36 +51,28 @@ export default class App extends Component { setupEventSource () { const url = window.location.pathname - console.log('Connecting to event source:', url) this.events = new window.EventSource(url) this.events.onopen = this.onopen.bind(this) this.events.onmessage = this.onmessage.bind(this) this.events.onerror = this.onerror.bind(this) } - onopen (data) { + onopen () { this.setState({ connection: true }) } - onerror (err) { + onerror () { this.setState({ connection: false }) - switch (this.events.readyState) { - case window.EventSource.CONNECTING: - console.log('Reconnecting...', err) - break - case window.EventSource.CLOSED: - console.log('Reinitializing...', err) - this.setupEventSource() - break + if (this.events.readyState === window.EventSource.CLOSED) { + this.setupEventSource() } } onmessage (message) { - console.log('received message!') const json = JSON.parse(message.data) // Prevent duplicates in the case of redelivered payloads @@ -79,7 +88,6 @@ export default class App extends Component { handleClear () { if (confirm('Are you sure you want to clear the delivery log?')) { - console.log('Clearing logs') const filtered = this.state.log.filter(this.isPinned) this.setState({ log: filtered }) if (filtered.length > 0) { @@ -113,13 +121,13 @@ export default class App extends Component { render () { const { log, filter, pinnedDeliveries } = this.state - let filtered = log + + let filtered = log || [] if (filter) { filtered = log.filter(l => { if (filter && filter.includes(':')) { let [searchString, value] = filter.split(':') if (!searchString.startsWith('body')) searchString = `body.${searchString}` - console.log(l, searchString, value) return get(l, searchString) === value } return true @@ -132,18 +140,18 @@ export default class App extends Component { const pinnedLogs = filtered.filter(this.isPinned).map((item, i, arr) => { const id = item['x-github-delivery'] || item.timestamp - return + return }) const allLogs = filtered.filter(item => !this.isPinned(item)).map((item, i, arr) => { const id = item['x-github-delivery'] || item.timestamp - return + return }) return (
-
+

Webhook Deliveries

{this.state.connection @@ -153,13 +161,13 @@ export default class App extends Component {
- {log.length > 0 + {log?.length > 0 ? ( -
+
- get-value syntax + get-value syntax
diff --git a/src/components/Blank.jsx b/src/components/Blank.jsx index 5db4822..6b40afa 100644 --- a/src/components/Blank.jsx +++ b/src/components/Blank.jsx @@ -4,7 +4,7 @@ import CodeExample from './CodeExample.jsx' export default function Blank () { return ( -
+
diff --git a/src/components/EventDescription.jsx b/src/components/EventDescription.jsx index 850653e..2ac19e7 100644 --- a/src/components/EventDescription.jsx +++ b/src/components/EventDescription.jsx @@ -40,18 +40,18 @@ function formatDate (date) { export default function EventDescription ({ event, - payload, + body, timestamp }) { const formattedTime = formatDate(new Date(timestamp)) - const onARepo = payload.repository && payload.repository.full_name - const onRepos = payload.repositories && payload.repositories.every(r => r.full_name) + const onARepo = body.repository && body.repository.full_name + const onRepos = body.repositories && body.repositories.every(r => r.full_name) return (
-

There was a {event} event received on {formattedTime}.

- {onARepo &&

This event was sent by {payload.repository.full_name}.

} - {onRepos &&

This event was triggered against: {payload.repositories.map(r => {r.full_name})}.

} +

There was a {event} event received on {formattedTime}.

+ {onARepo &&

This event was sent by {body.repository.full_name}.

} + {onRepos &&

This event was triggered against: {body.repositories.map(r => {r.full_name})}.

}
) } diff --git a/src/components/ListItem.jsx b/src/components/ListItem.jsx index 06f840b..a1c3c75 100644 --- a/src/components/ListItem.jsx +++ b/src/components/ListItem.jsx @@ -76,34 +76,34 @@ export default class ListItem extends Component { render () { const { expanded, copied, redelivered } = this.state - const { now, item, last, pinned, togglePinned } = this.props + const { now, item, pinned, togglePinned } = this.props - const event = item['x-github-event'] - const payload = item.body - const id = item['x-github-delivery'] || item.timestamp + const { body, query, timestamp, action, ...headers } = item + const eventType = item['x-github-event'] + const eventId = item['x-github-delivery'] || timestamp return ( -
  • -
    +
  • +
    - +
    - {event} - + {eventId} {eventType} +
    {expanded && ( -
    +
    -

    Event ID: {id}

    - +

    Event ID: {eventId}

    +
    -
    Payload
    +
    Headers
    +
    + 
    +                  {Object.entries(headers).sort().map(([key, value]) => 
    {key}: {value}
    )}
+
    +
    +
    +
    +
    Body
    From 98c7b26721dccd2bbcc776094fca4baaaefea966 Mon Sep 17 00:00:00 2001 From: Aras Abbasi Date: Thu, 16 Oct 2025 23:38:37 +0200 Subject: [PATCH 2/4] avoid emitLocalEvent --- lib/event-bus.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/event-bus.js b/lib/event-bus.js index d5eed34..f400c2a 100644 --- a/lib/event-bus.js +++ b/lib/event-bus.js @@ -45,16 +45,6 @@ function EventBus ({ logger = console } = {}) { }) } -/** - * Emit an event to this machine's in-memory EventEmitter - * @param {object} opts - * @param {string} opts.channel - Channel name - * @param {any} opts.payload - */ -EventBus.prototype.emitLocalEvent = function (opts) { - return this.events.emit(opts.channel, opts.payload) -} - /** * Emit an event to the Redis bus, which will tell every subscriber about it * @param {object} opts @@ -68,7 +58,7 @@ EventBus.prototype.emitEvent = process.env.REDIS_URL // Only emit local events if Redis isn't configured : async function (opts) { - this.emitLocalEvent(opts) + return this.events.emit(opts.channel, opts.payload) } module.exports = EventBus From 4e86776134288698c576f2c3066c54065f06e6cc Mon Sep 17 00:00:00 2001 From: Aras Abbasi Date: Thu, 16 Oct 2025 23:41:50 +0200 Subject: [PATCH 3/4] handle corrupted data --- src/components/App.jsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/App.jsx b/src/components/App.jsx index 4185323..205aa4c 100644 --- a/src/components/App.jsx +++ b/src/components/App.jsx @@ -23,14 +23,18 @@ export default class App extends Component { try { log = JSON.parse(ref) } catch { - localStorage.removeItem(this.ref) + if (confirm('Your saved data for the desired channel is corrupted. Clear it?')) { + localStorage.removeItem(this.ref) + } } if (pinnedRef) { try { pinnedDeliveries = JSON.parse(pinnedRef) } catch { - localStorage.removeItem(this.pinnedRef) + if (confirm('Your saved pinned deliveries for the desired channel is corrupted. Clear it?')) { + localStorage.removeItem(this.pinnedRef) + } } } From 0b38365e51c6c7b7cbed083a330e3bcab98cf532 Mon Sep 17 00:00:00 2001 From: Aras Abbasi Date: Thu, 16 Oct 2025 23:51:38 +0200 Subject: [PATCH 4/4] use rawBody for redelivery --- lib/server.js | 72 +++++++++++-------------- package-lock.json | 102 ++++++++++++++++++++++++++++-------- package.json | 5 +- src/components/ListItem.jsx | 21 ++++---- 4 files changed, 127 insertions(+), 73 deletions(-) diff --git a/lib/server.js b/lib/server.js index b6ce51b..d992111 100644 --- a/lib/server.js +++ b/lib/server.js @@ -17,6 +17,7 @@ const crypto = require('crypto') const path = require('path') const fs = require('fs') const Fastify = require('fastify') +const fastifyRawBody = require('fastify-raw-body') const fastifySwagger = require('@fastify/swagger') const fastifySwaggerUi = require('@fastify/swagger-ui') const fastifyCors = require('@fastify/cors') @@ -55,6 +56,10 @@ const [ Sentry.setupFastifyErrorHandler(fastify) } + await fastify.register(fastifyRawBody, { + global: false, + }) + await fastify.register(fastifySwagger, { openapi: { openapi: '3.0.0', @@ -81,8 +86,12 @@ const [ title: 'smee.io API', } }) - await fastify.register(fastifyCors) - await fastify.register(fastifyHelmet) + await fastify.register(fastifyCors, { + origin: '*' + }) + await fastify.register(fastifyHelmet, { + contentSecurityPolicy: false + }) if (process.env.FORCE_HTTPS) { await fastify.register(forceHttps) @@ -278,6 +287,9 @@ const [ }) fastify.post('/:channel', { + config: { + rawBody: true + }, onRequest: channelsBlockedHandler, schema: { params: { @@ -291,62 +303,40 @@ const [ } } }, + headers: { + type: 'object', + properties: { + 'x-github-event': { type: 'string' }, + 'x-github-delivery': { type: 'string', format: 'uuid' }, + 'x-hub-signature-256': { + type: 'string', + description: 'SHA256 HMAC hex digest of the body, using the webhook secret as the key, in the format sha256=...', + pattern: '^sha256=[a-f0-9]{64}$' + }, + }, + additionalProperties: { + type: 'string' + } + }, body: { type: 'object' } } }, async (req, reply) => { - // Emit an event to the Redis bus await bus.emitEvent({ channel: req.params.channel, payload: { ...req.headers, body: req.body, + rawBody: req.rawBody.toString('utf-8'), query: req.query, timestamp: Date.now() } }) - return reply.status(200).send() + return reply.status(200).send('ok\n') }) - // Resend payload via the event emitter - fastify.post('/:channel/redeliver', - { - onRequest: channelsBlockedHandler, - params: { - type: 'object', - properties: { - channel: { - type: 'string', - minLength: 1, - maxLength: 128, - pattern: '^[a-zA-Z0-9-_]+$' - } - } - }, - schema: { - params: { - type: 'object', - properties: { - channel: { - type: 'string' - } - } - }, - body: { - type: 'object' - } - } - }, async (req, reply) => { - // Emit an event to the Redis bus - await bus.emitEvent({ - channel: req.params.channel, - payload: req.body - }) - return reply.status(200) - }) - fastify.listen({ port, host: '0.0.0.0' }, (err, address) => { if (err) { console.error(err) diff --git a/package-lock.json b/package-lock.json index 56b6dac..212b8ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "dotenv": "^17.2.1", "eventsource": "^4.0.0", "fastify": "^5.4.0", + "fastify-raw-body": "^5.0.0", "ioredis": "^5.3.2" }, "devDependencies": { @@ -105,7 +106,6 @@ "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.3", @@ -2484,7 +2484,6 @@ "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==", "license": "Apache-2.0", - "peer": true, "engines": { "node": ">=8.0.0" } @@ -2506,7 +2505,6 @@ "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-2.1.0.tgz", "integrity": "sha512-zOyetmZppnwTyPrt4S7jMfXiSX9yyfF0hxlA8B5oo2TtKl+/RGCy7fi4DrBfIf3lCPrkKsRBWZZD7RFojK7FDg==", "license": "Apache-2.0", - "peer": true, "engines": { "node": "^18.19.0 || >=20.6.0" }, @@ -2519,7 +2517,6 @@ "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.1.0.tgz", "integrity": "sha512-RMEtHsxJs/GiHHxYT58IY57UXAQTuUnZVco6ymDEqTNlJKTimM4qPUPVe8InNFyBjhHBEAx4k3Q8LtNayBsbUQ==", "license": "Apache-2.0", - "peer": true, "dependencies": { "@opentelemetry/semantic-conventions": "^1.29.0" }, @@ -2535,7 +2532,6 @@ "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.204.0.tgz", "integrity": "sha512-vV5+WSxktzoMP8JoYWKeopChy6G3HKk4UQ2hESCRDUUTZqQ3+nM3u8noVG0LmNfRWwcFBnbZ71GKC7vaYYdJ1g==", "license": "Apache-2.0", - "peer": true, "dependencies": { "@opentelemetry/api-logs": "0.204.0", "import-in-the-middle": "^1.8.1", @@ -2928,7 +2924,6 @@ "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.1.0.tgz", "integrity": "sha512-1CJjf3LCvoefUOgegxi8h6r4B/wLSzInyhGP2UmIBYNlo4Qk5CZ73e1eEyWmfXvFtm1ybkmfb2DqWvspsYLrWw==", "license": "Apache-2.0", - "peer": true, "dependencies": { "@opentelemetry/core": "2.1.0", "@opentelemetry/semantic-conventions": "^1.29.0" @@ -2945,7 +2940,6 @@ "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.1.0.tgz", "integrity": "sha512-uTX9FBlVQm4S2gVQO1sb5qyBLq/FPjbp+tmGoxu4tIgtYGmBYB44+KX/725RFDe30yBSaA9Ml9fqphe1hbUyLQ==", "license": "Apache-2.0", - "peer": true, "dependencies": { "@opentelemetry/core": "2.1.0", "@opentelemetry/resources": "2.1.0", @@ -2963,7 +2957,6 @@ "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.37.0.tgz", "integrity": "sha512-JD6DerIKdJGmRp4jQyX5FlrQjA4tjOw1cvfsPAZXfOOEErMUHjPcPSICS+6WnM0nB0efSFARh0KAZss+bvExOA==", "license": "Apache-2.0", - "peer": true, "engines": { "node": ">=14" } @@ -3358,8 +3351,7 @@ "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-11.2.1.tgz", "integrity": "sha512-EkAig9PBZMjdWqaIk8l3Co31tUAfhbl/JH2m8U/YnEe3/VSFyYSmSKk46bq83o0ve7vEdNaeCVPuO8/3xFSV/Q==", "dev": true, - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/@primer/view-components": { "version": "0.43.6", @@ -3870,7 +3862,6 @@ "integrity": "sha512-n1H6IcDhmmUEG7TNVSspGmiHHutt7iVKtZwRppD7e04wha5MrkV1h3pti9xQLcCMt6YWsncpoT0HMjkH1FNwWQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.46.0", "@typescript-eslint/types": "8.46.0", @@ -4559,7 +4550,6 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -5188,7 +5178,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.9", "caniuse-lite": "^1.0.30001746", @@ -5220,6 +5209,15 @@ "dev": true, "license": "MIT" }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/call-bind": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", @@ -6812,7 +6810,6 @@ "integrity": "sha512-vPZZsiOKaBAIATpFE2uMI4w5IRwdv/FpQ+qZZMR4E+PeOcM4OeoEbqxRMnywdxP19TyB/3h6QBB0EWon7letSQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@typescript-eslint/types": "^8.35.0", "comment-parser": "^1.4.1", @@ -7401,6 +7398,29 @@ ], "license": "MIT" }, + "node_modules/fastify-raw-body": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/fastify-raw-body/-/fastify-raw-body-5.0.0.tgz", + "integrity": "sha512-2qfoaQ3BQDhZ1gtbkKZd6n0kKxJISJGM6u/skD9ljdWItAscjXrtZ1lnjr7PavmXX9j4EyCPmBDiIsLn07d5vA==", + "license": "MIT", + "dependencies": { + "fastify-plugin": "^5.0.0", + "raw-body": "^3.0.0", + "secure-json-parse": "^2.4.0" + }, + "engines": { + "node": ">= 10" + }, + "funding": { + "url": "https://github.com/Eomm/fastify-raw-body?sponsor=1" + } + }, + "node_modules/fastify-raw-body/node_modules/secure-json-parse": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.7.0.tgz", + "integrity": "sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==", + "license": "BSD-3-Clause" + }, "node_modules/fastq": { "version": "1.19.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", @@ -8145,6 +8165,22 @@ "node": ">=10.17.0" } }, + "node_modules/iconv-lite": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz", + "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==", + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/icss-utils": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", @@ -9595,7 +9631,6 @@ "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", "dev": true, "license": "MIT", - "peer": true, "bin": { "jiti": "lib/jiti-cli.mjs" } @@ -10970,7 +11005,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -11394,13 +11428,27 @@ "safe-buffer": "^5.1.0" } }, + "node_modules/raw-body": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-3.0.1.tgz", + "integrity": "sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA==", + "license": "MIT", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.7.0", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/react": { "version": "19.2.0", "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz", "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -11427,7 +11475,6 @@ "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -11882,6 +11929,12 @@ "node": ">=10" } }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "license": "MIT" + }, "node_modules/sass": { "version": "1.93.2", "resolved": "https://registry.npmjs.org/sass/-/sass-1.93.2.tgz", @@ -12007,7 +12060,6 @@ "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -13108,7 +13160,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -13367,6 +13418,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -13431,6 +13483,15 @@ "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==", "license": "MIT" }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/unrs-resolver": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/unrs-resolver/-/unrs-resolver-1.11.1.tgz", @@ -13624,7 +13685,6 @@ "integrity": "sha512-7h/weGm9d/ywQ6qzJ+Xy+r9n/3qgp/thalBbpOi5i223dPXKi04IBtqPN9nTd+jBc7QKfvDbaBnFipYp4sJAUQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/eslint-scope": "^3.7.7", "@types/estree": "^1.0.8", diff --git a/package.json b/package.json index f302fbd..113c900 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,9 @@ { "name": "smee.io", "private": true, - "sideEffects": ["*.scss"], + "sideEffects": [ + "*.scss" + ], "description": "Receives payloads then sends them to your locally running application.", "author": "Jason Etcovitch (https://github.com/JasonEtco)", "license": "ISC", @@ -26,6 +28,7 @@ "dotenv": "^17.2.1", "eventsource": "^4.0.0", "fastify": "^5.4.0", + "fastify-raw-body": "^5.0.0", "ioredis": "^5.3.2" }, "devDependencies": { diff --git a/src/components/ListItem.jsx b/src/components/ListItem.jsx index a1c3c75..94e0357 100644 --- a/src/components/ListItem.jsx +++ b/src/components/ListItem.jsx @@ -63,12 +63,13 @@ export default class ListItem extends Component { } handleRedeliver () { - return window.fetch(`${window.location.pathname}/redeliver`, { + const { body, rawBody, query, timestamp, action, ...headers } = this.props.item + + const querystring = '?' + new URLSearchParams(query).toString() + return window.fetch(`${window.location.pathname}${querystring}`, { method: 'POST', - body: JSON.stringify(this.props.item), - headers: { - 'Content-Type': 'application/json' - } + body: rawBody || JSON.stringify(body), + headers }).then(res => { this.setState({ redelivered: res.status === 200 }) }) @@ -78,9 +79,9 @@ export default class ListItem extends Component { const { expanded, copied, redelivered } = this.state const { now, item, pinned, togglePinned } = this.props - const { body, query, timestamp, action, ...headers } = item - const eventType = item['x-github-event'] - const eventId = item['x-github-delivery'] || timestamp + const { body, rawBody, query, timestamp, action, ...headers } = item + const eventType = headers['x-github-event'] + const eventId = headers['x-github-delivery'] || timestamp return (
  • @@ -89,7 +90,7 @@ export default class ListItem extends Component {
    • {eventId} {eventType} - +
    @@ -98,7 +99,7 @@ export default class ListItem extends Component {

    Event ID: {eventId}

    - +