teraslice-client-js 0.55.1 → 0.57.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.
Files changed (57) hide show
  1. package/dist/src/assets.d.ts +7 -6
  2. package/dist/src/assets.d.ts.map +1 -1
  3. package/dist/src/assets.js +15 -15
  4. package/dist/src/assets.js.map +1 -1
  5. package/dist/src/client.d.ts +1 -1
  6. package/dist/src/client.d.ts.map +1 -1
  7. package/dist/src/client.js +14 -15
  8. package/dist/src/client.js.map +1 -1
  9. package/dist/src/cluster.d.ts +7 -7
  10. package/dist/src/cluster.d.ts.map +1 -1
  11. package/dist/src/cluster.js +2 -2
  12. package/dist/src/cluster.js.map +1 -1
  13. package/dist/src/ex.d.ts +14 -13
  14. package/dist/src/ex.d.ts.map +1 -1
  15. package/dist/src/ex.js +18 -17
  16. package/dist/src/ex.js.map +1 -1
  17. package/dist/src/executions.d.ts +6 -6
  18. package/dist/src/executions.d.ts.map +1 -1
  19. package/dist/src/executions.js +7 -7
  20. package/dist/src/executions.js.map +1 -1
  21. package/dist/src/interfaces.d.ts +1 -218
  22. package/dist/src/interfaces.d.ts.map +1 -1
  23. package/dist/src/interfaces.js +0 -20
  24. package/dist/src/interfaces.js.map +1 -1
  25. package/dist/src/job.d.ts +19 -19
  26. package/dist/src/job.d.ts.map +1 -1
  27. package/dist/src/job.js +23 -21
  28. package/dist/src/job.js.map +1 -1
  29. package/dist/src/jobs.d.ts +4 -4
  30. package/dist/src/jobs.d.ts.map +1 -1
  31. package/dist/src/jobs.js +3 -3
  32. package/dist/src/jobs.js.map +1 -1
  33. package/dist/test/assets-spec.js +7 -1
  34. package/dist/test/assets-spec.js.map +1 -1
  35. package/dist/test/cluster-spec.js +0 -2
  36. package/dist/test/cluster-spec.js.map +1 -1
  37. package/dist/test/ex-spec.js +25 -25
  38. package/dist/test/ex-spec.js.map +1 -1
  39. package/dist/test/job-spec.js +79 -52
  40. package/dist/test/job-spec.js.map +1 -1
  41. package/dist/test/jobs-spec.js +4 -4
  42. package/dist/test/jobs-spec.js.map +1 -1
  43. package/dist/tsconfig.tsbuildinfo +1 -1
  44. package/package.json +3 -2
  45. package/src/assets.ts +24 -19
  46. package/src/client.ts +9 -11
  47. package/src/cluster.ts +10 -16
  48. package/src/ex.ts +44 -54
  49. package/src/executions.ts +15 -21
  50. package/src/interfaces.ts +1 -334
  51. package/src/job.ts +65 -64
  52. package/src/jobs.ts +10 -14
  53. package/test/assets-spec.ts +11 -5
  54. package/test/cluster-spec.ts +0 -2
  55. package/test/ex-spec.ts +32 -32
  56. package/test/job-spec.ts +87 -61
  57. package/test/jobs-spec.ts +5 -5
@@ -1,11 +1,12 @@
1
+ import { Teraslice } from '@terascope/types';
1
2
  import Client from './client';
2
- import { SearchQuery, PostData, AssetIDResponse, SearchOptions, AssetUploadQuery, TxtSearchParams, ClientConfig, Asset } from './interfaces';
3
+ import { PostData, SearchOptions, ClientConfig } from './interfaces';
3
4
  export default class Assets extends Client {
4
5
  constructor(config: ClientConfig);
5
- upload(data: PostData, query?: AssetUploadQuery): Promise<AssetIDResponse>;
6
- remove(id: string, searchOptions?: SearchOptions): Promise<AssetIDResponse>;
7
- list(query?: SearchQuery, searchOptions?: SearchOptions): Promise<Asset[]>;
8
- getAsset(name: string, version?: string, searchOptions?: SearchOptions): Promise<Asset[]>;
9
- txt(name?: string, version?: string, query?: TxtSearchParams, searchOptions?: SearchOptions): Promise<string>;
6
+ upload(data: PostData, query?: Teraslice.AssetUploadQuery): Promise<Teraslice.AssetIDResponse>;
7
+ remove(id: string, searchOptions?: SearchOptions): Promise<Teraslice.AssetIDResponse>;
8
+ list(query?: Teraslice.SearchQuery, searchOptions?: SearchOptions): Promise<Teraslice.AssetRecord[]>;
9
+ getAsset(name: string, version?: string, searchOptions?: SearchOptions): Promise<Teraslice.AssetRecord[]>;
10
+ txt(name?: string, version?: string, query?: Teraslice.TxtSearchParams, searchOptions?: SearchOptions): Promise<string>;
10
11
  }
11
12
  //# sourceMappingURL=assets.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/assets.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EACH,WAAW,EACX,QAAQ,EACR,eAAe,EACf,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,KAAK,EACR,MAAM,cAAc,CAAC;AAEtB,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,MAAM;gBAC1B,MAAM,EAAE,YAAY;IAK1B,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,GAAE,gBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC;IAa9E,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,GAAE,aAAkB,GAAG,OAAO,CAAC,eAAe,CAAC;IAU/E,IAAI,CACN,KAAK,GAAE,WAAgB,EACvB,aAAa,GAAE,aAAkB,GAClC,OAAO,CAAC,KAAK,EAAE,CAAC;IAKb,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,SAAK,EAAE,aAAa,GAAE,aAAkB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAgBzF,GAAG,CACL,IAAI,SAAK,EACT,OAAO,SAAK,EACZ,KAAK,GAAE,eAAoB,EAC3B,aAAa,GAAE,aAAkB,GAClC,OAAO,CAAC,MAAM,CAAC;CAmBrB"}
1
+ {"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/assets.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAErE,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,MAAM;gBAC1B,MAAM,EAAE,YAAY;IAK1B,MAAM,CACR,IAAI,EAAE,QAAQ,EACd,KAAK,GAAE,SAAS,CAAC,gBAAqB,GACvC,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC;IAc/B,MAAM,CACR,EAAE,EAAE,MAAM,EACV,aAAa,GAAE,aAAkB,GAClC,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC;IAW/B,IAAI,CACN,KAAK,GAAE,SAAS,CAAC,WAAgB,EACjC,aAAa,GAAE,aAAkB,GAClC,OAAO,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;IAK7B,QAAQ,CACV,IAAI,EAAE,MAAM,EACZ,OAAO,SAAK,EACZ,aAAa,GAAE,aAAkB,GAClC,OAAO,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;IAiB7B,GAAG,CACL,IAAI,SAAK,EACT,OAAO,SAAK,EACZ,KAAK,GAAE,SAAS,CAAC,eAAoB,EACrC,aAAa,GAAE,aAAkB,GAClC,OAAO,CAAC,MAAM,CAAC;CAmBrB"}
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- const job_components_1 = require("@terascope/job-components");
6
+ const utils_1 = require("@terascope/utils");
7
7
  const path_1 = __importDefault(require("path"));
8
8
  const auto_bind_1 = __importDefault(require("auto-bind"));
9
9
  const client_1 = __importDefault(require("./client"));
@@ -13,8 +13,8 @@ class Assets extends client_1.default {
13
13
  (0, auto_bind_1.default)(this);
14
14
  }
15
15
  async upload(data, query = {}) {
16
- if ((0, job_components_1.isEmpty)(data)) {
17
- throw new job_components_1.TSError('Asset stream must not be empty', {
16
+ if ((0, utils_1.isEmpty)(data)) {
17
+ throw new utils_1.TSError('Asset stream must not be empty', {
18
18
  statusCode: 400
19
19
  });
20
20
  }
@@ -24,8 +24,8 @@ class Assets extends client_1.default {
24
24
  return this.parse(results);
25
25
  }
26
26
  async remove(id, searchOptions = {}) {
27
- if ((0, job_components_1.isEmpty)(id)) {
28
- throw new job_components_1.TSError('Asset delete requires a ID', {
27
+ if ((0, utils_1.isEmpty)(id)) {
28
+ throw new utils_1.TSError('Asset delete requires a ID', {
29
29
  statusCode: 400
30
30
  });
31
31
  }
@@ -37,27 +37,27 @@ class Assets extends client_1.default {
37
37
  return this.get('/assets', options);
38
38
  }
39
39
  async getAsset(name, version = '', searchOptions = {}) {
40
- if (!name || !(0, job_components_1.isString)(name)) {
41
- throw new job_components_1.TSError('Name is required, and must be of type string', {
40
+ if (!name || !(0, utils_1.isString)(name)) {
41
+ throw new utils_1.TSError('Name is required, and must be of type string', {
42
42
  statusCode: 400
43
43
  });
44
44
  }
45
- if (version && !(0, job_components_1.isString)(version)) {
46
- throw new job_components_1.TSError('Version if provided must be of type string', {
45
+ if (version && !(0, utils_1.isString)(version)) {
46
+ throw new utils_1.TSError('Version if provided must be of type string', {
47
47
  statusCode: 400
48
48
  });
49
49
  }
50
- const pathing = path_1.default.join('/assets', name, version);
51
- return this.get(pathing, searchOptions);
50
+ const assetUrl = path_1.default.join('/assets', name, version);
51
+ return this.get(assetUrl, searchOptions);
52
52
  }
53
53
  async txt(name = '', version = '', query = {}, searchOptions = {}) {
54
- if (name && !(0, job_components_1.isString)(name)) {
55
- throw new job_components_1.TSError('Name must be of type string', {
54
+ if (name && !(0, utils_1.isString)(name)) {
55
+ throw new utils_1.TSError('Name must be of type string', {
56
56
  statusCode: 400
57
57
  });
58
58
  }
59
- if (version && !(0, job_components_1.isString)(version)) {
60
- throw new job_components_1.TSError('Version must be of type string', {
59
+ if (version && !(0, utils_1.isString)(version)) {
60
+ throw new utils_1.TSError('Version must be of type string', {
61
61
  statusCode: 400
62
62
  });
63
63
  }
@@ -1 +1 @@
1
- {"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/assets.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/assets.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,7 @@ export default class Client {
5
5
  protected readonly _config: ClientConfig;
6
6
  constructor(config?: ClientConfig);
7
7
  get<T = any>(endpoint: string, options?: SearchOptions): Promise<T>;
8
- post<T = any>(endpoint: string, data: unknown, options?: RequestOptions): Promise<T>;
8
+ post<T = any>(endpoint: string, data?: unknown, options?: RequestOptions): Promise<T>;
9
9
  put<T = any>(endpoint: string, data: unknown, options?: RequestOptions): Promise<T>;
10
10
  delete<T = any>(endpoint: string, options?: SearchOptions): Promise<T>;
11
11
  private _makeRequest;
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAM;IAC/B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;gBAE7B,MAAM,GAAE,YAAiB;IAwB/B,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC;IAInE,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IAIpF,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IAInF,MAAM,CAAC,CAAC,GAAG,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC;YAI9D,YAAY;IAgD1B,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,GAAG;IAKtC,SAAS,CAAC,WAAW,CACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAC,SAAS,EAAE,OAAO,EAAE,cAAc,GAAG,aAAa,GACrF,cAAc;CAGpB"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAM;IAC/B,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;gBAE7B,MAAM,GAAE,YAAiB;IAwB/B,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC;IAInE,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IAIrF,GAAG,CAAC,CAAC,GAAG,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC;IAInF,MAAM,CAAC,CAAC,GAAG,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC;YAI9D,YAAY;IAgD1B,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,GAAG;IAItC,SAAS,CAAC,WAAW,CACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAC,SAAS,EAAE,OAAO,EAAE,cAAc,GAAG,aAAa,GACrF,cAAc;CAGpB"}
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- const job_components_1 = require("@terascope/job-components");
6
+ const utils_1 = require("@terascope/utils");
7
7
  const http_1 = require("http");
8
8
  const url_1 = require("url");
9
9
  const got_1 = __importDefault(require("got"));
@@ -23,7 +23,7 @@ class Client {
23
23
  Accept: 'application/json',
24
24
  },
25
25
  retry: {
26
- limit: job_components_1.isTest ? 0 : 3,
26
+ limit: utils_1.isTest ? 0 : 3,
27
27
  maxRetryAfter: 15000 // 15 seconds
28
28
  },
29
29
  timeout: config.timeout,
@@ -45,7 +45,7 @@ class Client {
45
45
  async _makeRequest(method, endpoint, searchOptions, data) {
46
46
  const errorMsg = validateRequestOptions(endpoint, searchOptions);
47
47
  if (errorMsg) {
48
- return Promise.reject(new job_components_1.TSError(errorMsg, {
48
+ return Promise.reject(new utils_1.TSError(errorMsg, {
49
49
  statusCode: 422
50
50
  }));
51
51
  }
@@ -63,8 +63,8 @@ class Client {
63
63
  }
64
64
  // got doesn't like `undefined` values in the search params
65
65
  // so we need to remove them
66
- if ((0, job_components_1.isPlainObject)(options.searchParams)) {
67
- options.searchParams = (0, job_components_1.withoutNil)(options.searchParams);
66
+ if ((0, utils_1.isPlainObject)(options.searchParams)) {
67
+ options.searchParams = (0, utils_1.withoutNil)(options.searchParams);
68
68
  }
69
69
  const newEndpoint = getAPIEndpoint(endpoint, this._apiVersion);
70
70
  try {
@@ -82,9 +82,8 @@ class Client {
82
82
  }
83
83
  }
84
84
  parse(results) {
85
- return (0, job_components_1.tryParseJSON)(results);
85
+ return (0, utils_1.tryParseJSON)(results);
86
86
  }
87
- // TODO: make better types for this
88
87
  makeOptions(searchParams, options) {
89
88
  return { ...options, searchParams };
90
89
  }
@@ -99,14 +98,14 @@ function getAPIEndpoint(uri, apiVersion) {
99
98
  const isTxt = txtIndex < 2 && txtIndex > -1;
100
99
  if (isTxt)
101
100
  return endpoint;
102
- const versionPrefix = (0, job_components_1.trimStart)(apiVersion, '/');
101
+ const versionPrefix = (0, utils_1.trimStart)(apiVersion, '/');
103
102
  if (endpoint.startsWith(versionPrefix))
104
103
  return endpoint;
105
104
  return `${versionPrefix}/${endpoint}`;
106
105
  }
107
106
  function getErrorFromResponse(response) {
108
107
  let { body } = response;
109
- if (body && (0, job_components_1.isString)(body)) {
108
+ if (body && (0, utils_1.isString)(body)) {
110
109
  try {
111
110
  body = JSON.parse(body);
112
111
  }
@@ -114,8 +113,8 @@ function getErrorFromResponse(response) {
114
113
  return { message: body };
115
114
  }
116
115
  }
117
- if (body && (0, job_components_1.isPlainObject)(body)) {
118
- if ((0, job_components_1.isString)(body.error)) {
116
+ if (body && (0, utils_1.isPlainObject)(body)) {
117
+ if ((0, utils_1.isString)(body.error)) {
119
118
  return {
120
119
  message: body.error
121
120
  };
@@ -129,8 +128,8 @@ function getErrorFromResponse(response) {
129
128
  }
130
129
  function makeErrorFromResponse(response) {
131
130
  const { statusCode } = response;
132
- const stuff = getErrorFromResponse(response);
133
- const { message = http_1.STATUS_CODES[statusCode], code = statusCode } = stuff;
131
+ const parsedError = getErrorFromResponse(response);
132
+ const { message = http_1.STATUS_CODES[statusCode], code = statusCode } = parsedError;
134
133
  const error = new Error(message);
135
134
  error.error = code; // for legacy support
136
135
  error.code = code;
@@ -142,13 +141,13 @@ function validateRequestOptions(endpoint, _options) {
142
141
  if (!endpoint) {
143
142
  return 'endpoint must not be empty';
144
143
  }
145
- if (!(0, job_components_1.isString)(endpoint)) {
144
+ if (!(0, utils_1.isString)(endpoint)) {
146
145
  return 'endpoint must be a string';
147
146
  }
148
147
  return null;
149
148
  }
150
149
  function getRequestOptionsWithData(data, options) {
151
- if ((0, job_components_1.isPlainObject)(data) || Array.isArray(data)) {
150
+ if ((0, utils_1.isPlainObject)(data) || Array.isArray(data)) {
152
151
  return { ...options, json: data };
153
152
  }
154
153
  return { ...options, body: data };
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,12 @@
1
+ import { Teraslice } from '@terascope/types';
1
2
  import Client from './client';
2
- import { TxtType, RootResponse, ClusterState, ClusterStats, ControllerState } from './interfaces';
3
3
  export default class Cluster extends Client {
4
4
  constructor(config: Record<string, any>);
5
- info(): Promise<RootResponse>;
6
- state(): Promise<ClusterState>;
7
- stats(): Promise<ClusterStats>;
8
- slicers(): Promise<ControllerState>;
9
- controllers(): Promise<ControllerState>;
10
- txt(type: TxtType): Promise<string>;
5
+ info(): Promise<Teraslice.ApiRootResponse>;
6
+ state(): Promise<Teraslice.ClusterState>;
7
+ stats(): Promise<Teraslice.ClusterStats>;
8
+ slicers(): Promise<Teraslice.ExecutionList>;
9
+ controllers(): Promise<Teraslice.ExecutionList>;
10
+ txt(type: string): Promise<string>;
11
11
  }
12
12
  //# sourceMappingURL=cluster.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"cluster.d.ts","sourceRoot":"","sources":["../../src/cluster.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EACH,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,YAAY,EACZ,eAAe,EAClB,MAAM,cAAc,CAAC;AAOtB,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,MAAM;gBAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAMjC,IAAI,IAAI,OAAO,CAAC,YAAY,CAAC;IAI7B,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;IAI9B,KAAK,IAAI,OAAO,CAAC,YAAY,CAAC;IAI9B,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IAInC,WAAW,IAAI,OAAO,CAAC,eAAe,CAAC;IAIvC,GAAG,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;CAS5C"}
1
+ {"version":3,"file":"cluster.d.ts","sourceRoot":"","sources":["../../src/cluster.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7C,OAAO,MAAM,MAAM,UAAU,CAAC;AAO9B,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,MAAM;gBAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAMjC,IAAI,IAAI,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC;IAI1C,KAAK,IAAI,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC;IAIxC,KAAK,IAAI,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC;IAIxC,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC;IAI3C,WAAW,IAAI,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC;IAI/C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAS3C"}
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- const job_components_1 = require("@terascope/job-components");
6
+ const utils_1 = require("@terascope/utils");
7
7
  const util_1 = __importDefault(require("util"));
8
8
  const auto_bind_1 = __importDefault(require("auto-bind"));
9
9
  const client_1 = __importDefault(require("./client"));
@@ -34,7 +34,7 @@ class Cluster extends client_1.default {
34
34
  }
35
35
  async txt(type) {
36
36
  const validTypes = ['assets', 'slicers', 'ex', 'jobs', 'nodes', 'workers'];
37
- const isValid = validTypes.some((validType) => (0, job_components_1.startsWith)(type, validType));
37
+ const isValid = validTypes.some((validType) => (0, utils_1.startsWith)(type, validType));
38
38
  if (!isValid) {
39
39
  const error = new Error(`"${type}" is not a valid type. Must be one of ${JSON.stringify(validTypes)}`);
40
40
  return Promise.reject(error);
@@ -1 +1 @@
1
- {"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../src/cluster.ts"],"names":[],"mappings":";;;;;AAAA,8DAAuD;AACvD,gDAAwB;AACxB,0DAAiC;AACjC,sDAA8B;AAS9B,SAAS,oBAAoB,CAAC,EAAkC;IAC5D,MAAM,GAAG,GAAG,4GAA4G,CAAC;IACzH,OAAO,cAAI,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AACnC,CAAC;AAED,MAAqB,OAAQ,SAAQ,gBAAM;IACvC,YAAY,MAA2B;QACnC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAA,mBAAQ,EAAC,IAAI,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,IAAI;QACN,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,KAAK;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,KAAK;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,WAAW;QACb,OAAO,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAa;QACnB,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3E,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAA,2BAAU,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,OAAO,EAAE;YACV,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,IAAI,yCAAyC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACvG,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAChC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;CACJ;AApCD,0BAoCC"}
1
+ {"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../src/cluster.ts"],"names":[],"mappings":";;;;;AAAA,4CAA8C;AAE9C,gDAAwB;AACxB,0DAAiC;AACjC,sDAA8B;AAE9B,SAAS,oBAAoB,CAAC,EAA0C;IACpE,MAAM,GAAG,GAAG,4GAA4G,CAAC;IACzH,OAAO,cAAI,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AACnC,CAAC;AAED,MAAqB,OAAQ,SAAQ,gBAAM;IACvC,YAAY,MAA2B;QACnC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAA,mBAAQ,EAAC,IAAI,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,IAAI;QACN,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,KAAK;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,KAAK;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO;QACT,OAAO,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,WAAW;QACb,OAAO,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,IAAY;QAClB,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3E,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAA,kBAAU,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QAC5E,IAAI,CAAC,OAAO,EAAE;YACV,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,IAAI,yCAAyC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACvG,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAChC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;CACJ;AApCD,0BAoCC"}
package/dist/src/ex.d.ts CHANGED
@@ -1,20 +1,21 @@
1
+ import { Teraslice } from '@terascope/types';
1
2
  import Client from './client';
2
- import { ClientConfig, SearchQuery, SearchOptions, PausedResponse, StoppedResponse, StopQuery, Execution, ResumeResponse, ExecutionStatus, StateErrors, RequestOptions, RecoverQuery, ControllerState, WorkerJobProcesses, ChangeWorkerResponse, ChangeWorkerQueryParams } from './interfaces';
3
+ import { ClientConfig, SearchOptions, RequestOptions } from './interfaces';
3
4
  export default class Ex extends Client {
4
5
  private readonly _exId;
5
6
  constructor(config: ClientConfig, exId: string);
6
7
  id(): string;
7
- stop(query?: StopQuery, searchOptions?: SearchOptions): Promise<StoppedResponse>;
8
- pause(query?: SearchQuery, searchOptions?: SearchOptions): Promise<PausedResponse>;
9
- resume(query?: SearchQuery, searchOptions?: SearchOptions): Promise<ResumeResponse>;
10
- recover(query?: RecoverQuery, searchOptions?: SearchOptions): Promise<Ex>;
11
- status(requestOptions?: RequestOptions): Promise<ExecutionStatus>;
12
- slicer(requestOptions?: RequestOptions): Promise<ControllerState>;
13
- controller(requestOptions?: RequestOptions): Promise<ControllerState>;
14
- config(requestOptions?: RequestOptions): Promise<Execution>;
15
- workers(requestOptions?: RequestOptions): Promise<WorkerJobProcesses[]>;
16
- errors(options?: SearchQuery): Promise<StateErrors>;
17
- changeWorkers(action: ChangeWorkerQueryParams, workerNum: number, requestOptions?: RequestOptions): Promise<ChangeWorkerResponse | string>;
18
- waitForStatus(target: ExecutionStatus, intervalMs?: number, timeoutMs?: number, requestOptions?: RequestOptions): Promise<ExecutionStatus>;
8
+ stop(query?: Teraslice.StopQuery, searchOptions?: SearchOptions): Promise<Teraslice.ApiStoppedResponse>;
9
+ pause(query?: Teraslice.SearchQuery, searchOptions?: SearchOptions): Promise<Teraslice.ApiPausedResponse>;
10
+ resume(query?: Teraslice.SearchQuery, searchOptions?: SearchOptions): Promise<Teraslice.ApiResumeResponse>;
11
+ recover(query?: Teraslice.RecoverQuery, searchOptions?: SearchOptions): Promise<Ex>;
12
+ status(requestOptions?: RequestOptions): Promise<Teraslice.ExecutionStatus>;
13
+ slicer(requestOptions?: RequestOptions): Promise<Teraslice.ExecutionList>;
14
+ controller(requestOptions?: RequestOptions): Promise<Teraslice.ExecutionList>;
15
+ config(requestOptions?: RequestOptions): Promise<Teraslice.ExecutionRecord>;
16
+ workers(requestOptions?: RequestOptions): Promise<Teraslice.WorkerNode[]>;
17
+ errors(options?: Teraslice.SearchQuery): Promise<Teraslice.ErrorRecord[]>;
18
+ changeWorkers(action: Teraslice.ChangeWorkerQueryParams, workerNum: number, requestOptions?: RequestOptions): Promise<Teraslice.ChangeWorkerResponse | string>;
19
+ waitForStatus(target: Teraslice.ExecutionStatus, intervalMs?: number, timeoutMs?: number, requestOptions?: RequestOptions): Promise<Teraslice.ExecutionStatus>;
19
20
  }
20
21
  //# sourceMappingURL=ex.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"ex.d.ts","sourceRoot":"","sources":["../../src/ex.ts"],"names":[],"mappings":"AASA,OAAO,MAAM,MAAM,UAAU,CAAC;AAE9B,OAAO,EACH,YAAY,EACZ,WAAW,EACX,aAAa,EACb,cAAc,EACd,eAAe,EACf,SAAS,EACT,SAAS,EACT,cAAc,EACd,eAAe,EACf,WAAW,EACX,cAAc,EACd,YAAY,EACZ,eAAe,EAEf,kBAAkB,EAElB,oBAAoB,EACpB,uBAAuB,EAE1B,MAAM,cAAc,CAAC;AAEtB,MAAM,CAAC,OAAO,OAAO,EAAG,SAAQ,MAAM;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;gBAEnB,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM;IAS9C,EAAE,IAAI,MAAM;IAEN,IAAI,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,aAAa,GAAE,aAAkB,GAAG,OAAO,CAAC,eAAe,CAAC;IAKpF,KAAK,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,aAAa,GAAE,aAAkB,GAAG,OAAO,CAAC,cAAc,CAAC;IAKtF,MAAM,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,aAAa,GAAE,aAAkB,GAAG,OAAO,CAAC,cAAc,CAAC;IAKvF,OAAO,CACT,KAAK,GAAE,YAAiB,EACxB,aAAa,GAAE,aAAkB,GAClC,OAAO,CAAC,EAAE,CAAC;IAaR,MAAM,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAKjE,MAAM,CAAC,cAAc,GAAE,cAAmB,GAAG,OAAO,CAAC,eAAe,CAAC;IAIrE,UAAU,CAAC,cAAc,GAAE,cAAmB,GAAG,OAAO,CAAC,eAAe,CAAC;IAIzE,MAAM,CAAC,cAAc,GAAE,cAAmB,GAAG,OAAO,CAAC,SAAS,CAAC;IAI/D,OAAO,CAAC,cAAc,GAAE,cAAmB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAK3E,MAAM,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAMnD,aAAa,CACf,MAAM,EAAE,uBAAuB,EAC/B,SAAS,EAAE,MAAM,EACjB,cAAc,GAAE,cAAmB,GACpC,OAAO,CAAC,oBAAoB,GAAG,MAAM,CAAC;IA6BnC,aAAa,CACf,MAAM,EAAE,eAAe,EACvB,UAAU,SAAO,EACjB,SAAS,SAAI,EACb,cAAc,GAAE,cAAmB,GACpC,OAAO,CAAC,eAAe,CAAC;CAuD9B"}
1
+ {"version":3,"file":"ex.d.ts","sourceRoot":"","sources":["../../src/ex.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,EAAG,SAAQ,MAAM;IAClC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;gBAEnB,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM;IAS9C,EAAE,IAAI,MAAM;IAEN,IAAI,CACN,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,EAC3B,aAAa,GAAE,aAAkB,GAClC,OAAO,CAAC,SAAS,CAAC,kBAAkB,CAAC;IAKlC,KAAK,CACP,KAAK,CAAC,EAAE,SAAS,CAAC,WAAW,EAC7B,aAAa,GAAE,aAAkB,GAClC,OAAO,CAAC,SAAS,CAAC,iBAAiB,CAAC;IAKjC,MAAM,CACR,KAAK,CAAC,EAAE,SAAS,CAAC,WAAW,EAC7B,aAAa,GAAE,aAAkB,GAClC,OAAO,CAAC,SAAS,CAAC,iBAAiB,CAAC;IAKjC,OAAO,CACT,KAAK,GAAE,SAAS,CAAC,YAAiB,EAClC,aAAa,GAAE,aAAkB,GAClC,OAAO,CAAC,EAAE,CAAC;IAaR,MAAM,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC;IAK3E,MAAM,CAAC,cAAc,GAAE,cAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC;IAI7E,UAAU,CAAC,cAAc,GAAE,cAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC;IAIjF,MAAM,CAAC,cAAc,GAAE,cAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC;IAI/E,OAAO,CAAC,cAAc,GAAE,cAAmB,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;IAK7E,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;IAMzE,aAAa,CACf,MAAM,EAAE,SAAS,CAAC,uBAAuB,EACzC,SAAS,EAAE,MAAM,EACjB,cAAc,GAAE,cAAmB,GACpC,OAAO,CAAC,SAAS,CAAC,oBAAoB,GAAG,MAAM,CAAC;IA6B7C,aAAa,CACf,MAAM,EAAE,SAAS,CAAC,eAAe,EACjC,UAAU,SAAO,EACjB,SAAS,SAAI,EACb,cAAc,GAAE,cAAmB,GACpC,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC;CAuDxC"}
package/dist/src/ex.js CHANGED
@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- const job_components_1 = require("@terascope/job-components");
6
+ const utils_1 = require("@terascope/utils");
7
+ const types_1 = require("@terascope/types");
7
8
  const auto_bind_1 = __importDefault(require("auto-bind"));
8
9
  const client_1 = __importDefault(require("./client"));
9
- const interfaces_1 = require("./interfaces");
10
10
  class Ex extends client_1.default {
11
11
  constructor(config, exId) {
12
12
  validateExId(exId);
@@ -61,12 +61,12 @@ class Ex extends client_1.default {
61
61
  }
62
62
  async changeWorkers(action, workerNum, requestOptions = {}) {
63
63
  if (action == null || workerNum == null) {
64
- throw new job_components_1.TSError('Change workers requires action and count', {
64
+ throw new utils_1.TSError('Change workers requires action and count', {
65
65
  statusCode: 400
66
66
  });
67
67
  }
68
68
  if (!['add', 'remove', 'total'].includes(action)) {
69
- throw new job_components_1.TSError('Change workers requires action to be one of add, remove, or total', {
69
+ throw new utils_1.TSError('Change workers requires action to be one of add, remove, or total', {
70
70
  statusCode: 400
71
71
  });
72
72
  }
@@ -87,11 +87,11 @@ class Ex extends client_1.default {
87
87
  }
88
88
  async waitForStatus(target, intervalMs = 1000, timeoutMs = 0, requestOptions = {}) {
89
89
  const terminal = {
90
- [interfaces_1.ExecutionStatus.terminated]: true,
91
- [interfaces_1.ExecutionStatus.failed]: true,
92
- [interfaces_1.ExecutionStatus.rejected]: true,
93
- [interfaces_1.ExecutionStatus.completed]: true,
94
- [interfaces_1.ExecutionStatus.stopped]: true,
90
+ [types_1.Teraslice.ExecutionStatusEnum.terminated]: true,
91
+ [types_1.Teraslice.ExecutionStatusEnum.failed]: true,
92
+ [types_1.Teraslice.ExecutionStatusEnum.rejected]: true,
93
+ [types_1.Teraslice.ExecutionStatusEnum.completed]: true,
94
+ [types_1.Teraslice.ExecutionStatusEnum.stopped]: true,
95
95
  };
96
96
  const startTime = Date.now();
97
97
  const options = Object.assign({}, {
@@ -104,8 +104,8 @@ class Ex extends client_1.default {
104
104
  result = await this.status(options);
105
105
  }
106
106
  catch (err) {
107
- if (/(timeout|timedout)/i.test((0, job_components_1.toString)(err))) {
108
- await (0, job_components_1.pDelay)(intervalMs);
107
+ if (/(timeout|timedout)/i.test((0, utils_1.toString)(err))) {
108
+ await (0, utils_1.pDelay)(intervalMs);
109
109
  return checkStatus();
110
110
  }
111
111
  throw err;
@@ -117,13 +117,13 @@ class Ex extends client_1.default {
117
117
  // watching for these then we need to stop waiting as the job
118
118
  // status won't change further.
119
119
  if (terminal[result]) {
120
- throw new job_components_1.TSError(`Execution cannot reach the target status, "${target}", because it is in the terminal state, "${result}"`, { context: { lastStatus: result } });
120
+ throw new utils_1.TSError(`Execution cannot reach the target status, "${target}", because it is in the terminal state, "${result}"`, { context: { lastStatus: result } });
121
121
  }
122
122
  const elapsed = Date.now() - startTime;
123
123
  if (timeoutMs > 0 && elapsed >= timeoutMs) {
124
- throw new job_components_1.TSError(`Execution status failed to change from status "${result}" to "${target}" within ${(0, job_components_1.toHumanTime)(timeoutMs)}`, { context: { lastStatus: result } });
124
+ throw new utils_1.TSError(`Execution status failed to change from status "${result}" to "${target}" within ${(0, utils_1.toHumanTime)(timeoutMs)}`, { context: { lastStatus: result } });
125
125
  }
126
- await (0, job_components_1.pDelay)(intervalMs);
126
+ await (0, utils_1.pDelay)(intervalMs);
127
127
  return checkStatus();
128
128
  };
129
129
  return checkStatus();
@@ -132,12 +132,12 @@ class Ex extends client_1.default {
132
132
  exports.default = Ex;
133
133
  function validateExId(exId) {
134
134
  if (!exId) {
135
- throw new job_components_1.TSError('Ex requires exId', {
135
+ throw new utils_1.TSError('Ex requires exId', {
136
136
  statusCode: 400
137
137
  });
138
138
  }
139
- if (!(0, job_components_1.isString)(exId)) {
140
- throw new job_components_1.TSError('Ex requires exId to be a string', {
139
+ if (!(0, utils_1.isString)(exId)) {
140
+ throw new utils_1.TSError('Ex requires exId to be a string', {
141
141
  statusCode: 400
142
142
  });
143
143
  }
@@ -145,6 +145,7 @@ function validateExId(exId) {
145
145
  function filterProcesses(state, exId, type) {
146
146
  const results = [];
147
147
  for (const node of Object.values(state)) {
148
+ // TODO: fixme
148
149
  node.active.forEach((child) => {
149
150
  const { assignment, ex_id: procExId } = child;
150
151
  if ((assignment && assignment === type) && (procExId && procExId === exId)) {
@@ -1 +1 @@
1
- {"version":3,"file":"ex.js","sourceRoot":"","sources":["../../src/ex.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ex.js","sourceRoot":"","sources":["../../src/ex.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,16 @@
1
- import { JobConfig } from '@terascope/job-components';
1
+ import { Teraslice } from '@terascope/types';
2
2
  import Client from './client';
3
3
  import Ex from './ex';
4
- import { ClientConfig, SearchQuery, StateErrors, Execution } from './interfaces';
5
- type ListOptions = undefined | string | SearchQuery;
4
+ import { ClientConfig } from './interfaces';
5
+ type ListOptions = undefined | string | Teraslice.SearchQuery;
6
6
  export default class Executions extends Client {
7
7
  constructor(config: ClientConfig);
8
8
  /**
9
9
  * Similar to jobs.submit but returns an instance of Ex not a Job
10
10
  */
11
- submit(jobSpec: JobConfig, shouldNotStart?: boolean): Promise<Ex>;
12
- list(options?: ListOptions): Promise<Execution[]>;
13
- errors(exId?: string | SearchQuery, opts?: SearchQuery): Promise<StateErrors>;
11
+ submit(jobSpec: Teraslice.JobConfig, shouldNotStart?: boolean): Promise<Ex>;
12
+ list(options?: ListOptions): Promise<Teraslice.ExecutionRecord[]>;
13
+ errors(exId?: string | Teraslice.SearchQuery, opts?: Teraslice.SearchQuery): Promise<Teraslice.ErrorRecord[]>;
14
14
  /**
15
15
  * Wraps the execution id with convenience functions for accessing
16
16
  * the state on the server.
@@ -1 +1 @@
1
- {"version":3,"file":"executions.d.ts","sourceRoot":"","sources":["../../src/executions.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,SAAS,EAGZ,MAAM,2BAA2B,CAAC;AAEnC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,MAAM,CAAC;AAEtB,OAAO,EACH,YAAY,EACZ,WAAW,EAEX,WAAW,EACX,SAAS,EAEZ,MAAM,cAAc,CAAC;AAEtB,KAAK,WAAW,GAAG,SAAS,GAAG,MAAM,GAAG,WAAW,CAAC;AAEpD,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,MAAM;gBAC9B,MAAM,EAAE,YAAY;IAKhC;;MAEE;IACI,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,EAAE,CAAC;IAiBjE,IAAI,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAKjD,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAiBnF;;;MAGE;IACF,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,EAAE;CAGzB"}
1
+ {"version":3,"file":"executions.d.ts","sourceRoot":"","sources":["../../src/executions.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,MAAM,MAAM,CAAC;AAEtB,OAAO,EAAE,YAAY,EAAiB,MAAM,cAAc,CAAC;AAE3D,KAAK,WAAW,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC,WAAW,CAAC;AAE9D,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,MAAM;gBAC9B,MAAM,EAAE,YAAY;IAKhC;;MAEE;IACI,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,EAAE,CAAC;IAkB3E,IAAI,CAAC,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC;IAKjE,MAAM,CACR,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC,WAAW,EACrC,IAAI,CAAC,EAAE,SAAS,CAAC,WAAW,GAC7B,OAAO,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;IAiBnC;;;MAGE;IACF,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,EAAE;CAGzB"}
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- const job_components_1 = require("@terascope/job-components");
6
+ const utils_1 = require("@terascope/utils");
7
7
  const auto_bind_1 = __importDefault(require("auto-bind"));
8
8
  const client_1 = __importDefault(require("./client"));
9
9
  const ex_1 = __importDefault(require("./ex"));
@@ -17,7 +17,7 @@ class Executions extends client_1.default {
17
17
  */
18
18
  async submit(jobSpec, shouldNotStart) {
19
19
  if (!jobSpec) {
20
- throw new job_components_1.TSError('Submit requires a jobSpec', {
20
+ throw new utils_1.TSError('Submit requires a jobSpec', {
21
21
  statusCode: 400
22
22
  });
23
23
  }
@@ -37,13 +37,13 @@ class Executions extends client_1.default {
37
37
  }
38
38
  async errors(exId, opts) {
39
39
  const options = {};
40
- if ((0, job_components_1.isString)(exId)) {
41
- if ((0, job_components_1.isPlainObject)(opts)) {
40
+ if ((0, utils_1.isString)(exId)) {
41
+ if ((0, utils_1.isPlainObject)(opts)) {
42
42
  options.searchParams = opts;
43
43
  }
44
44
  return this.get(`/ex/${exId}/errors`, options);
45
45
  }
46
- if ((0, job_components_1.isPlainObject)(exId)) {
46
+ if ((0, utils_1.isPlainObject)(exId)) {
47
47
  options.searchParams = exId;
48
48
  }
49
49
  return this.get('/ex/errors', options);
@@ -61,13 +61,13 @@ function _parseListOptions(options) {
61
61
  // support legacy
62
62
  if (!options)
63
63
  return {};
64
- if ((0, job_components_1.isString)(options)) {
64
+ if ((0, utils_1.isString)(options)) {
65
65
  if (options === '*')
66
66
  return {};
67
67
  return { status: options };
68
68
  }
69
69
  if (options.status === '*')
70
- (0, job_components_1.unset)(options, 'status');
70
+ (0, utils_1.unset)(options, 'status');
71
71
  return options;
72
72
  }
73
73
  //# sourceMappingURL=executions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"executions.js","sourceRoot":"","sources":["../../src/executions.ts"],"names":[],"mappings":";;;;;AAAA,8DAMmC;AACnC,0DAAiC;AACjC,sDAA8B;AAC9B,8CAAsB;AAatB,MAAqB,UAAW,SAAQ,gBAAM;IAC1C,YAAY,MAAoB;QAC5B,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAA,mBAAQ,EAAC,IAAI,CAAC,CAAC;IACnB,CAAC;IAED;;MAEE;IACF,KAAK,CAAC,MAAM,CAAC,OAAkB,EAAE,cAAwB;QACrD,IAAI,CAAC,OAAO,EAAE;YACV,MAAM,IAAI,wBAAO,CAAC,2BAA2B,EAAE;gBAC3C,UAAU,EAAE,GAAG;aAClB,CAAC,CAAC;SACN;QACD,MAAM,GAAG,GAAkB,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE;YACzD,YAAY,EAAE,EAAE,KAAK,EAAE,CAAC,cAAc,EAAE;SAC3C,CAAC,CAAC;QACH,qCAAqC;QACrC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YACZ,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;YACjE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAqB;QAC5B,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,YAAY,EAAE,KAAK,EAAmB,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAA2B,EAAE,IAAkB;QACxD,MAAM,OAAO,GAAgB,EAAE,CAAC;QAChC,IAAI,IAAA,yBAAQ,EAAC,IAAI,CAAC,EAAE;YAChB,IAAI,IAAA,8BAAa,EAAC,IAAI,CAAC,EAAE;gBACrB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;aAC/B;YAED,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,SAAS,EAAE,OAAwB,CAAC,CAAC;SACnE;QAED,IAAI,IAAA,8BAAa,EAAC,IAAI,CAAC,EAAE;YACrB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;SAC/B;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,OAAwB,CAAC,CAAC;IAC5D,CAAC;IAED;;;MAGE;IACF,IAAI,CAAC,IAAY;QACb,OAAO,IAAI,YAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC;CACJ;AAvDD,6BAuDC;AAED,SAAS,iBAAiB,CAAC,OAAoB;IAC3C,iBAAiB;IACjB,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,IAAI,IAAA,yBAAQ,EAAC,OAAO,CAAC,EAAE;QACnB,IAAI,OAAO,KAAK,GAAG;YAAE,OAAO,EAAE,CAAC;QAC/B,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;KAC9B;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,GAAG;QAAE,IAAA,sBAAK,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACrD,OAAO,OAAO,CAAC;AACnB,CAAC"}
1
+ {"version":3,"file":"executions.js","sourceRoot":"","sources":["../../src/executions.ts"],"names":[],"mappings":";;;;;AAAA,4CAE0B;AAE1B,0DAAiC;AACjC,sDAA8B;AAC9B,8CAAsB;AAMtB,MAAqB,UAAW,SAAQ,gBAAM;IAC1C,YAAY,MAAoB;QAC5B,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAA,mBAAQ,EAAC,IAAI,CAAC,CAAC;IACnB,CAAC;IAED;;MAEE;IACF,KAAK,CAAC,MAAM,CAAC,OAA4B,EAAE,cAAwB;QAC/D,IAAI,CAAC,OAAO,EAAE;YACV,MAAM,IAAI,eAAO,CAAC,2BAA2B,EAAE;gBAC3C,UAAU,EAAE,GAAG;aAClB,CAAC,CAAC;SACN;QACD,MAAM,GAAG,GAAmC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE;YAC1E,YAAY,EAAE,EAAE,KAAK,EAAE,CAAC,cAAc,EAAE;SAC3C,CAAC,CAAC;QACH,qCAAqC;QACrC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YACZ,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC;YACjE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;QAED,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAqB;QAC5B,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACzC,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,YAAY,EAAE,KAAK,EAAmB,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,MAAM,CACR,IAAqC,EACrC,IAA4B;QAE5B,MAAM,OAAO,GAA0B,EAAE,CAAC;QAC1C,IAAI,IAAA,gBAAQ,EAAC,IAAI,CAAC,EAAE;YAChB,IAAI,IAAA,qBAAa,EAAC,IAAI,CAAC,EAAE;gBACrB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;aAC/B;YAED,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,SAAS,EAAE,OAAwB,CAAC,CAAC;SACnE;QAED,IAAI,IAAA,qBAAa,EAAC,IAAI,CAAC,EAAE;YACrB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;SAC/B;QAED,OAAO,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,OAAwB,CAAC,CAAC;IAC5D,CAAC;IAED;;;MAGE;IACF,IAAI,CAAC,IAAY;QACb,OAAO,IAAI,YAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACtC,CAAC;CACJ;AA3DD,6BA2DC;AAED,SAAS,iBAAiB,CAAC,OAAoB;IAC3C,iBAAiB;IACjB,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,IAAI,IAAA,gBAAQ,EAAC,OAAO,CAAC,EAAE;QACnB,IAAI,OAAO,KAAK,GAAG;YAAE,OAAO,EAAE,CAAC;QAC/B,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;KAC9B;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,GAAG;QAAE,IAAA,aAAK,EAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACrD,OAAO,OAAO,CAAC;AACnB,CAAC"}