chore(ui): async frontend pt1

Author: zunderscore

src/backend/effects/builtin/conditional-effects/conditions/condition-manager.js

@@ -97,8 +97,8 @@ class ConditionManager extends EventEmitter {
 
 const manager = new ConditionManager();
 
-frontendCommunicator.on("getConditionTypes", (trigger) => {
-    logger.info("got 'getConditionTypes' request");
+frontendCommunicator.onAsync("conditions:get-condition-types", async (trigger) => {
+    logger.info(`Got "conditions:get-condition-types" request`);
 
     let conditionTypes = manager.getAllConditionTypes();
     if (trigger != null) {

src/backend/effects/effect-manager.ts

@@ -44,7 +44,7 @@ class EffectManager extends TypedEmitter<{
             return mapped;
         });
 
-        frontendCommunicator.onAsync("getEffectDefinitions", async (triggerData: {
+        frontendCommunicator.onAsync("effects:get-effect-defintitions", async (triggerData: {
             triggerType: TriggerType;
             triggerMeta: TriggerMeta;
         }) => {
@@ -95,7 +95,7 @@ class EffectManager extends TypedEmitter<{
             return filteredEffectDefs;
         });
 
-        frontendCommunicator.on("getEffectDefinition", (effectId) => {
+        frontendCommunicator.onAsync("effects:get-effect-definition", async (effectId) => {
             this.logger.debug("got effect request", effectId);
             return this.mapEffectForFrontEnd(
                 this.getEffectById(effectId)

src/backend/events/activity-feed-manager.ts

@@ -42,7 +42,7 @@ class ActivityFeedManager {
             this.retriggerActivity(activity);
         });
 
-        frontendCommunicator.on("activity-feed:get-activity-feed-supported-events", () => {
+        frontendCommunicator.onAsync("activity-feed:get-activity-feed-supported-events", async () => {
             return EventManager
                 .getAllEventSources()
                 .map(es =>

src/backend/events/event-manager.ts

@@ -35,12 +35,12 @@ class EventManager extends TypedEmitter<{
 
         this.setMaxListeners(0);
 
-        frontendCommunicator.on("events:get-all-event-sources", () => {
+        frontendCommunicator.onAsync("events:get-all-event-sources", async () => {
             this.logger.info("got 'get all event sources' request");
             return simpleClone(this.getAllEventSources());
         });
 
-        frontendCommunicator.on("events:get-all-events", () => {
+        frontendCommunicator.onAsync("events:get-all-events", async () => {
             this.logger.info("got 'get all events' request");
             return simpleClone(this.getAllEvents());
         });
@@ -90,7 +90,7 @@ class EventManager extends TypedEmitter<{
             }
         });
 
-        frontendCommunicator.on("events:get-event-source", (event: {
+        frontendCommunicator.onAsync("events:get-event-source", async (event: {
             sourceId: string;
             eventId: string;
         }) => {

src/backend/events/filters/filter-manager.ts

@@ -18,7 +18,7 @@ class FilterManager extends EventEmitter {
     constructor() {
         super();
 
-        frontendCommunicator.on("getFiltersForEvent", (data: EventSourceAndId) => {
+        frontendCommunicator.onAsync("filters:get-for-event", async (data: EventSourceAndId) => {
             this.logger.info("got 'get all filters' request");
             const { eventSourceId, eventId } = data;
             return this.getFiltersForEvent(eventSourceId, eventId).map((f) => {

src/backend/restrictions/restriction-manager.ts

@@ -25,7 +25,7 @@ class RestrictionsManager extends TypedEmitter<Events> {
     constructor() {
         super();
 
-        frontendCommunicator.on("getRestrictions", (triggerData: {
+        frontendCommunicator.onAsync("restrictions:get-restrictions", async (triggerData: {
             triggerType: TriggerType;
             triggerMeta: TriggerMeta;
         }) => {

src/backend/setups/setup-manager.ts

@@ -56,8 +56,8 @@ class SetupManager {
             }) => await this.importSetup(setup, selectedCurrency)
         );
 
-        frontendCommunicator.on("setups:remove-setup-components",
-            ({ components }: { components: FirebotSetup["components"] }) =>
+        frontendCommunicator.onAsync("setups:remove-setup-components",
+            async ({ components }: { components: FirebotSetup["components"] }) =>
                 this.removeSetupComponents(components));
     }
 

src/gui/app/controllers/events.controller.js

@@ -54,7 +54,10 @@
                 $scope.getEventSets();
             };
 
-            const sources = backendCommunicator.fireEventSync("events:get-all-event-sources");
+            let sources = [];
+            $scope.loadEventSources = async () => {
+                sources = await backendCommunicator.fireEventAsync("events:get-all-event-sources");
+            };
 
             function friendlyEventTypeName(sourceId, eventId) {
                 const source = sources.find(s => s.id === sourceId);
@@ -518,7 +521,7 @@
 
             $scope.simulateEventsByType = function() {
                 utilityService.showModal({
-                    component: "simulateGroupEventsModal",
+                    component: "simulateEventModal",
                     size: "sm"
                 });
             };
@@ -544,5 +547,7 @@
                     });
                 }
             };
+
+            $scope.loadEventSources();
         });
 }());

…s/conditional-effect/conditionDisplay.js …/conditional-effect/condition-display.jssrc/gui/app/directives/conditional-effect/conditionDisplay.js renamed to src/gui/app/directives/conditional-effect/condition-display.js src/gui/app/directives/conditional-effect/conditionDisplay.js renamed to src/gui/app/directives/conditional-effect/condition-display.js

@@ -83,9 +83,8 @@
                     }
                 }
 
-                function getConditionTypes(triggerData) {
-                    return backendCommunicator
-                        .fireEventSync("getConditionTypes", triggerData)
+                async function getConditionTypes(triggerData) {
+                    return (await backendCommunicator.fireEventAsync("conditions:get-condition-types", triggerData))
                         .map((ct) => {
                             ct.getRightSidePresetValues = eval(ct.getRightSidePresetValues); // eslint-disable-line no-eval
                             ct.getLeftSidePresetValues = eval(ct.getLeftSidePresetValues); // eslint-disable-line no-eval
@@ -96,7 +95,7 @@
                         });
                 }
 
-                function reloadConditions() {
+                async function reloadConditions() {
                     if ($ctrl.conditionData == null) {
                         $ctrl.conditionData = {
                             mode: "exclusive",
@@ -110,7 +109,7 @@
                     /*
                         ,
                     */
-                    conditionDefintions = getConditionTypes();
+                    conditionDefintions = await getConditionTypes();
                 }
 
                 $ctrl.getConditionModeDisplay = function() {
@@ -121,13 +120,13 @@
                     return conditionDefintions.find(fd => fd.id === typeId);
                 };
 
-                $ctrl.$onInit = function() {
-                    reloadConditions();
+                $ctrl.$onInit = async () => {
+                    await reloadConditions();
                     validateConditionValues();
                 };
 
-                $ctrl.$onChanges = function() {
-                    reloadConditions();
+                $ctrl.$onChanges = async () => {
+                    await reloadConditions();
                 };
 
                 $ctrl.hasConditionsAvailable = function() {