@sonoransoftware/sonoran.js 1.0.5 → 1.0.7

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

@@ -105,9 +105,9 @@ class REST extends events_1.EventEmitter {
             case 'SET_ACCOUNT_RANKS': {
                 return {
                     accountId: args[0],
-                    set: args[1].set,
-                    add: args[1].add,
-                    remove: args[1].remove,
+                    set: args[1],
+                    add: args[2],
+                    remove: args[3],
                 };
             }
             default: {

package/dist/managers/CADManager.d.ts

@@ -8,7 +8,9 @@ import { CADServerManager } from './CADServerManager';
  * Manages all Sonoran CAD data and methods to interact with the public API.
  */
 export declare class CADManager extends BaseManager {
+    readonly ready = false;
     readonly version: CADSubscriptionVersionEnum;
+    readonly failReason: unknown;
     rest: REST | undefined;
     servers: CADServerManager | undefined;
     constructor(instance: Instance);

package/dist/managers/CADManager.js

@@ -34,23 +34,28 @@ const CADServerManager_1 = require("./CADServerManager");
 class CADManager extends BaseManager_1.BaseManager {
     constructor(instance) {
         super(instance);
+        this.ready = false;
         this.version = 0;
+        this.failReason = null;
         this.rest = new src_1.REST(instance, this, globalTypes.productEnums.CAD, src_1.DefaultCADRestOptions);
         this.buildManager(instance);
     }
     async buildManager(instance) {
         var _a;
+        const mutableThis = this;
         try {
             const versionResp = await ((_a = this.rest) === null || _a === void 0 ? void 0 : _a.request('GET_VERSION'));
-            const mutableThis = this;
             mutableThis.version = Number.parseInt(versionResp.replace(/(^\d+)(.+$)/i, '$1'));
             if (this.version >= globalTypes.CADSubscriptionVersionEnum.STANDARD) {
                 this.servers = new CADServerManager_1.CADServerManager(instance, this);
             }
             instance.isCADSuccessful = true;
+            instance.emit('CAD_SETUP_SUCCESSFUL');
         }
         catch (err) {
-            console.log(err);
+            mutableThis.failReason = err;
+            instance.emit('CAD_SETUP_UNSUCCESSFUL', err);
+            throw err;
         }
     }
     /**

package/dist/managers/CMSManager.d.ts

@@ -10,6 +10,7 @@ import { CMSServerManager } from './CMSServerManager';
 export declare class CMSManager extends BaseManager {
     readonly ready: boolean;
     readonly version: CMSSubscriptionVersionEnum;
+    readonly failReason: unknown;
     rest: REST | undefined;
     servers: CMSServerManager | undefined;
     constructor(instance: Instance);

package/dist/managers/CMSManager.js

@@ -36,27 +36,26 @@ class CMSManager extends BaseManager_1.BaseManager {
         super(instance);
         this.ready = false;
         this.version = 0;
+        this.failReason = null;
         this.rest = new src_1.REST(instance, this, globalTypes.productEnums.CMS, src_1.DefaultCMSRestOptions);
         this.buildManager(instance);
     }
     async buildManager(instance) {
         var _a;
+        const mutableThis = this;
         try {
             const versionResp = await ((_a = this.rest) === null || _a === void 0 ? void 0 : _a.request('GET_SUB_VERSION'));
             const version = Number.parseInt(versionResp.replace(/(^\d+)(.+$)/i, '$1'));
-            const mutableThis = this;
             if (version >= globalTypes.CMSSubscriptionVersionEnum.STANDARD) {
                 this.servers = new CMSServerManager_1.CMSServerManager(instance, this);
             }
             mutableThis.ready = true;
             mutableThis.version = version;
-            console.log(mutableThis.version);
-            console.log(this.version);
-            console.log(version);
             instance.isCMSSuccessful = true;
             instance.emit('CMS_SETUP_SUCCESSFUL');
         }
         catch (err) {
+            mutableThis.failReason = err;
             instance.emit('CMS_SETUP_UNSUCCESSFUL', err);
             throw err;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonoransoftware/sonoran.js",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "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",

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

@@ -210,9 +210,9 @@ export class REST extends EventEmitter {
 			case 'SET_ACCOUNT_RANKS': {
 				return {
 					accountId: args[0],
-					set: args[1].set,
-					add: args[1].add,
-					remove: args[1].remove,
+					set: args[1],
+					add: args[2],
+					remove: args[3],
 				};
 			}
 			default: {
@@ -220,4 +220,4 @@ export class REST extends EventEmitter {
 			}
 		}
 	}
-}
+}

package/src/managers/CADManager.ts

@@ -1,59 +1,64 @@
-import { Instance } from '../instance/Instance';
-import { CADSubscriptionVersionEnum } from '../constants';
-import { APIError, DefaultCADRestOptions, REST } from '../libs/rest/src';
-import { BaseManager } from './BaseManager';
-import * as globalTypes from '../constants';
-import type { Mutable } from '../constants';
-import { CADServerManager } from './CADServerManager';
-
-/**
- * Manages all Sonoran CAD data and methods to interact with the public API.
- */
-export class CADManager extends BaseManager {
-  public readonly version: CADSubscriptionVersionEnum = 0;
-  public rest: REST | undefined;
-  public servers: CADServerManager | undefined;
-
-  constructor(instance: Instance) {
-    super(instance);
-
-    this.rest = new REST(instance, this, globalTypes.productEnums.CAD, DefaultCADRestOptions);
-    this.buildManager(instance);
-  }
-
-  protected async buildManager(instance: Instance) {
-    try {
-      const versionResp: any = await this.rest?.request('GET_VERSION');
-      const mutableThis = this as Mutable<CADManager>;
-      mutableThis.version = Number.parseInt(versionResp.replace(/(^\d+)(.+$)/i,'$1'));
-      if (this.version >= globalTypes.CADSubscriptionVersionEnum.STANDARD) {
-        this.servers = new CADServerManager(instance, this);
-      }
-      instance.isCADSuccessful = true;
-    } catch (err) {
-      console.log(err);
-    }
-  }
-
-  /**
-   * Gets a community account by `accId` or `apiId`.
-   * @param {Object} params The object that contains parameters to get a community account.
-   * @param {string} [data.accId] The account id to find a community account.
-   * @param {string} [data.apiId] The api id to find a community account.
-   * @returns {Promise} Promise object represents if the request was successful with reason for failure if needed and the account data object if found.
-   */
-  public async getAccount(params: { apiId?: string, username?: string }): Promise<globalTypes.CADGetAccountPromiseResult> {
-    return new Promise(async (resolve, reject) => {
-      try {
-        const getAccountRequest: any = await this.rest?.request('GET_ACCOUNT', params.apiId, params.username);
-        resolve({ success: true, data: getAccountRequest });
-      } catch (err) {
-        if (err instanceof APIError) {
-          resolve({ success: false, reason: err.response });
-        } else {
-          reject(err);
-        }
-      }
-    });
-  }
+import { Instance } from '../instance/Instance';
+import { CADSubscriptionVersionEnum } from '../constants';
+import { APIError, DefaultCADRestOptions, REST } from '../libs/rest/src';
+import { BaseManager } from './BaseManager';
+import * as globalTypes from '../constants';
+import type { Mutable } from '../constants';
+import { CADServerManager } from './CADServerManager';
+
+/**
+ * Manages all Sonoran CAD data and methods to interact with the public API.
+ */
+export class CADManager extends BaseManager {
+  public readonly ready = false;
+  public readonly version: CADSubscriptionVersionEnum = 0;
+  public readonly failReason: unknown = null;
+  public rest: REST | undefined;
+  public servers: CADServerManager | undefined;
+
+  constructor(instance: Instance) {
+    super(instance);
+
+    this.rest = new REST(instance, this, globalTypes.productEnums.CAD, DefaultCADRestOptions);
+    this.buildManager(instance);
+  }
+
+  protected async buildManager(instance: Instance) {
+    const mutableThis = this as Mutable<CADManager>;
+    try {
+      const versionResp: any = await this.rest?.request('GET_VERSION');
+      mutableThis.version = Number.parseInt(versionResp.replace(/(^\d+)(.+$)/i,'$1'));
+      if (this.version >= globalTypes.CADSubscriptionVersionEnum.STANDARD) {
+        this.servers = new CADServerManager(instance, this);
+      }
+      instance.isCADSuccessful = true;
+      instance.emit('CAD_SETUP_SUCCESSFUL');
+    } catch (err) {
+      mutableThis.failReason = err;
+      instance.emit('CAD_SETUP_UNSUCCESSFUL', err);
+      throw err;
+    }
+  }
+
+  /**
+   * Gets a community account by `accId` or `apiId`.
+   * @param {Object} params The object that contains parameters to get a community account.
+   * @param {string} [data.accId] The account id to find a community account.
+   * @param {string} [data.apiId] The api id to find a community account.
+   * @returns {Promise} Promise object represents if the request was successful with reason for failure if needed and the account data object if found.
+   */
+  public async getAccount(params: { apiId?: string, username?: string }): Promise<globalTypes.CADGetAccountPromiseResult> {
+    return new Promise(async (resolve, reject) => {
+      try {
+        const getAccountRequest: any = await this.rest?.request('GET_ACCOUNT', params.apiId, params.username);
+        resolve({ success: true, data: getAccountRequest });
+      } catch (err) {
+        if (err instanceof APIError) {
+          resolve({ success: false, reason: err.response });
+        } else {
+          reject(err);
+        }
+      }
+    });
+  }
 }

package/src/managers/CMSManager.ts

@@ -11,6 +11,7 @@ import { CMSServerManager } from './CMSServerManager';
 export class CMSManager extends BaseManager {
   public readonly ready: boolean = false;
   public readonly version: CMSSubscriptionVersionEnum = 0;
+  public readonly failReason: unknown = null;
   public rest: REST | undefined;
   public servers: CMSServerManager | undefined;
 
@@ -22,21 +23,19 @@ export class CMSManager extends BaseManager {
   }
 
   protected async buildManager(instance: Instance) {
+    const mutableThis = this as globalTypes.Mutable<CMSManager>;
     try {
       const versionResp: any = await this.rest?.request('GET_SUB_VERSION');
       const version = Number.parseInt(versionResp.replace(/(^\d+)(.+$)/i,'$1'));
-      const mutableThis = this as globalTypes.Mutable<CMSManager>;
       if (version >= globalTypes.CMSSubscriptionVersionEnum.STANDARD) {
         this.servers = new CMSServerManager(instance, this);
       }
       mutableThis.ready = true;
       mutableThis.version = version;
-      console.log(mutableThis.version);
-      console.log(this.version);
-      console.log(version);
       instance.isCMSSuccessful = true;
       instance.emit('CMS_SETUP_SUCCESSFUL');
     } catch (err) {
+      mutableThis.failReason = err;
       instance.emit('CMS_SETUP_UNSUCCESSFUL', err);
       throw err;
     }