Remove worker mode

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - StatsD metrics:
  - Gauges:
    - `ely.skinsystem.{hostname}.app.redis.pool.available`
+- Worker mode. Use URL spoofing to load balance outgoing requests.
 
 ## [4.6.0] - 2021-03-04
 ### Added

README.md

@@ -134,22 +134,6 @@ docker-compose up -d app
         </td>
         <td><code>true</code></td>
     </tr>
-    <tr>
-        <td id="remote-mojang-uuids-provider">MOJANG_TEXTURES_UUIDS_PROVIDER_DRIVER</td>
-        <td>
-            Specifies the preferred provider of the Mojang's UUIDs. Takes <code>remote</code> value.
-            In any other case, the local queue will be used.
-        </td>
-        <td><code>remote</code></td>
-    </tr>
-    <tr>
-        <td>MOJANG_TEXTURES_UUIDS_PROVIDER_URL</td>
-        <td>
-            When the UUIDs driver set to <code>remote</code>, sets the remote URL.
-            The trailing slash won't cause any problems.
-        </td>
-        <td><code>http://remote-provider.com/api/worker/mojang-uuid</code></td>
-    </tr>
     <tr>
         <td>MOJANG_API_BASE_URL</td>
         <td>
@@ -399,31 +383,6 @@ response will be:
 }
 ```
 
-### Worker mode
-
-The worker mode can be used in cooperation with the [remote server mode](#remote-mojang-uuids-provider)
-to exchange Mojang usernames to UUIDs. This mode by itself doesn't solve the problem of
-[extremely strict limits](https://github.com/elyby/chrly/issues/10) on the number of requests to the Mojang's API.
-But with a proxying load balancer (e.g. HAProxy, Nginx, etc.) it's easy to build a cluster of workers,
-which will multiply the bandwidth of the exchanging usernames to its UUIDs.
-
-The instructions for setting up a proxy load balancer are outside the context of this documentation,
-but you get the idea ;)
-
-#### `GET /api/worker/mojang-uuid/{username}`
-
-Performs [batch usernames exchange to UUIDs](https://github.com/elyby/chrly/issues/1) and returns the result in the
-[same format as it returns from the Mojang's API](https://wiki.vg/Mojang_API#Username_-.3E_UUID_at_time):
-
-```json
-{
-    "id": "3e3ee6c35afa48abb61e8cd8c42fc0d9",
-    "name": "ErickSkrauch"
-}
-```
-
-> **Note**: the results aren't cached.
-
 ### Health check
 
 #### `GET /healthcheck`

di/handlers.go

@@ -11,14 +11,12 @@ import (
 	"github.com/spf13/viper"
 
 	. "github.com/elyby/chrly/http"
-	"github.com/elyby/chrly/mojangtextures"
 )
 
 var handlers = di.Options(
 	di.Provide(newHandlerFactory, di.As(new(http.Handler))),
 	di.Provide(newSkinsystemHandler, di.WithName("skinsystem")),
 	di.Provide(newApiHandler, di.WithName("api")),
-	di.Provide(newUUIDsWorkerHandler, di.WithName("worker")),
 )
 
 func newHandlerFactory(
@@ -48,17 +46,6 @@ func newHandlerFactory(
 	// See https://github.com/gorilla/mux/issues/416#issuecomment-600079279
 	router.NotFoundHandler = requestEventsMiddleware(http.HandlerFunc(NotFoundHandler))
 
-	// Enable the worker module before api to allow gorilla.mux to correctly find the target router
-	// as it uses the first matching and /api overrides the more accurate /api/worker
-	if hasValue(enabledModules, "worker") {
-		var workerRouter *mux.Router
-		if err := container.Resolve(&workerRouter, di.Name("worker")); err != nil {
-			return nil, err
-		}
-
-		mount(router, "/api/worker", workerRouter)
-	}
-
 	if hasValue(enabledModules, "api") {
 		var apiRouter *mux.Router
 		if err := container.Resolve(&apiRouter, di.Name("api")); err != nil {
@@ -127,12 +114,6 @@ func newApiHandler(skinsRepository SkinsRepository) *mux.Router {
 	}).Handler()
 }
 
-func newUUIDsWorkerHandler(mojangUUIDsProvider *mojangtextures.BatchUuidsProvider) *mux.Router {
-	return (&UUIDsWorker{
-		MojangUuidsProvider: mojangUUIDsProvider,
-	}).Handler()
-}
-
 func hasValue(slice []string, needle string) bool {
 	for _, value := range slice {
 		if value == needle {

di/mojang_textures.go

@@ -24,7 +24,6 @@ var mojangTextures = di.Options(
 	di.Provide(newMojangTexturesBatchUUIDsProviderStrategyFactory),
 	di.Provide(newMojangTexturesBatchUUIDsProviderDelayedStrategy),
 	di.Provide(newMojangTexturesBatchUUIDsProviderFullBusStrategy),
-	di.Provide(newMojangTexturesRemoteUUIDsProvider),
 	di.Provide(newMojangSignedTexturesProvider),
 	di.Provide(newMojangTexturesStorageFactory),
 )
@@ -86,17 +85,8 @@ func newMojangTexturesProvider(
 }
 
 func newMojangTexturesUuidsProviderFactory(
-	config *viper.Viper,
 	container *di.Container,
 ) (mojangtextures.UUIDsProvider, error) {
-	preferredUuidsProvider := config.GetString("mojang_textures.uuids_provider.driver")
-	if preferredUuidsProvider == "remote" {
-		var provider *mojangtextures.RemoteApiUuidsProvider
-		err := container.Resolve(&provider)
-
-		return provider, err
-	}
-
 	var provider *mojangtextures.BatchUuidsProvider
 	err := container.Resolve(&provider)
 
@@ -188,36 +178,6 @@ func newMojangTexturesBatchUUIDsProviderFullBusStrategy(config *viper.Viper) *mo
 	)
 }
 
-func newMojangTexturesRemoteUUIDsProvider(
-	container *di.Container,
-	config *viper.Viper,
-	emitter mojangtextures.Emitter,
-) (*mojangtextures.RemoteApiUuidsProvider, error) {
-	remoteUrl, err := url.Parse(config.GetString("mojang_textures.uuids_provider.url"))
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse remote url: %w", err)
-	}
-
-	if err := container.Provide(func(emitter es.Subscriber, config *viper.Viper) *namedHealthChecker {
-		config.SetDefault("healthcheck.mojang_api_textures_provider_cool_down_duration", time.Minute+10*time.Second)
-
-		return &namedHealthChecker{
-			Name: "mojang-api-textures-provider-response-checker",
-			Checker: es.MojangApiTexturesProviderResponseChecker(
-				emitter,
-				config.GetDuration("healthcheck.mojang_api_textures_provider_cool_down_duration"),
-			),
-		}
-	}); err != nil {
-		return nil, err
-	}
-
-	return &mojangtextures.RemoteApiUuidsProvider{
-		Emitter: emitter,
-		Url:     *remoteUrl,
-	}, nil
-}
-
 func newMojangSignedTexturesProvider(emitter mojangtextures.Emitter) mojangtextures.TexturesProvider {
 	return &mojangtextures.MojangApiTexturesProvider{
 		Emitter: emitter,

docker-compose.prod.yml

@@ -20,15 +20,6 @@ services:
     environment:
       CHRLY_SECRET: replace_this_value_in_production
 
-  # Use this configuration in case when you need a remote Mojang UUIDs provider
-  # worker:
-  #   image: elyby/chrly
-  #   hostname: chrly0
-  #   restart: always
-  #   ports:
-  #     - "8080:80"
-  #   command: ["worker"]
-
   redis:
     image: redis:4.0-32bit # 32-bit version is recommended to spare some memory
     restart: always

docker-entrypoint.sh

@@ -5,7 +5,7 @@ if [ ! -d /data/capes ]; then
     mkdir -p /data/capes
 fi
 
-if [ "$1" = "serve" ] || [ "$1" = "worker" ] || [ "$1" = "token" ] || [ "$1" = "version" ]; then
+if [ "$1" = "serve" ] || [ "$1" = "token" ] || [ "$1" = "version" ]; then
     set -- /usr/local/bin/chrly "$@"
 fi