improve centralization of models

src/Model/Utility/utility.ts

@@ -5,7 +5,7 @@ export function createTimestamp(): string {
 
 // string
 export function stringify(data: any): string {
-  return JSON.stringify(data);
+  return JSON.stringify(data, null, 4);
 }
 
 export function parse(string: string): any {

src/Model/chatListModel.ts

@@ -1,11 +1,15 @@
 import StorageModel, { storageKeys } from "./storageModel";
 
 import { ChatModel } from "./chatModel";
+import ConnectionModel from "./connectionModel";
+import SettingsModel from "./settingsModel";
 import { localeCompare } from "./Utility/utility";
 import { v4 } from "uuid";
 
 export default class ChatListModel {
   storageModel: StorageModel;
+  settingsModel: SettingsModel;
+  connectionModel: ConnectionModel;
 
   // data
   chatModels = new Set<ChatModel>();
@@ -20,7 +24,13 @@ export default class ChatListModel {
   createChat = (primaryChannel: string): ChatModel => {
     const id: string = v4();
 
-    const chatModel = new ChatModel(this.storageModel, this, id);
+    const chatModel = new ChatModel(
+      this.storageModel,
+      this.connectionModel,
+      this.settingsModel,
+      this,
+      id
+    );
     chatModel.setPrimaryChannel(primaryChannel);
 
     this.addChatModel(chatModel);
@@ -44,19 +54,31 @@ export default class ChatListModel {
     this.sortedPrimaryChannels = allChannels.sort(localeCompare);
   };
 
+  getIndexOfPrimaryChannel(primaryChannel: string): number {
+    return this.sortedPrimaryChannels.indexOf(primaryChannel);
+  }
+  
   // restore
   loadChats = (): void => {
     const chatDir = storageKeys.chats;
     const chatIds = this.storageModel.list(chatDir);
     for (const chatId of chatIds) {
-      const chatModel = new ChatModel(this.storageModel, this, chatId);
+      const chatModel = new ChatModel(
+        this.storageModel,
+        this.connectionModel,
+        this.settingsModel,
+        this,
+        chatId
+      );
       this.addChatModel(chatModel);
     }
   };
 
   // init
-  constructor(storageModel: StorageModel) {
+  constructor(storageModel: StorageModel, settingsModel: SettingsModel, connectionModel: ConnectionModel) {
     this.storageModel = storageModel;
+    this.settingsModel = settingsModel;
+    this.connectionModel = connectionModel;
     this.loadChats();
   }
 }

src/Model/chatModel.ts

@@ -4,21 +4,33 @@ import StorageModel, { storageKeys } from "./storageModel";
 
 import ChatListModel from "./chatListModel";
 import { Color } from "../ViewModel/colors";
+import ConnectionModel from "./connectionModel";
+import SettingsModel from "./settingsModel";
 import { checkIsValidObject } from "./Utility/typeSafety";
 import { createTimestamp } from "./Utility/utility";
 import { v4 } from "uuid";
 
 export class ChatModel {
+  connectionModel: ConnectionModel;
+  storageModel: StorageModel;
+  settingsModel: SettingsModel;
+  chatListModel: ChatListModel;
+
   // data
   id: string;
-  storageModel: StorageModel;
-  chatListModel: ChatListModel;
   info: ChatInfo;
   color: Color;
 
   messages = new Set<ChatMessage>();
   objects = new Map<string, ChatObject>();
 
+  // sorting
+  get index(): number {
+    return this.chatListModel.getIndexOfPrimaryChannel(
+      this.info.primaryChannel
+    );
+  }
+
   // paths
   get infoPath(): string[] {
     return storageKeys.chatInfo(this.id);
@@ -148,6 +160,11 @@ export class ChatModel {
     }
   };
 
+  // messaging
+  sendMessage = (body: string): void => {
+    //TODO
+  };
+
   // memory
   loadData = (): void => {
     this.restoreMessages();
@@ -162,10 +179,14 @@ export class ChatModel {
   // init
   constructor(
     storageModel: StorageModel,
+    connectionModel: ConnectionModel,
+    settingsModel: SettingsModel,
     chatListModel: ChatListModel,
     chatId: string
   ) {
     this.id = chatId;
+    this.connectionModel = connectionModel;
+    this.settingsModel = settingsModel;
     this.storageModel = storageModel;
     this.chatListModel = chatListModel;
 

src/Model/connectionModel.ts

@@ -29,6 +29,8 @@ export default class ConnectionModel {
     this.udn.disconnect();
   };
 
+  handleMessage = (data: Message): void => {}
+
   handleConnectionChange = (): void => {
     console.log("connection status:", this.isConnected, this.address);
     if (this.isConnected == false) return;
@@ -114,30 +116,20 @@ export default class ConnectionModel {
   }
 
   // setup
-  constructor(configuration: ConnectionModelConfiguration) {
+  constructor(storageModel: StorageModel) {
     // create frontend
     this.udn = new UDNFrontend();
-    this.storageModel = configuration.storageModel;
+    this.storageModel = storageModel;
 
     // setup handlers
     this.udn.onmessage = (data: Message) => {
-      configuration.messageHandler(data);
+      this.handleMessage(data);
     };
     this.udn.onconnect = () => {
       this.handleConnectionChange();
-      configuration.connectionChangeHandler();
     };
     this.udn.ondisconnect = () => {
       this.handleConnectionChange();
-      configuration.connectionChangeHandler();
     };
   }
-}
-
-// types
-export interface ConnectionModelConfiguration {
-  storageModel: StorageModel;
-
-  connectionChangeHandler: () => void;
-  messageHandler: (data: Message) => void;
-}
+}

src/Model/storageModel.ts

@@ -103,7 +103,7 @@ export default class StorageModel {
   };
 
   print = () => {
-    console.log(JSON.stringify(this.storageEntryTree, null, 4));
+    console.log(stringify(this.storageEntryTree));
   };
 
   static pathComponentsToKey = (...pathComponents: string[]): string => {
@@ -146,7 +146,12 @@ export const storageKeys = {
   // chat etc
   chats: [DATA_VERSION, "chat"],
   chatInfo: (id: string) => [DATA_VERSION, "chat", id, "info"],
-  chatLastUsedPage: (id: string) => [DATA_VERSION, "chat", id, "last-used-page"],
+  chatLastUsedPage: (id: string) => [
+    DATA_VERSION,
+    "chat",
+    id,
+    "last-used-page",
+  ],
   chatColor: (id: string) => [DATA_VERSION, "chat", id, "color"],
   chatMessages: (id: string) => [DATA_VERSION, "chat", id, "messages"],
   chatObjects: (id: string) => [DATA_VERSION, "chat", id, "objects"],