fix: flag column and new ipfs-geoip dataset (#319)

Also, removing ipfs-http-client

package.json

@@ -118,8 +118,7 @@
   },
   "dependencies": {
     "@dutu/rate-limiter": "github:dutu/rate-limiter#v1.3.1",
-    "url-ponyfill": "^0.5.10",
-    "ipfs-http-client": "^58.0.1"
+    "url-ponyfill": "^0.5.10"
   },
   "devDependencies": {
     "aegir": "^37.5.6",
@@ -130,7 +129,7 @@
     "eslint-plugin-compat": "^4.0.2",
     "fetch-ponyfill": "^7.1.0",
     "ipfs": "^0.64.2",
-    "ipfs-geoip": "^8.0.0",
+    "ipfs-geoip": "^9.0.0",
     "typescript": "^4.8.4"
   },
   "aegir": {

src/Flag.ts

@@ -1,8 +1,9 @@
 import type { GatewayNode } from './GatewayNode'
 import { Log } from './Log'
+import { lookup as IpfsGeoIpLookup } from 'ipfs-geoip'
 import { UiComponent } from './UiComponent'
-import { ipfsHttpClient } from './ipfsHttpClient'
 import { TokenBucketLimiter } from '@dutu/rate-limiter'
+import { DEFAULT_IPFS_GATEWAY } from './constants'
 
 const log = new Log('Flag')
 
@@ -88,7 +89,7 @@ class Flag extends UiComponent {
 
       await this.handleDnsQueryResponse(responseJson)
     } catch (err) {
-      log.error('problem submitting DNS request', err)
+      log.error('problem submitting DNS request', url, err)
       this.onError()
     }
   }
@@ -107,7 +108,7 @@ class Flag extends UiComponent {
     }
     if (ip != null) {
       try {
-        const geoipResponse = await window.IpfsGeoip.lookup(ipfsHttpClient, ip)
+        const geoipResponse = await IpfsGeoIpLookup(DEFAULT_IPFS_GATEWAY, ip)
 
         if (geoipResponse?.country_code != null) {
           this.onResponse(geoipResponse)

src/constants.ts

@@ -4,8 +4,10 @@ const IMG_HASH = 'bafybeibwzifw52ttrkqlikfzext5akxu7lz4xiwjgwzmqcpdzmp3n5vnbe' /
 // const IFRAME_HASH = 'bafkreifx3g6bkkwl7b4v43lvcqfo5vshbiehuvmpky2zayhfpg5qj7y3ca'
 const HASH_STRING = 'Hello from IPFS Gateway Checker'
 const TRUSTLESS_RESPONSE_TYPES = ['raw', 'car']
+const DEFAULT_IPFS_GATEWAY = 'https://ipfs.io'
 
 export {
+  DEFAULT_IPFS_GATEWAY,
   HASH_STRING,
   HASH_TO_TEST,
   // IFRAME_HASH,

src/global.d.ts

@@ -5,6 +5,7 @@
 // import type { Checker } from './Checker'
 
 declare module '@dutu/rate-limiter'
+declare module 'ipfs-geoip'
 
 // declare global {
 /**
@@ -30,11 +31,8 @@ interface Visible {
 }
 
 interface Window {
-  IpfsHttpClient: typeof import('ipfs-http-client')
-  IpfsGeoip: typeof import('ipfs-geoip')
   OnScriptloaded: typeof import('./onScriptLoaded').onScriptLoaded
   checker: import('./Checker').Checker
-  client: ReturnValue<typeof import('ipfs-http-client').create>
 }
 
 declare namespace IpfsGeoip {

src/index.html

@@ -10,10 +10,6 @@
 	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/tachyons@4.11.1/css/tachyons.min.css" integrity="sha256-XiJ+PedljEmPP2VaQzSzekfCZdPr0fpqmh9dY6kpsuQ=" crossorigin="anonymous">
 	<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ipfs-css@0.13.1/ipfs.css" integrity="sha256-crEOQ/1aKoWgku50e0aqNzt0Tt/ev2C97PVr5hGpeEY=" crossorigin="anonymous">
 	<link rel="shortcut icon" href="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAlo89/56ZQ/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACUjDu1lo89/6mhTP+zrVP/nplD/5+aRK8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHNiIS6Wjz3/ubFY/761W/+vp1D/urRZ/8vDZf/GvmH/nplD/1BNIm8AAAAAAAAAAAAAAAAAAAAAAAAAAJaPPf+knEj/vrVb/761W/++tVv/r6dQ/7q0Wf/Lw2X/y8Nl/8vDZf+tpk7/nplD/wAAAAAAAAAAAAAAAJaPPf+2rVX/vrVb/761W/++tVv/vrVb/6+nUP+6tFn/y8Nl/8vDZf/Lw2X/y8Nl/8G6Xv+emUP/AAAAAAAAAACWjz3/vrVb/761W/++tVv/vrVb/761W/+vp1D/urRZ/8vDZf/Lw2X/y8Nl/8vDZf/Lw2X/nplD/wAAAAAAAAAAlo89/761W/++tVv/vrVb/761W/++tVv/r6dQ/7q0Wf/Lw2X/y8Nl/8vDZf/Lw2X/y8Nl/56ZQ/8AAAAAAAAAAJaPPf++tVv/vrVb/761W/++tVv/vbRa/5aPPf+emUP/y8Nl/8vDZf/Lw2X/y8Nl/8vDZf+emUP/AAAAAAAAAACWjz3/vrVb/761W/++tVv/vrVb/5qTQP+inkb/op5G/6KdRv/Lw2X/y8Nl/8vDZf/Lw2X/nplD/wAAAAAAAAAAlo89/761W/++tVv/sqlS/56ZQ//LxWb/0Mlp/9DJaf/Kw2X/oJtE/7+3XP/Lw2X/y8Nl/56ZQ/8AAAAAAAAAAJaPPf+9tFr/mJE+/7GsUv/Rymr/0cpq/9HKav/Rymr/0cpq/9HKav+xrFL/nplD/8vDZf+emUP/AAAAAAAAAACWjz3/op5G/9HKav/Rymr/0cpq/9HKav/Rymr/0cpq/9HKav/Rymr/0cpq/9HKav+inkb/nplD/wAAAAAAAAAAAAAAAKKeRv+3slb/0cpq/9HKav/Rymr/0cpq/9HKav/Rymr/0cpq/9HKav+1sFX/op5G/wAAAAAAAAAAAAAAAAAAAAAAAAAAop5GUKKeRv/Nxmf/0cpq/9HKav/Rymr/0cpq/83GZ/+inkb/op5GSAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAop5G16KeRv/LxWb/y8Vm/6KeRv+inkaPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAop5G/6KeRtcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/n8AAPgfAADwDwAAwAMAAIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAAwAMAAPAPAAD4HwAA/n8AAA==" />
-    <!-- <script src="https://cdn.jsdelivr.net/npm/ipfs-http-client@56/index.min.js" integrity="sha384-nQtRd3sp3e41qrWYq2Kdr4uYrAYYFjpjVG8M76OR39X6ythvU/tl3ZBmMUtS54o+" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/ipfs-geoip@7/dist/index.min.js" integrity="sha384-xRhSHsWz2C384OynfHjLg113EXg3fohlDdASs7o6gCxkW1/nfciC5WynCV/s1Bpt" crossorigin="anonymous"></script> -->
-    <script src="https://cdn.jsdelivr.net/npm/ipfs-geoip@6.0.0/dist/index.min.js" integrity="sha256-Vhr0hZsdmsT81gd4u2bs3bLYLfDdr46nvcI/VaT9YZ4=" crossorigin="anonymous"></script>
-
 	<link href="styles.css?v=0.4" type="text/css" rel="stylesheet"/>
 </head>
 <body id="checker" class="sans-serif charcoal bg-snow-muted">