From 8ab0911ee810a52e10fe8904a896d23790526d86 Mon Sep 17 00:00:00 2001
From: JettTech <ldjetton21@gmail.com>
Date: Mon, 29 Jul 2024 16:19:59 -0500
Subject: [PATCH] latest edits

---
 src/stores/useHolochainStore.js | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/stores/useHolochainStore.js b/src/stores/useHolochainStore.js
index 7b43564..f788603 100644
--- a/src/stores/useHolochainStore.js
+++ b/src/stores/useHolochainStore.js
@@ -7,6 +7,11 @@ import useSignalStore from './useSignalStore'
 import { kycLevel2 } from '../services/hbs'
 import { hposHolochainCall } from '../services/hpos'
 
+const __HC_LAUNCHER_ENV__ = "__HC_LAUNCHER_ENV__";
+const __HC_ZOME_CALL_SIGNER__ = "__HC_ZOME_CALL_SIGNER__";
+const isLauncher = () => globalThis.window && __HC_LAUNCHER_ENV__ in globalThis.window;
+const getLauncherEnvironment = () => isLauncher() ? globalThis.window[__HC_LAUNCHER_ENV__] : undefined;
+
 const HC_APP_TIMEOUT = 35_000
 
 const makeUseHolochainStore = ({ installed_app_id, app_ws_url, hc_admin_port }) => defineStore('holochain', {
@@ -29,11 +34,11 @@ const makeUseHolochainStore = ({ installed_app_id, app_ws_url, hc_admin_port })
 
     async initialize() {
       try {
-        let happConnectionExpiration = this.happConnectionCache.get("expiresAt");
-        let happConnectionToken = this.happConnectionCache.get("token");
+        let happConnectionExpiration = this.happConnectionCache["expiresAt"];
+        let happConnectionToken = this.happConnectionCache["token"];
         let launcherEnv = getLauncherEnvironment();
 
-        if (!!launcherEnv && !happConnectionToken) {
+        if (!!launcherEnv) {
           this.isLauncherEnv = true;
           if (!launcherEnv.APP_INTERFACE_TOKEN) {
             console.warn(`Failed to locate the app interface token for app in launcher env: ${launcherEnv}`);
@@ -41,7 +46,7 @@ const makeUseHolochainStore = ({ installed_app_id, app_ws_url, hc_admin_port })
           if (!launcherEnv.APP_INTERFACE_PORT) {
             console.warn(`Failed to locate the app interface port for app in launcher env: ${launcherEnv}`);
           }
-          this.happConnectionCache.set("token", launcherEnv.APP_INTERFACE_TOKEN);
+          this.happConnectionCache["token"] = launcherEnv.APP_INTERFACE_TOKEN;
           happConnectionToken = launcherEnv.APP_INTERFACE_TOKEN;
           app_ws_url = `ws:localhost:${launcherEnv.APP_INTERFACE_PORT}`
         } else if (!happConnectionToken || !happConnectionExpiration || happConnectionExpiration <= Date.now()) {
@@ -57,17 +62,22 @@ const makeUseHolochainStore = ({ installed_app_id, app_ws_url, hc_admin_port })
               expiry_seconds: 0,
             });
   
-            this.happConnectionCache.set("expiresAt", issuedToken.expires_at);
-            this.happConnectionCache.set("token", issuedToken.token);
+            this.happConnectionCache["expiresAt"] = issuedToken.expires_at;
+            this.happConnectionCache["token"] = issuedToken.token;
             happConnectionToken = issuedToken.token
-        }
+          }
+
+        console.log("app_ws_url : ", app_ws_url)
+        console.log("happConnectionToken : ", happConnectionToken)
 
-        const holochainClient = await AppWebsocket.connect({
+        holochainClient = await AppWebsocket.connect({
           url: new URL(app_ws_url),
           wsClientOptions: { origin: 'ui-common-lib' },
-          token: happConnectionToken,
+          token: happConnectionToken, // do we need this for launcher?
           defaultTimeout: HC_APP_TIMEOUT,
         })
+          
+        console.log("holochainClient : ", happConnectionToken)
 
         holochainClient.on("signal", useSignalStore().handleSignal(presentHcSignal(signal)));
         this.client = holochainClient