feat: update to ipfs-geoip v9 #2061
Conversation
package-lock.json
Outdated
| "multiformats": { | ||
| "version": "9.6.5", | ||
| "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-9.6.5.tgz", | ||
| "integrity": "sha512-vMwf/FUO+qAPvl3vlSZEgEVFY/AxeZq5yg761ScF3CZsXgmTi/HGkicUiNN0CI4PW8FiY2P0OLklOcmQjdQJhw==" | ||
| "version": "9.9.0", | ||
| "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-9.9.0.tgz", | ||
| "integrity": "sha512-HoMUjhH9T8DDBNT+6xzkrd9ga/XiBI4xLr58LJACwK6G3HTOPeMz4nB4KJs33L2BelrIJa7P0VuNaVF3hMYfjg==" |
There was a problem hiding this comment.
we might want to prevent this change because of #1965
There was a problem hiding this comment.
specific dependency tracking issue: #2048
There was a problem hiding this comment.
Sooo... actually we don't need that. The dependencies on ipfs-geoip are wrong. Fixed those here: ipfs-shipyard/ipfs-geoip#100
There was a problem hiding this comment.
left a comment at ipfs/aegir#1104 (comment) and mentioned it in a peek at ipfs-geoip pr
|
@whizzzkid mind retrying with ipfs-geoip v9.0.1 that includes ipfs-shipyard/ipfs-geoip#100? If we can land this PR before Thursday, then we could make a new ipfs-webui release and include it in Kubo 0.17-rc1 :) |
| if (!Array.isArray(rule.exclude)) { | ||
| rule.exclude = [rule.exclude] | ||
| } | ||
| PURE_ESM_MODULES.forEach(module => { |
There was a problem hiding this comment.
since pure ESM modules like ipfs-geoip are already built, we need to let babel know that this can be skipped for transpilation.
| function modifyBabelLoaderRuleForTest (rules) { | ||
| return modifyBabelLoaderRules(rules, rule => { | ||
| if (rule.options && rule.options.plugins) { | ||
| rule.options.plugins.push('istanbul') |
There was a problem hiding this comment.
this also gives us an opportunity to inject instrumentation in a much more cleaner way.
| } else if (rule.oneOf) { | ||
| const nestedRules = modifyBabelLoaderRule(rule.oneOf, false) | ||
| foundRules.push(...nestedRules) | ||
| function modifyBabelLoaderRules (rules, modifier = r => r) { |
There was a problem hiding this comment.
refactored the logic to make this painless and D.R.Y.
| // Instrument for code coverage in development mode | ||
| const REACT_APP_ENV = process.env.REACT_APP_ENV ?? process.env.NODE_ENV ?? 'production' | ||
| if (REACT_APP_ENV === 'test') { | ||
| modifyBabelLoaderRule(config.module.rules) | ||
| config.module.rules = modifyBabelLoaderRuleForTest(config.module.rules) |
There was a problem hiding this comment.
explicit assignment instead of in place modification on pass by reference.
| return peerLocResolver.findLocations(peers, getIpfs) | ||
| }, | ||
| getPromise: ({ store }) => peerLocResolver.findLocations( | ||
| store.selectAvailableGatewayUrl(), store.selectPeers()), |
There was a problem hiding this comment.
now we can just pull the list the gateway urls active and pass the peers.
| latency: 'n/a', | ||
| addr: { | ||
| stringTuples: () => [[4, '123.123.123.123']] | ||
| selectPeers: () => [ |
There was a problem hiding this comment.
reformatted for readability. tab +1
| @@ -15,7 +15,7 @@ import AddConnection from './AddConnection/AddConnection' | |||
| import CliTutorMode from '../components/cli-tutor-mode/CliTutorMode' | |||
| import { cliCmdKeys, cliCommandList } from '../bundles/files/consts' | |||
|
|
|||
| const PeersPage = ({ t, toursEnabled, handleJoyrideCallback, isCliTutorModeEnabled }) => ( | |||
There was a problem hiding this comment.
unused assignment.
There was a problem hiding this comment.
Thank you @whizzzkid
Tested Peers screen locally and works as expected (cachable raw blocks are loaded from gateway, and we no longer use POST to /api/v0 for fetching geoip data).
I am merging this in effort to include this and webtransport fix from #2057 in Kubo 0.17-rc1 (ipfs/kubo#9319)
lidel
dismissed
SgtPooki’s stale review
Unblocked, concern is tracked in ipfs/aegir#1104
## [2.20.0](v2.19.0...v2.20.0) (2022-11-09) CID `bafybeibjbq3tmmy7wuihhhwvbladjsd3gx3kfjepxzkq6wylik6wc3whzy` --- ### Features * add success notification on "set pinning" action ([#2038](#2038)) ([e410164](e410164)) * track remote pins in progress ([#1919](#1919)) ([d3a6524](d3a6524)) * update to ipfs-geoip v9 ([#2061](#2061)) ([546fb5a](546fb5a)) ### Bug Fixes * /webtransport breaks status page ([#2057](#2057)) ([ea89e7f](ea89e7f)), closes [#2033](#2033) ### Trivial Changes * pull new translations ([#2049](#2049)) ([f6062b2](f6062b2)) * pull new translations ([#2056](#2056)) ([e13ff17](e13ff17)) * pull new translations ([#2059](#2059)) ([0bb5bf3](0bb5bf3))
|
🎉 This PR is included in version 2.20.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Closes #2055