@pact-foundation/pact-core 10.12.0 → 11.0.1

package/src/pact-environment.d.ts

@@ -1,5 +1,5 @@
 export declare class PactEnvironment {
-    readonly cwd: string;
+    get cwd(): string;
     isWindows(platform?: string): boolean;
 }
 declare const _default: PactEnvironment;

package/src/pact-environment.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PactEnvironment = void 0;
 var path = require("path");
 var PactEnvironment = (function () {
     function PactEnvironment() {
@@ -8,7 +9,7 @@ var PactEnvironment = (function () {
         get: function () {
             return path.resolve(__dirname, '..');
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     PactEnvironment.prototype.isWindows = function (platform) {

package/src/pact-environment.js.map

@@ -1 +1 @@
-{"version":3,"file":"pact-environment.js","sourceRoot":"","sources":["pact-environment.ts"],"names":[],"mappings":";;AAAA,2BAA6B;AAE7B;IAAA;IAQA,CAAC;IAPA,sBAAW,gCAAG;aAAd;YACC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACtC,CAAC;;;OAAA;IAEM,mCAAS,GAAhB,UAAiB,QAAmC;QAAnC,yBAAA,EAAA,WAAmB,OAAO,CAAC,QAAQ;QACnD,OAAO,QAAQ,KAAK,OAAO,CAAC;IAC7B,CAAC;IACF,sBAAC;AAAD,CAAC,AARD,IAQC;AARY,0CAAe;AAU5B,kBAAe,IAAI,eAAe,EAAE,CAAC"}
+{"version":3,"file":"pact-environment.js","sourceRoot":"","sources":["pact-environment.ts"],"names":[],"mappings":";;;AAAA,2BAA6B;AAE7B;IAAA;IAQA,CAAC;IAPC,sBAAW,gCAAG;aAAd;YACE,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;;;OAAA;IAEM,mCAAS,GAAhB,UAAiB,QAAmC;QAAnC,yBAAA,EAAA,WAAmB,OAAO,CAAC,QAAQ;QAClD,OAAO,QAAQ,KAAK,OAAO,CAAC;IAC9B,CAAC;IACH,sBAAC;AAAD,CAAC,AARD,IAQC;AARY,0CAAe;AAU5B,kBAAe,IAAI,eAAe,EAAE,CAAC"}

package/src/pact-standalone.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.standalone = void 0;
 var path = require("path");
 var install_1 = require("../standalone/install");
 var pact_environment_1 = require("./pact-environment");
-exports.standalone = function (platform, arch) {
+var standalone = function (platform, arch) {
     platform = platform || process.platform;
     arch = arch || process.arch;
     var binName = function (name) {
@@ -38,5 +39,6 @@ exports.standalone = function (platform, arch) {
             .trim(),
     };
 };
+exports.standalone = standalone;
 exports.default = exports.standalone();
 //# sourceMappingURL=pact-standalone.js.map

package/src/pact-standalone.js.map

@@ -1 +1 @@
-{"version":3,"file":"pact-standalone.js","sourceRoot":"","sources":["pact-standalone.ts"],"names":[],"mappings":";;AAAA,2BAA6B;AAC7B,iDAAuD;AACvD,uDAAiD;AAkBpC,QAAA,UAAU,GAAG,UACzB,QAAiB,EACjB,IAAa;IAEb,QAAQ,GAAG,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IACxC,IAAI,GAAG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAC5B,IAAM,OAAO,GAAG,UAAC,IAAY;QAC5B,OAAA,KAAG,IAAI,IAAG,0BAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAE;IAA7D,CAA6D,CAAC;IAC/D,IAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC1C,IAAM,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACxC,IAAM,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACjD,IAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACtC,IAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC1C,IAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,IAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACzB,YAAY,EACZ,wBAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,UAAU,EACzC,MAAM,EACN,KAAK,CACL,CAAC;IAEF,OAAO;QACN,GAAG,EAAE,0BAAe,CAAC,GAAG;QACxB,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC;QACvC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,0BAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE;QAC1E,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC;QACzC,eAAe,EAAE,IAAI;aACnB,OAAO,CAAC,0BAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC;aAC/C,IAAI,EAAE;QACR,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;QAC1C,mBAAmB,EAAE,IAAI;aACvB,OAAO,CAAC,0BAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC;aAC5C,IAAI,EAAE;QACR,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;QACnC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,0BAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE;QACtE,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;QACnC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,0BAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE;QACtE,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC;QACzC,gBAAgB,EAAE,IAAI;aACpB,OAAO,CAAC,0BAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC;aAC9C,IAAI,EAAE;KACR,CAAC;AACH,CAAC,CAAC;AAEF,kBAAe,kBAAU,EAAE,CAAC"}
+{"version":3,"file":"pact-standalone.js","sourceRoot":"","sources":["pact-standalone.ts"],"names":[],"mappings":";;;AAAA,2BAA6B;AAC7B,iDAAuD;AACvD,uDAAiD;AAkB1C,IAAM,UAAU,GAAG,UACxB,QAAiB,EACjB,IAAa;IAEb,QAAQ,GAAG,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IACxC,IAAI,GAAG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAC5B,IAAM,OAAO,GAAG,UAAC,IAAY;QAC3B,OAAA,KAAG,IAAI,IAAG,0BAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAE;IAA7D,CAA6D,CAAC;IAChE,IAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC1C,IAAM,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACxC,IAAM,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACjD,IAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACtC,IAAM,IAAI,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC1C,IAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,IAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACxB,YAAY,EACZ,wBAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,UAAU,EACzC,MAAM,EACN,KAAK,CACN,CAAC;IAEF,OAAO;QACL,GAAG,EAAE,0BAAe,CAAC,GAAG;QACxB,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC;QACvC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,0BAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE;QAC1E,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC;QACzC,eAAe,EAAE,IAAI;aAClB,OAAO,CAAC,0BAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC;aAC/C,IAAI,EAAE;QACT,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;QAC1C,mBAAmB,EAAE,IAAI;aACtB,OAAO,CAAC,0BAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC;aAC5C,IAAI,EAAE;QACT,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;QACnC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,0BAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE;QACtE,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;QACnC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,0BAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE;QACtE,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC;QACzC,gBAAgB,EAAE,IAAI;aACnB,OAAO,CAAC,0BAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC;aAC9C,IAAI,EAAE;KACV,CAAC;AACJ,CAAC,CAAC;AA1CW,QAAA,UAAU,cA0CrB;AAEF,kBAAe,kBAAU,EAAE,CAAC"}

package/src/pact.d.ts

@@ -1,4 +1,3 @@
-import * as q from 'q';
 import { Server, ServerOptions } from './server';
 import { Stub, StubOptions } from './stub';
 import { VerifierOptions } from './verifier';
@@ -14,15 +13,15 @@ export declare class Pact {
     logLevel(level?: LogLevels | number): number | void;
     createServer(options?: ServerOptions): Server;
     listServers(): Server[];
-    removeAllServers(): q.Promise<Server[]>;
+    removeAllServers(): Promise<Server[]>;
     createStub(options?: StubOptions): Stub;
     listStubs(): Stub[];
-    removeAllStubs(): q.Promise<Stub[]>;
-    removeAll(): q.Promise<AbstractService[]>;
-    verifyPacts(options: VerifierOptions): q.Promise<string>;
-    createMessage(options: MessageOptions): q.Promise<unknown>;
-    publishPacts(options: PublisherOptions): q.Promise<string[]>;
-    canDeploy(options: CanDeployOptions): q.Promise<CanDeployResponse | string>;
+    removeAllStubs(): Promise<Stub[]>;
+    removeAll(): Promise<AbstractService[]>;
+    verifyPacts(options: VerifierOptions): Promise<string>;
+    createMessage(options: MessageOptions): Promise<unknown>;
+    publishPacts(options: PublisherOptions): Promise<string[]>;
+    canDeploy(options: CanDeployOptions): Promise<CanDeployResponse | string>;
 }
 declare const _default: Pact;
 export default _default;

package/src/pact.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var q = require("q");
+exports.Pact = void 0;
 var path = require("path");
 var server_1 = require("./server");
 var stub_1 = require("./stub");
@@ -60,10 +60,10 @@ var Pact = (function () {
     };
     Pact.prototype.removeAllServers = function () {
         if (this.__servers.length === 0) {
-            return q(this.__servers);
+            return Promise.resolve(this.__servers);
         }
         logger_1.default.info('Removing all Pact servers.');
-        return q.all(_.map(this.__servers, function (server) { return server.delete(); }));
+        return Promise.all(_.map(this.__servers, function (server) { return server.delete(); }));
     };
     Pact.prototype.createStub = function (options) {
         var _this = this;
@@ -89,13 +89,13 @@ var Pact = (function () {
     };
     Pact.prototype.removeAllStubs = function () {
         if (this.__stubs.length === 0) {
-            return q(this.__stubs);
+            return Promise.resolve(this.__stubs);
         }
         logger_1.default.info('Removing all Pact stubs.');
-        return q.all(_.map(this.__stubs, function (stub) { return stub.delete(); }));
+        return Promise.all(_.map(this.__stubs, function (stub) { return stub.delete(); }));
     };
     Pact.prototype.removeAll = function () {
-        return q.all(_.flatten([this.removeAllStubs(), this.removeAllServers()]));
+        return Promise.all(_.flatten([this.removeAllStubs(), this.removeAllServers()]));
     };
     Pact.prototype.verifyPacts = function (options) {
         logger_1.default.info('Verifying Pacts.');

package/src/pact.js.map

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

package/src/publisher.d.ts

@@ -1,10 +1,8 @@
-import q = require('q');
 export declare class Publisher {
-    static create: (options: PublisherOptions) => Publisher;
     readonly options: PublisherOptions;
     private readonly __argMapping;
     constructor(options: PublisherOptions);
-    publish(): q.Promise<string[]>;
+    publish(): Promise<string[]>;
 }
 declare const _default: (options: PublisherOptions) => Publisher;
 export default _default;

package/src/publisher.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var q = require("q");
+exports.Publisher = void 0;
 var path = require("path");
 var fs = require("fs");
 var logger_1 = require("./logger");
 var spawn_1 = require("./spawn");
+var promise_timeout_1 = require("promise-timeout");
 var spawn_2 = require("./spawn");
-var util_1 = require("util");
 var pact_standalone_1 = require("./pact-standalone");
-var checkTypes = require('check-types');
+var checkTypes = require("check-types");
 var Publisher = (function () {
     function Publisher(options) {
         this.__argMapping = {
@@ -61,25 +61,30 @@ var Publisher = (function () {
         this.options = options;
     }
     Publisher.prototype.publish = function () {
+        var _this = this;
         logger_1.default.info("Publishing pacts to broker at: " + this.options.pactBroker);
-        var deferred = q.defer();
-        var instance = spawn_1.default.spawnBinary(pact_standalone_1.default.brokerPath, [{ cliVerb: 'publish' }, this.options], this.__argMapping);
-        var output = [];
-        instance.stdout.on('data', function (l) { return output.push(l); });
-        instance.stderr.on('data', function (l) { return output.push(l); });
-        instance.once('close', function (code) {
-            var o = output.join('\n');
-            var pactUrls = /^https?:\/\/.*\/pacts\/.*$/gim.exec(o);
-            if (code !== 0 || !pactUrls) {
-                logger_1.default.error("Could not publish pact:\n" + o);
-                return deferred.reject(new Error(o));
+        return promise_timeout_1.timeout(new Promise(function (resolve, reject) {
+            var instance = spawn_1.default.spawnBinary(pact_standalone_1.default.brokerPath, [{ cliVerb: 'publish' }, _this.options], _this.__argMapping);
+            var output = [];
+            instance.stdout.on('data', function (l) { return output.push(l); });
+            instance.stderr.on('data', function (l) { return output.push(l); });
+            instance.once('close', function (code) {
+                var o = output.join('\n');
+                var pactUrls = /^https?:\/\/.*\/pacts\/.*$/gim.exec(o);
+                if (code !== 0 || !pactUrls) {
+                    logger_1.default.error("Could not publish pact:\n" + o);
+                    return reject(new Error(o));
+                }
+                logger_1.default.info(o);
+                return resolve(pactUrls);
+            });
+        }), this.options.timeout).catch(function (err) {
+            if (err instanceof promise_timeout_1.TimeoutError) {
+                throw new Error("Timeout waiting for publication process to complete");
             }
-            logger_1.default.info(o);
-            return deferred.resolve(pactUrls);
+            throw err;
         });
-        return deferred.promise.timeout(this.options.timeout, "Timeout waiting for verification process to complete (PID: " + instance.pid + ")");
     };
-    Publisher.create = util_1.deprecate(function (options) { return new Publisher(options); }, 'Create function will be removed in future release, please use the default export function or use `new Publisher()`');
     return Publisher;
 }());
 exports.Publisher = Publisher;

package/src/publisher.js.map

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

package/src/server.d.ts

@@ -1,6 +1,5 @@
 import { AbstractService, LogLevel } from './service';
 export declare class Server extends AbstractService {
-    static create: (options?: ServerOptions | undefined) => Server;
     readonly options: ServerOptions;
     constructor(options?: ServerOptions);
 }
@@ -20,5 +19,6 @@ export interface ServerOptions {
     provider?: string;
     monkeypatch?: string;
     logLevel?: LogLevel;
+    timeout?: number;
     pactFileWriteMode?: 'overwrite' | 'update' | 'merge';
 }

package/src/server.js

@@ -3,23 +3,25 @@ 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 (b.hasOwnProperty(p)) d[p] = b[p]; };
+            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 __());
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Server = void 0;
 var service_1 = require("./service");
-var util_1 = require("util");
 var pact_standalone_1 = require("./pact-standalone");
 var path = require("path");
 var fs = require("fs");
 var mkdirp = require("mkdirp");
-var checkTypes = require('check-types');
+var checkTypes = require("check-types");
 var Server = (function (_super) {
     __extends(Server, _super);
     function Server(options) {
@@ -87,7 +89,6 @@ var Server = (function (_super) {
         _this.options = options;
         return _this;
     }
-    Server.create = util_1.deprecate(function (options) { return new Server(options); }, 'Create function will be removed in future release, please use the default export function or use `new Server()`');
     return Server;
 }(service_1.AbstractService));
 exports.Server = Server;

package/src/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAsD;AACtD,6BAAiC;AACjC,qDAAqC;AACrC,2BAA8B;AAC9B,uBAA0B;AAC1B,+BAAkC;AAGlC,IAAM,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAE1C;IAA4B,0BAAe;IAQ1C,gBAAY,OAA2B;QAA3B,wBAAA,EAAA,YAA2B;QAAvC,iBA4EC;QA3EA,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QACtE,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,IAAI,WAAW,CAAC;QAErE,IAAI,OAAO,CAAC,IAAI,EAAE;YACjB,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACvC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACxC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SACzC;QAED,IAAI,OAAO,CAAC,GAAG,EAAE;YAChB,IAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI;gBACH,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;aAC/B;YAAC,OAAO,CAAC,EAAE;gBACX,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACjB;SACD;QAED,IAAI,OAAO,CAAC,GAAG,EAAE;YAChB,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;SACxC;QAED,IAAI,OAAO,CAAC,OAAO,EAAE;YACpB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAChD;QAED,IAAI,OAAO,CAAC,MAAM,EAAE;YACnB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SAC9C;QAED,IAAI,OAAO,CAAC,QAAQ,EAAE;YACrB,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SAC3C;QAED,IAAI,OAAO,CAAC,QAAQ,EAAE;YACrB,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SAC3C;QAED,IAAI,OAAO,CAAC,QAAQ,EAAE;YACrB,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,WAAW,EAAc,CAAC;SAC9D;QAED,IAAI,OAAO,CAAC,WAAW,EAAE;YACxB,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC9C,IAAI;gBACH,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;aAC1D;YAAC,OAAO,CAAC,EAAE;gBACX,MAAM,IAAI,KAAK,CACd,8CAA4C,OAAO,CAAC,WAAa,CACjE,CAAC;aACF;SACD;QAED,QAAA,kBACC,yBAAI,CAAC,eAAe,EACpB,OAAO,EACP;YACC,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,OAAO;YACZ,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,UAAU;YAClB,IAAI,EAAE,QAAQ;YACd,GAAG,EAAE,YAAY;YACjB,IAAI,EAAE,8BAA8B;YACpC,iBAAiB,EAAE,wBAAwB;YAC3C,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,YAAY;YACtB,WAAW,EAAE,eAAe;YAC5B,QAAQ,EAAE,aAAa;SACvB,EACD,EAAE,OAAO,EAAE,SAAS,EAAE,CACtB,SAAC;QACF,KAAI,CAAC,OAAO,GAAG,OAAO,CAAC;;IACxB,CAAC;IAnFa,aAAM,GAAG,gBAAS,CAC/B,UAAC,OAAuB,IAAK,OAAA,IAAI,MAAM,CAAC,OAAO,CAAC,EAAnB,CAAmB,EAChD,iHAAiH,CACjH,CAAC;IAiFH,aAAC;CAAA,AArFD,CAA4B,yBAAe,GAqF1C;AArFY,wBAAM;AAwFnB,mBAAe,UAAC,OAAuB,IAAa,OAAA,IAAI,MAAM,CAAC,OAAO,CAAC,EAAnB,CAAmB,EAAC"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":"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"}

package/src/service.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" />
 import events = require('events');
-import q = require('q');
 import { CliVerbOptions } from './spawn';
 import { ChildProcess } from 'child_process';
 interface AbstractServiceEventInterface {
@@ -9,7 +8,7 @@ interface AbstractServiceEventInterface {
     DELETE_EVENT: string;
 }
 export declare abstract class AbstractService extends events.EventEmitter {
-    static readonly Events: AbstractServiceEventInterface;
+    static get Events(): AbstractServiceEventInterface;
     readonly options: ServiceOptions;
     protected __argMapping: any;
     protected __running: boolean;
@@ -17,12 +16,12 @@ export declare abstract class AbstractService extends events.EventEmitter {
     protected __cliVerb?: CliVerbOptions;
     protected __serviceCommand: string;
     protected constructor(command: string, options: ServiceOptions, argMapping: any, cliVerb?: CliVerbOptions);
-    start(): q.Promise<AbstractService>;
-    stop(): q.Promise<AbstractService>;
-    delete(): q.Promise<AbstractService>;
+    start(): Promise<AbstractService>;
+    stop(): Promise<AbstractService>;
+    delete(): Promise<AbstractService>;
     protected spawnBinary(): ChildProcess;
-    protected __waitForServiceUp(): q.Promise<unknown>;
-    protected __waitForServiceDown(): q.Promise<unknown>;
+    protected __waitForServiceUp(): Promise<unknown>;
+    protected __waitForServiceDown(): Promise<unknown>;
     private __call;
 }
 export interface ServiceOptions {
@@ -34,6 +33,7 @@ export interface ServiceOptions {
     sslkey?: string;
     log?: string;
     logLevel?: LogLevel;
+    timeout?: number;
 }
 export declare type LogLevel = 'debug' | 'info' | 'warn' | 'error';
 export interface HTTPConfig {

package/src/service.js

@@ -3,29 +3,36 @@ 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 (b.hasOwnProperty(p)) d[p] = b[p]; };
+            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 __());
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbstractService = void 0;
 var path = require("path");
 var fs = require("fs");
 var events = require("events");
 var http = require("request");
-var q = require("q");
 var logger_1 = require("./logger");
 var spawn_1 = require("./spawn");
+var promise_timeout_1 = require("promise-timeout");
 var mkdirp = require("mkdirp");
-var checkTypes = require('check-types');
+var checkTypes = require("check-types");
 var setTimeout = global.setTimeout;
-var CHECKTIME = 500;
 var RETRY_AMOUNT = 60;
-var PROCESS_TIMEOUT = 30000;
+var getTimeout = function (options) {
+    return options.timeout || 30000;
+};
+var getRetryTickTime = function (options) {
+    return Math.round(getTimeout(options) / RETRY_AMOUNT);
+};
 var AbstractService = (function (_super) {
     __extends(AbstractService, _super);
     function AbstractService(command, options, argMapping, cliVerb) {
@@ -47,7 +54,9 @@ var AbstractService = (function (_super) {
             checkTypes.assert.number(options.port);
             checkTypes.assert.integer(options.port);
             checkTypes.assert.positive(options.port);
-            checkTypes.assert.inRange(options.port, 0, 65535);
+            if (!checkTypes.inRange(options.port, 0, 65535)) {
+                throw new Error("Port number " + options.port + " is not in the range 0-65535");
+            }
             if (checkTypes.not.inRange(options.port, 1024, 49151)) {
                 logger_1.default.warn('Like a Boss, you used a port outside of the recommended range (1024 to 49151); I too like to live dangerously.');
             }
@@ -104,14 +113,14 @@ var AbstractService = (function (_super) {
                 DELETE_EVENT: 'delete',
             };
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     AbstractService.prototype.start = function () {
         var _this = this;
         if (this.__instance && this.__instance.connected) {
             logger_1.default.warn("You already have a process running with PID: " + this.__instance.pid);
-            return q.resolve(this);
+            return Promise.resolve(this);
         }
         this.__instance = this.spawnBinary();
         this.__instance.once('close', function () { return _this.stop(); });
@@ -131,20 +140,31 @@ var AbstractService = (function (_super) {
         this.__instance.stderr.on('data', function (data) {
             return logger_1.default.error("Pact Binary Error: " + data);
         });
-        return this.__waitForServiceUp()
-            .timeout(PROCESS_TIMEOUT, "Couldn't start Pact with PID: " + this.__instance.pid)
+        return promise_timeout_1.timeout(this.__waitForServiceUp(), getTimeout(this.options))
             .then(function () {
             _this.__running = true;
             _this.emit(AbstractService.Events.START_EVENT, _this);
             return _this;
+        })
+            .catch(function (err) {
+            if (err instanceof promise_timeout_1.TimeoutError) {
+                throw new Error("Timeout while waiting to start Pact with PID: " + (_this.__instance ? _this.__instance.pid : 'No Instance'));
+            }
+            throw err;
         });
     };
     AbstractService.prototype.stop = function () {
         var _this = this;
         var pid = this.__instance ? this.__instance.pid : -1;
-        return q(spawn_1.default.killBinary(this.__instance))
-            .then(function () { return _this.__waitForServiceDown(); })
-            .timeout(PROCESS_TIMEOUT, "Couldn't stop Pact with PID '" + pid + "'")
+        return promise_timeout_1.timeout(Promise.resolve(this.__instance)
+            .then(spawn_1.default.killBinary)
+            .then(function () { return _this.__waitForServiceDown(); }), getTimeout(this.options))
+            .catch(function (err) {
+            if (err instanceof promise_timeout_1.TimeoutError) {
+                throw new Error("Timeout while waiting to stop Pact with PID '" + pid + "'");
+            }
+            throw err;
+        })
             .then(function () {
             _this.__running = false;
             _this.emit(AbstractService.Events.STOP_EVENT, _this);
@@ -164,70 +184,72 @@ var AbstractService = (function (_super) {
     AbstractService.prototype.__waitForServiceUp = function () {
         var _this = this;
         var amount = 0;
-        var deferred = q.defer();
-        var retry = function () {
-            if (amount >= RETRY_AMOUNT) {
-                deferred.reject(new Error('Pact startup failed; tried calling service 10 times with no result.'));
-            }
-            setTimeout(check.bind(_this), CHECKTIME);
-        };
-        var check = function () {
-            amount++;
-            if (_this.options.port) {
-                _this.__call(_this.options).then(function () { return deferred.resolve(); }, retry.bind(_this));
-            }
-            else {
-                retry();
-            }
-        };
-        check();
-        return deferred.promise;
+        var waitPromise = new Promise(function (resolve, reject) {
+            var retry = function () {
+                if (amount >= RETRY_AMOUNT) {
+                    reject(new Error("Pact startup failed; tried calling service " + RETRY_AMOUNT + " times with no result."));
+                }
+                setTimeout(check.bind(_this), getRetryTickTime(_this.options));
+            };
+            var check = function () {
+                amount++;
+                if (_this.options.port) {
+                    _this.__call(_this.options).then(function () { return resolve(); }, retry.bind(_this));
+                }
+                else {
+                    retry();
+                }
+            };
+            check();
+        });
+        return waitPromise;
     };
     AbstractService.prototype.__waitForServiceDown = function () {
         var _this = this;
         var amount = 0;
-        var deferred = q.defer();
-        var check = function () {
-            amount++;
-            if (_this.options.port) {
-                _this.__call(_this.options).then(function () {
-                    if (amount >= RETRY_AMOUNT) {
-                        deferred.reject(new Error('Pact stop failed; tried calling service 10 times with no result.'));
-                        return;
-                    }
-                    setTimeout(check, CHECKTIME);
-                }, function () { return deferred.resolve(); });
-            }
-            else {
-                deferred.resolve();
-            }
-        };
-        check();
-        return deferred.promise;
+        var checkPromise = new Promise(function (resolve, reject) {
+            var check = function () {
+                amount++;
+                if (_this.options.port) {
+                    _this.__call(_this.options).then(function () {
+                        if (amount >= RETRY_AMOUNT) {
+                            reject(new Error("Pact stop failed; tried calling service " + RETRY_AMOUNT + " times with no result."));
+                            return;
+                        }
+                        setTimeout(check, getRetryTickTime(_this.options));
+                    }, function () { return resolve(); });
+                }
+                else {
+                    resolve();
+                }
+            };
+            check();
+        });
+        return checkPromise;
     };
     AbstractService.prototype.__call = function (options) {
-        var deferred = q.defer();
-        var config = {
-            uri: "http" + (options.ssl ? 's' : '') + "://" + options.host + ":" + options.port,
-            method: 'GET',
-            headers: {
-                'X-Pact-Mock-Service': true,
-                'Content-Type': 'application/json',
-            },
-        };
-        if (options.ssl) {
-            process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
-            config.agentOptions = {};
-            config.agentOptions.rejectUnauthorized = false;
-            config.agentOptions.requestCert = false;
-            config.agentOptions.agent = false;
-        }
-        http(config, function (err, res) {
-            !err && res.statusCode === 200
-                ? deferred.resolve()
-                : deferred.reject("HTTP Error: '" + JSON.stringify(err ? err : res) + "'");
+        return new Promise(function (resolve, reject) {
+            var config = {
+                uri: "http" + (options.ssl ? 's' : '') + "://" + options.host + ":" + options.port,
+                method: 'GET',
+                headers: {
+                    'X-Pact-Mock-Service': true,
+                    'Content-Type': 'application/json',
+                },
+            };
+            if (options.ssl) {
+                process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+                config.agentOptions = {};
+                config.agentOptions.rejectUnauthorized = false;
+                config.agentOptions.requestCert = false;
+                config.agentOptions.agent = false;
+            }
+            http(config, function (err, res) {
+                !err && res.statusCode === 200
+                    ? resolve()
+                    : reject("HTTP Error: '" + JSON.stringify(err ? err : res) + "'");
+            });
         });
-        return deferred.promise;
     };
     return AbstractService;
 }(events.EventEmitter));