specmatic 0.72.1 → 0.72.2

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 (7) hide show
  1. package/dist/config.js +1 -1
  2. package/dist/core/index.js +20 -13
  3. package/dist/kafka/index.js +10 -10
  4. package/package.json +1 -1
  5. package/src/config.ts +1 -1
  6. package/src/core/index.ts +8 -6
  7. package/src/kafka/index.ts +10 -10
package/dist/config.js CHANGED
@@ -6,5 +6,5 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.specmaticKafkaJarName = exports.specmaticJarName = void 0;
7
7
  var specmaticJarName = 'specmatic.jar';
8
8
  exports.specmaticJarName = specmaticJarName;
9
- var specmaticKafkaJarName = 'specmatic.jar';
9
+ var specmaticKafkaJarName = 'specmatic-kafka-all.jar';
10
10
  exports.specmaticKafkaJarName = specmaticKafkaJarName;
package/dist/core/index.js CHANGED
@@ -49,15 +49,15 @@ var startStub = (host, port, args) => {
49
49
  if (message.indexOf('Stub server is running') > -1) {
50
50
  _logger.default.info("Stub: ".concat(message));
51
51
  var stubInfo = message.split('on');
52
- if (stubInfo.length < 2) reject();else {
52
+ if (stubInfo.length < 2) reject('Cannot determine url from stub output');else {
53
53
  var _urlInfo$length;
54
54
  var url = stubInfo[1].trim();
55
55
  var urlInfo = /(.*?):\/\/(.*?):([0-9]+)/.exec(url);
56
- if (((_urlInfo$length = urlInfo === null || urlInfo === void 0 ? void 0 : urlInfo.length) !== null && _urlInfo$length !== void 0 ? _urlInfo$length : 0) < 4) reject();else resolve(new Stub(urlInfo[2], parseInt(urlInfo[3]), urlInfo[0], javaProcess));
56
+ if (((_urlInfo$length = urlInfo === null || urlInfo === void 0 ? void 0 : urlInfo.length) !== null && _urlInfo$length !== void 0 ? _urlInfo$length : 0) < 4) reject('Cannot determine host and port from stub output');else resolve(new Stub(urlInfo[2], parseInt(urlInfo[3]), urlInfo[0], javaProcess));
57
57
  }
58
58
  } else if (message.indexOf('Address already in use') > -1) {
59
59
  _logger.default.error("Stub: ".concat(message));
60
- reject();
60
+ reject('Address already in use');
61
61
  } else {
62
62
  _logger.default.debug("Stub: ".concat(message));
63
63
  }
@@ -144,17 +144,24 @@ var setExpectations = (stubPath, stubServerBaseUrl) => {
144
144
  (0, _nodeFetch.default)("".concat(stubServerBaseUrl, "/_specmatic/expectations"), {
145
145
  method: 'POST',
146
146
  body: JSON.stringify(stubResponse)
147
- }).then(response => {
148
- if (response.status != 200) {
149
- _logger.default.error("Set Expectations: Failed with status code ".concat(response.status));
150
- reject();
151
- } else {
152
- _logger.default.info('Set Expectations: Finished');
153
- resolve();
154
- }
155
- }).catch(err => {
147
+ }).then( /*#__PURE__*/function () {
148
+ var _ref2 = _asyncToGenerator(function* (response) {
149
+ if (response.status != 200) {
150
+ _logger.default.error("Set Expectations: Failed with status code ".concat(response.status));
151
+ var body = yield response.text();
152
+ _logger.default.error(body);
153
+ reject("Setting expecation failed");
154
+ } else {
155
+ _logger.default.info('Set Expectations: Finished');
156
+ resolve();
157
+ }
158
+ });
159
+ return function (_x2) {
160
+ return _ref2.apply(this, arguments);
161
+ };
162
+ }()).catch(err => {
156
163
  _logger.default.error("Set Expectations: Failed with error ".concat(err));
157
- reject();
164
+ reject("Setting expecation failed with error ".concat(err));
158
165
  });
159
166
  });
160
167
  };
package/dist/kafka/index.js CHANGED
@@ -42,17 +42,17 @@ var startKafkaStub = (port, args) => {
42
42
  if (message.indexOf('Kafka started on port') > -1) {
43
43
  _logger.default.info("Kafka Stub: ".concat(message));
44
44
  var stubInfo = message.split('on port');
45
- if (stubInfo.length < 2) reject();else port = parseInt(stubInfo[1].trim());
45
+ if (stubInfo.length < 2) reject('Cannot determine port from kafka stub output');else port = parseInt(stubInfo[1].trim());
46
46
  } else if (message.indexOf('Starting api server on port') > -1) {
47
47
  _logger.default.info("Kafka Stub: ".concat(message));
48
48
  var _stubInfo = message.split(':');
49
- if (_stubInfo.length < 2) reject();else apiPort = parseInt(_stubInfo[1].trim());
49
+ if (_stubInfo.length < 2) reject('Cannot determine api port from kafka stub output');else apiPort = parseInt(_stubInfo[1].trim());
50
50
  } else if (message.indexOf('Listening on topic') > -1) {
51
51
  _logger.default.info("Kafka Stub: ".concat(message));
52
- if (port && apiPort) resolve(new KafkaStub(port, apiPort, javaProcess));else reject();
52
+ if (port && apiPort) resolve(new KafkaStub(port, apiPort, javaProcess));else reject('No port or api port information available but kafka stub listening on topic already');
53
53
  } else if (message.indexOf('Address already in use') > -1) {
54
54
  _logger.default.error("Kafka Stub: ".concat(message));
55
- reject();
55
+ reject('Address already in use');
56
56
  } else {
57
57
  _logger.default.debug("Kafka Stub: ".concat(message));
58
58
  }
@@ -93,7 +93,7 @@ var setKafkaStubExpectations = (stub, expecations) => {
93
93
  }).then(response => {
94
94
  if (response.status != 200) {
95
95
  _logger.default.error("Kafka Set Expectations: Failed with status code ".concat(response.status));
96
- reject();
96
+ reject('Set expectation failed');
97
97
  } else {
98
98
  return response.text();
99
99
  }
@@ -102,7 +102,7 @@ var setKafkaStubExpectations = (stub, expecations) => {
102
102
  resolve();
103
103
  }).catch(err => {
104
104
  _logger.default.error("Kafka Set Expectations: Failed with error ".concat(err));
105
- reject();
105
+ reject("Set expectation failed with error ".concat(err));
106
106
  });
107
107
  });
108
108
  };
@@ -120,7 +120,7 @@ var verifyKafkaStub = stub => {
120
120
  }).then(response => {
121
121
  if (response.status != 200) {
122
122
  _logger.default.error("Kafka Verification: Failed with status code ".concat(response.status));
123
- reject();
123
+ reject('Kafka verification failed');
124
124
  } else {
125
125
  return response.json();
126
126
  }
@@ -130,7 +130,7 @@ var verifyKafkaStub = stub => {
130
130
  resolve(data.success);
131
131
  }).catch(err => {
132
132
  _logger.default.error("Kafka Verification: Failed with error ".concat(err));
133
- reject();
133
+ reject("Kafka verification failed with error ".concat(err));
134
134
  });
135
135
  });
136
136
  };
@@ -152,7 +152,7 @@ var verifyKafkaStubMessage = (stub, topic, value) => {
152
152
  }).then(response => {
153
153
  if (response.status != 200) {
154
154
  _logger.default.error("Kafka Verify Message: Failed with status code ".concat(response.status));
155
- reject();
155
+ reject('Kafka message verification failed');
156
156
  } else {
157
157
  return response.json();
158
158
  }
@@ -161,7 +161,7 @@ var verifyKafkaStubMessage = (stub, topic, value) => {
161
161
  resolve(data.received);
162
162
  }).catch(err => {
163
163
  _logger.default.error("Kafka Verify Message: Failed with error ".concat(err));
164
- reject();
164
+ reject("Kafka message verification failed with error ".concat(err));
165
165
  });
166
166
  });
167
167
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "specmatic",
3
- "version": "0.72.1",
3
+ "version": "0.72.2",
4
4
  "description": "Node wrapper for Specmatic",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
package/src/config.ts CHANGED
@@ -1,2 +1,2 @@
1
1
  export const specmaticJarName = 'specmatic.jar';
2
- export const specmaticKafkaJarName = 'specmatic.jar';
2
+ export const specmaticKafkaJarName = 'specmatic-kafka-all.jar';
package/src/core/index.ts CHANGED
@@ -45,16 +45,16 @@ const startStub = (host?: string, port?: number, args?: (string | number)[]): Pr
45
45
  if (message.indexOf('Stub server is running') > -1) {
46
46
  logger.info(`Stub: ${message}`);
47
47
  const stubInfo = message.split('on');
48
- if (stubInfo.length < 2) reject();
48
+ if (stubInfo.length < 2) reject('Cannot determine url from stub output');
49
49
  else {
50
50
  const url = stubInfo[1].trim();
51
51
  const urlInfo = /(.*?):\/\/(.*?):([0-9]+)/.exec(url);
52
- if ((urlInfo?.length ?? 0) < 4) reject();
52
+ if ((urlInfo?.length ?? 0) < 4) reject('Cannot determine host and port from stub output');
53
53
  else resolve(new Stub(urlInfo![2], parseInt(urlInfo![3]), urlInfo![0], javaProcess));
54
54
  }
55
55
  } else if (message.indexOf('Address already in use') > -1) {
56
56
  logger.error(`Stub: ${message}`);
57
- reject();
57
+ reject('Address already in use');
58
58
  } else {
59
59
  logger.debug(`Stub: ${message}`);
60
60
  }
@@ -144,10 +144,12 @@ const setExpectations = (stubPath: string, stubServerBaseUrl?: string): Promise<
144
144
  method: 'POST',
145
145
  body: JSON.stringify(stubResponse),
146
146
  })
147
- .then(response => {
147
+ .then(async response => {
148
148
  if (response.status != 200) {
149
149
  logger.error(`Set Expectations: Failed with status code ${response.status}`);
150
- reject();
150
+ const body = await response.text();
151
+ logger.error(body);
152
+ reject(`Setting expecation failed`);
151
153
  } else {
152
154
  logger.info('Set Expectations: Finished');
153
155
  resolve();
@@ -155,7 +157,7 @@ const setExpectations = (stubPath: string, stubServerBaseUrl?: string): Promise<
155
157
  })
156
158
  .catch(err => {
157
159
  logger.error(`Set Expectations: Failed with error ${err}`);
158
- reject();
160
+ reject(`Setting expecation failed with error ${err}`);
159
161
  });
160
162
  });
161
163
  };
package/src/kafka/index.ts CHANGED
@@ -37,20 +37,20 @@ const startKafkaStub = (port?: number, args?: (string | number)[]): Promise<Kafk
37
37
  if (message.indexOf('Kafka started on port') > -1) {
38
38
  logger.info(`Kafka Stub: ${message}`);
39
39
  const stubInfo = message.split('on port');
40
- if (stubInfo.length < 2) reject();
40
+ if (stubInfo.length < 2) reject('Cannot determine port from kafka stub output');
41
41
  else port = parseInt(stubInfo[1].trim());
42
42
  } else if (message.indexOf('Starting api server on port') > -1) {
43
43
  logger.info(`Kafka Stub: ${message}`);
44
44
  const stubInfo = message.split(':');
45
- if (stubInfo.length < 2) reject();
45
+ if (stubInfo.length < 2) reject('Cannot determine api port from kafka stub output');
46
46
  else apiPort = parseInt(stubInfo[1].trim());
47
47
  } else if (message.indexOf('Listening on topic') > -1) {
48
48
  logger.info(`Kafka Stub: ${message}`);
49
49
  if (port && apiPort) resolve(new KafkaStub(port, apiPort, javaProcess));
50
- else reject();
50
+ else reject('No port or api port information available but kafka stub listening on topic already');
51
51
  } else if (message.indexOf('Address already in use') > -1) {
52
52
  logger.error(`Kafka Stub: ${message}`);
53
- reject();
53
+ reject('Address already in use');
54
54
  } else {
55
55
  logger.debug(`Kafka Stub: ${message}`);
56
56
  }
@@ -87,7 +87,7 @@ const setKafkaStubExpectations = (stub: KafkaStub, expecations: any): Promise<vo
87
87
  .then(response => {
88
88
  if (response.status != 200) {
89
89
  logger.error(`Kafka Set Expectations: Failed with status code ${response.status}`);
90
- reject();
90
+ reject('Set expectation failed');
91
91
  } else {
92
92
  return response.text();
93
93
  }
@@ -98,7 +98,7 @@ const setKafkaStubExpectations = (stub: KafkaStub, expecations: any): Promise<vo
98
98
  })
99
99
  .catch(err => {
100
100
  logger.error(`Kafka Set Expectations: Failed with error ${err}`);
101
- reject();
101
+ reject(`Set expectation failed with error ${err}`);
102
102
  });
103
103
  });
104
104
  };
@@ -117,7 +117,7 @@ const verifyKafkaStub = (stub: KafkaStub): Promise<Boolean> => {
117
117
  .then(response => {
118
118
  if (response.status != 200) {
119
119
  logger.error(`Kafka Verification: Failed with status code ${response.status}`);
120
- reject();
120
+ reject('Kafka verification failed');
121
121
  } else {
122
122
  return response.json();
123
123
  }
@@ -129,7 +129,7 @@ const verifyKafkaStub = (stub: KafkaStub): Promise<Boolean> => {
129
129
  })
130
130
  .catch(err => {
131
131
  logger.error(`Kafka Verification: Failed with error ${err}`);
132
- reject();
132
+ reject(`Kafka verification failed with error ${err}`);
133
133
  });
134
134
  });
135
135
  };
@@ -149,7 +149,7 @@ const verifyKafkaStubMessage = (stub: KafkaStub, topic: string, value: string):
149
149
  .then(response => {
150
150
  if (response.status != 200) {
151
151
  logger.error(`Kafka Verify Message: Failed with status code ${response.status}`);
152
- reject();
152
+ reject('Kafka message verification failed');
153
153
  } else {
154
154
  return response.json();
155
155
  }
@@ -160,7 +160,7 @@ const verifyKafkaStubMessage = (stub: KafkaStub, topic: string, value: string):
160
160
  })
161
161
  .catch(err => {
162
162
  logger.error(`Kafka Verify Message: Failed with error ${err}`);
163
- reject();
163
+ reject(`Kafka message verification failed with error ${err}`);
164
164
  });
165
165
  });
166
166
  };