@diory/client-js 0.1.2 → 0.1.3

package/dist/connectionClient.js

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

package/dist/dioryClient.d.ts

@@ -9,8 +9,8 @@ declare class DioryClient implements IDioryClient {
     diograph: IDiograph;
     diory?: IDiory;
     constructor(dataClients: IDataClient[]);
-    initialise: (connections: IConnectionObject[]) => Promise<void>;
-    enterRoom: (roomObject: IRoomObject) => Promise<void>;
+    initialise: (connections: IConnectionObject[]) => Promise<IDioryClient>;
+    enterRoom: (roomObject: IRoomObject) => Promise<IRoom>;
     focusDiory: (dioryObject: IDioryObject) => IDiory;
     getDiosphere: () => Promise<void>;
     saveDiosphere: () => Promise<void>;

package/dist/dioryClient.js

@@ -3,18 +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 connectionClient_1 = require("./connectionClient");
-function getDataClient(dataClients, { 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);
-    });
-}
+const getConnectionClients_1 = require("./utils/getConnectionClients");
 class DioryClient {
     constructor(dataClients) {
         this.dataClients = [];
@@ -24,11 +13,11 @@ class DioryClient {
             this.diosphere.resetRooms();
             await this.getDiosphere();
             await this.enterRoom({ id: '/' });
-            return;
+            return this;
         };
         this.enterRoom = async (roomObject) => {
             this.room = this.diosphere.getRoom(roomObject);
-            this.diograph.resetDiories();
+            this.diograph.resetDiograph();
             await this.getDiograph();
             this.focusDiory({ id: '/' });
             return this.room;
@@ -39,7 +28,7 @@ class DioryClient {
         this.getDiosphere = async () => {
             console.info('getDiosphere', this.connections);
             if (this.connections) {
-                const connectionClients = getConnectionClients(this.dataClients, this.connections);
+                const connectionClients = (0, getConnectionClients_1.getConnectionClients)(this.dataClients, this.connections);
                 await Promise.all(connectionClients.map(async (connectionClient) => {
                     const diosphereObject = await connectionClient.getDiosphere();
                     console.info(diosphereObject);
@@ -51,7 +40,7 @@ class DioryClient {
         this.saveDiosphere = async () => {
             console.info('saveDiosphere', this.connections);
             if (this.connections) {
-                const connectionClients = getConnectionClients(this.dataClients, this.connections);
+                const connectionClients = (0, getConnectionClients_1.getConnectionClients)(this.dataClients, this.connections);
                 await Promise.all(connectionClients.map((connectionClient) => {
                     console.info(this.diosphere.toObject());
                     return connectionClient.saveDiosphere(this.diosphere.toObject());
@@ -63,7 +52,7 @@ class DioryClient {
             var _a, _b;
             console.info('getDiograph', (_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 = getConnectionClients(this.dataClients, this.room.connections);
+                const connectionClients = (0, getConnectionClients_1.getConnectionClients)(this.dataClients, this.room.connections);
                 await Promise.all(connectionClients.map(async (connectionClient) => {
                     const diographObject = await connectionClient.getDiograph();
                     console.info(diographObject);
@@ -76,7 +65,7 @@ class DioryClient {
             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 = getConnectionClients(this.dataClients, this.room.connections);
+                const connectionClients = (0, getConnectionClients_1.getConnectionClients)(this.dataClients, this.room.connections);
                 await Promise.all(connectionClients.map((connectionClient) => {
                     console.info(this.diograph.toObject());
                     return connectionClient.saveDiograph(this.diograph.toObject());

package/dist/dioryClient.spec.js

@@ -1,5 +1,10 @@
 "use strict";
 describe('dioryClient', () => {
+    describe('constructor()', () => {
+        it('should construct with dataClient', () => {
+            expect(true).toEqual(true);
+        });
+    });
     describe('initialise()', () => {
         it('should initialise with connections', () => {
             expect(true).toEqual(true);

package/dist/types.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 import { IConnectionObject, IDiosphere, IDiosphereObject, IRoom, IRoomObject } from '@diory/diosphere-js';
-import { IDiograph, IDiory } from '@diograph/diograph';
-import { IDiographObject, IDioryObject } from '@diograph/diograph';
+import { IDiographObject, IDiograph, IDiory, IDioryObject } from '@diograph/diograph';
 export interface IDataClient {
     type: string;
     readTextItem(url: string): Promise<string>;
@@ -30,8 +29,8 @@ export interface IDioryClient {
     room?: IRoom;
     diograph: IDiograph;
     diory?: IDiory;
-    initialise: (connections: IConnectionObject[]) => Promise<void>;
-    enterRoom: (roomObject: IRoomObject) => Promise<void>;
+    initialise: (connections: IConnectionObject[]) => Promise<IDioryClient>;
+    enterRoom: (roomObject: IRoomObject) => Promise<IRoom>;
     focusDiory: (dioryObject: IDioryObject) => IDiory;
     getDiosphere: () => void;
     saveDiosphere: () => void;

package/dist/utils/getConnectionClients.d.ts

@@ -0,0 +1,3 @@
+import { IConnectionObject } from '@diory/diosphere-js';
+import { IConnectionClient, IDataClient } from '../types';
+export declare function getConnectionClients(dataClients: IDataClient[], connections: IConnectionObject[]): IConnectionClient[];

package/dist/utils/getConnectionClients.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConnectionClients = void 0;
+const connectionClient_1 = require("../connectionClient");
+function getDataClient(dataClients, { 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);
+    });
+}
+exports.getConnectionClients = getConnectionClients;

package/package.json

@@ -1,21 +1,16 @@
 {
   "name": "@diory/client-js",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "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.1.2",
-    "@diory/diosphere-js": "^0.2.5",
-    "path": "^0.12.7",
-    "path-browserify": "^1.0.1",
-    "uuid": "8.3.2"
+    "@diograph/diograph": "0.3.0-rc12",
+    "@diory/diosphere-js": "0.2.6-rc1"
   },
   "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,12 +1,7 @@
-import { join } from 'path-browserify'
-
 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
@@ -19,27 +14,23 @@ class ConnectionClient implements IConnectionClient {
   }
 
   getDiosphere = async () => {
-    const diosphereString = await this.client.readTextItem(
-      join(this.connection.address, DIOSPHERE_JSON),
-    )
+    const diosphereString = await this.client.readTextItem(this.connection.address)
     return JSON.parse(diosphereString)
   }
 
   saveDiosphere = async (diosphereObject: IDiosphereObject) => {
-    const diosphereString = JSON.stringify(diosphereObject)
-    return this.client.writeItem(join(this.connection.address, DIOSPHERE_JSON), diosphereString)
+    const diosphereString = JSON.stringify(diosphereObject, null, 2)
+    return this.client.writeItem(this.connection.address, diosphereString)
   }
 
   getDiograph = async () => {
-    const diographString = await this.client.readTextItem(
-      join(this.connection.address, DIOGRAPH_JSON),
-    )
+    const diographString = await this.client.readTextItem(this.connection.address)
     return JSON.parse(diographString)
   }
 
   saveDiograph = async (diographObject: IDiographObject) => {
-    const diosphereString = JSON.stringify(diographObject)
-    return this.client.writeItem(join(this.connection.address, DIOGRAPH_JSON), diosphereString)
+    const diographString = JSON.stringify(diographObject, null, 2)
+    return this.client.writeItem(this.connection.address, diographString)
   }
 }
 

package/src/dioryClient.spec.ts

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

package/src/dioryClient.ts

@@ -1,27 +1,8 @@
 import { Diosphere, IConnectionObject, IDiosphere, IRoom, IRoomObject } from '@diory/diosphere-js'
 import { Diograph, IDiograph, IDiory, IDioryObject } from '@diograph/diograph'
 
-import { IConnectionClient, IDataClient, IDioryClient } from './types'
-import { ConnectionClient } from './connectionClient'
-
-function getDataClient(
-  dataClients: IDataClient[],
-  { client }: IConnectionObject,
-): IDataClient | undefined {
-  return dataClients.find(({ type }) => type === client)
-}
-
-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[]
-}
+import { IDataClient, IDioryClient } from './types'
+import { getConnectionClients } from './utils/getConnectionClients'
 
 class DioryClient implements IDioryClient {
   dataClients: IDataClient[] = []
@@ -41,20 +22,20 @@ class DioryClient implements IDioryClient {
     this.diograph.saveDiograph = this.saveDiograph
   }
 
-  initialise = async (connections: IConnectionObject[]): Promise<void> => {
+  initialise = async (connections: IConnectionObject[]): Promise<IDioryClient> => {
     this.connections = connections
 
     this.diosphere.resetRooms()
     await this.getDiosphere()
     await this.enterRoom({ id: '/' })
 
-    return
+    return this
   }
 
-  enterRoom = async (roomObject: IRoomObject): Promise<void> => {
+  enterRoom = async (roomObject: IRoomObject): Promise<IRoom> => {
     this.room = this.diosphere.getRoom(roomObject)
 
-    this.diograph.resetDiories()
+    this.diograph.resetDiograph()
     await this.getDiograph()
     this.focusDiory({ id: '/' })
 

package/src/types.ts

@@ -5,8 +5,7 @@ import {
   IRoom,
   IRoomObject,
 } from '@diory/diosphere-js'
-import { IDiograph, IDiory } from '@diograph/diograph'
-import { IDiographObject, IDioryObject } from '@diograph/diograph'
+import { IDiographObject, IDiograph, IDiory, IDioryObject } from '@diograph/diograph'
 
 export interface IDataClient {
   type: string
@@ -38,8 +37,8 @@ export interface IDioryClient {
   room?: IRoom
   diograph: IDiograph
   diory?: IDiory
-  initialise: (connections: IConnectionObject[]) => Promise<void>
-  enterRoom: (roomObject: IRoomObject) => Promise<void>
+  initialise: (connections: IConnectionObject[]) => Promise<IDioryClient>
+  enterRoom: (roomObject: IRoomObject) => Promise<IRoom>
   focusDiory: (dioryObject: IDioryObject) => IDiory
   getDiosphere: () => void
   saveDiosphere: () => void

package/src/utils/getConnectionClients.ts

@@ -0,0 +1,23 @@
+import { IConnectionObject } from '@diory/diosphere-js'
+
+import { IConnectionClient, IDataClient } from '../types'
+import { ConnectionClient } from '../connectionClient'
+
+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[]
+}