feat: various fixes and improvements #53
Conversation
| @@ -36,6 +36,7 @@ $ docker run -it -p 8080:8080 -e DEBUG="helia-http-gateway" helia | |||
| | Variable | Description | Default | | |||
| | --- | --- | --- | | |||
| | `DEBUG` | Debug level | `''`| | |||
| | `FASTIFY_DEBUG` | Debug level for fastify's logger | `''`| | |||
There was a problem hiding this comment.
separate env var for enabling fastify logging, since we have our own logging using debug with DEBUG already.
| "test:e2e-flame": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-flame\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"", | ||
| "test:e2e-doctor": "concurrently -k -s all -n \"gateway,playwright\" -c \"magenta,blue\" \"npm run start:dev-doctor\" \"wait-on 'tcp:$PORT' && npm run test:e2e\"", |
There was a problem hiding this comment.
these no longer seem to be working :(
| "aegir": "41.x", | ||
| "clinic": "^13.0.0", | ||
| "concurrently": "^8.2.2", | ||
| "cross-env": "^7.0.3", | ||
| "debug": "4.3.4", | ||
| "typescript": "5.x", | ||
| "wait-on": "^7.0.1" | ||
| "wait-on": "^7.1.0" | ||
| }, | ||
| "dependencies": { | ||
| "@helia/unixfs": "1.x", | ||
| "blockstore-level": "^1.1.4", | ||
| "datastore-level": "^10.1.4", | ||
| "dns-over-http-resolver": "2.1.3", | ||
| "dns-over-http-resolver": "3.0.0", | ||
| "fastify": "4.24.3", | ||
| "fastify-metrics": "10.3.2", | ||
| "fastify-metrics": "10.3.3", |
| "debug:until-death": "./debugging/until-death.sh", | ||
| "debug:test-gateways": "./debugging/test-gateways.sh" |
There was a problem hiding this comment.
helper scripts to debugging shell scripts.. only tested on macOS M1
| reuseExistingServer: process.env.CI == null | ||
| reuseExistingServer: process.env.CI == null, | ||
| env: { | ||
| DEBUG: process.env.DEBUG ?? ' ' |
There was a problem hiding this comment.
we should pass through DEBUG env var to webserver started up by playwright.
| for await (const chunk of await this.heliaFetch.fetch({ address, namespace, relativePath, signal })) { | ||
| if (type === undefined) { | ||
| type = await parseContentType({ bytes: chunk, path: relativePath }) | ||
| // this needs to happen first. | ||
| reply.raw.writeHead(200, { | ||
| 'Content-Type': type ?? DEFAULT_MIME_TYPE, | ||
| 'Cache-Control': 'public, max-age=31536000, immutable' | ||
| }) | ||
| } | ||
| reply.raw.write(Buffer.from(chunk)) |
There was a problem hiding this comment.
wrapped all this in a try-catch to handle bubbling errors on request aborts (and other things that fail, like some webrtc failures I posted as comments in #18)
| } catch (err) { | ||
| this.log('Error fetching from Helia:', err) | ||
| // TODO: If we failed here and we already wrote the headers, we need to handle that. | ||
| // await reply.code(500) |
There was a problem hiding this comment.
we should probably do something smarter here.
| const opController = new AbortController() | ||
| request.raw.on('close', () => { | ||
| if (request.raw.aborted) { | ||
| this.log('Request aborted by client') | ||
| opController.abort() | ||
| } | ||
| }) |
There was a problem hiding this comment.
listen for request cancellations
| if (address.includes('wikipedia')) { | ||
| await reply.code(500).send('Wikipedia is not yet supported. Follow https://github.com/ipfs/helia-http-gateway/issues/35 for more information.') | ||
| return | ||
| } |
There was a problem hiding this comment.
prevent wikipedia requests
| enabled: DEBUG !== '', | ||
| msgPrefix: 'helia-http-gateway:fastify', | ||
| enabled: FASTIFY_DEBUG !== '', | ||
| msgPrefix: 'helia-http-gateway:fastify ', |
There was a problem hiding this comment.
not having a trailing space caused logs prefixed with helia-http-gateway:fastifyincoming instead of helia-http-gateway:fastify incoming
|
e2e tests passing. yay! merging this. |
./debuggingscripts & readme to help with testing locallyfs.stat()async race for root files (index.html, etc) to fs.ls iterator.. seems much faster (and less wasteful)