@robotical/webapp-types 1.1.0 → 1.1.2

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

@@ -146,7 +146,7 @@ var receivedMessageHandler = function (receivedMessage, data, messagePromiseId)
                 return [3 /*break*/, 29];
             case 2:
                 _b.trys.push([2, 4, , 5]);
-                return [4 /*yield*/, wrapperAppManager.connect(data.method, data.uuid)];
+                return [4 /*yield*/, wrapperAppManager.connect(data.method, data.uuids)];
             case 3:
                 connectionResults = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: connectionResults, messagePromiseId: messagePromiseId });

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

@@ -7,6 +7,11 @@ import { ConnManager } from "@robotical/roboticaljs";
 declare class CogConnector extends Connector implements ConnectorInterface {
     type: RaftTypeE;
     constructor(raftId: string, connManager: ConnManager);
+    /**
+     * Publish an event to all observers
+     * Set in RICConnector as an event listener callback
+     */
+    publish(eventType: string, eventEnum: RaftConnEvent | RaftUpdateEvent | RaftPublishEvent | RaftInfoEvents, eventName: string, eventData: any): void;
     /**
      * Connect to a RAFT
      */

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

@@ -49,10 +49,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+import { RaftInfoEvents } from "../../../types/events/raft-info";
 import Logger from "../../../services/logger/Logger";
 import { RaftTypeE } from "../../../types/raft";
 import Connector from "../Connector";
-import { RaftConnEvent, RaftUpdateEvent } from "@robotical/raftjs";
+import { RaftConnEvent, RaftPublishEvent, RaftUpdateEvent } from "@robotical/raftjs";
+import { CogPublishedDataGetter } from "@robotical/roboticaljs";
+import { WrapperSentMessage } from "../../../types/communication-between-apps/wrapper-communication";
 var SHOW_LOGS = true;
 var TAG = "CogConnector";
 var CogConnector = /** @class */ (function (_super) {
@@ -62,6 +65,19 @@ var CogConnector = /** @class */ (function (_super) {
         _this.type = RaftTypeE.COG;
         return _this;
     }
+    /**
+     * Publish an event to all observers
+     * Set in RICConnector as an event listener callback
+     */
+    CogConnector.prototype.publish = function (eventType, eventEnum, eventName, eventData) {
+        window.WebAppCommunicator.sendMessageNoWait(WrapperSentMessage.RAFT_PUBLISHED_EVENT, { raftId: this.id, eventType: eventType, eventEnum: eventEnum, eventName: eventName, eventData: eventData });
+        if (this._observers.hasOwnProperty(eventType)) {
+            for (var _i = 0, _a = this._observers[eventType]; _i < _a.length; _i++) {
+                var observer = _a[_i];
+                observer.notify(eventType, eventEnum, eventName, eventData);
+            }
+        }
+    };
     /**
      * Connect to a RAFT
      */
@@ -163,8 +179,24 @@ var CogConnector = /** @class */ (function (_super) {
      */
     CogConnector.prototype.pubEventHandler = function (eventEnum, eventName, data) {
         return __awaiter(this, void 0, void 0, function () {
+            var systemType, stateInfo, simplifiedInfo;
             return __generator(this, function (_a) {
                 switch (eventEnum) {
+                    case RaftPublishEvent.PUBLISH_EVENT_DATA:
+                        systemType = this.connManager.getConnector().getSystemType();
+                        if (systemType) {
+                            stateInfo = systemType.getStateInfo();
+                            if (stateInfo.deviceManager) {
+                                simplifiedInfo = {
+                                    power: CogPublishedDataGetter.getPowerData(stateInfo.deviceManager),
+                                    accelerometer: CogPublishedDataGetter.getAccelerometerData(stateInfo.deviceManager),
+                                    light: CogPublishedDataGetter.getLightData(stateInfo.deviceManager),
+                                    gyroscope: CogPublishedDataGetter.getGyroscopeData(stateInfo.deviceManager)
+                                };
+                                this.publish("raftinfo", RaftInfoEvents.STATE_INFO, "StateInfo", { stateInfo: simplifiedInfo });
+                            }
+                        }
+                        break;
                     default:
                         break;
                 }

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

@@ -1,12 +1,15 @@
 import { RaftInfoEvents } from "../../types/events/raft-info";
 import { ConnectionAttemptResults, RaftTypeE } from "../../types/raft";
+import { RaftObserver } from "../../application/RAFTs/RaftObserver";
 import ConnectorInterface from "./ConnectorInterface";
 import { ConnManager, RICLedLcdColours } from "@robotical/roboticaljs";
 import { RaftOKFail, RaftConnEvent, RaftUpdateEvent, RaftPublishEvent } from "@robotical/raftjs";
 declare class Connector implements ConnectorInterface {
     id: string;
     type: RaftTypeE;
-    private _observers;
+    protected _observers: {
+        [key: string]: Array<RaftObserver>;
+    };
     connManager: ConnManager;
     constructor(id: string, connManager: ConnManager);
     /**

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

@@ -38,7 +38,7 @@ 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, RaftPublishEvent } from "@robotical/raftjs";
+import { RaftConnEvent, RaftUpdateEvent, } from "@robotical/raftjs";
 var SHOW_LOGS = true;
 var TAG = "Connector";
 var Connector = /** @class */ (function () {
@@ -53,11 +53,14 @@ var Connector = /** @class */ (function () {
         // Set the listener function
         // Subscribe to connManager events
         this.connManager.setConnectionEventListener(function (eventType, eventEnum, eventName, eventData) {
-            if (eventType !== "pub") {
+            if (eventType === "pub") {
+                // if it's a pub event, we are publishing it from _pubEventHandler method (in child classes)
+            }
+            else {
                 Logger.info(SHOW_LOGS, TAG, "eventType: ".concat(eventType, " eventEnum: ").concat(eventEnum, " eventName: ").concat(eventName, " eventData: ").concat(eventData));
+                _this.publish(eventType, eventEnum, eventName, eventData);
             }
             _this.eventHandler(eventType, eventEnum, eventName, eventData);
-            _this.publish(eventType, eventEnum, eventName, eventData);
         });
     }
     /**
@@ -192,6 +195,10 @@ var Connector = /** @class */ (function () {
      * Set in RICConnector as an event listener callback
      */
     Connector.prototype.publish = function (eventType, eventEnum, eventName, eventData) {
+        if (eventType === "raftinfo") {
+            // should be handled from child class
+            return;
+        }
         window.WebAppCommunicator.sendMessageNoWait(WrapperSentMessage.RAFT_PUBLISHED_EVENT, { raftId: this.id, eventType: eventType, eventEnum: eventEnum, eventName: eventName, eventData: eventData });
         if (this._observers.hasOwnProperty(eventType)) {
             for (var _i = 0, _a = this._observers[eventType]; _i < _a.length; _i++) {
@@ -293,16 +300,8 @@ var Connector = /** @class */ (function () {
      */
     Connector.prototype._pubEventHandler = function (eventEnum, eventName, data) {
         return __awaiter(this, void 0, void 0, function () {
-            var systemType, stateInfo;
             return __generator(this, function (_a) {
                 switch (eventEnum) {
-                    case RaftPublishEvent.PUBLISH_EVENT_DATA:
-                        systemType = this.connManager.getConnector().getSystemType();
-                        if (systemType) {
-                            stateInfo = systemType.getStateInfo();
-                            this.publish("raftinfo", RaftInfoEvents.STATE_INFO, "StateInfo", { stateInfo: stateInfo });
-                        }
-                        break;
                     default:
                         break;
                 }

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

@@ -10,6 +10,6 @@ export default class ConnectorFactory {
      * @returns Promise<ConnectionAttemptResults>
      *
      */
-    static connectToRaftHelper(method: RaftConnectionMethod, uuid: string): Promise<Connector | null>;
+    static connectToRaftHelper(method: RaftConnectionMethod, uuids: string[]): Promise<Connector | null>;
     static createConnector(raftType: string | undefined, connManager: ConnManager): Connector;
 }

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

@@ -52,7 +52,7 @@ var ConnectorFactory = /** @class */ (function () {
      * @returns Promise<ConnectionAttemptResults>
      *
      */
-    ConnectorFactory.connectToRaftHelper = function (method, uuid) {
+    ConnectorFactory.connectToRaftHelper = function (method, uuids) {
         return __awaiter(this, void 0, void 0, function () {
             var connManager, wasConnected, systemInfo, raftType, connector;
             return __generator(this, function (_a) {
@@ -60,7 +60,7 @@ var ConnectorFactory = /** @class */ (function () {
                     case 0:
                         connManager = new ConnManager();
                         Logger.info(SHOW_LOGS, TAG, "Connecting to RAFT with method: ".concat(method));
-                        return [4 /*yield*/, connManager.connect(method, "", uuid)];
+                        return [4 /*yield*/, connManager.connect(method, "", uuids)];
                     case 1:
                         wasConnected = _a.sent();
                         Logger.info(SHOW_LOGS, TAG, "Was connected to RAFT: ".concat(wasConnected));

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

@@ -7,6 +7,11 @@ import { ConnManager } from "@robotical/roboticaljs";
 declare class MartyConnector extends Connector implements ConnectorInterface {
     type: RaftTypeE;
     constructor(raftId: string, connManager: ConnManager);
+    /**
+     * Publish an event to all observers
+     * Set in RICConnector as an event listener callback
+     */
+    publish(eventType: string, eventEnum: RaftConnEvent | RaftUpdateEvent | RaftPublishEvent | RaftInfoEvents, eventName: string, eventData: any): void;
     /**
      * Connect to a RAFT
      */

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

@@ -50,11 +50,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { RICRoboticalAddOns } from "@robotical/ricjs-robotical-addons";
+import { RaftInfoEvents } from "../../../types/events/raft-info";
 import Logger from "../../../services/logger/Logger";
 import { RaftTypeE } from "../../../types/raft";
 import Connector from "../Connector";
 import { RaftConnEvent, RaftUpdateEvent, RaftPublishEvent, } from "@robotical/raftjs";
 import { RICServoParamUpdater, RICSystemUtils, } from "@robotical/roboticaljs";
+import { WrapperSentMessage } from "../../../types/communication-between-apps/wrapper-communication";
 var SHOW_LOGS = true;
 var TAG = "MartyConnector";
 var MartyConnector = /** @class */ (function (_super) {
@@ -64,6 +66,22 @@ var MartyConnector = /** @class */ (function (_super) {
         _this.type = RaftTypeE.MARTY;
         return _this;
     }
+    /**
+     * Publish an event to all observers
+     * Set in RICConnector as an event listener callback
+     */
+    MartyConnector.prototype.publish = function (eventType, eventEnum, eventName, eventData) {
+        if (eventType === "raftinfo") {
+            // marty info do not need manipulation like Cog
+        }
+        window.WebAppCommunicator.sendMessageNoWait(WrapperSentMessage.RAFT_PUBLISHED_EVENT, { raftId: this.id, eventType: eventType, eventEnum: eventEnum, eventName: eventName, eventData: eventData });
+        if (this._observers.hasOwnProperty(eventType)) {
+            for (var _i = 0, _a = this._observers[eventType]; _i < _a.length; _i++) {
+                var observer = _a[_i];
+                observer.notify(eventType, eventEnum, eventName, eventData);
+            }
+        }
+    };
     /**
      * Connect to a RAFT
      */
@@ -203,9 +221,15 @@ var MartyConnector = /** @class */ (function (_super) {
      */
     MartyConnector.prototype.pubEventHandler = function (eventEnum, eventName, data) {
         return __awaiter(this, void 0, void 0, function () {
+            var systemType, stateInfo;
             return __generator(this, function (_a) {
                 switch (eventEnum) {
                     case RaftPublishEvent.PUBLISH_EVENT_DATA:
+                        systemType = this.connManager.getConnector().getSystemType();
+                        if (systemType) {
+                            stateInfo = systemType.getStateInfo();
+                            this.publish("raftinfo", RaftInfoEvents.STATE_INFO, "StateInfo", { stateInfo: stateInfo });
+                        }
                         break;
                     default:
                         break;

package/package.json

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