@pact-foundation/pact-core 13.4.1-beta.1 → 13.4.1-beta.13

package/native/consumer.cc

@@ -3,6 +3,58 @@
 
 using namespace Napi;
 
+PactSpecification integerToSpecification(Napi::Env &env, uint32_t number) {
+  PactSpecification specification = PactSpecification::PactSpecification_V2;
+
+  switch(number) {
+    case 0:
+      specification = PactSpecification::PactSpecification_Unknown;
+      break;
+    case 1:
+      specification = PactSpecification::PactSpecification_V1;
+      break;
+    case 2:
+      specification = PactSpecification::PactSpecification_V1_1;
+      break;
+    case 3:
+      specification = PactSpecification::PactSpecification_V2;
+      break;
+    case 4:
+      specification = PactSpecification::PactSpecification_V3;
+      break;
+    case 5:
+      specification = PactSpecification::PactSpecification_V4;
+      break;
+    default:
+      std::string err =  "Unable to parse pact specification: ";
+      err += number;
+
+      throw Napi::Error::New(env, err);
+  }
+
+  return specification;
+}
+
+InteractionPart integerToInteractionPart(Napi::Env &env, uint32_t number) {
+  InteractionPart part = InteractionPart::InteractionPart_Request;
+
+  switch(number) {
+    case 0:
+      part = InteractionPart::InteractionPart_Request;
+      break;
+    case 1:
+      part = InteractionPart::InteractionPart_Response;
+      break;
+    default:
+      std::string err =  "Unable to parse pact interaction part: ";
+      err += number;
+
+      throw Napi::Error::New(env, err);
+  }
+
+  return part;
+}
+
 /**
  * Fetch the in-memory logger buffer contents. This will only have any contents if the `buffer`
  * sink has been configured to log to. The contents will be allocated on the heap and will need
@@ -265,12 +317,12 @@ Napi::Value PactffiWritePactFile(const Napi::CallbackInfo& info) {
   }
 
   int32_t port = info[0].As<Napi::Number>().Int32Value();
-  std::string dir = info[0].As<Napi::String>().Utf8Value();
-  bool overwrite = info[0].As<Napi::Boolean>().Value();
+  std::string dir = info[1].As<Napi::String>().Utf8Value();
+  bool overwrite = info[2].As<Napi::Boolean>().Value();
 
-  pactffi_write_pact_file(port, dir.c_str(), overwrite);
+  int32_t res = pactffi_write_pact_file(port, dir.c_str(), overwrite);
 
-  return info.Env().Undefined();
+  return Number::New(env, res);
 }
 
 /**
@@ -455,7 +507,7 @@ Napi::Value PactffiGivenWithParam(const Napi::CallbackInfo& info) {
   InteractionHandle interaction = info[0].As<Napi::Number>().Uint32Value();
   std::string description = info[1].As<Napi::String>().Utf8Value();
   std::string name = info[2].As<Napi::String>().Utf8Value();
-  std::string value = info[4].As<Napi::String>().Utf8Value();
+  std::string value = info[3].As<Napi::String>().Utf8Value();
 
   bool res = pactffi_given_with_param(interaction, description.c_str(), name.c_str(), value.c_str());
 
@@ -541,7 +593,7 @@ Napi::Value PactffiWithQueryParameter(const Napi::CallbackInfo& info) {
   InteractionHandle interaction = info[0].As<Napi::Number>().Uint32Value();
   std::string name = info[1].As<Napi::String>().Utf8Value();
   size_t index = info[2].As<Napi::Number>().Uint32Value();
-  std::string value = info[2].As<Napi::String>().Utf8Value();
+  std::string value = info[3].As<Napi::String>().Utf8Value();
 
   bool res = pactffi_with_query_parameter(interaction, name.c_str(), index, value.c_str());
 
@@ -572,19 +624,20 @@ Napi::Value PactffiWithSpecification(const Napi::CallbackInfo& info) {
   }
 
   if (!info[1].IsNumber()) {
-    throw Napi::Error::New(env, "PactffiWithSpecification(arg 1) expected a string");
+    throw Napi::Error::New(env, "PactffiWithSpecification(arg 1) expected a number");
   }
 
   PactHandle pact = info[0].As<Napi::Number>().Uint32Value();
-  PactSpecification* specification = info[1].As<External<PactSpecification>>().Data();
-  // Alternatively could just handle as ints (the rust code ensures the enum is layed out correctly) e.g.
-  // uint32 specification = info[1].As<Napi::Number>().Uint32Value();
+  uint32_t specificationNumber = info[1].As<Napi::Number>().Uint32Value();
+  PactSpecification specification = integerToSpecification(env, specificationNumber);
 
-  bool res = pactffi_with_specification(pact, *specification);
+  bool res = pactffi_with_specification(pact, specification);
 
   return Napi::Boolean::New(env, res);
 }
 
+
+
 /**
  * Sets the additional metadata on the Pact file. Common uses are to add the client library details such as the name and version
  * Returns false if the interaction or Pact can't be modified (i.e. the mock server for it has already started)
@@ -669,22 +722,22 @@ Napi::Value PactffiWithHeader(const Napi::CallbackInfo& info) {
     throw Napi::Error::New(env, "PactffiWithHeader(arg 2) expected a string");
   }
 
-  if (!info[3].IsString()) {
-    throw Napi::Error::New(env, "PactffiWithHeader(arg 3) expected a string");
+  if (!info[3].IsNumber()) {
+    throw Napi::Error::New(env, "PactffiWithHeader(arg 3) expected a number");
   }
 
   if (!info[4].IsString()) {
     throw Napi::Error::New(env, "PactffiWithHeader(arg 4) expected a string");
   }
 
-  PactHandle pact = info[0].As<Napi::Number>().Uint32Value();
-  InteractionPart* part = info[1].As<External<InteractionPart>>().Data();
-  // uint32_t part = info[1].As<Napi::Number>().Uint32Value();
+  InteractionHandle interaction = info[0].As<Napi::Number>().Uint32Value();
+  uint32_t partNumber = info[1].As<Napi::Number>().Uint32Value();
+  InteractionPart part = integerToInteractionPart(env, partNumber);
   std::string name = info[2].As<Napi::String>().Utf8Value();
   size_t index = info[3].As<Napi::Number>().Uint32Value();
-  std::string value = info[3].As<Napi::String>().Utf8Value();
+  std::string value = info[4].As<Napi::String>().Utf8Value();
 
-  bool res = pactffi_with_header(pact, *part, name.c_str(), index, value.c_str());
+  bool res = pactffi_with_header(interaction, part, name.c_str(), index, value.c_str());
 
   return Napi::Boolean::New(env, res);
 }
@@ -729,13 +782,13 @@ Napi::Value PactffiWithBody(const Napi::CallbackInfo& info) {
     throw Napi::Error::New(env, "PactffiWithBody(arg 3) expected a string");
   }
 
-  PactHandle pact = info[0].As<Napi::Number>().Uint32Value();
-  InteractionPart* part = info[1].As<External<InteractionPart>>().Data();
-  // uint32_t part = info[1].As<Napi::Number>().Uint32Value();
+  InteractionHandle interaction = info[0].As<Napi::Number>().Uint32Value();
+  uint32_t partNumber = info[1].As<Napi::Number>().Uint32Value();
+  InteractionPart part = integerToInteractionPart(env, partNumber);
   std::string contentType = info[2].As<Napi::String>().Utf8Value();
   std::string body = info[3].As<Napi::String>().Utf8Value();
 
-  bool res = pactffi_with_body(pact, *part, contentType.c_str(), body.c_str());
+  bool res = pactffi_with_body(interaction, part, contentType.c_str(), body.c_str());
 
   return Napi::Boolean::New(env, res);
 }
@@ -787,14 +840,16 @@ Napi::Value PactffiWithBinaryFile(const Napi::CallbackInfo& info) {
     throw Napi::Error::New(env, "PactffiWithBinaryFile(arg 4) expected a number");
   }
 
-  PactHandle pact = info[0].As<Napi::Number>().Uint32Value();
-  InteractionPart* part = info[1].As<External<InteractionPart>>().Data();
+  InteractionHandle interaction = info[0].As<Napi::Number>().Uint32Value();
+  uint32_t partNumber = info[1].As<Napi::Number>().Uint32Value();
+  InteractionPart part = integerToInteractionPart(env, partNumber);
+
   // uint32_t part = info[1].As<Napi::Number>().Uint32Value();
   std::string contentType = info[2].As<Napi::String>().Utf8Value();
   Napi::Buffer<uint8_t> buffer = info[3].As<Napi::Buffer<uint8_t>>();
   size_t size = info[4].As<Napi::Number>().Uint32Value();
 
-  bool res = pactffi_with_binary_file(pact, *part, contentType.c_str(), buffer.Data(), size);
+  bool res = pactffi_with_binary_file(interaction, part, contentType.c_str(), buffer.Data(), size);
 
   return Napi::Boolean::New(env, res);
 }
@@ -817,7 +872,7 @@ Napi::Value PactffiWithBinaryFile(const Napi::CallbackInfo& info) {
  *                                          InteractionPart part,
  *                                          const char *content_type,
  *                                          const char *file,
- *                                          const char *part_name);
+ *                                          const char part_name);
  */
 Napi::Value PactffiWithMultipartFile(const Napi::CallbackInfo& info) {
    // return: bool
@@ -847,14 +902,15 @@ Napi::Value PactffiWithMultipartFile(const Napi::CallbackInfo& info) {
     throw Napi::Error::New(env, "PactffiWithMultipartFile(arg 4) expected a string");
   }
 
-  PactHandle pact = info[0].As<Napi::Number>().Uint32Value();
-  InteractionPart* part = info[1].As<External<InteractionPart>>().Data();
-  // uint32_t part = info[1].As<Napi::Number>().Uint32Value();
+  InteractionHandle interaction = info[0].As<Napi::Number>().Uint32Value();
+  uint32_t partNumber = info[1].As<Napi::Number>().Uint32Value();
+  InteractionPart part = integerToInteractionPart(env, partNumber);
+
   std::string contentType = info[2].As<Napi::String>().Utf8Value();
   std::string file = info[3].As<Napi::String>().Utf8Value();
   std::string partName = info[4].As<Napi::String>().Utf8Value();
 
-  StringResult res = pactffi_with_multipart_file(pact, *part, contentType.c_str(), file.c_str(), partName.c_str());
+  StringResult res = pactffi_with_multipart_file(interaction, part, contentType.c_str(), file.c_str(), partName.c_str());
 
   // TODO: this will also break the https://github.com/pact-foundation/pact-js-core/tree/feat/ffi-consumer/src/consumer branch
   //       which expects a struct
@@ -886,8 +942,8 @@ Napi::Value PactffiResponseStatus(const Napi::CallbackInfo& info) {
     throw Napi::Error::New(env, "PactffiResponseStatus received < 2 arguments");
   }
 
-  if (!info[0].IsString()) {
-    throw Napi::Error::New(env, "PactffiResponseStatus(arg 0) expected a string");
+  if (!info[0].IsNumber()) {
+    throw Napi::Error::New(env, "PactffiResponseStatus(arg 0) expected a number");
   }
 
   if (!info[1].IsNumber()) {
@@ -895,7 +951,7 @@ Napi::Value PactffiResponseStatus(const Napi::CallbackInfo& info) {
   }
 
   InteractionHandle interaction = info[0].As<Napi::Number>().Uint32Value();
-  unsigned short status = info[0].As<Napi::Number>().Uint32Value();
+  unsigned short status = info[1].As<Napi::Number>().Uint32Value();
 
   bool res = pactffi_response_status(interaction, status);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pact-foundation/pact-core",
-  "version": "13.4.1-beta.1",
+  "version": "13.4.1-beta.13",
   "description": "Core of @pact-foundation/pact. You almost certainly don't want to depend on this directly.",
   "main": "src/index.js",
   "homepage": "https://github.com/pact-foundation/pact-js-core#readme",
@@ -39,9 +39,9 @@
     "provider",
     "verifier"
   ],
-  "author": "Michel Boudreau <michelboudreau@gmail.com> (codinghitchhiker.com)",
+  "author": "Matt Fellows <m@onegeek.com.au> (http://www.onegeek.com.au)",
   "contributors": [
-    "Matt Fellows <m@onegeek.com.au> (http://www.onegeek.com.au)"
+    "Michel Boudreau <michelboudreau@gmail.com> (codinghitchhiker.com)"
   ],
   "license": "MIT",
   "bugs": {
@@ -57,15 +57,12 @@
     "chalk": "4.1.2",
     "check-types": "7.3.0",
     "cross-spawn": "7.0.3",
-    "ffi-napi": "^4.0.3",
     "mkdirp": "1.0.0",
     "needle": "2.8.0",
     "node-addon-api": "^4.2.0",
     "pino": "6.13.1",
     "pino-pretty": "^6.0.0",
     "promise-timeout": "1.3.0",
-    "ref-napi": "^3.0.3",
-    "ref-struct-di": "^1.1.1",
     "rimraf": "2.6.2",
     "underscore": "1.12.1",
     "unixify": "1.0.0"
@@ -81,7 +78,6 @@
     "@types/cross-spawn": "^6.0.1",
     "@types/decompress": "^4.2.3",
     "@types/express": "4.11.1",
-    "@types/ffi-napi": "^2.4.3",
     "@types/jest": "^27.0.2",
     "@types/mkdirp": "^0.5.2",
     "@types/mocha": "9.0.0",
@@ -96,6 +92,7 @@
     "@types/url-join": "^4.0.0",
     "@typescript-eslint/eslint-plugin": "^5.2.0",
     "@typescript-eslint/parser": "^5.2.0",
+    "axios": "^0.24.0",
     "basic-auth": "2.0.0",
     "body-parser": "1.18.2",
     "chai": "4.1.2",
@@ -106,10 +103,10 @@
     "eslint": "^8.1.0",
     "eslint-config-prettier": "^8.3.0",
     "express": "4.16.2",
+    "form-data": "^4.0.0",
     "jest": "^27.3.1",
     "mocha": "^9.1.3",
     "nodemon": "^2.0.4",
-    "prebuildify": "^5.0.0",
     "prettier": "^2.3.0",
     "sinon": "9.2.4",
     "snyk": "^1.747.0",
@@ -121,7 +118,7 @@
   "scripts": {
     "clean": "rimraf '{src,test,bin,standalone}/**/*.{js,map,d.ts}' 'package.zip' '.tmp' 'tmp'",
     "lint": "eslint . --ext .ts --config .eslintrc",
-    "prebuild": "npm run clean",
+    "prebuild": "npm run clean && bash script/download-libs.sh",
     "build": "tsc",
     "prerelease": "npm run snyk-protect",
     "release": "standard-version",

package/src/consumer/__testoutput__/foo-consumer-bar-provider.json

@@ -0,0 +1,255 @@
+{
+  "consumer": {
+    "name": "foo-consumer"
+  },
+  "interactions": [
+    {
+      "description": "a request to create a dog with binary data",
+      "providerStates": [
+        {
+          "name": "fido exists"
+        }
+      ],
+      "request": {
+        "body": "H4sIAAAAAAAAEyvJyCxWAKLEPIXUvOT8lNQUheKSosy8dADqFSK8GQAAAA==",
+        "headers": {
+          "Content-Type": "application/octet-stream",
+          "x-special-header": "header"
+        },
+        "matchingRules": {
+          "body": {
+            "$": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "contentType",
+                  "value": "application/gzip"
+                }
+              ]
+            }
+          },
+          "header": {},
+          "query": {}
+        },
+        "method": "POST",
+        "path": "/dogs/1234",
+        "query": {
+          "someParam": [
+            "someValue"
+          ]
+        }
+      },
+      "response": {
+        "body": {
+          "age": 23,
+          "alive": true,
+          "name": "fido"
+        },
+        "headers": {
+          "Content-Type": "application/json",
+          "x-special-response-header": "header"
+        },
+        "matchingRules": {
+          "body": {
+            "$.age": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "type"
+                }
+              ]
+            },
+            "$.alive": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "type"
+                }
+              ]
+            },
+            "$.name": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "type"
+                }
+              ]
+            }
+          },
+          "header": {}
+        },
+        "status": 200
+      }
+    },
+    {
+      "description": "a request to get a create with JSON data",
+      "providerStates": [
+        {
+          "name": "fido exists"
+        }
+      ],
+      "request": {
+        "headers": {
+          "x-special-header": "header"
+        },
+        "method": "POST",
+        "path": "/dogs/1234",
+        "query": {
+          "someParam": [
+            "someValue"
+          ]
+        }
+      },
+      "response": {
+        "body": {
+          "age": 23,
+          "alive": true,
+          "name": "fido"
+        },
+        "headers": {
+          "Content-Type": "application/json",
+          "x-special-response-header": "header"
+        },
+        "matchingRules": {
+          "body": {
+            "$.age": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "type"
+                }
+              ]
+            },
+            "$.alive": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "type"
+                }
+              ]
+            },
+            "$.id": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "type"
+                }
+              ]
+            },
+            "$.name": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "type"
+                }
+              ]
+            }
+          },
+          "header": {}
+        },
+        "status": 200
+      }
+    },
+    {
+      "description": "a request to get a dog with multipart data",
+      "providerStates": [
+        {
+          "name": "fido exists"
+        }
+      ],
+      "request": {
+        "body": "--UYYelOPUUVAA5RHD\r\nContent-Disposition: form-data; name=\"my_file\"; filename=\"monkeypatch.rb\"\r\nContent-Type: application/octet-stream\r\n\r\ndef Filelock(lockname, options = {}, &block)\n  puts \"Opening file without filelock\"\n  File.open(lockname, File::RDWR|File::CREAT, 0644) do |file|\n    Timeout::timeout(options.fetch(:timeout, 60), Filelock::ExecTimeout) { yield file }\n  end\nend\n\r\n--UYYelOPUUVAA5RHD--\r\n",
+        "headers": {
+          "Content-Type": "multipart/form-data; boundary=UYYelOPUUVAA5RHD",
+          "x-special-header": "header"
+        },
+        "matchingRules": {
+          "body": {
+            "$.my_file": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "contentType",
+                  "value": "text/plain"
+                }
+              ]
+            }
+          },
+          "header": {
+            "Content-Type": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "regex",
+                  "regex": "multipart/form-data;(\\s*charset=[^;]*;)?\\s*boundary=.*"
+                }
+              ]
+            }
+          },
+          "query": {}
+        },
+        "method": "POST",
+        "path": "/dogs/1234",
+        "query": {
+          "someParam": [
+            "someValue"
+          ]
+        }
+      },
+      "response": {
+        "body": {
+          "age": 23,
+          "alive": true,
+          "name": "fido"
+        },
+        "headers": {
+          "Content-Type": "application/json",
+          "x-special-header": "header"
+        },
+        "matchingRules": {
+          "body": {
+            "$.age": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "type"
+                }
+              ]
+            },
+            "$.alive": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "type"
+                }
+              ]
+            },
+            "$.name": {
+              "combine": "AND",
+              "matchers": [
+                {
+                  "match": "type"
+                }
+              ]
+            }
+          },
+          "header": {}
+        },
+        "status": 200
+      }
+    }
+  ],
+  "metadata": {
+    "pactRust": {
+      "ffi": "0.2.2",
+      "mockserver": "0.8.7",
+      "models": "0.2.7"
+    },
+    "pactSpecification": {
+      "version": "3.0.0"
+    }
+  },
+  "provider": {
+    "name": "bar-provider"
+  }
+}

package/src/consumer/index.d.ts

@@ -1,3 +1,4 @@
 import { FfiSpecificationVersion } from '../ffi/types';
 import { ConsumerPact } from './types';
 export declare const makeConsumerPact: (consumer: string, provider: string, version?: FfiSpecificationVersion, logLevel?: import("..").LogLevel) => ConsumerPact;
+export * from './types';