flow

public/sketch.js

@@ -13,32 +13,7 @@ var score;
 let logo;
 var silence;
 
-(async () => {
-
-  fetch("/entries").then(function(response) {
-    return response.json();
-  }).then(function(data) {
-    console.log(data);
-  }).catch(function() {
-    console.log("Booo");
-  });
-  var list = new Promise((resolve, reject) => {
-    var xmlHttp = new XMLHttpRequest();
-    xmlHttp.open( "GET", "/entries", false ); // false for synchronous request
-    xmlHttp.send( null );
-    return xmlHttp.responseText;
-    loadJSON("/entries", (json) => {
-      resolve(json);
-    });
-  });
-  await list;
-  console.log(list);
-})();
-
 function preload() {
-  loadJSON("/score.json", function(json) {
-    score = json;
-  });
   silence = loadSound("./audio/_silence.wav");
 }
 
@@ -115,16 +90,20 @@ socket.on("connect", function() {
   }
 });
 
-socket.on("post", function(post) {
+socket.on("post", async function(post) {
 
   console.log(post);
+  var resp = await new Promise((resolve, reject) => {
+    loadJSON("/entries", (json) => resolve(json));
+  })
+  console.log(resp.list);
 
   // var object = post.object;
   var object = {
     "id": 1,
     "type": "abc",
-    "src": "https://p.dianaband.info/public/sound-parade/" + list[post] + "/pixels.png",
-    "audio": "https://p.dianaband.info/public/sound-parade/" + list[post] + "/audio.mp3",
+    "src": "https://p.dianaband.info/public/sound-parade/" + resp.list[post] + "/pixels.png",
+    "audio": "https://p.dianaband.info/public/sound-parade/" + resp.list[post] + "/audio.mp3",
     "alt": "알트",
     "size": { "base": 40, "random": 20 },
     "y": { "base": 20, "random": 10 },

server.js

@@ -196,7 +196,7 @@ var looper;
       }, 30000 * index, pointer, index);
     }
 
-    var timegap = 10000 + Math.random()*(10000);
+    var timegap = 10000 + Math.random()*(40000);
     console.log(timegap);
 
     pointer++;