feat: Fixed cache breaker so it's near instant (well almost), also ch…

…anged interval to 15 seconds
itssimple · Aug 22, 2021 · 5fbf5fd · 5fbf5fd
1 parent 3597771
commit 5fbf5fd
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 5 deletions.
diff --git a/src/scripts/background.js b/src/scripts/background.js
@@ -7,6 +7,8 @@ var firstLaunch = true;
 var mainWindowId = null;
 var overlayWindowId = null;
 
+const destiny2ClassId = 21812;
+
 function openWindow(event, originEvent) {
   if (event) {
     log("WINDOW", "Got launch event: ", event);
@@ -84,7 +86,7 @@ function parseQueryString(queryString) {
 }
 
 function gameLaunched(game) {
-  if (game && game.classId == 21812) {
+  if (game && game.classId == destiny2ClassId) {
     log("GAME:LAUNCH", game);
     eventEmitter.emit("game-launched", game);
   }
@@ -193,7 +195,7 @@ if (firstLaunch) {
 
   window.eventEmitter.addEventListener("main-window-closed", function () {
     overwolf.games.getRunningGameInfo(function (data) {
-      if (data == null) {
+      if (data == null || data.classId != destiny2ClassId) {
         exitApp("No game running, no need to run in the background");
       }
     });

diff --git a/src/scripts/destiny2/apiClient.js b/src/scripts/destiny2/apiClient.js
@@ -510,6 +510,7 @@ function DestinyApiClient(d2ApiClient) {
       profileCurrency: _profile.profileCurrencies.data.items,
       profilePlugSets: _profile.profilePlugSets.data.plugs,
       profileCollectibles: _profile.profileCollectibles.data,
+      profile: _profile.profile.data,
     };
 
     return lastPlayedCharacter;
@@ -552,15 +553,40 @@ function DestinyApiClient(d2ApiClient) {
     });
   };
 
+  this.lockItem = async function (
+    membershipType,
+    characterId,
+    itemId,
+    lockState
+  ) {
+    return new Promise(async (resolve, reject) => {
+      await pluginClient.POSTJson(
+        `${destinyApiUrl}/Destiny2/Actions/Items/SetLockState/`,
+        JSON.stringify({
+          membershipType: membershipType,
+          characterId: characterId,
+          itemId: itemId,
+          state: lockState,
+        }),
+        await getUserToken(),
+        (result) => {
+          if (result.statusCode === 200) {
+            resolve(result.content);
+          } else {
+            reject(result);
+          }
+        }
+      );
+    });
+  };
+
   this.getNamedDataObject = async function (forceRefresh = false) {
     let _lastPlayer = await self.getLastPlayedCharacter(forceRefresh);
 
     if (_lastPlayer == null) {
       return null;
     }
 
-    await self.equipItems(_lastPlayer);
-
     let namedDataObject = {
       ..._lastPlayer,
     };
@@ -603,6 +629,19 @@ function DestinyApiClient(d2ApiClient) {
 
     namedDataObject = self.mapHashesToDefinitionsInObject(namedDataObject);
 
+    const lockableItems = _lastPlayer.characterInventory.filter(
+      (i) => i.lockable && i.inventoryitemItemType == 3
+    );
+
+    if (lockableItems.length > 0) {
+      await self.lockItem(
+        _lastPlayer.characterInfo.membershipType,
+        _lastPlayer.characterInfo.characterId,
+        lockableItems[0].itemInstanceId,
+        lockableItems[0].state
+      );
+    }
+
     eventEmitter.emit("destiny2-api-update", namedDataObject);
 
     return namedDataObject;

diff --git a/src/scripts/overlayWindow.js b/src/scripts/overlayWindow.js
@@ -176,4 +176,4 @@ eventEmitter.addEventListener("visible-items-changed", (visibleItems) => {
 
 setInterval(async function () {
   await destinyApiClient.getTrackableData(true);
-}, 30 * 1000);
+}, 15 * 1000);