add shared profile and messages data

diff --git a/src/composables/useEmitter.ts b/src/composables/useEmitter.ts
index 240c557477af21aa81716665fc54e81c6c4e1950..134e9699520aceb920423bea9341a09569a80e9c 100644 (file)
--- a/src/composables/useEmitter.ts
+++ b/src/composables/useEmitter.ts
@@ -8,7 +8,7 @@ export const backgroundMitt = new BackgroundMitt();
 
 export const ipcEmit = (channel: string, payload: any) => {
     backgroundMitt.emit('ipc-renderer', {
-        endpoint: channel,
+        channel: channel,
         message: payload
     });
 };

diff --git a/src/render/App.vue b/src/render/App.vue
index a7645d1a52d601bb8c30144ddb801789567388ff..686591bd1e381be3f2cffc8ecf113af743d6af47 100644 (file)
--- a/src/render/App.vue
+++ b/src/render/App.vue
@@ -4,14 +4,12 @@
 
     <Header />
 
-    <!-- Main Components
     <Messenger
-    v-if="profile"
-    :profile="profile"
-    :messages="state.messages"
+        v-if="profile"
     />
+
+    <!-- Main Components
     -->
-    <div v-if="profile">{{profile}}</div>
     <Login v-else />
 
   </main>
@@ -31,7 +29,7 @@ import Messenger from "@/render/components/messenger.vue";
 import Login from "@/render/components/login.vue";
 import Header from "@/render/components/header.vue";
 
-import useProfile from "@/render/composables/useProfile";
+import { profile, authComplete } from "@/render/composables/useProfile";
 import { postAppMount } from "@/render/ipc";
 
 export default defineComponent({
@@ -45,8 +43,6 @@ export default defineComponent({
 
   setup() {
 
-    const { profile, authComplete } = useProfile();
-
     onMounted(() => postAppMount());
 
     return {

diff --git a/src/render/components/bubble.vue b/src/render/components/bubble.vue
index 6a62e62d6da0e72517262833edb72cbfc29d1d74..982cef3134f6ce82f7ad3a380afcbb20293e60ce 100644 (file)
--- a/src/render/components/bubble.vue
+++ b/src/render/components/bubble.vue
@@ -10,7 +10,7 @@
 
     <!-- message context -->
     <span class="context">
-      <div :class="`${type}-icon`">
+      <div :class="`${type}-icon`"/>
       {{ context }}
     </span>
 
@@ -22,23 +22,24 @@
  import { defineComponent, ref, onMounted } from 'vue';
 
  export default defineComponent({
-  name: "MessageItem",
+  name: "Bubble",
 
   props: ["text", "context", "type", "position"],
 
   setup() {
 
+    const seen = ref(false);
     /* initialize seen state */
-    const seen = ref(() => {
-      if (document.visibilityState === "visible") {
-        return true;
-      } else return false;
-    });
+    if (document.visibilityState === "visible") {
+        seen.value = true;
+    } else seen.value = false;
 
     onMounted(() => {
 
-      if (!seen) 
-      document.addEventListener("visibilitychange", () => seen = true);
+      if(seen.value)
+      document.addEventListener("visibilitychange", () => {
+          seen.value = true
+      });
 
     });
 

diff --git a/src/render/components/login.vue b/src/render/components/login.vue
index 6cb4dd6eb6393c3d38a3e0e389dc1f94042a2664..bece6eaf8cec0dddc0c73dc7023a96819be33b75 100644 (file)
--- a/src/render/components/login.vue
+++ b/src/render/components/login.vue
@@ -35,7 +35,7 @@
 <script lang="ts">
 
 import { defineComponent, ref } from "vue";
-import useProfile from '@/render/composables/useProfile';
+import { setProfile } from '@/render/composables/useProfile';
 import { invokeLogin } from "@/render/ipc";
 
 export default defineComponent({
@@ -46,8 +46,6 @@ export default defineComponent({
     const usr = ref("");
     const pwd = ref("");
 
-    const { setProfile } = useProfile();
-
     // Submit login credentials to the backend.
     const submitForm = async () => {
 

diff --git a/src/render/components/messenger.vue b/src/render/components/messenger.vue
index d0dd382d1d12e1864758e4f8f59ef985f13c6bd8..ee565491d723ca0b8e9c2472e502a742351491b3 100644 (file)
--- a/src/render/components/messenger.vue
+++ b/src/render/components/messenger.vue
@@ -8,8 +8,8 @@
   <!-- List of message bubbles. -->
   <div id="messenger">
     <Bubble
-      v-for="message in messagesRef"
-      :text="message.text"
+      v-for="message in messages"
+      :text="message.content.text"
       :context="message.context"
       :key="message[0]"
     />
@@ -22,48 +22,24 @@
 import { defineComponent, onMounted, onUnmounted } from "vue";
 import InputItem from "@/render/components/inputItem.vue";
 import Settings from "@/render/components/settings.vue";
-import useMessages from "./controllers/messenger.control";
+import Bubble from "@/render/components/bubble.vue";
+
+import { profile } from "@/render/composables/useProfile";
+import { messages } from "@/render/composables/useMessages";
 
 export default defineComponent({
   name: "Messenger",
 
-  props: ["profile", "messages"],
-
   components: {
     InputItem,
-    Settings
+    Settings,
+    Bubble
   },
 
-  setup(props) {
-
-    // Handle messages in view.
-    const { messagesRef } = useMessages();
-
-    onMounted(() => {
-
-      /* seed messages */
-      window.ipcRenderer.on("init-messages", (e_: any, payload: any) => {
-        // seedMessages(payload.messages);
-      });
-
-      /* add a new message */
-      window.ipcRenderer.on("add-message", (_e: any, payload: any) => {
-        // addMessage(payload.message);
-      });
-
-      /* update an existing message */
-      window.ipcRenderer.on("update-message", (_e: any, payload: any) => {
-        // updateMessage(payload.message);
-      });
-
-    });
-
-    onUnmounted(() => {
-      window.ipcRenderer.removeAllListeners("new-message");
-    });
-
+  setup() {
     return {
-      messagesRef
+      messages,
+      profile
     };
 
   },

diff --git a/src/render/components/settings.vue b/src/render/components/settings.vue
index 46e14bd78ba55ba2e438efcbdd6707545f2373dc..cf881c33441ad5485442e30cd718067fd0ea79d9 100644 (file)
--- a/src/render/components/settings.vue
+++ b/src/render/components/settings.vue
@@ -28,7 +28,7 @@
 <script lang="ts">
 
   import { defineComponent, ref } from "vue";
-  import useProfile from "@/render/composables/useProfile"
+  import { clearProfile } from "@/render/composables/useProfile"
   import { invokeLogout } from "@/render/ipc";
 
   export default defineComponent({
@@ -37,8 +37,6 @@
     setup() {
       const toggleSettings = ref(false);
 
-      const { clearProfile } = useProfile();
-
       // Listen for escape key to close settings.
       const onEscape = (e: any) => {
         if(e.key === "Escape") {

diff --git a/src/render/composables/useMessages.ts b/src/render/composables/useMessages.ts
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..11377fd5b2a728bff7f7d6ce360f912277c81efc 100644 (file)
--- a/src/render/composables/useMessages.ts
+++ b/src/render/composables/useMessages.ts
@@ -0,0 +1,33 @@
+// shared
+import { ref, Ref } from "vue";
+import useScroll from "@/render/composables/useScroll";
+
+export let messages: Ref<Array<Message>> = ref([]);
+
+export const setMessages: IpcListenerCallback<Array<Message>> = (payload) => {
+    messages.value = payload as Array<Message>;
+}
+
+export const addMessage: IpcListenerCallback<Message> = (payload) => {
+    messages.value.push(payload as Message);
+}
+
+export const updateMessage: IpcListenerCallback<Message> = (payload) => {
+    const message = payload as Message;
+
+    let targetMessage = messages.value.filter((m: Message) => {
+        return m.uid = message.uid;
+    })[0];
+
+    if (targetMessage) {
+        targetMessage = message;
+    }
+
+}
+
+export default {
+    messages,
+    setMessages,
+    addMessage,
+    updateMessage
+};

diff --git a/src/render/composables/useProfile.ts b/src/render/composables/useProfile.ts
index 0f3c39efb1649406bbc607ea8980f968f3c1f4e5..8585763eec29408b46b76dff30c9e184bd6aadb8 100644 (file)
--- a/src/render/composables/useProfile.ts
+++ b/src/render/composables/useProfile.ts
@@ -1,33 +1,27 @@
+// shared
 import { ref } from "vue";
 
-const profile = ref();
+export let profile = ref();
 
-const authComplete = ref(false);
+export let authComplete = ref(false);
 
-const useProfile = () => {
+export const setProfile: IpcListenerCallback<Profile | null> = (payload) => {
+    payload ? profile.value = payload : clearProfile();
+    showRender();
+};
 
-    const setProfile: IpcListenerCallback<Profile | null> = (payload) => {
-        payload ? profile.value = payload : clearProfile();
-        showRender();
-    }
+export const clearProfile = () => {
+    profile.value = null;
+};
 
-    const clearProfile = () => {
-        profile.value = null;
-    }
+export const showRender = () => {
+    authComplete.value = true;
+};
 
-    const showRender = () => {
-        authComplete.value = true;
-    }
-
-
-    return {
-        setProfile,
-        clearProfile,
-        profile,
-        showRender,
-        authComplete,
-    }
-
-}
-
-export default  useProfile;
+export default {
+    setProfile,
+    clearProfile,
+    profile,
+    showRender,
+    authComplete,
+};

diff --git a/src/render/listeners.ts b/src/render/listeners.ts
index 76f4832f88d6b3f3cac714a22f76078cd992bd48..876d206db7bb99600fcdbbbada268a527cabeed9 100644 (file)
--- a/src/render/listeners.ts
+++ b/src/render/listeners.ts
@@ -1,8 +1,7 @@
 
 import { IpcRendererListener } from "./composables/useIpcRend"
-import useProfile from "./composables/useProfile";
-
-const { setProfile } = useProfile();
+import { setProfile } from "./composables/useProfile";
+import { setMessages, addMessage, updateMessage } from "./composables/useMessages";
 
 const SET_PROFILE_CHANNEL = "set-profile";
 
@@ -17,16 +16,17 @@ export const setProfileListener = new IpcRendererListener({
 
 export const initMessagesListener = new IpcRendererListener({
     channel: INIT_MESSAGES_CHANNEL,
-    listenerCallback: () => {}
+    listenerCallback: setMessages
 });
 
 
 export const addMessagesListener = new IpcRendererListener({
     channel: ADD_MESSAGE_CHANNEL,
-    listenerCallback: () => {}
+    listenerCallback: addMessage
 });
 
 export const updateMessagesListener = new IpcRendererListener({
     channel: UPDATE_MESSAGE_CHANNEL,
-    listenerCallback: () => {}
+    listenerCallback: updateMessage
 });
+

diff --git a/src/session.ts b/src/session.ts
index 1b278ba6d681d84a1a1ba98414e5bcec87a3a17c..cde1df34ff4721f5c0781c9658cb07e76bf8b1e6 100644 (file)
--- a/src/session.ts
+++ b/src/session.ts
@@ -3,7 +3,7 @@
 
 
 // import useAudio from "@/audio";
-import ipcEmit from "@/composables/useEmitter";
+import { ipcEmit } from "@/composables/useEmitter";
 import useWebsockets from "./composables/useWebsockets";
 import {config} from "@/config";
 
@@ -14,7 +14,6 @@ const uiState: any | null = null;
 // const { initAudio, closeAudio } = useAudio();
 
 const isInitMessage = (message: any): boolean => {
-    console.log(message)
     return true;
 };
 
@@ -23,7 +22,6 @@ const deauthenticate = (): void => {
 };
 
 const isAddMessage = (message: any): boolean => {
-    console.log(message)
     return true;
 };
 
@@ -33,38 +31,45 @@ const isAddMessage = (message: any): boolean => {
  */
 
 
-const onMessageCallback = (message: string) => {
+const onMessageCallback = (payload: string) => {
 
-    const content  = JSON.parse(message);
+    const message  = JSON.parse(payload);
+    console.log(typeof message);
 
     /* if the platform fails to authenticate, we must back down */
-    if (content === "CLOSE_AUTH_FAIL") {
+    if (message === "CLOSE_AUTH_FAIL") {
         deauthenticate();
         return;
     }
 
+    ipcEmit("add-message", message)
+    return
+
     /* on init, platform sends state, used to init canvas */
-    if (isInitMessage(content)) {
-        // uiState.set(content);
+    if (isInitMessage(message)) {
+        ipcEmit("init-messages", message)
     }
 
 
-    else if (isAddMessage(content)) {
-        // uiState.add(content);
+    else if (isAddMessage(message)) {
+        ipcEmit("add-messages", message)
     }
 
     else {
-        // uiState.update(content);
+        ipcEmit("update-messages", message)
     }
+
 }
 
 const onConnectionStatusCallback = (alive: boolean) => {
-
     // console.log('[Session]: Connection Alive: ', alive);
     // ipcEmit('connection-state', alive);
 }
 
-const { connect, send, close } = useWebsockets(onMessageCallback, onConnectionStatusCallback);
+const { connect, send, close } = useWebsockets(
+    onMessageCallback,
+    onConnectionStatusCallback
+);
 
 /* send a message to the platform */
 export function sendMessage<Message>(message: Message): void {

diff --git a/src/types.ts b/src/types.ts
index 01dd4b56309719b5e09665af0a54d0c57ed0cf90..7c78e2970fe8b812a6a0a510ceccc5a7be9b1b67 100644 (file)
--- a/src/types.ts
+++ b/src/types.ts
@@ -40,7 +40,7 @@ interface AccountCredentials {
 }
 
 /*
- * Electron Ipc Main
+ * Electron Ipc
  */
 interface IpcHandlerCallback<I, O> {
     (payload: I | null): Promise<Error | O>;

diff --git a/src/window.ts b/src/window.ts
index a456e3cfe487e15a6d345c80edbc460c7b0dccee..3c16e7a14945bde1d40f511fd49e318e6d53dde0 100644 (file)
--- a/src/window.ts
+++ b/src/window.ts
@@ -10,7 +10,7 @@ import { config } from "@/config";
 const { autoUpdater } = require('electron-updater');
 
 interface IpcRendererPayload {
-  endpoint: string;
+  channel: string;
   message: Message | null;
 }
 
@@ -50,8 +50,9 @@ const onNavBar = (_event: any, action: string): void => {
 
 // Util function to render message on ipc-renderer event.
 const renderMessage = (payload: IpcRendererPayload): void => {
+    console.log('sending to browser window', payload);
     if (win) {
-        win.webContents.send(payload.endpoint, {
+        win.webContents.send(payload.channel, {
             message: payload.message
         });
     }