feat: new websockets channels for umbrel app

Author: vafanassieff

Dockerfile

@@ -1,8 +1,8 @@
-FROM node:16.15.0-alpine3.14 AS builder
+FROM node:18.15.0-alpine3.16 AS builder
 
 WORKDIR /usr/lnmarkets
 
-RUN npm install -g pnpm@7
+RUN npm install -g pnpm@8
 
 COPY package.json pnpm-workspace.yaml pnpm-lock.yaml ./
 
@@ -16,7 +16,7 @@ COPY apps/front /usr/lnmarkets/apps/front
 
 RUN pnpm -C apps/front build
 
-FROM node:16.15.0-alpine3.14
+FROM node:18.15.0-alpine3.16
 
 ENV NODE_ENV="production"
 

apps/api/docker/Dockerfile.dev

@@ -1,8 +1,8 @@
-FROM node:16.15.0-alpine3.14
+FROM node:18.15.0-alpine3.16
 
 WORKDIR /usr/src
 
-RUN npm install -g pnpm@7
+RUN npm install -g pnpm@8
 
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY apps/api/package.json apps/api/package.json

apps/api/src/websockets.js

@@ -29,8 +29,8 @@ export default async (server) => {
     await lnm.connect()
     await lnm.subscribe({
       params: [
-        'futures/market/index',
-        'futures/market/bid-offer',
+        'futures/btc_usd/index',
+        'futures/btc_usd/lastPrice',
         'options/market/volatility',
       ],
     })

apps/front/docker/Dockerfile.dev

@@ -1,8 +1,8 @@
-FROM node:16.15.0-alpine3.14
+FROM node:18.15.0-alpine3.16
 
 WORKDIR /usr/src
 
-RUN npm install -g pnpm@7
+RUN npm install -g pnpm@8
 
 COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
 COPY apps/front/package.json apps/front/package.json

docker-compose.yml compose.ymldocker-compose.yml renamed to compose.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
   lnmarkets:
     image: ghcr.io/ln-markets/umbrel:v1.1.5@sha256:7ef171d3e76d99706d2077b3f27b115a1dbff150b339378692d90ebe06f7761a

dev/local/.env dev/.envdev/local/.env renamed to dev/.env

@@ -1,3 +1,3 @@
-COMPOSE_PROJECT_NAME=lnmarkets_umbrel_local
 COMPOSE_DOCKER_CLI_BUILD=1
 DOCKER_BUILDKIT=1
+COMPOSE_HTTP_TIMEOUT=120

dev/local/docker-compose.yml dev/compose.ymldev/local/docker-compose.yml renamed to dev/compose.yml

@@ -1,12 +1,11 @@
-version: '3.7'
+name: lnmarkets-umbrel
 
 x-logging: &default-logging
   driver: 'json-file'
   options:
     max-size: '5m'
     max-file: '10'
     tag: '{{.Name}}'
-
 networks:
   lnmarkets_backend:
     external: true
@@ -19,53 +18,50 @@ volumes:
 
 services:
   api:
-    container_name: lnmarkets_umbrel_local_api
     restart: 'on-failure'
     build:
-      context: ../..
+      context: ..
       dockerfile: ./apps/api/docker/Dockerfile.dev
     ports:
       - 8001:4242
     environment:
       - NODE_ENV=development
       - LND_IP=lnd-user
-      - LNMARKETS_API_HOSTNAME=api.kibotrel.lnmarkets.dev
+      - LNMARKETS_API_HOSTNAME=api.afa.lnmarkets.dev
       - BITCOIN_NETWORK=regtest
       - APP_PASSWORD=lnmarkets
     volumes:
-      - ${PWD}/../../apps/api/src:/usr/src/apps/api/src:cached
-      - lnmarkets_lnd-user:/lnd/:ro
+      - ../apps/api/src:/usr/src/apps/api/src
+      - lnmarkets_lnd-user:/lnd:ro
     networks:
       - lnmarkets_backend
       - lnmarkets_reverse-proxy
     logging: *default-logging
 
   front:
-    container_name: lnmarkets_umbrel_local_front
     restart: 'on-failure'
     build:
-      context: ../..
+      context: ..
       dockerfile: ./apps/front/docker/Dockerfile.dev
     ports:
       - 3000:3000
     volumes:
-      - ${PWD}/../../apps/front/src:/usr/src/apps/front/src
-      - ${PWD}/../../apps/front/public:/usr/src/apps/front/public
-      - ${PWD}/../../apps/front/postcss.config.js:/usr/src/apps/front/postcss.config.js
-      - ${PWD}/../../apps/front/tailwind.config.js:/usr/src/apps/front/tailwind.config.js
-      - ${PWD}/../../apps/front/vite.config.js:/usr/src/apps/front/vite.config.js
-      - ${PWD}/../../apps/front/index.html:/usr/src/apps/front/index.html
+      - ../apps/front/src:/usr/src/apps/front/src
+      - ../apps/front/public:/usr/src/apps/front/public
+      - ../apps/front/postcss.config.js:/usr/src/apps/front/postcss.config.js
+      - ../apps/front/tailwind.config.js:/usr/src/apps/front/tailwind.config.js
+      - ../apps/front/vite.config.js:/usr/src/apps/front/vite.config.js
+      - ../apps/front/index.html:/usr/src/apps/front/index.html
     environment:
       - NODE_ENV=development
     logging: *default-logging
 
   # This service is used to test the production container
   # We run as root to avoid permissions issues in the lnd volume
   app:
-    container_name: lnmarkets_umbrel_local
     restart: 'on-failure'
     build:
-      context: ../..
+      context: ..
       dockerfile: ./Dockerfile
     user: root
     ports:
@@ -76,7 +72,7 @@ services:
       - BITCOIN_NETWORK=regtest
       - APP_PASSWORD=lnmarkets
     volumes:
-      - lnmarkets_lnd-user:/lnd/:ro
+      - lnmarkets_lnd-user:/lnd:ro
     networks:
       - lnmarkets_backend
       - lnmarkets_reverse-proxy