Add CommandResultDone default generic type

Fix destructed result into CommandResult.
Add request util for unwrapping result.

Author: storycraft

src/request/index.ts

@@ -52,26 +52,28 @@ export enum KnownDataStatusCode {
 
 export type DataStatusCode = KnownDataStatusCode | number;
 
-export interface DefaultReq {
+export interface ResponseState {
 
-  [key: string]: unknown;
+  status: DataStatusCode;
 
 }
 
-export interface DefaultRes {
+export interface DefaultReq {
 
-  status: DataStatusCode;
   [key: string]: unknown;
 
 }
 
+export interface DefaultRes extends DefaultReq, ResponseState {
+
+}
+
 /**
  * Wrapped request response.
  */
-interface RootCommandResult {
+interface RootCommandResult extends ResponseState {
 
   readonly success: boolean;
-  readonly status: DataStatusCode;
 
 }
 
@@ -94,6 +96,6 @@ interface CommandResultDoneVoid extends RootCommandResult {
 
 }
 
-export type CommandResultDone<T> = (T extends void ? CommandResultDoneVoid : CommandResultDoneValue<T>);
+export type CommandResultDone<T = void> = (T extends void ? CommandResultDoneVoid : CommandResultDoneValue<T>);
 export type CommandResult<T = void> = CommandResultFailed | CommandResultDone<T>;
 export type AsyncCommandResult<T = void> = Promise<CommandResult<T>>;

src/talk/openlink/talk-open-channel-data-session.ts

@@ -43,7 +43,7 @@ export class TalkOpenChannelDataSession implements OpenChannelSession {
     return this._store;
   }
 
-  async markRead(chat: ChatLogged): Promise<{ success: boolean, status: number }> {
+  async markRead(chat: ChatLogged): AsyncCommandResult {
     const res = await this._channelSession.markRead(chat);
 
     if (res.success) {
@@ -160,7 +160,7 @@ export class TalkOpenChannelDataSession implements OpenChannelSession {
     chat: ChatLoggedType,
     type: RelayEventType,
     count: number,
-  ): Promise<{ status: number, success: boolean }> {
+  ): AsyncCommandResult {
     return this._channelSession.createEvent(chat, type, count);
   }
 
@@ -214,7 +214,7 @@ export class TalkOpenChannelDataSession implements OpenChannelSession {
     return this._channelSession.blockUser(user);
   }
 
-  react(flag: boolean): Promise<{ status: number, success: boolean }> {
+  react(flag: boolean): AsyncCommandResult {
     return this._channelSession.react(flag);
   }
 

src/talk/openlink/talk-open-channel-session.ts

@@ -143,7 +143,7 @@ export class TalkOpenChannelSession implements OpenChannelSession {
     return this._linkSession.removeKicked(this._channel, { ...user, kickedChannelId: this._channel.channelId });
   }
 
-  react(flag: boolean): Promise<{ status: number, success: boolean }> {
+  react(flag: boolean): AsyncCommandResult {
     return this._linkSession.react(this._channel, flag);
   }
 
@@ -179,7 +179,7 @@ export class TalkOpenChannelSession implements OpenChannelSession {
     chat: ChatLoggedType,
     type: RelayEventType,
     count: number,
-  ): Promise<{ status: number, success: boolean }> {
+  ): AsyncCommandResult {
     const res = await this._session.request(
       'RELAYEVENT',
       {

src/talk/openlink/talk-open-channel.ts

@@ -150,7 +150,7 @@ export class TalkOpenChannel
     return this._channelSession.forwardChat(chat, noSeen);
   }
 
-  deleteChat(chat: ChatLogged): Promise<{ success: boolean, status: number }> {
+  deleteChat(chat: ChatLogged): AsyncCommandResult {
     return this._channelSession.deleteChat(chat);
   }
 

src/talk/openlink/talk-open-link-session.ts

@@ -128,7 +128,7 @@ export class TalkOpenLinkSession implements OpenLinkSession {
     return { status: res.status, success: res.status === KnownDataStatusCode.SUCCESS };
   }
 
-  async react(link: OpenLinkComponent, flag: boolean): Promise<{ status: number, success: boolean }> {
+  async react(link: OpenLinkComponent, flag: boolean): AsyncCommandResult {
     const res = await this._session.request<JoinInfoRes>(
       'REACT',
       {

src/util/index.ts

@@ -7,3 +7,4 @@
 export * from './chained-iterator';
 export * from './json-util';
 export * from './device';
+export * from './request';

src/util/request.ts

@@ -0,0 +1,22 @@
+/*
+ * Created on Sun Jul 04 2021
+ *
+ * Copyright (c) storycraft. Licensed under the MIT Licence.
+ */
+
+import { CommandResult, CommandResultDone } from "../request";
+
+/**
+ * Unwrap CommandResult and convert failed case into error.
+ *
+ * @template T
+ * @param {CommandResult<T>} commandRes CommandResult to unwrap
+ * @return {T} Unwrapped result
+ */
+export function unwrapResult<T>(commandRes: CommandResult<T>): CommandResultDone<T> {
+  if (!commandRes.success) {
+    throw new Error(`Request failed with status: ${commandRes.status}`);
+  }
+
+  return commandRes;
+}