Issues 56, 57, 58, 59

src/client/census.client.ts

@@ -46,7 +46,7 @@ export class CensusClient extends EventEmitter<ClientEvents> {
 
         this.serviceId = serviceId;
 
-        this.rest = new RestClient({serviceId, ...rest});
+        this.rest = new RestClient(environment, {serviceId, ...rest});
 
         this.characterManager = new CharacterManager(this, characterManager,);
 

src/client/concerns/cache.contract.ts

@@ -1,9 +1,9 @@
 export interface CacheContract {
-    put(key: string, data: any): Promise<void>;
+    put(key: string, data: any): Promise<void> | void;
 
-    fetch(key: string): Promise<any | null>;
+    fetch(key: string): Promise<any | null> | any | null;
 
-    forget(key: string): Promise<void>;
+    forget(key: string): Promise<void> | void;
 
-    forgetAll(): Promise<void>;
+    forgetAll(): Promise<void> | void;
 }

src/client/managers/character.manager.ts

@@ -1,4 +1,4 @@
-import {CacheContract} from  '../concerns/cache.contract';
+import {CacheContract} from '../concerns/cache.contract';
 import {GetQuery} from '../../rest';
 import {CensusClient} from '../census.client';
 import {MaxRetryException} from '../exceptions/max-retry.exception';
@@ -57,6 +57,14 @@ export class CharacterManager {
         return data;
     }
 
+    async forget(id: string): Promise<void> {
+        await this.cache.forget(id);
+    }
+
+    async forgetAll(): Promise<void> {
+        await this.cache.forgetAll();
+    }
+
     private async request(id: string): Promise<any> {
         const conditions = {character_id: id};
         let retries = this.maxRetries;
@@ -66,7 +74,7 @@ export class CharacterManager {
 
         do {
             try {
-                const data = await this.query.get(this.client.environment, conditions);
+                const data = await this.query.get(conditions);
 
                 if (data.length <= 0)
                     throw new Error(`Census did not return a character for "${id}"`);

src/rest/concern/rest.contract.ts

@@ -1,23 +1,20 @@
 import {CollectionNames, Conditions, Params} from '../types/collection';
-import {PS2Environment} from '../../types/ps2.options';
 import {CensusGetResponse} from '../types/census';
 
 export interface RestContract {
     /**
      * Run a count query
      *
-     * @param environment
      * @param collection
      * @param query
      */
-    count<C extends CollectionNames>(environment: PS2Environment, collection: C, query: Conditions<C>): Promise<number>;
+    count<C extends CollectionNames>(collection: C, query: Conditions<C>): Promise<number>;
 
     /**
      * Execute a get query directly
      *
-     * @param environment
      * @param collection
      * @param params
      */
-    get<C extends CollectionNames, R>(environment: PS2Environment, collection: C, params: Params<C>): Promise<CensusGetResponse<C, R>>;
+    get<C extends CollectionNames, R>(collection: C, params: Params<C>): Promise<CensusGetResponse<C, R>>;
 }

src/rest/get.query.ts

@@ -1,6 +1,5 @@
 import {CollectionNames, Conditions, Format, PartialPaths, Paths} from './types/collection';
 import {CensusResponse} from './utils/census-response';
-import {PS2Environment} from '../types/ps2.options';
 import {CommandParamKeys, CommandParams, Join, Langs, Resolve, Sort, Tree} from './types/commands';
 import {CensusBoolean, CensusGetResponse} from './types/census';
 import {RestContract} from './concern/rest.contract';
@@ -153,13 +152,12 @@ export class GetQuery<C extends CollectionNames, R = Format<C>> {
     /**
      * Execute the query
      *
-     * @param environment the environment to query
      * @param query conditions to filter results
      */
-    async get(environment: PS2Environment, query: Conditions<C>): Promise<CensusResponse<R>> {
+    async get(query: Conditions<C> = {}): Promise<CensusResponse<R>> {
         return new CensusResponse(
             this.collection,
-            await this.census.get<C, CensusGetResponse<C, R>>(environment, this.collection, {...this.params, ...query}),
+            await this.census.get<C, CensusGetResponse<C, R>>(this.collection, {...this.params, ...query}),
         );
     }
 

src/rest/index.ts

@@ -5,7 +5,7 @@ export * from './utils/census-response';
 export * from './collections';
 
 /** Utility */
-export * as commandTypes from './types/commands';
+export * from './types';
 
 /** Exceptions */
 export * from './exceptions/census-rest.exception';

src/rest/rest.client.ts

@@ -19,10 +19,9 @@ export class RestClient implements RestContract {
     static readonly CENSUS_HTTP = 'http://census.daybreakgames.com';
     static readonly CENSUS_HTTPS = 'https://census.daybreakgames.com';
 
-
     private api: AxiosInstance;
 
-    constructor({serviceId, https = true}: RestClientOptions = {}) {
+    constructor(readonly environment: PS2Environment,{serviceId, https = true}: RestClientOptions = {}) {
         let baseUrl = https ? RestClient.CENSUS_HTTPS : RestClient.CENSUS_HTTP;
 
         if (serviceId) baseUrl += `/s:${serviceId}`;
@@ -57,13 +56,12 @@ export class RestClient implements RestContract {
     /**
      * Run a count query
      *
-     * @param environment
      * @param collection
      * @param query
      */
-    async count<C extends CollectionNames>(environment: PS2Environment, collection: C, query: Conditions<C>): Promise<number> {
+    async count<C extends CollectionNames>(collection: C, query: Conditions<C>): Promise<number> {
         const {data} = await this.api.get(
-            `/count/${environment}:v2/${collection}`,
+            `/count/${this.environment}:v2/${collection}`,
             {params: query},
         );
 
@@ -73,13 +71,12 @@ export class RestClient implements RestContract {
     /**
      * Execute a get query directly
      *
-     * @param environment
      * @param collection
      * @param params
      */
-    async get<C extends CollectionNames, R>(environment: PS2Environment, collection: C, params: Params<C>): Promise<CensusGetResponse<C, R>> {
+    async get<C extends CollectionNames, R>(collection: C, params: Params<C>): Promise<CensusGetResponse<C, R>> {
         const {data} = await this.api.get(
-            `/get/${environment}:v2/${collection}`,
+            `/get/${this.environment}:v2/${collection}`,
             {params},
         );
 

src/rest/types/index.ts

@@ -0,0 +1 @@
+export * as collection from './collection';