mapshaper 0.7.3 → 0.7.5

package/bin/mapshaper-gui

@@ -16,6 +16,7 @@ var defaultPort = 5555,
       .option('-t, --target <name>', 'name of layer to select initially')
       .addOption(new commander.Option('-b, --blurb <text>',
         'replace the default blurb on the import screen').hideHelp())
+      .argument('[file...]', 'data files to load')
       .helpOption('-h, --help', 'show this help message')
       .version(require('../package.json').version)
       .parse(process.argv),
@@ -25,7 +26,6 @@ var defaultPort = 5555,
     url = require("url"),
     fs = require("fs"),
     Cookies = require("cookies"),
-    opn = require("opn"),
     webRoot = path.join(__dirname, "../www"),
     port = parseInt(opts.port, 10) || defaultPort,
     dataFiles = expandShapefiles(program.args),
@@ -66,10 +66,24 @@ function startServer(port) {
       // block attempts to load files outside webroot
       serve404(response);
     } else if (uri == '/close') {
-      // end process when page closes, unless page is immediately refreshed
+      // End process when page closes, unless page is immediately refreshed.
+      // The grace window (1500ms) gives the refreshed page time to send
+      // /cancel-close. A short window is not safe here: with sendBeacon,
+      // /close frequently arrives at the server *after* the new page's
+      // resource fetches have already been served, so we can't rely on
+      // those fetches to reset the timer for us.
       timeout = setTimeout(function() {
         process.exit(0);
-      }, 200);
+      }, 1500);
+      response.writeHead(204); // no content
+      response.end();
+    } else if (uri == '/cancel-close') {
+      // The page-load-time refresh detection in src/gui/gui.mjs sends this
+      // when sessionStorage indicates the new page is a refresh of the
+      // previous tab incarnation. clearTimeout above already cancelled any
+      // pending exit; we just need to acknowledge the request.
+      response.writeHead(204);
+      response.end();
     } else if (uri == "/manifest.js") {
       if (!sessionId && opts.directSave) {
         // create a session id for authenticating requests to save files
@@ -86,14 +100,24 @@ function startServer(port) {
     } else if (uri.indexOf('/save') === 0) {
       saveContent(request, response);
     } else {
-      // serve a file from the web root
-      if (uri == '/') {
-        uri = '/index.html';
+      // serve a file from the web root. Translate directory paths (any URI
+      // ending in '/') to their index.html so that links like '/docs/' work
+      // the way they do behind a normal static-file host (mapshaper.org).
+      if (uri.endsWith('/')) {
+        uri += 'index.html';
       }
       serveFile(getAssetFilePath(uri), response);
     }
   }).listen(port, 'localhost', function() {
-    opn("http://localhost:" + port);
+    // `open` is ESM-only since v9, so import it dynamically from this CJS bin
+    // script. Failure to launch a browser is non-fatal: the user can still
+    // visit the URL printed (or implied) by the running server.
+    import('open').then(function(mod) {
+      return mod.default("http://localhost:" + port);
+    }).catch(function(err) {
+      console.error("Could not open browser automatically; visit http://localhost:" + port + " manually.");
+      console.error(err && err.message || err);
+    });
   });
 }