@robotical/webapp-types 1.0.0 → 1.0.5

package/dist-types/src/application/ApplicationManager/ApplicationManager.d.ts

@@ -1,4 +1,4 @@
-import { RaftConnectionMethod } from "../../types/raft";
+import { RaftConnectionMethod, RaftTypeE } from "../../types/raft";
 import WebAppCommunicator from "../../wrapper-app/communicators/WebAppCommunicator";
 import RAFT from "../RAFTs/RAFT";
 import Marty from "../RAFTs/Marty/Marty";
@@ -15,8 +15,11 @@ export default class ApplicationManager {
     connectedRafts: {
         [key: string]: RAFT;
     };
+    connectedRaftsContext: ConnectedRaftItem[];
     ricSelectedCb: ((raft: RAFT) => void) | null;
     toaster: typeof Toaster;
+    showBackHomeButton: () => void;
+    hideBackHomeButton: () => void;
     connectedRaftContextMethods: {
         addConnectedRaft: (connectedRaft: ConnectedRaftItem) => void;
         removeConnectedRaft: (connectedRaftId: string) => void;
@@ -26,12 +29,14 @@ export default class ApplicationManager {
     constructor();
     createNewCog(id: string): Cog;
     createNewMarty(id: string): Marty;
+    connectGenericMarty(afterRaftConnectedCb: (raft: RAFT) => void): Promise<void>;
+    connectGenericCog(afterRaftConnectedCb: (raft: RAFT) => void): Promise<void>;
     /**
      * Generic Connect method
      * This method is called from various environments (connection button, blocksjr, blocks etc.)
      * Known issue: connecting to a raft from within a platform won't add the newly connected raft to the connectedRafts hook
      */
-    connectGeneric(afterRaftConnectedCb: (raft: RAFT) => void): Promise<void>;
+    connectGeneric(afterRaftConnectedCb: (raft: RAFT) => void, uuid: string): Promise<void>;
     /**
      * Disconnect from RAFT generic
      * This method is called from various environments (connection button, blocksjr, blocks etc.)
@@ -41,7 +46,7 @@ export default class ApplicationManager {
      * Selects a RAFT in Phone's verification modal
      */
     selectRaft(ricToConnectTo: FOUND_RAFT_ON_DISCOVERY_RESPONSE['foundRIC'], method: RaftConnectionMethod): Promise<RAFT | null>;
-    connectToRIC(method: RaftConnectionMethod): Promise<RAFT | null>;
+    connectToRIC(method: RaftConnectionMethod, uuid: string): Promise<RAFT | null>;
     /**
      * Disconnect from RAFT
      */
@@ -88,4 +93,5 @@ export default class ApplicationManager {
      * List the files from the device's local storage
      */
     listFilesFromDeviceLocalStorage(dirname: string): Promise<unknown>;
+    getTheCurrentlySelectedDeviceOrFirstOfItsKind(deviceType: RaftTypeE): RAFT | undefined;
 }

package/dist-types/src/application/ApplicationManager/ApplicationManager.js

@@ -45,6 +45,7 @@ import VerificationModal from "../../components/modals/VerificationModal";
 import { raftFoundSubscriptionHelper } from "../RAFTs/raft-subscription-helpers";
 import { AppSentMessage } from "../../types/communication-between-apps/wrapper-communication";
 import VerificationModalPhoneApp from "../../components/modals/VerificationModalPhoneApp";
+import { RaftChannelBLE, } from "@robdobsn/raftjs";
 import Logger from "../../services/logger/Logger";
 import isPhoneApp from "../../utils/phone-app-communication/is-phone-app";
 import DisconnectConfirmationModal from "../../components/modals/DisconnectConfirmation";
@@ -57,6 +58,7 @@ var ApplicationManager = /** @class */ (function () {
         this._observers = {};
         // Connected RICs
         this.connectedRafts = {};
+        this.connectedRaftsContext = [];
         // Callback to call when a RAFT is selected (Phone App only)
         // We need that to make sure the connection button gets the selected RAFT once the user selects one
         this.ricSelectedCb = null;
@@ -73,6 +75,8 @@ var ApplicationManager = /** @class */ (function () {
         // public sessionDbs = new SessionsDBManager();
         // toaster
         this.toaster = Toaster;
+        this.showBackHomeButton = function () { };
+        this.hideBackHomeButton = function () { };
         // connected raft context methods
         this.connectedRaftContextMethods = {
             addConnectedRaft: function (connectedRaft) { },
@@ -82,6 +86,8 @@ var ApplicationManager = /** @class */ (function () {
         this.isPhoneApp = isPhoneApp;
         // super();
         // AnalyticsManager.appStartSession();
+        this.connectGenericMarty = this.connectGenericMarty.bind(this);
+        this.connectGenericCog = this.connectGenericCog.bind(this);
     }
     ApplicationManager.prototype.createNewCog = function (id) {
         return new Cog(id);
@@ -89,12 +95,26 @@ var ApplicationManager = /** @class */ (function () {
     ApplicationManager.prototype.createNewMarty = function (id) {
         return new Marty(id);
     };
+    ApplicationManager.prototype.connectGenericMarty = function (afterRaftConnectedCb) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.connectGeneric(afterRaftConnectedCb, RaftChannelBLE.RICServiceUUID)];
+            });
+        });
+    };
+    ApplicationManager.prototype.connectGenericCog = function (afterRaftConnectedCb) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.connectGeneric(afterRaftConnectedCb, RaftChannelBLE.CogServiceUUID)];
+            });
+        });
+    };
     /**
      * Generic Connect method
      * This method is called from various environments (connection button, blocksjr, blocks etc.)
      * Known issue: connecting to a raft from within a platform won't add the newly connected raft to the connectedRafts hook
      */
-    ApplicationManager.prototype.connectGeneric = function (afterRaftConnectedCb) {
+    ApplicationManager.prototype.connectGeneric = function (afterRaftConnectedCb, uuid) {
         return __awaiter(this, void 0, void 0, function () {
             var e_1, newRaft, e_2;
             var _this = this;
@@ -119,7 +139,7 @@ var ApplicationManager = /** @class */ (function () {
                     case 4: return [3 /*break*/, 8];
                     case 5:
                         _a.trys.push([5, 7, , 8]);
-                        return [4 /*yield*/, window.applicationManager.connectToRIC(RaftConnectionMethod.WEB_BLE)];
+                        return [4 /*yield*/, window.applicationManager.connectToRIC(RaftConnectionMethod.WEB_BLE, uuid)];
                     case 6:
                         newRaft = _a.sent();
                         if (newRaft) {
@@ -215,13 +235,13 @@ var ApplicationManager = /** @class */ (function () {
             });
         });
     };
-    ApplicationManager.prototype.connectToRIC = function (method) {
+    ApplicationManager.prototype.connectToRIC = function (method, uuid) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var wasConnectedObj, raftId, raftType, raft;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, RAFT.connect(method)];
+                    case 0: return [4 /*yield*/, RAFT.connect(method, uuid)];
                     case 1:
                         wasConnectedObj = _c.sent();
                         if (!wasConnectedObj.success) return [3 /*break*/, 3];
@@ -441,6 +461,40 @@ var ApplicationManager = /** @class */ (function () {
             });
         });
     };
+    /*======== END OF NATIVE COMMANDS ONLY ========*/
+    //======================//
+    /* UI */
+    //======================//
+    //======================//
+    /* HELPERS */
+    //======================//
+    ApplicationManager.prototype.getTheCurrentlySelectedDeviceOrFirstOfItsKind = function (deviceType) {
+        var _a;
+        // checks if the currently selected device is a deviceType and returns it
+        // if not, returns the first deviceType in the list (if there is one)
+        var currentlySelectedId = (_a = this.connectedRaftsContext.find(function (connectedRaft) { return connectedRaft.isSelected; })) === null || _a === void 0 ? void 0 : _a.id;
+        if (currentlySelectedId) {
+            var selectedRaft = this.connectedRafts[currentlySelectedId];
+            if (!selectedRaft) {
+                return;
+            }
+            if (selectedRaft.type === deviceType) {
+                // the currently selected device is a cog, return it
+                return selectedRaft;
+            }
+            else {
+                // the currently selected device is not a cog, find the first cog in the list
+                var fistCog = void 0;
+                for (var raftId in this.connectedRafts) {
+                    if (this.connectedRafts[raftId].type === deviceType) {
+                        fistCog = this.connectedRafts[raftId];
+                        break;
+                    }
+                }
+                return fistCog;
+            }
+        }
+    };
     // Communicator to the wrapper app
     ApplicationManager.wrapperAppCommunicator = new WebAppCommunicator();
     return ApplicationManager;

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

@@ -90,7 +90,7 @@ var Cog = /** @class */ (function (_super) {
      */
     Cog.prototype.getBatteryStrength = function () {
         var _a;
-        return ((_a = this.raftStateInfo) === null || _a === void 0 ? void 0 : _a.Power.battV) || 0;
+        return ((_a = this.raftStateInfo) === null || _a === void 0 ? void 0 : _a.Power.battV) ? Math.round(this.raftStateInfo.Power.battV * 100) : 0;
     };
     /**
    * This methods handles RAFT events coming from the RICConnector of the wrapper
@@ -131,7 +131,7 @@ var Cog = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.sendRestMessage('led//color/#ff8585')];
+                    case 0: return [4 /*yield*/, this.sendRestMessage('led/ring/color/#ff8585')];
                     case 1:
                         _a.sent();
                         return [4 /*yield*/, this.sendRestMessage('audio/rtttl/NoteASharp:d=4,o=6,b=600:a#')];
@@ -140,7 +140,7 @@ var Cog = /** @class */ (function (_super) {
                         return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 100); })];
                     case 3:
                         _a.sent();
-                        return [4 /*yield*/, this.sendRestMessage('led//color/#000000')];
+                        return [4 /*yield*/, this.sendRestMessage('led/ring/color/#000000')];
                     case 4:
                         _a.sent();
                         return [2 /*return*/];

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

@@ -29,7 +29,7 @@ export default class RAFT implements RICInterface {
     * Connect to a RAFT
     * We first connect, then we discover the raft type, and then we create the appopriate raft instance
     */
-    static connect(method: RaftConnectionMethod): Promise<ConnectionAttemptResults>;
+    static connect(method: RaftConnectionMethod, uuid: string): Promise<ConnectionAttemptResults>;
     /**
      * Disconnect from a RAFT
      */

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

@@ -85,12 +85,12 @@ var RAFT = /** @class */ (function () {
     * Connect to a RAFT
     * We first connect, then we discover the raft type, and then we create the appopriate raft instance
     */
-    RAFT.connect = function (method) {
+    RAFT.connect = function (method, uuid) {
         return __awaiter(this, void 0, void 0, function () {
             var connectResults;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_CONNECT, { method: method })];
+                    case 0: return [4 /*yield*/, window.wrapperCommunicator.sendMessageAndWait(AppSentMessage.RAFT_CONNECT, { method: method, uuid: uuid })];
                     case 1:
                         connectResults = _a.sent();
                         return [2 /*return*/, connectResults];

package/dist-types/src/store/SelectedRaftContext.js

@@ -49,6 +49,9 @@ export var ConnectedRaftContentProvider = function (_a) {
             };
         }
     }, []);
+    useEffect(function () {
+        window.applicationManager.connectedRaftsContext = connectedRafts;
+    }, [connectedRafts]);
     var addConnectedRaft = function (connectedRaft) {
         // if the new raft is already in the list, do not add it again, just select it
         var existingRaft = connectedRafts.find(function (connectedRaft_) { return connectedRaft_.id === connectedRaft.id; });

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

@@ -14,7 +14,7 @@ export declare class WrapperAppManager {
     * @returns Promise<ConnectionAttemptResults>
     *
     */
-    connect(method: RaftConnectionMethod): Promise<ConnectionAttemptResults>;
+    connect(method: RaftConnectionMethod, uuid: string): Promise<ConnectionAttemptResults>;
     /**
      * Re-triggers the connect event which was missed due to the connection logic
      */

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

@@ -55,12 +55,12 @@ var WrapperAppManager = /** @class */ (function () {
     * @returns Promise<ConnectionAttemptResults>
     *
     */
-    WrapperAppManager.prototype.connect = function (method) {
+    WrapperAppManager.prototype.connect = function (method, uuid) {
         return __awaiter(this, void 0, void 0, function () {
             var connector, connectionResults;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, ConnectorFactory.connectToRaftHelper(method)];
+                    case 0: return [4 /*yield*/, ConnectorFactory.connectToRaftHelper(method, uuid)];
                     case 1:
                         connector = _a.sent();
                         if (!connector) {

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)];
+                return [4 /*yield*/, wrapperAppManager.connect(data.method, data.uuid)];
             case 3:
                 connectionResults = _b.sent();
                 window.wrapperCommunicator.onMessageResponse({ success: true, error: "", results: connectionResults, messagePromiseId: messagePromiseId });

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): Promise<Connector | null>;
+    static connectToRaftHelper(method: RaftConnectionMethod, uuid: 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) {
+    ConnectorFactory.connectToRaftHelper = function (method, uuid) {
         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, "")];
+                        return [4 /*yield*/, connManager.connect(method, "", uuid)];
                     case 1:
                         wasConnected = _a.sent();
                         Logger.info(SHOW_LOGS, TAG, "Was connected to RAFT: ".concat(wasConnected));

package/package.json

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