@diory/client-js 0.2.1 → 0.4.0-rc1

package/dist/connectionClient/connectionClient.d.ts

@@ -1,6 +1,7 @@
 import { IDiographObject } from '@diograph/diograph';
 import { IConnectionObject, IDiosphereObject } from '@diory/diosphere-js';
-import { IConnectionClient, IDataClient } from '../types';
+import { IDataClient } from '@diograph/local-client';
+import { IConnectionClient } from '../types';
 declare class ConnectionClient implements IConnectionClient {
     type: string;
     client: IDataClient;

package/dist/dioryClient/dioryClient.d.ts

@@ -1,6 +1,7 @@
 import { IConnectionObject, IDiosphere, IDiosphereObject, IRoom, IRoomObject } from '@diory/diosphere-js';
 import { IDiograph, IDiographObject, IDiory, IDioryObject } from '@diograph/diograph';
-import { IDioryClient, IDataClient } from '../types';
+import { IDataClient } from '@diograph/local-client';
+import { IDioryClient } from '../types';
 declare class DioryClient implements IDioryClient {
     dataClients: IDataClient[];
     connections: IConnectionObject[];
@@ -15,8 +16,8 @@ declare class DioryClient implements IDioryClient {
     initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>;
     getDiograph: () => Promise<IDiographObject | undefined>;
     saveDiograph: () => Promise<IDiographObject>;
-    importDiograph: () => Promise<IDiograph>;
-    generateDiograph: () => Promise<IDiographObject | undefined>;
+    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>;

package/dist/dioryClient/dioryClient.js

@@ -23,13 +23,12 @@ class DioryClient {
         };
         this.initialiseDiograph = async (roomObject) => {
             var _a;
-            console.info('initialiseDiograph', roomObject);
+            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: '/' });
-            console.info(this.diograph.toObject());
             return this.diograph;
         };
         this.getDiograph = async () => {
@@ -57,9 +56,9 @@ class DioryClient {
             }));
             return diographObject;
         };
-        this.importDiograph = async () => {
+        this.importDiograph = async (connections) => {
             var _a;
-            const diographObject = await this.generateDiograph();
+            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]) => {
@@ -77,10 +76,10 @@ class DioryClient {
             }
             return this.diograph;
         };
-        this.generateDiograph = async () => {
-            console.info('generateDiograph');
+        this.generateDiograph = async (connections) => {
+            console.info('generateDiograph', connections);
             let diographObject;
-            await Promise.all(this.getDiographClients().map(async (connectionClient) => {
+            await Promise.all(this.getDiographClients(connections).map(async (connectionClient) => {
                 diographObject = await connectionClient.generateDiograph();
                 console.info(diographObject);
                 return;
@@ -92,13 +91,12 @@ class DioryClient {
         };
         this.initialiseDiosphere = async (connections) => {
             var _a;
-            console.info('initialiseDiosphere', connections);
+            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: '/' });
-            console.info(this.diosphere.toObject());
             return this.diosphere;
         };
         this.getDiosphere = async () => {

package/dist/index.d.ts

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

package/dist/types.d.ts

@@ -1,36 +1,6 @@
-/// <reference types="node" />
 import { IConnectionObject, IDiosphere, IDiosphereObject, IRoom, IRoomObject } from '@diory/diosphere-js';
 import { IDiograph, IDiographObject, IDiory, IDioryObject } from '@diograph/diograph';
-export interface IMetadata {
-    name: string;
-    created?: string;
-    modified?: string;
-    duration?: string;
-    thumbnail?: string;
-    latlng?: string;
-}
-export interface IFileType {
-    ext?: string;
-    mime?: string;
-}
-export interface IDataClient {
-    type: string;
-    readTextItem(url: string): Promise<string>;
-    readItem(url: string): Promise<Buffer>;
-    readToStream(url: string): any;
-    exists(url: string): Promise<boolean>;
-    writeTextItem(url: string, fileContent: string): Promise<boolean>;
-    writeItem(url: string, fileContent: Buffer | string): Promise<boolean>;
-    deleteItem(url: string): Promise<boolean>;
-    deleteFolder(url: string): Promise<void>;
-    list(url: string): Promise<string[]>;
-    getFileNames(url: string): Promise<string[]>;
-    getFolderNames(url: string): Promise<string[]>;
-    getFileType(url: string): Promise<IFileType>;
-    getMetadata(url: string): IMetadata;
-    getThumbnail?(imageUrl: string): Promise<string | undefined>;
-    getVideoMetadata?(videoUrl: string): Promise<IMetadata>;
-}
+import { IDataClient } from '@diograph/local-client';
 export interface IConnectionClient {
     type: string;
     client: IDataClient;
@@ -52,8 +22,8 @@ export interface IDioryClient {
     initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>;
     getDiograph: () => Promise<IDiographObject | undefined>;
     saveDiograph: () => Promise<IDiographObject>;
-    importDiograph: () => Promise<IDiograph>;
-    generateDiograph: () => Promise<IDiographObject | undefined>;
+    importDiograph: (connections?: IConnectionObject[]) => Promise<IDiograph>;
+    generateDiograph: (connections?: IConnectionObject[]) => Promise<IDiographObject | undefined>;
     diosphere: IDiosphere;
     initialiseDiosphere: (connections: IConnectionObject[]) => Promise<IDiosphere>;
     getDiosphere: () => Promise<IDiosphereObject | undefined>;

package/dist/utils/getConnectionClients.d.ts

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

package/package.json

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

package/src/connectionClient/connectionClient.ts

@@ -3,7 +3,9 @@ import { generateDiograph } from '@diograph/folder-generator'
 
 import { IDiographObject } from '@diograph/diograph'
 import { IConnectionObject, IDiosphereObject } from '@diory/diosphere-js'
-import { IConnectionClient, IDataClient } from '../types'
+import { IDataClient } from '@diograph/local-client'
+
+import { IConnectionClient } from '../types'
 
 const DIOSPHERE_JSON = 'diosphere.json'
 const DIOGRAPH_JSON = 'diograph.json'

package/src/dioryClient/dioryClient.ts

@@ -7,8 +7,9 @@ import {
   IRoomObject,
 } from '@diory/diosphere-js'
 import { Diograph, IDiograph, IDiographObject, IDiory, IDioryObject } from '@diograph/diograph'
+import { IDataClient } from '@diograph/local-client'
 
-import { IDioryClient, IDataClient } from '../types'
+import { IDioryClient } from '../types'
 import { getConnectionClients } from '../utils/getConnectionClients'
 import { debounce } from '../utils/debounce'
 
@@ -46,7 +47,7 @@ class DioryClient implements IDioryClient {
   }
 
   initialiseDiograph = async (roomObject: IRoomObject): Promise<IDiograph> => {
-    console.info('initialiseDiograph', roomObject)
+    console.info('initialiseDiograph: room', roomObject)
     this.selectRoom(roomObject)
 
     this.diograph.resetDiograph()
@@ -55,7 +56,6 @@ class DioryClient implements IDioryClient {
 
     this.focusDiory({ id: '/' })
 
-    console.info(this.diograph.toObject())
     return this.diograph
   }
 
@@ -93,8 +93,8 @@ class DioryClient implements IDioryClient {
     return diographObject
   }
 
-  importDiograph = async (): Promise<IDiograph> => {
-    const diographObject = await this.generateDiograph()
+  importDiograph = async (connections?: IConnectionObject[]): Promise<IDiograph> => {
+    const diographObject = await this.generateDiograph(connections)
 
     if (diographObject) {
       const diory = this.diory?.toObject()
@@ -115,12 +115,14 @@ class DioryClient implements IDioryClient {
     return this.diograph
   }
 
-  generateDiograph = async (): Promise<IDiographObject | undefined> => {
-    console.info('generateDiograph')
+  generateDiograph = async (
+    connections?: IConnectionObject[],
+  ): Promise<IDiographObject | undefined> => {
+    console.info('generateDiograph', connections)
 
     let diographObject
     await Promise.all(
-      this.getDiographClients().map(async (connectionClient) => {
+      this.getDiographClients(connections).map(async (connectionClient) => {
         diographObject = await connectionClient.generateDiograph()
         console.info(diographObject)
         return
@@ -135,7 +137,7 @@ class DioryClient implements IDioryClient {
   }
 
   initialiseDiosphere = async (connections: IConnectionObject[]): Promise<IDiosphere> => {
-    console.info('initialiseDiosphere', connections)
+    console.info('initialiseDiosphere: connections', connections)
     this.connections = connections
 
     this.diosphere.resetRooms()
@@ -144,7 +146,6 @@ class DioryClient implements IDioryClient {
 
     this.selectRoom({ id: '/' })
 
-    console.info(this.diosphere.toObject())
     return this.diosphere
   }
 

package/src/index.ts

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

package/src/types.ts

@@ -6,39 +6,7 @@ import {
   IRoomObject,
 } from '@diory/diosphere-js'
 import { IDiograph, IDiographObject, IDiory, IDioryObject } from '@diograph/diograph'
-
-export interface IMetadata {
-  name: string
-  created?: string
-  modified?: string
-  duration?: string
-  thumbnail?: string
-  latlng?: string
-}
-
-export interface IFileType {
-  ext?: string
-  mime?: string
-}
-
-export interface IDataClient {
-  type: string
-  readTextItem(url: string): Promise<string>
-  readItem(url: string): Promise<Buffer>
-  readToStream(url: string): any
-  exists(url: string): Promise<boolean>
-  writeTextItem(url: string, fileContent: string): Promise<boolean>
-  writeItem(url: string, fileContent: Buffer | string): Promise<boolean>
-  deleteItem(url: string): Promise<boolean>
-  deleteFolder(url: string): Promise<void>
-  list(url: string): Promise<string[]>
-  getFileNames(url: string): Promise<string[]>
-  getFolderNames(url: string): Promise<string[]>
-  getFileType(url: string): Promise<IFileType>
-  getMetadata(url: string): IMetadata
-  getThumbnail?(imageUrl: string): Promise<string | undefined>
-  getVideoMetadata?(videoUrl: string): Promise<IMetadata>
-}
+import { IDataClient } from '@diograph/local-client'
 
 export interface IConnectionClient {
   type: string
@@ -62,8 +30,8 @@ export interface IDioryClient {
   initialiseDiograph: (roomObject: IRoomObject) => Promise<IDiograph>
   getDiograph: () => Promise<IDiographObject | undefined>
   saveDiograph: () => Promise<IDiographObject>
-  importDiograph: () => Promise<IDiograph>
-  generateDiograph: () => Promise<IDiographObject | undefined>
+  importDiograph: (connections?: IConnectionObject[]) => Promise<IDiograph>
+  generateDiograph: (connections?: IConnectionObject[]) => Promise<IDiographObject | undefined>
   diosphere: IDiosphere
   initialiseDiosphere: (connections: IConnectionObject[]) => Promise<IDiosphere>
   getDiosphere: () => Promise<IDiosphereObject | undefined>

package/src/utils/getConnectionClients.ts

@@ -1,7 +1,8 @@
 import { IConnectionObject } from '@diory/diosphere-js'
+import { IDataClient } from '@diograph/local-client'
 
 import { ConnectionClient } from '../connectionClient/connectionClient'
-import { IConnectionClient, IDataClient } from '../types'
+import { IConnectionClient } from '../types'
 
 function getDataClient(
   dataClients: IDataClient[],