move extension info map to Runtime

Author: Christopher Willis-Ford

src/engine/blocks.js

@@ -551,7 +551,7 @@ class Blocks {
         const categoryId = block.categoryId ||
             (block.mutation && block.mutation.blockInfo && block.mutation.blockInfo.categoryId);
         if (categoryId) {
-            block.extensionInfo = this.runtime.extensionManager.getExtensionInfo(categoryId);
+            block.extensionInfo = this.runtime.getExtensionInfo(categoryId);
         }
 
         // Push block id to scripts array.

src/engine/runtime.js

@@ -202,6 +202,13 @@ class Runtime extends EventEmitter {
          */
         this._primitives = {};
 
+        /**
+         * Map of loaded extension URLs/IDs to sanitized extension info.
+         * @type {Map.<string, ExtensionInfo>}
+         * @private
+         */
+        this._loadedExtensions = new Map();
+
         /**
          * Map to look up all block information by extended opcode.
          * @type {Array.<CategoryInfo>}
@@ -824,6 +831,36 @@ class Runtime extends EventEmitter {
         this.emit(Runtime.EXTENSION_ADDED, categoryInfo);
     }
 
+    /**
+     * Check whether an extension is registered or is in the process of loading. This is intended to control loading or
+     * adding extensions so it may return `true` before the extension is ready to be used. Use the promise returned by
+     * `loadExtensionURL` if you need to wait until the extension is truly ready.
+     * @param {string} extensionID - the ID of the extension.
+     * @returns {boolean} - true if loaded, false otherwise.
+     */
+    isExtensionLoaded (extensionID) {
+        return this._loadedExtensions.has(extensionID);
+    }
+
+    /**
+     * Fetch the cached information about an extension. Does not call `getInfo` on the extension
+     * @see {@link isExtensionLoaded} for details about registration timing.
+     * @param {string} extensionID - the ID of the extension.
+     * @returns {ExtensionInfo} - cached information about the extension, or `undefined` if the extension is not loaded.
+     */
+    getExtensionInfo (extensionID) {
+        return this._loadedExtensions.get(extensionID);
+    }
+
+    /**
+     * Retrieve the whole map of extension ID to extension information.
+     * Callers other than the extension manager should probably not use this.
+     * @returns {Map.<string, ExtensionInfo>} - a map of extension ID to `ExtensionInfo` for each loaded extension.
+     */
+    getLoadedExtensions () {
+        return this._loadedExtensions;
+    }
+
     /**
      * Reregister the primitives for an extension
      * @param  {ExtensionMetadata} extensionInfo - new info (results of running getInfo) for an extension

src/extension-support/extension-manager.js

@@ -82,13 +82,6 @@ class ExtensionManager {
          */
         this.pendingWorkers = [];
 
-        /**
-         * Map of loaded extension URLs/IDs to sanitized extension info.
-         * @type {Map.<string, ExtensionInfo>}
-         * @private
-         */
-        this._loadedExtensions = new Map();
-
         /**
          * Keep a reference to the runtime so we can construct internal extension objects.
          * TODO: remove this in favor of extensions accessing the runtime as a service.
@@ -107,19 +100,10 @@ class ExtensionManager {
      * `loadExtensionURL` if you need to wait until the extension is truly ready.
      * @param {string} extensionID - the ID of the extension.
      * @returns {boolean} - true if loaded, false otherwise.
+     * @deprecated Please use `isExtensionLoaded` on the Runtime instead.
      */
     isExtensionLoaded (extensionID) {
-        return this._loadedExtensions.has(extensionID);
-    }
-
-    /**
-     * Fetch the cached information about an extension. Does not call `getInfo` on the extension
-     * @see {@link isExtensionLoaded} for details about registration timing.
-     * @param {string} extensionID - the ID of the extension.
-     * @return {ExtensionInfo} - cached information about the extension, or `undefined` if the extension is not loaded.
-     */
-    getExtensionInfo (extensionID) {
-        return this._loadedExtensions.get(extensionID);
+        return this.runtime.isExtensionLoaded(extensionID);
     }
 
     /**
@@ -133,7 +117,7 @@ class ExtensionManager {
             return;
         }
 
-        if (this.isExtensionLoaded(extensionId)) {
+        if (this.runtime.isExtensionLoaded(extensionId)) {
             const message = `Rejecting attempt to load a second extension with ID ${extensionId}`;
             log.warn(message);
             return;
@@ -171,16 +155,17 @@ class ExtensionManager {
      * @returns {Promise} resolved once all the extensions have been reinitialized
      */
     refreshBlocks () {
+        const loadedExtensions = this.runtime.getLoadedExtensions();
         const allPromises = [];
-        this._loadedExtensions.forEach((extensionInfo, oldId) => {
+        loadedExtensions.forEach((extensionInfo, oldId) => {
             const serviceName = extensionInfo.serviceName;
             allPromises.push(dispatch.call(serviceName, 'getInfo')
                 .then(info => {
                     info = this._prepareExtensionInfo(serviceName, info);
-                    this._loadedExtensions.set(info.id, info);
+                    loadedExtensions.set(info.id, info);
                     if (oldId !== info.id) {
                         log.warn(`Extension changed ID from ${oldId} to ${info.id}!`);
-                        this._loadedExtensions.delete(oldId);
+                        loadedExtensions.delete(oldId);
                     }
                     dispatch.call('runtime', '_refreshExtensionPrimitives', info);
                 })
@@ -244,7 +229,7 @@ class ExtensionManager {
         dispatch.setServiceSync(serviceName, extensionObject);
         this.registerExtensionServiceSync(serviceName);
         const extensionInfo = this._prepareExtensionInfo(serviceName, rawExtensionInfo);
-        this._loadedExtensions.set(extensionInfo.id, extensionInfo);
+        this.runtime.getLoadedExtensions().set(extensionInfo.id, extensionInfo);
     }
 
     /**

src/serialization/sb3.js

@@ -853,7 +853,7 @@ const deserializeBlocks = function (runtime, blocks) {
         }
         const block = blocks[blockId];
         const {extensionId, extendedOpcode} = decodeBlock(block);
-        const extensionInfo = runtime.extensionManager.getExtensionInfo(extensionId);
+        const extensionInfo = runtime.getExtensionInfo(extensionId);
         const customDeserialize = getSerializationInfo(extensionInfo, extendedOpcode).deserialize;
         if (customDeserialize) {
             const newBlock = customDeserialize(block);