Merge remote-tracking branch 'origin/main' into azure-openai-integrat…

…ion-server-side-3

libraries/objectDefaultFiles/object.js

@@ -299,7 +299,7 @@
     /**
      * Helper function that tools can use to convert a path on the server to the correct server's URL,
      * @example input: '/object/test/uploadMediaFile'
-     *          output: 'https://toolboxedge.net/n/id/s/id/object/test/uploadMediaFile' on cloud server
+     *          output: 'https://spatial.ptc.io/n/id/s/id/object/test/uploadMediaFile' on cloud server
      *          output: 'http://192.168.0.25:8080/object/test/uploadMediaFile' on local server
      * @param {string} path
      * @returns {string}

libraries/serverHelpers/proxyRequestHandler.js

@@ -3,9 +3,9 @@ const https = require('https');
 const proxyRequestHandler = (req, res) => {
     const input = req.params[0];
     if (!input.includes('://')) {
-        const proxyURL = `https://toolboxedge.net/${req.params[0]}`;
+        const proxyURL = `https://spatial.ptc.io/${req.params[0]}`;
         const headers = req.headers;
-        headers.Host = "toolboxedge.net";
+        headers.Host = 'spatial.ptc.io';
         https.get(proxyURL, {headers}, proxyRes => {
             res.status(proxyRes.statusCode);
             for (let header in proxyRes.headers) {

package.json

@@ -40,7 +40,7 @@
     "jsdoc": "^4.0.2",
     "minami": "^1.2.3",
     "mock-fs": "^5.2.0",
-    "puppeteer": "^22.6.1"
+    "puppeteer": "^22.6.3"
   },
   "scripts": {
     "test": "npm run lint && jest --forceExit --runInBand",

persistence/CloudProxyWrapper.js

@@ -72,7 +72,7 @@ class CloudProxyWrapper {
         if (!edgeAgent || !edgeAgent.networkUUID || !edgeAgent.networkSecret) {
             throw new Error('bad edge-agent settings: ' + JSON.stringify(edgeAgent));
         }
-        const serverUrl = edgeAgent.serverUrl || 'alpha.toolboxedge.net';
+        const serverUrl = edgeAgent.serverUrl || 'alpha.spatial.ptc.io';
         const networkUUID = edgeAgent.networkUUID;
         const networkSecret = edgeAgent.networkSecret;
         return `https://${serverUrl}/n/${networkUUID}/s/${networkSecret}/files/`;

server.js

@@ -107,6 +107,19 @@ const globalVariables = {
 
 exports.useHTTPS = globalVariables.useHTTPS;
 
+let forceGCInterval = null;
+if (global.gc) {
+    setInterval(() => {
+        const usage = process.memoryUsage();
+        // Total memory usage less than 100 MB
+        if (!usage || usage.rss < 100 * 1024 * 1024) {
+            return;
+        }
+
+        global.gc();
+    }, 7919); // arbitrary prime number delay to distribute around the gc hitches
+}
+
 // ports used to define the server behaviour
 /*
  The server uses port 8080 to communicate with other servers and with the Reality Editor.
@@ -1179,6 +1192,9 @@ async function exit() {
         console.warn('unable to close udpServer', e);
     }
     clearInterval(socketUpdaterInterval);
+    if (forceGCInterval) {
+        clearInterval(forceGCInterval);
+    }
     staleObjectCleaner.clearCleanupIntervals();
     humanPoseFuser.stop();
     for (const splatTask of Object.values(splatTasks)) {
@@ -2324,7 +2340,7 @@ function objectWebServer() {
             res.send(webFrontend.generateHtmlForHardwareInterface(req.params.interfaceName, hardwareInterfaceModules, version, services.ips, serverPort, globalVariables.useHTTPS, configHtmlPath));
         });
 
-        // Proxies requests to toolboxedge.net, for CORS video playback
+        // Proxies requests to spatial.ptc.io, for CORS video playback
         const proxyRequestHandler = require('./libraries/serverHelpers/proxyRequestHandler.js');
         webServer.get('/proxy/*', proxyRequestHandler);