Merge pull request #3 from hexlet-components/refactoring

Refactoring

Author: dzencot

.dockerignore

@@ -2,7 +2,6 @@
 .DS_Store
 
 # Default TypeSpec output
-tsp-output/
 dist/
 
 # Dependency directories

.github/workflows/release.yml

@@ -1,8 +1,10 @@
 name: Build
 
 on:
-  - push
-  - pull_request
+  push
+    branches:
+      - main
+
 
 jobs:
   build:

Caddyfile

@@ -0,0 +1,77 @@
+http://localhost:8080
+
+route / {
+	reverse_proxy localhost:4010
+}
+
+route /http-api/echo {
+  reverse_proxy localhost:4010
+}
+
+route /http-api/openapi {
+	reverse_proxy localhost:4010
+}
+
+route /http-protocol/openapi {
+	reverse_proxy localhost:4010
+}
+
+route /js-playwright/openapi {
+	reverse_proxy localhost:4010
+}
+
+route /postman/openapi {
+	reverse_proxy localhost:4010
+}
+
+route /assets {
+  reverse_proxy localhost:4010
+}
+
+route /http-api/example {
+	reverse_proxy localhost:4010
+}
+
+route /http-protocol/login {
+	reverse_proxy localhost:4010
+}
+
+route /http-protocol/stream {
+	reverse_proxy localhost:4010
+}
+
+route /http-protocol/removed {
+	reverse_proxy localhost:4010
+}
+
+route /http-protocol {
+	reverse_proxy localhost:4010
+}
+
+route /js-playwright/users-list {
+	reverse_proxy localhost:4010
+}
+
+route /js-dom-testing-library/users-list {
+	reverse_proxy localhost:4010
+}
+
+route /http-api/* {
+	uri strip_prefix /http-api
+	reverse_proxy localhost:4011
+}
+
+route /http-protocol/* {
+	uri strip_prefix /http-protocol
+	reverse_proxy localhost:4011
+}
+
+route /js-playwright/* {
+	uri strip_prefix /playwright
+	reverse_proxy localhost:4012
+}
+
+route /postman/* {
+	uri strip_prefix /postman
+	reverse_proxy localhost:4013
+}

Dockerfile

@@ -1,6 +1,16 @@
 FROM node:22-alpine
+
+ENV NODE_ENV=production
+
+RUN apk add --no-cache make caddy
+RUN npm install -g @stoplight/prism-cli
+
+COPY package.json package-lock.json* ./
+RUN npm ci && npm cache clean --force
+
 COPY . .
-RUN npm ci
-RUN apk add --no-cache make
-RUN make compile
-CMD ["npm", "start"]
+# RUN make compile
+
+EXPOSE 8080
+
+CMD ["make", "start"]

Makefile

@@ -1,3 +1,5 @@
+IMAGE_ID := ghcr.io/hexlet-components/rest-api-example
+
 setup:
 	npm ci
 	make compile
@@ -9,16 +11,25 @@ compile:
 	npx tsp compile ./typespec/js-playwright/main.tsp --output-dir "./tsp-output/js-playwright"
 
 dev:
-	npx fastify start -a 0.0.0.0 server/src/index.js
+	docker run -v ./custom-server:/custom-server -p 8080:8080 $(IMAGE_ID)
 
 start:
-	npx fastify start -a 0.0.0.0 server/src/index.js
+	prism mock -m -p 4011 --host 0.0.0.0 ./tsp-output/http-api/@typespec/openapi3/openapi.1.0.yaml &
+	prism mock -m -p 4012 --host 0.0.0.0 ./tsp-output/http-protocol/@typespec/openapi3/openapi.1.0.yaml &
+	prism mock -m -p 4013 --host 0.0.0.0 ./tsp-output/js-playwright/@typespec/openapi3/openapi.1.0.yaml &
+	prism mock -m -p 4014 --host 0.0.0.0 ./tsp-output/postman/@typespec/openapi3/openapi.1.0.yaml &
+	npm start &
+	caddy run
 
 test:
 	echo no tests
 
-compose-test:
-	docker compose up --build --abort-on-container-exit
+docker-build:
+	docker build . -t $(IMAGE_ID)
+
+docker-run:
+	docker rm -f rest-api-example
+	docker run -p 8080:8080 --name rest-api-example $(IMAGE_ID)
 
-generate-fixtures:
-	node server/bin/generateFixtures.js
+docker-sh:
+	docker run -it --entrypoint sh $(IMAGE_ID)

README.md

@@ -13,7 +13,7 @@ See [Makefile](./Makefile)
 
 ```bash
 make setup
-make start # Open http://localhost:5000/swagger
+make dev # Open http://localhost:8080
 ```
 
 ---