@diory/client-js 0.1.4 → 0.2.0-rc1

package/dist/{connectionClient.d.ts → connectionClient/connectionClient.d.ts}

@@ -1,6 +1,6 @@
 import { IDiographObject } from '@diograph/diograph';
 import { IConnectionObject, IDiosphereObject } from '@diory/diosphere-js';
-import { IConnectionClient, IDataClient } from './types';
+import { IConnectionClient, IDataClient } from '../types';
 declare class ConnectionClient implements IConnectionClient {
     type: string;
     client: IDataClient;
@@ -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 → connectionClient/connectionClient.js}

@@ -2,6 +2,7 @@
 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 {
@@ -26,6 +27,10 @@ class ConnectionClient {
             const diographString = JSON.stringify(diographObject, null, 2);
             return this.client.writeItem(path, diographString);
         };
+        this.generateDiograph = async () => {
+            const { diograph } = await (0, folder_generator_1.generateDiograph)(this.connection.address, this.client);
+            return diograph.toObject();
+        };
         this.type = dataClient.type;
         this.client = dataClient;
         this.connection = connection;

package/dist/connectionClient/connectionClient.spec.js

@@ -0,0 +1,18 @@
+"use strict";
+describe('connectionClient', () => {
+    describe('construct()', () => {
+        it('should construct with dataClient and connection', () => {
+            expect(true).toEqual(true);
+        });
+    });
+    describe('getDiosphere()', () => {
+        it('should get diosphere', () => {
+            expect(true).toEqual(true);
+        });
+    });
+    describe('saveDiosphere()', () => {
+        it('should save diosphere object', () => {
+            expect(true).toEqual(true);
+        });
+    });
+});

package/dist/{dioryClient.d.ts → dioryClient/dioryClient.d.ts}

@@ -1,6 +1,6 @@
 import { IConnectionObject, IDiosphere, IRoom, IRoomObject } from '@diory/diosphere-js';
 import { IDiograph, IDiory, IDioryObject } from '@diograph/diograph';
-import { IDataClient, IDioryClient } from './types';
+import { IDioryClient, IDataClient } from '../types';
 declare class DioryClient implements IDioryClient {
     dataClients: IDataClient[];
     connections: IConnectionObject[];
@@ -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 → dioryClient/dioryClient.js}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DioryClient = void 0;
 const diosphere_js_1 = require("@diory/diosphere-js");
 const diograph_1 = require("@diograph/diograph");
-const getConnectionClients_1 = require("./utils/getConnectionClients");
+const getConnectionClients_1 = require("../utils/getConnectionClients");
 class DioryClient {
     constructor(dataClients) {
         this.dataClients = [];
@@ -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 → dioryClient/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/index.d.ts

@@ -1,3 +1,3 @@
-export { DioryClient } from './dioryClient';
-export { ConnectionClient } from './connectionClient';
-export { IDioryClient, IConnectionClient, IDataClient } from './types';
+export { DioryClient } from './dioryClient/dioryClient';
+export { ConnectionClient } from './connectionClient/connectionClient';
+export { IDioryClient } from './types';

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionClient = exports.DioryClient = void 0;
-var dioryClient_1 = require("./dioryClient");
+var dioryClient_1 = require("./dioryClient/dioryClient");
 Object.defineProperty(exports, "DioryClient", { enumerable: true, get: function () { return dioryClient_1.DioryClient; } });
-var connectionClient_1 = require("./connectionClient");
+var connectionClient_1 = require("./connectionClient/connectionClient");
 Object.defineProperty(exports, "ConnectionClient", { enumerable: true, get: function () { return connectionClient_1.ConnectionClient; } });

package/dist/types.d.ts

@@ -1,6 +1,15 @@
 /// <reference types="node" />
 import { IConnectionObject, IDiosphere, IDiosphereObject, IRoom, IRoomObject } from '@diory/diosphere-js';
-import { IDiographObject, IDiograph, IDiory, IDioryObject } from '@diograph/diograph';
+import { IDiograph, IDiographObject, IDiory, IDioryObject } from '@diograph/diograph';
+export interface IMetadata {
+    name: string;
+    created?: string;
+    modified?: string;
+}
+export interface IFileType {
+    ext?: string;
+    mime?: string;
+}
 export interface IDataClient {
     type: string;
     readTextItem(url: string): Promise<string>;
@@ -12,6 +21,10 @@ export interface IDataClient {
     deleteItem(url: string): Promise<boolean>;
     deleteFolder(url: string): Promise<void>;
     list(url: string): Promise<string[]>;
+    getFileNames(url: string): Promise<string[]>;
+    getFolderNames(url: string): Promise<string[]>;
+    getMetadata(url: string): IMetadata;
+    getFileType(url: string): Promise<IFileType>;
 }
 export interface IConnectionClient {
     type: string;
@@ -21,6 +34,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 +46,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/dist/utils/getConnectionClients.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConnectionClients = void 0;
-const connectionClient_1 = require("../connectionClient");
+const connectionClient_1 = require("../connectionClient/connectionClient");
 function getDataClient(dataClients, { client }) {
     return dataClients.find(({ type }) => type === client);
 }

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@diory/client-js",
-  "version": "0.1.4",
+  "version": "0.2.0-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.3.0-rc1",
+    "@diory/diosphere-js": "0.2.6-rc2",
     "path-browserify": "^1.0.1",
     "uuid": "8.3.2"
   },

package/src/connectionClient/connectionClient.spec.ts

@@ -0,0 +1,19 @@
+describe('connectionClient', () => {
+  describe('construct()', () => {
+    it('should construct with dataClient and connection', () => {
+      expect(true).toEqual(true)
+    })
+  })
+
+  describe('getDiosphere()', () => {
+    it('should get diosphere', () => {
+      expect(true).toEqual(true)
+    })
+  })
+
+  describe('saveDiosphere()', () => {
+    it('should save diosphere object', () => {
+      expect(true).toEqual(true)
+    })
+  })
+})

package/src/{connectionClient.ts → connectionClient/connectionClient.ts}

@@ -1,8 +1,9 @@
 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'
+import { IConnectionClient, IDataClient } from '../types'
 
 const DIOSPHERE_JSON = 'diosphere.json'
 const DIOGRAPH_JSON = 'diograph.json'
@@ -41,6 +42,11 @@ class ConnectionClient implements IConnectionClient {
     const diographString = JSON.stringify(diographObject, null, 2)
     return this.client.writeItem(path, diographString)
   }
+
+  generateDiograph = async (): Promise<IDiographObject> => {
+    const { diograph } = await generateDiograph(this.connection.address, this.client)
+    return diograph.toObject()
+  }
 }
 
 export { ConnectionClient }

package/src/{dioryClient.spec.ts → dioryClient/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 → dioryClient/dioryClient.ts}

@@ -1,8 +1,8 @@
 import { Diosphere, IConnectionObject, IDiosphere, IRoom, IRoomObject } from '@diory/diosphere-js'
 import { Diograph, IDiograph, IDiory, IDioryObject } from '@diograph/diograph'
 
-import { IDataClient, IDioryClient } from './types'
-import { getConnectionClients } from './utils/getConnectionClients'
+import { IDioryClient, IDataClient } from '../types'
+import { getConnectionClients } from '../utils/getConnectionClients'
 
 class DioryClient implements IDioryClient {
   dataClients: IDataClient[] = []
@@ -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/index.ts

@@ -1,3 +1,3 @@
-export { DioryClient } from './dioryClient'
-export { ConnectionClient } from './connectionClient'
-export { IDioryClient, IConnectionClient, IDataClient } from './types'
+export { DioryClient } from './dioryClient/dioryClient'
+export { ConnectionClient } from './connectionClient/connectionClient'
+export { IDioryClient } from './types'

package/src/types.ts

@@ -5,7 +5,18 @@ import {
   IRoom,
   IRoomObject,
 } from '@diory/diosphere-js'
-import { IDiographObject, IDiograph, IDiory, IDioryObject } from '@diograph/diograph'
+import { IDiograph, IDiographObject, IDiory, IDioryObject } from '@diograph/diograph'
+
+export interface IMetadata {
+  name: string
+  created?: string
+  modified?: string
+}
+
+export interface IFileType {
+  ext?: string
+  mime?: string
+}
 
 export interface IDataClient {
   type: string
@@ -18,6 +29,10 @@ export interface IDataClient {
   deleteItem(url: string): Promise<boolean>
   deleteFolder(url: string): Promise<void>
   list(url: string): Promise<string[]>
+  getFileNames(url: string): Promise<string[]>
+  getFolderNames(url: string): Promise<string[]>
+  getMetadata(url: string): IMetadata
+  getFileType(url: string): Promise<IFileType>
 }
 
 export interface IConnectionClient {
@@ -28,6 +43,7 @@ export interface IConnectionClient {
   saveDiosphere: (diosphereObject: IDiosphereObject) => void
   getDiograph: () => Promise<IDiographObject>
   saveDiograph: (diographObject: IDiographObject) => void
+  generateDiograph: () => Promise<IDiographObject>
 }
 
 export interface IDioryClient {
@@ -40,8 +56,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/src/utils/getConnectionClients.ts

@@ -1,7 +1,7 @@
 import { IConnectionObject } from '@diory/diosphere-js'
 
+import { ConnectionClient } from '../connectionClient/connectionClient'
 import { IConnectionClient, IDataClient } from '../types'
-import { ConnectionClient } from '../connectionClient'
 
 function getDataClient(
   dataClients: IDataClient[],