@jbrowse/cli 3.6.4 → 3.7.0

package/dist/commands/add-connection.js

@@ -128,7 +128,7 @@ async function run(args) {
     }
     const configType = type || determineConnectionType(url);
     const id = connectionId ||
-        [configType, assemblyNames, +Date.now()].filter(f => !!f).join('-');
+        [configType, assemblyNames, Date.now()].filter(f => !!f).join('-');
     const connectionConfig = {
         type: configType,
         name: name || id,

package/dist/commands/admin-server-utils.js

@@ -8,14 +8,10 @@ exports.parsePort = parsePort;
 exports.generateKey = generateKey;
 exports.setupConfigFile = setupConfigFile;
 exports.setupRoutes = setupRoutes;
-exports.setupServer = setupServer;
 exports.startServer = startServer;
 const crypto_1 = __importDefault(require("crypto"));
 const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-const cors_1 = __importDefault(require("cors"));
-const express_1 = __importDefault(require("express"));
 const utils_1 = require("../utils");
 /**
  * Validates if a port number is in the valid range
@@ -176,44 +172,6 @@ function setupRoutes({ app, baseDir, outFile, key, serverRef, }) {
         });
     });
 }
-/**
- * Sets up the Express server with routes
- */
-function setupServer({ baseDir, outFile, bodySizeLimit, }) {
-    // Create Express application
-    const app = (0, express_1.default)();
-    // Configure middleware
-    app.use(express_1.default.static(baseDir));
-    app.use((0, cors_1.default)());
-    app.use(express_1.default.json({ limit: bodySizeLimit }));
-    // Add error handling middleware
-    app.use((err, _req, res, next) => {
-        if (err) {
-            console.error('Server error:', err);
-            res.status(500).setHeader('Content-Type', 'text/plain');
-            res.send('Internal Server Error');
-        }
-        else {
-            next();
-        }
-    });
-    // Generate admin key and store it
-    const key = generateKey();
-    const keyPath = path_1.default.join(os_1.default.tmpdir(), `jbrowse-admin-${key}`);
-    try {
-        fs_1.default.writeFileSync(keyPath, key);
-        (0, utils_1.debug)(`Admin key stored at ${keyPath}`);
-    }
-    catch (error) {
-        console.error(`Failed to write admin key to ${keyPath}:`, error.message);
-        // Continue anyway, as this is not critical
-    }
-    // Create server reference for shutdown route
-    const serverRef = { current: null };
-    // Set up routes
-    setupRoutes({ app, baseDir, outFile, key, serverRef });
-    return { app, key, keyPath, serverRef };
-}
 /**
  * Starts the server and sets up shutdown handlers
  */

package/dist/commands/admin-server.js

@@ -1,9 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = run;
+const fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
-const utils_1 = require("../utils");
+const cors_1 = __importDefault(require("cors"));
+const express_1 = __importDefault(require("express"));
 const admin_server_utils_1 = require("./admin-server-utils");
+const utils_1 = require("../utils");
 async function run(args) {
     const options = {
         help: {
@@ -45,10 +53,47 @@ async function run(args) {
     // Parse and validate port
     const port = (0, admin_server_utils_1.parsePort)({ portStr: flags.port });
     // Set up the Express server
-    const { app, key, keyPath, serverRef } = (0, admin_server_utils_1.setupServer)({
+    // const { app, key, keyPath, serverRef } = setupServer({
+    //   baseDir,
+    //   outFile,
+    //   bodySizeLimit,
+    // })
+    const app = (0, express_1.default)();
+    // Configure middleware
+    app.use(express_1.default.static(baseDir));
+    app.use((0, cors_1.default)());
+    app.use(express_1.default.json({ limit: bodySizeLimit }));
+    // Add error handling middleware
+    app.use((err, _req, res, next) => {
+        if (err) {
+            console.error('Server error:', err);
+            res.status(500).setHeader('Content-Type', 'text/plain');
+            res.send('Internal Server Error');
+        }
+        else {
+            next();
+        }
+    });
+    // Generate admin key and store it
+    const key = (0, admin_server_utils_1.generateKey)();
+    const keyPath = path_1.default.join(os_1.default.tmpdir(), `jbrowse-admin-${key}`);
+    try {
+        fs_1.default.writeFileSync(keyPath, key);
+        (0, utils_1.debug)(`Admin key stored at ${keyPath}`);
+    }
+    catch (error) {
+        console.error(`Failed to write admin key to ${keyPath}:`, error.message);
+        // Continue anyway, as this is not critical
+    }
+    // Create server reference for shutdown route
+    const serverRef = { current: null };
+    // Set up routes
+    (0, admin_server_utils_1.setupRoutes)({
+        app,
         baseDir,
         outFile,
-        bodySizeLimit,
+        key,
+        serverRef,
     });
     // Start the server and set up shutdown handlers
     (0, admin_server_utils_1.startServer)({ app, port, key, outFile, keyPath, serverRef });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/cli",
-  "version": "3.6.4",
+  "version": "3.7.0",
   "description": "A command line tool for working with JBrowse 2",
   "keywords": [
     "jbrowse",
@@ -43,10 +43,11 @@
     "express": "^5.1.0",
     "ixixx": "^2.0.1",
     "json-parse-better-errors": "^1.0.2",
-    "node-fetch-native": "^1.6.4"
+    "node-fetch-native": "^1.6.4",
+    "tmp": "^0.2.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3db8e50ce2bd9c081efbf6c2e7ae5f342380a25a"
+  "gitHead": "85bdd0d58286b7adbfd408146b15847676317635"
 }