@diory/client-js 0.4.0-rc1 → 0.4.0-rc2

package/README.md

@@ -12,7 +12,8 @@ yarn add @diory/client-js
 
 ```
 const clients = [localClient, S3Client, ...]
-const { diosphere, room, diograph, diory } = DioryClient(clients)
+const dioryClient = DioryClient(clients)
+dioryClient.initialiseDiosphere([connections])
 diosphere.initialise([connection])
 diosphere.enterRoom(room)
 diograph.focusDiory(diory)

package/dist/connectionClient/connectionClient.d.ts

@@ -1,16 +1,17 @@
-import { IDiographObject } from '@diograph/diograph';
-import { IConnectionObject, IDiosphereObject } from '@diory/diosphere-js';
-import { IDataClient } from '@diograph/local-client';
-import { IConnectionClient } from '../types';
+import { IDiographObject } from '@diograph/diograph'
+import { IConnectionObject, IDiosphereObject } from '@diory/diosphere-js'
+import { IDataClient } from '@diograph/local-client'
+import { IConnectionClient } from '../types'
 declare class ConnectionClient implements IConnectionClient {
-    type: string;
-    client: IDataClient;
-    connection: IConnectionObject;
-    constructor(dataClient: IDataClient, connection: IConnectionObject);
-    getDiosphere: () => Promise<any>;
-    saveDiosphere: (diosphereObject: IDiosphereObject) => Promise<boolean>;
-    getDiograph: () => Promise<any>;
-    saveDiograph: (diographObject: IDiographObject) => Promise<boolean>;
-    generateDiograph: () => Promise<IDiographObject>;
+  dataClients: IDataClient[]
+  connections: IConnectionObject[]
+  constructor(dataClients: IDataClient[])
+  initialiseConnections: (connections?: IConnectionObject[]) => IConnectionClient
+  findDataClient: ({ client }: IConnectionObject) => IDataClient | undefined
+  getDiosphere: () => Promise<IDiosphereObject | undefined>
+  saveDiosphere: (diosphereObject: IDiosphereObject) => Promise<void>
+  getDiograph: () => Promise<IDiographObject | undefined>
+  saveDiograph: (diographObject: IDiographObject) => Promise<void>
+  generateDiograph: () => Promise<IDiographObject>
 }
-export { ConnectionClient };
+export { ConnectionClient }

package/dist/connectionClient/connectionClient.js

@@ -1,39 +1,95 @@
-"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';
+'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 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(path, diosphereString);
-        };
-        this.getDiograph = async () => {
-            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(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;
+  constructor(dataClients) {
+    this.connections = []
+    this.initialiseConnections = (connections = []) => {
+      this.connections = connections
+      return this
     }
+    this.findDataClient = ({ client }) => {
+      return this.dataClients.find(({ type }) => type === client)
+    }
+    this.getDiosphere = async () => {
+      let diosphereObject
+      await Promise.all(
+        this.connections.map(async (connection) => {
+          const client = this.findDataClient(connection)
+          if (client) {
+            const path = (0, path_browserify_1.join)(connection.address, DIOSPHERE_JSON)
+            const diosphereString = await client.readTextItem(path)
+            diosphereObject = JSON.parse(diosphereString)
+          }
+        }),
+      )
+      // @ts-ignore
+      return diosphereObject
+    }
+    this.saveDiosphere = async (diosphereObject) => {
+      await Promise.all(
+        this.connections.map(async (connection) => {
+          const client = this.findDataClient(connection)
+          if (client) {
+            const path = (0, path_browserify_1.join)(connection.address, DIOSPHERE_JSON)
+            const diosphereString = JSON.stringify(diosphereObject, null, 2)
+            return client.writeItem(path, diosphereString)
+          }
+        }),
+      )
+      return
+    }
+    this.getDiograph = async () => {
+      let diographObject
+      await Promise.all(
+        this.connections.map(async (connection) => {
+          const client = this.findDataClient(connection)
+          if (client) {
+            const path = (0, path_browserify_1.join)(connection.address, DIOGRAPH_JSON)
+            const diographString = await client.readTextItem(path)
+            diographObject = JSON.parse(diographString)
+          }
+        }),
+      )
+      // @ts-ignore
+      return diographObject
+    }
+    this.saveDiograph = async (diographObject) => {
+      await Promise.all(
+        this.connections.map(async (connection) => {
+          const client = this.findDataClient(connection)
+          if (client) {
+            const path = (0, path_browserify_1.join)(connection.address, DIOGRAPH_JSON)
+            const diosphereString = JSON.stringify(diographObject, null, 2)
+            return client.writeItem(path, diosphereString)
+          }
+        }),
+      )
+      return
+    }
+    this.generateDiograph = async () => {
+      let diographObject
+      await Promise.all(
+        this.connections.map(async (connection) => {
+          const client = this.findDataClient(connection)
+          if (client) {
+            const { diograph } = await (0, folder_generator_1.generateDiograph)(
+              connection.address,
+              client,
+            )
+            diographObject = diograph.toObject()
+            return
+          }
+        }),
+      )
+      // @ts-ignore
+      return diographObject
+    }
+    this.dataClients = dataClients
+  }
 }
-exports.ConnectionClient = ConnectionClient;
+exports.ConnectionClient = ConnectionClient

package/dist/connectionClient/connectionClient.spec.js

@@ -1,18 +1,18 @@
-"use strict";
+'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);
-        });
-    });
-});
+  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/addDefaultDiograph.d.ts

@@ -0,0 +1,2 @@
+import { IDiograph } from '@diograph/diograph'
+export declare const addDefaultDiograph: (diograph: IDiograph) => void

package/dist/dioryClient/addDefaultDiograph.js

@@ -0,0 +1,17 @@
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+exports.addDefaultDiograph = void 0
+const addDefaultDiograph = (diograph) => {
+  const diory = diograph.addDiory({
+    text: 'Welcome to Diory',
+    latlng: '60.01366036242365, 20.007133483886722',
+  })
+  diograph.addDiory(
+    {
+      text: 'Root diory',
+      links: [{ id: diory.id }],
+    },
+    '/',
+  )
+}
+exports.addDefaultDiograph = addDefaultDiograph

package/dist/dioryClient/addDefaultRoom.d.ts

@@ -0,0 +1,5 @@
+import { IConnectionObject, IDiosphere } from '@diory/diosphere-js'
+export declare const addDefaultRoom: (
+  diosphere: IDiosphere,
+  connections: IConnectionObject[],
+) => void

package/dist/dioryClient/addDefaultRoom.js

@@ -0,0 +1,13 @@
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+exports.addDefaultRoom = void 0
+const addDefaultRoom = (diosphere, connections) => {
+  diosphere.addRoom(
+    {
+      text: 'Home room',
+      connections,
+    },
+    '/',
+  )
+}
+exports.addDefaultRoom = addDefaultRoom

package/dist/dioryClient/dioryClient.d.ts

@@ -1,26 +1,16 @@
-import { IConnectionObject, IDiosphere, IDiosphereObject, IRoom, IRoomObject } from '@diory/diosphere-js';
-import { IDiograph, IDiographObject, IDiory, IDioryObject } from '@diograph/diograph';
+import { IConnectionObject, IDiosphere, IRoom, IRoomObject } from '@diory/diosphere-js';
+import { IDiograph, IDiory, IDioryObject } from '@diograph/diograph';
 import { IDataClient } from '@diograph/local-client';
 import { IDioryClient } from '../types';
 declare class DioryClient implements IDioryClient {
-    dataClients: IDataClient[];
-    connections: IConnectionObject[];
     diosphere: IDiosphere;
-    room?: IRoom;
     diograph: IDiograph;
+    room?: IRoom;
     diory?: IDiory;
     constructor(dataClients: IDataClient[]);
-    focusDiory: (dioryObject: IDioryObject) => IDiory;
-    selectRoom: (roomObject: IRoomObject) => IRoom;
-    getDiographClients: (connections?: IConnectionObject[]) => import("../types").IConnectionClient[];
-    initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>;
-    getDiograph: () => Promise<IDiographObject | undefined>;
-    saveDiograph: () => Promise<IDiographObject>;
-    importDiograph: (connections?: IConnectionObject[]) => Promise<IDiograph>;
-    generateDiograph: (connections?: IConnectionObject[]) => Promise<IDiographObject | undefined>;
-    getDiosphereClients: (connections?: IConnectionObject[]) => import("../types").IConnectionClient[];
     initialiseDiosphere: (connections: IConnectionObject[]) => Promise<IDiosphere>;
-    getDiosphere: () => Promise<IDiosphereObject | undefined>;
-    saveDiosphere: () => Promise<IDiosphereObject>;
+    initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>;
+    selectRoom: (roomObject: IRoomObject) => IRoom;
+    focusDiory: (dioryObject: IDioryObject) => IDiory;
 }
 export { DioryClient };

package/dist/dioryClient/dioryClient.js

@@ -3,132 +3,43 @@ 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 debounce_1 = require("../utils/debounce");
-const getDefaultDiosphere_1 = require("./getDefaultDiosphere");
-const getDefaultDiograph_1 = require("./getDefaultDiograph");
+const local_client_1 = require("@diograph/local-client");
+const addDefaultRoom_1 = require("../utils/addDefaultRoom");
+const addDefaultDiograph_1 = require("../utils/addDefaultDiograph");
 class DioryClient {
     constructor(dataClients) {
-        this.dataClients = [];
-        this.connections = [];
-        this.focusDiory = (dioryObject) => {
-            return (this.diory = this.diograph.getDiory(dioryObject));
-        };
-        this.selectRoom = (roomObject) => {
-            return (this.room = this.diosphere.getRoom(roomObject));
-        };
-        this.getDiographClients = (connections) => {
-            var _a;
-            return (0, getConnectionClients_1.getConnectionClients)(this.dataClients, connections !== null && connections !== void 0 ? connections : (_a = this.room) === null || _a === void 0 ? void 0 : _a.connections);
+        this.initialiseDiosphere = async (connections) => {
+            console.info('initialiseDiosphere: connections', connections);
+            this.diosphere.initialise(connections);
+            await this.diosphere.getDiosphere();
+            if (!Object.keys(this.diosphere.rooms)) {
+                (0, addDefaultRoom_1.addDefaultRoom)(this.diosphere, connections);
+            }
+            this.selectRoom({ id: '/' });
+            return this.diosphere;
         };
         this.initialiseDiograph = async (roomObject) => {
-            var _a;
+            var _a, _b;
             console.info('initialiseDiograph: room', roomObject);
             this.selectRoom(roomObject);
-            this.diograph.resetDiograph();
-            const diographObject = (_a = (await this.getDiograph())) !== null && _a !== void 0 ? _a : (0, getDefaultDiograph_1.getDefaultDiograph)();
-            this.diograph.addDiograph(diographObject);
-            this.focusDiory({ id: '/' });
-            return this.diograph;
-        };
-        this.getDiograph = async () => {
-            console.info('getDiograph');
-            let diographObject;
-            await Promise.all(this.getDiographClients().map(async (connectionClient) => {
-                try {
-                    diographObject = await connectionClient.getDiograph();
-                    console.info(diographObject);
-                }
-                catch (error) {
-                    console.error(error);
+            if ((_a = this.room) === null || _a === void 0 ? void 0 : _a.connections) {
+                this.diograph.initialise((_b = this.room) === null || _b === void 0 ? void 0 : _b.connections);
+                await this.diograph.getDiograph();
+                if (!Object.keys(this.diograph.diograph)) {
+                    (0, addDefaultDiograph_1.addDefaultDiograph)(this.diograph);
                 }
-                return;
-            }));
-            return diographObject;
-        };
-        this.saveDiograph = async () => {
-            console.info('saveDiograph');
-            const diographObject = this.diograph.toObject();
-            await Promise.all(this.getDiographClients().map(async (connectionClient) => {
-                await connectionClient.saveDiograph(diographObject);
-                console.info(diographObject);
-                return;
-            }));
-            return diographObject;
-        };
-        this.importDiograph = async (connections) => {
-            var _a;
-            const diographObject = await this.generateDiograph(connections);
-            if (diographObject) {
-                const diory = (_a = this.diory) === null || _a === void 0 ? void 0 : _a.toObject();
-                Object.entries(diographObject).forEach(([key, dioryObject]) => {
-                    try {
-                        key === '/' && diory
-                            ? this.diograph.addDioryLink(diory, diographObject['/'])
-                            : this.diograph.addDiory(dioryObject);
-                    }
-                    catch (error) {
-                        console.error(error);
-                    }
-                });
-                await this.saveDiograph();
-                console.info(this.diograph.toObject());
+                this.focusDiory({ id: '/' });
             }
             return this.diograph;
         };
-        this.generateDiograph = async (connections) => {
-            console.info('generateDiograph', connections);
-            let diographObject;
-            await Promise.all(this.getDiographClients(connections).map(async (connectionClient) => {
-                diographObject = await connectionClient.generateDiograph();
-                console.info(diographObject);
-                return;
-            }));
-            return diographObject;
-        };
-        this.getDiosphereClients = (connections) => {
-            return (0, getConnectionClients_1.getConnectionClients)(this.dataClients, connections !== null && connections !== void 0 ? connections : this.connections);
-        };
-        this.initialiseDiosphere = async (connections) => {
-            var _a;
-            console.info('initialiseDiosphere: connections', connections);
-            this.connections = connections;
-            this.diosphere.resetRooms();
-            const diosphereObject = (_a = (await this.getDiosphere())) !== null && _a !== void 0 ? _a : (0, getDefaultDiosphere_1.getDefaultDiosphere)(connections);
-            this.diosphere.addDiosphere(diosphereObject);
-            this.selectRoom({ id: '/' });
-            return this.diosphere;
-        };
-        this.getDiosphere = async () => {
-            console.info('getDiosphere');
-            let diosphereObject;
-            await Promise.all(this.getDiosphereClients().map(async (connectionClient) => {
-                try {
-                    diosphereObject = await connectionClient.getDiosphere();
-                    console.info(diosphereObject);
-                }
-                catch (error) {
-                    console.error(error);
-                }
-                return;
-            }));
-            return diosphereObject;
+        this.selectRoom = (roomObject) => {
+            return (this.room = this.diosphere.getRoom(roomObject));
         };
-        this.saveDiosphere = async () => {
-            console.info('saveDiosphere');
-            const diosphereObject = this.diosphere.toObject();
-            await Promise.all(this.getDiosphereClients().map(async (connectionClient) => {
-                await connectionClient.saveDiosphere(diosphereObject);
-                console.info(diosphereObject);
-                return;
-            }));
-            return diosphereObject;
+        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();
-        this.diosphere.saveDiosphere = (0, debounce_1.debounce)(this.saveDiosphere, 1000);
-        this.diograph.saveDiograph = (0, debounce_1.debounce)(this.saveDiograph, 1000);
+        this.diosphere = new diosphere_js_1.Diosphere(new local_client_1.ConnectionClient(dataClients));
+        this.diograph = new diograph_1.Diograph(new local_client_1.ConnectionClient(dataClients));
     }
 }
 exports.DioryClient = DioryClient;

package/dist/dioryClient/getDefaultDiograph.d.ts

@@ -1,2 +1,2 @@
-import { IDiographObject } from '@diograph/diograph';
-export declare const getDefaultDiograph: () => IDiographObject;
+import { IDiographObject } from '@diograph/diograph'
+export declare const getDefaultDiograph: () => IDiographObject

package/dist/dioryClient/getDefaultDiograph.js

@@ -1,17 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultDiograph = void 0;
-const diograph_1 = require("@diograph/diograph");
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+exports.getDefaultDiograph = void 0
+const diograph_1 = require('@diograph/diograph')
 const getDefaultDiograph = () => {
-    const diograph = new diograph_1.Diograph();
-    const diory = diograph.addDiory({
-        text: 'Welcome to Diory',
-        latlng: '60.01366036242365, 20.007133483886722',
-    });
-    diograph.addDiory({
-        text: 'Root',
-        links: [{ id: diory.id }],
-    }, '/');
-    return diograph.toObject();
-};
-exports.getDefaultDiograph = getDefaultDiograph;
+  const diograph = new diograph_1.Diograph()
+  const diory = diograph.addDiory({
+    text: 'Welcome to Diory',
+    latlng: '60.01366036242365, 20.007133483886722',
+  })
+  diograph.addDiory(
+    {
+      text: 'Root',
+      links: [{ id: diory.id }],
+    },
+    '/',
+  )
+  return diograph.toObject()
+}
+exports.getDefaultDiograph = getDefaultDiograph

package/dist/dioryClient/getDefaultDiosphere.d.ts

@@ -1,2 +1,2 @@
-import { IConnectionObject, IDiosphereObject } from '@diory/diosphere-js';
-export declare const getDefaultDiosphere: (connections: IConnectionObject[]) => IDiosphereObject;
+import { IConnectionObject, IDiosphereObject } from '@diory/diosphere-js'
+export declare const getDefaultDiosphere: (connections: IConnectionObject[]) => IDiosphereObject

package/dist/dioryClient/getDefaultDiosphere.js

@@ -1,13 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultDiosphere = void 0;
-const diosphere_js_1 = require("@diory/diosphere-js");
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+exports.getDefaultDiosphere = void 0
+const diosphere_js_1 = require('@diory/diosphere-js')
 const getDefaultDiosphere = (connections) => {
-    const diosphere = new diosphere_js_1.Diosphere();
-    diosphere.addRoom({
-        text: 'Room',
-        connections,
-    }, '/');
-    return diosphere.toObject();
-};
-exports.getDefaultDiosphere = getDefaultDiosphere;
+  const diosphere = new diosphere_js_1.Diosphere()
+  diosphere.addRoom(
+    {
+      text: 'Room',
+      connections,
+    },
+    '/',
+  )
+  return diosphere.toObject()
+}
+exports.getDefaultDiosphere = getDefaultDiosphere

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/types.d.ts

@@ -1,31 +1,12 @@
-import { IConnectionObject, IDiosphere, IDiosphereObject, IRoom, IRoomObject } from '@diory/diosphere-js';
-import { IDiograph, IDiographObject, IDiory, IDioryObject } from '@diograph/diograph';
-import { IDataClient } from '@diograph/local-client';
-export interface IConnectionClient {
-    type: string;
-    client: IDataClient;
-    connection: IConnectionObject;
-    getDiosphere: () => Promise<IDiosphereObject>;
-    saveDiosphere: (diosphereObject: IDiosphereObject) => void;
-    getDiograph: () => Promise<IDiographObject>;
-    saveDiograph: (diographObject: IDiographObject) => void;
-    generateDiograph: () => Promise<IDiographObject>;
-}
+import { IConnectionObject, IDiosphere, IRoom, IRoomObject } from '@diory/diosphere-js';
+import { IDiograph, IDiory, IDioryObject } from '@diograph/diograph';
 export interface IDioryClient {
-    dataClients: IDataClient[];
-    connections: IConnectionObject[];
-    diory?: IDiory;
-    focusDiory: (dioryObject: IDioryObject) => IDiory;
-    room?: IRoom;
-    selectRoom: (roomObject: IRoomObject) => IRoom;
-    diograph: IDiograph;
-    initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>;
-    getDiograph: () => Promise<IDiographObject | undefined>;
-    saveDiograph: () => Promise<IDiographObject>;
-    importDiograph: (connections?: IConnectionObject[]) => Promise<IDiograph>;
-    generateDiograph: (connections?: IConnectionObject[]) => Promise<IDiographObject | undefined>;
     diosphere: IDiosphere;
+    diograph: IDiograph;
+    room?: IRoom;
+    diory?: IDiory;
     initialiseDiosphere: (connections: IConnectionObject[]) => Promise<IDiosphere>;
-    getDiosphere: () => Promise<IDiosphereObject | undefined>;
-    saveDiosphere: () => Promise<IDiosphereObject>;
+    initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>;
+    selectRoom: (roomObject: IRoomObject) => IRoom;
+    focusDiory: (dioryObject: IDioryObject) => IDiory;
 }

package/dist/utils/addDefaultDiograph.d.ts

@@ -0,0 +1,2 @@
+import { IDiograph } from '@diograph/diograph';
+export declare const addDefaultDiograph: (diograph: IDiograph) => void;

package/dist/utils/addDefaultDiograph.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addDefaultDiograph = void 0;
+const addDefaultDiograph = (diograph) => {
+    const diory = diograph.addDiory({
+        text: 'Welcome to Diory',
+        latlng: '60.01366036242365, 20.007133483886722',
+    });
+    diograph.addDiory({
+        text: 'Root diory',
+        links: [{ id: diory.id }],
+    }, '/');
+};
+exports.addDefaultDiograph = addDefaultDiograph;

package/dist/utils/addDefaultRoom.d.ts

@@ -0,0 +1,2 @@
+import { IConnectionObject, IDiosphere } from '@diory/diosphere-js';
+export declare const addDefaultRoom: (diosphere: IDiosphere, connections: IConnectionObject[]) => void;

package/dist/utils/addDefaultRoom.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addDefaultRoom = void 0;
+const addDefaultRoom = (diosphere, connections) => {
+    diosphere.addRoom({
+        text: 'Home room',
+        connections,
+    }, '/');
+};
+exports.addDefaultRoom = addDefaultRoom;

package/dist/utils/getConnectionClients.d.ts

@@ -1,4 +1,7 @@
-import { IConnectionObject } from '@diory/diosphere-js';
-import { IDataClient } from '@diograph/local-client';
-import { IConnectionClient } from '../types';
-export declare function getConnectionClients(dataClients: IDataClient[], connections?: IConnectionObject[]): IConnectionClient[];
+import { IConnectionObject } from '@diory/diosphere-js'
+import { IDataClient } from '@diograph/local-client'
+import { IConnectionClient } from '../types'
+export declare function getConnectionClients(
+  dataClients: IDataClient[],
+  connections?: IConnectionObject[],
+): IConnectionClient[]

package/dist/utils/getConnectionClients.js

@@ -1,16 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConnectionClients = void 0;
-const connectionClient_1 = require("../connectionClient/connectionClient");
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+exports.getConnectionClients = void 0
+const connectionClient_1 = require('../connectionClient/connectionClient')
 function getDataClient(dataClients, { client }) {
-    return dataClients.find(({ type }) => type === client);
+  return dataClients.find(({ type }) => type === client)
 }
 function getConnectionClients(dataClients, connections = []) {
-    return connections
-        .filter(({ client }) => dataClients.some(({ type }) => type === client))
-        .map((connection) => {
-        const dataClient = getDataClient(dataClients, connection);
-        return new connectionClient_1.ConnectionClient(dataClient, connection);
-    });
+  return connections
+    .filter(({ client }) => dataClients.some(({ type }) => type === client))
+    .map((connection) => {
+      const dataClient = getDataClient(dataClients, connection)
+      return new connectionClient_1.ConnectionClient(dataClient, connection)
+    })
 }
-exports.getConnectionClients = getConnectionClients;
+exports.getConnectionClients = getConnectionClients

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@diory/client-js",
-  "version": "0.4.0-rc1",
+  "version": "0.4.0-rc2",
   "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",
+    "@diograph/diograph": "^0.4.0-rc1",
     "@diograph/folder-generator": "^0.4.0-rc1",
-    "@diograph/local-client": "^0.3.2",
-    "@diory/diosphere-js": "^0.2.6",
+    "@diograph/local-client": "^0.4.0-rc3",
+    "@diory/diosphere-js": "^0.4.0-rc1",
     "path-browserify": "^1.0.1",
     "uuid": "8.3.2"
   },

package/src/dioryClient/dioryClient.ts

@@ -1,186 +1,62 @@
-import {
-  Diosphere,
-  IConnectionObject,
-  IDiosphere,
-  IDiosphereObject,
-  IRoom,
-  IRoomObject,
-} from '@diory/diosphere-js'
-import { Diograph, IDiograph, IDiographObject, IDiory, IDioryObject } from '@diograph/diograph'
-import { IDataClient } from '@diograph/local-client'
+import { Diosphere, IConnectionObject, IDiosphere, IRoom, IRoomObject } from '@diory/diosphere-js'
+import { Diograph, IDiograph, IDiory, IDioryObject } from '@diograph/diograph'
+import { IDataClient, ConnectionClient } from '@diograph/local-client'
 
 import { IDioryClient } from '../types'
-import { getConnectionClients } from '../utils/getConnectionClients'
-import { debounce } from '../utils/debounce'
 
-import { getDefaultDiosphere } from './getDefaultDiosphere'
-import { getDefaultDiograph } from './getDefaultDiograph'
+import { addDefaultRoom } from '../utils/addDefaultRoom'
+import { addDefaultDiograph } from '../utils/addDefaultDiograph'
 
 class DioryClient implements IDioryClient {
-  dataClients: IDataClient[] = []
-  connections: IConnectionObject[] = []
   diosphere: IDiosphere
-  room?: IRoom
   diograph: IDiograph
+  room?: IRoom
   diory?: IDiory
 
   constructor(dataClients: IDataClient[]) {
-    this.dataClients = dataClients
+    this.diosphere = new Diosphere(new ConnectionClient(dataClients))
+    this.diograph = new Diograph(new ConnectionClient(dataClients))
+  }
 
-    this.diosphere = new Diosphere()
-    this.diograph = new Diograph()
+  initialiseDiosphere = async (connections: IConnectionObject[]): Promise<IDiosphere> => {
+    console.info('initialiseDiosphere: connections', connections)
 
-    this.diosphere.saveDiosphere = debounce(this.saveDiosphere, 1000)
-    this.diograph.saveDiograph = debounce(this.saveDiograph, 1000)
-  }
+    this.diosphere.initialise(connections)
+    await this.diosphere.getDiosphere()
 
-  focusDiory = (dioryObject: IDioryObject): IDiory => {
-    return (this.diory = this.diograph.getDiory(dioryObject))
-  }
+    if (!Object.keys(this.diosphere.rooms)) {
+      addDefaultRoom(this.diosphere, connections)
+    }
 
-  selectRoom = (roomObject: IRoomObject): IRoom => {
-    return (this.room = this.diosphere.getRoom(roomObject))
-  }
+    this.selectRoom({ id: '/' })
 
-  getDiographClients = (connections?: IConnectionObject[]) => {
-    return getConnectionClients(this.dataClients, connections ?? this.room?.connections)
+    return this.diosphere
   }
 
   initialiseDiograph = async (roomObject: IRoomObject): Promise<IDiograph> => {
     console.info('initialiseDiograph: room', roomObject)
     this.selectRoom(roomObject)
 
-    this.diograph.resetDiograph()
-    const diographObject = (await this.getDiograph()) ?? getDefaultDiograph()
-    this.diograph.addDiograph(diographObject)
-
-    this.focusDiory({ id: '/' })
-
-    return this.diograph
-  }
-
-  getDiograph = async (): Promise<IDiographObject | undefined> => {
-    console.info('getDiograph')
-
-    let diographObject
-    await Promise.all(
-      this.getDiographClients().map(async (connectionClient) => {
-        try {
-          diographObject = await connectionClient.getDiograph()
-          console.info(diographObject)
-        } catch (error) {
-          console.error(error)
-        }
-        return
-      }),
-    )
-
-    return diographObject
-  }
-
-  saveDiograph = async (): Promise<IDiographObject> => {
-    console.info('saveDiograph')
+    if (this.room?.connections) {
+      this.diograph.initialise(this.room?.connections)
+      await this.diograph.getDiograph()
 
-    const diographObject = this.diograph.toObject()
-    await Promise.all(
-      this.getDiographClients().map(async (connectionClient) => {
-        await connectionClient.saveDiograph(diographObject)
-        console.info(diographObject)
-        return
-      }),
-    )
+      if (!Object.keys(this.diograph.diograph)) {
+        addDefaultDiograph(this.diograph)
+      }
 
-    return diographObject
-  }
-
-  importDiograph = async (connections?: IConnectionObject[]): Promise<IDiograph> => {
-    const diographObject = await this.generateDiograph(connections)
-
-    if (diographObject) {
-      const diory = this.diory?.toObject()
-      Object.entries(diographObject).forEach(([key, dioryObject]) => {
-        try {
-          key === '/' && diory
-            ? this.diograph.addDioryLink(diory, diographObject['/'])
-            : this.diograph.addDiory(dioryObject)
-        } catch (error) {
-          console.error(error)
-        }
-      })
-
-      await this.saveDiograph()
-      console.info(this.diograph.toObject())
+      this.focusDiory({ id: '/' })
     }
 
     return this.diograph
   }
 
-  generateDiograph = async (
-    connections?: IConnectionObject[],
-  ): Promise<IDiographObject | undefined> => {
-    console.info('generateDiograph', connections)
-
-    let diographObject
-    await Promise.all(
-      this.getDiographClients(connections).map(async (connectionClient) => {
-        diographObject = await connectionClient.generateDiograph()
-        console.info(diographObject)
-        return
-      }),
-    )
-
-    return diographObject
-  }
-
-  getDiosphereClients = (connections?: IConnectionObject[]) => {
-    return getConnectionClients(this.dataClients, connections ?? this.connections)
-  }
-
-  initialiseDiosphere = async (connections: IConnectionObject[]): Promise<IDiosphere> => {
-    console.info('initialiseDiosphere: connections', connections)
-    this.connections = connections
-
-    this.diosphere.resetRooms()
-    const diosphereObject = (await this.getDiosphere()) ?? getDefaultDiosphere(connections)
-    this.diosphere.addDiosphere(diosphereObject)
-
-    this.selectRoom({ id: '/' })
-
-    return this.diosphere
-  }
-
-  getDiosphere = async (): Promise<IDiosphereObject | undefined> => {
-    console.info('getDiosphere')
-
-    let diosphereObject
-    await Promise.all(
-      this.getDiosphereClients().map(async (connectionClient) => {
-        try {
-          diosphereObject = await connectionClient.getDiosphere()
-          console.info(diosphereObject)
-        } catch (error) {
-          console.error(error)
-        }
-        return
-      }),
-    )
-
-    return diosphereObject
+  selectRoom = (roomObject: IRoomObject): IRoom => {
+    return (this.room = this.diosphere.getRoom(roomObject))
   }
 
-  saveDiosphere = async (): Promise<IDiosphereObject> => {
-    console.info('saveDiosphere')
-
-    const diosphereObject = this.diosphere.toObject()
-    await Promise.all(
-      this.getDiosphereClients().map(async (connectionClient) => {
-        await connectionClient.saveDiosphere(diosphereObject)
-        console.info(diosphereObject)
-        return
-      }),
-    )
-
-    return diosphereObject
+  focusDiory = (dioryObject: IDioryObject): IDiory => {
+    return (this.diory = this.diograph.getDiory(dioryObject))
   }
 }
 

package/src/index.ts

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

package/src/types.ts

@@ -1,39 +1,13 @@
-import {
-  IConnectionObject,
-  IDiosphere,
-  IDiosphereObject,
-  IRoom,
-  IRoomObject,
-} from '@diory/diosphere-js'
-import { IDiograph, IDiographObject, IDiory, IDioryObject } from '@diograph/diograph'
-import { IDataClient } from '@diograph/local-client'
-
-export interface IConnectionClient {
-  type: string
-  client: IDataClient
-  connection: IConnectionObject
-  getDiosphere: () => Promise<IDiosphereObject>
-  saveDiosphere: (diosphereObject: IDiosphereObject) => void
-  getDiograph: () => Promise<IDiographObject>
-  saveDiograph: (diographObject: IDiographObject) => void
-  generateDiograph: () => Promise<IDiographObject>
-}
+import { IConnectionObject, IDiosphere, IRoom, IRoomObject } from '@diory/diosphere-js'
+import { IDiograph, IDiory, IDioryObject } from '@diograph/diograph'
 
 export interface IDioryClient {
-  dataClients: IDataClient[]
-  connections: IConnectionObject[]
-  diory?: IDiory
-  focusDiory: (dioryObject: IDioryObject) => IDiory
-  room?: IRoom
-  selectRoom: (roomObject: IRoomObject) => IRoom
-  diograph: IDiograph
-  initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>
-  getDiograph: () => Promise<IDiographObject | undefined>
-  saveDiograph: () => Promise<IDiographObject>
-  importDiograph: (connections?: IConnectionObject[]) => Promise<IDiograph>
-  generateDiograph: (connections?: IConnectionObject[]) => Promise<IDiographObject | undefined>
   diosphere: IDiosphere
+  diograph: IDiograph
+  room?: IRoom
+  diory?: IDiory
   initialiseDiosphere: (connections: IConnectionObject[]) => Promise<IDiosphere>
-  getDiosphere: () => Promise<IDiosphereObject | undefined>
-  saveDiosphere: () => Promise<IDiosphereObject>
+  initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>
+  selectRoom: (roomObject: IRoomObject) => IRoom
+  focusDiory: (dioryObject: IDioryObject) => IDiory
 }

package/src/{dioryClient/getDefaultDiograph.ts → utils/addDefaultDiograph.ts}

@@ -1,18 +1,15 @@
-import { Diograph, IDiographObject } from '@diograph/diograph'
+import { IDiograph } from '@diograph/diograph'
 
-export const getDefaultDiograph = (): IDiographObject => {
-  const diograph = new Diograph()
+export const addDefaultDiograph = (diograph: IDiograph): void => {
   const diory = diograph.addDiory({
     text: 'Welcome to Diory',
     latlng: '60.01366036242365, 20.007133483886722',
   })
   diograph.addDiory(
     {
-      text: 'Root',
+      text: 'Root diory',
       links: [{ id: diory.id }],
     },
     '/',
   )
-
-  return diograph.toObject()
 }

package/src/utils/addDefaultRoom.ts

@@ -0,0 +1,11 @@
+import { IConnectionObject, IDiosphere } from '@diory/diosphere-js'
+
+export const addDefaultRoom = (diosphere: IDiosphere, connections: IConnectionObject[]): void => {
+  diosphere.addRoom(
+    {
+      text: 'Home room',
+      connections,
+    },
+    '/',
+  )
+}

package/src/connectionClient/connectionClient.spec.ts

@@ -1,19 +0,0 @@
-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/connectionClient.ts

@@ -1,54 +0,0 @@
-import { join } from 'path-browserify'
-import { generateDiograph } from '@diograph/folder-generator'
-
-import { IDiographObject } from '@diograph/diograph'
-import { IConnectionObject, IDiosphereObject } from '@diory/diosphere-js'
-import { IDataClient } from '@diograph/local-client'
-
-import { IConnectionClient } from '../types'
-
-const DIOSPHERE_JSON = 'diosphere.json'
-const DIOGRAPH_JSON = 'diograph.json'
-
-class ConnectionClient implements IConnectionClient {
-  type: string
-  client: IDataClient
-  connection: IConnectionObject
-
-  constructor(dataClient: IDataClient, connection: IConnectionObject) {
-    this.type = dataClient.type
-    this.client = dataClient
-    this.connection = connection
-  }
-
-  getDiosphere = async () => {
-    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(path, diosphereString)
-  }
-
-  getDiograph = async () => {
-    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(path, diographString)
-  }
-
-  generateDiograph = async (): Promise<IDiographObject> => {
-    const { diograph } = await generateDiograph(this.connection.address, this.client)
-    return diograph.toObject()
-  }
-}
-
-export { ConnectionClient }

package/src/dioryClient/getDefaultDiosphere.ts

@@ -1,14 +0,0 @@
-import { Diosphere, IConnectionObject, IDiosphereObject } from '@diory/diosphere-js'
-
-export const getDefaultDiosphere = (connections: IConnectionObject[]): IDiosphereObject => {
-  const diosphere = new Diosphere()
-  diosphere.addRoom(
-    {
-      text: 'Room',
-      connections,
-    },
-    '/',
-  )
-
-  return diosphere.toObject()
-}

package/src/utils/getConnectionClients.ts

@@ -1,24 +0,0 @@
-import { IConnectionObject } from '@diory/diosphere-js'
-import { IDataClient } from '@diograph/local-client'
-
-import { ConnectionClient } from '../connectionClient/connectionClient'
-import { IConnectionClient } from '../types'
-
-function getDataClient(
-  dataClients: IDataClient[],
-  { client }: IConnectionObject,
-): IDataClient | undefined {
-  return dataClients.find(({ type }) => type === client)
-}
-
-export function getConnectionClients(
-  dataClients: IDataClient[],
-  connections: IConnectionObject[] = [],
-): IConnectionClient[] {
-  return connections
-    .filter(({ client }) => dataClients.some(({ type }) => type === client))
-    .map((connection) => {
-      const dataClient = getDataClient(dataClients, connection)
-      return new ConnectionClient(dataClient!, connection)
-    }) as IConnectionClient[]
-}