@diory/client-js 0.4.0-rc2 → 0.4.1

package/dist/dioryClient/dioryClient.d.ts

@@ -1,8 +1,7 @@
-import { IConnectionObject, IDiosphere, IRoom, IRoomObject } from '@diory/diosphere-js';
-import { IDiograph, IDiory, IDioryObject } from '@diograph/diograph';
-import { IDataClient } from '@diograph/local-client';
+import { IConnectionObject, IDiosphere, IRoom, IRoomObject, IDiograph, IDiory, IDioryObject, IDataClient } from '@diory/types';
 import { IDioryClient } from '../types';
 declare class DioryClient implements IDioryClient {
+    dataClients: IDataClient[];
     diosphere: IDiosphere;
     diograph: IDiograph;
     room?: IRoom;

package/dist/dioryClient/dioryClient.js

@@ -3,14 +3,15 @@ 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 local_client_1 = require("@diograph/local-client");
+const connection_client_js_1 = require("@diory/connection-client-js");
 const addDefaultRoom_1 = require("../utils/addDefaultRoom");
 const addDefaultDiograph_1 = require("../utils/addDefaultDiograph");
 class DioryClient {
     constructor(dataClients) {
         this.initialiseDiosphere = async (connections) => {
             console.info('initialiseDiosphere: connections', connections);
-            this.diosphere.initialise(connections);
+            const connectionClient = new connection_client_js_1.ConnectionClient(this.dataClients, connections);
+            this.diosphere.connect(connectionClient);
             await this.diosphere.getDiosphere();
             if (!Object.keys(this.diosphere.rooms)) {
                 (0, addDefaultRoom_1.addDefaultRoom)(this.diosphere, connections);
@@ -23,7 +24,8 @@ class DioryClient {
             console.info('initialiseDiograph: room', roomObject);
             this.selectRoom(roomObject);
             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);
+                const connectionClient = new connection_client_js_1.ConnectionClient(this.dataClients, (_b = this.room) === null || _b === void 0 ? void 0 : _b.connections);
+                this.diograph.connect(connectionClient);
                 await this.diograph.getDiograph();
                 if (!Object.keys(this.diograph.diograph)) {
                     (0, addDefaultDiograph_1.addDefaultDiograph)(this.diograph);
@@ -38,8 +40,9 @@ class DioryClient {
         this.focusDiory = (dioryObject) => {
             return (this.diory = this.diograph.getDiory(dioryObject));
         };
-        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));
+        this.dataClients = dataClients;
+        this.diosphere = new diosphere_js_1.Diosphere();
+        this.diograph = new diograph_1.Diograph();
     }
 }
 exports.DioryClient = DioryClient;

package/dist/types.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, IRoom, IRoomObject } from '@diory/types';
+import { IDiograph, IDiory, IDioryObject } from '@diory/types';
 export interface IDioryClient {
     diosphere: IDiosphere;
     diograph: IDiograph;

package/dist/utils/addDefaultDiograph.d.ts

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

package/dist/utils/addDefaultRoom.d.ts

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

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@diory/client-js",
-  "version": "0.4.0-rc2",
+  "version": "0.4.1",
   "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.4.0-rc1",
-    "@diograph/folder-generator": "^0.4.0-rc1",
-    "@diograph/local-client": "^0.4.0-rc3",
-    "@diory/diosphere-js": "^0.4.0-rc1",
+    "@diograph/diograph": "^0.4.1",
+    "@diory/connection-client-js": "^0.4.1",
+    "@diory/diosphere-js": "^0.4.1",
     "path-browserify": "^1.0.1",
     "uuid": "8.3.2"
   },
   "devDependencies": {
+    "@diory/types": "^0.4.2",
     "@types/jest": "^27.4.0",
     "@types/path-browserify": "^1.0.2",
     "@types/uuid": "8.3.2",
@@ -41,14 +41,15 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/DioryMe/diosphere-js.git"
+    "url": "git+https://github.com/DioryMe/diory-client-js.git"
   },
   "keywords": [
     "diory",
-    "diosphere"
+    "diosphere",
+    "diograph"
   ],
   "bugs": {
-    "url": "https://github.com/DioryMe/diosphere-js/issues"
+    "url": "https://github.com/DioryMe/diory-client-js/issues"
   },
-  "homepage": "https://github.com/DioryMe/diosphere-js#readme"
+  "homepage": "https://github.com/DioryMe/diory-client-js#readme"
 }

package/src/dioryClient/dioryClient.ts

@@ -1,6 +1,18 @@
-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 { Diosphere } from '@diory/diosphere-js'
+import { Diograph } from '@diograph/diograph'
+import { ConnectionClient } from '@diory/connection-client-js'
+
+import {
+  IConnectionObject,
+  IDiosphere,
+  IRoom,
+  IRoomObject,
+  IDiograph,
+  IDiory,
+  IDioryObject,
+  IDataClient,
+  IConnectionClient,
+} from '@diory/types'
 
 import { IDioryClient } from '../types'
 
@@ -8,20 +20,23 @@ import { addDefaultRoom } from '../utils/addDefaultRoom'
 import { addDefaultDiograph } from '../utils/addDefaultDiograph'
 
 class DioryClient implements IDioryClient {
+  dataClients: IDataClient[]
   diosphere: IDiosphere
   diograph: IDiograph
   room?: IRoom
   diory?: IDiory
 
   constructor(dataClients: IDataClient[]) {
-    this.diosphere = new Diosphere(new ConnectionClient(dataClients))
-    this.diograph = new Diograph(new ConnectionClient(dataClients))
+    this.dataClients = dataClients
+    this.diosphere = new Diosphere()
+    this.diograph = new Diograph()
   }
 
   initialiseDiosphere = async (connections: IConnectionObject[]): Promise<IDiosphere> => {
     console.info('initialiseDiosphere: connections', connections)
 
-    this.diosphere.initialise(connections)
+    const connectionClient: IConnectionClient = new ConnectionClient(this.dataClients, connections)
+    this.diosphere.connect(connectionClient)
     await this.diosphere.getDiosphere()
 
     if (!Object.keys(this.diosphere.rooms)) {
@@ -38,7 +53,11 @@ class DioryClient implements IDioryClient {
     this.selectRoom(roomObject)
 
     if (this.room?.connections) {
-      this.diograph.initialise(this.room?.connections)
+      const connectionClient: IConnectionClient = new ConnectionClient(
+        this.dataClients,
+        this.room?.connections,
+      )
+      this.diograph.connect(connectionClient)
       await this.diograph.getDiograph()
 
       if (!Object.keys(this.diograph.diograph)) {

package/src/types.ts

@@ -1,5 +1,5 @@
-import { IConnectionObject, IDiosphere, IRoom, IRoomObject } from '@diory/diosphere-js'
-import { IDiograph, IDiory, IDioryObject } from '@diograph/diograph'
+import { IConnectionObject, IDiosphere, IRoom, IRoomObject } from '@diory/types'
+import { IDiograph, IDiory, IDioryObject } from '@diory/types'
 
 export interface IDioryClient {
   diosphere: IDiosphere

package/src/utils/addDefaultDiograph.ts

@@ -1,4 +1,4 @@
-import { IDiograph } from '@diograph/diograph'
+import { IDiograph } from '@diory/types'
 
 export const addDefaultDiograph = (diograph: IDiograph): void => {
   const diory = diograph.addDiory({

package/src/utils/addDefaultRoom.ts

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

package/dist/connectionClient/connectionClient.d.ts

@@ -1,17 +0,0 @@
-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 {
-  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 }

package/dist/connectionClient/connectionClient.js

@@ -1,95 +0,0 @@
-'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(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

package/dist/connectionClient/connectionClient.spec.js

@@ -1,18 +0,0 @@
-'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/connectionClient/utils/debounce.d.ts

@@ -1 +0,0 @@
-export declare function debounce(func: any, wait: number, immediate?: boolean): () => typeof func

package/dist/connectionClient/utils/debounce.js

@@ -1,22 +0,0 @@
-'use strict'
-Object.defineProperty(exports, '__esModule', { value: true })
-exports.debounce = void 0
-function debounce(func, wait, immediate = false) {
-  let timeout
-  // eslint-disable-next-line func-names
-  return () => {
-    // @ts-ignore
-    const context = this
-    const args = arguments
-    // eslint-disable-next-line func-names
-    const later = function () {
-      timeout = null
-      if (!immediate) func.apply(context, args)
-    }
-    const callNow = immediate && !timeout
-    clearTimeout(timeout)
-    timeout = setTimeout(later, wait)
-    if (callNow) func.apply(context, args)
-  }
-}
-exports.debounce = debounce

package/dist/dioryClient/addDefaultDiograph.d.ts

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

package/dist/dioryClient/addDefaultDiograph.js

@@ -1,17 +0,0 @@
-'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

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

package/dist/dioryClient/addDefaultRoom.js

@@ -1,13 +0,0 @@
-'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/defaultDiograph.json

@@ -1,24 +0,0 @@
-{
-  "/": {
-    "id": "welcome-root-diory"
-  },
-  "welcome-root-diory": {
-    "id": "welcome-root-diory",
-    "text": "Room",
-    "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.d.ts

@@ -1,21 +0,0 @@
-export declare const diosphere: {
-  rooms: {
-    '/': {
-      id: string
-      created: string
-      modified: string
-    }
-    'welcome-room': {
-      id: string
-      text: string
-      doors: never[]
-      connections: {
-        id: string
-        client: string
-        address: string
-      }[]
-      created: string
-      modified: string
-    }
-  }
-}

package/dist/dioryClient/defaultDiosphere.js

@@ -1,26 +0,0 @@
-'use strict'
-Object.defineProperty(exports, '__esModule', { value: true })
-exports.diosphere = void 0
-exports.diosphere = {
-  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',
-      doors: [],
-      connections: [
-        {
-          id: 'welcome-connection',
-          client: 'LocalClient',
-          address: 'public/welcome-room',
-        },
-      ],
-      created: '2024-03-24T14:56:21.243Z',
-      modified: '2024-03-24T14:56:21.243Z',
-    },
-  },
-}

package/dist/dioryClient/defaultDiosphere.json

@@ -1,23 +0,0 @@
-{
-  "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/getDefaultDiograph.d.ts

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

package/dist/dioryClient/getDefaultDiograph.js

@@ -1,20 +0,0 @@
-'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

package/dist/dioryClient/getDefaultDiosphere.d.ts

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

package/dist/dioryClient/getDefaultDiosphere.js

@@ -1,16 +0,0 @@
-'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

package/dist/utils/debounce.d.ts

@@ -1 +0,0 @@
-export declare function debounce(func: any, wait: number, immediate?: boolean): () => typeof func;

package/dist/utils/debounce.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.debounce = void 0;
-function debounce(func, wait, immediate = false) {
-    let timeout;
-    // eslint-disable-next-line func-names
-    return () => {
-        // @ts-ignore
-        const context = this;
-        const args = arguments;
-        // eslint-disable-next-line func-names
-        const later = function () {
-            timeout = null;
-            if (!immediate)
-                func.apply(context, args);
-        };
-        const callNow = immediate && !timeout;
-        clearTimeout(timeout);
-        timeout = setTimeout(later, wait);
-        if (callNow)
-            func.apply(context, args);
-    };
-}
-exports.debounce = debounce;

package/dist/utils/getConnectionClients.d.ts

@@ -1,7 +0,0 @@
-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 +0,0 @@
-'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)
-}
-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/src/utils/debounce.ts

@@ -1,18 +0,0 @@
-export function debounce(func: any, wait: number, immediate = false) {
-  let timeout: any
-  // eslint-disable-next-line func-names
-  return (): typeof func => {
-    // @ts-ignore
-    const context = this
-    const args = arguments
-    // eslint-disable-next-line func-names
-    const later = function () {
-      timeout = null
-      if (!immediate) func.apply(context, args)
-    }
-    const callNow = immediate && !timeout
-    clearTimeout(timeout)
-    timeout = setTimeout(later, wait)
-    if (callNow) func.apply(context, args)
-  }
-}