Use http-proxy-middleware instead of cors-anywhere

Part of #755
LayerManager · Feb 23, 2023 · a60e30f · a60e30f
1 parent 9d4a65e
commit a60e30f
Show file tree

Hide file tree

Showing 11 changed files with 1,071 additions and 451 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,9 @@ make timgen-build
 - [#703](https://github.com/LayerManager/layman/issues/703) Attribute names in [WFS-T requests](doc/endpoints.md#web-feature-service) must match to regex `^[a-zA-Z_][a-zA-Z_0-9]*$`, otherwise Layman error is raised. It applies to attributes of both internal and external tables, and only to attributes that not exist in database yet.
 - [#772](https://github.com/LayerManager/layman/issues/772) Speed up endpoints [GET Workspace Layer Thumbnail](doc/rest.md#get-workspace-layer-thumbnail), [GET Workspace Layer Style](doc/rest.md#get-workspace-layer-style), [GET Workspace Map Thumbnail](doc/rest.md#get-workspace-map-thumbnail) and [GET Workspace Map File](doc/rest.md#get-workspace-map-file).
 - [#755](https://github.com/LayerManager/layman/issues/755) Downgrade Node.js of Timgen from v18 to v16
+- [#755](https://github.com/LayerManager/layman/issues/755) Change Node.js dependencies of Timgen:
+  - http-server -> express 4
+  - cors-anywhere -> http-proxy-middleware 2 
 
 ## v1.19.0
  2023-01-11

diff --git a/doc/dependencies.md b/doc/dependencies.md
@@ -62,8 +62,8 @@
 | --- | --- | --- | --- | --- | --- |
 | [layman-test-client](https://github.com/LayerManager/layman-test-client) | GNU GPL v3 | client/docker/Dockerfile | opt | bin | to demonstrate communication with REST API |
 | [openlayers](https://openlayers.org/) | BSD 2-Clause | timgen/package.json | prod | bin | for client-side map rendering in Timgen |
-| [http-server](https://www.npmjs.com/package/http-server) | MIT | timgen/package.json | prod | bin | as static HTTP server for Timgen |
-| [cors-anywhere](https://www.npmjs.com/package/cors-anywhere) | MIT | timgen/package.json | prod | bin | for proxying Timgen requests |
+| [express](https://expressjs.com/) | MIT | timgen/package.json | prod | bin | as HTTP server for Timgen |
+| [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) | MIT | timgen/package.json | prod | bin | for proxying Timgen requests |
 | [file-saver](https://www.npmjs.com/package/file-saver) | MIT | timgen/package.json | prod | bin | for saving images in Timgen |
 
 ## Other dependencies

diff --git a/docker-compose.demo.yml b/docker-compose.demo.yml
@@ -75,7 +75,7 @@ services:
         dockerfile: Dockerfile.production
       image: timgen:latest
       user: ${UID_GID}
-      command: sh -c "node proxy.js & npx http-server dist/"
+      command: sh -c "node server.js"
       extra_hosts:
          - ${EXTRA_HOST1}
          - ${EXTRA_HOST2}

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -79,10 +79,9 @@ services:
         dockerfile: Dockerfile.production
       image: timgen:latest
       user: ${UID_GID}
-      command: sh -c "node proxy.js & npx http-server dist/"
+      command: sh -c "node server.js"
 #      ports:
 #        - 8080:8080
-#        - 8081:8081
 
    layman_client:
       container_name: layman_client

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -63,10 +63,9 @@ services:
         dockerfile: Dockerfile.production
       image: timgen:latest
       user: ${UID_GID}
-      command: sh -c "node proxy.js & npx http-server dist/"
+      command: sh -c "node server.js"
 #      ports:
 #        - 8080:8080
-#        - 8081:8081
 
    layman_client_test:
       container_name: layman_client_test

diff --git a/timgen/Dockerfile.production b/timgen/Dockerfile.production
@@ -13,7 +13,7 @@ RUN npm ci
 
 ADD index.html \
     index.js \
-    proxy.js \
+    server.js \
     /code/
 
 ADD src /code/src