chore: added feature flag

.env.defaults

@@ -19,3 +19,5 @@ AWS_SECRET_ACCESS_KEY=
 AWS_S3_BUCKET=
 AWS_S3_REGION=
 AWS_S3_ENDPOINT=
+FF_URL=https://feature-flags.decentraland.org
+ATLAS_SERVER_URL=

package.json

@@ -18,8 +18,10 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.0.0",
     "@dcl/schemas": "^9.8.0",
     "@well-known-components/env-config-provider": "^1.2.0",
+    "@well-known-components/features-component": "^2.0.0",
     "@well-known-components/http-requests-logger-component": "^2.1.0",
     "@well-known-components/http-server": "^1.1.6",
     "@well-known-components/http-tracer-component": "^1.1.0",
@@ -33,8 +35,7 @@
     "ethers": "^5.7.2",
     "fp-future": "^1.0.1",
     "node-fetch": "^2.6.1",
-    "p-limit": "^3.1.0",
-    "@aws-sdk/client-s3": "^3.0.0"
+    "p-limit": "^3.1.0"
   },
   "devDependencies": {
     "@types/cli-progress": "^3.9.1",
@@ -45,4 +46,4 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.9.4"
   }
-}
+}

src/components.ts

@@ -9,6 +9,7 @@ import {
   createStatusCheckComponent,
   IFetchComponent,
 } from '@well-known-components/http-server'
+import { createFeaturesComponent } from '@well-known-components/features-component'
 import { createSubgraphComponent } from '@well-known-components/thegraph-component'
 import { createLogComponent } from '@well-known-components/logger'
 import { createTracerComponent } from '@well-known-components/tracer-component'
@@ -113,7 +114,17 @@ export async function initComponents(): Promise<AppComponents> {
   const statusChecks = await createStatusCheckComponent({ server, config })
   const renderMiniMap = await createMiniMapRendererComponent({ map })
   const renderEstateMiniMap = await createEstatesRendererComponent({ map })
-
+  const features = await createFeaturesComponent(
+    {
+      config,
+      logs,
+      fetch,
+    },
+    (await config.requireString('ATLAS_SERVER_URL')) ||
+      `http://${await config.getString(
+        'HTTP_SERVER_HOST'
+      )}:${await config.getString('HTTP_SERVER_PORT')}`
+  )
   return {
     config,
     api,
@@ -131,5 +142,6 @@ export async function initComponents(): Promise<AppComponents> {
     rentals,
     renderMiniMap,
     renderEstateMiniMap,
+    features,
   }
 }

src/controllers/handlers.ts

@@ -3,71 +3,86 @@ import { cacheWrapper } from '../logic/cache-wrapper'
 import { extractParams, getFilterFromUrl } from '../logic/filter-params'
 import { isErrorWithMessage } from '../logic/error'
 import { AppComponents, Context } from '../types'
+import { ApplicationName, Feature } from '../modules/features/types'
 
 export const createTilesRequestHandler = (
-  components: Pick<AppComponents, 'map'>
+  components: Pick<AppComponents, 'map' | 'features'>
 ) => {
-  const { map } = components
+  const { map, features } = components
   return cacheWrapper(
     async (context: { url: URL }) => {
       if (!map.isReady()) {
         return { status: 503, body: 'Not ready' }
       }
 
-      const lastUploadedUrls = map.getLastUploadedTilesUrl()
-      if (!lastUploadedUrls.v2) {
-        const tiles = await map.getTiles()
-        const data = getFilterFromUrl(context.url, tiles)
-        return {
-          status: 200,
-          headers: {
-            'content-type': 'application/json',
-          } as Record<string, string>,
-          body: JSON.stringify({ ok: true, data }),
+      if (
+        await features.getIsFeatureEnabled(
+          ApplicationName.DAPPS,
+          Feature.ATLAS_REDIRECT_TO_S3
+        )
+      ) {
+        const lastUploadedUrls = map.getLastUploadedTilesUrl()
+        if (lastUploadedUrls.v2) {
+          return {
+            status: 301,
+            headers: {
+              location: lastUploadedUrls.v2,
+              'cache-control': 'public, max-age=60',
+            } as Record<string, string>,
+          }
         }
       }
 
+      const tiles = await map.getTiles()
+      const data = getFilterFromUrl(context.url, tiles)
       return {
-        status: 301,
+        status: 200,
         headers: {
-          location: lastUploadedUrls.v2,
-          'cache-control': 'public, max-age=60',
+          'content-type': 'application/json',
         } as Record<string, string>,
+        body: JSON.stringify({ ok: true, data }),
       }
     },
     [map.getLastUpdatedAt]
   )
 }
 
 export const createLegacyTilesRequestHandler = (
-  components: Pick<AppComponents, 'map'>
+  components: Pick<AppComponents, 'map' | 'features'>
 ) => {
-  const { map } = components
+  const { map, features } = components
   return cacheWrapper(
     async (context: { url: URL }) => {
       if (!map.isReady()) {
         return { status: 503, body: 'Not ready' }
       }
 
-      const lastUploadedUrls = map.getLastUploadedTilesUrl()
-      if (!lastUploadedUrls.v1) {
-        const tiles = await map.getTiles()
-        const data = toLegacyTiles(getFilterFromUrl(context.url, tiles))
-        return {
-          status: 200,
-          headers: {
-            'content-type': 'application/json',
-          } as Record<string, string>,
-          body: JSON.stringify({ ok: true, data }),
+      if (
+        await features.getIsFeatureEnabled(
+          ApplicationName.DAPPS,
+          Feature.ATLAS_REDIRECT_TO_S3
+        )
+      ) {
+        const lastUploadedUrls = map.getLastUploadedTilesUrl()
+        if (lastUploadedUrls.v1) {
+          return {
+            status: 301,
+            headers: {
+              location: lastUploadedUrls.v1,
+              'cache-control': 'public, max-age=60',
+            } as Record<string, string>,
+          }
         }
       }
 
+      const tiles = await map.getTiles()
+      const data = toLegacyTiles(getFilterFromUrl(context.url, tiles))
       return {
-        status: 301,
+        status: 200,
         headers: {
-          location: lastUploadedUrls.v1,
-          'cache-control': 'public, max-age=60',
+          'content-type': 'application/json',
         } as Record<string, string>,
+        body: JSON.stringify({ ok: true, data }),
       }
     },
     [map.getLastUpdatedAt]

src/controllers/routes.ts

@@ -20,7 +20,7 @@ import { Router } from '@well-known-components/http-server'
 
 export type RoutesComponents = Pick<
   AppComponents,
-  'server' | 'map' | 'image' | 'config' | 'api' | 'district'
+  'server' | 'map' | 'image' | 'config' | 'api' | 'district' | 'features'
 >
 
 // We return the entire router because it will be easier to test than a whole server

src/modules/features/types.ts

@@ -0,0 +1,15 @@
+export enum Feature {
+  ATLAS_REDIRECT_TO_S3 = 'atlas-redirect-to-s3',
+}
+
+export enum ApplicationName {
+  EXPLORER = 'explorer',
+  BUILDER = 'builder',
+  MARKETPLACE = 'marketplace',
+  ACCOUNT = 'account',
+  DAO = 'dao',
+  DAPPS = 'dapps',
+  EVENTS = 'events',
+  LANDING = 'landing',
+  TEST = 'test',
+}

src/types.ts

@@ -1,8 +1,3 @@
-import { IApiComponent } from './modules/api/types'
-import { IMapComponent } from './modules/map/types'
-import { IDistrictComponent } from './modules/district/types'
-import { IImageComponent } from './modules/image/types'
-import { IS3Component } from './modules/s3/component'
 import {
   IConfigComponent,
   ILoggerComponent,
@@ -13,9 +8,14 @@ import {
 } from '@well-known-components/interfaces'
 import { IRentalsComponent } from './modules/rentals/types'
 import { ISubgraphComponent } from '@well-known-components/thegraph-component'
+import { IFeaturesComponent } from '@well-known-components/features-component'
+import { IApiComponent } from './modules/api/types'
+import { IMapComponent } from './modules/map/types'
+import { IDistrictComponent } from './modules/district/types'
+import { IImageComponent } from './modules/image/types'
+import { IS3Component } from './modules/s3/component'
 import { Metrics } from './metrics'
 import { MiniMapRendererComponent } from './adapters/mini-map-renderer'
-
 export type GlobalContext = {
   components: AppComponents
 }
@@ -37,6 +37,7 @@ export type AppComponents = {
   statusChecks: IBaseComponent
   renderMiniMap: MiniMapRendererComponent
   renderEstateMiniMap: MiniMapRendererComponent
+  features: IFeaturesComponent
 }
 
 export type TestComponents = AppComponents