Merge branch 'TurboWarp:develop' into blockShape

src/compiler/compat-block-utility.js

@@ -3,12 +3,11 @@ const BlockUtility = require('../engine/block-utility');
 class CompatibilityLayerBlockUtility extends BlockUtility {
     constructor () {
         super();
-        this._stackFrame = {};
         this._startedBranch = null;
     }
 
     get stackFrame () {
-        return this._stackFrame;
+        return this.thread.compatibilityStackFrame;
     }
 
     startBranch (branchNumber, isLoop) {
@@ -33,9 +32,9 @@ class CompatibilityLayerBlockUtility extends BlockUtility {
     init (thread, fakeBlockId, stackFrame) {
         this.thread = thread;
         this.sequencer = thread.target.runtime.sequencer;
-        this._stackFrame = stackFrame;
         this._startedBranch = null;
         thread.stack[0] = fakeBlockId;
+        thread.compatibilityStackFrame = stackFrame;
     }
 }
 

src/engine/thread.js

@@ -215,6 +215,7 @@ class Thread {
          */
         this.procedures = null;
         this.executableHat = false;
+        this.compatibilityStackFrame = null;
     }
 
     /**

src/io/keyboard.js

@@ -27,10 +27,10 @@ const KEY_NAME = {
 };
 
 /**
- * An array of the names of scratch keys.
- * @type {Array<string>}
+ * A set of the names of Scratch keys.
+ * @type {Set<string>}
  */
-const KEY_NAME_LIST = Object.keys(KEY_NAME).map(name => KEY_NAME[name]);
+const KEY_NAME_SET = new Set(Object.values(KEY_NAME));
 
 class Keyboard {
     constructor (runtime) {
@@ -121,7 +121,9 @@ class Keyboard {
         keyArg = Cast.toString(keyArg);
 
         // If the arg matches a special key name, return it.
-        if (KEY_NAME_LIST.includes(keyArg)) {
+        // No special keys have a name that is only 1 character long, so we can avoid the lookup
+        // entirely in the most common case.
+        if (keyArg.length > 1 && KEY_NAME_SET.has(keyArg)) {
             return keyArg;
         }
 

src/virtual-machine.js

@@ -527,6 +527,15 @@ class VirtualMachine extends EventEmitter {
         zip.file('project.json', projectJson);
         this._addFileDescsToZip(this.serializeAssets(), zip);
 
+        // Use a fixed modification date for the files in the zip instead of letting JSZip use the
+        // current time to avoid a very small metadata leak and make zipping deterministic. The magic
+        // number is from the first TurboWarp/scratch-vm commit after forking
+        // (4a93dab4fa3704ab7a1374b9794026b3330f3433).
+        const date = new Date(1591657163000);
+        for (const file of Object.values(zip.files)) {
+            file.date = date;
+        }
+
         return zip;
     }
 

test/integration/tw_compat_block_utility_stackframe_exposed.js

@@ -0,0 +1,15 @@
+const {test} = require('tap');
+const fs = require('fs');
+const path = require('path');
+const VM = require('../../src/virtual-machine');
+const Timer = require('../../src/util/timer');
+
+test('compatibility stack frame is exposed on thread', t => {
+    const vm = new VM();
+    vm.loadProject(fs.readFileSync(path.join(__dirname, '../fixtures/tw-glide.sb3'))).then(() => {
+        vm.greenFlag();
+        vm.runtime._step();
+        t.ok(vm.runtime.threads[0].compatibilityStackFrame.timer instanceof Timer);
+        t.end();
+    });
+});

test/integration/tw_deterministic_sb3.js

@@ -0,0 +1,14 @@
+const {test} = require('tap');
+const VM = require('../../src/virtual-machine');
+
+test('saveProjectSb3 is deterministic over time', t => {
+    const vm = new VM();
+    Promise.all([
+        vm.saveProjectSb3('nodebuffer'),
+        // Zip modification time is only accurate to the second
+        new Promise(resolve => setTimeout(resolve, 1000)).then(() => vm.saveProjectSb3('nodebuffer'))
+    ]).then(([a, b]) => {
+        t.same(a, b);
+        t.end();
+    });
+});