Merge branch 'release' into ts-migrate

.vscode/launch.json

@@ -3,13 +3,13 @@
     // Hover to view descriptions of existing attributes.
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
-    "configurations": [  
+    "configurations": [
         {
             "name": "Node.js - Debug Current File",
             "type": "node",
             "request": "launch",
             "program": "${file}"
-          },   
+        },
         {
             "address": "0.0.0.0",
             "localRoot": "${workspaceFolder}/backend",
@@ -22,6 +22,18 @@
             ],
             "type": "pwa-node"
         },
+        {
+            "address": "0.0.0.0",
+            "localRoot": "${workspaceFolder}/data-ingestor",
+            "name": "Data Ingestor: Debug with Docker",
+            "port": 9338,
+            "remoteRoot": "/usr/src/app",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "pwa-node"
+        },
         {
             "address": "0.0.0.0",
             "localRoot": "${workspaceFolder}/realtime",

data-ingestor/index.ts

@@ -109,7 +109,7 @@ app.get(
     }
 );
 
-app.use(['/probe', '/api/probe'], require('./api/probe'));
+app.use(['/data-ingestor/probe', '/probe'], require('./api/probe'));
 
 app.set('port', process.env['PORT'] || 3200);
 

docker-compose.dev.yml

@@ -64,7 +64,7 @@ services:
     data-ingestor:
         ports:
             - '3200:3200'
-            - '9239:9229' # Debugging port.
+            - '9338:9229' # Debugging port.
         build:
             network: host
             context: .

probe-api/index.ts

@@ -20,6 +20,6 @@ app.get(
     }
 );
 
-app.use(['/probe', '/api/probe'], require('./api/probe'));
+app.use(['/probe-api/probe', '/probe'], require('./api/probe'));
 
 export default app;