Allow specification of a public_baseurl. (#25)

* Allow specification of a public_baseurl.

* Prepare

* Ensure timeout set for testing synapse up-ness

* Remove use of custom baseurl other than by synapse itself.

Author: michaelkaye

.github/workflows/test.yml

@@ -22,6 +22,20 @@ jobs:
         uploadLogs: true
         httpPort: 8008
 
+  test-baseurl:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
+      with:
+        python-version: "3.x"
+    - name: Run synapse
+      uses: ./
+      with: 
+        uploadLogs: true
+        httpPort: 8008
+        public_baseurl: http://10.0.2.2:8008/
+  
   test-modules:
     runs-on: ubuntu-latest
     steps:

action.yml

@@ -17,6 +17,9 @@ inputs:
     description: 'Comma-separated list of modules to pip install.'
     required: false
     default: ''
+  public_baseurl:
+    description: 'Public base URL (defaults to http://localhost:${httpPort} if not defined)'
+    required: false
   httpPort:
     description: 'HTTP port for C-S and S-S APIs'
     required: false

create.js

@@ -39,10 +39,15 @@ async function run() {
 
 
     const port = core.getInput("httpPort");
-    // Additional is our customizations to the base homeserver config
+    var public_baseurl = core.getInput("public_baseurl");
+    if (public_baseurl == "") {
+       public_baseurl = `http://localhost:${port}`
+    }
+
 
+    // Additional is our customizations to the base homeserver config
     var additional = {
-       public_baseurl: `http://localhost:${port}/`,
+       public_baseurl: public_baseurl,
        enable_registration: true,
        enable_registration_without_verification: true,
        listeners: [
@@ -156,7 +161,7 @@ async function run() {
     core.info(`Waiting until C-S api is available`);
 
 
-    const url = `http://localhost:${port}/_matrix/client/versions`;
+    const url = `http://localhost:${ port }/_matrix/client/versions`;
     var retry = 0;
     while (true) {
       core.info("Checking endpoint...");
@@ -180,17 +185,22 @@ async function run() {
 
     // Action directory is not in the root; provide an output with the synapse folder we're using
     core.saveState("synapse-dir", process.cwd());
-    core.setOutput("synapse-url", `http://localhost:${port}/`);
+    core.setOutput("synapse-url", `http://localhost:${ port }/`);
   } catch (error) {
     core.setFailed(error.message);
   }
 }
 
+// Short timeout because we have a larger retry loop around it
+// And the server should respond within ~500ms or is generally unhappy anyway
 async function checkFor200(target) {
   return new Promise((resolve, reject) => {
 
-    const req = http.get(target, (res) => {
+    const req = http.get(target, {timeout: 500}, (res) => {
        resolve(res.statusCode);
+    }).on('timeout', (e) => {
+       req.abort();
+       resolve(0);
     }).on('error', (e) => {
        resolve(0);
     });;