socket reconnection logic

3 files changed, 11 insertions, 27 deletions

diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 0168bb7c..f5576edd 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -1,24 +1,9 @@
 <script>
 	import '../app.css';
 	import { onMount } from 'svelte';
-  import { rate, ws } from "$lib/store";
-  import { messages } from "$lib/socket";
+	import { connect } from '$lib/socket';
 
-	let token =
-		'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6ImJvYiIsImlhdCI6MTY1ODc5NDkxMX0._zFTEADrbLffcXa5sIMrJtJ483VdIiYmsdt2ofibxu4';
-
-	onMount(async () => {
-		$ws = new WebSocket(`ws://localhost:3119/ws`);
-
-		$ws.onmessage = (msg) => {
-			let { type, data } = JSON.parse(msg.data);
-      messages(data)[type] && messages(data)[type]();
-		};
-
-		$ws.onopen = () => {
-			ws.send(JSON.stringify({ type: 'login', data: token }));
-		};
-	});
+	onMount(connect);
 </script>
 
 <slot />
diff --git a/src/routes/invoice.js b/src/routes/invoice.js
index fa493fe1..49bcfe70 100644
--- a/src/routes/invoice.js
+++ b/src/routes/invoice.js
@@ -10,11 +10,11 @@ export async function GET({ params }) {
 		})
 		.text();
 
-	let body = await got
+	await got
 		.post('http://localhost:3119/invoice', {
 			json: { invoice: { text, network }, user: { username } }
 		})
 		.json();
 
-	return { body };
+	return { body: { text } };
 }
diff --git a/src/routes/invoice.svelte b/src/routes/invoice.svelte
index 6ea9e67f..40a66a24 100644
--- a/src/routes/invoice.svelte
+++ b/src/routes/invoice.svelte
@@ -1,13 +1,12 @@
 <script>
-  import { rate } from "$lib/store";
-  import { onMount } from "svelte";
+	import { rate } from '$lib/store';
+	import { onMount } from 'svelte';
 
-  onMount(() => {
+  export let text;
+</script>
 
-  });
-  </script>
+QR code
 
-  QR code
-
-  {$rate}
+{text}
 
+{$rate}