From 064bc5492d9f428963eb56a8f2f5e83a0b0d929d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=A1=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B3=D0=B5=D0=B9=20=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B5=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=87?= <malko@softclub.by>
Date: Sat, 8 Oct 2022 09:34:39 +0300
Subject: [PATCH 1/4] feat(plugins): Add Webim SDK plugin

---
 .../plugins/webim/index.ts                    | 203 ++++++++++++++++++
 1 file changed, 203 insertions(+)
 create mode 100644 src/@awesome-cordova-plugins/plugins/webim/index.ts

diff --git a/src/@awesome-cordova-plugins/plugins/webim/index.ts b/src/@awesome-cordova-plugins/plugins/webim/index.ts
new file mode 100644
index 0000000000..415a5d6756
--- /dev/null
+++ b/src/@awesome-cordova-plugins/plugins/webim/index.ts
@@ -0,0 +1,203 @@
+import { Injectable } from '@angular/core';
+import { Cordova, AwesomeCordovaNativePlugin, Plugin } from '@awesome-cordova-plugins/core';
+
+export interface InitParams {
+  accountName: string;
+  closeWithClearVisitorData: boolean;
+  storeHistoryLocally: boolean;
+  pushToken: string;
+  location: string;
+  visitorFields: string;
+}
+
+export interface InitResponse {
+  result: string;
+}
+
+
+/**
+ * @name Webim
+ * @description
+ * A cordova plugin, a JS version of Webim SDK
+ * @usage
+ * ```typescript
+ * import { Webim } from '@awesome-cordova-plugins/webim/ngx';
+ *
+ *
+ * constructor(private webim: Webim) { }
+ *
+ * ...
+ *
+ *
+ * this.webim.functionName('Hi bro', 42)
+ *   .then((res: any) => console.log(res))
+ *   .catch((error: any) => console.error(error));
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'Webim',
+  plugin: 'webim-cordova-plugin',
+  pluginRef: 'Webim',
+  repo: 'https://github.com/webim/webim-cordova-plugin.git',
+  install: 'cordova plugin add https://github.com/webim/webim-cordova-plugin.git',
+  platforms: ['Android', 'iOS', 'Browser'],
+})
+@Injectable()
+export class Webim extends AwesomeCordovaNativePlugin {
+
+
+  @Cordova()
+  init(params: InitParams): Promise<InitResponse>{
+    return;
+  }
+
+
+  @Cordova()
+  requestDialog(): Promise<any> {
+    return;
+  }
+
+
+  @Cordova()
+  getMessagesHistory(limit: number, offset: number): Promise<any>{
+    return;
+  }
+
+
+  @Cordova()
+  typingMessage(message: string): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  sendMessage(message: string): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  replyMessage(message: string): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  sendFile(filePath: string): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  sendSurveyAnswer(surveyAnswer: string): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  cancelSurvey(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  onMessage(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  onDeletedMessage(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  onFile(message: string): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  onTyping(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  onConfirm(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  onDialog(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  onBan(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  close(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  rateOperator(id: string, rating: number): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  rateOperatorWithNote(id: string, rating: number, note: string): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  sendDialogToEmailAddress(emailAddress: string): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  onUnreadByVisitorMessageCount(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  onSurvey(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  onNextQuestion(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  onSurveyCancel(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  getUnreadByVisitorMessageCount(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  sendKeyboardRequest(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  setChatRead(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  getShowEmailButton(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  showRateOperatorWindow(): Promise<any>{
+    return;
+  }
+
+  @Cordova()
+  onLogging(): Promise<any>{
+    return;
+  }
+
+}

From e78cf6c81e16048deff3715ee941e03d00d090f7 Mon Sep 17 00:00:00 2001
From: SerjMalko <serhey_rti@mail.ru>
Date: Sat, 15 Oct 2022 09:55:43 +0300
Subject: [PATCH 2/4] feat(webim): Add request/response models

---
 .../plugins/webim/index.ts                    | 148 ++++++++++++------
 1 file changed, 103 insertions(+), 45 deletions(-)

diff --git a/src/@awesome-cordova-plugins/plugins/webim/index.ts b/src/@awesome-cordova-plugins/plugins/webim/index.ts
index 415a5d6756..7bfd10b61b 100644
--- a/src/@awesome-cordova-plugins/plugins/webim/index.ts
+++ b/src/@awesome-cordova-plugins/plugins/webim/index.ts
@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, AwesomeCordovaNativePlugin, Plugin } from '@awesome-cordova-plugins/core';
+import { AwesomeCordovaNativePlugin, Cordova, Plugin } from '@awesome-cordova-plugins/core';
+import { Observable } from 'rxjs';
 
 export interface InitParams {
   accountName: string;
@@ -10,21 +11,84 @@ export interface InitParams {
   visitorFields: string;
 }
 
-export interface InitResponse {
+export interface DefaultResponse {
   result: string;
 }
 
+export interface Quote {
+  state: string;
+  id: string;
+  text: string;
+  url: string;
+  timestamp: string;
+  senderName: string;
+  authorID: string;
+}
+
+export interface Employee {
+  id: string;
+  firstname: string;
+  avatar: string;
+}
+
+export interface Keyboard {
+  state: string;
+  buttons: Array<KeyboardButton>;
+  keyboardResponse: KeyboardResponse;
+}
+
+export interface KeyboardRequest {
+  messageID: string;
+  button: KeyboardButton;
+}
+
+export interface KeyboardButton {
+  text: string;
+  id: string;
+}
+
+export interface KeyboardResponse {
+  buttonID: string;
+  messageID: string;
+}
+
+export interface Message {
+  id: string;
+  currentChatID: string;
+  text: string;
+  url: string;
+  imageWidth: number;
+  imageHeight: number;
+  thumbUrl: string;
+  timestamp: string;
+  sender: string;
+  quote: Quote;
+  operator: Employee;
+  keyboard: Keyboard;
+  keyboardRequest: KeyboardRequest;
+  isFirst: boolean;
+  isReadByOperator: boolean;
+  canBeReplied: boolean;
+}
+
+export interface DialogState {
+  employee: Employee;
+}
+
+export type MessagesHistoryResponse = Array<Message>;
+export type MessageResponse = Message;
+export type DialogStateResponse = DialogState;
 
 /**
- * @name Webim
+ * @name WebimSDK
  * @description
  * A cordova plugin, a JS version of Webim SDK
  * @usage
  * ```typescript
- * import { Webim } from '@awesome-cordova-plugins/webim/ngx';
+ * import { WebimSDK } from '@awesome-cordova-plugins/webim/ngx';
  *
  *
- * constructor(private webim: Webim) { }
+ * constructor(private webim: WebimSDK) { }
  *
  * ...
  *
@@ -36,168 +100,162 @@ export interface InitResponse {
  * ```
  */
 @Plugin({
-  pluginName: 'Webim',
-  plugin: 'webim-cordova-plugin',
-  pluginRef: 'Webim',
+  pluginName: 'WebimSDK',
+  plugin: 'ru.webim.sdk',
+  pluginRef: 'webimsdk',
   repo: 'https://github.com/webim/webim-cordova-plugin.git',
   install: 'cordova plugin add https://github.com/webim/webim-cordova-plugin.git',
   platforms: ['Android', 'iOS', 'Browser'],
 })
 @Injectable()
-export class Webim extends AwesomeCordovaNativePlugin {
-
-
+export class WebimSDK extends AwesomeCordovaNativePlugin {
   @Cordova()
-  init(params: InitParams): Promise<InitResponse>{
+  init(params: InitParams): Promise<DefaultResponse> {
     return;
   }
 
-
   @Cordova()
-  requestDialog(): Promise<any> {
+  requestDialog(): Promise<DefaultResponse> {
     return;
   }
 
-
   @Cordova()
-  getMessagesHistory(limit: number, offset: number): Promise<any>{
+  getMessagesHistory(limit: number, offset: number): Promise<MessagesHistoryResponse | DefaultResponse> {
     return;
   }
 
-
   @Cordova()
-  typingMessage(message: string): Promise<any>{
+  typingMessage(message: string): Promise<string> {
     return;
   }
 
   @Cordova()
-  sendMessage(message: string): Promise<any>{
+  sendMessage(message: string): Promise<MessageResponse | DefaultResponse> {
     return;
   }
 
   @Cordova()
-  replyMessage(message: string): Promise<any>{
+  replyMessage(message: string, repliedMessage: Message): Promise<MessageResponse | DefaultResponse> {
     return;
   }
 
   @Cordova()
-  sendFile(filePath: string): Promise<any>{
+  sendFile(filePath: string): Promise<string | DefaultResponse> {
     return;
   }
 
   @Cordova()
-  sendSurveyAnswer(surveyAnswer: string): Promise<any>{
+  sendSurveyAnswer(surveyAnswer: string): Promise<any> {
     return;
   }
 
   @Cordova()
-  cancelSurvey(): Promise<any>{
+  cancelSurvey(): Promise<any> {
     return;
   }
 
   @Cordova()
-  onMessage(): Promise<any>{
+  onMessage(): Observable<MessageResponse> {
     return;
   }
 
   @Cordova()
-  onDeletedMessage(): Promise<any>{
+  onDeletedMessage(): Observable<MessageResponse> {
     return;
   }
 
   @Cordova()
-  onFile(message: string): Promise<any>{
+  onFile(message: string): Observable<MessageResponse> {
     return;
   }
 
   @Cordova()
-  onTyping(): Promise<any>{
+  onTyping(): Observable<unknown> {
     return;
   }
 
   @Cordova()
-  onConfirm(): Promise<any>{
+  onConfirm(): Observable<MessageResponse> {
     return;
   }
 
   @Cordova()
-  onDialog(): Promise<any>{
+  onDialog(): Observable<DialogStateResponse> {
     return;
   }
 
   @Cordova()
-  onBan(): Promise<any>{
+  onBan(): Observable<unknown> {
     return;
   }
 
   @Cordova()
-  close(): Promise<any>{
+  close(): Observable<DefaultResponse> {
     return;
   }
 
   @Cordova()
-  rateOperator(id: string, rating: number): Promise<any>{
+  rateOperator(id: string, rating: number): Promise<any> {
     return;
   }
 
   @Cordova()
-  rateOperatorWithNote(id: string, rating: number, note: string): Promise<any>{
+  rateOperatorWithNote(id: string, rating: number, note: string): Promise<any> {
     return;
   }
 
   @Cordova()
-  sendDialogToEmailAddress(emailAddress: string): Promise<any>{
+  sendDialogToEmailAddress(emailAddress: string): Promise<any> {
     return;
   }
 
   @Cordova()
-  onUnreadByVisitorMessageCount(): Promise<any>{
+  onUnreadByVisitorMessageCount(): Observable<unknown> {
     return;
   }
 
   @Cordova()
-  onSurvey(): Promise<any>{
+  onSurvey(): Observable<unknown> {
     return;
   }
 
   @Cordova()
-  onNextQuestion(): Promise<any>{
+  onNextQuestion(): Observable<unknown> {
     return;
   }
 
   @Cordova()
-  onSurveyCancel(): Promise<any>{
+  onSurveyCancel(): Observable<unknown> {
     return;
   }
 
   @Cordova()
-  getUnreadByVisitorMessageCount(): Promise<any>{
+  getUnreadByVisitorMessageCount(): Promise<any> {
     return;
   }
 
   @Cordova()
-  sendKeyboardRequest(): Promise<any>{
+  sendKeyboardRequest(): Promise<any> {
     return;
   }
 
   @Cordova()
-  setChatRead(): Promise<any>{
+  setChatRead(): Promise<any> {
     return;
   }
 
   @Cordova()
-  getShowEmailButton(): Promise<any>{
+  getShowEmailButton(): Promise<any> {
     return;
   }
 
   @Cordova()
-  showRateOperatorWindow(): Promise<any>{
+  showRateOperatorWindow(): Promise<any> {
     return;
   }
 
   @Cordova()
-  onLogging(): Promise<any>{
+  onLogging(): Observable<unknown> {
     return;
   }
-
 }

From a99ef4131856aebe2de35a3584ac79b4d314b267 Mon Sep 17 00:00:00 2001
From: SerjMalko <serhey_rti@mail.ru>
Date: Thu, 20 Oct 2022 12:25:52 +0300
Subject: [PATCH 3/4] feat(webim): Fix Observable methods

---
 .../plugins/webim/index.ts                    | 68 ++++++++++++++-----
 1 file changed, 52 insertions(+), 16 deletions(-)

diff --git a/src/@awesome-cordova-plugins/plugins/webim/index.ts b/src/@awesome-cordova-plugins/plugins/webim/index.ts
index 7bfd10b61b..cdfaac6f08 100644
--- a/src/@awesome-cordova-plugins/plugins/webim/index.ts
+++ b/src/@awesome-cordova-plugins/plugins/webim/index.ts
@@ -80,7 +80,7 @@ export type MessageResponse = Message;
 export type DialogStateResponse = DialogState;
 
 /**
- * @name WebimSDK
+ * @name Webim
  * @description
  * A cordova plugin, a JS version of Webim SDK
  * @usage
@@ -100,7 +100,7 @@ export type DialogStateResponse = DialogState;
  * ```
  */
 @Plugin({
-  pluginName: 'WebimSDK',
+  pluginName: 'Webim',
   plugin: 'ru.webim.sdk',
   pluginRef: 'webimsdk',
   repo: 'https://github.com/webim/webim-cordova-plugin.git',
@@ -108,7 +108,7 @@ export type DialogStateResponse = DialogState;
   platforms: ['Android', 'iOS', 'Browser'],
 })
 @Injectable()
-export class WebimSDK extends AwesomeCordovaNativePlugin {
+export class Webim extends AwesomeCordovaNativePlugin {
   @Cordova()
   init(params: InitParams): Promise<DefaultResponse> {
     return;
@@ -154,43 +154,64 @@ export class WebimSDK extends AwesomeCordovaNativePlugin {
     return;
   }
 
-  @Cordova()
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+  })
   onMessage(): Observable<MessageResponse> {
     return;
   }
 
-  @Cordova()
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+  })
   onDeletedMessage(): Observable<MessageResponse> {
     return;
   }
 
-  @Cordova()
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+  })
   onFile(message: string): Observable<MessageResponse> {
     return;
   }
 
-  @Cordova()
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+  })
   onTyping(): Observable<unknown> {
     return;
   }
 
-  @Cordova()
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+  })
   onConfirm(): Observable<MessageResponse> {
     return;
   }
 
-  @Cordova()
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+  })
   onDialog(): Observable<DialogStateResponse> {
     return;
   }
 
-  @Cordova()
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+  })
   onBan(): Observable<unknown> {
     return;
   }
 
   @Cordova()
-  close(): Observable<DefaultResponse> {
+  close(): Promise<DefaultResponse> {
     return;
   }
 
@@ -209,22 +230,34 @@ export class WebimSDK extends AwesomeCordovaNativePlugin {
     return;
   }
 
-  @Cordova()
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+  })
   onUnreadByVisitorMessageCount(): Observable<unknown> {
     return;
   }
 
-  @Cordova()
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+  })
   onSurvey(): Observable<unknown> {
     return;
   }
 
-  @Cordova()
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+  })
   onNextQuestion(): Observable<unknown> {
     return;
   }
 
-  @Cordova()
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+  })
   onSurveyCancel(): Observable<unknown> {
     return;
   }
@@ -254,7 +287,10 @@ export class WebimSDK extends AwesomeCordovaNativePlugin {
     return;
   }
 
-  @Cordova()
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+  })
   onLogging(): Observable<unknown> {
     return;
   }

From 5dd5bf6906711419a15f383b9f9a674a56d9984f Mon Sep 17 00:00:00 2001
From: Serj Malko <sergey_rti@mail.ru>
Date: Thu, 20 Oct 2022 12:40:01 +0300
Subject: [PATCH 4/4] Update index.ts

---
 src/@awesome-cordova-plugins/plugins/webim/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/@awesome-cordova-plugins/plugins/webim/index.ts b/src/@awesome-cordova-plugins/plugins/webim/index.ts
index cdfaac6f08..a058efabea 100644
--- a/src/@awesome-cordova-plugins/plugins/webim/index.ts
+++ b/src/@awesome-cordova-plugins/plugins/webim/index.ts
@@ -85,10 +85,10 @@ export type DialogStateResponse = DialogState;
  * A cordova plugin, a JS version of Webim SDK
  * @usage
  * ```typescript
- * import { WebimSDK } from '@awesome-cordova-plugins/webim/ngx';
+ * import { Webim } from '@awesome-cordova-plugins/webim/ngx';
  *
  *
- * constructor(private webim: WebimSDK) { }
+ * constructor(private webim: Webim) { }
  *
  * ...
  *