lucid-package 0.0.119 → 0.0.121

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "lucid-package",
-    "version": "0.0.119",
+    "version": "0.0.121",
     "description": "",
     "main": "index.js",
     "bin": {

package/src/editorextension.js

@@ -115,11 +115,11 @@ exports.watchEditorExtension = watchEditorExtension;
  * @param watchIgnoreNodeModules If true, while serving, will not autoreload on changes to node_modules files
  */
 async function debugEditorExtension(extensionNames, isInternal, quiet = false, pickAnyPort = false, watchIgnoreNodeModules = false) {
-    const port = 9900;
     const watchers = await Promise.all(extensionNames.map(async (name) => watchEditorExtension(name, isInternal, quiet, watchIgnoreNodeModules)));
     const app = express();
-    const server = listen(app, port, pickAnyPort);
-    setupWebSockets(server);
+    const initialPortToTry = 9900;
+    // The actual port number (that the server serves from)can change, depending on anyport behavior.
+    listen(app, initialPortToTry, pickAnyPort);
     const errorLog = new Map();
     recordErrors(watchers, errorLog);
     app.use(cors_1.corsAllowLucid);
@@ -145,10 +145,12 @@ async function debugEditorExtension(extensionNames, isInternal, quiet = false, p
     });
     app.get(['/editorextension', '/editorextension/:name'], async (req, res) => {
         const name = req.params['name'] ?? extensionNames[0];
+        const port = req.socket.localPort;
         const rawExtension = await getRawEditorExtension(name, port);
         res.send(rawExtension);
     });
     app.get('/editorextensions', async (req, res) => {
+        const port = req.socket.localPort;
         res.send(await Promise.all(extensionNames.map((name) => getRawEditorExtension(name, port))));
     });
     app.get('/settings', async (req, res) => {
@@ -229,17 +231,18 @@ async function debugEditorExtension(extensionNames, isInternal, quiet = false, p
     app.use('/resources', express.static('public'));
 }
 exports.debugEditorExtension = debugEditorExtension;
-function listen(app, port, pickAnyPort) {
-    return app
-        .listen(port, 'localhost', () => {
-        console.log((0, theme_1.success)('Listening at http://localhost:' + port + '/extension.js'));
+function listen(app, portToTry, pickAnyPort) {
+    const server = app
+        .listen(portToTry, 'localhost', () => {
+        console.log((0, theme_1.success)('Listening at http://localhost:' + portToTry + '/extension.js'));
         (0, shapelibrary_1.debugShapeLibraries)(undefined, pickAnyPort);
+        setupWebSockets(server);
     })
         .on('error', (err) => {
         if (err.code === 'EADDRINUSE') {
-            if (pickAnyPort && port < 15000) {
-                port++;
-                listen(app, port, pickAnyPort);
+            if (pickAnyPort && portToTry < 15000) {
+                portToTry++;
+                listen(app, portToTry, pickAnyPort);
             }
             else {
                 console.error('Failed to listen for extension');