GeoIp location

.github/workflows/validate.yml

@@ -48,6 +48,11 @@ jobs:
     uses: ./.github/workflows/test-setup.yml
     with:
       package: cdn-location
+  geoip-location:
+    needs: build
+    uses: ./.github/workflows/test-setup.yml
+    with:
+      package: geoip-location
   protocol:
     needs: build
     uses: ./.github/workflows/test-setup.yml

package.json

@@ -18,6 +18,7 @@
         "packages/utils",
         "packages/test-utils",
         "packages/cdn-location",
+        "packages/geoip-location",
         "packages/protocol",
         "packages/proto-rpc",
         "packages/autocertifier-client",

packages/autocertifier-server/test/integration/StreamrChallenger.test.ts

@@ -50,7 +50,7 @@ describe('StreamrChallenger', () => {
                 },
                 websocketHost: '127.0.0.1',
                 websocketPortRange: { min: 12323, max: 12323 },
-                createLocalPeerDescriptor: () => mockPeerDescriptor1
+                createLocalPeerDescriptor: async () => mockPeerDescriptor1
             }),
             metricsContext: new MetricsContext()
         })

packages/broker/src/broker.ts

@@ -24,7 +24,17 @@ export const createBroker = async (configWithoutDefaults: Config): Promise<Broke
     const config = validateConfig(configWithoutDefaults, BROKER_CONFIG_SCHEMA)
     const plugins: Plugin<any>[] = Object.keys(config.plugins).map((name) => createPlugin(name, config))
     applyPluginClientConfigs(plugins, config.client)
-    const streamrClient = new StreamrClient(config.client)
+    const streamrClient = new StreamrClient({
+        ...config.client,
+        network: {
+            ...config.client.network,
+            controlLayer: {
+                ...config.client.network?.controlLayer,
+                geoIpDatabaseFolder: config.client.network?.controlLayer?.geoIpDatabaseFolder ??
+                    '~/.streamr/geoipdatabases' // TODO: more cleaner solution?
+            }
+        }
+    })
 
     let httpServer: HttpServer | HttpsServer | undefined
 
@@ -70,7 +80,7 @@ export const createBroker = async (configWithoutDefaults: Config): Promise<Broke
 }
 
 process.on('uncaughtException', (err) => {
-    logger.fatal( 'Encountered uncaughtException', { err })
+    logger.fatal('Encountered uncaughtException', { err })
     process.exit(1)
 })
 

packages/browser-test-runner/webpack.config.js

@@ -10,7 +10,7 @@ module.exports = function({ entry, libraryName, alias = {} }) {
             },
             mode: 'development',
             entry,
-            devtool: 'source-map',
+            devtool: 'eval-source-map',
             module: {
                 rules: [
                     {

packages/cdn-location/.eslintignore

@@ -2,3 +2,5 @@ node_modules/**
 dist/**
 .idea/**
 src/proto/**
+data-generation/final-data/airportCodeToRegion.ts
+src/airportCodeToRegion.ts