Merge pull request #136 from Hello-Storage/staging

Staging

Author: Onetti01

.circleci/config.yml

@@ -34,7 +34,17 @@ commands:
           command: |
             EC2_USERNAME=ubuntu
             EC2_PUBLIC_DNS=api-staging.joinhello.app
-            ssh -o StrictHostKeyChecking=no $EC2_USERNAME@$EC2_PUBLIC_DNS "cd workspace/staging && sudo docker compose pull && sudo docker system prune -f && sudo docker compose up -d --build --wait"
+            # Create an archive of the specified node files
+            tar -czvf node_files.tar.gz -C ./node .dockerignore .gitignore Dockerfile.dev index.ts nodemon.json package.json tsconfig.json
+            # Ensure the target directories exist
+            ssh -o StrictHostKeyChecking=no $EC2_USERNAME@$EC2_PUBLIC_DNS "mkdir -p /home/ubuntu/workspace/staging/node"
+            # Securely copy the updated docker-compose.yml and the node files archive to the server
+            scp -o StrictHostKeyChecking=no ./docker-compose.yml $EC2_USERNAME@$EC2_PUBLIC_DNS:/home/ubuntu/workspace/staging/docker-compose.yml
+            scp -o StrictHostKeyChecking=no node_files.tar.gz $EC2_USERNAME@$EC2_PUBLIC_DNS:/home/ubuntu/workspace/staging/node_files.tar.gz
+            # Extract the node files archive to the correct directory and cleanup
+            ssh -o StrictHostKeyChecking=no $EC2_USERNAME@$EC2_PUBLIC_DNS "cd /home/ubuntu/workspace/staging && tar -xzvf node_files.tar.gz -C node && rm node_files.tar.gz"
+            # Connect to the server and start the updated setup
+            ssh -o StrictHostKeyChecking=no $EC2_USERNAME@$EC2_PUBLIC_DNS "cd /home/ubuntu/workspace/staging && sudo docker compose pull && sudo docker system prune -f && sudo docker compose up -d --build --wait"
 
 jobs:
   build:

.dockerignore

@@ -0,0 +1 @@
+arweave-wallet.json

.env.example

@@ -14,6 +14,7 @@ POSTGRES_DB=hello
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
 POSTGRES_PORT=5432
+PGPASSWORD=postgres
 
 POSTGRES_MOCK_HOST=localhost
 POSTGRES_MOCK_DB=mockhello
@@ -29,13 +30,18 @@ RedisPassword=
 FILEBASE_ACCESS_KEY=access_key
 FILEBASE_SECRET_KEY=access_key
 FILEBASE_PINNING_KEY=access_key
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
 FILEBASE_ENDPOINT=https://s3.filebase.com
 FILEBASE_REGION=us-east-1
 
+
 WASABI_ACCESS_KEY=access_key
 WASABI_SECRET_KEY=access_key
 WASABI_ENDPOINT=s3.eu-central-2.wasabisys.com
 WASABI_BUCKET=hello-storage
 WASABI_REGION=us-east-1
 
-ENCRYPTION_KEY=ThIS_Is_A_32ByTE_LoNG_STrING_123
+ENCRYPTION_KEY=ThIS_Is_A_32ByTE_LoNG_STrING_123
+
+NODEJS_SERVER_ENDPOINT=http://nodejs-server:3000

.gitignore

@@ -8,6 +8,8 @@
 *.so
 *.dylib
 
+arweave-wallet.json
+
 # Test binary, built with `go test -c`
 *.test
 

arweave-wallet.json.example

@@ -0,0 +1,11 @@
+{
+    "d": "a_jAwL...",
+    "dp": "h3n...",
+    "dq": "DZQ...",
+    "e": "AQ..",
+    "kty": "RSA",
+    "n": "jqf...",
+    "p": "_AO...",
+    "q": "kOl...",
+    "qi": "pfc..."
+}

compose.dev.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+version: "3.9"
 
 ## FOR TEST AND DEVELOPMENT ONLY, DO NOT USE IN PRODUCTION   ##
 
@@ -47,9 +47,27 @@ services:
       timeout: 5s
       retries: 5
 
+  nodejs-server:
+    container_name: nodejs-server-dev
+    build:
+      context: ./node
+      dockerfile: ./Dockerfile.dev # Adjust if your Dockerfile has a different name or path
+    restart: always
+    env_file:
+      - .env
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./node:/usr/src/app # This mounts your host node directory to the container's working directory
+      - ./arweave-wallet.json:/usr/src/app/arweave-wallet.json:ro
+      - /usr/src/app/node_modules # Persists node_modules folder to avoid being overridden by the bind mount
+    networks:
+      - network-backend
+
 networks:
   network-backend:
 volumes:
   postgres-data:
     external: true
     name: postgres-data
+

compose.prod.yml

@@ -53,6 +53,23 @@ services:
       - '6379:6379'
     networks:
       - network-backend
+  nodejs-server:
+    container_name: nodejs-server-dev
+    build:
+      context: ./node
+      dockerfile: ./Dockerfile.dev # Adjust if your Dockerfile has a different name or path
+    restart: always
+    env_file:
+      - .env
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./node:/usr/src/app # This mounts your host node directory to the container's working directory
+      - ./arweave-wallet.json:/usr/src/app/arweave-wallet.json:ro
+      - /usr/src/app/node_modules # Persists node_modules folder to avoid being overridden by the bind mount
+    networks:
+      - network-backend
+
 
 networks:
   network-backend:

docker-compose.yml

@@ -37,6 +37,31 @@ services:
       interval: 10s
       timeout: 5s
       retries: 5
+  redis:
+    container_name: redis
+    image: redis/redis-stack-server:latest
+    restart: always
+    ports:
+      - '6379:6379'
+    networks:
+      - network-backend
+  nodejs-server:
+    container_name: nodejs-server-dev
+    build:
+      context: ./node
+      dockerfile: ./Dockerfile.dev # Adjust if your Dockerfile has a different name or path
+    restart: always
+    env_file:
+      - .env
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./node:/usr/src/app # This mounts your host node directory to the container's working directory
+      - ./arweave-wallet.json:/usr/src/app/arweave-wallet.json:ro
+      - /usr/src/app/node_modules # Persists node_modules folder to avoid being overridden by the bind mount
+    networks:
+      - network-backend
+
 
 networks:
   network-backend:

internal/api/abort.go

@@ -75,6 +75,12 @@ func AbortBusy(c *gin.Context) {
 	Abort(c, http.StatusTooManyRequests, "Busy, please try again later")
 }
 
-func ErrorResponse(err error) gin.H {
-	return gin.H{"error": err.Error()}
+func ErrorResponse(err error, code ...string) gin.H {
+    response := gin.H{"error": err.Error(), "status": "fail"}
+
+    if len(code) > 0 {
+        response["code"] = code
+    }
+
+    return response
 }

internal/api/api.go

@@ -14,6 +14,7 @@ import (
 
 var log = event.Log
 
+
 func Ping(router *gin.RouterGroup) {
 	router.GET("/", func(c *gin.Context) {
 		c.JSON(http.StatusOK, "hello backend api endpoints")