@or-sdk/adapters 0.1.1-beta.736.0 → 0.1.1-beta.745.0

package/README.md

@@ -0,0 +1,22 @@
+## Installation:
+```
+$ npm i @or-sdk/accounts
+```
+
+## Usage:
+```typescript
+import { Adapters } from '@or-sdk/adapters'
+
+// with direct api url
+const adapters = new Adapters({
+  token: 'my-account-token-string',
+  eventManagerUrl: 'http://example.accounts/endpoint',
+  accountId: 'account-id-string'
+});
+
+// with service discovery(slower)
+const adapters = new Adapters({
+  token: 'my-account-token-string',
+  discoveryUrl: 'http://example.accounts/endpoint'
+});
+ ```

package/dist/cjs/Adapters.js

@@ -10,21 +10,104 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Adapters = void 0;
 var event_manager_1 = require("@or-sdk/event-manager");
+var discovery_1 = require("@or-sdk/discovery");
 var Adapters = (function () {
     function Adapters(params) {
+        this._accountId = undefined;
         var token = params.token, discoveryUrl = params.discoveryUrl, eventManagerUrl = params.eventManagerUrl, accountId = params.accountId;
         this.eventManager = new event_manager_1.EventManager({
             token: token,
             discoveryUrl: discoveryUrl,
             eventManagerUrl: eventManagerUrl,
         });
-        this.adaptersUrl = accountId ? "/http/".concat(accountId) : '';
+        this.discovery = new discovery_1.Discovery({
+            token: token,
+            discoveryUrl: discoveryUrl,
+        });
+        this._accountId = accountId;
     }
+    Object.defineProperty(Adapters.prototype, "accountId", {
+        get: function () {
+            return this._accountId;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Adapters.prototype, "adaptersUrl", {
+        get: function () {
+            return this.accountId ? "/http/".concat(this.accountId) : '';
+        },
+        enumerable: false,
+        configurable: true
+    });
     Adapters.prototype.makeRequest = function (params) {
-        return this.eventManager.makeRequest(__assign(__assign({}, params), { route: "".concat(this.adaptersUrl, "/").concat(params.route) }));
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!!this.accountId) return [3, 2];
+                        return [4, this.getAccountId()];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2: return [2, this.eventManager.makeRequest(__assign(__assign({}, params), { route: "".concat(this.adaptersUrl, "/").concat(params.route) }))];
+                }
+            });
+        });
+    };
+    Adapters.prototype.getAccountId = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this;
+                        return [4, this.discovery.getCurrentAccountId()];
+                    case 1:
+                        _a._accountId = _b.sent();
+                        return [2];
+                }
+            });
+        });
     };
     return Adapters;
 }());

package/dist/cjs/Adapters.js.map

@@ -1 +1 @@
-{"version":3,"file":"Adapters.js","sourceRoot":"","sources":["../../src/Adapters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AACA,uDAAqD;AAUrD;IAWE,kBAAY,MAAsB;QACxB,IAAA,KAAK,GAA+C,MAAM,MAArD,EAAE,YAAY,GAAiC,MAAM,aAAvC,EAAE,eAAe,GAAgB,MAAM,gBAAtB,EAAE,SAAS,GAAK,MAAM,UAAX,CAAY;QAEnE,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC;YACnC,KAAK,OAAA;YACL,YAAY,cAAA;YACZ,eAAe,iBAAA;SAChB,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,gBAAS,SAAS,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3D,CAAC;IAEM,8BAAW,GAAlB,UAAsB,MAAoB;QACxC,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,uBAC/B,MAAM,KACT,KAAK,EAAE,UAAG,IAAI,CAAC,WAAW,cAAI,MAAM,CAAC,KAAK,CAAE,IAC5C,CAAC;IACL,CAAC;IACH,eAAC;AAAD,CAAC,AA7BD,IA6BC;AA7BY,4BAAQ"}
+{"version":3,"file":"Adapters.js","sourceRoot":"","sources":["../../src/Adapters.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uDAAqD;AACrD,+CAA8C;AAW9C;IAYE,kBAAY,MAAsB;QAF1B,eAAU,GAAuB,SAAS,CAAC;QAGzC,IAAA,KAAK,GAA+C,MAAM,MAArD,EAAE,YAAY,GAAiC,MAAM,aAAvC,EAAE,eAAe,GAAgB,MAAM,gBAAtB,EAAE,SAAS,GAAK,MAAM,UAAX,CAAY;QAEnE,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC;YACnC,KAAK,OAAA;YACL,YAAY,cAAA;YACZ,eAAe,iBAAA;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAAC;YAC7B,KAAK,OAAA;YACL,YAAY,cAAA;SACb,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,sBAAI,+BAAS;aAAb;YACE,OAAO,IAAI,CAAC,UAAU,CAAC;QACzB,CAAC;;;OAAA;IAED,sBAAI,iCAAW;aAAf;YACE,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAS,IAAI,CAAC,SAAS,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,CAAC;;;OAAA;IAEY,8BAAW,GAAxB,UAA4B,MAAoB;;;;;6BAC1C,CAAC,IAAI,CAAC,SAAS,EAAf,cAAe;wBACjB,WAAM,IAAI,CAAC,YAAY,EAAE,EAAA;;wBAAzB,SAAyB,CAAC;;4BAE5B,WAAO,IAAI,CAAC,YAAY,CAAC,WAAW,uBAC/B,MAAM,KACT,KAAK,EAAE,UAAG,IAAI,CAAC,WAAW,cAAI,MAAM,CAAC,KAAK,CAAE,IAC5C,EAAC;;;;KACJ;IAEa,+BAAY,GAA1B;;;;;;wBACE,KAAA,IAAI,CAAA;wBAAc,WAAM,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,EAAA;;wBAA5D,GAAK,UAAU,GAAG,SAA0C,CAAC;;;;;KAC9D;IACH,eAAC;AAAD,CAAC,AAjDD,IAiDC;AAjDY,4BAAQ"}

package/dist/esm/Adapters.js

@@ -1,16 +1,47 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { EventManager } from '@or-sdk/event-manager';
+import { Discovery } from '@or-sdk/discovery';
 export class Adapters {
     constructor(params) {
+        this._accountId = undefined;
         const { token, discoveryUrl, eventManagerUrl, accountId } = params;
         this.eventManager = new EventManager({
             token,
             discoveryUrl,
             eventManagerUrl,
         });
-        this.adaptersUrl = accountId ? `/http/${accountId}` : '';
+        this.discovery = new Discovery({
+            token,
+            discoveryUrl,
+        });
+        this._accountId = accountId;
+    }
+    get accountId() {
+        return this._accountId;
+    }
+    get adaptersUrl() {
+        return this.accountId ? `/http/${this.accountId}` : '';
     }
     makeRequest(params) {
-        return this.eventManager.makeRequest(Object.assign(Object.assign({}, params), { route: `${this.adaptersUrl}/${params.route}` }));
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.accountId) {
+                yield this.getAccountId();
+            }
+            return this.eventManager.makeRequest(Object.assign(Object.assign({}, params), { route: `${this.adaptersUrl}/${params.route}` }));
+        });
+    }
+    getAccountId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this._accountId = yield this.discovery.getCurrentAccountId();
+        });
     }
 }
 //# sourceMappingURL=Adapters.js.map

package/dist/esm/Adapters.js.map

@@ -1 +1 @@
-{"version":3,"file":"Adapters.js","sourceRoot":"","sources":["../../src/Adapters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAUrD,MAAM,OAAO,QAAQ;IAWnB,YAAY,MAAsB;QAChC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAEnE,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC;YACnC,KAAK;YACL,YAAY;YACZ,eAAe;SAChB,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3D,CAAC;IAEM,WAAW,CAAI,MAAoB;QACxC,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,iCAC/B,MAAM,KACT,KAAK,EAAE,GAAG,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,KAAK,EAAE,IAC5C,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"Adapters.js","sourceRoot":"","sources":["../../src/Adapters.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAW9C,MAAM,OAAO,QAAQ;IAYnB,YAAY,MAAsB;QAF1B,eAAU,GAAuB,SAAS,CAAC;QAGjD,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAEnE,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC;YACnC,KAAK;YACL,YAAY;YACZ,eAAe;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC;YAC7B,KAAK;YACL,YAAY;SACb,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACzD,CAAC;IAEY,WAAW,CAAI,MAAoB;;YAC9C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACnB,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;aAC3B;YACD,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,iCAC/B,MAAM,KACT,KAAK,EAAE,GAAG,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,KAAK,EAAE,IAC5C,CAAC;QACL,CAAC;KAAA;IAEa,YAAY;;YACxB,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,CAAC;QAC/D,CAAC;KAAA;CACF"}

package/dist/types/Adapters.d.ts

@@ -1,9 +1,13 @@
 import { CalApiParams } from '@or-sdk/base';
 import { AdaptersConfig } from './types';
 export declare class Adapters {
-    private readonly adaptersUrl;
     private readonly eventManager;
+    private readonly discovery;
+    private _accountId;
     constructor(params: AdaptersConfig);
+    get accountId(): string | undefined;
+    get adaptersUrl(): string;
     makeRequest<T>(params: CalApiParams): Promise<T>;
+    private getAccountId;
 }
 //# sourceMappingURL=Adapters.d.ts.map

package/dist/types/Adapters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Adapters.d.ts","sourceRoot":"","sources":["../../src/Adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AASzC,qBAAa,QAAQ;IAQnB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;gBAEhC,MAAM,EAAE,cAAc;IAY3B,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC;CAMxD"}
+{"version":3,"file":"Adapters.d.ts","sourceRoot":"","sources":["../../src/Adapters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI5C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AASzC,qBAAa,QAAQ;IAQnB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,UAAU,CAAiC;gBAEvC,MAAM,EAAE,cAAc;IAgBlC,IAAI,SAAS,uBAEZ;IAED,IAAI,WAAW,WAEd;IAEY,WAAW,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC;YAU/C,YAAY;CAG3B"}

package/dist/types/types.d.ts

@@ -2,7 +2,7 @@ import { Token } from '@or-sdk/base';
 export declare type AdaptersConfig = {
     token: Token;
     discoveryUrl?: string;
-    eventManagerUrl: string;
-    accountId: string;
+    eventManagerUrl?: string;
+    accountId?: string;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,oBAAY,cAAc,GAAG;IAI3B,KAAK,EAAE,KAAK,CAAC;IAIb,YAAY,CAAC,EAAE,MAAM,CAAC;IAItB,eAAe,EAAE,MAAM,CAAC;IAExB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,oBAAY,cAAc,GAAG;IAI3B,KAAK,EAAE,KAAK,CAAC;IAIb,YAAY,CAAC,EAAE,MAAM,CAAC;IAItB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC"}

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.1-beta.736.0",
+  "version": "0.1.1-beta.745.0",
   "name": "@or-sdk/adapters",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -24,7 +24,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@or-sdk/base": "^0.26.8",
-    "@or-sdk/event-manager": "^0.24.6"
+    "@or-sdk/base": "0.27.0",
+    "@or-sdk/discovery": "^1.5.1-beta.745.0",
+    "@or-sdk/event-manager": "^0.24.7"
   }
 }

package/src/Adapters.ts

@@ -1,5 +1,7 @@
 import { CalApiParams } from '@or-sdk/base';
 import { EventManager } from '@or-sdk/event-manager';
+import { Discovery } from '@or-sdk/discovery';
+
 import { AdaptersConfig } from './types';
 
 /**
@@ -17,8 +19,9 @@ export class Adapters {
    * ```
    */
 
-  private readonly adaptersUrl: string;
   private readonly eventManager: EventManager;
+  private readonly discovery: Discovery;
+  private _accountId: string | undefined = undefined;
 
   constructor(params: AdaptersConfig) {
     const { token, discoveryUrl, eventManagerUrl, accountId } = params;
@@ -28,14 +31,33 @@ export class Adapters {
       discoveryUrl,
       eventManagerUrl,
     });
+    this.discovery = new Discovery({
+      token,
+      discoveryUrl,
+    });
+
+    this._accountId = accountId;
+  }
+
+  get accountId() {
+    return this._accountId;
+  }
 
-    this.adaptersUrl = accountId ? `/http/${accountId}` : '';
+  get adaptersUrl() {
+    return this.accountId ? `/http/${this.accountId}` : '';
   }
 
-  public makeRequest<T>(params: CalApiParams): Promise<T> {
+  public async makeRequest<T>(params: CalApiParams): Promise<T> {
+    if (!this.accountId) {
+      await this.getAccountId();
+    }
     return this.eventManager.makeRequest({
       ...params,
       route: `${this.adaptersUrl}/${params.route}`,
     });
   }
+
+  private async getAccountId(): Promise<void> {
+    this._accountId = await this.discovery.getCurrentAccountId();
+  }
 }

package/src/types.ts

@@ -12,7 +12,7 @@ export type AdaptersConfig = {
   /**
     * Url of OneReach Event Manager api
     */
-  eventManagerUrl: string;
+  eventManagerUrl?: string;
 
-  accountId: string;
+  accountId?: string;
 };