feat: separate the extension in basics and modulino (#13)

Author: dido18

scratch-arduino-extensions/packages/scratch-vm/src/extensions/arduino_basics/index.js

@@ -0,0 +1,62 @@
+// const formatMessage = require('../../../../../../scratch-editor/node_modules/format-message');
+const BlockType = require('../../../../../../scratch-editor/packages/scratch-vm/src/extension-support/block-type');
+const ArgumentType = require('../../../../../../scratch-editor/packages/scratch-vm/src/extension-support/argument-type');
+const io = require('../socket.io.min.js');
+
+/**
+ * Url of icon to be displayed at the left edge of each extension block.
+ * @type {string}
+ */
+// eslint-disable-next-line max-len
+const iconURI = '';
+
+/**
+ * Url of icon to be displayed in the toolbox menu for the extension category.
+ * @type {string}
+ */
+// eslint-disable-next-line max-len
+const menuIconURI = ''
+
+const wsServerURL = `${window.location.protocol}//${window.location.hostname}:7000`;
+
+class ArduinoBasics {
+  constructor(runtime) {
+    this.runtime = runtime;
+
+    this.io = io(wsServerURL, {
+      path: '/socket.io',
+      transports: ['polling', 'websocket'],
+      autoConnect: true
+    });
+  }
+};
+
+ArduinoBasics.prototype.getInfo = function () {
+  return {
+    id: 'arduinobasics',
+    name: "Arduino Basics",
+    menuIconURI: menuIconURI,
+    blockIconURI: iconURI,
+    blocks: [
+      {
+        opcode: 'matrixDraw',
+        blockType: BlockType.COMMAND,
+        text: 'draw [FRAME] on matrix',
+        func: 'matrixDraw',
+        arguments: {
+          FRAME: {
+            type: ArgumentType.MATRIX,
+            defaultValue: '0101010101100010101000100'
+          }
+        }
+      }
+    ]
+  };
+}
+
+ArduinoBasics.prototype.matrixDraw = function (args) {
+  console.log(`Drawing frame on matrix: ${args}`);
+  this.io.emit("matrix_draw", { frame: args.FRAME });
+};
+
+module.exports = ArduinoBasics;

scratch-arduino-extensions/packages/scratch-vm/src/extensions/scratch3_arduino/index.js renamed to scratch-arduino-extensions/packages/scratch-vm/src/extensions/arduino_modulino/index.js

@@ -1,7 +1,7 @@
-// const formatMessage = require('../../../../../../scratch-editor/node_modules/format-message');
 const BlockType = require('../../../../../../scratch-editor/packages/scratch-vm/src/extension-support/block-type');
 const ArgumentType = require('../../../../../../scratch-editor/packages/scratch-vm/src/extension-support/argument-type');
-const io = require('./socket.io.min.js');
+const io = require('../socket.io.min.js');
+
 
 /**
  * Url of icon to be displayed at the left edge of each extension block.
@@ -19,7 +19,7 @@ const menuIconURI = ''
 
 const wsServerURL = `${window.location.protocol}//${window.location.hostname}:7000`;
 
-class Scratch3Arduino {
+class ArduinoModulino {
   constructor(runtime) {
     this.runtime = runtime;
     this.io = io(wsServerURL, {
@@ -37,25 +37,13 @@ class Scratch3Arduino {
   }
 };
 
-Scratch3Arduino.prototype.getInfo = function () {
+ArduinoModulino.prototype.getInfo = function () {
   return {
-    id: 'arduino',
-    name: "Arduino",
+    id: 'arduinomodulino',
+    name: "Arduino Modulino",
     menuIconURI: menuIconURI,
     blockIconURI: iconURI,
     blocks: [
-      {
-        opcode: 'matrixDraw',
-        blockType: BlockType.COMMAND,
-        text: 'draw [FRAME] on matrix',
-        func: 'matrixDraw',
-        arguments: {
-          FRAME: {
-            type: ArgumentType.MATRIX,
-            defaultValue: '0101010101100010101000100'
-          }
-        }
-      },
       {
         opcode: 'whenModulinoButtonsPressed',
         blockType: BlockType.HAT,
@@ -76,17 +64,12 @@ Scratch3Arduino.prototype.getInfo = function () {
   };
 }
 
-Scratch3Arduino.prototype.matrixDraw = function (args) {
-  console.log(`Drawing frame on matrix: ${args}`);
-  this.io.emit("matrix_draw", { frame: args.FRAME });
-};
-
-Scratch3Arduino.prototype.whenModulinoButtonsPressed = function (args) {
+ArduinoModulino.prototype.whenModulinoButtonsPressed = function (args) {
   if (args.BTN === this._button_pressed) {
     this._button_pressed = '';
     return true;
   }
   return false;
 };
 
-module.exports = Scratch3Arduino;
+module.exports = ArduinoModulino;

scratch-arduino-extensions/packages/scratch-vm/src/extensions/scratch3_arduino/socket.io.min.js renamed to scratch-arduino-extensions/packages/scratch-vm/src/extensions/socket.io.min.js

@@ -2,14 +2,15 @@ const path = require("path");
 const fs = require("fs");
 
 const extensions = [
-  { name: "Scratch3Arduino", directory: "scratch3_arduino" },
+  { name: "ArduinoBasics", directory: "arduino_basics" },
+  { name: "ArduinoModulino", directory: "arduino_modulino" }
 ];
 
  // base dir is the 'scratch-arduino-extensions' folder
 const BaseDir = path.resolve(__dirname, "../"); 
 
 extensions.forEach(extension => {
-  console.log(`${extension.name} (${extension.directory})`);
+  console.log(`\n${extension.name} (${extension.directory})`);
 
   process.stdout.write("\t - add symbolic link: ");
   const scratchVmExtensionsDir = path.resolve(BaseDir,"../scratch-editor/packages/scratch-vm/src/extensions",extension.directory);
@@ -39,8 +40,8 @@ extensions.forEach(extension => {
   if (!vmCode.includes(extension.name)) {
     fs.copyFileSync(scratchVmVirtualMachineFile, `${scratchVmVirtualMachineFile}.orig`);
     vmCode = vmCode.replace(
-      /CORE_EXTENSIONS = \[[\s\S]*?\];/,
-      `$&\n\nCORE_EXTENSIONS.push('${extension.name}');`,
+      /(CORE_EXTENSIONS = \[[\s\S]*?)\];/,
+      `$1'${extension.name}',\n];`,
     );
     fs.writeFileSync(scratchVmVirtualMachineFile, vmCode);
     process.stdout.write("done\n");