feat: update to ipfs-geoip v9 by whizzzkid · Pull Request #2061 · ipfs/ipfs-webui

whizzzkid · 2022-11-02T15:18:51Z

Closes #2055

SgtPooki

I see that CI tests are failing, and the reason isn't obvious but it seems multiformats-ish.

SgtPooki · 2022-11-02T20:03:04Z

package-lock.json

    "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=="


we might want to prevent this change because of #1965

specific dependency tracking issue: #2048

Sooo... actually we don't need that. The dependencies on ipfs-geoip are wrong. Fixed those here: ipfs-shipyard/ipfs-geoip#100

left a comment at ipfs/aegir#1104 (comment) and mentioned it in a peek at ipfs-geoip pr

lidel · 2022-11-08T18:08:58Z

@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 :)

whizzzkid

ready for review @lidel @SgtPooki

whizzzkid · 2022-11-09T18:35:37Z

config-overrides.js

+        if (!Array.isArray(rule.exclude)) {
+          rule.exclude = [rule.exclude]
+        }
+        PURE_ESM_MODULES.forEach(module => {


since pure ESM modules like ipfs-geoip are already built, we need to let babel know that this can be skipped for transpilation.

whizzzkid · 2022-11-09T18:36:01Z

config-overrides.js

+function modifyBabelLoaderRuleForTest (rules) {
+  return modifyBabelLoaderRules(rules, rule => {
+    if (rule.options && rule.options.plugins) {
+      rule.options.plugins.push('istanbul')


this also gives us an opportunity to inject instrumentation in a much more cleaner way.

whizzzkid · 2022-11-09T18:36:20Z

config-overrides.js

-    } else if (rule.oneOf) {
-      const nestedRules = modifyBabelLoaderRule(rule.oneOf, false)
-      foundRules.push(...nestedRules)
+function modifyBabelLoaderRules (rules, modifier = r => r) {


refactored the logic to make this painless and D.R.Y.

whizzzkid · 2022-11-09T18:36:47Z

config-overrides.js

  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)


explicit assignment instead of in place modification on pass by reference.

whizzzkid · 2022-11-09T18:37:33Z

src/bundles/peer-locations.js

-      return peerLocResolver.findLocations(peers, getIpfs)
-    },
+    getPromise: ({ store }) => peerLocResolver.findLocations(
+      store.selectAvailableGatewayUrl(), store.selectPeers()),


now we can just pull the list the gateway urls active and pass the peers.

whizzzkid · 2022-11-09T18:38:03Z

src/bundles/peer-locations.test.js

-            latency: 'n/a',
-            addr: {
-              stringTuples: () => [[4, '123.123.123.123']]
+          selectPeers: () => [


reformatted for readability. tab +1

whizzzkid · 2022-11-09T18:38:25Z

src/peers/PeersPage.js

 import CliTutorMode from '../components/cli-tutor-mode/CliTutorMode'
 import { cliCmdKeys, cliCommandList } from '../bundles/files/consts'

-const PeersPage = ({ t, toursEnabled, handleJoyrideCallback, isCliTutorModeEnabled }) => (


unused assignment.

lidel

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)

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))

ipfs-gui-bot · 2022-11-09T23:25:12Z

🎉 This PR is included in version 2.20.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

whizzzkid added 2 commits November 2, 2022 15:17

Updating to geoip@9

e0f482f

Merge branch 'main' into feature/ipfs-geoip-v9

ff8719a

SgtPooki previously requested changes Nov 2, 2022

View reviewed changes

whizzzkid mentioned this pull request Nov 2, 2022

fix(deps): ESM deps should be dev-only ipfs-shipyard/ipfs-geoip#100

Merged

SgtPooki mentioned this pull request Nov 3, 2022

type: 'module' or format: 'esm' should not require dependencies ipfs/aegir#1104

Open

lidel changed the title ~~(feat) Updating to geoip@9~~ feat: update to ipfs-geoip v9 Nov 8, 2022

whizzzkid added 8 commits November 8, 2022 11:35

Merge branch 'main' into feature/ipfs-geoip-v9

2c650fb

upgrading to lates

a2a36c0

Only upgrading geoip

056195f

Undo package install

a40d8d7

Upgrading geoip

dfba157

Importing only lookup function

780be59

Skipping babel transpilation for Pure ESM

ef1f699

Fixing unit tests

98312a2

whizzzkid had a problem deploying to Deploy November 9, 2022 06:46 Error

whizzzkid added 4 commits November 9, 2022 00:46

comments

39e704e

syncing package-files

109ccfd

Fixing tests

ab9bb6f

Refactoring logic

d527194

whizzzkid had a problem deploying to Deploy November 9, 2022 18:16 Error

Removing unreachable code.

7d24f15

whizzzkid temporarily deployed to Deploy November 9, 2022 18:37 Inactive

whizzzkid commented Nov 9, 2022

View reviewed changes

whizzzkid marked this pull request as ready for review November 9, 2022 18:43

whizzzkid requested a review from a team as a code owner November 9, 2022 18:43

whizzzkid requested review from SgtPooki and lidel November 9, 2022 18:43

lidel approved these changes Nov 9, 2022

View reviewed changes

lidel merged commit 546fb5a into ipfs:main Nov 9, 2022

ipfs-gui-bot added the released label Nov 9, 2022

Conversation

whizzzkid commented Nov 2, 2022

Uh oh!

SgtPooki left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lidel commented Nov 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

whizzzkid left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lidel left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ipfs-gui-bot commented Nov 9, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

lidel commented Nov 8, 2022 •

edited

Loading

lidel left a comment •

edited

Loading