@diory/client-js 0.1.3 → 0.1.5-rc1

package/dist/connectionClient.d.ts

@@ -10,5 +10,6 @@ declare class ConnectionClient implements IConnectionClient {
     saveDiosphere: (diosphereObject: IDiosphereObject) => Promise<boolean>;
     getDiograph: () => Promise<any>;
     saveDiograph: (diographObject: IDiographObject) => Promise<boolean>;
+    generateDiograph: () => Promise<IDiographObject>;
 }
 export { ConnectionClient };

package/dist/connectionClient.js

@@ -1,23 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionClient = void 0;
+const path_browserify_1 = require("path-browserify");
+const folder_generator_1 = require("@diograph/folder-generator");
+const DIOSPHERE_JSON = 'diosphere.json';
+const DIOGRAPH_JSON = 'diograph.json';
 class ConnectionClient {
     constructor(dataClient, connection) {
         this.getDiosphere = async () => {
-            const diosphereString = await this.client.readTextItem(this.connection.address);
+            const path = (0, path_browserify_1.join)(this.connection.address, DIOSPHERE_JSON);
+            const diosphereString = await this.client.readTextItem(path);
             return JSON.parse(diosphereString);
         };
         this.saveDiosphere = async (diosphereObject) => {
+            const path = (0, path_browserify_1.join)(this.connection.address, DIOSPHERE_JSON);
             const diosphereString = JSON.stringify(diosphereObject, null, 2);
-            return this.client.writeItem(this.connection.address, diosphereString);
+            return this.client.writeItem(path, diosphereString);
         };
         this.getDiograph = async () => {
-            const diographString = await this.client.readTextItem(this.connection.address);
+            const path = (0, path_browserify_1.join)(this.connection.address, DIOGRAPH_JSON);
+            const diographString = await this.client.readTextItem(path);
             return JSON.parse(diographString);
         };
         this.saveDiograph = async (diographObject) => {
+            const path = (0, path_browserify_1.join)(this.connection.address, DIOGRAPH_JSON);
             const diographString = JSON.stringify(diographObject, null, 2);
-            return this.client.writeItem(this.connection.address, diographString);
+            return this.client.writeItem(path, diographString);
+        };
+        this.generateDiograph = async () => {
+            const { diograph } = await (0, folder_generator_1.generateDiograph)(this.connection.address); // TODO: Client
+            return diograph.toObject();
         };
         this.type = dataClient.type;
         this.client = dataClient;

package/dist/dioryClient.d.ts

@@ -12,9 +12,10 @@ declare class DioryClient implements IDioryClient {
     initialise: (connections: IConnectionObject[]) => Promise<IDioryClient>;
     enterRoom: (roomObject: IRoomObject) => Promise<IRoom>;
     focusDiory: (dioryObject: IDioryObject) => IDiory;
-    getDiosphere: () => Promise<void>;
-    saveDiosphere: () => Promise<void>;
-    getDiograph: () => Promise<void>;
-    saveDiograph: () => Promise<void>;
+    getDiosphere: () => Promise<IDiosphere>;
+    saveDiosphere: () => Promise<IDiosphere>;
+    getDiograph: () => Promise<IDiograph>;
+    saveDiograph: () => Promise<IDiograph>;
+    generateDiograph: () => Promise<IDiograph>;
 }
 export { DioryClient };

package/dist/dioryClient.js

@@ -20,6 +20,7 @@ class DioryClient {
             this.diograph.resetDiograph();
             await this.getDiograph();
             this.focusDiory({ id: '/' });
+            await this.generateDiograph();
             return this.room;
         };
         this.focusDiory = (dioryObject) => {
@@ -32,21 +33,22 @@ class DioryClient {
                 await Promise.all(connectionClients.map(async (connectionClient) => {
                     const diosphereObject = await connectionClient.getDiosphere();
                     console.info(diosphereObject);
-                    return this.diosphere.initialise(diosphereObject);
+                    return this.diosphere.addDiosphere(diosphereObject);
                 }));
             }
-            return;
+            return this.diosphere;
         };
         this.saveDiosphere = async () => {
             console.info('saveDiosphere', this.connections);
             if (this.connections) {
                 const connectionClients = (0, getConnectionClients_1.getConnectionClients)(this.dataClients, this.connections);
-                await Promise.all(connectionClients.map((connectionClient) => {
+                await Promise.all(connectionClients.map(async (connectionClient) => {
                     console.info(this.diosphere.toObject());
-                    return connectionClient.saveDiosphere(this.diosphere.toObject());
+                    await connectionClient.saveDiosphere(this.diosphere.toObject());
+                    return;
                 }));
             }
-            return;
+            return this.diosphere;
         };
         this.getDiograph = async () => {
             var _a, _b;
@@ -56,22 +58,39 @@ class DioryClient {
                 await Promise.all(connectionClients.map(async (connectionClient) => {
                     const diographObject = await connectionClient.getDiograph();
                     console.info(diographObject);
-                    return this.diograph.initialise(diographObject);
+                    this.diograph.addDiograph(diographObject);
+                    return;
                 }));
             }
-            return;
+            return this.diograph;
         };
         this.saveDiograph = async () => {
             var _a, _b;
             console.info('saveDiograph', (_a = this.room) === null || _a === void 0 ? void 0 : _a.connections);
             if ((_b = this.room) === null || _b === void 0 ? void 0 : _b.connections) {
                 const connectionClients = (0, getConnectionClients_1.getConnectionClients)(this.dataClients, this.room.connections);
-                await Promise.all(connectionClients.map((connectionClient) => {
+                await Promise.all(connectionClients.map(async (connectionClient) => {
                     console.info(this.diograph.toObject());
-                    return connectionClient.saveDiograph(this.diograph.toObject());
+                    await connectionClient.saveDiograph(this.diograph.toObject());
+                    return;
+                }));
+            }
+            return this.diograph;
+        };
+        this.generateDiograph = async () => {
+            var _a, _b, _c;
+            console.info('generateDiograph', (_a = this.room) === null || _a === void 0 ? void 0 : _a.connections);
+            if ((_b = this.room) === null || _b === void 0 ? void 0 : _b.connections) {
+                const connectionClients = (0, getConnectionClients_1.getConnectionClients)(this.dataClients, (_c = this.room) === null || _c === void 0 ? void 0 : _c.connections);
+                await Promise.all(connectionClients.map(async (connectionClient) => {
+                    const diographObject = await connectionClient.generateDiograph();
+                    console.info(diographObject);
+                    this.diograph.addDiograph(diographObject);
+                    await connectionClient.saveDiograph(this.diograph.toObject());
+                    return;
                 }));
             }
-            return;
+            return this.diograph;
         };
         this.dataClients = dataClients;
         this.diosphere = new diosphere_js_1.Diosphere();

package/dist/dioryClient.spec.js

@@ -10,4 +10,9 @@ describe('dioryClient', () => {
             expect(true).toEqual(true);
         });
     });
+    describe('enterRoom()', () => {
+        it('should initialise with connections', () => {
+            expect(true).toEqual(true);
+        });
+    });
 });

package/dist/types.d.ts

@@ -21,6 +21,7 @@ export interface IConnectionClient {
     saveDiosphere: (diosphereObject: IDiosphereObject) => void;
     getDiograph: () => Promise<IDiographObject>;
     saveDiograph: (diographObject: IDiographObject) => void;
+    generateDiograph: () => Promise<IDiographObject>;
 }
 export interface IDioryClient {
     dataClients: IDataClient[];
@@ -32,8 +33,9 @@ export interface IDioryClient {
     initialise: (connections: IConnectionObject[]) => Promise<IDioryClient>;
     enterRoom: (roomObject: IRoomObject) => Promise<IRoom>;
     focusDiory: (dioryObject: IDioryObject) => IDiory;
-    getDiosphere: () => void;
-    saveDiosphere: () => void;
-    getDiograph: () => void;
-    saveDiograph: () => void;
+    getDiosphere: () => Promise<IDiosphere>;
+    saveDiosphere: () => Promise<IDiosphere>;
+    getDiograph: () => Promise<IDiograph>;
+    saveDiograph: () => Promise<IDiograph>;
+    generateDiograph: () => Promise<IDiograph>;
 }

package/package.json

@@ -1,16 +1,21 @@
 {
   "name": "@diory/client-js",
-  "version": "0.1.3",
+  "version": "0.1.5-rc1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Olli-Pekka Pohjola <op@diory.me>, Jouni Alanen <jouni@diory.me>",
   "license": "MIT",
   "dependencies": {
-    "@diograph/diograph": "0.3.0-rc12",
-    "@diory/diosphere-js": "0.2.6-rc1"
+    "@diograph/diograph": "0.3.0-rc14",
+    "@diograph/folder-generator": "^0.2.0-rc1",
+    "@diory/diosphere-js": "0.2.6-rc2",
+    "path-browserify": "^1.0.1",
+    "uuid": "8.3.2"
   },
   "devDependencies": {
     "@types/jest": "^27.4.0",
+    "@types/path-browserify": "^1.0.2",
+    "@types/uuid": "8.3.2",
     "jest": "^27.5.0",
     "prettier": "^2.5.1",
     "ts-jest": "^27.1.3",

package/src/connectionClient.ts

@@ -1,7 +1,13 @@
+import { join } from 'path-browserify'
+import { generateDiograph } from '@diograph/folder-generator'
+
 import { IDiographObject } from '@diograph/diograph'
 import { IConnectionObject, IDiosphereObject } from '@diory/diosphere-js'
 import { IConnectionClient, IDataClient } from './types'
 
+const DIOSPHERE_JSON = 'diosphere.json'
+const DIOGRAPH_JSON = 'diograph.json'
+
 class ConnectionClient implements IConnectionClient {
   type: string
   client: IDataClient
@@ -14,23 +20,32 @@ class ConnectionClient implements IConnectionClient {
   }
 
   getDiosphere = async () => {
-    const diosphereString = await this.client.readTextItem(this.connection.address)
+    const path = join(this.connection.address, DIOSPHERE_JSON)
+    const diosphereString = await this.client.readTextItem(path)
     return JSON.parse(diosphereString)
   }
 
   saveDiosphere = async (diosphereObject: IDiosphereObject) => {
+    const path = join(this.connection.address, DIOSPHERE_JSON)
     const diosphereString = JSON.stringify(diosphereObject, null, 2)
-    return this.client.writeItem(this.connection.address, diosphereString)
+    return this.client.writeItem(path, diosphereString)
   }
 
   getDiograph = async () => {
-    const diographString = await this.client.readTextItem(this.connection.address)
+    const path = join(this.connection.address, DIOGRAPH_JSON)
+    const diographString = await this.client.readTextItem(path)
     return JSON.parse(diographString)
   }
 
   saveDiograph = async (diographObject: IDiographObject) => {
+    const path = join(this.connection.address, DIOGRAPH_JSON)
     const diographString = JSON.stringify(diographObject, null, 2)
-    return this.client.writeItem(this.connection.address, diographString)
+    return this.client.writeItem(path, diographString)
+  }
+
+  generateDiograph = async (): Promise<IDiographObject> => {
+    const { diograph } = await generateDiograph(this.connection.address) // TODO: Client
+    return diograph.toObject()
   }
 }
 

package/src/dioryClient.spec.ts

@@ -10,4 +10,10 @@ describe('dioryClient', () => {
       expect(true).toEqual(true)
     })
   })
+
+  describe('enterRoom()', () => {
+    it('should initialise with connections', () => {
+      expect(true).toEqual(true)
+    })
+  })
 })

package/src/dioryClient.ts

@@ -39,6 +39,8 @@ class DioryClient implements IDioryClient {
     await this.getDiograph()
     this.focusDiory({ id: '/' })
 
+    await this.generateDiograph()
+
     return this.room
   }
 
@@ -46,7 +48,7 @@ class DioryClient implements IDioryClient {
     return (this.diory = this.diograph.getDiory(dioryObject))
   }
 
-  getDiosphere = async (): Promise<void> => {
+  getDiosphere = async (): Promise<IDiosphere> => {
     console.info('getDiosphere', this.connections)
     if (this.connections) {
       const connectionClients = getConnectionClients(this.dataClients, this.connections)
@@ -55,31 +57,32 @@ class DioryClient implements IDioryClient {
         connectionClients.map(async (connectionClient) => {
           const diosphereObject = await connectionClient.getDiosphere()
           console.info(diosphereObject)
-          return this.diosphere.initialise(diosphereObject)
+          return this.diosphere.addDiosphere(diosphereObject)
         }),
       )
     }
 
-    return
+    return this.diosphere
   }
 
-  saveDiosphere = async (): Promise<void> => {
+  saveDiosphere = async (): Promise<IDiosphere> => {
     console.info('saveDiosphere', this.connections)
     if (this.connections) {
       const connectionClients = getConnectionClients(this.dataClients, this.connections)
 
       await Promise.all(
-        connectionClients.map((connectionClient) => {
+        connectionClients.map(async (connectionClient) => {
           console.info(this.diosphere.toObject())
-          return connectionClient.saveDiosphere(this.diosphere.toObject())
+          await connectionClient.saveDiosphere(this.diosphere.toObject())
+          return
         }),
       )
     }
 
-    return
+    return this.diosphere
   }
 
-  getDiograph = async (): Promise<void> => {
+  getDiograph = async (): Promise<IDiograph> => {
     console.info('getDiograph', this.room?.connections)
     if (this.room?.connections) {
       const connectionClients = getConnectionClients(this.dataClients, this.room.connections)
@@ -88,28 +91,50 @@ class DioryClient implements IDioryClient {
         connectionClients.map(async (connectionClient) => {
           const diographObject = await connectionClient.getDiograph()
           console.info(diographObject)
-          return this.diograph.initialise(diographObject)
+          this.diograph.addDiograph(diographObject)
+          return
         }),
       )
     }
 
-    return
+    return this.diograph
   }
 
-  saveDiograph = async (): Promise<void> => {
+  saveDiograph = async (): Promise<IDiograph> => {
     console.info('saveDiograph', this.room?.connections)
     if (this.room?.connections) {
       const connectionClients = getConnectionClients(this.dataClients, this.room.connections)
 
       await Promise.all(
-        connectionClients.map((connectionClient) => {
+        connectionClients.map(async (connectionClient) => {
           console.info(this.diograph.toObject())
-          return connectionClient.saveDiograph(this.diograph.toObject())
+          await connectionClient.saveDiograph(this.diograph.toObject())
+          return
+        }),
+      )
+    }
+
+    return this.diograph
+  }
+
+  generateDiograph = async (): Promise<IDiograph> => {
+    console.info('generateDiograph', this.room?.connections)
+    if (this.room?.connections) {
+      const connectionClients = getConnectionClients(this.dataClients, this.room?.connections)
+
+      await Promise.all(
+        connectionClients.map(async (connectionClient) => {
+          const diographObject = await connectionClient.generateDiograph()
+          console.info(diographObject)
+          this.diograph.addDiograph(diographObject)
+
+          await connectionClient.saveDiograph(this.diograph.toObject())
+          return
         }),
       )
     }
 
-    return
+    return this.diograph
   }
 }
 

package/src/types.ts

@@ -28,6 +28,7 @@ export interface IConnectionClient {
   saveDiosphere: (diosphereObject: IDiosphereObject) => void
   getDiograph: () => Promise<IDiographObject>
   saveDiograph: (diographObject: IDiographObject) => void
+  generateDiograph: () => Promise<IDiographObject>
 }
 
 export interface IDioryClient {
@@ -40,8 +41,9 @@ export interface IDioryClient {
   initialise: (connections: IConnectionObject[]) => Promise<IDioryClient>
   enterRoom: (roomObject: IRoomObject) => Promise<IRoom>
   focusDiory: (dioryObject: IDioryObject) => IDiory
-  getDiosphere: () => void
-  saveDiosphere: () => void
-  getDiograph: () => void
-  saveDiograph: () => void
+  getDiosphere: () => Promise<IDiosphere>
+  saveDiosphere: () => Promise<IDiosphere>
+  getDiograph: () => Promise<IDiograph>
+  saveDiograph: () => Promise<IDiograph>
+  generateDiograph: () => Promise<IDiograph>
 }