refactor: update vtc with newer version

Author: einazare

assets/js/asr-client-js-main/.github/ISSUE_TEMPLATE/bug_report.yml renamed to assets/js/asr-client-js-refactor-VAT-385-453/.github/ISSUE_TEMPLATE/bug_report.yml

@@ -16,7 +16,24 @@ body:
       description: Please specify what version of `@vatis-tech/asr-client-js` you are using, and also, please check if the issue is reproducible with the latest stable version of the plugin.
       multiple: true
       options:
+        - 1.2.2
+        - 1.2.1
+        - 1.2.1-rc.1
+        - 1.2.1-rc.0
+        - 1.2.0
+        - 1.1.1
+        - 1.1.0
+        - 1.1.0-rc.0
         - 1.0.0
+        - 1.0.0-rc.8
+        - 1.0.0-rc.7
+        - 1.0.0-rc.6
+        - 1.0.0-rc.5
+        - 1.0.0-rc.4
+        - 1.0.0-rc.3
+        - 1.0.0-rc.2
+        - 1.0.0-rc.1
+        - 1.0.0-rc.0
     validations:
       required: true
   - type: dropdown

assets/js/asr-client-js-main/.github/ISSUE_TEMPLATE/config.yml renamed to assets/js/asr-client-js-refactor-VAT-385-453/.github/ISSUE_TEMPLATE/config.yml

@@ -16,7 +16,24 @@ body:
       description: Please specify what version of `@vatis-tech/asr-client-js` do you want to use.
       multiple: true
       options:
+        - 1.2.2
+        - 1.2.1
+        - 1.2.1-rc.1
+        - 1.2.1-rc.0
+        - 1.2.0
+        - 1.1.1
+        - 1.1.0
+        - 1.1.0-rc.0
         - 1.0.0
+        - 1.0.0-rc.8
+        - 1.0.0-rc.7
+        - 1.0.0-rc.6
+        - 1.0.0-rc.5
+        - 1.0.0-rc.4
+        - 1.0.0-rc.3
+        - 1.0.0-rc.2
+        - 1.0.0-rc.1
+        - 1.0.0-rc.0
     validations:
       required: true
   - type: dropdown

assets/js/asr-client-js-main/.github/ISSUE_TEMPLATE/feature_request.yml renamed to assets/js/asr-client-js-refactor-VAT-385-453/.github/ISSUE_TEMPLATE/feature_request.yml

@@ -51,6 +51,24 @@ No fixes were made.
 
 Each time you add new changes to this file, please add them bellow this line - i.e. between the [insertion](#insterion) section and the last version added.
 
+## [1.3.0] - 2022-05-03
+
+### Added
+
+No new features were added.
+
+### Changed
+
+- Right now, instead of sending one message and waiting for its full response, you can send up to `waitingAfterMessages` before waiting for full responses
+
+### Removed
+
+Nothing was removed.
+
+### Fixed
+
+No fixes were made.
+
 ## [1.2.0] - 2022-04-11
 
 ### Added

assets/js/asr-client-js-main/.github/ISSUE_TEMPLATE/help_wanted.yml renamed to assets/js/asr-client-js-refactor-VAT-385-453/.github/ISSUE_TEMPLATE/help_wanted.yml

@@ -1,6 +1,6 @@
 # @vatis-tech/asr-client-js
 
-![version](https://img.shields.io/badge/version-1.2.1-blue.svg)
+![version](https://img.shields.io/badge/version-1.3.0-blue.svg)
 ![license](https://img.shields.io/badge/license-MIT-blue.svg)
 ![GitHub issues open](https://img.shields.io/github/issues/Vatis-Tech/asr-client-js.svg)
 ![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/Vatis-Tech/asr-client-js.svg)
@@ -244,6 +244,10 @@ Default is `0.3 seconds`.
 
 Default is `0.3 seconds`.
 
+### `waitingAfterMessages`
+
+This is a **number** that needs to be _> 0_. It represents the number of message to be sent to the ASR Service, before waiting for a response. Default is `5`.
+
 ## Methods
 
 ### `destroy`

assets/js/asr-client-js-main/.gitignore renamed to assets/js/asr-client-js-refactor-VAT-385-453/.gitignore

@@ -51,6 +51,24 @@ No fixes were made.
 
 Each time you add new changes to this file, please add them bellow this line - i.e. between the [insertion](#insterion) section and the last version added.
 
+## [1.3.0] - 2022-05-03
+
+### Added
+
+No new features were added.
+
+### Changed
+
+- Right now, instead of sending one message and waiting for its full response, you can send up to `waitingAfterMessages` before waiting for full responses
+
+### Removed
+
+Nothing was removed.
+
+### Fixed
+
+No fixes were made.
+
 ## [1.2.0] - 2022-04-11
 
 ### Added

assets/js/asr-client-js-main/CHANGELOG.md renamed to assets/js/asr-client-js-refactor-VAT-385-453/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @vatis-tech/asr-client-js
 
-![version](https://img.shields.io/badge/version-1.2.1-blue.svg)
+![version](https://img.shields.io/badge/version-1.3.0-blue.svg)
 ![license](https://img.shields.io/badge/license-MIT-blue.svg)
 ![GitHub issues open](https://img.shields.io/github/issues/Vatis-Tech/asr-client-js.svg)
 ![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/Vatis-Tech/asr-client-js.svg)
@@ -244,6 +244,10 @@ Default is `0.3 seconds`.
 
 Default is `0.3 seconds`.
 
+### `waitingAfterMessages`
+
+This is a **number** that needs to be _> 0_. It represents the number of message to be sent to the ASR Service, before waiting for a response. Default is `5`.
+
 ## Methods
 
 ### `destroy`

assets/js/asr-client-js-main/CODE_OF_CONDUCT.md renamed to assets/js/asr-client-js-refactor-VAT-385-453/CODE_OF_CONDUCT.md

@@ -73,7 +73,9 @@ var InstanceReservation = /*#__PURE__*/function () {
     key: "onLoad",
     value: function onLoad() {
       if (this.xmlHttp.status !== 200) {
-        this.onError(JSON.parse(this.xmlHttp.responseText));
+        this.onError({
+          status: this.xmlHttp.status
+        });
         return;
       }
 

assets/js/asr-client-js-main/CONTRIBUTING.md renamed to assets/js/asr-client-js-refactor-VAT-385-453/CONTRIBUTING.md

@@ -60,6 +60,11 @@ var MicrophoneGenerator = /*#__PURE__*/function () {
     value: function destroy() {
       if (this.mediaRecorder && this.mediaRecorder.state !== "inactive") {
         this.mediaRecorder.stop();
+        this.onDataCallback({
+          data: "",
+          flush: "True",
+          close: "True"
+        });
       }
 
       if (this.stream) {
@@ -115,7 +120,9 @@ var MicrophoneGenerator = /*#__PURE__*/function () {
 
                     reader.onloadend = function () {
                       // You can upload the base64 to server here.
-                      _this2.onDataCallback(reader.result.replace("data:audio/webm;codecs=opus;base64,", "").replace("data:audio/webm; codecs=opus; base64,", ""));
+                      _this2.onDataCallback({
+                        data: reader.result.replace("data:audio/webm;codecs=opus;base64,", "").replace("data:audio/webm; codecs=opus; base64,", "")
+                      });
                     };
 
                     reader.readAsDataURL(e.data); // if (e.data.size > 0) {

assets/js/asr-client-js-main/LICENSE.md renamed to assets/js/asr-client-js-refactor-VAT-385-453/LICENSE.md

@@ -26,6 +26,10 @@ var SOCKET_IO_CLIENT_NAMESPACE = _index["default"].SOCKET_IO_CLIENT_NAMESPACE,
     SOCKET_IO_CLIENT_BUFFER_OFFSET = _index["default"].SOCKET_IO_CLIENT_BUFFER_OFFSET,
     SOCKET_IO_CLIENT_AUDIO_FORMAT = _index["default"].SOCKET_IO_CLIENT_AUDIO_FORMAT,
     SOCKET_IO_CLIENT_SENDING_HEADERS = _index["default"].SOCKET_IO_CLIENT_SENDING_HEADERS,
+    SOCKET_IO_CLIENT_DISABLE_DISFLUENCIES = _index["default"].SOCKET_IO_CLIENT_DISABLE_DISFLUENCIES,
+    SOCKET_IO_CLIENT_ENABLE_PUNCTUATION_CAPITALIZATION = _index["default"].SOCKET_IO_CLIENT_ENABLE_PUNCTUATION_CAPITALIZATION,
+    SOCKET_IO_CLIENT_ENABLE_ENTITIES_RECOGNITION = _index["default"].SOCKET_IO_CLIENT_ENABLE_ENTITIES_RECOGNITION,
+    SOCKET_IO_CLIENT_ENABLE_NUMERALS_CONVERSION = _index["default"].SOCKET_IO_CLIENT_ENABLE_NUMERALS_CONVERSION,
     MICROPHONE_FRAME_LENGTH = _index["default"].MICROPHONE_FRAME_LENGTH,
     MICROPHONE_TIMESLICE = _index["default"].MICROPHONE_TIMESLICE;
 
@@ -51,6 +55,7 @@ var SocketIOClientGenerator = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "frameOverlap", void 0);
     (0, _defineProperty2["default"])(this, "bufferOffset", void 0);
     (0, _defineProperty2["default"])(this, "errorHandler", void 0);
+    (0, _defineProperty2["default"])(this, "sendClosePacket", void 0);
     this.errorHandler = errorHandler;
     this.logger = logger;
     this.logger({
@@ -63,6 +68,7 @@ var SocketIOClientGenerator = /*#__PURE__*/function () {
     this.frameLength = frameLength;
     this.frameOverlap = frameOverlap;
     this.bufferOffset = bufferOffset;
+    this.sendClosePacket = true;
   }
 
   (0, _createClass2["default"])(SocketIOClientGenerator, [{
@@ -92,7 +98,11 @@ var SocketIOClientGenerator = /*#__PURE__*/function () {
           FrameOverlap: this.frameOverlap ? this.frameOverlap : SOCKET_IO_CLIENT_FRAME_OVERLAP,
           BufferOffset: this.bufferOffset ? this.bufferOffset : SOCKET_IO_CLIENT_BUFFER_OFFSET,
           AudioFormat: SOCKET_IO_CLIENT_AUDIO_FORMAT,
-          SendingHeaders: SOCKET_IO_CLIENT_SENDING_HEADERS
+          SendingHeaders: SOCKET_IO_CLIENT_SENDING_HEADERS,
+          DisableDisfluencies: SOCKET_IO_CLIENT_DISABLE_DISFLUENCIES,
+          EnablePunctuationCapitalization: SOCKET_IO_CLIENT_ENABLE_PUNCTUATION_CAPITALIZATION,
+          EnableEntitiesRecognition: SOCKET_IO_CLIENT_ENABLE_ENTITIES_RECOGNITION,
+          EnableNumeralsConversion: SOCKET_IO_CLIENT_ENABLE_NUMERALS_CONVERSION
         }
       });
       this.socketRef.on("connect", function () {
@@ -138,14 +148,24 @@ var SocketIOClientGenerator = /*#__PURE__*/function () {
   }, {
     key: "emitData",
     value: function emitData(data) {
-      this.socketRef.emit(SOCKET_IO_CLIENT_REQUEST_PATH, {
-        data: data
-      });
+      if (data.close === "True" || data.flush === "True") {
+        this.sendClosePacket = false;
+      }
+
+      this.socketRef.emit(SOCKET_IO_CLIENT_REQUEST_PATH, data);
     }
   }, {
     key: "destroy",
     value: function destroy() {
       this.socketRef.off("disconnect");
+
+      if (this.sendClosePacket) {
+        this.socketRef.emit(SOCKET_IO_CLIENT_REQUEST_PATH, {
+          close: "True",
+          data: ""
+        });
+      }
+
       this.socketRef.disconnect();
     }
   }]);

assets/js/asr-client-js-main/README.md renamed to assets/js/asr-client-js-refactor-VAT-385-453/README.md

@@ -7,24 +7,30 @@ exports["default"] = void 0;
 var API_URL = "https://vatis.tech/api/v1";
 var API_URL_PATH = "/asr-client/auth?service=<service>&model=<model>&language=<language>";
 var RESERVATION_URL = "<service_host>/asr/v1/registry/stream/reserve";
+var WAIT_AFTER_MESSAGES = 10;
 var SOCKET_IO_CLIENT_NAMESPACE = "/asr_stream";
 var SOCKET_IO_CLIENT_TRANSPORTS = ["websocket"];
 var SOCKET_IO_CLIENT_PATH = "/live/transcribe/socket.io";
 var SOCKET_IO_CLIENT_RESULT_PATH = "/asr_result";
 var SOCKET_IO_CLIENT_REQUEST_PATH = "/asr_request";
 var SOCKET_IO_CLIENT_RESPONSE_SPLIT_PACKET = "SplitPacket";
 var SOCKET_IO_CLIENT_RESPONSE_FINAL_SPLIT_PACKET = "FinalSplitPacket";
-var SOCKET_IO_CLIENT_FRAME_OVERLAP = 0.3;
-var SOCKET_IO_CLIENT_BUFFER_OFFSET = 0.3;
+var SOCKET_IO_CLIENT_FRAME_OVERLAP = 1.0;
+var SOCKET_IO_CLIENT_BUFFER_OFFSET = 0.5;
 var SOCKET_IO_CLIENT_AUDIO_FORMAT = "webm";
 var SOCKET_IO_CLIENT_SENDING_HEADERS = "True";
-var MICROPHONE_FRAME_LENGTH = 0.3;
-var MICROPHONE_BIT_RATE_SAMPLES = 8000;
-var MICROPHONE_TIMESLICE = 250;
+var SOCKET_IO_CLIENT_DISABLE_DISFLUENCIES = "True";
+var SOCKET_IO_CLIENT_ENABLE_PUNCTUATION_CAPITALIZATION = "True";
+var SOCKET_IO_CLIENT_ENABLE_ENTITIES_RECOGNITION = "True";
+var SOCKET_IO_CLIENT_ENABLE_NUMERALS_CONVERSION = "True";
+var MICROPHONE_FRAME_LENGTH = 0.6;
+var MICROPHONE_BIT_RATE_SAMPLES = 16000;
+var MICROPHONE_TIMESLICE = 500;
 var projectConstants = {
   API_URL_PATH: API_URL_PATH,
   API_URL: API_URL,
   RESERVATION_URL: RESERVATION_URL,
+  WAIT_AFTER_MESSAGES: WAIT_AFTER_MESSAGES,
   SOCKET_IO_CLIENT_NAMESPACE: SOCKET_IO_CLIENT_NAMESPACE,
   SOCKET_IO_CLIENT_TRANSPORTS: SOCKET_IO_CLIENT_TRANSPORTS,
   SOCKET_IO_CLIENT_PATH: SOCKET_IO_CLIENT_PATH,
@@ -36,6 +42,10 @@ var projectConstants = {
   SOCKET_IO_CLIENT_BUFFER_OFFSET: SOCKET_IO_CLIENT_BUFFER_OFFSET,
   SOCKET_IO_CLIENT_AUDIO_FORMAT: SOCKET_IO_CLIENT_AUDIO_FORMAT,
   SOCKET_IO_CLIENT_SENDING_HEADERS: SOCKET_IO_CLIENT_SENDING_HEADERS,
+  SOCKET_IO_CLIENT_DISABLE_DISFLUENCIES: SOCKET_IO_CLIENT_DISABLE_DISFLUENCIES,
+  SOCKET_IO_CLIENT_ENABLE_PUNCTUATION_CAPITALIZATION: SOCKET_IO_CLIENT_ENABLE_PUNCTUATION_CAPITALIZATION,
+  SOCKET_IO_CLIENT_ENABLE_ENTITIES_RECOGNITION: SOCKET_IO_CLIENT_ENABLE_ENTITIES_RECOGNITION,
+  SOCKET_IO_CLIENT_ENABLE_NUMERALS_CONVERSION: SOCKET_IO_CLIENT_ENABLE_NUMERALS_CONVERSION,
   MICROPHONE_FRAME_LENGTH: MICROPHONE_FRAME_LENGTH,
   MICROPHONE_BIT_RATE_SAMPLES: MICROPHONE_BIT_RATE_SAMPLES,
   MICROPHONE_TIMESLICE: MICROPHONE_TIMESLICE

assets/js/asr-client-js-main/babel.config.json renamed to assets/js/asr-client-js-refactor-VAT-385-453/babel.config.json

@@ -23,14 +23,13 @@ var _MicrophoneGenerator = _interopRequireDefault(require("./components/Micropho
 
 var _MicrophoneQueue = _interopRequireDefault(require("./components/MicrophoneQueue.js"));
 
-var _index = _interopRequireDefault(require("./helpers/functions/index.js"));
+var _index = _interopRequireDefault(require("./helpers/constants/index.js"));
 
-// import constants from "../helpers/constants/index.js";
-// const {
-//
-// } = constants;
-var generateApiUrl = _index["default"].generateApiUrl,
-    checkIfFinalPacket = _index["default"].checkIfFinalPacket;
+var _index2 = _interopRequireDefault(require("./helpers/functions/index.js"));
+
+var WAIT_AFTER_MESSAGES = _index["default"].WAIT_AFTER_MESSAGES;
+var generateApiUrl = _index2["default"].generateApiUrl,
+    checkIfFinalPacket = _index2["default"].checkIfFinalPacket;
 
 var VatisTechClient = /*#__PURE__*/function () {
   function VatisTechClient(_ref) {
@@ -47,7 +46,8 @@ var VatisTechClient = /*#__PURE__*/function () {
         frameLength = _ref.frameLength,
         frameOverlap = _ref.frameOverlap,
         bufferOffset = _ref.bufferOffset,
-        errorHandler = _ref.errorHandler;
+        errorHandler = _ref.errorHandler,
+        waitingAfterMessages = _ref.waitingAfterMessages;
     (0, _classCallCheck2["default"])(this, VatisTechClient);
     (0, _defineProperty2["default"])(this, "microphoneGenerator", void 0);
     (0, _defineProperty2["default"])(this, "instanceReservation", void 0);
@@ -56,6 +56,7 @@ var VatisTechClient = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "microphoneQueue", void 0);
     (0, _defineProperty2["default"])(this, "onData", void 0);
     (0, _defineProperty2["default"])(this, "waitingForFinalPacket", void 0);
+    (0, _defineProperty2["default"])(this, "waitingAfterMessages", void 0);
     (0, _defineProperty2["default"])(this, "logger", void 0);
     (0, _defineProperty2["default"])(this, "log", void 0);
     (0, _defineProperty2["default"])(this, "shouldDestroy", void 0);
@@ -81,9 +82,16 @@ var VatisTechClient = /*#__PURE__*/function () {
     this.logger({
       currentState: "@vatis-tech/asr-client-js: Initilizing plugin.",
       description: "@vatis-tech/asr-client-js: This is the base constructor which initilizez everything for the LIVE ASR service of Vatis Tech."
-    }); // this is a flag that says if the whole response for the previous packet was received or not
+    });
+
+    if (waitingAfterMessages && waitingAfterMessages > 0) {
+      this.waitingAfterMessages = waitingAfterMessages;
+    } else {
+      this.waitingAfterMessages = WAIT_AFTER_MESSAGES;
+    } // this is a flag that says if the whole response for the previous packet was received or not
 
-    this.waitingForFinalPacket = false; // this is a flag that says if the user wants to destroy the VTC client
+
+    this.waitingForFinalPacket = 0; // this is a flag that says if the user wants to destroy the VTC client
     // but since there might be data to be received by the socket, or to be sent by the socket
     // the VTC client will wait for that to finis
 
@@ -158,7 +166,7 @@ var VatisTechClient = /*#__PURE__*/function () {
           hard = _ref2.hard;
 
       // check if there is still data to be received or to be sent
-      if ((this.waitingForFinalPacket || !this.microphoneQueue.isEmpty) && hard !== true) {
+      if ((this.waitingForFinalPacket > 0 || !this.microphoneQueue.isEmpty) && hard !== true) {
         // let the messaging know that we want the client to be destroyed
         this.shouldDestroy = true; // pause the microphone so it won't record anymore
 
@@ -263,8 +271,8 @@ var VatisTechClient = /*#__PURE__*/function () {
       if (this.microphoneQueue === undefined) return;
       this.microphoneQueue.enqueue(data);
 
-      if (this.waitingForFinalPacket === false && this.microphoneQueue.peek()) {
-        this.waitingForFinalPacket = true;
+      if (this.waitingForFinalPacket < this.waitingAfterMessages && this.microphoneQueue.peek()) {
+        this.waitingForFinalPacket = this.waitingForFinalPacket + 1;
         this.socketIOClientGenerator.emitData(this.microphoneQueue.dequeue());
       }
     } // get data from SocketIOClientGenerator from the SOCKET_IO_CLIENT_RESULT_PATH and send it to user's callback function
@@ -277,16 +285,16 @@ var VatisTechClient = /*#__PURE__*/function () {
       this.onData(JSON.parse(data));
 
       if (checkIfFinalPacket(JSON.parse(data))) {
-        if (this.microphoneQueue.peek()) {
-          this.waitingForFinalPacket = true;
+        this.waitingForFinalPacket = this.waitingForFinalPacket - 1;
+
+        if (this.microphoneQueue.peek() && this.waitingForFinalPacket < this.waitingAfterMessages) {
+          this.waitingForFinalPacket = this.waitingForFinalPacket + 1;
           this.socketIOClientGenerator.emitData(this.microphoneQueue.dequeue());
-        } else {
-          this.waitingForFinalPacket = false;
         }
       } // check if the user tried to destroy the VTC client
 
 
-      if (!this.waitingForFinalPacket && this.microphoneQueue.isEmpty && this.shouldDestroy) {
+      if (this.waitingForFinalPacket === 0 && this.microphoneQueue.isEmpty && this.shouldDestroy) {
         this.destroy();
       }
     }