@sonoransoftware/sonoran.js 1.0.14 → 1.0.16

package/dist/constants.d.ts

@@ -1,4 +1,4 @@
-import Collection from '@discordjs/collection';
+import { Collection } from '@discordjs/collection';
 import { CADDispatchOriginEnums, CADDispatchStatusEnums } from './libs/rest/src';
 import { DataManager } from './managers/DataManager';
 import { CADActiveUnitsManager } from './managers/CADActiveUnitsManager';
@@ -23,16 +23,16 @@ export interface CADNewDispatchBuilderOptions {
     metaData?: Record<string, string>;
     units?: string[];
 }
-export declare type Constructable<T> = abstract new (...args: any[]) => T;
+export type Constructable<T> = abstract new (...args: any[]) => T;
 export interface Caches {
     CADActiveUnitsManager: [manager: typeof CADActiveUnitsManager, holds: CADActiveUnit];
 }
-export declare type CacheConstructors = {
+export type CacheConstructors = {
     [K in keyof Caches]: Caches[K][0] & {
         name: K;
     };
 };
-export declare type CacheFactory = (manager: CacheConstructors[keyof Caches], holds: Caches[typeof manager['name']][1]) => typeof manager['prototype'] extends DataManager<infer K, infer V, any> ? Collection<K, V> : never;
+export type CacheFactory = (manager: CacheConstructors[keyof Caches], holds: Caches[typeof manager['name']][1]) => typeof manager['prototype'] extends DataManager<infer K, infer V, any> ? Collection<K, V> : never;
 export interface CADActiveUnitFetchOptions {
     id?: number | number[];
     accId?: string | string[];
@@ -54,7 +54,7 @@ export declare enum CMSSubscriptionVersionEnum {
     PRO = 4,
     ONE = 6
 }
-export declare type Mutable<T> = {
+export type Mutable<T> = {
     -readonly [k in keyof T]: T[k];
 };
 export interface CMSVerifyWhitelistPromiseResult {

package/dist/instance/Instance.d.ts

@@ -17,6 +17,7 @@ export declare class Instance extends EventEmitter {
     cad: CADManager | undefined;
     cms: CMSManager | undefined;
     debug: boolean;
+    apiHeaders: HeadersInit;
     constructor(options: InstanceTypes.InstanceOptions);
     private initialize;
     _debugLog(message: string): void;

package/dist/instance/Instance.js

@@ -42,9 +42,13 @@ class Instance extends events_1.default {
         this.cmsDefaultServerId = 1;
         this.isCMSSuccessful = false;
         this.debug = false;
+        this.apiHeaders = {};
         if (options.debug) {
             this.debug = options.debug;
         }
+        if (Object.prototype.hasOwnProperty.call(options, 'apiHeaders') && options.apiHeaders !== undefined) {
+            this.apiHeaders = options.apiHeaders;
+        }
         if (Object.prototype.hasOwnProperty.call(options, 'apiKey') && Object.prototype.hasOwnProperty.call(options, 'communityId')) {
             if (Object.prototype.hasOwnProperty.call(options, 'product')) {
                 switch (options.product) {

package/dist/instance/instance.types.d.ts

@@ -1,5 +1,5 @@
 import * as globalTypes from '../constants';
-export declare type InstanceOptions = {
+export type InstanceOptions = {
     communityId?: string;
     apiKey?: string;
     product?: globalTypes.productEnums;
@@ -13,4 +13,5 @@ export declare type InstanceOptions = {
     cmsApiUrl?: string;
     cmsDefaultServerId?: number;
     debug?: boolean;
+    apiHeaders?: HeadersInit;
 };

package/dist/libs/rest/src/lib/REST.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
 import { EventEmitter } from 'events';
 import { RequestData, RequestManager } from './RequestManager';
 import { AllAPITypesType, RESTTypedAPIDataStructs } from './utils/constants';
@@ -84,7 +86,7 @@ export interface REST {
     off: (<K extends keyof RestEvents>(event: K, listener: (...args: RestEvents[K]) => void) => this) & (<S extends string | symbol>(event: Exclude<S, keyof RestEvents>, listener: (...args: any[]) => void) => this);
     removeAllListeners: (<K extends keyof RestEvents>(event?: K) => this) & (<S extends string | symbol>(event?: Exclude<S, keyof RestEvents>) => this);
 }
-export declare type RestManagerTypes = CADManager | CMSManager;
+export type RestManagerTypes = CADManager | CMSManager;
 export declare class REST extends EventEmitter {
     readonly requestManager: RequestManager;
     readonly instance: Instance;

package/dist/libs/rest/src/lib/REST.js

@@ -12,15 +12,15 @@ class REST extends events_1.EventEmitter {
         this.instance = _instance;
         this.manager = _manager;
         this.requestManager = new RequestManager_1.RequestManager(_instance, _product, options)
-            .on("restDebug" /* Debug */, this.emit.bind(this, "restDebug" /* Debug */))
-            .on("rateLimited" /* RateLimited */, this.emit.bind(this, "rateLimited" /* RateLimited */))
-            .on("invalidRequestWarning" /* InvalidRequestWarning */, this.emit.bind(this, "invalidRequestWarning" /* InvalidRequestWarning */));
+            .on("restDebug" /* RESTEvents.Debug */, this.emit.bind(this, "restDebug" /* RESTEvents.Debug */))
+            .on("rateLimited" /* RESTEvents.RateLimited */, this.emit.bind(this, "rateLimited" /* RESTEvents.RateLimited */))
+            .on("invalidRequestWarning" /* RESTEvents.InvalidRequestWarning */, this.emit.bind(this, "invalidRequestWarning" /* RESTEvents.InvalidRequestWarning */));
         this.on('newListener', (name, listener) => {
-            if (name === "request" /* Request */ || name === "response" /* Response */)
+            if (name === "request" /* RESTEvents.Request */ || name === "response" /* RESTEvents.Response */)
                 this.requestManager.on(name, listener);
         });
         this.on('removeListener', (name, listener) => {
-            if (name === "request" /* Request */ || name === "response" /* Response */)
+            if (name === "request" /* RESTEvents.Request */ || name === "response" /* RESTEvents.Response */)
                 this.requestManager.off(name, listener);
         });
     }

package/dist/libs/rest/src/lib/RequestManager.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="node" />
-import Collection from '@discordjs/collection';
+import { Collection } from '@discordjs/collection';
 import { EventEmitter } from 'events';
 import type { Instance } from '../../../../instance/Instance';
 import { RESTOptions, RateLimitData, RestEvents } from './REST';
 import { productEnums } from '../../../../constants';
 import { IHandler } from './handlers/IHandler';
-export declare type RouteLike = `/${string}`;
+export type RouteLike = `/${string}`;
 export declare const enum RequestMethod {
     Delete = "delete",
     Get = "get",
@@ -13,7 +13,7 @@ export declare const enum RequestMethod {
     Post = "post",
     Put = "put"
 }
-export declare type ReqDataType = Array<unknown> | unknown;
+export type ReqDataType = Array<unknown> | unknown;
 export interface RequestData {
     id: string;
     key: string;

package/dist/libs/rest/src/lib/RequestManager.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestManager = void 0;
-const collection_1 = __importDefault(require("@discordjs/collection"));
+const collection_1 = require("@discordjs/collection");
 // import { DiscordSnowflake } from '@sapphire/snowflake';
 const events_1 = require("events");
 const constants_1 = require("./utils/constants");
@@ -14,8 +11,8 @@ const utils_1 = require("../../../../utils/utils");
 class RequestManager extends events_1.EventEmitter {
     constructor(_instance, _product, options) {
         super();
-        this.ratelimitedTypes = new collection_1.default();
-        this.handlers = new collection_1.default();
+        this.ratelimitedTypes = new collection_1.Collection();
+        this.handlers = new collection_1.Collection();
         this.product = _product;
         this.instance = _instance;
         switch (_product) {
@@ -182,7 +179,8 @@ class RequestManager extends events_1.EventEmitter {
         apiData.fetchOptions.body = JSON.stringify(apiData.data);
         apiData.fetchOptions.headers = {
             'Accept': 'application/json',
-            'Content-Type': 'application/json'
+            'Content-Type': 'application/json',
+            ...instance.apiHeaders
         };
         return apiData;
     }

package/dist/libs/rest/src/lib/utils/constants.d.ts

@@ -33,7 +33,7 @@ export declare const GeneralCMSAPITypes: APITypeData[];
 export declare const ServersCMSAPITypes: APITypeData[];
 export declare const EventsCMSAPITypes: APITypeData[];
 export declare const AllAPITypes: AllAPITypeData[];
-export declare type AllAPITypesType = 'GET_SERVERS' | 'SET_SERVERS' | 'GET_VERSION' | 'SET_PENAL_CODES' | 'SET_API_ID' | 'GET_TEMPLATES' | 'NEW_RECORD' | 'EDIT_RECORD' | 'REMOVE_RECORD' | 'LOOKUP_INT' | 'LOOKUP' | 'GET_ACCOUNT' | 'CHECK_APIID' | 'APPLY_PERMISSION_KEY' | 'SET_ACCOUNT_PERMISSIONS' | 'BAN_USER' | 'VERIFY_SECRET' | 'AUTH_STREETSIGNS' | 'SET_POSTALS' | 'SEND_PHOTO' | 'GET_CHARACTERS' | 'NEW_CHARACTER' | 'EDIT_CHARACTER' | 'REMOVE_CHARACTER' | 'GET_IDENTIFIERS' | 'MODIFY_IDENTIFIER' | 'SET_IDENTIFIER' | 'UNIT_PANIC' | 'UNIT_STATUS' | 'GET_BLIPS' | 'ADD_BLIP' | 'MODIFY_BLIP' | 'REMOVE_BLIP' | '911_CALL' | 'REMOVE_911' | 'GET_CALLS' | 'GET_ACTIVE_UNITS' | 'KICK_UNIT' | 'NEW_DISPATCH' | 'ATTACH_UNIT' | 'DETACH_UNIT' | 'SET_CALL_POSTAL' | 'SET_CALL_PRIMARY' | 'ADD_CALL_NOTE' | 'CLOSE_CALL' | 'UNIT_LOCATION' | 'SET_STREETSIGN_CONFIG' | 'UPDATE_STREETSIGN' | 'GET_COM_ACCOUNT' | 'GET_DEPARTMENTS' | 'GET_SUB_VERSION' | 'CHECK_COM_APIID' | 'VERIFY_WHITELIST' | 'CLOCK_IN_OUT' | 'FULL_WHITELIST' | 'GET_ACCOUNT_RANKS' | 'SET_ACCOUNT_RANKS' | 'RSVP';
+export type AllAPITypesType = 'GET_SERVERS' | 'SET_SERVERS' | 'GET_VERSION' | 'SET_PENAL_CODES' | 'SET_API_ID' | 'GET_TEMPLATES' | 'NEW_RECORD' | 'EDIT_RECORD' | 'REMOVE_RECORD' | 'LOOKUP_INT' | 'LOOKUP' | 'GET_ACCOUNT' | 'CHECK_APIID' | 'APPLY_PERMISSION_KEY' | 'SET_ACCOUNT_PERMISSIONS' | 'BAN_USER' | 'VERIFY_SECRET' | 'AUTH_STREETSIGNS' | 'SET_POSTALS' | 'SEND_PHOTO' | 'GET_CHARACTERS' | 'NEW_CHARACTER' | 'EDIT_CHARACTER' | 'REMOVE_CHARACTER' | 'GET_IDENTIFIERS' | 'MODIFY_IDENTIFIER' | 'SET_IDENTIFIER' | 'UNIT_PANIC' | 'UNIT_STATUS' | 'GET_BLIPS' | 'ADD_BLIP' | 'MODIFY_BLIP' | 'REMOVE_BLIP' | '911_CALL' | 'REMOVE_911' | 'GET_CALLS' | 'GET_ACTIVE_UNITS' | 'KICK_UNIT' | 'NEW_DISPATCH' | 'ATTACH_UNIT' | 'DETACH_UNIT' | 'SET_CALL_POSTAL' | 'SET_CALL_PRIMARY' | 'ADD_CALL_NOTE' | 'CLOSE_CALL' | 'UNIT_LOCATION' | 'SET_STREETSIGN_CONFIG' | 'UPDATE_STREETSIGN' | 'GET_COM_ACCOUNT' | 'GET_DEPARTMENTS' | 'GET_SUB_VERSION' | 'CHECK_COM_APIID' | 'VERIFY_WHITELIST' | 'CLOCK_IN_OUT' | 'FULL_WHITELIST' | 'GET_ACCOUNT_RANKS' | 'SET_ACCOUNT_RANKS' | 'RSVP';
 export interface CMSServerAPIStruct {
     id: number;
     name: string;
@@ -428,7 +428,7 @@ export interface RESTTypedAPIDataStructs {
         accId: string | undefined
     ];
 }
-export declare type PossibleRequestData = undefined | {
+export type PossibleRequestData = undefined | {
     data: CADPenalCodeStruct[] | CADSetAPIIDStruct | CADNewEditRecordOptionOneStruct | CADNewEditRecordOptionTwoStruct | CADLookupByIntStruct | CADLookupStruct | CADModifyAccountPermsStruct | CADKickBanUserStruct | CADSetPostalStruct[] | CADModifyIdentifierStruct | CADAddBlipStruct[] | CADModifyBlipStruct[] | CADGetCallsStruct | CADGetActiveUnitsStruct | CADNewDispatchStruct;
 } | {
     servers: CADServerAPIStruct[];

package/dist/managers/CacheManager.d.ts

@@ -1,4 +1,4 @@
-import Collection from '@discordjs/collection';
+import { Collection } from '@discordjs/collection';
 import { Instance } from '../instance/Instance';
 import { Constructable } from '../constants';
 import { DataManager } from './DataManager';

package/dist/managers/CacheManager.js

@@ -1,15 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CacheManager = void 0;
-const collection_1 = __importDefault(require("@discordjs/collection"));
+const collection_1 = require("@discordjs/collection");
 const DataManager_1 = require("./DataManager");
 class CacheManager extends DataManager_1.DataManager {
     constructor(instance, holds, iterable) {
         super(instance, holds);
-        this._cache = new collection_1.default();
+        this._cache = new collection_1.Collection();
         if (iterable) {
             for (const item of iterable) {
                 this._add(item);

package/dist/managers/DataManager.d.ts

@@ -1,7 +1,7 @@
 import { Instance } from '../instance/Instance';
 import { BaseManager } from './BaseManager';
 import { Constructable } from '../constants';
-import Collection from '@discordjs/collection';
+import { Collection } from '@discordjs/collection';
 interface DataManagerInstanceObject {
     id: string;
 }

package/dist/managers/DataManager.js

@@ -1,12 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataManager = void 0;
 const BaseManager_1 = require("./BaseManager");
 const errors_1 = require("../errors");
-const collection_1 = __importDefault(require("@discordjs/collection"));
+const collection_1 = require("@discordjs/collection");
 class DataManager extends BaseManager_1.BaseManager {
     constructor(instance, holds) {
         super(instance);
@@ -34,7 +31,7 @@ class DataManager extends BaseManager_1.BaseManager {
      */
     resolve(idOrInstance) {
         var _a;
-        if (this.cache instanceof collection_1.default) {
+        if (this.cache instanceof collection_1.Collection) {
             if (typeof idOrInstance === 'object')
                 return idOrInstance;
             if (typeof idOrInstance === 'string')

package/dist/structures/CADActiveUnit.d.ts

@@ -31,7 +31,7 @@ export interface CADActiveUnitDataStruct {
     rank: string;
     group: string;
 }
-export declare type CADActiveUnitResolvable = CADActiveUnit | number;
+export type CADActiveUnitResolvable = CADActiveUnit | number;
 export declare class CADActiveUnit extends Base {
     id: number;
     accId: string;

package/dist/utils/utils.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.debugLog = exports.errorLog = exports.infoLog = exports.warnLog = exports.flatten = exports.cloneObject = exports.mergeDefault = void 0;
-const collection_1 = __importDefault(require("@discordjs/collection"));
+const collection_1 = require("@discordjs/collection");
 const isObject = (d) => typeof d === 'object' && d !== null;
 function mergeDefault(def, given) {
     if (!given)
@@ -46,10 +43,10 @@ function flatten(obj, ...props) {
         const elemIsObj = isObject(element);
         const valueOf = elemIsObj && typeof element.valueOf === 'function' ? element.valueOf() : null;
         // If it's a Collection, make the array of keys
-        if (element instanceof collection_1.default)
+        if (element instanceof collection_1.Collection)
             out[newProp] = Array.from(element.keys());
         // If the valueOf is a Collection, use its array of keys
-        else if (valueOf instanceof collection_1.default)
+        else if (valueOf instanceof collection_1.Collection)
             out[newProp] = Array.from(valueOf.keys());
         // If it's an array, flatten each element
         else if (Array.isArray(element))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonoransoftware/sonoran.js",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "Sonoran.js is a library that allows you to interact with the Sonoran CAD and Sonoran CMS API. Based off of and utilizes several Discord.js library techniques for ease of use.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,8 +37,8 @@
     "ext": "*.ts, *.json"
   },
   "dependencies": {
-    "@discordjs/collection": "^0.5.0",
-    "@sapphire/async-queue": "^1.3.0",
+    "@discordjs/collection": "^1.5.0",
+    "@sapphire/async-queue": "^1.5.0",
     "@sapphire/snowflake": "^3.2.0",
     "events": "^3.3.0",
     "node-abort-controller": "^3.0.1",

package/src/constants.ts

@@ -1,4 +1,4 @@
-import Collection from '@discordjs/collection';
+import { Collection } from '@discordjs/collection';
 import { CADDispatchOriginEnums, CADDispatchStatusEnums } from './libs/rest/src';
 import { DataManager } from './managers/DataManager';
 import { CADActiveUnitsManager } from './managers/CADActiveUnitsManager';

package/src/instance/Instance.ts

@@ -1,118 +1,122 @@
-import EventEmitter from 'events';
-
-import * as globalTypes from '../constants';
-import * as InstanceTypes from './instance.types';
-import { CADManager } from '../managers/CADManager';
-import { CMSManager } from '../managers/CMSManager';
-import { debugLog } from '../utils';
-
-export class Instance extends EventEmitter {
-  public cadCommunityId: string | undefined;
-  public cadApiKey: string | undefined;
-  public cadApiUrl: string = 'https://api.sonorancad.com';
-  public cadDefaultServerId: number = 1;
-  public isCADSuccessful: boolean = false;
-  public cmsCommunityId: string | undefined;
-  public cmsApiKey: string | undefined;
-  public cmsApiUrl: string = 'https://api.sonorancms.com';
-  public cmsDefaultServerId: number = 1;
-  public isCMSSuccessful: boolean = false;
-
-  public cad: CADManager | undefined;
-  public cms: CMSManager | undefined;
-
-  public debug: boolean = false;
-
-  constructor(options: InstanceTypes.InstanceOptions) {
-    super({ captureRejections: true });
-    if (options.debug) {
-      this.debug = options.debug;
-    }
-    if (Object.prototype.hasOwnProperty.call(options, 'apiKey') && Object.prototype.hasOwnProperty.call(options, 'communityId')) {
-      if (Object.prototype.hasOwnProperty.call(options, 'product')) {
-        switch (options.product) {
-          case globalTypes.productEnums.CAD: {
-            this.cadCommunityId = options.communityId;
-            this.cadApiKey = options.apiKey;
-            if (options.serverId !== undefined) {
-              this._debugLog(`Overriding default server id... ${options.serverId}`);
-              this.cadDefaultServerId = options.serverId;
-            }
-            if (Object.prototype.hasOwnProperty.call(options, 'cadApiUrl') && typeof options.cadApiUrl === 'string') {
-              this._debugLog(`Overriding CAD API Url... ${options.cadApiUrl}`);
-              this.cadApiUrl = options.cadApiUrl;
-            }
-            this._debugLog('About to initialize instance.');
-            this.initialize();
-            break;
-          }
-          case globalTypes.productEnums.CMS: {
-            this.cmsCommunityId = options.communityId;
-            this.cmsApiKey = options.apiKey;
-            if (options.serverId !== undefined) {
-              this._debugLog(`Overriding default server id... ${options.serverId}`);
-              this.cmsDefaultServerId = options.serverId;
-            }
-            if (Object.prototype.hasOwnProperty.call(options, 'cmsApiUrl') && typeof options.cmsApiUrl === 'string') {
-              this._debugLog(`Overriding CMS API URL... ${options.cmsApiUrl}`);
-              this.cmsApiUrl = options.cmsApiUrl;
-            }
-            this.initialize();
-            break;
-          }
-          default: {
-            throw new Error('Invalid product enum given for constructor.');
-          }
-        }
-      } else {
-        throw new Error('No product enum given when instancing.');
-      }
-    } else {
-      this.cadCommunityId = options.cadCommunityId;
-      this.cadApiKey = options.cadApiKey;
-      this.cmsCommunityId = options.cmsCommunityId;
-      this.cmsApiKey = options.cmsApiKey;
-
-      if (options.cadDefaultServerId !== undefined) {
-        this._debugLog(`Overriding default CAD server id... ${options.serverId}`);
-        this.cadDefaultServerId = options.cadDefaultServerId;
-      }
-      if (options.cmsDefaultServerId !== undefined) {
-        this._debugLog(`Overriding default CMS server id... ${options.serverId}`);
-        this.cmsDefaultServerId = options.cmsDefaultServerId;
-      }
-      if (Object.prototype.hasOwnProperty.call(options, 'cadApiUrl') && typeof options.cadApiUrl === 'string') {
-        this._debugLog(`Overriding CAD API Url... ${options.cadApiUrl}`);
-        this.cadApiUrl = options.cadApiUrl;
-      }
-      if (Object.prototype.hasOwnProperty.call(options, 'cmsApiUrl') && typeof options.cmsApiUrl === 'string') {
-        this._debugLog(`Overriding CMS API URL... ${options.cmsApiUrl}`);
-        this.cmsApiUrl = options.cmsApiUrl;
-      }
-      this.initialize();
-    }
-  }
-
-
-
-  private initialize() {
-    if (this.cadCommunityId && this.cadApiKey && this.cadApiUrl) {
-      this._debugLog('About to initialize CAD Manager');
-      this.cad = new CADManager(this);
-    } else {
-      this._debugLog('Not initializing CAD Manager due to a missing community id, api key, or api url.');
-    }
-    if (this.cmsCommunityId && this.cmsApiKey && this.cmsApiUrl) {
-      this._debugLog('About to initialize CMS Manager');
-      this.cms = new CMSManager(this);
-    } else {
-      this._debugLog('Not initializing CMS Manager due to a missing community id, api key, or api url.');
-    }
-  }
-
-  public _debugLog(message: string): void {
-    if (this.debug) {
-      debugLog(message);
-    }
-  }
+import EventEmitter from 'events';
+
+import * as globalTypes from '../constants';
+import * as InstanceTypes from './instance.types';
+import { CADManager } from '../managers/CADManager';
+import { CMSManager } from '../managers/CMSManager';
+import { debugLog } from '../utils';
+
+export class Instance extends EventEmitter {
+  public cadCommunityId: string | undefined;
+  public cadApiKey: string | undefined;
+  public cadApiUrl: string = 'https://api.sonorancad.com';
+  public cadDefaultServerId: number = 1;
+  public isCADSuccessful: boolean = false;
+  public cmsCommunityId: string | undefined;
+  public cmsApiKey: string | undefined;
+  public cmsApiUrl: string = 'https://api.sonorancms.com';
+  public cmsDefaultServerId: number = 1;
+  public isCMSSuccessful: boolean = false;
+
+  public cad: CADManager | undefined;
+  public cms: CMSManager | undefined;
+
+  public debug: boolean = false;
+  public apiHeaders: HeadersInit = {};
+
+  constructor(options: InstanceTypes.InstanceOptions) {
+    super({ captureRejections: true });
+    if (options.debug) {
+      this.debug = options.debug;
+    }
+    if (Object.prototype.hasOwnProperty.call(options, 'apiHeaders') && options.apiHeaders !== undefined) {
+      this.apiHeaders = options.apiHeaders;
+    }
+    if (Object.prototype.hasOwnProperty.call(options, 'apiKey') && Object.prototype.hasOwnProperty.call(options, 'communityId')) {
+      if (Object.prototype.hasOwnProperty.call(options, 'product')) {
+        switch (options.product) {
+          case globalTypes.productEnums.CAD: {
+            this.cadCommunityId = options.communityId;
+            this.cadApiKey = options.apiKey;
+            if (options.serverId !== undefined) {
+              this._debugLog(`Overriding default server id... ${options.serverId}`);
+              this.cadDefaultServerId = options.serverId;
+            }
+            if (Object.prototype.hasOwnProperty.call(options, 'cadApiUrl') && typeof options.cadApiUrl === 'string') {
+              this._debugLog(`Overriding CAD API Url... ${options.cadApiUrl}`);
+              this.cadApiUrl = options.cadApiUrl;
+            }
+            this._debugLog('About to initialize instance.');
+            this.initialize();
+            break;
+          }
+          case globalTypes.productEnums.CMS: {
+            this.cmsCommunityId = options.communityId;
+            this.cmsApiKey = options.apiKey;
+            if (options.serverId !== undefined) {
+              this._debugLog(`Overriding default server id... ${options.serverId}`);
+              this.cmsDefaultServerId = options.serverId;
+            }
+            if (Object.prototype.hasOwnProperty.call(options, 'cmsApiUrl') && typeof options.cmsApiUrl === 'string') {
+              this._debugLog(`Overriding CMS API URL... ${options.cmsApiUrl}`);
+              this.cmsApiUrl = options.cmsApiUrl;
+            }
+            this.initialize();
+            break;
+          }
+          default: {
+            throw new Error('Invalid product enum given for constructor.');
+          }
+        }
+      } else {
+        throw new Error('No product enum given when instancing.');
+      }
+    } else {
+      this.cadCommunityId = options.cadCommunityId;
+      this.cadApiKey = options.cadApiKey;
+      this.cmsCommunityId = options.cmsCommunityId;
+      this.cmsApiKey = options.cmsApiKey;
+
+      if (options.cadDefaultServerId !== undefined) {
+        this._debugLog(`Overriding default CAD server id... ${options.serverId}`);
+        this.cadDefaultServerId = options.cadDefaultServerId;
+      }
+      if (options.cmsDefaultServerId !== undefined) {
+        this._debugLog(`Overriding default CMS server id... ${options.serverId}`);
+        this.cmsDefaultServerId = options.cmsDefaultServerId;
+      }
+      if (Object.prototype.hasOwnProperty.call(options, 'cadApiUrl') && typeof options.cadApiUrl === 'string') {
+        this._debugLog(`Overriding CAD API Url... ${options.cadApiUrl}`);
+        this.cadApiUrl = options.cadApiUrl;
+      }
+      if (Object.prototype.hasOwnProperty.call(options, 'cmsApiUrl') && typeof options.cmsApiUrl === 'string') {
+        this._debugLog(`Overriding CMS API URL... ${options.cmsApiUrl}`);
+        this.cmsApiUrl = options.cmsApiUrl;
+      }
+      this.initialize();
+    }
+  }
+
+
+
+  private initialize() {
+    if (this.cadCommunityId && this.cadApiKey && this.cadApiUrl) {
+      this._debugLog('About to initialize CAD Manager');
+      this.cad = new CADManager(this);
+    } else {
+      this._debugLog('Not initializing CAD Manager due to a missing community id, api key, or api url.');
+    }
+    if (this.cmsCommunityId && this.cmsApiKey && this.cmsApiUrl) {
+      this._debugLog('About to initialize CMS Manager');
+      this.cms = new CMSManager(this);
+    } else {
+      this._debugLog('Not initializing CMS Manager due to a missing community id, api key, or api url.');
+    }
+  }
+
+  public _debugLog(message: string): void {
+    if (this.debug) {
+      debugLog(message);
+    }
+  }
 }

package/src/instance/instance.types.ts

@@ -1,17 +1,18 @@
-import * as globalTypes from '../constants';
-
-export type InstanceOptions = {
-  communityId?: string;
-  apiKey?: string;
-  product?: globalTypes.productEnums;
-  serverId?: number;
-  cadCommunityId?: string;
-  cadApiKey?: string;
-  cadApiUrl?: string;
-  cadDefaultServerId?: number;
-  cmsCommunityId?: string;
-  cmsApiKey?: string;
-  cmsApiUrl?: string;
-  cmsDefaultServerId?: number;
-  debug?: boolean;
+import * as globalTypes from '../constants';
+
+export type InstanceOptions = {
+  communityId?: string;
+  apiKey?: string;
+  product?: globalTypes.productEnums;
+  serverId?: number;
+  cadCommunityId?: string;
+  cadApiKey?: string;
+  cadApiUrl?: string;
+  cadDefaultServerId?: number;
+  cmsCommunityId?: string;
+  cmsApiKey?: string;
+  cmsApiUrl?: string;
+  cmsDefaultServerId?: number;
+  debug?: boolean;
+  apiHeaders?: HeadersInit ;
 };

package/src/libs/rest/src/lib/RequestManager.ts

@@ -1,4 +1,4 @@
-import Collection from '@discordjs/collection';
+import { Collection } from '@discordjs/collection';
 // import { DiscordSnowflake } from '@sapphire/snowflake';
 import { EventEmitter } from 'events';
 // import type { RequestInit, BodyInit } from 'node-fetch';
@@ -248,7 +248,8 @@ export class RequestManager extends EventEmitter {
     apiData.fetchOptions.body = JSON.stringify(apiData.data);
     apiData.fetchOptions.headers = {
       'Accept': 'application/json',
-      'Content-Type': 'application/json'
+      'Content-Type': 'application/json',
+      ...instance.apiHeaders
     };
 
     return apiData;

package/src/managers/CacheManager.ts

@@ -1,4 +1,4 @@
-import Collection from '@discordjs/collection';
+import { Collection } from '@discordjs/collection';
 import { Instance } from '../instance/Instance';
 import { Constructable } from '../constants';
 import { DataManager } from './DataManager';

package/src/managers/DataManager.ts

@@ -3,7 +3,7 @@ import { BaseManager } from './BaseManager';
 import { GenericError } from '../errors';
 import { Constructable } from '../constants';
 
-import Collection from '@discordjs/collection';
+import { Collection } from '@discordjs/collection';
 
 interface DataManagerInstanceObject {
   id: string;
@@ -39,7 +39,7 @@ export class DataManager<_K, Holds, _R> extends BaseManager {
    * @param idOrInstance The id or instance of something in this Manager
    * @returns {?Object} An instance from this Manager
    */
-   public resolve(idOrInstance: string | object): object | null {
+  public resolve(idOrInstance: string | object): object | null {
     if (this.cache instanceof Collection) {
       if (typeof idOrInstance === 'object') return idOrInstance;
       if (typeof idOrInstance === 'string') return this.cache.get(idOrInstance) ?? null;

package/src/utils/utils.ts

@@ -1,4 +1,4 @@
-import Collection from '@discordjs/collection';
+import { Collection } from '@discordjs/collection';
 
 const isObject = (d: any) => typeof d === 'object' && d !== null;