Skip to content

Commit

Permalink
refactor: Doing some small refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@itssimple
itssimple committed Aug 2, 2022
1 parent e719d71 commit ad522e6
Show file tree
Hide file tree
Showing 9 changed files with 265 additions and 173 deletions.
64 changes: 35 additions & 29 deletions src/scripts/destiny2/apiClient.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,31 @@
import { log } from "../log";
import { Destiny2Goals } from "./goalItems";
declare var db: Destiny2Database;
declare var eventEmitter: EventEmitter;

import { EventEmitter } from "../eventEmitter";
import { Destiny2Database } from "../indexedDB";
import { log } from "../log";
import { Destiny2Goals, GoalDataItem } from "./goalItems";

export type DestinyNamedObject = {
characterInfo: any;
characterProgression: any;
characterActivities: any;
characterUninstancedItemComponents: any;
characterInventory: any;
characterEquipment: any;
characterPlugSets: any;
characterCollectibles: any;
characterRecords: any;
profileProgression: any;
metrics: any;
itemComponents: any;
records: any;
profileInventory: any;
profileCurrency: any;
profilePlugSets: any;
profileCollectibles: any;
profile: any;
};
export class DestinyApiClient {
destinyDataDefinition: {};
randomState: string | null;
Expand All @@ -10,7 +35,7 @@ export class DestinyApiClient {
lastVersion: string | null;
profile: any;
linkedProfiles: any;
trackedGoals: any[];
trackedGoals: GoalDataItem[];
cachedManifest: any;
checkManifestVersion: () => Promise<unknown>;
checkStoredDefinitions: (downloadMissingDefinitions?: boolean) => Promise<string[]>;
Expand All @@ -19,7 +44,7 @@ export class DestinyApiClient {
getToken: (state: any, code: any) => Promise<unknown>;
refreshToken: () => Promise<unknown>;
getLinkedProfiles: () => Promise<unknown>;
getUserProfile: (membershipId: any, membershipType: any) => Promise<unknown>;
getUserProfile: (membershipId: string, membershipType: any) => Promise<unknown>;
getLastPlayedCharacter: (forceRefresh?: boolean) => Promise<{
characterInfo: any;
characterProgression: any;
Expand All @@ -42,26 +67,7 @@ export class DestinyApiClient {
}>;
equipItems: (_lastPlayer: any) => Promise<unknown>;
lockItem: (membershipType: any, characterId: any, itemId: any, lockState: any) => Promise<unknown>;
getNamedDataObject: (forceRefresh?: boolean) => Promise<{
characterInfo: any;
characterProgression: any;
characterActivities: any;
characterUninstancedItemComponents: any;
characterInventory: any;
characterEquipment: any;
characterPlugSets: any;
characterCollectibles: any;
characterRecords: any;
profileProgression: any;
metrics: any;
itemComponents: any;
records: any;
profileInventory: any;
profileCurrency: any;
profilePlugSets: any;
profileCollectibles: any;
profile: any;
}>;
getNamedDataObject: (forceRefresh?: boolean) => Promise<DestinyNamedObject>;
getPresentationNodeFromHash: (hash: any) => any[];
mapHashesToDefinitionsInObject: (object: any) => any;
getTrackableData: (forceRefresh?: boolean) => Promise<any[]>;
Expand Down Expand Up @@ -244,7 +250,7 @@ export class DestinyApiClient {
};

this.checkStoredDefinitions = async function (downloadMissingDefinitions = true) {
let missingDefinitions = [];
let missingDefinitions: string[] = [];

for (let dataType of destinyDataTypes) {
if ((await db.getItem(`destinyContent-${dataType}`)) === null) {
Expand Down Expand Up @@ -497,7 +503,7 @@ export class DestinyApiClient {
StringVariables: 1200,
};

this.getUserProfile = async function (membershipId, membershipType) {
this.getUserProfile = async function (membershipId: string, membershipType) {
let interestingComponents = [
profileComponents.Profiles,
profileComponents.ProfileInventories,
Expand Down Expand Up @@ -664,7 +670,7 @@ export class DestinyApiClient {
});
};

this.getNamedDataObject = async function (forceRefresh = false) {
this.getNamedDataObject = async function (forceRefresh = false): Promise<DestinyNamedObject> {
let _lastPlayer = await self.getLastPlayedCharacter(forceRefresh);

if (_lastPlayer == null) {
Expand Down Expand Up @@ -833,7 +839,7 @@ export class DestinyApiClient {
return _objectCopy;
};

this.getTrackableData = async function (forceRefresh = false) {
this.getTrackableData = async function (forceRefresh = false): Promise<GoalDataItem[]> {
let namedObject = await self.getNamedDataObject(forceRefresh);

if (namedObject == null) {
Expand All @@ -844,7 +850,7 @@ export class DestinyApiClient {
let seasonPassDefinition =
self.destinyDataDefinition.DestinySeasonPassDefinition[seasonDefinition.seasonPassHash];

let trackableDataItems = [];
let trackableDataItems: GoalDataItem[] = [];

let milestoneData = self.goalApi.getMilestoneData(namedObject);
for (let milestone of milestoneData) {
Expand Down
122 changes: 94 additions & 28 deletions src/scripts/destiny2/goalItems.js → src/scripts/destiny2/goalItems.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,75 @@
import { DestinyApiClient } from "./apiClient";

declare var destinyApiClient: DestinyApiClient;

export type GoalType = "seasonrank" | "milestone" | "bounty" | "quest" | "characterRecord";

export type GoalDataItem = {
name: string;
description: string;
icon: string;
nextLevelAt?: number;
progressToNextLevel?: number;
type: GoalType;
order: number;
inProgressValueStyle: number;
completedValueStyle: number;
tracked?: boolean | undefined | null;
startDate?: string | undefined | null;
endDate?: string | undefined | null;
};

export type SeasonRankData = GoalDataItem & {};

export type MilestoneDataItem = GoalDataItem & {};

export type BountyDataItem = GoalDataItem & {
state?: ItemState;
};

export type QuestDataItem = GoalDataItem & {
state?: ItemState;
};

export type CharacterRecordDataItem = GoalDataItem & {
state?: RecordState;
};

export enum ItemState {
None = 0,
Locked = 1,
Tracked = 2,
Masterwork = 4,
Crafted = 8,
HighlightedObjective = 16,
}

export enum RecordState {
None = 0,
RecordRedeemed = 1,
RewardUnavailable = 2,
ObjectiveNotCompleted = 4,
Obscured = 8,
Invisible = 16,
EntitlementUnowned = 32,
CanEquipTitle = 64,
}

export class Destiny2Goals {
getSeasonRankData: (namedObject: any, seasonDefinition: any, seasonPassDefinition: any) => SeasonRankData;
replaceStringVariables: (string: string, profileVariables: string[]) => string;
getMilestoneData: (namedObject: any) => MilestoneDataItem[];
getBounties: (namedObject: any) => BountyDataItem[];
getQuests: (namedObject: any) => QuestDataItem[];
getCharacterRecords: (namedObject: any) => CharacterRecordDataItem[];

constructor() {
/**
* @description Used for the base URL of content, like images and such.
*/
const destinyBaseUrl = "https://www.bungie.net";

this.getSeasonRankData = function (namedObject, seasonDefinition, seasonPassDefinition) {
this.getSeasonRankData = function (namedObject, seasonDefinition, seasonPassDefinition): SeasonRankData {
let seasonPassData = namedObject.characterProgression.progressions[seasonDefinition.seasonPassProgressionHash];
let seasonPassProgressionData =
namedObject.characterProgression.progressions[seasonPassDefinition.prestigeProgressionHash];
Expand All @@ -23,7 +87,7 @@ export class Destiny2Goals {
progressToNextLevel += seasonPassProgressionData.progressToNextLevel;
}

let seasonRankDataItem = {
let seasonRankDataItem: SeasonRankData = {
name: `Season Rank ${seasonRank}`,
description: seasonDefinition.displayProperties.name,
icon: `${seasonArtifactData.displayProperties.icon}`,
Expand All @@ -39,7 +103,7 @@ export class Destiny2Goals {
return seasonRankDataItem;
};

this.replaceStringVariables = function (string, profileVariables) {
this.replaceStringVariables = function (string, profileVariables): string {
if (!string || string.indexOf("{var:") === -1) return string;
var matchRegex = /{var:(\d+)}/g;

Expand All @@ -50,27 +114,30 @@ export class Destiny2Goals {
if (allMatches) {
for (var i = 0; i < allMatches.length; i++) {
var match = allMatches[i];
var matchIndex = match.match(/\d+/)[0];
var matchString = profileVariables[matchIndex];
var _match = match.match(/\d+/);
if (_match) {
var matchIndex = _match[0];
var matchString = profileVariables[matchIndex];

if (matchString) {
newString = newString.replace(match, matchString);
if (matchString) {
newString = newString.replace(match, matchString);
}
}
}
}

return newString;
};

this.getMilestoneData = function (namedObject) {
let milestoneData = [];
this.getMilestoneData = function (namedObject): MilestoneDataItem[] {
let milestoneData: MilestoneDataItem[] = [];

let milestoneKeys = Object.keys(namedObject.characterProgression.milestones);

for (let milestoneKey of milestoneKeys) {
let milestone = namedObject.characterProgression.milestones[milestoneKey];

let milestoneDataItem = {
let milestoneDataItem: MilestoneDataItem = {
name: this.replaceStringVariables(
milestone.milestoneName,
namedObject.profileStringVariables.integerValuesByHash
Expand Down Expand Up @@ -123,7 +190,7 @@ export class Destiny2Goals {
milestoneDataItem.icon = step.activityIcon;
}

break; //milestoneData.push(milestoneDataItem);
break;
}
}
}
Expand All @@ -141,7 +208,7 @@ export class Destiny2Goals {
}

if (typeof challenge.objectiveInProgressValueStyle !== "undefined") {
milestoneDataItem.inProgressValueStyle = step.objectiveInProgressValueStyle;
milestoneDataItem.inProgressValueStyle = challenge.objectiveInProgressValueStyle;
}

if (typeof challenge.objectiveCompletedValueStyle !== "undefined") {
Expand All @@ -152,7 +219,7 @@ export class Destiny2Goals {
milestoneDataItem.nextLevelAt = challenge.objective.completionValue;
}

break; //milestoneData.push(milestoneDataItem);
break;
}
}
}
Expand All @@ -168,8 +235,8 @@ export class Destiny2Goals {

const bountyItemType = 26;

this.getBounties = function (namedObject) {
let bountyData = [];
this.getBounties = function (namedObject): BountyDataItem[] {
let bountyData: BountyDataItem[] = [];

var bountyItems = namedObject.characterInventory.filter((item) => item.inventoryitemItemType === bountyItemType);

Expand All @@ -182,7 +249,7 @@ export class Destiny2Goals {
if (incompleteTasks.length === 0) continue;

for (let objective of incompleteTasks) {
let bountyDataItem = {
let bountyDataItem: BountyDataItem = {
name: this.replaceStringVariables(
bounty.inventoryitemName,
namedObject.profileStringVariables.integerValuesByHash
Expand All @@ -196,15 +263,15 @@ export class Destiny2Goals {
type: "bounty",
inProgressValueStyle: 0,
completedValueStyle: 0,
tracked: (bounty.state & 2) == 2,
tracked: (bounty.state & ItemState.Tracked) == ItemState.Tracked,
state: bounty.state,
};

if (typeof bounty.expirationDate !== "undefined") {
bountyDataItem.endDate = bounty.expirationDate;

// If the bounty is expired, we'll ignore it
if (new Date(bounty.expirationDate) < Date.now()) {
if (new Date(bounty.expirationDate).getTime() < new Date().getTime()) {
continue;
}
}
Expand Down Expand Up @@ -240,11 +307,10 @@ export class Destiny2Goals {
return bountyData;
};

const questItemType = 12;
const questBucketHash = 1345459588;

this.getQuests = function (namedObject) {
let questData = [];
this.getQuests = function (namedObject): QuestDataItem[] {
let questData: QuestDataItem[] = [];

var questItems = namedObject.characterInventory.filter(
(item) =>
Expand All @@ -263,7 +329,7 @@ export class Destiny2Goals {
const _objectives = itemObjectives.objectives.filter((objective) => objective.visible && !objective.complete);

for (let objective of _objectives) {
let questDataItem = {
let questDataItem: QuestDataItem = {
name: this.replaceStringVariables(
instanceQuest.inventoryitemName,
namedObject.profileStringVariables.integerValuesByHash
Expand All @@ -277,7 +343,7 @@ export class Destiny2Goals {
type: "quest",
inProgressValueStyle: 0,
completedValueStyle: 0,
tracked: (instanceQuest.state & 2) == 2,
tracked: (instanceQuest.state & ItemState.Tracked) == ItemState.Tracked,
state: instanceQuest.state,
};

Expand Down Expand Up @@ -316,7 +382,7 @@ export class Destiny2Goals {
).filter((objective) => objective.visible && !objective.complete);

for (let objective of questObjectives) {
let questDataItem = {
let questDataItem: QuestDataItem = {
name: this.replaceStringVariables(
uninstancedQuest.inventoryitemName,
namedObject.profileStringVariables.integerValuesByHash
Expand All @@ -330,7 +396,7 @@ export class Destiny2Goals {
type: "quest",
inProgressValueStyle: 0,
completedValueStyle: 0,
tracked: (uninstancedQuest.state & 2) == 2,
tracked: (uninstancedQuest.state & ItemState.Tracked) == ItemState.Tracked,
state: uninstancedQuest.state,
};

Expand Down Expand Up @@ -365,8 +431,8 @@ export class Destiny2Goals {
return questData;
};

this.getCharacterRecords = function (namedObject) {
let characterRecords = [];
this.getCharacterRecords = function (namedObject): CharacterRecordDataItem[] {
let characterRecords: CharacterRecordDataItem[] = [];

let characterRecordKeys = Object.keys(namedObject.characterRecords.records);
for (let key of characterRecordKeys) {
Expand All @@ -379,7 +445,7 @@ export class Destiny2Goals {
);

for (let objective of recordObjectives) {
let characterRecordData = {
let characterRecordData: CharacterRecordDataItem = {
name: characterRecord.recordName,
type: "characterRecord",
order: 100,
Expand Down
Loading

0 comments on commit ad522e6

Please sign in to comment.