@diory/client-js 0.4.0 → 0.4.1

package/dist/dioryClient/dioryClient.d.ts

@@ -1,6 +1,7 @@
 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

@@ -10,7 +10,8 @@ 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 connection_client_js_1.ConnectionClient(dataClients));
-        this.diograph = new diograph_1.Diograph(new connection_client_js_1.ConnectionClient(dataClients));
+        this.dataClients = dataClients;
+        this.diosphere = new diosphere_js_1.Diosphere();
+        this.diograph = new diograph_1.Diograph();
     }
 }
 exports.DioryClient = DioryClient;

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@diory/client-js",
-  "version": "0.4.0",
+  "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",
-    "@diory/connection-client-js": "^0.4.0",
-    "@diory/diosphere-js": "^0.4.0",
+    "@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.0",
+    "@diory/types": "^0.4.2",
     "@types/jest": "^27.4.0",
     "@types/path-browserify": "^1.0.2",
     "@types/uuid": "8.3.2",

package/src/dioryClient/dioryClient.ts

@@ -11,6 +11,7 @@ import {
   IDiory,
   IDioryObject,
   IDataClient,
+  IConnectionClient,
 } from '@diory/types'
 
 import { IDioryClient } from '../types'
@@ -19,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)) {
@@ -49,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/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/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)
-  }
-}