Define the classes before instantiation in the entry points

chesslablab · Feb 5, 2025 · 429f9dd · 429f9dd
1 parent c2777de
commit 429f9dd
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 49 deletions.
diff --git a/assets/js/pages/annotations/index.js b/assets/js/pages/annotations/index.js
@@ -3,13 +3,6 @@ import { dataWebSocket } from '../../websockets/DataWebSocket.js';
 import { analysisWebSocket } from '../../websockets/game/AnalysisWebSocket.js';
 import * as variant from '../../../variant.js';
 
-try {
-  await Promise.all([
-    dataWebSocket.connect(),
-    analysisWebSocket.connect()
-  ]);
-} catch {}
-
 class RavForm extends BaseComponent {
   mount() {
     this.el.querySelector('select').addEventListener('change', event => {
@@ -29,6 +22,13 @@ class RavForm extends BaseComponent {
   }
 }
 
+try {
+  await Promise.all([
+    dataWebSocket.connect(),
+    analysisWebSocket.connect()
+  ]);
+} catch {}
+
 const learnForm = new BaseComponent({
   el: document.querySelector('#learnForm')
 });

diff --git a/assets/js/pages/console/index.js b/assets/js/pages/console/index.js
@@ -24,20 +24,6 @@ class ConsoleWebSocket extends AbstractWebSocket {
   }
 }
 
-const dataWebSocket = new ConsoleWebSocket();
-const gameWebSocket = new ConsoleWebSocket();
-const binaryWebSocket = new ConsoleWebSocket();
-const authWebSocket = new ConsoleWebSocket();
-
-try {
-  await Promise.all([
-    dataWebSocket.connect(9443),
-    gameWebSocket.connect(8443),
-    binaryWebSocket.connect(7443),
-    authWebSocket.connect(6443)
-  ]);
-} catch {}
-
 class ConsoleForm extends BaseComponent {
   current = 0;
   stack = [];
@@ -100,6 +86,20 @@ class ConsoleForm extends BaseComponent {
   }
 }
 
+const dataWebSocket = new ConsoleWebSocket();
+const gameWebSocket = new ConsoleWebSocket();
+const binaryWebSocket = new ConsoleWebSocket();
+const authWebSocket = new ConsoleWebSocket();
+
+try {
+  await Promise.all([
+    dataWebSocket.connect(9443),
+    gameWebSocket.connect(8443),
+    binaryWebSocket.connect(7443),
+    authWebSocket.connect(6443)
+  ]);
+} catch {}
+
 const consoleForm = new ConsoleForm({
   el: document.querySelector('#consoleForm'),
   props() {

diff --git a/assets/js/pages/games/index.js b/assets/js/pages/games/index.js
@@ -9,14 +9,6 @@ import { analysisWebSocket } from '../../websockets/game/AnalysisWebSocket.js';
 import * as mode from '../../../mode.js';
 import * as variant from '../../../variant.js';
 
-try {
-  await Promise.all([
-    binaryWebSocket.connect(),
-    dataWebSocket.connect(),
-    analysisWebSocket.connect()
-  ]);
-} catch {}
-
 class SearchGamesForm extends BaseComponent {
   mount() {
     this.el.addEventListener('submit', async (event) => {
@@ -75,6 +67,14 @@ class SearchGamesForm extends BaseComponent {
   }
 }
 
+try {
+  await Promise.all([
+    binaryWebSocket.connect(),
+    dataWebSocket.connect(),
+    analysisWebSocket.connect()
+  ]);
+} catch {}
+
 const searchGamesForm = new SearchGamesForm({
   el: document.querySelector('#searchGamesForm'),
   props() {

diff --git a/assets/js/pages/play/computer/index.js b/assets/js/pages/play/computer/index.js
@@ -5,13 +5,6 @@ import { stockfishWebSocket } from '../../../websockets/game/StockfishWebSocket.
 import * as mode from '../../../../mode.js';
 import * as variant from '../../../../variant.js';
 
-try {
-  await Promise.all([
-    binaryWebSocket.connect(),
-    stockfishWebSocket.connect()
-  ]);
-} catch {}
-
 class PlayComputerModal extends BaseComponent {
   mount() {
     this.props.form.addEventListener('submit', event => {
@@ -44,6 +37,13 @@ class PlayComputerModal extends BaseComponent {
   }
 }
 
+try {
+  await Promise.all([
+    binaryWebSocket.connect(),
+    stockfishWebSocket.connect()
+  ]);
+} catch {}
+
 const playComputerModal = new PlayComputerModal({
   el: document.querySelector('#playComputerModal'),
   props() {

diff --git a/assets/js/pages/signin/index.js b/assets/js/pages/signin/index.js
@@ -2,12 +2,6 @@ import jsCookie from 'js-cookie';
 import BaseComponent from '../../BaseComponent.js';
 import { authWebSocket } from '../../websockets/AuthWebSocket.js';
 
-try {
-  await Promise.all([
-    authWebSocket.connect()
-  ]);
-} catch {}
-
 class SignInForm extends BaseComponent {
   mount() {
     this.el.addEventListener('submit', event => {
@@ -30,6 +24,12 @@ class SignInForm extends BaseComponent {
   }
 }
 
+try {
+  await Promise.all([
+    authWebSocket.connect()
+  ]);
+} catch {}
+
 const signInForm = new SignInForm({
   el: document.querySelector('#signInForm')
 });
diff --git a/assets/js/pages/training/index.js b/assets/js/pages/training/index.js
@@ -3,13 +3,6 @@ import BaseComponent from '../../BaseComponent.js';
 import { binaryWebSocket } from '../../websockets/BinaryWebSocket.js';
 import { stockfishWebSocket } from '../../websockets/game/StockfishWebSocket.js';
 
-try {
-  await Promise.all([
-    binaryWebSocket.connect(),
-    stockfishWebSocket.connect()
-  ]);
-} catch {}
-
 class CheckmateForm extends BaseComponent {
   _checkmateTypes = ['QR,R', 'Q', 'R', 'BB', 'BN'];
 
@@ -62,6 +55,13 @@ class EndgameForm extends BaseComponent {
   }
 }
 
+try {
+  await Promise.all([
+    binaryWebSocket.connect(),
+    stockfishWebSocket.connect()
+  ]);
+} catch {}
+
 const checkmateForm = new CheckmateForm({
   el: document.querySelector('#checkmateForm')
 });