specmatic 0.70.5 → 0.70.6

package/dist/core/index.js

@@ -10,7 +10,10 @@ var _fastXmlParser = require("fast-xml-parser");
 var _fs = _interopRequireDefault(require("fs"));
 var _logger = _interopRequireDefault(require("../common/logger"));
 var _runner = require("../common/runner");
+var _promise = _interopRequireDefault(require("terminate/promise"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
@@ -63,16 +66,21 @@ var startStub = (host, port, args) => {
   });
 };
 exports.startStub = startStub;
-var stopStub = stub => {
-  var _javaProcess$stdout, _javaProcess$stderr;
-  _logger.default.debug("Stub: Stopping server at ".concat(stub.url));
-  var javaProcess = stub.process;
-  (_javaProcess$stdout = javaProcess.stdout) === null || _javaProcess$stdout === void 0 ? void 0 : _javaProcess$stdout.removeAllListeners();
-  (_javaProcess$stderr = javaProcess.stderr) === null || _javaProcess$stderr === void 0 ? void 0 : _javaProcess$stderr.removeAllListeners();
-  javaProcess.removeAllListeners('close');
-  javaProcess.kill();
-  _logger.default.info("Stub: Stopped server at ".concat(stub.url));
-};
+var stopStub = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(function* (stub) {
+    var _javaProcess$stdout, _javaProcess$stderr;
+    _logger.default.debug("Stub: Stopping server at ".concat(stub.url));
+    var javaProcess = stub.process;
+    (_javaProcess$stdout = javaProcess.stdout) === null || _javaProcess$stdout === void 0 ? void 0 : _javaProcess$stdout.removeAllListeners();
+    (_javaProcess$stderr = javaProcess.stderr) === null || _javaProcess$stderr === void 0 ? void 0 : _javaProcess$stderr.removeAllListeners();
+    javaProcess.removeAllListeners('close');
+    yield (0, _promise.default)(javaProcess.pid);
+    _logger.default.info("Stub: Stopped server at ".concat(stub.url));
+  });
+  return function stopStub(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
 exports.stopStub = stopStub;
 var test = (host, port, contractPath, args) => {
   var specsPath = _path.default.resolve(contractPath + '');

package/dist/kafka/index.js

@@ -7,7 +7,10 @@ exports.verifyKafkaStub = exports.stopKafkaStub = exports.startKafkaStub = expor
 var _runner = require("../common/runner");
 var _logger = _interopRequireDefault(require("../common/logger"));
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
+var _promise = _interopRequireDefault(require("terminate/promise"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
@@ -60,16 +63,21 @@ var startKafkaStub = (port, args) => {
   });
 };
 exports.startKafkaStub = startKafkaStub;
-var stopKafkaStub = stub => {
-  var _javaProcess$stdout, _javaProcess$stderr;
-  _logger.default.debug("Kafka Stub: Stopping at port=".concat(stub.port, ", apiPort=").concat(stub.apiPort));
-  var javaProcess = stub.process;
-  (_javaProcess$stdout = javaProcess.stdout) === null || _javaProcess$stdout === void 0 ? void 0 : _javaProcess$stdout.removeAllListeners();
-  (_javaProcess$stderr = javaProcess.stderr) === null || _javaProcess$stderr === void 0 ? void 0 : _javaProcess$stderr.removeAllListeners();
-  javaProcess.removeAllListeners('close');
-  javaProcess.kill();
-  _logger.default.info("Kafka Stub: Stopped at port=".concat(stub.port, ", apiPort=").concat(stub.apiPort));
-};
+var stopKafkaStub = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(function* (stub) {
+    var _javaProcess$stdout, _javaProcess$stderr;
+    _logger.default.debug("Kafka Stub: Stopping at port=".concat(stub.port, ", apiPort=").concat(stub.apiPort));
+    var javaProcess = stub.process;
+    (_javaProcess$stdout = javaProcess.stdout) === null || _javaProcess$stdout === void 0 ? void 0 : _javaProcess$stdout.removeAllListeners();
+    (_javaProcess$stderr = javaProcess.stderr) === null || _javaProcess$stderr === void 0 ? void 0 : _javaProcess$stderr.removeAllListeners();
+    javaProcess.removeAllListeners('close');
+    yield (0, _promise.default)(javaProcess.pid);
+    _logger.default.info("Kafka Stub: Stopped at port=".concat(stub.port, ", apiPort=").concat(stub.apiPort));
+  });
+  return function stopKafkaStub(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
 exports.stopKafkaStub = stopKafkaStub;
 var verifyKafkaStub = (stub, topic, value) => {
   var verificationUrl = "http://localhost:".concat(stub.apiPort, "/_verifications");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "specmatic",
-  "version": "0.70.5",
+  "version": "0.70.6",
   "description": "Node wrapper for Specmatic",
   "main": "dist/index.js",
   "scripts": {
@@ -46,6 +46,7 @@
     "fast-xml-parser": "^4.2.2",
     "node-fetch": "^2.6.11",
     "rimraf": "^5.0.1",
+    "terminate": "^2.6.1",
     "winston": "^3.8.2",
     "yargs": "^17.7.2"
   },

package/src/core/__tests__/stub.ts

@@ -3,12 +3,14 @@ import path from 'path';
 import { ChildProcess } from 'child_process';
 import { mock as jestMock, mockReset } from 'jest-mock-extended';
 import { Readable } from 'stream';
+import terminate from 'terminate/promise';
 
 import * as specmatic from '../..';
 import { specmaticJarName } from '../../config';
 import { Stub } from '..';
 
 jest.mock('exec-sh');
+jest.mock('terminate');
 
 const SPECMATIC_JAR_PATH = path.resolve(__dirname, '..', '..', '..', specmaticJarName);
 const HOST = 'localhost';
@@ -129,5 +131,5 @@ test('stopStub method stops any running stub server', () => {
 
     expect(readableMock.removeAllListeners).toHaveBeenCalledTimes(2);
     expect(javaProcessMock.removeAllListeners).toHaveBeenCalledTimes(1);
-    expect(javaProcessMock.kill).toHaveBeenCalledTimes(1);
+    expect(terminate).toHaveBeenCalledTimes(1);
 });

package/src/core/index.ts

@@ -5,6 +5,7 @@ import { XMLParser } from 'fast-xml-parser';
 import fs from 'fs';
 import logger from '../common/logger';
 import { callSpecmatic } from '../common/runner';
+import terminate from 'terminate/promise';
 
 export class Stub {
     host: string;
@@ -62,13 +63,13 @@ const startStub = (host?: string, port?: number, args?: (string | number)[]): Pr
     });
 };
 
-const stopStub = (stub: Stub) => {
+const stopStub = async (stub: Stub) => {
     logger.debug(`Stub: Stopping server at ${stub.url}`);
     const javaProcess = stub.process;
     javaProcess.stdout?.removeAllListeners();
     javaProcess.stderr?.removeAllListeners();
     javaProcess.removeAllListeners('close');
-    javaProcess.kill();
+    await terminate(javaProcess.pid!);
     logger.info(`Stub: Stopped server at ${stub.url}`);
 };
 

package/src/kafka/index.ts

@@ -2,6 +2,7 @@ import { callKafka } from '../common/runner';
 import logger from '../common/logger';
 import { ChildProcess } from 'child_process';
 import fetch from 'node-fetch';
+import terminate from 'terminate/promise';
 
 export class KafkaStub {
     port: number;
@@ -61,13 +62,13 @@ const startKafkaStub = (port?: number, args?: (string | number)[]): Promise<Kafk
     });
 };
 
-const stopKafkaStub = (stub: KafkaStub) => {
+const stopKafkaStub = async (stub: KafkaStub) => {
     logger.debug(`Kafka Stub: Stopping at port=${stub.port}, apiPort=${stub.apiPort}`);
     const javaProcess = stub.process;
     javaProcess.stdout?.removeAllListeners();
     javaProcess.stderr?.removeAllListeners();
     javaProcess.removeAllListeners('close');
-    javaProcess.kill();
+    await terminate(javaProcess.pid!);
     logger.info(`Kafka Stub: Stopped at port=${stub.port}, apiPort=${stub.apiPort}`);
 };