updates

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

@@ -1,10 +1,34 @@
 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-protocol/example {
+route /http-api/example {
 	reverse_proxy localhost:4010
 }
 
@@ -42,12 +66,12 @@ route /http-protocol/* {
 	reverse_proxy localhost:4011
 }
 
-route /http-playwright/* {
-	uri strip_prefix /http-playwright
+route /js-playwright/* {
+	uri strip_prefix /playwright
 	reverse_proxy localhost:4012
 }
 
-route /http-postman/* {
-	uri strip_prefix /http-postman
+route /postman/* {
+	uri strip_prefix /postman
 	reverse_proxy localhost:4013
 }

Dockerfile

@@ -1,7 +1,6 @@
 FROM node:22-alpine
 
-ARG NODE_ENV=production
-ENV NODE_ENV $NODE_ENV
+ENV NODE_ENV=production
 
 RUN apk add --no-cache make caddy
 RUN npm install -g @stoplight/prism-cli
@@ -10,7 +9,7 @@ COPY package.json package-lock.json* ./
 RUN npm ci && npm cache clean --force
 
 COPY . .
-RUN make compile
+# RUN make compile
 
 EXPOSE 8080
 

Makefile

@@ -1,3 +1,5 @@
+IMAGE_ID := ghcr.io/hexlet-components/rest-api-example
+
 setup:
 	npm ci
 	make compile
@@ -9,21 +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:
 	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 &
+	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
 ```
 
 ---

app.config.json

@@ -4,5 +4,11 @@
   "version": "1.0",
   "openapiFilePath": "tsp-output/@typespec/openapi3/openapi.1.0.yaml",
   "docRoute": "openapi",
-  "apiKey": "tybRrq0Te4tBtQAubh9Qs9qprLyTc2kbBn4laQFPzYxtWymhMZRt5gTQ8a3aBegrgW5FZoEcmijz8micMRFUglLJDAv2QtqSZwzaWugMlyfLvnsIAWhrLS8y"
+  "apiKey": "tybRrq0Te4tBtQAubh9Qs9qprLyTc2kbBn4laQFPzYxtWymhMZRt5gTQ8a3aBegrgW5FZoEcmijz8micMRFUglLJDAv2QtqSZwzaWugMlyfLvnsIAWhrLS8y",
+  "apps": [
+    "http-api",
+    "http-protocol",
+    "js-playwright",
+    "postman"
+  ]
 }

custom-server/assets/docs/http-api/.swagger-codegen-ignore

@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

custom-server/assets/docs/http-api/.swagger-codegen/VERSION

@@ -0,0 +1 @@
+3.0.63