diff --git a/package.json b/package.json index 4196303..668e40d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@chatenium/chatenium-sdk", - "version": "1.0.4", + "version": "1.0.5", "description": "A library for interacting with the Chatenium API", "type": "module", "main": "dist/index.js", diff --git a/src/mocks/storage/keyring.ts b/src/mocks/storage/keyring.ts index f03b5c4..977ede5 100644 --- a/src/mocks/storage/keyring.ts +++ b/src/mocks/storage/keyring.ts @@ -7,12 +7,12 @@ export class KeyringMock implements KeyringAPI { this.ring[key] = value; } - get(key: string): string { - return this.ring[key]; + get(key: string): Promise { + return Promise.resolve(this.ring[key]); } - getAll(): string[] { - return Object.keys(this.ring); + getAll(): Promise { + return Promise.resolve(Object.keys(this.ring)); } delete(key: string) { diff --git a/src/services/chatService.ts b/src/services/chatService.ts index 327b249..0239be1 100644 --- a/src/services/chatService.ts +++ b/src/services/chatService.ts @@ -58,8 +58,8 @@ export class ChatService { } } - getQuick(): Message[] { - const chats = this.database.get("chats", this.userid) + async getQuick(): Promise { + const chats = await this.database.get("chats", this.userid) if (chats) { return JSON.parse(chats) } else { diff --git a/src/services/dmService.ts b/src/services/dmService.ts index 0be7a36..2912308 100644 --- a/src/services/dmService.ts +++ b/src/services/dmService.ts @@ -65,8 +65,8 @@ export class DMService { } } - getQuick(): Message[] { - const messages = this.database.get("messages", this.chatid) + async getQuick(): Promise { + const messages = await this.database.get("messages", this.chatid) if (messages) { return JSON.parse(messages) } else { diff --git a/src/services/networkService.ts b/src/services/networkService.ts index 734abce..0362747 100644 --- a/src/services/networkService.ts +++ b/src/services/networkService.ts @@ -108,8 +108,8 @@ export class NetworkService { } } - getQuick(): Message[] { - const networks = this.database.get("networks", this.userid) + async getQuick(): Promise { + const networks = await this.database.get("networks", this.userid) if (networks) { return JSON.parse(networks) } else { diff --git a/src/services/pictureService.ts b/src/services/pictureService.ts index 63d6ff9..ed496fd 100644 --- a/src/services/pictureService.ts +++ b/src/services/pictureService.ts @@ -54,8 +54,8 @@ export class PictureService { } } - getQuick(): Message[] { - const pictures = this.database.get("pictures", this.uploaderId) + async getQuick(): Promise { + const pictures = await this.database.get("pictures", this.uploaderId) if (pictures) { return JSON.parse(pictures) } else { diff --git a/src/services/sessionManager.ts b/src/services/sessionManager.ts index b11fe27..83a8e60 100644 --- a/src/services/sessionManager.ts +++ b/src/services/sessionManager.ts @@ -33,18 +33,18 @@ export class SessionManager { /** * Loads all saved sessions */ - loadSessions(): Session[] { - const tokens = this.keyring.getAll() + async loadSessions(): Promise { + const tokens = await this.keyring.getAll() const sessions: Session[] = [] - tokens.forEach(token => { - const userData = this.database.get("sessions", token.split(".")[0]) + for (const token of tokens) { + const userData = await this.database.get("sessions", token.split(".")[0]) if (userData) { sessions.push({ token: token, userData: JSON.parse(userData) }) } - }) + } return sessions } @@ -52,8 +52,8 @@ export class SessionManager { /** * Gets the preferred user set by the client */ - getPreferredUser(): string { - return this.KeyValue.get("preferredUser") ?? "" + async getPreferredUser(): Promise { + return await this.KeyValue.get("preferredUser") ?? "" } /** @@ -67,9 +67,9 @@ export class SessionManager { /** * Loads the preferred session by the client */ - loadPreferredSession() { - const sessions = this.loadSessions() - let preferredUser = this.getPreferredUser() + async loadPreferredSession() { + const sessions = await this.loadSessions() + let preferredUser = await this.getPreferredUser() if (preferredUser == "") { preferredUser = sessions[0].userData.userid this.setPreferredUser(sessions[0].userData.userid) diff --git a/src/services/textChannelService.ts b/src/services/textChannelService.ts index 3c91b13..97a6c5d 100644 --- a/src/services/textChannelService.ts +++ b/src/services/textChannelService.ts @@ -71,8 +71,8 @@ export class TextChannelServiceService { } } - getQuick(): Message[] { - const messages = this.database.get("networkmessages", this.channelId) + async getQuick(): Promise { + const messages = await this.database.get("networkmessages", this.channelId) if (messages) { return JSON.parse(messages) } else { diff --git a/src/storage/database.ts b/src/storage/database.ts index f747428..6cdac0e 100644 --- a/src/storage/database.ts +++ b/src/storage/database.ts @@ -1,6 +1,6 @@ export interface DatabaseAPI { set(collection: string, key: string, value: any): void; - get(collection: string, key: string): string; + get(collection: string, key: string): Promise; delete(collection: string, key: string): void; flush(): void; } \ No newline at end of file diff --git a/src/storage/keyring.ts b/src/storage/keyring.ts index 17daad9..566bbfa 100644 --- a/src/storage/keyring.ts +++ b/src/storage/keyring.ts @@ -1,6 +1,6 @@ export interface KeyringAPI { set(key: string, value: any): void; - get(key: string): string; - getAll(): string[]; + get(key: string): Promise; + getAll(): Promise; delete(key: string): void; } \ No newline at end of file diff --git a/src/storage/keyvalue.ts b/src/storage/keyvalue.ts index b52d77b..d635d91 100644 --- a/src/storage/keyvalue.ts +++ b/src/storage/keyvalue.ts @@ -1,6 +1,6 @@ export interface KeyValueAPI { set(key: string, value: any): void; - get(key: string): string; + get(key: string): Promise; delete(key: string): void; flush(): void; } \ No newline at end of file