@diory/client-js 0.1.0 → 0.1.2

package/dist/dioryClient.d.ts

@@ -10,11 +10,11 @@ declare class DioryClient implements IDioryClient {
     diory?: IDiory;
     constructor(dataClients: IDataClient[]);
     initialise: (connections: IConnectionObject[]) => Promise<void>;
+    enterRoom: (roomObject: IRoomObject) => Promise<void>;
+    focusDiory: (dioryObject: IDioryObject) => IDiory;
     getDiosphere: () => Promise<void>;
     saveDiosphere: () => Promise<void>;
-    enterRoom: (roomObject: IRoomObject) => Promise<IRoom>;
     getDiograph: () => Promise<void>;
     saveDiograph: () => Promise<void>;
-    focusDiory: (dioryObject: IDioryObject) => IDiory;
 }
 export { DioryClient };

package/dist/dioryClient.js

@@ -21,11 +21,21 @@ class DioryClient {
         this.connections = [];
         this.initialise = async (connections) => {
             this.connections = connections;
+            this.diosphere.resetRooms();
             await this.getDiosphere();
             await this.enterRoom({ id: '/' });
-            await this.focusDiory({ id: '/' });
             return;
         };
+        this.enterRoom = async (roomObject) => {
+            this.room = this.diosphere.getRoom(roomObject);
+            this.diograph.resetDiories();
+            await this.getDiograph();
+            this.focusDiory({ id: '/' });
+            return this.room;
+        };
+        this.focusDiory = (dioryObject) => {
+            return (this.diory = this.diograph.getDiory(dioryObject));
+        };
         this.getDiosphere = async () => {
             console.info('getDiosphere', this.connections);
             if (this.connections) {
@@ -49,11 +59,6 @@ class DioryClient {
             }
             return;
         };
-        this.enterRoom = async (roomObject) => {
-            this.room = this.diosphere.getRoom(roomObject);
-            await this.getDiograph();
-            return this.room;
-        };
         this.getDiograph = async () => {
             var _a, _b;
             console.info('getDiograph', (_a = this.room) === null || _a === void 0 ? void 0 : _a.connections);
@@ -79,9 +84,6 @@ class DioryClient {
             }
             return;
         };
-        this.focusDiory = (dioryObject) => {
-            return (this.diory = this.diograph.getDiory(dioryObject));
-        };
         this.dataClients = dataClients;
         this.diosphere = new diosphere_js_1.Diosphere();
         this.diograph = new diograph_1.Diograph();

package/dist/types.d.ts

@@ -31,10 +31,10 @@ export interface IDioryClient {
     diograph: IDiograph;
     diory?: IDiory;
     initialise: (connections: IConnectionObject[]) => Promise<void>;
+    enterRoom: (roomObject: IRoomObject) => Promise<void>;
+    focusDiory: (dioryObject: IDioryObject) => IDiory;
     getDiosphere: () => void;
     saveDiosphere: () => void;
-    enterRoom: (roomObject: IRoomObject) => Promise<IRoom>;
     getDiograph: () => void;
     saveDiograph: () => void;
-    focusDiory: (dioryObject: IDioryObject) => IDiory;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diory/client-js",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Olli-Pekka Pohjola <op@diory.me>, Jouni Alanen <jouni@diory.me>",

package/src/dioryClient.ts

@@ -44,13 +44,27 @@ class DioryClient implements IDioryClient {
   initialise = async (connections: IConnectionObject[]): Promise<void> => {
     this.connections = connections
 
+    this.diosphere.resetRooms()
     await this.getDiosphere()
     await this.enterRoom({ id: '/' })
-    await this.focusDiory({ id: '/' })
 
     return
   }
 
+  enterRoom = async (roomObject: IRoomObject): Promise<void> => {
+    this.room = this.diosphere.getRoom(roomObject)
+
+    this.diograph.resetDiories()
+    await this.getDiograph()
+    this.focusDiory({ id: '/' })
+
+    return this.room
+  }
+
+  focusDiory = (dioryObject: IDioryObject): IDiory => {
+    return (this.diory = this.diograph.getDiory(dioryObject))
+  }
+
   getDiosphere = async (): Promise<void> => {
     console.info('getDiosphere', this.connections)
     if (this.connections) {
@@ -84,14 +98,6 @@ class DioryClient implements IDioryClient {
     return
   }
 
-  enterRoom = async (roomObject: IRoomObject): Promise<IRoom> => {
-    this.room = this.diosphere.getRoom(roomObject)
-
-    await this.getDiograph()
-
-    return this.room
-  }
-
   getDiograph = async (): Promise<void> => {
     console.info('getDiograph', this.room?.connections)
     if (this.room?.connections) {
@@ -124,10 +130,6 @@ class DioryClient implements IDioryClient {
 
     return
   }
-
-  focusDiory = (dioryObject: IDioryObject): IDiory => {
-    return (this.diory = this.diograph.getDiory(dioryObject))
-  }
 }
 
 export { DioryClient }

package/src/types.ts

@@ -39,10 +39,10 @@ export interface IDioryClient {
   diograph: IDiograph
   diory?: IDiory
   initialise: (connections: IConnectionObject[]) => Promise<void>
+  enterRoom: (roomObject: IRoomObject) => Promise<void>
+  focusDiory: (dioryObject: IDioryObject) => IDiory
   getDiosphere: () => void
   saveDiosphere: () => void
-  enterRoom: (roomObject: IRoomObject) => Promise<IRoom>
   getDiograph: () => void
   saveDiograph: () => void
-  focusDiory: (dioryObject: IDioryObject) => IDiory
 }