From 4add3521b3ac1cd3690a3fd1e37e339687c67b38 Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Fri, 26 Jul 2024 12:42:12 +0200
Subject: [PATCH] clean code

---
 src/routes/options-flow/+page.svelte     | 40 +++++++++++++++++-------
 src/routes/options-flow/+page.ts         |  6 +++-
 src/routes/options-zero-dte/+page.svelte | 15 ++-------
 src/routes/options-zero-dte/+page.ts     |  3 ++
 4 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/routes/options-flow/+page.svelte b/src/routes/options-flow/+page.svelte
index 7da29eb4..3323580a 100644
--- a/src/routes/options-flow/+page.svelte
+++ b/src/routes/options-flow/+page.svelte
@@ -1,6 +1,6 @@
 <script lang='ts'>
   import { goto } from '$app/navigation';
-  import { screenWidth, userRegion, numberOfUnreadNotification, etfTicker, stockTicker, isOpen } from '$lib/store';
+  import { screenWidth, numberOfUnreadNotification, etfTicker, stockTicker, isOpen } from '$lib/store';
   import notifySound from '$lib/audio/options-flow-reader.mp3';
   import UpgradeToPro from '$lib/components/UpgradeToPro.svelte';
   import { abbreviateNumber } from '$lib/utils';
@@ -11,16 +11,6 @@
   export let data;
     
   
-  const usRegion = ['cle1','iad1','pdx1','sfo1'];
-  let wsURL;
-  
-  userRegion?.subscribe(value => {
-  if (usRegion?.includes(value)) {
-    wsURL = import.meta.env.VITE_USEAST_WS_URL;
-  } else {
-    wsURL = import.meta.env.VITE_EU_WS_URL;
-  }
-  });
   
   let rawData = [];
   let filterList = [];
@@ -64,6 +54,32 @@
   let optionExecutionEstimate;
   let optionExchange;
 
+  /*
+  async function infiniteHandler({ detail: { loaded, complete, error } }) {
+
+		try {
+      const lastId = rawData?.at(-1)?.id;
+      const postData = {'lastId': lastId};
+      const response = await fetch(data?.apiURL + '/options-flow-feed', {
+        method: 'POST',
+        headers: {
+          "Content-Type": "application/json", "X-API-KEY": data?.apiKey
+        },
+        body: JSON.stringify(postData),
+      });
+      const newData = await response.json();
+      if(newData?.length === 0) {
+        complete();
+      }
+      else {
+        rawData = [...rawData,...newData];
+        loaded();
+      }
+		} catch (e) {
+			error();
+		}
+	}
+  */
   function toggleMode()
   {
       if ($isOpen) {
@@ -120,7 +136,7 @@ function handleViewData(optionData) {
   async function websocketRealtimeData() {
   
   try {
-  socket = new WebSocket(wsURL+"/options-flow-reader");
+  socket = new WebSocket(data?.wsURL+"/options-flow-reader");
   
   
   socket.addEventListener('message', (event) => {
diff --git a/src/routes/options-flow/+page.ts b/src/routes/options-flow/+page.ts
index 9faf1d98..c77145c5 100644
--- a/src/routes/options-flow/+page.ts
+++ b/src/routes/options-flow/+page.ts
@@ -22,6 +22,7 @@ const checkMarketHour = async () => {
 const usRegion = ['cle1','iad1','pdx1','sfo1'];
 
 let apiURL;
+let wsURL;
 let apiKey = import.meta.env.VITE_STOCKNEAR_API_KEY;
 
 
@@ -29,8 +30,10 @@ userRegion.subscribe(value => {
 
   if (usRegion?.includes(value)) {
     apiURL = import.meta.env.VITE_USEAST_API_URL;
+    wsURL = import.meta.env.VITE_USEAST_WS_URL;
   } else {
     apiURL = import.meta.env.VITE_EU_API_URL;
+    wsURL = import.meta.env.VITE_EU_WS_URL;
   }
 });
 
@@ -56,6 +59,7 @@ export const load = async () => {
 
   // Make sure to return a promise
   return {
-    getOptionsFlowFeed: await getOptionsFlowFeed()
+    getOptionsFlowFeed: await getOptionsFlowFeed(),
+    wsURL,
   };
 };
\ No newline at end of file
diff --git a/src/routes/options-zero-dte/+page.svelte b/src/routes/options-zero-dte/+page.svelte
index 0a78c396..879ce7d9 100644
--- a/src/routes/options-zero-dte/+page.svelte
+++ b/src/routes/options-zero-dte/+page.svelte
@@ -1,6 +1,6 @@
 <script lang='ts'>
   import { goto } from '$app/navigation';
-  import { screenWidth, userRegion, numberOfUnreadNotification, etfTicker, stockTicker, isOpen } from '$lib/store';
+  import { screenWidth, numberOfUnreadNotification, etfTicker, stockTicker, isOpen } from '$lib/store';
   import notifySound from '$lib/audio/options-flow-reader.mp3';
   import UpgradeToPro from '$lib/components/UpgradeToPro.svelte';
   import { abbreviateNumber } from '$lib/utils';
@@ -12,17 +12,6 @@
   export let data;
     
   
-  const usRegion = ['cle1','iad1','pdx1','sfo1'];
-  let wsURL;
-  
-  userRegion?.subscribe(value => {
-  if (usRegion?.includes(value)) {
-    wsURL = import.meta.env.VITE_USEAST_WS_URL;
-  } else {
-    wsURL = import.meta.env.VITE_EU_WS_URL;
-  }
-  });
-  
   let rawData = [];
   let filterList = [];
 
@@ -121,7 +110,7 @@ function handleViewData(optionData) {
 async function websocketRealtimeData() {
 
 try {
-socket = new WebSocket(wsURL+"/options-zero-dte-reader");
+socket = new WebSocket(data?.wsURL+"/options-zero-dte-reader");
 
 
 socket.addEventListener('message', (event) => {
diff --git a/src/routes/options-zero-dte/+page.ts b/src/routes/options-zero-dte/+page.ts
index fe0260c8..7753c494 100644
--- a/src/routes/options-zero-dte/+page.ts
+++ b/src/routes/options-zero-dte/+page.ts
@@ -22,6 +22,7 @@ const checkMarketHour = async () => {
 const usRegion = ['cle1','iad1','pdx1','sfo1'];
 
 let apiURL;
+let wsURL;
 let apiKey = import.meta.env.VITE_STOCKNEAR_API_KEY;
 
 
@@ -29,8 +30,10 @@ userRegion.subscribe(value => {
 
   if (usRegion?.includes(value)) {
     apiURL = import.meta.env.VITE_USEAST_API_URL;
+    wsURL = import.meta.env.VITE_USEAST_WS_URL;
   } else {
     apiURL = import.meta.env.VITE_EU_API_URL;
+    wsURL = import.meta.env.VITE_EU_WS_URL;
   }
 });