Merge pull request #279 from keep-starknet-strange/feat/websockets

Websocket deployment
keep-starknet-strange · Jan 16, 2025 · a0b96b3 · a0b96b3
2 parents 53a0683 + 0051459
commit a0b96b3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -29,6 +29,8 @@ docker-build:
 	docker build . -f backend/Dockerfile.prod -t "brandonjroberts/art-peace-backend:$(APP_VERSION)-$(COMMIT_SHA)"
 	@echo "Building consumer..."
 	docker build . -f backend/Dockerfile.consumer.prod -t "brandonjroberts/art-peace-consumer:$(APP_VERSION)-$(COMMIT_SHA)"
+	@echo "Building websocket..."
+	docker build . -f backend/Dockerfile.websocket.prod -t "brandonjroberts/art-peace-websocket:$(APP_VERSION)-$(COMMIT_SHA)"
 	@echo "Building indexer..."	
 	docker build . -f indexer/Dockerfile.prod -t "brandonjroberts/art-peace-indexer:$(APP_VERSION)-$(COMMIT_SHA)"
 

diff --git a/backend/Dockerfile.websocket.prod b/backend/Dockerfile.websocket.prod
@@ -17,6 +17,6 @@ COPY ./backend .
 # Build the app & run it
 RUN go build -o web-sockets ./cmd/web-sockets/web-sockets.go
 
-EXPOSE 8082
+EXPOSE 8083
 
 CMD ["./web-sockets"]
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -70,6 +70,10 @@ function App() {
         }
       } else {
         setIsHome(true);
+        if (!worldsMode) {
+          setOpenedWorldId(null);
+          return;
+        }
         try {
           const response = await fetchWrapper('get-world?worldId=0');
           if (response.data) {
@@ -81,6 +85,9 @@ function App() {
         }
       }
 
+      if (!worldsMode) {
+        return;
+      }
       // Always fetch surrounding worlds
       const surroundingResponse = await fetchWrapper('get-home-worlds');
       if (surroundingResponse.data) {

diff --git a/frontend/src/canvas/CanvasContainer.js b/frontend/src/canvas/CanvasContainer.js
@@ -199,7 +199,6 @@ const CanvasContainer = (props) => {
   useEffect(() => {
     if (hasInit) return;
     const containerRect = canvasContainerRef.current.getBoundingClientRect();
-    console.log(containerRect);
     const adjustX = ((canvasScale - 1) * props.width) / 2;
     const adjustY = ((canvasScale - 1) * props.height) / 2;
     setCanvasX(containerRect.width / 2 - adjustX);
@@ -854,7 +853,8 @@ const CanvasContainer = (props) => {
                 width: props.width * canvasScale,
                 height: props.height * canvasScale
               }}
-              disabled={true}
+              colors={props.colors}
+              pixelClicked={pixelClicked}
             />
             <h2
               className='CanvasContainer__title CanvasContainer__title--worlds'

diff --git a/infra/art-peace-infra/templates/backend/backend-ingress.yaml b/infra/art-peace-infra/templates/backend/backend-ingress.yaml
@@ -12,9 +12,9 @@ spec:
     pathType: Exact
     backend:
       service:
-        name: {{ .Values.labels.consumer.name }}
+        name: {{ .Values.labels.websocket.name }}
         port:
-          number: {{ .Values.ports.consumer }}
+          number: {{ .Values.ports.websocket }}
   - path: /nft-images
     pathType: Prefix
     backend:
@@ -49,9 +49,9 @@ spec:
         pathType: Exact
         backend:
           service:
-            name: {{ .Values.labels.consumer.name }}
+            name: {{ .Values.labels.websocket.name }}
             port:
-              number: {{ .Values.ports.consumer }}
+              number: {{ .Values.ports.websocket }}
       - path: /
         pathType: Prefix
         backend:

diff --git a/infra/art-peace-infra/values.yaml b/infra/art-peace-infra/values.yaml
@@ -9,6 +9,8 @@ labels:
     name: admin-backend
   consumer:
     name: consumer
+  websocket:
+    name: websocket
   indexer:
     name: indexer
 
@@ -17,6 +19,7 @@ ports:
   postgres: 5432
   backend: 8080
   adminBackend: 8082
+  websocket: 8083
   consumer: 8081
 
 volumes:
@@ -63,6 +66,9 @@ deployments:
   consumer:
     replicas: 1
     image: brandonjroberts/art-peace-consumer
+  websocket:
+    replicas: 1
+    image: brandonjroberts/art-peace-websocket
   indexer:
     replicas: 1
     image: brandonjroberts/art-peace-indexer