General bug fixing & make code more robust

Author: Ironbill25

dist/bundle.js

@@ -478,8 +478,10 @@
         case "multiply":
           return val1 * val2;
         case "divide":
+          if (val2 === 0) return "Error: Division by zero";
           return val1 / val2;
         case "modulo":
+          if (val2 === 0) return "Error: Division by zero";
           return val1 % val2;
         case "power":
           return val1 ** val2;
@@ -1949,12 +1951,14 @@
       num1: Argument("string", "200000000000000000000"),
       num2: Argument("string", "2")
     }, ({ num1, num2 }) => {
+      if (BigInt(num2) === 0n) return "Error: Division by zero";
       return BigInt(num1) / BigInt(num2);
     }),
     Block(BlockType.REPORTER, "bignumModulo", "[num1] mod [num2]", {
       num1: Argument("string", "100000000000000000001"),
       num2: Argument("string", "100000000000000000000")
     }, ({ num1, num2 }) => {
+      if (BigInt(num2) === 0n) return "Error: Division by zero";
       return BigInt(num1) % BigInt(num2);
     }),
     Block(BlockType.REPORTER, "bignumPower", "[num1] ^ [num2]", {

scratchjs.js

@@ -13,8 +13,8 @@ See more about ScratchJS at https://ironbill25.github.io/projects/scratchjs/`);
     window.sjs_extensionBlocks = [];
 
     function chkKey(obj, key) {
-      if (!obj) return "";
-      return Object.keys(obj).includes(key) ? obj[key] : "";
+      if (!obj) return "No object provided";
+      return Object.keys(obj).includes(key) ? obj[key] : "Key not found";
     }
 
     window.sjs_applyViewMode = () => {
@@ -350,7 +350,7 @@ You can get the official bookmarklet here: https://scratch.mit.edu/projects/1316
           const timestamp = Date.now();
           const response = await fetch(
             "https://raw.githubusercontent.com/Ironbill25/JavaScript-For-Scratch/main/dist/bundle.js?t=" +
-              timestamp, { cache: "no-store" }
+            timestamp, { cache: "no-store" }
           );
           if (response.ok) {
             const code = await response.text();
@@ -449,9 +449,9 @@ You can get the official bookmarklet here: https://scratch.mit.edu/projects/1316
        * @param {Function} fun - The function to execute when the block is run.
        * @returns {Object} - The block object.
        */
-      window.Block = (blockType, opcode, text, args = {}, fun = () => {}, othersettings = {}) => {
+      window.Block = (blockType, opcode, text, args = {}, fun = () => { }, othersettings = {}) => {
 
-const wrappedFunction = function (...args) {
+        const wrappedFunction = function (...args) {
           try {
             return fun.apply(this, args);
           } catch (error) {
@@ -579,13 +579,13 @@ const wrappedFunction = function (...args) {
         STAGE: "stage",
       };
 
-      window.addExtensionBlocks = function(blocks) {
+      window.addExtensionBlocks = function (blocks) {
         window.allBlocks = [...window.allBlocks, Spacer, ...blocks];
       };
 
       await loadBlockFiles();
 
-      
+
 
       window.ScratchJS = class {
         constructor(runtime) {
@@ -779,46 +779,41 @@ const wrappedFunction = function (...args) {
           localStorage.setItem("scratchjs_devMode", "true");
         }
 
-        let retryCount = 0;
-        const maxRetries = 3;
 
-        while (retryCount < maxRetries) {
-          if (retryCount === maxRetries - 1) {
-            const allBlocks = categories.flatMap(
-              (category) => window[`sjs_${category}`] || [],
-            );
-            allBlocks.push(...(window.sjs_extensionBlocks || []));
+        const allBlocks = categories.flatMap(
+          (category) => window[`sjs_${category}`] || [],
+        );
+        allBlocks.push(...(window.sjs_extensionBlocks || []));
 
-            console.log(allBlocks);
+        console.log(allBlocks);
 
-            const missingFunctions = allBlocks.filter(
-              (block) =>
-                block.opcode && !(block.opcode in (window.allFunctions || {})),
-            );
-            if (missingFunctions.length > 0) console.warn(
-              "Missing functions for blocks:",
-              missingFunctions.map((b) => b.opcode),
-            );
-            break;
-          }
+        const missingFunctions = allBlocks.filter(
+          (block) =>
+            block.opcode && !(block.opcode in (window.allFunctions || {})),
+        );
+        if (missingFunctions.length > 0) console.warn(
+          "Missing functions for blocks:",
+          missingFunctions.map((b) => b.opcode),
+        );
 
-          await new Promise((resolve) => setTimeout(resolve, 500));
-          retryCount++;
-        }
 
         var extensionInstance = new ScratchJS(vm.extensionManager.runtime);
 
-        if (viewmode) { for (const [opcode, func] of Object.entries(
-          window.allFunctions || {},
-        )) {
-          extensionInstance[opcode] = () => "This block is disabled in view mode";
-        }};
-
-         if (!viewmode) {for (const [opcode, func] of Object.entries(
-          window.allFunctions || {},
-        )) {
-          extensionInstance[opcode] = func;
-        }};
+        if (viewmode) {
+          for (const [opcode, func] of Object.entries(
+            window.allFunctions || {},
+          )) {
+            extensionInstance[opcode] = () => "This block is disabled in view mode";
+          }
+        };
+
+        if (!viewmode) {
+          for (const [opcode, func] of Object.entries(
+            window.allFunctions || {},
+          )) {
+            extensionInstance[opcode] = func;
+          }
+        };
         var serviceName =
           vm.extensionManager._registerInternalExtension(extensionInstance);
         vm.extensionManager._loadedExtensions.set(

scratchjsblocks/bignum.js

@@ -49,13 +49,15 @@ window.sjs_bignum = [
         num1: Argument("string", "200000000000000000000"),
         num2: Argument("string", "2")
     }, ({ num1, num2 }) => {
+        if (BigInt(num2) === 0n) return "Error: Division by zero";
         return (BigInt(num1) / BigInt(num2));
     }),
 
     Block(BlockType.REPORTER, "bignumModulo", "[num1] mod [num2]", {
         num1: Argument("string", "100000000000000000001"),
         num2: Argument("string", "100000000000000000000")
     }, ({ num1, num2 }) => {
+        if (BigInt(num2) === 0n) return "Error: Division by zero";
         return (BigInt(num1) % BigInt(num2));
     }),
 

scratchjsblocks/booleans.js

@@ -58,8 +58,10 @@ window.sjs_booleans = [
             case "multiply":
               return val1 * val2;
             case "divide":
+              if (val2 === 0) return "Error: Division by zero";
               return val1 / val2;
             case "modulo":
+              if (val2 === 0) return "Error: Division by zero";
               return val1 % val2;
             case "power":
               return val1 ** val2;