@or-sdk/mcp-tools 0.5.0-beta.4166.0 → 0.5.0-beta.4168.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -125,7 +125,7 @@ var McpTools = (function (_super) {
125
125
  };
126
126
  McpTools.prototype.getAvailableMcp = function () {
127
127
  return __awaiter(this, arguments, void 0, function (options) {
128
- var _a, serversResult, discoveryResult, fromServers, fromDiscovery, items;
128
+ var _a, serversResult, discoveryResult, items;
129
129
  if (options === void 0) { options = {}; }
130
130
  return __generator(this, function (_b) {
131
131
  switch (_b.label) {
@@ -135,27 +135,9 @@ var McpTools = (function (_super) {
135
135
  ])];
136
136
  case 1:
137
137
  _a = _b.sent(), serversResult = _a[0], discoveryResult = _a[1];
138
- fromServers = serversResult.status === 'fulfilled' && serversResult.value
139
- ? serversResult.value.servers.map(function (s) { return ({
140
- name: s.name,
141
- url: s.url,
142
- description: s.description,
143
- auth: 'bearer',
144
- source: 'internal',
145
- }); })
146
- : [];
147
- fromDiscovery = discoveryResult.status === 'fulfilled' && discoveryResult.value
148
- ? discoveryResult.value.packages.map(function (p) { return ({
149
- name: p.package,
150
- url: p.url,
151
- auth: p.auth,
152
- redirectUrl: p.redirectUrl,
153
- source: 'discovery',
154
- }); })
155
- : [];
156
- items = __spreadArray(__spreadArray([], fromServers, true), fromDiscovery, true);
138
+ items = __spreadArray(__spreadArray([], (serversResult.status === 'fulfilled' && serversResult.value ? serversResult.value.servers : []), true), (discoveryResult.status === 'fulfilled' && discoveryResult.value ? discoveryResult.value.servers : []), true);
157
139
  return [2, {
158
- items: items,
140
+ servers: items,
159
141
  total: items.length,
160
142
  }];
161
143
  }
@@ -163,7 +145,21 @@ var McpTools = (function (_super) {
163
145
  });
164
146
  };
165
147
  McpTools.prototype.authorizeOAuthPackage = function (pkg) {
166
- return window.open(pkg.redirectUrl, '_blank');
148
+ return __awaiter(this, void 0, void 0, function () {
149
+ var url;
150
+ return __generator(this, function (_a) {
151
+ switch (_a.label) {
152
+ case 0: return [4, this.makeRequest({
153
+ method: 'GET',
154
+ route: '',
155
+ url: pkg.oAuth2RedirectUri,
156
+ })];
157
+ case 1:
158
+ url = (_a.sent()).url;
159
+ return [2, window.open(url, '_blank')];
160
+ }
161
+ });
162
+ });
167
163
  };
168
164
  return McpTools;
169
165
  }(base_1.Base));
@@ -1 +1 @@
1
- {"version":3,"file":"McpTools.js","sourceRoot":"","sources":["../../src/McpTools.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"McpTools.js","sourceRoot":"","sources":["../../src/McpTools.ts"],"names":[],"mappings":"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"}
@@ -53,33 +53,25 @@ export class McpTools extends Base {
53
53
  this._mcpApiUrl ? this.getInternalServers(options) : Promise.resolve(null),
54
54
  this._mcpToolsUrl ? this.getDiscovery(options) : Promise.resolve(null),
55
55
  ]);
56
- const fromServers = serversResult.status === 'fulfilled' && serversResult.value
57
- ? serversResult.value.servers.map((s) => ({
58
- name: s.name,
59
- url: s.url,
60
- description: s.description,
61
- auth: 'bearer',
62
- source: 'internal',
63
- }))
64
- : [];
65
- const fromDiscovery = discoveryResult.status === 'fulfilled' && discoveryResult.value
66
- ? discoveryResult.value.packages.map((p) => ({
67
- name: p.package,
68
- url: p.url,
69
- auth: p.auth,
70
- redirectUrl: p.redirectUrl,
71
- source: 'discovery',
72
- }))
73
- : [];
74
- const items = [...fromServers, ...fromDiscovery];
56
+ const items = [
57
+ ...(serversResult.status === 'fulfilled' && serversResult.value ? serversResult.value.servers : []),
58
+ ...(discoveryResult.status === 'fulfilled' && discoveryResult.value ? discoveryResult.value.servers : []),
59
+ ];
75
60
  return {
76
- items,
61
+ servers: items,
77
62
  total: items.length,
78
63
  };
79
64
  });
80
65
  }
81
66
  authorizeOAuthPackage(pkg) {
82
- return window.open(pkg.redirectUrl, '_blank');
67
+ return __awaiter(this, void 0, void 0, function* () {
68
+ const { url } = yield this.makeRequest({
69
+ method: 'GET',
70
+ route: '',
71
+ url: pkg.oAuth2RedirectUri,
72
+ });
73
+ return window.open(url, '_blank');
74
+ });
83
75
  }
84
76
  }
85
77
  //# sourceMappingURL=McpTools.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"McpTools.js","sourceRoot":"","sources":["../../src/McpTools.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"McpTools.js","sourceRoot":"","sources":["../../src/McpTools.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { Base } from '@or-sdk/base';
2
- import { AvailableMcpResponse, CallOptions, Config, DiscoveryResponse, InternalServersResponse, OAuthPackage } from './types';
2
+ import { CallOptions, Config, InternalServersResponse, McpServer } from './types';
3
3
  export declare class McpTools extends Base {
4
4
  private readonly _mcpApiUrl?;
5
5
  private readonly _mcpToolsUrl?;
@@ -7,8 +7,8 @@ export declare class McpTools extends Base {
7
7
  private makeRequest;
8
8
  parseError(err: unknown): Error;
9
9
  getInternalServers(options?: CallOptions): Promise<InternalServersResponse>;
10
- getDiscovery(options?: CallOptions): Promise<DiscoveryResponse>;
11
- getAvailableMcp(options?: CallOptions): Promise<AvailableMcpResponse>;
12
- authorizeOAuthPackage(pkg: OAuthPackage): Window | null;
10
+ getDiscovery(options?: CallOptions): Promise<InternalServersResponse>;
11
+ getAvailableMcp(options?: CallOptions): Promise<InternalServersResponse>;
12
+ authorizeOAuthPackage(pkg: McpServer): Promise<Window | null>;
13
13
  }
14
14
  //# sourceMappingURL=McpTools.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"McpTools.d.ts","sourceRoot":"","sources":["../../src/McpTools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAgB,MAAM,cAAc,CAAC;AAIlD,OAAO,EAEL,oBAAoB,EACpB,WAAW,EACX,MAAM,EACN,iBAAiB,EACjB,uBAAuB,EACvB,YAAY,EACb,MAAM,SAAS,CAAC;AAIjB,qBAAa,QAAS,SAAQ,IAAI;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAS;gBAE3B,MAAM,EAAE,MAAM;YAcZ,WAAW;IAIzB,UAAU,CAAC,GAAG,EAAE,OAAO;IASjB,kBAAkB,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAkB/E,YAAY,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAkBnE,eAAe,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAyC/E,qBAAqB,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI;CAGxD"}
1
+ {"version":3,"file":"McpTools.d.ts","sourceRoot":"","sources":["../../src/McpTools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAgB,MAAM,cAAc,CAAC;AAIlD,OAAO,EACL,WAAW,EACX,MAAM,EACN,uBAAuB,EACvB,SAAS,EAEV,MAAM,SAAS,CAAC;AAIjB,qBAAa,QAAS,SAAQ,IAAI;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAS;gBAE3B,MAAM,EAAE,MAAM;YAcZ,WAAW;IAIzB,UAAU,CAAC,GAAG,EAAE,OAAO;IASjB,kBAAkB,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAkB/E,YAAY,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAkBzE,eAAe,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAsB5E,qBAAqB,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CASpE"}
@@ -10,8 +10,6 @@ export type CallOptions = {
10
10
  };
11
11
  export type McpServer = {
12
12
  id: string;
13
- flowId: string;
14
- accountId: string;
15
13
  name: string;
16
14
  description: string;
17
15
  version: string;
@@ -19,41 +17,20 @@ export type McpServer = {
19
17
  isBearerTokenValidationEnabled: boolean;
20
18
  tokenValidationCacheTtlSeconds: number;
21
19
  isStandardAuthEndpointsEnabled: boolean;
20
+ isPlatformAuthEnabled: boolean;
21
+ isOAuth2Enabled: boolean;
22
+ oAuth2RedirectUri?: string;
22
23
  timeout: number;
23
24
  label: string;
24
25
  url: string;
25
- botId: string;
26
- flowUrl: string;
26
+ service?: string;
27
+ params?: Record<string, string>;
27
28
  };
28
29
  export type InternalServersResponse = {
29
30
  servers: McpServer[];
30
31
  total: number;
31
32
  };
32
- export type McpPackage = {
33
- package: string;
33
+ export type OAuthAuthUrlResponse = {
34
34
  url: string;
35
- auth: 'oauth' | string;
36
- redirectUrl?: string;
37
- };
38
- export type OAuthPackage = McpPackage & {
39
- auth: 'oauth';
40
- redirectUrl: string;
41
- };
42
- export type AvailableMcp = {
43
- name: string;
44
- url: string;
45
- description?: string;
46
- auth: 'oauth' | string;
47
- redirectUrl?: string;
48
- source: 'internal' | 'discovery';
49
- };
50
- export type AvailableMcpResponse = {
51
- items: AvailableMcp[];
52
- total: number;
53
- };
54
- export type DiscoveryResponse = {
55
- description: string;
56
- auth: string;
57
- packages: McpPackage[];
58
35
  };
59
36
  //# sourceMappingURL=types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAKrC,MAAM,MAAM,MAAM,GAAG;IAInB,KAAK,EAAE,KAAK,CAAC;IAKb,YAAY,CAAC,EAAE,MAAM,CAAC;IAKtB,WAAW,CAAC,EAAE,MAAM,CAAC;IAKrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,yBAAyB,EAAE,OAAO,CAAC;IACnC,8BAA8B,EAAE,OAAO,CAAC;IACxC,8BAA8B,EAAE,MAAM,CAAC;IACvC,8BAA8B,EAAE,OAAO,CAAC;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG;IACtC,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,UAAU,GAAG,WAAW,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,YAAY,EAAE,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,UAAU,EAAE,CAAC;CACxB,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAKrC,MAAM,MAAM,MAAM,GAAG;IAInB,KAAK,EAAE,KAAK,CAAC;IAKb,YAAY,CAAC,EAAE,MAAM,CAAC;IAKtB,WAAW,CAAC,EAAE,MAAM,CAAC;IAKrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,yBAAyB,EAAE,OAAO,CAAC;IACnC,8BAA8B,EAAE,OAAO,CAAC;IACxC,8BAA8B,EAAE,MAAM,CAAC;IACvC,8BAA8B,EAAE,OAAO,CAAC;IACxC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,MAAM,CAAC;CACb,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@or-sdk/mcp-tools",
3
- "version": "0.5.0-beta.4166.0",
3
+ "version": "0.5.0-beta.4168.0",
4
4
  "description": "",
5
5
  "license": "Apache-2.0",
6
6
  "author": "",
package/src/McpTools.ts CHANGED
@@ -3,13 +3,11 @@ import { Base, CalApiParams } from '@or-sdk/base';
3
3
  import { SERVICE_KEY } from './constants';
4
4
  import { createErrorParser, processors } from './error-parser';
5
5
  import {
6
- AvailableMcp,
7
- AvailableMcpResponse,
8
6
  CallOptions,
9
7
  Config,
10
- DiscoveryResponse,
11
8
  InternalServersResponse,
12
- OAuthPackage,
9
+ McpServer,
10
+ OAuthAuthUrlResponse,
13
11
  } from './types';
14
12
 
15
13
  const errorParser = createErrorParser(processors.AXIOS);
@@ -61,14 +59,14 @@ export class McpTools extends Base {
61
59
  /**
62
60
  * Retrieves the MCP discovery information with available packages.
63
61
  * @param [options] - The API call options.
64
- * @returns {Promise<DiscoveryResponse>} A promise that resolves with the discovery information.
62
+ * @returns {Promise<InternalServersResponse>} A promise that resolves with the discovery information.
65
63
  */
66
- async getDiscovery(options: CallOptions = {}): Promise<DiscoveryResponse> {
64
+ async getDiscovery(options: CallOptions = {}): Promise<InternalServersResponse> {
67
65
  if (!this._mcpToolsUrl) {
68
66
  throw new Error('mcpToolsUrl is required for getDiscovery');
69
67
  }
70
68
 
71
- return this.makeRequest<DiscoveryResponse>({
69
+ return this.makeRequest<InternalServersResponse>({
72
70
  method: 'GET',
73
71
  route: '',
74
72
  url: `${this._mcpToolsUrl}/mcp/discovery`,
@@ -79,40 +77,21 @@ export class McpTools extends Base {
79
77
  /**
80
78
  * Fetches internal MCP servers and discovery packages in parallel and returns them as a unified list.
81
79
  * @param [options] - The API call options.
82
- * @returns {Promise<AvailableMcpResponse>} A promise that resolves with all available MCP entries.
80
+ * @returns {Promise<InternalServersResponse>} A promise that resolves with all available MCP entries.
83
81
  */
84
- async getAvailableMcp(options: CallOptions = {}): Promise<AvailableMcpResponse> {
82
+ async getAvailableMcp(options: CallOptions = {}): Promise<InternalServersResponse> {
85
83
  const [serversResult, discoveryResult] = await Promise.allSettled([
86
84
  this._mcpApiUrl ? this.getInternalServers(options) : Promise.resolve(null),
87
85
  this._mcpToolsUrl ? this.getDiscovery(options) : Promise.resolve(null),
88
86
  ]);
89
87
 
90
- const fromServers: AvailableMcp[] =
91
- serversResult.status === 'fulfilled' && serversResult.value
92
- ? serversResult.value.servers.map((s) => ({
93
- name: s.name,
94
- url: s.url,
95
- description: s.description,
96
- auth: 'bearer',
97
- source: 'internal' as const,
98
- }))
99
- : [];
100
-
101
- const fromDiscovery: AvailableMcp[] =
102
- discoveryResult.status === 'fulfilled' && discoveryResult.value
103
- ? discoveryResult.value.packages.map((p) => ({
104
- name: p.package,
105
- url: p.url,
106
- auth: p.auth,
107
- redirectUrl: p.redirectUrl,
108
- source: 'discovery' as const,
109
- }))
110
- : [];
111
-
112
- const items = [...fromServers, ...fromDiscovery];
88
+ const items = [
89
+ ...(serversResult.status === 'fulfilled' && serversResult.value ? serversResult.value.servers : []),
90
+ ...(discoveryResult.status === 'fulfilled' && discoveryResult.value ? discoveryResult.value.servers : []),
91
+ ];
113
92
 
114
93
  return {
115
- items,
94
+ servers: items,
116
95
  total: items.length,
117
96
  };
118
97
  }
@@ -122,7 +101,13 @@ export class McpTools extends Base {
122
101
  * @param pkg - The OAuth package to authorize.
123
102
  * @returns {Window | null} The opened window reference, or null if it could not be opened.
124
103
  */
125
- authorizeOAuthPackage(pkg: OAuthPackage): Window | null {
126
- return window.open(pkg.redirectUrl, '_blank');
104
+ async authorizeOAuthPackage(pkg: McpServer): Promise<Window | null> {
105
+ const { url } = await this.makeRequest<OAuthAuthUrlResponse>({
106
+ method: 'GET',
107
+ route: '',
108
+ url: pkg.oAuth2RedirectUri!,
109
+ });
110
+
111
+ return window.open(url, '_blank');
127
112
  }
128
113
  }
package/src/types.ts CHANGED
@@ -31,8 +31,6 @@ export type CallOptions = {
31
31
 
32
32
  export type McpServer = {
33
33
  id: string;
34
- flowId: string;
35
- accountId: string;
36
34
  name: string;
37
35
  description: string;
38
36
  version: string;
@@ -40,11 +38,14 @@ export type McpServer = {
40
38
  isBearerTokenValidationEnabled: boolean;
41
39
  tokenValidationCacheTtlSeconds: number;
42
40
  isStandardAuthEndpointsEnabled: boolean;
41
+ isPlatformAuthEnabled: boolean;
42
+ isOAuth2Enabled: boolean;
43
+ oAuth2RedirectUri?: string;
43
44
  timeout: number;
44
45
  label: string;
45
46
  url: string;
46
- botId: string;
47
- flowUrl: string;
47
+ service?: string;
48
+ params?: Record<string, string>;
48
49
  };
49
50
 
50
51
  export type InternalServersResponse = {
@@ -52,34 +53,7 @@ export type InternalServersResponse = {
52
53
  total: number;
53
54
  };
54
55
 
55
- export type McpPackage = {
56
- package: string;
56
+ export type OAuthAuthUrlResponse = {
57
57
  url: string;
58
- auth: 'oauth' | string;
59
- redirectUrl?: string;
60
58
  };
61
59
 
62
- export type OAuthPackage = McpPackage & {
63
- auth: 'oauth';
64
- redirectUrl: string;
65
- };
66
-
67
- export type AvailableMcp = {
68
- name: string;
69
- url: string;
70
- description?: string;
71
- auth: 'oauth' | string;
72
- redirectUrl?: string;
73
- source: 'internal' | 'discovery';
74
- };
75
-
76
- export type AvailableMcpResponse = {
77
- items: AvailableMcp[];
78
- total: number;
79
- };
80
-
81
- export type DiscoveryResponse = {
82
- description: string;
83
- auth: string;
84
- packages: McpPackage[];
85
- };