@or-sdk/bots 0.23.7 → 0.24.0-411.0

package/dist/cjs/Bots.js

@@ -1,4 +1,19 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var __assign = (this && this.__assign) || function () {
     __assign = Object.assign || function(t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -46,185 +61,139 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bots = void 0;
-var data_hub_1 = require("@or-sdk/data-hub");
+var base_1 = require("@or-sdk/base");
 var constants_1 = require("./constants");
-var tags_1 = require("@or-sdk/tags");
-var utils_1 = require("./utils");
-var Bots = (function () {
+var Bots = (function (_super) {
+    __extends(Bots, _super);
     function Bots(params) {
-        var token = params.token, discoveryUrl = params.discoveryUrl, accountId = params.accountId, dataHubUrl = params.dataHubUrl;
-        this.dataHub = new data_hub_1.DataHub({
-            token: token,
-            discoveryUrl: discoveryUrl,
-            accountId: accountId,
-            dataHubUrl: dataHubUrl,
-        });
-        this.tags = new tags_1.Tags({
+        var _this = this;
+        var token = params.token, discoveryUrl = params.discoveryUrl, accountId = params.accountId, dataHub2Url = params.dataHub2Url;
+        _this = _super.call(this, {
             token: token,
             discoveryUrl: discoveryUrl,
+            serviceKey: constants_1.SERVICE_KEY,
             accountId: accountId,
-            dataHubUrl: dataHubUrl,
-        });
+            serviceUrl: dataHub2Url,
+        }) || this;
+        return _this;
     }
     Bots.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4, Promise.all([
-                            this.dataHub.init(),
-                            this.tags.init(),
-                        ])];
-                    case 1:
-                        _a.sent();
-                        return [2];
-                }
+                return [2];
+            });
+        });
+    };
+    Bots.prototype.getBots = function (_a) {
+        var _b = _a === void 0 ? {} : _a, _c = _b.query, query = _c === void 0 ? {} : _c, projection = _b.projection, _d = _b.includeDeleted, includeDeleted = _d === void 0 ? false : _d, _e = _b.includeExisting, includeExisting = _e === void 0 ? true : _e, limit = _b.limit, offset = _b.offset;
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_f) {
+                if (includeDeleted && !includeExisting)
+                    query.isDeleted = true;
+                if (!includeDeleted && includeExisting)
+                    query.isDeleted = false;
+                return [2, this.callApiV2({
+                        route: '/bots',
+                        params: {
+                            query: query,
+                            projection: projection,
+                            limit: limit,
+                            offset: offset,
+                        },
+                    })];
             });
         });
     };
     Bots.prototype.listBots = function (params) {
         if (params === void 0) { params = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var _a, projection, varPrams, variables, data;
-            return __generator(this, function (_b) {
-                _a = params.projection, projection = _a === void 0 ? [] : _a, varPrams = __rest(params, ["projection"]);
-                variables = __assign({ entity: constants_1.ENTITY_NAME, params: __assign({ queryParams: {}, includeDeleted: false, includeExisting: true, limit: 30 }, varPrams) }, this.dataHub.isCrossAccount ? { accountId: this.dataHub.currentAccountId } : { sandbox: false });
-                data = {
-                    operationName: this.dataHub.getOperationName(data_hub_1.OperationNames.LIST),
-                    query: (0, utils_1.getListQuery)({
-                        crossAccount: this.dataHub.isCrossAccount,
-                        projection: projection,
-                    }),
-                    variables: variables,
-                };
-                return [2, this.dataHub.getFullList('POST', '/graphql', data)];
+            return __generator(this, function (_a) {
+                return [2, this.getBots(params)];
             });
         });
     };
-    Bots.prototype.getBot = function (id) {
+    Bots.prototype.getBotById = function (botId, projection) {
         return __awaiter(this, void 0, void 0, function () {
-            var route, params;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        route = "/v2/".concat(this.dataHub.currentAccountId ? this.dataHub.currentAccountId : 'current', "/bot/").concat(id);
-                        params = {
-                            includeDeleted: false,
-                            includeExisting: true,
-                        };
-                        return [4, this.dataHub.makeRequest({
-                                method: 'GET',
-                                route: route,
-                                params: params,
-                            })];
-                    case 1: return [2, _a.sent()];
-                }
+                return [2, this.callApiV2({
+                        route: "/bots/".concat(botId),
+                        params: {
+                            projection: projection,
+                        },
+                    })];
             });
         });
     };
-    Bots.prototype.saveBot = function (source) {
+    Bots.prototype.getBot = function (id) {
         return __awaiter(this, void 0, void 0, function () {
-            var route, data;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        route = "/v2/".concat(this.dataHub.currentAccountId ? this.dataHub.currentAccountId : 'current', "/bot/").concat(source.id ? source.id : 'new');
-                        data = {
-                            bot: source,
-                        };
-                        return [4, this.dataHub.makeRequest({
-                                method: 'POST',
-                                route: route,
-                                data: data,
-                            })];
-                    case 1: return [2, _a.sent()];
-                }
+                return [2, this.getBotById(id)];
             });
         });
     };
-    Bots.prototype.deleteBot = function (botId) {
+    Bots.prototype.saveBot = function (bot) {
         return __awaiter(this, void 0, void 0, function () {
-            var variables, operationName, data, result;
+            var id;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (this.dataHub.isCrossAccount) {
-                            throw Error('Cross-account deleting is not implemented.');
-                        }
-                        variables = {
-                            entity: constants_1.ENTITY_NAME,
-                            data: {
-                                id: botId,
-                                subscribe: true,
-                            },
-                        };
-                        operationName = this.dataHub.getOperationName(data_hub_1.OperationNames.DELETE_TEMPORARILY);
-                        data = {
-                            operationName: operationName,
-                            query: constants_1.QUERY_DELETE,
-                            variables: variables,
-                        };
-                        return [4, this.dataHub.makeRequest({
-                                method: 'POST',
-                                route: '/graphql',
-                                data: data,
+                        bot.id = bot.id || 'new';
+                        return [4, this.callApiV2({
+                                route: "/bots/".concat(bot.id),
+                                data: {
+                                    bot: bot,
+                                },
+                                method: 'post',
                             })];
                     case 1:
-                        result = _a.sent();
-                        return [2, this.dataHub.subscribe(result.data[operationName].requestId)];
+                        id = (_a.sent()).id;
+                        return [2, __assign(__assign({}, bot), { id: id })];
                 }
             });
         });
     };
-    Bots.prototype.addTags = function (source, tagNames) {
+    Bots.prototype.deleteBot = function (bot, temporarily) {
+        if (temporarily === void 0) { temporarily = true; }
         return __awaiter(this, void 0, void 0, function () {
-            var tags, tagIds, newIds;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4, this.tags.getMultipleTagsByName(tagNames, true)];
-                    case 1:
-                        tags = _a.sent();
-                        tagIds = tags.map(function (tag) { return tag.id; });
-                        newIds = (0, tags_1.filterTagIds)(source.tags, tagIds).newIds;
-                        if (!newIds.length) {
-                            throw Error('No tags to add.');
-                        }
-                        return [2, this.saveBot(__assign(__assign({}, source), { tags: (0, tags_1.addTagsIds)(source.tags, newIds) }))];
-                }
+                return [2, this.callApiV2({
+                        route: "/bots/".concat(bot.id),
+                        data: {
+                            temporarily: temporarily,
+                        },
+                        method: 'delete',
+                    })];
             });
         });
     };
-    Bots.prototype.removeTags = function (source, tagNames) {
+    Bots.getNewBot = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var tags, tagIds, existingIds;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4, this.tags.getMultipleTagsByName(tagNames)];
-                    case 1:
-                        tags = _a.sent();
-                        tagIds = tags.map(function (tag) { return tag.id; });
-                        existingIds = (0, tags_1.filterTagIds)(source.tags, tagIds).existingIds;
-                        if (!existingIds.length) {
-                            throw Error('No tags to remove.');
-                        }
-                        return [2, this.saveBot(__assign(__assign({}, source), { tags: (0, tags_1.removeTagIds)(source.tags, existingIds) }))];
-                }
+                return [2, {
+                        data: {
+                            label: '',
+                            description: '',
+                            longDescription: '',
+                            iconUrl: '',
+                            deploy: {},
+                        },
+                    }];
+            });
+        });
+    };
+    Bots.prototype.recoverBot = function (bot) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.callApiV2({
+                        route: "/bots/".concat(bot.id),
+                        method: 'patch',
+                    })];
             });
         });
     };
     return Bots;
-}());
+}(base_1.Base));
 exports.Bots = Bots;
 //# sourceMappingURL=Bots.js.map

package/dist/cjs/Bots.js.map

@@ -1 +1 @@
-{"version":3,"file":"Bots.js","sourceRoot":"","sources":["../../src/Bots.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Bots.js","sourceRoot":"","sources":["../../src/Bots.ts"],"names":[],"mappings":"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"}

package/dist/cjs/constants.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENTITY_NAME = exports.QUERY_DELETE = void 0;
-exports.QUERY_DELETE = "mutation deleteTemporarily($entity: EntityType!, $data: DeleteInput!) {\n  deleteTemporarily(entity: $entity, data: $data) {\n    ... on AsyncRequest {\n      requestId\n    }\n  }\n}";
-exports.ENTITY_NAME = 'BOT';
+exports.SERVICE_KEY = void 0;
+exports.SERVICE_KEY = 'datahub2';
 //# sourceMappingURL=constants.js.map

package/dist/cjs/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,YAAY,GAAG,yLAM1B,CAAC;AAEU,QAAA,WAAW,GAAG,KAAK,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,UAAU,CAAC"}

package/dist/esm/Bots.js

@@ -7,133 +7,103 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-import { DataHub, OperationNames } from '@or-sdk/data-hub';
-import { QUERY_DELETE, ENTITY_NAME, } from './constants';
-import { Tags, filterTagIds, addTagsIds, removeTagIds } from '@or-sdk/tags';
-import { getListQuery } from './utils';
-export class Bots {
+import { Base } from '@or-sdk/base';
+import { SERVICE_KEY } from './constants';
+export class Bots extends Base {
     constructor(params) {
-        const { token, discoveryUrl, accountId, dataHubUrl } = params;
-        this.dataHub = new DataHub({
+        const { token, discoveryUrl, accountId, dataHub2Url } = params;
+        super({
             token,
             discoveryUrl,
+            serviceKey: SERVICE_KEY,
             accountId,
-            dataHubUrl,
-        });
-        this.tags = new Tags({
-            token,
-            discoveryUrl,
-            accountId,
-            dataHubUrl,
+            serviceUrl: dataHub2Url,
         });
     }
     init() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield Promise.all([
-                this.dataHub.init(),
-                this.tags.init(),
-            ]);
+        });
+    }
+    getBots({ query = {}, projection, includeDeleted = false, includeExisting = true, limit, offset } = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (includeDeleted && !includeExisting)
+                query.isDeleted = true;
+            if (!includeDeleted && includeExisting)
+                query.isDeleted = false;
+            return this.callApiV2({
+                route: '/bots',
+                params: {
+                    query,
+                    projection,
+                    limit,
+                    offset,
+                },
+            });
         });
     }
     listBots(params = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { projection = [] } = params, varPrams = __rest(params, ["projection"]);
-            const variables = Object.assign({ entity: ENTITY_NAME, params: Object.assign({ queryParams: {}, includeDeleted: false, includeExisting: true, limit: 30 }, varPrams) }, this.dataHub.isCrossAccount ? { accountId: this.dataHub.currentAccountId } : { sandbox: false });
-            const data = {
-                operationName: this.dataHub.getOperationName(OperationNames.LIST),
-                query: getListQuery({
-                    crossAccount: this.dataHub.isCrossAccount,
+            return this.getBots(params);
+        });
+    }
+    getBotById(botId, projection) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.callApiV2({
+                route: `/bots/${botId}`,
+                params: {
                     projection,
-                }),
-                variables,
-            };
-            return this.dataHub.getFullList('POST', '/graphql', data);
+                },
+            });
         });
     }
     getBot(id) {
         return __awaiter(this, void 0, void 0, function* () {
-            const route = `/v2/${this.dataHub.currentAccountId ? this.dataHub.currentAccountId : 'current'}/bot/${id}`;
-            const params = {
-                includeDeleted: false,
-                includeExisting: true,
-            };
-            return yield this.dataHub.makeRequest({
-                method: 'GET',
-                route,
-                params,
-            });
+            return this.getBotById(id);
         });
     }
-    saveBot(source) {
+    saveBot(bot) {
         return __awaiter(this, void 0, void 0, function* () {
-            const route = `/v2/${this.dataHub.currentAccountId ? this.dataHub.currentAccountId : 'current'}/bot/${source.id ? source.id : 'new'}`;
-            const data = {
-                bot: source,
-            };
-            return yield this.dataHub.makeRequest({
-                method: 'POST',
-                route,
-                data,
+            bot.id = bot.id || 'new';
+            const { id } = yield this.callApiV2({
+                route: `/bots/${bot.id}`,
+                data: {
+                    bot,
+                },
+                method: 'post',
             });
+            return Object.assign(Object.assign({}, bot), { id });
         });
     }
-    deleteBot(botId) {
+    deleteBot(bot, temporarily = true) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.dataHub.isCrossAccount) {
-                throw Error('Cross-account deleting is not implemented.');
-            }
-            const variables = {
-                entity: ENTITY_NAME,
+            return this.callApiV2({
+                route: `/bots/${bot.id}`,
                 data: {
-                    id: botId,
-                    subscribe: true,
+                    temporarily,
                 },
-            };
-            const operationName = this.dataHub.getOperationName(OperationNames.DELETE_TEMPORARILY);
-            const data = {
-                operationName,
-                query: QUERY_DELETE,
-                variables,
-            };
-            const result = yield this.dataHub.makeRequest({
-                method: 'POST',
-                route: '/graphql',
-                data,
+                method: 'delete',
             });
-            return this.dataHub.subscribe(result.data[operationName].requestId);
         });
     }
-    addTags(source, tagNames) {
+    static getNewBot() {
         return __awaiter(this, void 0, void 0, function* () {
-            const tags = yield this.tags.getMultipleTagsByName(tagNames, true);
-            const tagIds = tags.map(tag => tag.id);
-            const { newIds } = filterTagIds(source.tags, tagIds);
-            if (!newIds.length) {
-                throw Error('No tags to add.');
-            }
-            return this.saveBot(Object.assign(Object.assign({}, source), { tags: addTagsIds(source.tags, newIds) }));
+            return {
+                data: {
+                    label: '',
+                    description: '',
+                    longDescription: '',
+                    iconUrl: '',
+                    deploy: {},
+                },
+            };
         });
     }
-    removeTags(source, tagNames) {
+    recoverBot(bot) {
         return __awaiter(this, void 0, void 0, function* () {
-            const tags = yield this.tags.getMultipleTagsByName(tagNames);
-            const tagIds = tags.map(tag => tag.id);
-            const { existingIds } = filterTagIds(source.tags, tagIds);
-            if (!existingIds.length) {
-                throw Error('No tags to remove.');
-            }
-            return this.saveBot(Object.assign(Object.assign({}, source), { tags: removeTagIds(source.tags, existingIds) }));
+            return this.callApiV2({
+                route: `/bots/${bot.id}`,
+                method: 'patch',
+            });
         });
     }
 }

package/dist/esm/Bots.js.map

@@ -1 +1 @@
-{"version":3,"file":"Bots.js","sourceRoot":"","sources":["../../src/Bots.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Bots.js","sourceRoot":"","sources":["../../src/Bots.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAQ,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAW1C,MAAM,OAAO,IAAK,SAAQ,IAAI;IAS5B,YAAY,MAAkB;QAC5B,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;QAC/D,KAAK,CAAC;YACJ,KAAK;YACL,YAAY;YACZ,UAAU,EAAE,WAAW;YACvB,SAAS;YACT,UAAU,EAAE,WAAW;SACxB,CAAC,CAAC;IASL,CAAC;IAEK,IAAI;;QAEV,CAAC;KAAA;IAQY,OAAO,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,UAAU,EAAE,cAAc,GAAG,KAAK,EAAE,eAAe,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,KAAoB,EAAE;;YAChI,IAAI,cAAc,IAAI,CAAC,eAAe;gBAAE,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;YAC/D,IAAI,CAAC,cAAc,IAAI,eAAe;gBAAE,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;YAChE,OAAO,IAAI,CAAC,SAAS,CAAC;gBACpB,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE;oBACN,KAAK;oBACL,UAAU;oBACV,KAAK;oBACL,MAAM;iBACP;aACF,CAAC,CAAC;QACL,CAAC;KAAA;IAQY,QAAQ,CAAC,SAAyB,EAAE;;YAC/C,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;KAAA;IAQY,UAAU,CAAC,KAAa,EAAE,UAAqB;;YAC1D,OAAO,IAAI,CAAC,SAAS,CAAC;gBACpB,KAAK,EAAE,SAAS,KAAK,EAAE;gBACvB,MAAM,EAAE;oBACN,UAAU;iBACX;aACF,CAAC,CAAC;QACL,CAAC;KAAA;IAOY,MAAM,CAAC,EAAU;;YAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC;KAAA;IAUY,OAAO,CAAC,GAAQ;;YAC3B,GAAG,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,IAAI,KAAK,CAAC;YACzB,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC;gBAClC,KAAK,EAAE,SAAS,GAAG,CAAC,EAAE,EAAE;gBACxB,IAAI,EAAE;oBACJ,GAAG;iBACJ;gBACD,MAAM,EAAE,MAAM;aACf,CAAC,CAAC;YAEH,uCACK,GAAG,KACN,EAAE,IACF;QACJ,CAAC;KAAA;IAQY,SAAS,CAAC,GAAkB,EAAE,WAAW,GAAG,IAAI;;YAC3D,OAAO,IAAI,CAAC,SAAS,CAAC;gBACpB,KAAK,EAAE,SAAS,GAAG,CAAC,EAAE,EAAE;gBACxB,IAAI,EAAE;oBACJ,WAAW;iBACZ;gBACD,MAAM,EAAE,QAAQ;aACjB,CAAC,CAAC;QACL,CAAC;KAAA;IAoDD,MAAM,CAAO,SAAS;;YACpB,OAAO;gBACL,IAAI,EAAE;oBACJ,KAAK,EAAE,EAAE;oBACT,WAAW,EAAE,EAAE;oBACf,eAAe,EAAE,EAAE;oBACnB,OAAO,EAAE,EAAE;oBACX,MAAM,EAAE,EAAE;iBACX;aACF,CAAC;QACJ,CAAC;KAAA;IAQY,UAAU,CAAC,GAAkB;;YACxC,OAAO,IAAI,CAAC,SAAS,CAAC;gBACpB,KAAK,EAAE,SAAS,GAAG,CAAC,EAAE,EAAE;gBACxB,MAAM,EAAE,OAAO;aAChB,CAAC,CAAC;QACL,CAAC;KAAA;CACF"}

package/dist/esm/constants.js

@@ -1,9 +1,2 @@
-export const QUERY_DELETE = `mutation deleteTemporarily($entity: EntityType!, $data: DeleteInput!) {
-  deleteTemporarily(entity: $entity, data: $data) {
-    ... on AsyncRequest {
-      requestId
-    }
-  }
-}`;
-export const ENTITY_NAME = 'BOT';
+export const SERVICE_KEY = 'datahub2';
 //# sourceMappingURL=constants.js.map

package/dist/esm/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG;;;;;;EAM1B,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CAAC"}

package/dist/types/Bots.d.ts

@@ -1,16 +1,26 @@
-import { List } from '@or-sdk/base';
-import { GraphqlResponseCheckExecution } from '@or-sdk/data-hub';
-import { BotsConfig, Bot, ListBotsParams } from './types';
-import { Taggable } from '@or-sdk/tags';
-export declare class Bots implements Taggable<Bot> {
-    private readonly dataHub;
-    private readonly tags;
+import { Base, List } from '@or-sdk/base';
+import { Bot, BotsConfig, GetBotsParams, ListBotsParams } from './types';
+export declare class Bots extends Base {
     constructor(params: BotsConfig);
     init(): Promise<void>;
+    getBots({ query, projection, includeDeleted, includeExisting, limit, offset }?: GetBotsParams): Promise<List<Bot>>;
     listBots(params?: ListBotsParams): Promise<List<Bot>>;
+    getBotById(botId: string, projection?: string[]): Promise<Bot>;
     getBot(id: string): Promise<Bot>;
-    saveBot(source: Bot): Promise<Bot>;
-    deleteBot(botId: string): Promise<GraphqlResponseCheckExecution>;
-    addTags(source: Bot, tagNames: string[]): Promise<Bot>;
-    removeTags(source: Bot, tagNames: string[]): Promise<Bot>;
+    saveBot(bot: Bot): Promise<Bot>;
+    deleteBot(bot: {
+        id: string;
+    }, temporarily?: boolean): Promise<null>;
+    static getNewBot(): Promise<{
+        data: {
+            label: string;
+            description: string;
+            longDescription: string;
+            iconUrl: string;
+            deploy: {};
+        };
+    }>;
+    recoverBot(bot: {
+        id: string;
+    }): Promise<null>;
 }

package/dist/types/constants.d.ts

@@ -1,2 +1 @@
-export declare const QUERY_DELETE = "mutation deleteTemporarily($entity: EntityType!, $data: DeleteInput!) {\n  deleteTemporarily(entity: $entity, data: $data) {\n    ... on AsyncRequest {\n      requestId\n    }\n  }\n}";
-export declare const ENTITY_NAME = "BOT";
+export declare const SERVICE_KEY = "datahub2";

package/dist/types/types.d.ts

@@ -3,7 +3,7 @@ export declare type BotsConfig = {
     token: Token;
     discoveryUrl?: string;
     accountId?: string;
-    dataHubUrl?: string;
+    dataHub2Url?: string;
 };
 export declare type Bot = {
     id?: string;
@@ -27,3 +27,13 @@ export declare type ListBotsParams = {
     includeExisting?: boolean;
     projection?: string[];
 };
+export declare type GetBotsParams = {
+    includeDeleted?: boolean;
+    includeExisting?: boolean;
+    projection?: string[];
+    query?: {
+        [key: string]: any;
+    };
+    limit?: number;
+    offset?: number;
+};

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.23.7",
+  "version": "0.24.0-411.0",
   "name": "@or-sdk/bots",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -23,9 +23,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@or-sdk/base": "^0.24.1",
-    "@or-sdk/data-hub": "^0.23.7",
-    "@or-sdk/tags": "^0.23.7"
-  },
-  "gitHead": "70275da9788930b6234570b7a9806738d66104ed"
+    "@or-sdk/base": "^0.24.2-411.0",
+    "@or-sdk/data-hub": "^0.23.8-411.0",
+    "@or-sdk/tags": "^0.24.0-411.0"
+  }
 }

package/src/Bots.ts

@@ -1,12 +1,8 @@
-import { List } from '@or-sdk/base';
-import { DataHub, GraphqlResponse, GraphqlResponseCheckExecution, GraphqlResponseDelete, OperationNames } from '@or-sdk/data-hub';
-import { BotsConfig, Bot, ListBotsParams } from './types';
-import {
-  QUERY_DELETE,
-  ENTITY_NAME,
-} from './constants';
-import { Tags, Taggable, filterTagIds, addTagsIds, removeTagIds } from '@or-sdk/tags';
-import { getListQuery } from './utils';
+import { Base, List } from '@or-sdk/base';
+// import { addTagsIds, filterTagIds, removeTagIds, Tags } from '@or-sdk/tags';
+import { SERVICE_KEY } from './constants';
+import { Bot, BotsConfig, GetBotsParams, ListBotsParams } from './types';
+
 
 /**
  * OneReach Bots service client
@@ -15,9 +11,8 @@ import { getListQuery } from './utils';
  * $ npm i @or-sdk/bots
  * ```
  */
-export class Bots implements Taggable<Bot> {
-  private readonly dataHub: DataHub;
-  private readonly tags: Tags;
+export class Bots extends Base {
+  // private readonly tags: Tags;
 
   /**
    * ```typescript
@@ -26,27 +21,46 @@ export class Bots implements Taggable<Bot> {
    * ```
    */
   constructor(params: BotsConfig) {
-    const { token, discoveryUrl, accountId, dataHubUrl } = params;
-
-    this.dataHub = new DataHub({
+    const { token, discoveryUrl, accountId, dataHub2Url } = params;
+    super({
       token,
       discoveryUrl,
+      serviceKey: SERVICE_KEY,
       accountId,
-      dataHubUrl,
-    });
-    this.tags = new Tags({
-      token,
-      discoveryUrl,
-      accountId,
-      dataHubUrl,
+      serviceUrl: dataHub2Url,
     });
+
+    // this.tags = new Tags({
+    //   token,
+    //   discoveryUrl,
+    //   accountId,
+    //   serviceKey: SERVICE_KEY,
+    //   dataHub2Url,
+    // });
   }
 
   async init() {
-    await Promise.all([
-      this.dataHub.init(),
-      this.tags.init(),
-    ]);
+    // await this.tags.init();
+  }
+  /**
+   * Get bots
+   * ```typescript
+   * const botList = await bots.getBots();
+   * ```
+   */
+
+  public async getBots({ query = {}, projection, includeDeleted = false, includeExisting = true, limit, offset }: GetBotsParams = {}): Promise<List<Bot>> {
+    if (includeDeleted && !includeExisting) query.isDeleted = true;
+    if (!includeDeleted && includeExisting) query.isDeleted = false;
+    return this.callApiV2({
+      route: '/bots',
+      params: {
+        query,
+        projection,
+        limit,
+        offset,
+      },
+    });
   }
 
   /**
@@ -56,33 +70,23 @@ export class Bots implements Taggable<Bot> {
    * ```
    */
   public async listBots(params: ListBotsParams = {}): Promise<List<Bot>> {
-    const { projection = [], ...varPrams } = params;
-    const variables = {
-      entity: ENTITY_NAME,
-      params: {
-        queryParams: {},
-        includeDeleted: false,
-        includeExisting: true,
-        limit: 30,
-
-        // overrides
-        ...varPrams,
-      },
-      ... this.dataHub.isCrossAccount ? { accountId: this.dataHub.currentAccountId } : { sandbox: false },
-    };
+    return this.getBots(params);
+  }
 
-    const data = {
-      operationName: this.dataHub.getOperationName(OperationNames.LIST),
-      query: getListQuery({
-        crossAccount: this.dataHub.isCrossAccount,
+  /**
+   * Get bot by id
+   * ```typescript
+   * const bot = await bots.getBotById('bot-id');
+   * ```
+   */
+  public async getBotById(botId: string, projection?: string[]): Promise<Bot> {
+    return this.callApiV2({
+      route: `/bots/${botId}`,
+      params: {
         projection,
-      }),
-      variables,
-    };
-
-    return this.dataHub.getFullList<Bot>('POST', '/graphql', data);
+      },
+    });
   }
-
   /**
    * Get bot
    * ```typescript
@@ -90,18 +94,7 @@ export class Bots implements Taggable<Bot> {
    * ```
    */
   public async getBot(id: string): Promise<Bot> {
-    const route = `/v2/${this.dataHub.currentAccountId ? this.dataHub.currentAccountId : 'current'}/bot/${id}`;
-
-    const params = {
-      includeDeleted: false,
-      includeExisting: true,
-    };
-
-    return await this.dataHub.makeRequest<Bot>({
-      method: 'GET',
-      route,
-      params,
-    });
+    return this.getBotById(id);
   }
 
   /**
@@ -112,18 +105,20 @@ export class Bots implements Taggable<Bot> {
    * const savedBot = await bots.saveBot(botSource);
    * ```
    */
-  public async saveBot(source: Bot): Promise<Bot> {
-    const route = `/v2/${this.dataHub.currentAccountId ? this.dataHub.currentAccountId : 'current'}/bot/${source.id ? source.id : 'new'}`;
+  public async saveBot(bot: Bot): Promise<Bot> {
+    bot.id = bot.id || 'new';
+    const { id } = await this.callApiV2({
+      route: `/bots/${bot.id}`,
+      data: {
+        bot,
+      },
+      method: 'post',
+    });
 
-    const data = {
-      bot: source,
+    return {
+      ...bot,
+      id,
     };
-
-    return await this.dataHub.makeRequest<Bot>({
-      method: 'POST',
-      route,
-      data,
-    });
   }
 
   /**
@@ -132,34 +127,14 @@ export class Bots implements Taggable<Bot> {
    * await bots.deleteBot('bot-id');
    * ```
    */
-  public async deleteBot(botId: string): Promise<GraphqlResponseCheckExecution> {
-    if (this.dataHub.isCrossAccount) {
-      throw Error('Cross-account deleting is not implemented.');
-    }
-
-    const variables = {
-      entity: ENTITY_NAME,
+  public async deleteBot(bot: {id: string;}, temporarily = true): Promise<null> {
+    return this.callApiV2({
+      route: `/bots/${bot.id}`,
       data: {
-        id: botId,
-        subscribe: true,
+        temporarily,
       },
-    };
-
-    const operationName = this.dataHub.getOperationName(OperationNames.DELETE_TEMPORARILY);
-
-    const data = {
-      operationName,
-      query: QUERY_DELETE,
-      variables,
-    };
-
-    const result = await this.dataHub.makeRequest<GraphqlResponse<void>>({
-      method: 'POST',
-      route: '/graphql',
-      data,
+      method: 'delete',
     });
-
-    return this.dataHub.subscribe((result.data[operationName] as GraphqlResponseDelete).requestId);
   }
 
   /**
@@ -168,21 +143,21 @@ export class Bots implements Taggable<Bot> {
    * const bot = await bots.addTags(botSource, tagIdsArr);
    * ```
    */
-  public async addTags(source: Bot, tagNames: string[]): Promise<Bot> {
-    const tags = await this.tags.getMultipleTagsByName(tagNames, true);
-    const tagIds = tags.map(tag => tag.id!);
+  // public async addTags(source: Bot, tagNames: string[]): Promise<Bot> {
+  //   const tags = await this.tags.getMultipleTagsByName(tagNames, true);
+  //   const tagIds = tags.map(tag => tag.id!);
 
-    const { newIds } = filterTagIds(source.tags, tagIds);
+  //   const { newIds } = filterTagIds(source.tags, tagIds);
 
-    if (!newIds.length) {
-      throw Error('No tags to add.');
-    }
+  //   if (!newIds.length) {
+  //     throw Error('No tags to add.');
+  //   }
 
-    return this.saveBot({
-      ...source,
-      tags: addTagsIds(source.tags, newIds),
-    });
-  }
+  //   return this.saveBot({
+  //     ...source,
+  //     tags: addTagsIds(source.tags, newIds),
+  //   });
+  // }
 
   /**
    * Remove tags
@@ -190,20 +165,50 @@ export class Bots implements Taggable<Bot> {
    * const bot = await bots.removeTags(botSource, tagIdsArr);
    * ```
    */
-  public async removeTags(source: Bot, tagNames: string[]): Promise<Bot> {
-    const tags = await this.tags.getMultipleTagsByName(tagNames);
-    const tagIds = tags.map(tag => tag.id!);
+  // public async removeTags(source: Bot, tagNames: string[]): Promise<Bot> {
+  //   const tags = await this.tags.getMultipleTagsByName(tagNames);
+  //   const tagIds = tags.map(tag => tag.id!);
 
-    const { existingIds } = filterTagIds(source.tags, tagIds);
+  //   const { existingIds } = filterTagIds(source.tags, tagIds);
 
-    if (!existingIds.length) {
-      throw Error('No tags to remove.');
-    }
+  //   if (!existingIds.length) {
+  //     throw Error('No tags to remove.');
+  //   }
 
-    return this.saveBot({
-      ...source,
-      tags: removeTagIds(source.tags, existingIds),
-    });
+  //   return this.saveBot({
+  //     ...source,
+  //     tags: removeTagIds(source.tags, existingIds),
+  //   });
+  // }
+
+  /**
+   * Get new bot
+   * ```typescript
+   * const bot = await bots.getNewBot();
+   * ```
+   */
+  static async getNewBot() {
+    return {
+      data: {
+        label: '',
+        description: '',
+        longDescription: '',
+        iconUrl: '',
+        deploy: {},
+      },
+    };
   }
 
+  /**
+   * Recover deleted bot
+   * ```typescript
+   * const bot = await bots.recoverBot({id});
+   * ```
+   */
+  public async recoverBot(bot: {id: string;}): Promise<null> {
+    return this.callApiV2({
+      route: `/bots/${bot.id}`,
+      method: 'patch',
+    });
+  }
 }

package/src/constants.ts

@@ -1,10 +1,2 @@
-export const QUERY_DELETE = `mutation deleteTemporarily($entity: EntityType!, $data: DeleteInput!) {
-  deleteTemporarily(entity: $entity, data: $data) {
-    ... on AsyncRequest {
-      requestId
-    }
-  }
-}`;
-
-export const ENTITY_NAME = 'BOT';
+export const SERVICE_KEY = 'datahub2';
 

package/src/types.ts

@@ -19,7 +19,7 @@ export type BotsConfig = {
   /**
    * Url of OneReach DataHub api
    */
-  dataHubUrl?: string;
+  dataHub2Url?: string;
 };
 
 export type Bot = {
@@ -45,3 +45,12 @@ export type ListBotsParams = {
   includeExisting?: boolean;
   projection?: string[];
 };
+
+export type GetBotsParams = {
+  includeDeleted?: boolean;
+  includeExisting?: boolean;
+  projection?: string[];
+  query?: {[key: string]: any;};
+  limit?: number;
+  offset?: number;
+};