🔧 chore: set global Scratch object while loading unsandboxed extension

Signed-off-by: SimonShiki <sinangentoo@gmail.com>
jexjws · Oct 30, 2023 · 49faa77 · 49faa77
1 parent 58035eb
commit 49faa77
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/src/global.d.ts b/src/global.d.ts
@@ -1,5 +1,6 @@
 /// <reference path="node_modules/@turbowarp/types/index.d.ts" />
 // <reference path="./loader/loader" />
+// <reference path="./loader/make-ctx" />
 
 declare interface Window {
     Blockly?: Partial<ScratchBlocks>;
@@ -17,4 +18,5 @@ declare interface Window {
         >;
         openFrontend(): void;
     };
+    Scratch?: Context;
 }
diff --git a/src/loader/loader.ts b/src/loader/loader.ts
@@ -43,12 +43,6 @@ class ChibiLoader {
      */
     private nextExtensionWorker = 0;
 
-    /**
-     * Whether Scratch object should be passed inline.
-     * @type {boolean}
-     */
-    private inlinedCtx = false;
-
     /**
      * FIFO queue of extensions which have been requested but not yet loaded in a worker,
      * along with promise resolution functions to call once the worker is ready or failed.
@@ -71,14 +65,6 @@ class ChibiLoader {
 
     constructor (vm: VM) {
         this.vm = vm;
-        this.inlinedCtx = typeof window.Scratch === 'object';
-        if (!this.inlinedCtx) {
-            window.Scratch = makeCtx(this.vm);
-        } else {
-            warn(
-                'A Scratch instance already exists in the current environment, so it will be passed inline for unsandboxed extension.'
-            );
-        }
         dispatch.setService('loader', this).catch((e: Error) => {
             error(`ChibiLoader was unable to register extension service: ${JSON.stringify(e)}`);
         });
@@ -108,6 +94,13 @@ class ChibiLoader {
                     const originalScript = await response.text();
                     const closureFunc = new Function('Scratch', originalScript);
                     const ctx = makeCtx(this.vm);
+                    // Provide compatibility support for some extensions
+                    // Nevertheless, it is a very bad behavior for Chibi to directly read the Scratch
+                    // object on the window, because the extension should not depend on unknown external
+                    // environment.
+                    if (!('Scratch' in window)) {
+                        window.Scratch = ctx;
+                    }
                     ctx.extensions.register = (extensionObj: ExtensionClass) => {
                         const extensionInfo = extensionObj.getInfo();
                         this._registerExtensionInfo(extensionObj, extensionInfo, ext);