@robotical/webapp-types 3.17.40 → 3.17.41

package/dist-types/src/application/RAFTs/RAFT.d.ts

@@ -1,3 +1,4 @@
+import type { RestMessageOptions } from "../../types/communication-between-apps/wrapper-communication";
 import { ConnectionAttemptResults, RaftConnectionMethod, RaftTypeE } from "../../types/raft";
 import { RaftInfoEvents } from "../../types/events/raft-info";
 import { FOUND_RAFT_ON_DISCOVERY_RESPONSE } from "../../types/phone-app-communicator";
@@ -58,7 +59,7 @@ export default class RAFT implements RICInterface {
     /**
      * Send a REST message to the RAFT
      */
-    sendRestMessage(msg: string, params?: object): Promise<RaftOKFail>;
+    sendRestMessage(msg: string, params?: object, options?: RestMessageOptions): Promise<RaftOKFail>;
     /**
      * Highlights the raft
      */

package/dist-types/src/application/RAFTs/RAFT.js

@@ -175,10 +175,10 @@ var RAFT = /** @class */ (function () {
     /**
      * Send a REST message to the RAFT
      */
-    RAFT.prototype.sendRestMessage = function (msg, params) {
+    RAFT.prototype.sendRestMessage = function (msg, params, options) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_SEND_REST, { raftId: this.id, msg: msg, params: params })];
+                return [2 /*return*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_SEND_REST, { raftId: this.id, msg: msg, params: params, options: options })];
             });
         });
     };

package/dist-types/src/types/communication-between-apps/wrapper-communication.d.ts

@@ -8,6 +8,9 @@ export interface IWrapperSentMessage {
     data?: any;
     messagePromiseId: string;
 }
+export type RestMessageOptions = {
+    waitForResponse?: boolean;
+};
 export declare enum AppSentMessage {
     RAFT_IS_CONNECTED = "RAFT_IS_CONNECTED",
     RAFT_CONNECT = "RAFT_CONNECT",

package/dist-types/src/wrapper-app/WrapperAppManager.d.ts

@@ -1,4 +1,5 @@
 import { RaftInfoEvents } from "../types/events/raft-info";
+import type { RestMessageOptions } from "../types/communication-between-apps/wrapper-communication";
 import { ConnectionAttemptResults, RaftConnectionMethod } from "../types/raft";
 import Connector from "./connectors/Connector";
 import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robotical/raftjs";
@@ -73,7 +74,7 @@ export declare class WrapperAppManager {
     /**
      * Send a REST message to the RAFT
      */
-    sendRestMessage(msg: string, params: object | undefined, raftId: string): Promise<import("@robotical/raftjs").RaftOKFail>;
+    sendRestMessage(msg: string, params: object | undefined, raftId: string, options?: RestMessageOptions): Promise<import("@robotical/raftjs").RaftOKFail>;
     /**
      * Removes marty after a certain time
      * Removes from the martys list after x seconds so that we can still get the last event

package/dist-types/src/wrapper-app/WrapperAppManager.js

@@ -286,10 +286,10 @@ var WrapperAppManager = /** @class */ (function () {
     /**
      * Send a REST message to the RAFT
      */
-    WrapperAppManager.prototype.sendRestMessage = function (msg, params, raftId) {
+    WrapperAppManager.prototype.sendRestMessage = function (msg, params, raftId, options) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.connectors[raftId].sendRestMessage(msg, params)];
+                return [2 /*return*/, this.connectors[raftId].sendRestMessage(msg, params, options)];
             });
         });
     };

package/dist-types/src/wrapper-app/communicators/WebAppCommunicator.js

@@ -217,7 +217,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
             case 21: return [3 /*break*/, 51];
             case 22:
                 _b.trys.push([22, 24, , 25]);
-                return [4 /*yield*/, wrapperAppManager.sendRestMessage(data.msg, data.params, data.raftId)];
+                return [4 /*yield*/, wrapperAppManager.sendRestMessage(data.msg, data.params, data.raftId, data.options)];
             case 23:
                 restResults = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: restResults, messagePromiseId: messagePromiseId });

package/dist-types/src/wrapper-app/connectors/Connector.d.ts

@@ -1,4 +1,5 @@
 import { RaftInfoEvents } from "../../types/events/raft-info";
+import type { RestMessageOptions } from "../../types/communication-between-apps/wrapper-communication";
 import { ConnectionAttemptResults, RaftTypeE } from "../../types/raft";
 import { RaftObserver } from "../../application/RAFTs/RaftObserver";
 import ConnectorInterface from "./ConnectorInterface";
@@ -27,7 +28,7 @@ declare class Connector implements ConnectorInterface {
     /**
      * Send a REST message to the RAFT
      */
-    sendRestMessage(msg: string, params?: object): Promise<RaftOKFail>;
+    sendRestMessage(msg: string, params?: object, options?: RestMessageOptions): Promise<RaftOKFail>;
     /**
      * Verify correct RAFT is selected
      */

package/dist-types/src/wrapper-app/connectors/Connector.js

@@ -38,9 +38,20 @@ import { RaftInfoEvents } from "../../types/events/raft-info";
 import { WrapperSentMessage } from "../../types/communication-between-apps/wrapper-communication";
 import Logger from "../../services/logger/Logger";
 import { RaftTypeE } from "../../types/raft";
-import { RaftConnEvent, RaftUpdateEvent, } from "@robotical/raftjs";
+import { RaftConnEvent, RaftUpdateEvent, RICRESTElemCode, } from "@robotical/raftjs";
 var SHOW_LOGS = true;
 var TAG = "Connector";
+var formatRestCommand = function (msg, params) {
+    var paramEntries = Object.entries(params || {});
+    var paramQueryStr = "";
+    for (var _i = 0, paramEntries_1 = paramEntries; _i < paramEntries_1.length; _i++) {
+        var param = paramEntries_1[_i];
+        if (paramQueryStr.length > 0)
+            paramQueryStr += "&";
+        paramQueryStr += param[0] + "=" + param[1];
+    }
+    return paramQueryStr.length > 0 ? msg + "?" + paramQueryStr : msg;
+};
 var Connector = /** @class */ (function () {
     function Connector(id, connManager) {
         var _this = this;
@@ -97,10 +108,20 @@ var Connector = /** @class */ (function () {
     /**
      * Send a REST message to the RAFT
      */
-    Connector.prototype.sendRestMessage = function (msg, params) {
+    Connector.prototype.sendRestMessage = function (msg, params, options) {
         return __awaiter(this, void 0, void 0, function () {
+            var command, sent;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.connManager.getConnector().sendRICRESTMsg(msg, params || {})];
+                switch (_a.label) {
+                    case 0:
+                        if (!((options === null || options === void 0 ? void 0 : options.waitForResponse) === false)) return [3 /*break*/, 2];
+                        command = formatRestCommand(msg, params);
+                        return [4 /*yield*/, this.connManager.getConnector().getRaftMsgHandler().sendRICRESTNoResp(command, RICRESTElemCode.RICREST_ELEM_CODE_URL)];
+                    case 1:
+                        sent = _a.sent();
+                        return [2 /*return*/, { rslt: sent ? "ok" : "fail" }];
+                    case 2: return [2 /*return*/, this.connManager.getConnector().sendRICRESTMsg(msg, params || {})];
+                }
             });
         });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robotical/webapp-types",
-  "version": "3.17.40",
+  "version": "3.17.41",
   "description": "Type definitions for the Application Manager",
   "main": "dist/application-manager.d.ts",
   "types": "dist/application-manager.d.ts",