Merge branch 'minekube:master' into master

Author: julian-siebert

.examples/extend/simple-proxy/go.mod

@@ -1,70 +1,70 @@
 module simple-proxy
 
-go 1.23.2
+go 1.24.1
 
 replace go.minekube.com/gate => ../../../
 
 require (
 	github.com/robinbraemer/event v0.1.1
 	go.minekube.com/brigodier v0.0.1
 	go.minekube.com/common v0.0.6
-	go.minekube.com/gate v0.47.0
+	go.minekube.com/gate v0.48.1
 )
 
 require (
-	buf.build/gen/go/minekube/connect/protocolbuffers/go v1.35.2-20240220124425-904ce30425c9.1 // indirect
+	buf.build/gen/go/minekube/connect/protocolbuffers/go v1.36.6-20240220124425-904ce30425c9.1 // indirect
 	connectrpc.com/connect v1.18.1 // indirect
 	github.com/Tnze/go-mc v1.20.2 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
-	github.com/coder/websocket v1.8.12 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
+	github.com/coder/websocket v1.8.13 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
 	github.com/dboslee/lru v0.0.1 // indirect
 	github.com/edwingeng/deque/v2 v2.1.1 // indirect
 	github.com/emirpasic/gods v1.18.1 // indirect
 	github.com/francoispqt/gojay v1.2.13 // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/gammazero/deque v1.0.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jellydator/ttlcache/v3 v3.3.0 // indirect
-	github.com/knadh/koanf/providers/file v1.1.2 // indirect
+	github.com/knadh/koanf/providers/file v1.2.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pires/go-proxyproto v0.8.0 // indirect
 	github.com/rs/xid v1.6.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/sagikazarmark/locafero v0.6.0 // indirect
+	github.com/sagikazarmark/locafero v0.9.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/segmentio/fasthash v1.0.3 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.7.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.19.0 // indirect
+	github.com/spf13/afero v1.14.0 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/spf13/viper v1.20.1 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/urfave/cli/v2 v2.27.5 // indirect
+	github.com/urfave/cli/v2 v2.27.6 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	github.com/zyedidia/generic v1.2.1 // indirect
 	go.minekube.com/connect v0.6.2 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.8.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect
-	google.golang.org/grpc v1.69.4 // indirect
-	google.golang.org/protobuf v1.36.2 // indirect
+	golang.org/x/net v0.38.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/time v0.9.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
+	google.golang.org/grpc v1.70.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

.examples/extend/simple-proxy/go.sum

@@ -88,7 +88,7 @@ spec:
         - containerPort: 25565
           name: minecraft
         volumeMounts:
-        - mountPath: /gate/config.yml
+        - mountPath: /config.yml
           name: config
           subPath: config.yml
       volumes:

.examples/kubernetes/bundle.yaml

@@ -17,7 +17,7 @@ spec:
               name: minecraft
           volumeMounts:
             - name: config
-              mountPath: /gate/config.yml
+              mountPath: /config.yml
               subPath: config.yml
       volumes:
         - name: config

.examples/kubernetes/deploy.yaml

@@ -0,0 +1,33 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Debug",
+      "type": "go",
+      "request": "launch",
+      "mode": "debug",
+      "program": "${workspaceFolder}/gate.go",
+      "args": ["-d"],
+      "console": "integratedTerminal"
+    },
+    {
+      "name": "Debug with OTEL (Self-hosted)",
+      "type": "go",
+      "request": "launch",
+      "mode": "debug",
+      "program": "${workspaceFolder}/gate.go",
+      "args": ["-d"],
+      "console": "integratedTerminal",
+      "env": {
+        "OTEL_EXPORTER_OTLP_ENDPOINT": "http://localhost:4318",
+        "OTEL_EXPORTER_OTLP_PROTOCOL": "http/protobuf",
+        "OTEL_TRACES_ENABLED": "true",
+        "OTEL_METRICS_ENABLED": "true",
+        "OTEL_SERVICE_NAME": "gate-dev"
+      }
+    }
+  ]
+}

.vscode/launch.json

@@ -48,9 +48,11 @@ export default defineConfig({
   ],
 
   vue: {
-    reactivityTransform: true,
+    // reactivityTransform: true, // This option is deprecated
   },
 
+  ignoreDeadLinks: 'localhostLinks',
+
   themeConfig: {
     logo: '/minekube-logo.png',
 
@@ -176,6 +178,44 @@ export default defineConfig({
             },
           ],
         },
+        {
+          text: 'OpenTelemetry',
+          items: [
+            {
+              text: 'Overview',
+              link: '/guide/otel/',
+            },
+            {
+              text: 'Grafana',
+              items: [
+                {
+                  text: 'Grafana Cloud',
+                  link: '/guide/otel/grafana-cloud/',
+                },
+                {
+                  text: 'Self-hosted Grafana Stack',
+                  link: '/guide/otel/self-hosted/grafana-stack.md',
+                },
+                {
+                  text: 'Grafana Dashboards',
+                  link: '/guide/otel/self-hosted/dashboard',
+                },
+              ],
+            },
+            {
+              text: 'Honeycomb',
+              link: '/guide/otel/honeycomb/',
+            },
+            {
+              text: 'Self-hosted Jaeger',
+              link: '/guide/otel/self-hosted/jaeger',
+            },
+            {
+              text: 'FAQ',
+              link: '/guide/otel/faq/',
+            },
+          ],
+        },
         {
           text: 'Security',
           items: [

.web/docs/.vitepress/config.ts

@@ -0,0 +1,20 @@
+<template>
+  <a
+    target="_blank"
+    class="fixed bottom-5 right-5 z-50"
+    href="https://minekube.com/discord"
+  >
+    <button
+      aria-label="Discord Support"
+      class="flex items-center justify-center gap-[6px] w-fit h-fit rounded-full transition-all bg-white hover:bg-[var(--vp-button-brand-hover-bg)] stroke-black hover:stroke-[var(--vp-button-brand-hover-text)] px-4 py-3 sm:px-8 sm:py-4 font-[500] text-black hover:text-[var(--vp-button-brand-hover-text)] text-[16px] leading-[20.83px] sm:text-[19px] sm:leading-[25px] !px-[16px] !py-[13px] !max-sm:rounded-full !sm:rounded-br-none !text-[16px] !leading-[21px]"
+    >
+      <svg width="32" height="32" viewBox="0 0 32 33" fill="inherit">
+        <path
+          d="M26.1303 11.347C24.3138 9.93899 22.134 9.23502 19.8331 9.11768L19.4697 9.4697C21.5284 9.93899 23.345 10.8776 25.0404 12.1683C22.9817 11.1123 20.6807 10.4084 18.2587 10.1737C17.5321 10.0563 16.9266 10.0563 16.2 10.0563C15.4734 10.0563 14.8679 10.0563 14.1413 10.1737C11.7193 10.4084 9.41833 11.1123 7.35963 12.1683C9.05501 10.8776 10.8716 9.93899 12.9303 9.4697L12.5669 9.11768C10.266 9.23502 8.08621 9.93899 6.26972 11.347C4.21101 15.1017 3.1211 19.3257 3 23.6669C4.81649 25.5443 7.35963 26.7177 10.0239 26.7177C10.0239 26.7177 10.8716 25.779 11.477 24.9576C9.90277 24.6057 8.44954 23.7843 7.48074 22.4937C8.32843 22.963 9.17611 23.4323 10.0239 23.7843C11.1138 24.2537 12.2037 24.4883 13.2936 24.723C14.2624 24.8403 15.2312 24.9576 16.2 24.9576C17.1688 24.9576 18.1376 24.8403 19.1064 24.723C20.1963 24.4883 21.2862 24.2537 22.3761 23.7843C23.2239 23.4323 24.0716 22.963 24.9193 22.4937C23.9505 23.7843 22.4972 24.6057 20.923 24.9576C21.5284 25.779 22.3761 26.7177 22.3761 26.7177C25.0404 26.7177 27.5835 25.5443 29.4 23.6669C29.2789 19.3257 28.189 15.1017 26.1303 11.347ZM12.2037 21.555C10.9927 21.555 9.90278 20.499 9.90278 19.2084C9.90278 17.9177 10.9927 16.8617 12.2037 16.8617C13.4147 16.8617 14.5046 17.9177 14.5046 19.2084C14.5046 20.499 13.4147 21.555 12.2037 21.555ZM20.1963 21.555C18.9853 21.555 17.8954 20.499 17.8954 19.2084C17.8954 17.9177 18.9853 16.8617 20.1963 16.8617C21.4073 16.8617 22.4972 17.9177 22.4972 19.2084C22.4972 20.499 21.4073 21.555 20.1963 21.555Z"
+          fill="inherit"
+        ></path>
+      </svg>
+      <div class="max-sm:hidden">Discord Support</div>
+    </button>
+  </a>
+</template>

.web/docs/.vitepress/theme/components/DiscordButton.vue

@@ -751,7 +751,7 @@ try:
             <div
               class="text-2xl sm:text-3xl font-semibold text-[--vp-c-brand-1]"
             >
-              650+
+              800+
             </div>
             <div class="text-xs sm:text-sm text-[--vp-c-text-2]">
               Discord Members
@@ -762,7 +762,7 @@ try:
             <div
               class="text-2xl sm:text-3xl font-semibold text-[--vp-c-brand-1]"
             >
-              650+
+              750+
             </div>
             <div class="text-xs sm:text-sm text-[--vp-c-text-2]">
               GitHub Stars

.web/docs/.vitepress/theme/components/LandingAfter.vue

@@ -1,30 +1,40 @@
 <script setup>
-import DefaultTheme from 'vitepress/theme'
-import {useRouter} from 'vitepress';
-import {watch} from 'vue';
-import HomeHeroImage from "./HomeHeroImage.vue";
+import DefaultTheme from 'vitepress/theme';
+import { useRouter } from 'vitepress';
+import { watch } from 'vue';
+import HomeHeroImage from './HomeHeroImage.vue';
 import LandingAfter from './LandingAfter.vue';
+import MyGlobalButton from './DiscordButton.vue';
 
-const {Layout} = DefaultTheme
+const { Layout } = DefaultTheme;
 
 const router = useRouter();
 
 // Only run this on the client. Not during build
 if (typeof window !== 'undefined' && window.posthog) {
-  watch(() => router.route.data.relativePath, (path) => {
-    posthog.capture("$pageview");
-  }, {immediate: true});
+  watch(
+    () => router.route.data.relativePath,
+    (path) => {
+      posthog.capture('$pageview');
+    },
+    { immediate: true }
+  );
 }
-
 </script>
 
 <template>
   <Layout>
     <template #home-hero-image>
-      <HomeHeroImage/>
+      <HomeHeroImage />
     </template>
     <template #home-features-after>
-      <LandingAfter/>
+      <LandingAfter />
+    </template>
+    <template #default>
+      <slot />
+    </template>
+    <template #layout-bottom>
+      <MyGlobalButton />
     </template>
   </Layout>
-</template>
+</template>

.web/docs/.vitepress/theme/components/Layout.vue

@@ -17,7 +17,11 @@
     - [Player](#minekube-gate-v1-Player)
     - [RegisterServerRequest](#minekube-gate-v1-RegisterServerRequest)
     - [RegisterServerResponse](#minekube-gate-v1-RegisterServerResponse)
+    - [RequestCookieRequest](#minekube-gate-v1-RequestCookieRequest)
+    - [RequestCookieResponse](#minekube-gate-v1-RequestCookieResponse)
     - [Server](#minekube-gate-v1-Server)
+    - [StoreCookieRequest](#minekube-gate-v1-StoreCookieRequest)
+    - [StoreCookieResponse](#minekube-gate-v1-StoreCookieResponse)
     - [UnregisterServerRequest](#minekube-gate-v1-UnregisterServerRequest)
     - [UnregisterServerResponse](#minekube-gate-v1-UnregisterServerResponse)
 
@@ -222,6 +226,37 @@ RegisterServerResponse is the response for RegisterServer method.
 
 
 
+<a name="minekube-gate-v1-RequestCookieRequest"></a>
+
+### RequestCookieRequest
+RequestCookieRequest is the request for RequestCookie method.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| player | [string](#string) |  | The player&#39;s username or ID |
+| key | [string](#string) |  | The key of the cookie in format `namespace:key` |
+
+
+
+
+
+
+<a name="minekube-gate-v1-RequestCookieResponse"></a>
+
+### RequestCookieResponse
+RequestCookieResponse is the response for RequestCookie method.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| payload | [bytes](#bytes) |  | The payload of the cookie. May be empty if the cookie is not found. |
+
+
+
+
+
+
 <a name="minekube-gate-v1-Server"></a>
 
 ### Server
@@ -239,6 +274,33 @@ Server represents a backend server where Gate can connect players to.
 
 
 
+<a name="minekube-gate-v1-StoreCookieRequest"></a>
+
+### StoreCookieRequest
+StoreCookieRequest is the request for StoreCookie method.
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| player | [string](#string) |  | The player&#39;s username or ID |
+| key | [string](#string) |  | The key of the cookie in format `namespace:key` |
+| payload | [bytes](#bytes) |  | The payload to store. Passing an empty payload will remove the cookie. |
+
+
+
+
+
+
+<a name="minekube-gate-v1-StoreCookieResponse"></a>
+
+### StoreCookieResponse
+StoreCookieResponse is the response for StoreCookie method.
+
+
+
+
+
+
 <a name="minekube-gate-v1-UnregisterServerRequest"></a>
 
 ### UnregisterServerRequest
@@ -287,6 +349,8 @@ All methods follow standard gRPC error codes and include detailed error messages
 | UnregisterServer | [UnregisterServerRequest](#minekube-gate-v1-UnregisterServerRequest) | [UnregisterServerResponse](#minekube-gate-v1-UnregisterServerResponse) | UnregisterServer removes a server from the proxy. Returns NOT_FOUND if no matching server is found. Returns INVALID_ARGUMENT if neither name nor address is provided. |
 | ConnectPlayer | [ConnectPlayerRequest](#minekube-gate-v1-ConnectPlayerRequest) | [ConnectPlayerResponse](#minekube-gate-v1-ConnectPlayerResponse) | ConnectPlayer connects a player to a specified server. Returns NOT_FOUND if either the player or target server doesn&#39;t exist. Returns FAILED_PRECONDITION if the connection attempt fails. |
 | DisconnectPlayer | [DisconnectPlayerRequest](#minekube-gate-v1-DisconnectPlayerRequest) | [DisconnectPlayerResponse](#minekube-gate-v1-DisconnectPlayerResponse) | DisconnectPlayer disconnects a player from the proxy. Returns NOT_FOUND if the player doesn&#39;t exist. Returns INVALID_ARGUMENT if the reason text is malformed. |
+| StoreCookie | [StoreCookieRequest](#minekube-gate-v1-StoreCookieRequest) | [StoreCookieResponse](#minekube-gate-v1-StoreCookieResponse) | StoreCookie stores a cookie on a player&#39;s client. Returns NOT_FOUND if the player doesn&#39;t exist. Passing an empty payload will remove the cookie. |
+| RequestCookie | [RequestCookieRequest](#minekube-gate-v1-RequestCookieRequest) | [RequestCookieResponse](#minekube-gate-v1-RequestCookieResponse) | RequestCookie requests a cookie from a player&#39;s client. The payload in RequestCookieResponse may be empty if the cookie is not found. |