@jbrowse/core 1.6.7 → 1.7.0

package/pluggableElementTypes/renderers/FeatureRendererType.js

@@ -114,10 +114,11 @@ var FeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy) {
     key: "serializeResultsInWorker",
     value: function serializeResultsInWorker(result, args) {
       var serialized = (0, _get2.default)((0, _getPrototypeOf2.default)(FeatureRendererType.prototype), "serializeResultsInWorker", this).call(this, result, args);
+      var features = result.features;
       return _objectSpread(_objectSpread({}, serialized), {}, {
-        features: (0, _util.iterMap)(result.features.values(), function (f) {
+        features: (0, _util.iterMap)(features.values(), function (f) {
           return f.toJSON();
-        })
+        }, features.size)
       });
     }
     /**
@@ -145,7 +146,7 @@ var FeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy) {
       var _getFeatures = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(renderArgs) {
         var _this = this;
 
-        var signal, regions, sessionId, adapterConfig, _yield$getAdapter, dataAdapter, features, requestRegions, region, featureObservable;
+        var signal, regions, sessionId, adapterConfig, _yield$getAdapter, dataAdapter, features, requestRegions, region, featureObservable, feats;
 
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
@@ -188,24 +189,18 @@ var FeatureRendererType = /*#__PURE__*/function (_ServerSideRendererTy) {
                 renderArgs) : // @ts-ignore
                 dataAdapter.getFeaturesInMultipleRegions(requestRegions, renderArgs);
                 _context.next = 13;
-                return featureObservable.pipe((0, _operators.tap)(function () {
-                  return (0, _util.checkAbortSignal)(signal);
-                }), (0, _operators.filter)(function (feature) {
-                  return _this.featurePassesFilters(renderArgs, feature);
-                }), (0, _operators.tap)(function (feature) {
-                  var id = feature.id();
-
-                  if (!id) {
-                    throw new Error("invalid feature id \"".concat(id, "\""));
-                  }
-
-                  features.set(id, feature);
-                }), (0, _operators.ignoreElements)()).toPromise();
+                return featureObservable.pipe((0, _operators.toArray)()).toPromise();
 
               case 13:
-                return _context.abrupt("return", features);
-
-              case 14:
+                feats = _context.sent;
+                (0, _util.checkAbortSignal)(signal);
+                return _context.abrupt("return", new Map(feats.filter(function (feat) {
+                  return _this.featurePassesFilters(renderArgs, feat);
+                }).map(function (feat) {
+                  return [feat.id(), feat];
+                })));
+
+              case 16:
               case "end":
                 return _context.stop();
             }

package/rpc/BaseRpcDriver.d.ts

@@ -1,5 +1,5 @@
 import PluginManager from '../PluginManager';
-import { AnyConfigurationModel } from '../configuration/configurationSchema';
+import { AnyConfigurationModel } from '../configuration';
 export interface WorkerHandle {
     status?: string;
     error?: Error;
@@ -18,26 +18,25 @@ export interface RpcDriverConstructorArgs {
 export declare function watchWorker(worker: WorkerHandle, pingTime: number, rpcDriverClassName: string): Promise<unknown>;
 declare class LazyWorker {
     driver: BaseRpcDriver;
-    worker?: WorkerHandle;
+    workerP?: Promise<WorkerHandle> | undefined;
     constructor(driver: BaseRpcDriver);
-    getWorker(pluginManager: PluginManager, rpcDriverClassName: string): Promise<WorkerHandle>;
+    getWorker(): Promise<WorkerHandle>;
 }
 export default abstract class BaseRpcDriver {
     abstract name: string;
     private lastWorkerAssignment;
     private workerAssignments;
-    private workerCount;
-    abstract makeWorker(pluginManager: PluginManager): Promise<WorkerHandle>;
+    abstract makeWorker(): Promise<WorkerHandle>;
     private workerPool?;
     maxPingTime: number;
     workerCheckFrequency: number;
     config: AnyConfigurationModel;
     constructor(args: RpcDriverConstructorArgs);
-    filterArgs<THING_TYPE>(thing: THING_TYPE, pluginManager: PluginManager, sessionId: string): THING_TYPE;
-    remoteAbort(pluginManager: PluginManager, sessionId: string, functionName: string, signalId: number): Promise<void>;
+    filterArgs<THING_TYPE>(thing: THING_TYPE, sessionId: string): THING_TYPE;
+    remoteAbort(sessionId: string, functionName: string, signalId: number): Promise<void>;
     createWorkerPool(): LazyWorker[];
     getWorkerPool(): LazyWorker[];
-    getWorker(sessionId: string, pluginManager: PluginManager): Promise<WorkerHandle>;
+    getWorker(sessionId: string): Promise<WorkerHandle>;
     call(pluginManager: PluginManager, sessionId: string, functionName: string, args: {
         statusCallback?: (message: string) => void;
     }, options?: {}): Promise<unknown>;

package/rpc/BaseRpcDriver.js

@@ -30,6 +30,8 @@ var _util = require("../util");
 
 var _remoteAbortSignals = require("./remoteAbortSignals");
 
+var _configuration = require("../configuration");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -119,48 +121,38 @@ var LazyWorker = /*#__PURE__*/function () {
   function LazyWorker(driver) {
     (0, _classCallCheck2.default)(this, LazyWorker);
     this.driver = driver;
-    (0, _defineProperty2.default)(this, "worker", void 0);
+    (0, _defineProperty2.default)(this, "workerP", void 0);
   }
 
   (0, _createClass2.default)(LazyWorker, [{
     key: "getWorker",
     value: function () {
-      var _getWorker = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(pluginManager, rpcDriverClassName) {
+      var _getWorker = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _this = this;
 
-        var worker;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                if (this.worker) {
-                  _context.next = 6;
-                  break;
+                if (!this.workerP) {
+                  this.workerP = this.driver.makeWorker().then(function (worker) {
+                    watchWorker(worker, _this.driver.maxPingTime, _this.driver.name).catch(function (error) {
+                      if (worker) {
+                        console.error('worker did not respond, killing and generating new one');
+                        console.error(error);
+                        worker.destroy();
+                        worker.status = 'killed';
+                        worker.error = error;
+                        _this.workerP = undefined;
+                      }
+                    });
+                    return worker;
+                  });
                 }
 
-                _context.next = 3;
-                return this.driver.makeWorker(pluginManager);
+                return _context.abrupt("return", this.workerP);
 
-              case 3:
-                worker = _context.sent;
-                watchWorker(worker, this.driver.maxPingTime, rpcDriverClassName).catch(function (error) {
-                  if (_this.worker) {
-                    console.error('worker did not respond, killing and generating new one');
-                    console.error(error);
-
-                    _this.worker.destroy();
-
-                    _this.worker.status = 'killed';
-                    _this.worker.error = error;
-                    _this.worker = undefined;
-                  }
-                });
-                this.worker = worker;
-
-              case 6:
-                return _context.abrupt("return", this.worker);
-
-              case 7:
+              case 2:
               case "end":
                 return _context.stop();
             }
@@ -168,7 +160,7 @@ var LazyWorker = /*#__PURE__*/function () {
         }, _callee, this);
       }));
 
-      function getWorker(_x4, _x5) {
+      function getWorker() {
         return _getWorker.apply(this, arguments);
       }
 
@@ -184,7 +176,6 @@ var BaseRpcDriver = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "name", void 0);
     (0, _defineProperty2.default)(this, "lastWorkerAssignment", -1);
     (0, _defineProperty2.default)(this, "workerAssignments", new Map());
-    (0, _defineProperty2.default)(this, "workerCount", 0);
     (0, _defineProperty2.default)(this, "workerPool", void 0);
     (0, _defineProperty2.default)(this, "maxPingTime", 30000);
     (0, _defineProperty2.default)(this, "workerCheckFrequency", 5000);
@@ -195,19 +186,19 @@ var BaseRpcDriver = /*#__PURE__*/function () {
 
   (0, _createClass2.default)(BaseRpcDriver, [{
     key: "filterArgs",
-    value: function filterArgs(thing, pluginManager, sessionId) {
+    value: function filterArgs(thing, sessionId) {
       var _this2 = this;
 
       if (Array.isArray(thing)) {
         return thing.filter(isClonable).map(function (t) {
-          return _this2.filterArgs(t, pluginManager, sessionId);
+          return _this2.filterArgs(t, sessionId);
         });
       }
 
       if ((0, _typeof2.default)(thing) === 'object' && thing !== null) {
         // AbortSignals are specially handled
         if (thing instanceof AbortSignal) {
-          return (0, _remoteAbortSignals.serializeAbortSignal)(thing, this.remoteAbort.bind(this, pluginManager, sessionId));
+          return (0, _remoteAbortSignals.serializeAbortSignal)(thing, this.remoteAbort.bind(this, sessionId));
         }
 
         if ((0, _mobxStateTree.isStateTreeNode)(thing) && !(0, _mobxStateTree.isAlive)(thing)) {
@@ -227,7 +218,7 @@ var BaseRpcDriver = /*#__PURE__*/function () {
               k = _ref2[0],
               v = _ref2[1];
 
-          return [k, _this2.filterArgs(v, pluginManager, sessionId)];
+          return [k, _this2.filterArgs(v, sessionId)];
         }));
       }
 
@@ -236,14 +227,14 @@ var BaseRpcDriver = /*#__PURE__*/function () {
   }, {
     key: "remoteAbort",
     value: function () {
-      var _remoteAbort = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(pluginManager, sessionId, functionName, signalId) {
+      var _remoteAbort = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(sessionId, functionName, signalId) {
         var worker;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 _context2.next = 2;
-                return this.getWorker(sessionId, pluginManager);
+                return this.getWorker(sessionId);
 
               case 2:
                 worker = _context2.sent;
@@ -262,7 +253,7 @@ var BaseRpcDriver = /*#__PURE__*/function () {
         }, _callee2, this);
       }));
 
-      function remoteAbort(_x6, _x7, _x8, _x9) {
+      function remoteAbort(_x4, _x5, _x6) {
         return _remoteAbort.apply(this, arguments);
       }
 
@@ -274,7 +265,7 @@ var BaseRpcDriver = /*#__PURE__*/function () {
       var _this3 = this;
 
       var hardwareConcurrency = detectHardwareConcurrency();
-      var workerCount = this.workerCount || Math.max(1, Math.ceil((hardwareConcurrency - 2) / 3));
+      var workerCount = (0, _configuration.readConfObject)(this.config, 'workerCount') || (0, _util.clamp)(1, Math.max(1, hardwareConcurrency - 1), 5);
       return (0, _toConsumableArray2.default)(new Array(workerCount)).map(function () {
         return new LazyWorker(_this3);
       });
@@ -293,7 +284,7 @@ var BaseRpcDriver = /*#__PURE__*/function () {
   }, {
     key: "getWorker",
     value: function () {
-      var _getWorker2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(sessionId, pluginManager) {
+      var _getWorker2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(sessionId) {
         var workers, workerNumber, workerAssignment, worker;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
@@ -310,7 +301,7 @@ var BaseRpcDriver = /*#__PURE__*/function () {
                 } // console.log(`${sessionId} -> worker ${workerNumber}`)
 
 
-                worker = workers[workerNumber].getWorker(pluginManager, this.name);
+                worker = workers[workerNumber].getWorker();
 
                 if (worker) {
                   _context3.next = 6;
@@ -330,7 +321,7 @@ var BaseRpcDriver = /*#__PURE__*/function () {
         }, _callee3, this);
       }));
 
-      function getWorker(_x10, _x11) {
+      function getWorker(_x7) {
         return _getWorker2.apply(this, arguments);
       }
 
@@ -369,7 +360,7 @@ var BaseRpcDriver = /*#__PURE__*/function () {
               case 3:
                 done = false;
                 _context4.next = 6;
-                return this.getWorker(sessionId, pluginManager);
+                return this.getWorker(sessionId);
 
               case 6:
                 worker = _context4.sent;
@@ -379,7 +370,7 @@ var BaseRpcDriver = /*#__PURE__*/function () {
 
               case 10:
                 serializedArgs = _context4.sent;
-                filteredAndSerializedArgs = this.filterArgs(serializedArgs, pluginManager, sessionId); // now actually call the worker
+                filteredAndSerializedArgs = this.filterArgs(serializedArgs, sessionId); // now actually call the worker
 
                 callP = worker.call(functionName, filteredAndSerializedArgs, _objectSpread({
                   timeout: 5 * 60 * 1000,
@@ -417,7 +408,7 @@ var BaseRpcDriver = /*#__PURE__*/function () {
         }, _callee4, this);
       }));
 
-      function call(_x12, _x13, _x14, _x15) {
+      function call(_x8, _x9, _x10, _x11) {
         return _call.apply(this, arguments);
       }
 

package/rpc/BaseRpcDriver.test.js

@@ -334,7 +334,7 @@ var MockRpcDriver = /*#__PURE__*/function (_BaseRpcDriver) {
   (0, _createClass2.default)(MockRpcDriver, [{
     key: "makeWorker",
     value: function () {
-      var _makeWorker = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(_pluginManager) {
+      var _makeWorker = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
         return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
@@ -349,7 +349,7 @@ var MockRpcDriver = /*#__PURE__*/function (_BaseRpcDriver) {
         }, _callee5);
       }));
 
-      function makeWorker(_x2) {
+      function makeWorker() {
         return _makeWorker.apply(this, arguments);
       }
 

package/rpc/RpcManager.js

@@ -25,6 +25,10 @@ var _WebWorkerRpcDriver = _interopRequireDefault(require("./WebWorkerRpcDriver")
 
 var _MainThreadRpcDriver = _interopRequireDefault(require("./MainThreadRpcDriver"));
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 var DriverClasses = {
   WebWorkerRpcDriver: _WebWorkerRpcDriver.default,
   MainThreadRpcDriver: _MainThreadRpcDriver.default
@@ -54,21 +58,35 @@ var RpcManager = /*#__PURE__*/function () {
         return driver;
       }
 
-      var backendConfiguration = this.backendConfigurations[backendName];
-      var DriverClassImpl = DriverClasses[backendName];
+      var newDriver;
+      var config = this.mainConfiguration.drivers.get('WebWorkerRpcDriver');
 
-      if (!DriverClassImpl) {
-        throw new Error("requested RPC driver \"".concat(backendName, "\" is not installed"));
-      }
+      if (backendName === 'MainThreadRpcDriver') {
+        var backendConfiguration = this.backendConfigurations.MainThreadRpcDriver;
 
-      if (!backendConfiguration) {
-        throw new Error("requested RPC driver \"".concat(backendName, "\" is missing config"));
-      } // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        if (!backendConfiguration) {
+          throw new Error("requested RPC driver \"".concat(backendName, "\" is missing config"));
+        }
 
+        newDriver = new _MainThreadRpcDriver.default(_objectSpread(_objectSpread({}, backendConfiguration), {}, {
+          config: config
+        }));
+      } else if (backendName === 'WebWorkerRpcDriver') {
+        var _backendConfiguration = this.backendConfigurations.WebWorkerRpcDriver;
+
+        if (!_backendConfiguration) {
+          throw new Error("requested RPC driver \"".concat(backendName, "\" is missing config"));
+        }
+
+        newDriver = new _WebWorkerRpcDriver.default(_objectSpread(_objectSpread({}, _backendConfiguration), {}, {
+          config: config
+        }), {
+          plugins: this.pluginManager.runtimePluginDefinitions
+        });
+      } else {
+        throw new Error("requested RPC driver \"".concat(backendName, "\" is not installed"));
+      }
 
-      var newDriver = new DriverClassImpl(backendConfiguration, {
-        plugins: this.pluginManager.runtimePluginDefinitions
-      });
       this.driverObjects.set(backendName, newDriver);
       return newDriver;
     }

package/rpc/WebWorkerRpcDriver.d.ts

@@ -1,12 +1,8 @@
 import Rpc from 'librpc-web-mod';
 import BaseRpcDriver, { RpcDriverConstructorArgs } from './BaseRpcDriver';
 import { PluginDefinition } from '../PluginLoader';
-interface WebpackWorker {
-    new (): Worker;
-    prototype: Worker;
-}
 interface WebWorkerRpcDriverConstructorArgs extends RpcDriverConstructorArgs {
-    WorkerClass: WebpackWorker;
+    makeWorkerInstance: () => Worker;
 }
 declare class WebWorkerHandle extends Rpc.Client {
     destroy(): void;
@@ -20,7 +16,7 @@ export default class WebWorkerRpcDriver extends BaseRpcDriver {
         plugins: PluginDefinition[];
     };
     name: string;
-    WorkerClass: WebpackWorker;
+    makeWorkerInstance: () => Worker;
     constructor(args: WebWorkerRpcDriverConstructorArgs, workerBootConfiguration: {
         plugins: PluginDefinition[];
     });

package/rpc/WebWorkerRpcDriver.js

@@ -116,8 +116,8 @@ var WebWorkerRpcDriver = /*#__PURE__*/function (_BaseRpcDriver) {
     _this = _super2.call(this, args);
     _this.workerBootConfiguration = workerBootConfiguration;
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "name", 'WebWorkerRpcDriver');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "WorkerClass", void 0);
-    _this.WorkerClass = args.WorkerClass;
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "makeWorkerInstance", void 0);
+    _this.makeWorkerInstance = args.makeWorkerInstance;
     return _this;
   }
 
@@ -127,7 +127,7 @@ var WebWorkerRpcDriver = /*#__PURE__*/function (_BaseRpcDriver) {
       var _makeWorker = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var _this2 = this;
 
-        var worker, p;
+        var instance, worker, p;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -135,8 +135,9 @@ var WebWorkerRpcDriver = /*#__PURE__*/function (_BaseRpcDriver) {
                 // note that we are making a Rpc.Client connection with a worker pool of
                 // one for each worker, because we want to do our own state-group-aware
                 // load balancing rather than using librpc's builtin round-robin
+                instance = this.makeWorkerInstance();
                 worker = new WebWorkerHandle({
-                  workers: [new this.WorkerClass()]
+                  workers: [instance]
                 }); // send the worker its boot configuration using info from the pluginManager
 
                 p = new Promise(function (resolve, reject) {
@@ -152,7 +153,7 @@ var WebWorkerRpcDriver = /*#__PURE__*/function (_BaseRpcDriver) {
                 });
                 return _context2.abrupt("return", p);
 
-              case 3:
+              case 4:
               case "end":
                 return _context2.stop();
             }

package/rpc/configSchema.js

@@ -9,14 +9,22 @@ var _mobxStateTree = require("mobx-state-tree");
 
 var _configuration = require("../configuration");
 
-var MainThreadRpcDriverConfigSchema = (0, _configuration.ConfigurationSchema)('MainThreadRpcDriver', {}, {
+var BaseRpcDriverConfigSchema = (0, _configuration.ConfigurationSchema)('BaseRpcDriver', {
+  workerCount: {
+    type: 'number',
+    description: 'The number of workers to use. If 0 (the default) JBrowse will decide how many workers to use.',
+    defaultValue: 0
+  }
+}, {
   explicitlyTyped: true
 });
-var WebWorkerRpcDriverConfigSchema = (0, _configuration.ConfigurationSchema)('WebWorkerRpcDriver', {}, {
-  explicitlyTyped: true
+var MainThreadRpcDriverConfigSchema = (0, _configuration.ConfigurationSchema)('MainThreadRpcDriver', {}, {
+  explicitlyTyped: true,
+  baseConfiguration: BaseRpcDriverConfigSchema
 });
-var ElectronRpcDriverConfigSchema = (0, _configuration.ConfigurationSchema)('ElectronRpcDriver', {}, {
-  explicitlyTyped: true
+var WebWorkerRpcDriverConfigSchema = (0, _configuration.ConfigurationSchema)('WebWorkerRpcDriver', {}, {
+  explicitlyTyped: true,
+  baseConfiguration: BaseRpcDriverConfigSchema
 });
 
 var _default = (0, _configuration.ConfigurationSchema)('RpcOptions', {
@@ -25,7 +33,7 @@ var _default = (0, _configuration.ConfigurationSchema)('RpcOptions', {
     description: 'the RPC driver to use for tracks and tasks that are not configured to use a specific RPC backend',
     defaultValue: 'MainThreadRpcDriver'
   },
-  drivers: _mobxStateTree.types.optional(_mobxStateTree.types.map(_mobxStateTree.types.union(MainThreadRpcDriverConfigSchema, WebWorkerRpcDriverConfigSchema, ElectronRpcDriverConfigSchema)), {
+  drivers: _mobxStateTree.types.optional(_mobxStateTree.types.map(_mobxStateTree.types.union(MainThreadRpcDriverConfigSchema, WebWorkerRpcDriverConfigSchema)), {
     MainThreadRpcDriver: {
       type: 'MainThreadRpcDriver'
     }

package/ui/App.js

@@ -238,23 +238,19 @@ var App = (0, _mobxReact.observer)(function (_ref2) {
     }
 
     var ReactComponent = viewType.ReactComponent;
-    return (
-      /*#__PURE__*/
-      // @ts-ignore
-      _react.default.createElement(_ViewContainer.default, {
-        key: "view-".concat(view.id),
-        view: view,
-        onClose: function onClose() {
-          return session.removeView(view);
-        }
-      }, /*#__PURE__*/_react.default.createElement(_react.Suspense, {
-        fallback: /*#__PURE__*/_react.default.createElement("div", null, "Loading...")
-      }, /*#__PURE__*/_react.default.createElement(ReactComponent, {
-        model: view,
-        session: session,
-        getTrackType: pluginManager.getTrackType
-      })))
-    );
+    return /*#__PURE__*/_react.default.createElement(_ViewContainer.default, {
+      key: "view-".concat(view.id),
+      view: view,
+      onClose: function onClose() {
+        return session.removeView(view);
+      }
+    }, /*#__PURE__*/_react.default.createElement(_react.Suspense, {
+      fallback: /*#__PURE__*/_react.default.createElement("div", null, "Loading...")
+    }, /*#__PURE__*/_react.default.createElement(ReactComponent, {
+      model: view,
+      session: session,
+      getTrackType: pluginManager.getTrackType
+    })));
   }) : /*#__PURE__*/_react.default.createElement(_core.Paper, {
     className: classes.selectPaper
   }, /*#__PURE__*/_react.default.createElement(_core.Typography, null, "Select a view to launch"), /*#__PURE__*/_react.default.createElement(_core.Select, {

package/ui/AssemblySelector.d.ts

@@ -1,8 +1,11 @@
 /// <reference types="react" />
+import { InputProps as IIP } from '@material-ui/core';
 import { AbstractSessionModel } from '../util';
-declare const AssemblySelector: ({ session, onChange, selected, }: {
+declare const AssemblySelector: ({ session, onChange, selected, InputProps, extra, }: {
     session: AbstractSessionModel;
     onChange: (arg: string) => void;
     selected: string | undefined;
+    InputProps?: IIP | undefined;
+    extra?: unknown;
 }) => JSX.Element;
 export default AssemblySelector;

package/ui/AssemblySelector.js

@@ -2,12 +2,16 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
 
 var _mobxReact = require("mobx-react");
 
@@ -15,35 +19,92 @@ var _configuration = require("../configuration");
 
 var _core = require("@material-ui/core");
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 var useStyles = (0, _core.makeStyles)(function () {
   return {
     importFormEntry: {
       minWidth: 180
     }
   };
-});
+}); // Hook from https://usehooks.com/useLocalStorage/
+
+function useLocalStorage(key, initialValue) {
+  var _useState = (0, _react.useState)(function () {
+    if (typeof window === 'undefined') {
+      return initialValue;
+    }
+
+    try {
+      var item = window.localStorage.getItem(key);
+      return item ? JSON.parse(item) : initialValue;
+    } catch (error) {
+      console.error(error);
+      return initialValue;
+    }
+  }),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      storedValue = _useState2[0],
+      setStoredValue = _useState2[1];
+
+  var setValue = function setValue(value) {
+    try {
+      var valueToStore = value instanceof Function ? value(storedValue) : value;
+      setStoredValue(valueToStore);
+
+      if (typeof window !== 'undefined') {
+        window.localStorage.setItem(key, JSON.stringify(valueToStore));
+      }
+    } catch (error) {
+      console.error(error);
+    }
+  };
+
+  return [storedValue, setValue];
+}
+
 var AssemblySelector = (0, _mobxReact.observer)(function (_ref) {
   var session = _ref.session,
-      _onChange = _ref.onChange,
-      selected = _ref.selected;
+      onChange = _ref.onChange,
+      selected = _ref.selected,
+      InputProps = _ref.InputProps,
+      _ref$extra = _ref.extra,
+      extra = _ref$extra === void 0 ? 0 : _ref$extra;
   var classes = useStyles();
   var assemblyNames = session.assemblyNames,
-      assemblyManager = session.assemblyManager;
+      assemblyManager = session.assemblyManager; // constructs a localstorage key based on host/path/config to help
+  // remember. non-config assists usage with e.g. embedded apps
+
+  var config = new URLSearchParams(window.location.search).get('config');
+
+  var _useLocalStorage = useLocalStorage("lastAssembly-".concat([window.location.host + window.location.pathname, config, extra].join('-')), selected),
+      _useLocalStorage2 = (0, _slicedToArray2.default)(_useLocalStorage, 2),
+      lastSelected = _useLocalStorage2[0],
+      setLastSelected = _useLocalStorage2[1];
+
+  var selection = assemblyNames.includes(lastSelected || '') ? lastSelected : selected;
+  (0, _react.useEffect)(function () {
+    if (selection && selection !== selected) {
+      onChange(selection);
+    }
+  }, [selection, onChange, selected]);
   var error = assemblyNames.length ? '' : 'No configured assemblies';
   return /*#__PURE__*/_react.default.createElement(_core.TextField, {
     select: true,
     label: "Assembly",
     variant: "outlined",
-    margin: "normal",
     helperText: error || 'Select assembly to view',
-    value: error ? '' : selected,
+    value: error ? '' : selection,
     inputProps: {
       'data-testid': 'assembly-selector'
     },
     onChange: function onChange(event) {
-      return _onChange(event.target.value);
+      return setLastSelected(event.target.value);
     },
     error: !!error,
+    InputProps: InputProps,
     disabled: !!error,
     className: classes.importFormEntry
   }, assemblyNames.map(function (name) {