@smartico/public-api 0.0.12 → 0.0.14

package/src/Missions/index.ts

@@ -1,28 +1,12 @@
-import { AchievementOptinRequest } from "./AchievementOptinRequest";
-import { AchievementOptinResponse } from "./AchievementOptinResponse";
-import { AchievementPublicMeta } from "./AchievementPublicMeta";
-import { AchievementStatus } from "./AchievementStatus";
-import { AchievementTaskPublicMeta } from "./AchievementTaskPublicMeta";
-import { AchievementTaskType } from "./AchievementTaskType";
-import { AchievementType } from "./AchievementType";
-import { GetAchievementMapRequest } from "./GetAchievementMapRequest";
-import { GetAchievementMapResponse } from "./GetAchievementMapResponse";
-import { ReloadAchievementsEvent } from "./ReloadAchievementsEvent";
-import { UserAchievement } from "./UserAchievement";
-import { UserAchievementTask } from "./UserAchievementTask";
-
-
-export {
-    AchievementOptinRequest,
-    AchievementOptinResponse,
-    AchievementPublicMeta,
-    AchievementStatus,
-    AchievementTaskPublicMeta,
-    AchievementTaskType,
-    AchievementType,
-    GetAchievementMapRequest,
-    GetAchievementMapResponse,
-    ReloadAchievementsEvent,
-    UserAchievement,
-    UserAchievementTask,
-}
+export * from "./AchievementOptinRequest";
+export * from "./AchievementOptinResponse";
+export * from "./AchievementPublicMeta";
+export * from "./AchievementStatus";
+export * from "./AchievementTaskPublicMeta";
+export * from "./AchievementTaskType";
+export * from "./AchievementType";
+export * from "./GetAchievementMapRequest";
+export * from "./GetAchievementMapResponse";
+export * from "./ReloadAchievementsEvent";
+export * from "./UserAchievement";
+export * from "./UserAchievementTask";

package/src/SmarticoAPI.ts

@@ -50,15 +50,28 @@ class SmarticoAPI {
         this.logCIDs = options.logCIDs || [];
         this.logHTTPTiming = options.logHTTPTiming || false;
 
-        let ENV_ID = this.label_api_key.length === 38 ? label_api_key.substring(37, 38) : '';
+        this.publicUrl = SmarticoAPI.getPublicUrl(label_api_key);
+        this.avatarDomain = SmarticoAPI.getAvatarUrl(label_api_key);
+
+        this.label_api_key = label_api_key.substring(0, 36);
+
+    }    
+
+    private static getEnvId(label_api_key: string): string {
+        let ENV_ID = label_api_key.length === 38 ? label_api_key.substring(37, 38) : '';
         
         if (ENV_ID === '1' || ENV_ID === '2') {
             ENV_ID = ''
         }
-        label_api_key = label_api_key.substring(0, 36);
+        return ENV_ID;        
+    }
+
+    public static getPublicUrl(label_api_key: string): string {
+        return PUBLIC_API_URL.replace('{ENV_ID}', SmarticoAPI.getEnvId(label_api_key));    
+    }
 
-        this.publicUrl = PUBLIC_API_URL.replace('{ENV_ID}', ENV_ID);    
-        this.avatarDomain = AVATAR_DOMAIN.replace('{ENV_ID}', ENV_ID);    
+    public static getAvatarUrl(label_api_key: string): string {
+        return AVATAR_DOMAIN.replace('{ENV_ID}', SmarticoAPI.getEnvId(label_api_key));    
     }    
 
     private async send<T>(message: any, expectCID?: ClassId): Promise<T> {
@@ -313,12 +326,12 @@ class SmarticoAPI {
         const response = await this.send<GetTournamentInfoResponse>(message);
         
         if (response.userPosition?.avatar_id) {
-            response.userPosition.avatar_url = CoreUtils.avatarUrl(response.userPosition.avatar_url, this.avatarDomain);
+            response.userPosition.avatar_url = CoreUtils.avatarUrl(response.userPosition.avatar_id, this.avatarDomain);
         }
 
         if (response.tournamentInfo.players?.length) {
             response.tournamentInfo.players.forEach(p => {
-                p.avatar_url = CoreUtils.avatarUrl(p.avatar_url, this.avatarDomain);
+                p.avatar_url = CoreUtils.avatarUrl(p.avatar_id, this.avatarDomain);
             });
         }
 

package/src/Store/index.ts

@@ -1,25 +1,10 @@
-import { BuyStoreItemErrorCode } from "./BuyStoreItemErrorCode";
-import { BuyStoreItemRequest } from "./BuyStoreItemRequest";
-import { BuyStoreItemResponse } from "./BuyStoreItemResponse";
-import { GetCategoriesStoreResponse } from "./GetCategoriesStoreResponse";
-import { GetStoreItemsResponse } from "./GetStoreItemsResponse";
-import { StoreCategory } from "./StoreCategory";
-import { StoreCategoryPublicMeta } from "./StoreCategoryPublicMeta";
-import { StoreItem } from "./StoreItem";
-import { StoreItemPublicMeta } from "./StoreItemPublicMeta";
-import { StoreItemType } from "./StoreItemType";
-
-
-export {
-    BuyStoreItemErrorCode,
-    BuyStoreItemRequest,
-    BuyStoreItemResponse,
-    GetCategoriesStoreResponse,
-    GetStoreItemsResponse,
-    StoreCategory,
-    StoreCategoryPublicMeta,
-    StoreItem,
-    StoreItemPublicMeta,
-    StoreItemType,
-
-}
+export * from "./BuyStoreItemErrorCode";
+export * from "./BuyStoreItemRequest";
+export * from "./BuyStoreItemResponse";
+export * from "./GetCategoriesStoreResponse";
+export * from "./GetStoreItemsResponse";
+export * from "./StoreCategory";
+export * from "./StoreCategoryPublicMeta";
+export * from "./StoreItem";
+export * from "./StoreItemPublicMeta";
+export * from "./StoreItemType";

package/src/Tournaments/index.ts

@@ -1,35 +1,16 @@
-import { GetTournamentInfoRequest } from "./GetTournamentInfoRequest";
-import { GetTournamentInfoResponse } from "./GetTournamentInfoResponse";
-import { GetTournamentsRequest } from "./GetTournamentsRequest";
-import { GetTournamentsResponse } from "./GetTournamentsResponse";
-import { Tournament } from "./Tournament";
-import { TournamentInstanceStatus } from "./TournamentInstanceStatus";
-import { TournamentPlayer } from "./TournamentPlayer";
-import { TournamentPrize } from "./TournamentPrize";
-import { TournamentPublicMeta } from "./TournamentPublicMeta";
-import { TournamentRegisterRequest } from "./TournamentRegisterRequest";
-import { TournamentRegisterResponse } from "./TournamentRegisterResponse";
-import { TournamentRegistrationError } from "./TournamentRegistrationError";
-import { TournamentRegistrationStatus } from "./TournamentRegistrationStatus";
-import { TournamentRegistrationType } from "./TournamentRegistrationType";
-import { TournamentType } from "./TournamentType";
-import { TournamentUtils } from "./TournamentUtils";
-
-export {
-    GetTournamentInfoRequest,
-    GetTournamentInfoResponse,
-    GetTournamentsRequest,
-    GetTournamentsResponse,
-    Tournament,
-    TournamentInstanceStatus,
-    TournamentPlayer,
-    TournamentPrize,
-    TournamentPublicMeta,
-    TournamentRegisterRequest,
-    TournamentRegisterResponse,
-    TournamentRegistrationError,
-    TournamentRegistrationStatus,
-    TournamentRegistrationType,
-    TournamentType,
-    TournamentUtils
-}
+export * from "./GetTournamentInfoRequest";
+export * from "./GetTournamentInfoResponse";
+export * from "./GetTournamentsRequest";
+export * from "./GetTournamentsResponse";
+export * from "./Tournament";
+export * from "./TournamentInstanceStatus";
+export * from "./TournamentPlayer";
+export * from "./TournamentPrize";
+export * from "./TournamentPublicMeta";
+export * from "./TournamentRegisterRequest";
+export * from "./TournamentRegisterResponse";
+export * from "./TournamentRegistrationError";
+export * from "./TournamentRegistrationStatus";
+export * from "./TournamentRegistrationType";
+export * from "./TournamentType";
+export * from "./TournamentUtils";

package/src/index.ts

@@ -1,19 +1,11 @@
-import { ClassId } from './Base/ClassId'
-import { ILogger } from './ILogger';
-import { MessageSender, SmarticoAPI } from './SmarticoAPI'
+export * from './Base/ClassId'
+export * from './ILogger';
+export * from './SmarticoAPI'
 
 export * from './Core';
 export * from './Inbox';
 export * from './Leaderboard';
 export * from './MiniGames';
 export * from './Missions';
-export * from './Store';
-export * from './Tournaments';
-
-
-export {
-    SmarticoAPI,
-    MessageSender,
-    ClassId,
-    ILogger
-}
+export * from './Store';   
+export * from './Tournaments';