nodeskini 1.0.6 → 1.0.9

package/serveur/OSCandMidi.mjs

@@ -2,7 +2,7 @@
  * @fileOverview OSC and Midi control
  * <BR> See: http://www.indiana.edu/~emusic/cntrlnumb.html,
  * http://www.ccarh.org/courses/253/handout/controllers/
- * @copyright (C) 2022-2024 Bertrand Petit-Hédelin
+ * @copyright (C) 2022-2026 Bertrand Petit-Hédelin
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
   * @author Bertrand Petit-Hédelin <bertrand@hedelin.fr>
- * @version 1.4
+ * @version 1.5
  */
 "use strict"
 import { createRequire } from 'module';
@@ -159,7 +159,7 @@ export function sendOSCProcessing(message, val1, val2) {
 }
 
 /**
- * Send a note on through OSC
+ * Send a note on through OSC or MIDI
  * @param  {number} bus
  * @param  {number} channel
  * @param  {number} note
@@ -178,6 +178,30 @@ export function sendNoteOn(bus, channel, note, velocity) {
   }
 };
 
+/**
+ * Send a note on through OSC or MIDI to activate a clip
+ * @param  {number} note
+ */
+export function convertAndActivateClip(note){
+  let buf;
+
+  if (debug1) console.log("INFO: LogosOSCandMidiLocal : convertAndActivateClip: sending MIDI: " + note);
+  let channel = Math.floor(note / 127) + 1;
+  note = note % 127;
+  if (channel > 15) {
+      if (debug1) console.log("ERR: LogosOSCandMidiLocal : convertAndActivateClip: Nombre de canaux midi dépassé.");
+          return -1;
+  }
+
+  if (directMidi) {
+    midiOutput.sendMessage([144 + channel, note, 100]);
+  } else {
+  buf = osc.toBuffer({ address: "/noteOn" , args: [ par.busMidiAbleton, channel, note, 127 ]  });    
+  return udp.send(buf, 0, buf.length, par.outportForMIDI, par.remoteIPAddressSound,
+    function(err) { if (err !== null) console.log("ERR: logosOSCandMidi: convertAndActivateClip: Erreur udp send: ", err); });
+  }
+};
+
 /**
  * Send a note off through OSC
  * @param  {number} bus

package/serveur/controleDAW.mjs

@@ -649,7 +649,8 @@ export function cleanQueues() {
   messageLog.type = "VIDAGE FILES ATTENTES";
   logInfoDAW(messageLog);
   if (debug) console.log("controleDAW: cleanQueues");
-  serv.broadcast(JSON.stringify({ type: "etatDeLaFileAttente", value: filesDattente }));
+  // Envoyer le même format que displayQueues() : un array vide car les files sont vidées
+  serv.broadcast(JSON.stringify({ type: "etatDeLaFileAttente", value: [] }));
 }
 
 /**

package/serveur/groupeClientsSons.mjs

@@ -67,7 +67,7 @@ var midimix;
 var orchestration;
 var groupesClient;
 export var matriceDesPossibles;
-var timerDivision; // Nombre de pulses par tick, doit rester undefined si pas à jour par les automates
+let timerDivision; // Nombre de pulses par tick, doit rester undefined si pas à jour par les automates
 var nbeDeGroupesSons = 0;
 var nombreDePatternsPossibleEnListe = [[1, 255]]; // init pour client memorySortable
 
@@ -81,6 +81,7 @@ var groupeName = "";
 // On créé ce fichier à partir du xml de Blockly
 var myReactOrchestration = "../myReact/orchestrationHH.mjs";
 var socketControleur;
+var socketQueueViewer;
 var computeScorePolicy = 0;
 var computeScoreClass = 0;
 
@@ -341,6 +342,7 @@ export function setComputeScoreClass(scoreClass) {
  * @param {number} timer division
  */
 export function setTimerDivision(timer) {
+  if(debug1) console.log("INFO: groupecliensSons: setTimerDivision:", timer);
   timerDivision = timer;
 }
 
@@ -352,6 +354,14 @@ export function setSocketControleur(socket) {
   socketControleur = socket;
 }
 
+/**
+ * Set the queueViewer socket
+ * @param {socket} queueViewer socket
+ */
+export function setSocketQueueViewer(socket) {
+  socketQueueViewer = socket;
+}
+
 /**
  * Call the reset of the rcoehstration matrix.
  */
@@ -490,7 +500,7 @@ export function informSelecteurOnMenuChange(groupe, sons, status) {
 }
 
 /**
- * To display the tick on the controler client.
+ * To display the tick on the controler and queueViewer clients.
  * @param {number} tick 
  */
 export function setTickOnControler(tick) {
@@ -505,6 +515,19 @@ export function setTickOnControler(tick) {
     } else {
       if (debug) console.log("ERR: groupecliensSons: informControleur: socketControleur not ready;", socketControleur.readyState);
     }
+  }
+
+     // Send the tick to queueViewer.
+  if (socketQueueViewer !== undefined) {
+    if (socketQueueViewer.readyState == 1) {
+      try {
+        socketQueueViewer.send(JSON.stringify(message));
+      } catch (err) {
+        if (debug) console.log("ERR: groupecliensSons: send setTickAutomate to queueViewer", err);
+      }
+    } else {
+      if (debug) console.log("ERR: groupecliensSons: informControleur: socketControleur not ready;", socketControleur.readyState);
+    }
   }
 }
 
@@ -884,6 +907,7 @@ export async function makeOneAutomatePossibleMachine() {
   if (debug) console.log("groupeClientsSons.js: makeOneAutomatePossibleMachine", par.groupesDesSons);
   
   try {
+    //C'est l'import qui compile le code HH en machine HipHop.js
     const orchestration = await import(myReactOrchestration + '?foo=bar' + tempIndex);
     tempIndex++;
     orchestration.setServ(serv, DAW, this, oscMidiLocal, midimix);   
@@ -891,7 +915,7 @@ export async function makeOneAutomatePossibleMachine() {
 
     makeSignalsListeners(machine);
     
-    if (debug) console.log("------------- groupecliensSons: makeOneAutomatePossibleMachine:machine: ", machine);
+    if (debug) console.log("------------- groupecliensSons: makeOneAutomatePossibleMachine:par: ", par);
     
     return machine;
   } catch (err) {

package/serveur/ipConfig.json

@@ -19,6 +19,6 @@
   "outportProcessing": 10000,
   "outportLumiere": 7700,
   "inportLumiere": 9000,
-  "sessionPath": "./pieces/opus/",
-  "piecePath" : "./pieces/opus/"
+  "sessionPath": "./pieces/etudesHarmonie/",
+  "piecePath" : "./pieces/etudesHarmonie/"
 }

package/serveur/skiniParametres.js

@@ -1,5 +1,5 @@
 
-// Generated by Skini: Wed Jan 07 2026 10:47:37 GMT+0100 (heure normale d’Europe centrale)
+// Generated by Skini: Thu May 28 2026 10:24:15 GMT+0200 (heure d’été d’Europe centrale)
 "use strict"
 
 // A utiliser si Processing en passerelle
@@ -19,9 +19,9 @@ exports.english = true;
   Si ces valeurs ne sont pas données c'est celle qui
   sont dans le simulateur qui sont utilisées
 ************************************/
-exports.tempoMax = 2000; // En ms
-exports.tempoMin = 2200; // En ms
-exports.limiteDureeAttente = 2000; // En pulsations
+exports.tempoMax = 3000; // En ms
+exports.tempoMin = 2900; // En ms
+exports.limiteDureeAttente = 33; // En pulsations
 
 /********************************************************
 AUTOMATE
@@ -36,7 +36,7 @@ exports.pulsationON = false;
 CHEMIN DES FICHIERS SONS MP3 pour les clients
 Nom du sous répartoire ./sounds/xxxx
 *************************************/
-exports.soundFilesPath1 = "opus4";
+exports.soundFilesPath1 = "";
 
 /***************************************
 CHEMIN DES PARTITIONS DES PATTERNS ET CONFIG AVEC MUSICIENS
@@ -83,106 +83,58 @@ exports.synchroSkini = false;
 exports.timer = 500;
 exports.gameOSCSignals = false;
 
-exports.sensorOSC = true;
-exports.tempoSensorsInit = [100,100,100,100,100,100,20,20,20,20,20,20];
-exports.sensorsSensibilities = [200,200,200,200,200,200,200,200,200,200,200,199];
+exports.sensorOSC = false;
+exports.tempoSensorsInit = [0,0,0,0,0,0,0,0,0,0,0,0];
+exports.sensorsSensibilities = [5,5,5,5,5,5,5,5,5,5,5,5];
 
 const groupesDesSons = [
-  [ "saxo",1, "group",401,200,21,"#4CAF50",[],10 ],
-  [ "nappeViolons",2, "group",100,500,20,"#4CAF50",[],1 ],
-  [ "nappe2Violons",3, "group",100,600,20,"#797bbf",[],1 ],
-  [ "Piano1Intro1",10, "tank",100,51,1,"#5F6262",[],1 ],
-  [ "Piano1Intro2",11, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Intro3",12, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Intro4",13, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Intro5",14, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Intro6",15, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Intro7",16, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Milieu1",17, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Milieu2",18, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Milieu3",19, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Milieu4",20, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Milieu5",21, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Milieu6",22, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Milieu7",23, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Fin1",24, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Fin2",25, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Fin3",26, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Fin4",27, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Fin5",28, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Fin6",29, "tank",,,1,"#5F6262",[], ],
-  [ "Piano1Fin7",30, "tank",,,1,"#5F6262",[], ],
-  [ "SaxIntro1",31, "tank",400,51,2,"#5F6262",[],1 ],
-  [ "SaxIntro2",32, "tank",,,2,"#5F6262",[], ],
-  [ "SaxIntro3",33, "tank",,,2,"#5F6262",[], ],
-  [ "SaxIntro4",34, "tank",,,2,"#5F6262",[], ],
-  [ "SaxIntro5",35, "tank",,,2,"#5F6262",[], ],
-  [ "SaxIntro6",36, "tank",,,2,"#5F6262",[], ],
-  [ "SaxIntro7",37, "tank",,,2,"#5F6262",[], ],
-  [ "SaxMilieu1",38, "tank",,,2,"#5F6262",[], ],
-  [ "SaxMilieu2",39, "tank",,,2,"#5F6262",[], ],
-  [ "SaxMilieu3",40, "tank",,,2,"#5F6262",[], ],
-  [ "SaxMilieu4",41, "tank",,,2,"#5F6262",[], ],
-  [ "SaxMilieu5",42, "tank",,,2,"#5F6262",[], ],
-  [ "SaxMilieu6",43, "tank",,,2,"#5F6262",[], ],
-  [ "SaxMilieu7",44, "tank",,,2,"#5F6262",[], ],
-  [ "SaxFin1",45, "tank",,,2,"#5F6262",[], ],
-  [ "SaxFin2",46, "tank",,,2,"#5F6262",[], ],
-  [ "SaxFin3",47, "tank",,,2,"#5F6262",[], ],
-  [ "SaxFin4",48, "tank",,,2,"#5F6262",[], ],
-  [ "SaxFin5",49, "tank",,,2,"#5F6262",[], ],
-  [ "SaxFin6",50, "tank",,,2,"#5F6262",[], ],
-  [ "SaxFin7",51, "tank",,,2,"#5F6262",[], ],
-  [ "BrassIntro1",52, "tank",700,51,3,"#039879",[],1 ],
-  [ "BrassIntro2",53, "tank",,,3,"#039879",[], ],
-  [ "BrassIntro3",54, "tank",,,3,"#039879",[], ],
-  [ "BrassIntro4",55, "tank",,,3,"#039879",[], ],
-  [ "BrassIntro5",56, "tank",,,3,"#039879",[], ],
-  [ "BrassIntro6",57, "tank",,,3,"#039879",[], ],
-  [ "BrassIntro7",58, "tank",,,3,"#039879",[], ],
-  [ "BrassMilieu1",59, "tank",,,3,"#039879",[], ],
-  [ "BrassMilieu2",60, "tank",,,3,"#039879",[], ],
-  [ "BrassMilieu3",61, "tank",,,3,"#039879",[], ],
-  [ "BrassMilieu4",62, "tank",,,3,"#039879",[], ],
-  [ "BrassMilieu5",63, "tank",,,3,"#039879",[], ],
-  [ "BrassMilieu6",64, "tank",,,3,"#039879",[], ],
-  [ "BrassMilieu7",65, "tank",,,3,"#039879",[], ],
-  [ "BrassFin1",66, "tank",,,3,"#039879",[], ],
-  [ "BrassFin2",67, "tank",,,3,"#039879",[], ],
-  [ "BrassFin3",68, "tank",,,3,"#039879",[], ],
-  [ "BrassFin4",69, "tank",,,3,"#039879",[], ],
-  [ "BrassFin5",70, "tank",,,3,"#039879",[], ],
-  [ "BrassFin6",71, "tank",,,3,"#039879",[], ],
-  [ "BrassFin7",72, "tank",,,3,"#039879",[], ],
-  [ "Percu1",73, "tank",800,600,4,"#039879",[],1 ],
-  [ "Percu2",74, "tank",,,4,"#039879",[], ],
-  [ "Percu3",75, "tank",,,4,"#039879",[], ],
-  [ "Percu4",76, "tank",,,4,"#039879",[], ],
-  [ "Percu5",77, "tank",,,4,"#039879",[], ],
-  [ "Percu6",78, "tank",,,4,"#039879",[], ],
-  [ "Percu7",79, "tank",,,4,"#039879",[], ],
-  [ "FluteIntro1",80, "tank",400,400,5,"#039879",[],1 ],
-  [ "FluteIntro2",81, "tank",,,5,"#039879",[], ],
-  [ "FluteIntro3",82, "tank",,,5,"#039879",[], ],
-  [ "FluteIntro4",83, "tank",,,5,"#039879",[], ],
-  [ "FluteIntro5",84, "tank",,,5,"#039879",[], ],
-  [ "FluteIntro6",85, "tank",,,5,"#039879",[], ],
-  [ "FluteIntro7",86, "tank",,,5,"#039879",[], ],
-  [ "FluteMilieu1",87, "tank",,,5,"#039879",[], ],
-  [ "FluteMilieu2",88, "tank",,,5,"#039879",[], ],
-  [ "FluteMilieu3",89, "tank",,,5,"#039879",[], ],
-  [ "FluteMilieu4",90, "tank",,,5,"#039879",[], ],
-  [ "FluteMilieu5",91, "tank",,,5,"#039879",[], ],
-  [ "FluteMilieu6",92, "tank",,,5,"#039879",[], ],
-  [ "FluteMilieu7",93, "tank",,,5,"#039879",[], ],
-  [ "FluteFin1",94, "tank",,,5,"#039879",[], ],
-  [ "FluteFin2",95, "tank",,,5,"#039879",[], ],
-  [ "FluteFin3",96, "tank",,,5,"#039879",[], ],
-  [ "FluteFin4",97, "tank",,,5,"#039879",[], ],
-  [ "FluteFin5",98, "tank",,,5,"#039879",[], ],
-  [ "FluteFin6",99, "tank",,,5,"#039879",[], ],
-  [ "FluteFin7",100, "tank",,,5,"#039879",[], ],
-  [ "Flesh",110, "group",100,350,7,"#008CBA",[],1 ],
-  [ "Massive",111, "group",100,400,7,"#008CBA",[],1 ],
+  [ "PianoC",0, "group",100,100,5,"#5F6262",[],1 ],
+  [ "PianoEb",1, "group",200,100,5,"#5F6262",[],1 ],
+  [ "PianoFmin",2, "group",300,100,5,"#5F6262",[],1 ],
+  [ "FluteC1",3, "tank",400,100,1,"#5F6262",[],1 ],
+  [ "FluteC2",5, "tank",,,1,"",[],1 ],
+  [ "FluteC3",6, "tank",,,1,"",[],1 ],
+  [ "FluteC4",7, "tank",,,1,"",[],1 ],
+  [ "FluteC5",8, "tank",,,1,"",[],1 ],
+  [ "FluteC6",9, "tank",,,1,"",[],1 ],
+  [ "FluteC7",10, "tank",,,1,"",[],1 ],
+  [ "FluteC8",11, "tank",,,1,"",[],1 ],
+  [ "FluteC9",12, "tank",,,1,"",[],1 ],
+  [ "FluteC10",13, "tank",,,1,"",[],1 ],
+  [ "FluteC11",14, "tank",,,1,"",[],1 ],
+  [ "FluteC12",15, "tank",,,1,"",[],1 ],
+  [ "FluteC13",16, "tank",,,1,"",[],1 ],
+  [ "FluteC14",17, "tank",,,1,"",[],1 ],
+  [ "FluteC15",18, "tank",,,1,"",[],1 ],
+  [ "FluteEb1",19, "tank",100,200,2,"#BCA104",[],1 ],
+  [ "FluteEb2",20, "tank",,,2,"",[],1 ],
+  [ "FluteEb3",21, "tank",,,2,"",[],1 ],
+  [ "FluteEb4",22, "tank",,,2,"",[],1 ],
+  [ "FluteEb5",23, "tank",,,2,"#039879",[],1 ],
+  [ "FluteEb6",24, "tank",,,2,"#039879",[],1 ],
+  [ "FluteEb7",25, "tank",,,2,"#039879",[],1 ],
+  [ "FluteEb8",26, "tank",,,2,"",[],1 ],
+  [ "FluteEb9",27, "tank",,,2,"",[],1 ],
+  [ "FluteEb10",28, "tank",,,2,"",[],1 ],
+  [ "FluteEb11",29, "tank",,,2,"",[],1 ],
+  [ "FluteEb12",30, "tank",,,2,"",[],1 ],
+  [ "FluteEb13",31, "tank",,,2,"",[],1 ],
+  [ "FluteEb14",32, "tank",,,2,"",[],1 ],
+  [ "FluteEb15",33, "tank",,,2,"",[],1 ],
+  [ "FluteFmin1",34, "tank",200,200,3,"#BCA104",[],1 ],
+  [ "FluteFmin2",35, "tank",,,3,"",[],1 ],
+  [ "FluteFmin3",36, "tank",,,3,"",[],1 ],
+  [ "FluteFmin4",37, "tank",,,3,"",[],1 ],
+  [ "FluteFmin5",38, "tank",,,3,"",[],1 ],
+  [ "FluteFmin6",39, "tank",,,3,"",[],1 ],
+  [ "FluteFmin7",40, "tank",,,3,"",[],1 ],
+  [ "FluteFmin8",41, "tank",,,3,"",[],1 ],
+  [ "FluteFmin9",42, "tank",,,3,"",[],1 ],
+  [ "FluteFmin10",43, "tank",,,3,"",[],1 ],
+  [ "FluteFmin11",44, "tank",,,3,"",[],1 ],
+  [ "FluteFmin12",45, "tank",,,3,"",[],1 ],
+  [ "FluteFmin13",46, "tank",,,3,"",[],1 ],
+  [ "FluteFmin14",47, "tank",,,3,"",[],1 ],
+  [ "FluteFmin15",48, "tank",,,3,"",[],1 ],
   ];
 exports.groupesDesSons = groupesDesSons;

package/serveur/utilsSkini.mjs

@@ -31,7 +31,7 @@ let debug1 = true;
 export function creationInterfacesOUT(groupes) {
   if (groupes !== undefined) {
     return groupes.map(function (k) {
-         return k[0] + "OUT";
+      return k[0] + "OUT";
     })
   };
 }

package/serveur/websocketServer.mjs

@@ -265,6 +265,7 @@ let offsetDivision = 0;
 let compteurDivisionMesure = 0;
 let nbeDeGroupesSons = 0;
 let socketControleur;
+let socketQueueViewer;
 let groupeName = "";
 let automatePossibleMachine;
 
@@ -1326,7 +1327,8 @@ maybe an hiphop compile Error`);
           }));
           break;
 
-        /*	    case "DAWStartClip":
+        /* Pas à jour dans la version node.js
+        case "DAWStartClip":
                 pseudo = msgRecu.pseudo;
                 if (msgRecu.clipChoisi === undefined ) break; // Protection si pas de selection sur le client
                     if (debug) console.log("Web Socket Serveur: DAWStartClip: clipChoisi", msgRecu.clipChoisi, " pour ID: ", msgRecu.id);
@@ -1361,8 +1363,8 @@ maybe an hiphop compile Error`);
               messageLog.pseudo = msgRecu.pseudo;
               messageLog.text = msg.text;
               logInfoSocket(messageLog);
-              break;*/
-
+              break;
+        */
         case "dureeDuTickHorlogeMidi": // Reçu de Processing chaque 24 pulses de l'horloge Midi (une noire)
           receivedTickFromSynchro();
           break;
@@ -1871,6 +1873,14 @@ maybe an hiphop compile Error`);
           ws.id = msgRecu.id;
           if (debug) console.log("INFO: websocketserbeur: startSpectateur: ", msgRecu.id);
 
+          // On ne permet donc qu'un seul queueViewer.
+          if (msgRecu.text === "queueViewer") {
+            if (debug1) console.log("INFO: webSocketServeur: startSpectateur: un queueViewer connecté");
+            socketQueueViewer = ws;
+            groupesClientSon.setSocketQueueViewer(ws);
+            break; // Pas besoin d'aller plus loin dans ce cas
+          }
+
           // On ne permet donc qu'un seul controleur.
           // Attention: La connexion d'un deuxième contrôleur, fait perdre la première et réinitialise la matrice des possible.
           if (msgRecu.text === "controleur") {
@@ -1882,7 +1892,7 @@ maybe an hiphop compile Error`);
               type: "skiniParametres",
               value: par
             }));
-            break;
+            break; // Pas besoin d'aller plus loin dans ce cas
           }
 
           if (msgRecu.text === "pieceParameters") {

package/skini.mjs

@@ -130,6 +130,10 @@ function startSkini() {
     res.sendFile(path.join(__dirname + '/client/parametrage/parametrage.html'));
   });
 
+  app.get('/queueViewer', function (req, res) {
+    res.sendFile(path.join(__dirname + '/client/queueViewer/queue.html'));
+  });
+
   var port = ipConfig.webserveurPort;
   var addressServer = ipConfig.serverIPAddress;
   app.listen(port, () => {