@diory/client-js 0.2.0-rc12 → 0.2.0-rc13

package/dist/dioryClient/defaultDiograph.json

@@ -0,0 +1,23 @@
+{
+    "/": {
+        "id": "welcome-root-diory"
+    },
+    "welcome-root-diory": {
+        "id": "welcome-root-diory",
+        "image": "",
+        "links": [
+            {
+                "id": "welcome-diory"
+            }
+        ],
+        "modified": "2020-01-03T14:03:04.751Z"
+    },
+    "welcome-diory": {
+        "id": "welcome-diory",
+        "image": "",
+        "modified": "2020-01-03T14:03:04.751Z",
+        "text": "Welcome to Diory",
+        "latitude": 60.01366036242365,
+        "longitude": 20.007133483886722
+    }
+}

package/dist/dioryClient/defaultDiosphere.json

@@ -0,0 +1,23 @@
+{
+    "rooms": {
+        "/": {
+            "id": "welcome-room",
+            "created": "2024-03-24T14:56:21.243Z",
+            "modified": "2024-03-24T14:56:21.243Z"
+        },
+        "welcome-room": {
+            "id": "welcome-room",
+            "text": "Wellcome room",
+            "doors": [],
+            "connections": [
+                {
+                    "id": "welcome-room",
+                    "client": "LocalClient",
+                    "address": "public/welcome-room"
+                }
+            ],
+            "created": "2024-03-24T14:56:21.243Z",
+            "modified": "2024-03-24T14:56:21.243Z"
+        }
+    }
+}

package/dist/dioryClient/dioryClient.d.ts

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

package/dist/dioryClient/dioryClient.js

@@ -1,48 +1,40 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 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 defaultDiosphere_json_1 = __importDefault(require("./defaultDiosphere.json"));
+const defaultDiograph_json_1 = __importDefault(require("./defaultDiograph.json"));
 class DioryClient {
     constructor(dataClients) {
         this.dataClients = [];
         this.connections = [];
-        this.initialise = async (connections) => {
-            console.info('initialise', connections);
-            this.connections = connections;
-            this.diosphere.resetRooms();
-            console.info(this.diosphere);
-            return this;
-        };
         this.selectRoom = (roomObject) => {
             return (this.room = this.diosphere.getRoom(roomObject));
         };
-        this.enterRoom = async (roomObject) => {
-            console.info('enterRoom', roomObject);
-            this.selectRoom(roomObject);
-            this.diograph.resetDiograph();
-            await this.getDiograph();
-            console.info(this.room);
-            return this.room;
-        };
-        this.focusDiory = (dioryObject) => {
-            return (this.diory = this.diograph.getDiory(dioryObject));
-        };
         this.getDiosphereClients = (connections) => {
             return (0, getConnectionClients_1.getConnectionClients)(this.dataClients, connections !== null && connections !== void 0 ? connections : this.connections);
         };
-        this.getDiographClients = (connections) => {
+        this.initialiseDiosphere = async (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);
+            console.info('initialiseDiosphere', connections);
+            this.connections = connections;
+            this.diosphere.resetRooms();
+            const diosphereObject = (_a = (await this.getDiosphere())) !== null && _a !== void 0 ? _a : defaultDiosphere_json_1.default;
+            this.diosphere.addDiosphere(diosphereObject);
+            this.selectRoom({ id: '/' });
+            return this.diosphere;
         };
         this.getDiosphere = async (connections) => {
             console.info('getDiosphere', connections);
+            let diosphereObject;
             await Promise.all(this.getDiosphereClients(connections).map(async (connectionClient) => {
                 try {
-                    const diosphereObject = await connectionClient.getDiosphere();
-                    this.diosphere.addDiosphere(diosphereObject);
-                    this.selectRoom({ id: '/' });
+                    diosphereObject = await connectionClient.getDiosphere();
                     console.info(this.diosphere.toObject());
                 }
                 catch (error) {
@@ -50,41 +42,59 @@ class DioryClient {
                 }
                 return;
             }));
-            return this.diosphere;
+            return diosphereObject;
         };
         this.saveDiosphere = async (connections) => {
             console.info('saveDiosphere', connections);
+            const diosphereObject = this.diosphere.toObject();
             await Promise.all(this.getDiosphereClients(connections).map(async (connectionClient) => {
-                await connectionClient.saveDiosphere(this.diosphere.toObject());
-                console.info(this.diosphere.toObject());
+                await connectionClient.saveDiosphere(diosphereObject);
+                console.info(diosphereObject);
                 return;
             }));
-            return this.diosphere;
+            return diosphereObject;
+        };
+        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.focusDiory = (dioryObject) => {
+            return (this.diory = this.diograph.getDiory(dioryObject));
+        };
+        this.initialiseDiograph = async (roomObject) => {
+            var _a;
+            console.info('initialiseDiograph', roomObject);
+            this.selectRoom(roomObject);
+            this.diograph.resetDiograph();
+            const diographObject = (_a = (await this.getDiograph())) !== null && _a !== void 0 ? _a : defaultDiograph_json_1.default;
+            this.diograph.addDiograph(diographObject);
+            this.focusDiory({ id: '/' });
+            return this.diograph;
         };
         this.getDiograph = async (connections) => {
             console.info('getDiograph', connections);
+            let diographObject;
             await Promise.all(this.getDiographClients(connections).map(async (connectionClient) => {
                 try {
-                    const diographObject = await connectionClient.getDiograph();
-                    this.diograph.addDiograph(diographObject);
-                    this.focusDiory({ id: '/' });
-                    console.info(this.diograph.toObject());
+                    diographObject = await connectionClient.getDiograph();
+                    console.info(diographObject);
                 }
                 catch (error) {
                     console.error(error);
                 }
                 return;
             }));
-            return this.diograph;
+            return diographObject;
         };
         this.saveDiograph = async (connections) => {
             console.info('saveDiograph', connections);
+            const diographObject = this.diograph.toObject();
             await Promise.all(this.getDiographClients(connections).map(async (connectionClient) => {
-                await connectionClient.saveDiograph(this.diograph.toObject());
-                console.info(this.diograph.toObject());
+                await connectionClient.saveDiograph(diographObject);
+                console.info(diographObject);
                 return;
             }));
-            return this.diograph;
+            return diographObject;
         };
         this.generateDiograph = async (connections) => {
             console.info('generateDiograph', connections);

package/dist/types.d.ts

@@ -48,13 +48,13 @@ export interface IDioryClient {
     room?: IRoom;
     diograph: IDiograph;
     diory?: IDiory;
-    initialise: (connections: IConnectionObject[]) => Promise<IDioryClient>;
     selectRoom: (roomObject: IRoomObject) => IRoom;
-    enterRoom: (roomObject: IRoomObject) => Promise<IRoom>;
+    getDiosphere: () => Promise<IDiosphereObject | undefined>;
+    saveDiosphere: () => Promise<IDiosphereObject>;
+    initialiseDiosphere: (connections: IConnectionObject[]) => Promise<IDiosphere>;
     focusDiory: (dioryObject: IDioryObject) => IDiory;
-    getDiosphere: () => Promise<IDiosphere>;
-    saveDiosphere: () => Promise<IDiosphere>;
-    getDiograph: () => Promise<IDiograph>;
-    saveDiograph: () => Promise<IDiograph>;
+    getDiograph: () => Promise<IDiographObject | undefined>;
+    saveDiograph: () => Promise<IDiographObject>;
+    initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>;
     generateDiograph: () => Promise<IDiograph>;
 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@diory/client-js",
-  "version": "0.2.0-rc12",
+  "version": "0.2.0-rc13",
   "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-rc15",
+    "@diograph/diograph": "0.3.0-rc16",
     "@diograph/folder-generator": "^0.3.0-rc3",
-    "@diory/diosphere-js": "^0.2.6-rc3",
+    "@diory/diosphere-js": "0.2.6-rc4",
     "path-browserify": "^1.0.1",
     "uuid": "8.3.2"
   },

package/src/dioryClient/defaultDiograph.json

@@ -0,0 +1,23 @@
+{
+  "/": {
+    "id": "welcome-root-diory"
+  },
+  "welcome-root-diory": {
+    "id": "welcome-root-diory",
+    "image": "",
+    "links": [
+      {
+        "id": "welcome-diory"
+      }
+    ],
+    "modified": "2020-01-03T14:03:04.751Z"
+  },
+  "welcome-diory": {
+    "id": "welcome-diory",
+    "image": "",
+    "modified": "2020-01-03T14:03:04.751Z",
+    "text": "Welcome to Diory",
+    "latitude": 60.01366036242365,
+    "longitude": 20.007133483886722
+  }
+}

package/src/dioryClient/defaultDiosphere.json

@@ -0,0 +1,23 @@
+{
+  "rooms": {
+    "/": {
+      "id": "welcome-room",
+      "created": "2024-03-24T14:56:21.243Z",
+      "modified": "2024-03-24T14:56:21.243Z"
+    },
+    "welcome-room": {
+      "id": "welcome-room",
+      "text": "Wellcome room",
+      "doors": [],
+      "connections": [
+        {
+          "id": "welcome-room",
+          "client": "LocalClient",
+          "address": "public/welcome-room"
+        }
+      ],
+      "created": "2024-03-24T14:56:21.243Z",
+      "modified": "2024-03-24T14:56:21.243Z"
+    }
+  }
+}

package/src/dioryClient/dioryClient.ts

@@ -1,9 +1,19 @@
-import { Diosphere, IConnectionObject, IDiosphere, IRoom, IRoomObject } from '@diory/diosphere-js'
-import { Diograph, IDiograph, IDiory, IDioryObject } from '@diograph/diograph'
+import {
+  Diosphere,
+  IConnectionObject,
+  IDiosphere,
+  IDiosphereObject,
+  IRoom,
+  IRoomObject,
+} from '@diory/diosphere-js'
+import { Diograph, IDiograph, IDiographObject, IDiory, IDioryObject } from '@diograph/diograph'
 
 import { IDioryClient, IDataClient } from '../types'
 import { getConnectionClients } from '../utils/getConnectionClients'
 
+import defaultDiosphere from './defaultDiosphere.json'
+import defaultDiograph from './defaultDiograph.json'
+
 class DioryClient implements IDioryClient {
   dataClients: IDataClient[] = []
   connections: IConnectionObject[] = []
@@ -22,112 +32,116 @@ class DioryClient implements IDioryClient {
     this.diograph.saveDiograph = this.saveDiograph
   }
 
-  initialise = async (connections: IConnectionObject[]): Promise<IDioryClient> => {
-    console.info('initialise', connections)
-
-    this.connections = connections
-    this.diosphere.resetRooms()
-    console.info(this.diosphere)
-
-    return this
-  }
-
   selectRoom = (roomObject: IRoomObject): IRoom => {
     return (this.room = this.diosphere.getRoom(roomObject))
   }
 
-  enterRoom = async (roomObject: IRoomObject): Promise<IRoom> => {
-    console.info('enterRoom', roomObject)
-
-    this.selectRoom(roomObject)
-    this.diograph.resetDiograph()
-    await this.getDiograph()
-    console.info(this.room)
-
-    return this.room as IRoom
-  }
-
-  focusDiory = (dioryObject: IDioryObject): IDiory => {
-    return (this.diory = this.diograph.getDiory(dioryObject))
-  }
-
   getDiosphereClients = (connections?: IConnectionObject[]) => {
     return getConnectionClients(this.dataClients, connections ?? this.connections)
   }
 
-  getDiographClients = (connections?: IConnectionObject[]) => {
-    return getConnectionClients(this.dataClients, connections ?? this.room?.connections)
+  initialiseDiosphere = async (connections: IConnectionObject[]): Promise<IDiosphere> => {
+    console.info('initialiseDiosphere', connections)
+    this.connections = connections
+
+    this.diosphere.resetRooms()
+    const diosphereObject = (await this.getDiosphere()) ?? defaultDiosphere
+    this.diosphere.addDiosphere(diosphereObject)
+
+    this.selectRoom({ id: '/' })
+
+    return this.diosphere
   }
 
-  getDiosphere = async (connections?: IConnectionObject[]): Promise<IDiosphere> => {
+  getDiosphere = async (
+    connections?: IConnectionObject[],
+  ): Promise<IDiosphereObject | undefined> => {
     console.info('getDiosphere', connections)
+
+    let diosphereObject
     await Promise.all(
       this.getDiosphereClients(connections).map(async (connectionClient) => {
         try {
-          const diosphereObject = await connectionClient.getDiosphere()
-          this.diosphere.addDiosphere(diosphereObject)
-          this.selectRoom({ id: '/' })
+          diosphereObject = await connectionClient.getDiosphere()
           console.info(this.diosphere.toObject())
         } catch (error) {
           console.error(error)
         }
-
         return
       }),
     )
 
-    return this.diosphere
+    return diosphereObject
   }
 
-  saveDiosphere = async (connections?: IConnectionObject[]): Promise<IDiosphere> => {
+  saveDiosphere = async (connections?: IConnectionObject[]): Promise<IDiosphereObject> => {
     console.info('saveDiosphere', connections)
 
+    const diosphereObject = this.diosphere.toObject()
     await Promise.all(
       this.getDiosphereClients(connections).map(async (connectionClient) => {
-        await connectionClient.saveDiosphere(this.diosphere.toObject())
-        console.info(this.diosphere.toObject())
-
+        await connectionClient.saveDiosphere(diosphereObject)
+        console.info(diosphereObject)
         return
       }),
     )
 
-    return this.diosphere
+    return diosphereObject
+  }
+
+  getDiographClients = (connections?: IConnectionObject[]) => {
+    return getConnectionClients(this.dataClients, connections ?? this.room?.connections)
+  }
+
+  focusDiory = (dioryObject: IDioryObject): IDiory => {
+    return (this.diory = this.diograph.getDiory(dioryObject))
+  }
+
+  initialiseDiograph = async (roomObject: IRoomObject): Promise<IDiograph> => {
+    console.info('initialiseDiograph', roomObject)
+    this.selectRoom(roomObject)
+
+    this.diograph.resetDiograph()
+    const diographObject = (await this.getDiograph()) ?? defaultDiograph
+    this.diograph.addDiograph(diographObject)
+
+    this.focusDiory({ id: '/' })
+
+    return this.diograph
   }
 
-  getDiograph = async (connections?: IConnectionObject[]): Promise<IDiograph> => {
+  getDiograph = async (connections?: IConnectionObject[]): Promise<IDiographObject | undefined> => {
     console.info('getDiograph', connections)
 
+    let diographObject
     await Promise.all(
       this.getDiographClients(connections).map(async (connectionClient) => {
         try {
-          const diographObject = await connectionClient.getDiograph()
-          this.diograph.addDiograph(diographObject)
-          this.focusDiory({ id: '/' })
-          console.info(this.diograph.toObject())
+          diographObject = await connectionClient.getDiograph()
+          console.info(diographObject)
         } catch (error) {
           console.error(error)
         }
-
         return
       }),
     )
 
-    return this.diograph
+    return diographObject
   }
 
-  saveDiograph = async (connections?: IConnectionObject[]): Promise<IDiograph> => {
+  saveDiograph = async (connections?: IConnectionObject[]): Promise<IDiographObject> => {
     console.info('saveDiograph', connections)
 
+    const diographObject = this.diograph.toObject()
     await Promise.all(
       this.getDiographClients(connections).map(async (connectionClient) => {
-        await connectionClient.saveDiograph(this.diograph.toObject())
-        console.info(this.diograph.toObject())
-
+        await connectionClient.saveDiograph(diographObject)
+        console.info(diographObject)
         return
       }),
     )
 
-    return this.diograph
+    return diographObject
   }
 
   generateDiograph = async (connections?: IConnectionObject[]): Promise<IDiograph> => {

package/src/types.ts

@@ -58,13 +58,13 @@ export interface IDioryClient {
   room?: IRoom
   diograph: IDiograph
   diory?: IDiory
-  initialise: (connections: IConnectionObject[]) => Promise<IDioryClient>
   selectRoom: (roomObject: IRoomObject) => IRoom
-  enterRoom: (roomObject: IRoomObject) => Promise<IRoom>
+  getDiosphere: () => Promise<IDiosphereObject | undefined>
+  saveDiosphere: () => Promise<IDiosphereObject>
+  initialiseDiosphere: (connections: IConnectionObject[]) => Promise<IDiosphere>
   focusDiory: (dioryObject: IDioryObject) => IDiory
-  getDiosphere: () => Promise<IDiosphere>
-  saveDiosphere: () => Promise<IDiosphere>
-  getDiograph: () => Promise<IDiograph>
-  saveDiograph: () => Promise<IDiograph>
+  getDiograph: () => Promise<IDiographObject | undefined>
+  saveDiograph: () => Promise<IDiographObject>
+  initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>
   generateDiograph: () => Promise<IDiograph>
 }

package/tsconfig.json

@@ -5,7 +5,9 @@
     "target": "es2017",
     "module": "commonjs",
     "strict": true,
-    "forceConsistentCasingInFileNames": true
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true
   },
   "exclude": ["node_modules", "dist"]
 }