Merge branch 'main' into gs-upload-test

.github/workflows/nodejs.yml

@@ -30,6 +30,44 @@ jobs:
       run: ./scripts/ci.sh
 
     - name: Run tests
+      run: npm test
+      env:
+        CI: true
+        ALLOW_SECURE_MODE: true
+
+    - uses: actions/upload-artifact@v3
+      if: always()
+      with:
+        name: test-screenshots
+        path: screenshots/
+
+  build-insecure:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    - name: Configure git
+      env:
+        TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+      run: git config --global url."https://${TOKEN}:[email protected]/".insteadOf "https://github.com/"
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - name: Download and install supplementary addons and test data
+      run: ./scripts/ci.sh
+
+    - name: Run tests (http mode)
       run: npm test
       env:
         CI: true

README.md

@@ -49,12 +49,13 @@ Finally, configure and generate a local self-signed certificate.
 cp scripts/cert.conf.template scripts/cert.conf
 # edit scripts/cert.conf to include your local ip address if desired
 vim scripts/cert.conf
-./scripts/generate_certificate.sh
+./scripts/generate_cert.sh or ./scripts/generate_cert.ps1 (for windows)
 ```
 
 If desired, you can now add this certificate (cert.pem) to your local trusted
 certificate store (e.g. Keychain on macOS) to not have to manually add it to
-each browser's cert store.
+each browser's cert store. For more information on trusting on iOS, see [this
+guide](./docs/ios-cert-install.md)
 
 You can now run the server using the following command:
 

config.js

@@ -20,6 +20,10 @@ const argv = yargs
         description: 'The port on which udp discovery broadcasts occur (default 52316)',
         type: 'number',
     })
+    .option('secure', {
+        description: 'Enable the server\'s secure (https) mode',
+        type: 'boolean',
+    })
     .help()
     .argv;
 
@@ -54,3 +58,5 @@ module.exports.beatPort = argv.udpPort || 52316;
 
 // Whether to enable the offline clone functionality
 module.exports.persistToCloud = false;
+
+module.exports.allowSecureMode = argv.secure || process.env.ALLOW_SECURE_MODE === 'true';

docs/ios-cert-install.md

@@ -0,0 +1,39 @@
+---
+layout: doc
+title: Installing Self-signed Certificates on iOS
+permalink: /docs/dive-deeper/internals/ios-self-signed-certificates
+---
+
+The overall process to trusting a local edge server's self-signed certificates
+is to download the cert onto the phone then trust the "Profile" this cert
+provides in the phone's settings.
+
+### Download cert.pem onto phone
+We need to get the file `cert.pem` onto the phone. One such tool is python's built-in http server:
+
+![terminal window showing results of running python3's http server module](./assets/python3-http-server.png)
+
+Next, navigate to http://your-edge-server-ip-address:8000/ to see a listing of
+all files in this directory and download cert.pem from the list.
+
+![a directory listing in Safari on iOS](./assets/downloading-certpem.png)
+
+The page will prompt you if you trust this configuration profile. Accept this prompt and open the Settings app to finish trusting the profile.
+
+![a popup from Safari asking whether you trust the configuration profile](./assets/downloading-certpem-clicked.png)
+
+### Trust configuration profile in Settings
+
+In the Settings app there will be a helpful shortcut "Profile Downloaded" to
+navigate directly to trusting the newly downloaded profile.
+
+![Settings app with "Profile Downloaded" shortcut button visible](./assets/settings-with-profile-downloaded.png)
+
+Tap this shortcut to move onto trusting the profile. Press "Install" on this
+next screen and enter your passcode to finish the trusting process.
+
+![A prompt to the user to install the new configuration profile](./assets/settings-profile-install.png)
+
+With this entire process complete, you should now see the Configuration Profile
+reflected in the Settings - VPN and Device Management list of profiles.
+

libraries/objectDefaultFiles/toolsocket.js

@@ -210,7 +210,7 @@ function ToolboxUtilities_parseUrl(url, schema) {
         }
     }
 
-    const fileEnum = ["jpg", "jpeg", "gif", "zip", "glb", "html", "map", "htm", "xml", "dat", "png", "js", "json", "obj", "fbx", "svg", "mp4", "pdf", "csv", "css", "woff", "otf", "webm", "webp", "ttf", "wasm"];
+    const fileEnum = ["html", "htm", "js", "json", "jpg", "jpeg", "gif", "zip", "glb", "map", "xml", "dat", "png","obj", "splat", "ply", "3dt", "fbx", "svg", "mp4", "pdf", "csv", "css", "woff", "otf", "webm", "webp", "ttf", "wasm"];
     let res = {};
     let route = "";
     let querySplit = [];