@diory/client-js 0.1.5-rc1 → 0.2.0-rc10

package/dist/{connectionClient.d.ts → connectionClient/connectionClient.d.ts}

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

package/dist/{connectionClient.js → connectionClient/connectionClient.js}

@@ -28,7 +28,7 @@ class ConnectionClient {
             return this.client.writeItem(path, diographString);
         };
         this.generateDiograph = async () => {
-            const { diograph } = await (0, folder_generator_1.generateDiograph)(this.connection.address); // TODO: Client
+            const { diograph } = await (0, folder_generator_1.generateDiograph)(this.connection.address, this.client);
             return diograph.toObject();
         };
         this.type = dataClient.type;

package/dist/connectionClient/connectionClient.spec.js

@@ -0,0 +1,18 @@
+"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/{dioryClient.d.ts → dioryClient/dioryClient.d.ts}

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

package/dist/{dioryClient.js → dioryClient/dioryClient.js}

@@ -3,7 +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 getConnectionClients_1 = require("./utils/getConnectionClients");
+const getConnectionClients_1 = require("../utils/getConnectionClients");
 class DioryClient {
     constructor(dataClients) {
         this.dataClients = [];
@@ -20,7 +20,6 @@ class DioryClient {
             this.diograph.resetDiograph();
             await this.getDiograph();
             this.focusDiory({ id: '/' });
-            await this.generateDiograph();
             return this.room;
         };
         this.focusDiory = (dioryObject) => {
@@ -85,7 +84,11 @@ class DioryClient {
                 await Promise.all(connectionClients.map(async (connectionClient) => {
                     const diographObject = await connectionClient.generateDiograph();
                     console.info(diographObject);
-                    this.diograph.addDiograph(diographObject);
+                    Object.entries(diographObject).forEach(([key, dioryObject]) => {
+                        key === '/'
+                            ? this.diograph.addDioryLink({ id: '/' }, diographObject['/'])
+                            : this.diograph.addDiory(dioryObject);
+                    });
                     await connectionClient.saveDiograph(this.diograph.toObject());
                     return;
                 }));

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionClient = exports.DioryClient = void 0;
-var dioryClient_1 = require("./dioryClient");
+var dioryClient_1 = require("./dioryClient/dioryClient");
 Object.defineProperty(exports, "DioryClient", { enumerable: true, get: function () { return dioryClient_1.DioryClient; } });
-var connectionClient_1 = require("./connectionClient");
+var connectionClient_1 = require("./connectionClient/connectionClient");
 Object.defineProperty(exports, "ConnectionClient", { enumerable: true, get: function () { return connectionClient_1.ConnectionClient; } });

package/dist/types.d.ts

@@ -1,6 +1,18 @@
 /// <reference types="node" />
 import { IConnectionObject, IDiosphere, IDiosphereObject, IRoom, IRoomObject } from '@diory/diosphere-js';
-import { IDiographObject, IDiograph, IDiory, IDioryObject } from '@diograph/diograph';
+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>;
@@ -12,6 +24,12 @@ export interface IDataClient {
     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>;
 }
 export interface IConnectionClient {
     type: string;

package/dist/utils/getConnectionClients.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConnectionClients = void 0;
-const connectionClient_1 = require("../connectionClient");
+const connectionClient_1 = require("../connectionClient/connectionClient");
 function getDataClient(dataClients, { client }) {
     return dataClients.find(({ type }) => type === client);
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@diory/client-js",
-  "version": "0.1.5-rc1",
+  "version": "0.2.0-rc10",
   "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-rc14",
-    "@diograph/folder-generator": "^0.2.0-rc1",
+    "@diograph/folder-generator": "^0.3.0-rc3",
     "@diory/diosphere-js": "0.2.6-rc2",
     "path-browserify": "^1.0.1",
     "uuid": "8.3.2"

package/src/connectionClient/connectionClient.spec.ts

@@ -0,0 +1,19 @@
+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/src/{connectionClient.ts → connectionClient/connectionClient.ts}

@@ -3,7 +3,7 @@ import { generateDiograph } from '@diograph/folder-generator'
 
 import { IDiographObject } from '@diograph/diograph'
 import { IConnectionObject, IDiosphereObject } from '@diory/diosphere-js'
-import { IConnectionClient, IDataClient } from './types'
+import { IConnectionClient, IDataClient } from '../types'
 
 const DIOSPHERE_JSON = 'diosphere.json'
 const DIOGRAPH_JSON = 'diograph.json'
@@ -44,7 +44,7 @@ class ConnectionClient implements IConnectionClient {
   }
 
   generateDiograph = async (): Promise<IDiographObject> => {
-    const { diograph } = await generateDiograph(this.connection.address) // TODO: Client
+    const { diograph } = await generateDiograph(this.connection.address, this.client)
     return diograph.toObject()
   }
 }

package/src/{dioryClient.ts → dioryClient/dioryClient.ts}

@@ -1,8 +1,8 @@
 import { Diosphere, IConnectionObject, IDiosphere, IRoom, IRoomObject } from '@diory/diosphere-js'
 import { Diograph, IDiograph, IDiory, IDioryObject } from '@diograph/diograph'
 
-import { IDataClient, IDioryClient } from './types'
-import { getConnectionClients } from './utils/getConnectionClients'
+import { IDioryClient, IDataClient } from '../types'
+import { getConnectionClients } from '../utils/getConnectionClients'
 
 class DioryClient implements IDioryClient {
   dataClients: IDataClient[] = []
@@ -39,8 +39,6 @@ class DioryClient implements IDioryClient {
     await this.getDiograph()
     this.focusDiory({ id: '/' })
 
-    await this.generateDiograph()
-
     return this.room
   }
 
@@ -126,7 +124,11 @@ class DioryClient implements IDioryClient {
         connectionClients.map(async (connectionClient) => {
           const diographObject = await connectionClient.generateDiograph()
           console.info(diographObject)
-          this.diograph.addDiograph(diographObject)
+          Object.entries(diographObject).forEach(([key, dioryObject]) => {
+            key === '/'
+              ? this.diograph.addDioryLink({ id: '/' }, diographObject['/'])
+              : this.diograph.addDiory(dioryObject)
+          })
 
           await connectionClient.saveDiograph(this.diograph.toObject())
           return

package/src/index.ts

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

package/src/types.ts

@@ -5,7 +5,21 @@ import {
   IRoom,
   IRoomObject,
 } from '@diory/diosphere-js'
-import { IDiographObject, IDiograph, IDiory, IDioryObject } from '@diograph/diograph'
+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
@@ -18,6 +32,12 @@ export interface IDataClient {
   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>
 }
 
 export interface IConnectionClient {

package/src/utils/getConnectionClients.ts

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