@pact-foundation/pact-core 13.15.0 → 14.0.1
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.
- package/.cirrus.yml +2 -1
- package/CHANGELOG.md +19 -0
- package/package.json +3 -3
- package/prebuilds/darwin-arm64/node.napi.node +0 -0
- package/prebuilds/darwin-x64/node.napi.node +0 -0
- package/prebuilds/win32-x64/node.napi.node +0 -0
- package/src/ffi/index.js +19 -15
- package/src/ffi/index.js.map +1 -1
- package/src/verifier/nativeVerifier.js +1 -1
- package/src/verifier/nativeVerifier.js.map +1 -1
package/.cirrus.yml
CHANGED
|
@@ -21,10 +21,10 @@ PREBUILD_AND_TEST: &PREBUILD_AND_TEST
|
|
|
21
21
|
test_16_script: NODE_VERSION=16 script/ci/build-and-test.sh && script/ci/clean.sh
|
|
22
22
|
|
|
23
23
|
linux_arm_task:
|
|
24
|
+
only_if: $CIRRUS_CHANGE_TITLE !=~ 'chore\(release\):.*'
|
|
24
25
|
env:
|
|
25
26
|
SET_NVM: "true"
|
|
26
27
|
arm_container:
|
|
27
|
-
# container:
|
|
28
28
|
image: node:20-slim
|
|
29
29
|
cirrus_setup_script: chmod +x script/**/* && chmod +x script/**
|
|
30
30
|
setup_script: apt update --yes && apt install --yes curl python3 make build-essential g++ unzip zip git
|
|
@@ -35,6 +35,7 @@ linux_arm_task:
|
|
|
35
35
|
path: prebuilds/*.tar.gz
|
|
36
36
|
|
|
37
37
|
macos_arm_task:
|
|
38
|
+
only_if: $CIRRUS_CHANGE_TITLE !=~ 'chore\(release\):.*'
|
|
38
39
|
macos_instance:
|
|
39
40
|
image: ghcr.io/cirruslabs/macos-ventura-base:latest
|
|
40
41
|
env:
|
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,25 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
## [14.0.1](https://github.com/pact-foundation/pact-js-core/compare/v14.0.0...v14.0.1) (2023-07-07)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Fixes and Improvements
|
|
9
|
+
|
|
10
|
+
* set engines in package.json not engine ([4c9cc69](https://github.com/pact-foundation/pact-js-core/commit/4c9cc695a02c52c546c30379a92c5b9008888b4e))
|
|
11
|
+
|
|
12
|
+
## [14.0.0](https://github.com/pact-foundation/pact-js-core/compare/v13.15.0...v14.0.0) (2023-07-07)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### ⚠ BREAKING CHANGES
|
|
16
|
+
|
|
17
|
+
* drop support for node 15 and earlier
|
|
18
|
+
|
|
19
|
+
### Fixes and Improvements
|
|
20
|
+
|
|
21
|
+
* drop support for node 15 and earlier ([5fa91db](https://github.com/pact-foundation/pact-js-core/commit/5fa91db208bcceb176665722520519e4cfb5dc93))
|
|
22
|
+
* improve logging output for pact ffi native library lookup ([fb4e338](https://github.com/pact-foundation/pact-js-core/commit/fb4e3383c5fccaa03350004b4086d01ff54cf585))
|
|
23
|
+
|
|
5
24
|
## [13.15.0](https://github.com/pact-foundation/pact-js-core/compare/v13.13.9...v13.15.0) (2023-07-06)
|
|
6
25
|
|
|
7
26
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pact-foundation/pact-core",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "14.0.1",
|
|
4
4
|
"description": "Core of @pact-foundation/pact. You almost certainly don't want to depend on this directly.",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"homepage": "https://github.com/pact-foundation/pact-js-core#readme",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"ia32",
|
|
25
25
|
"arm64"
|
|
26
26
|
],
|
|
27
|
-
"
|
|
28
|
-
"node": ">=
|
|
27
|
+
"engines": {
|
|
28
|
+
"node": ">=16"
|
|
29
29
|
},
|
|
30
30
|
"repository": {
|
|
31
31
|
"type": "git",
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/src/ffi/index.js
CHANGED
|
@@ -43,7 +43,7 @@ const supportedPlatformsMessage = [
|
|
|
43
43
|
'Supported platforms are: ',
|
|
44
44
|
` - ${supportedPlatforms.join('\n - ')}`,
|
|
45
45
|
].join('\n');
|
|
46
|
-
const detectedMessage = `We detected your platform as: \n\n - ${platform}
|
|
46
|
+
const detectedMessage = `We detected your platform as: \n\n - ${platform}`;
|
|
47
47
|
logger_1.default.debug(detectedMessage);
|
|
48
48
|
if (!supportedPlatforms.includes(platform)) {
|
|
49
49
|
logger_1.default.warn(supportedPlatformsMessage);
|
|
@@ -51,7 +51,7 @@ if (!supportedPlatforms.includes(platform)) {
|
|
|
51
51
|
logger_1.default.error(`Unsupported platform: ${platform}`);
|
|
52
52
|
throw new Error(`Unsupported platform: ${platform}`);
|
|
53
53
|
}
|
|
54
|
-
const loadPathMessage = (bindingsPath) => `:
|
|
54
|
+
const loadPathMessage = (bindingsPath) => `: attempting to load native module from: \n\n - ${node_path_1.default.join(bindingsPath, 'prebuilds', platform)} ${process.env['PACT_PREBUILD_LOCATION']
|
|
55
55
|
? `\n - source: PACT_PREBUILD_LOCATION \n - You must have a supported prebuild for your platform at this location in the path ${node_path_1.default.join(process.env['PACT_PREBUILD_LOCATION'], 'prebuilds', platform)}`
|
|
56
56
|
: `\n source: pact-js-core binding lookup \n\n - You can override via PACT_PREBUILD_LOCATION\n`}`;
|
|
57
57
|
const bindingsResolver = (bindingsPath) => bindings(bindingsPath);
|
|
@@ -60,13 +60,14 @@ const bindingPaths = [
|
|
|
60
60
|
process.env['PACT_PREBUILD_LOCATION']?.toString() ?? node_path_1.default.resolve(),
|
|
61
61
|
];
|
|
62
62
|
let ffiLib;
|
|
63
|
-
const renderBinaryErrorMessage = (error
|
|
64
|
-
logger_1.default.debug(
|
|
65
|
-
logger_1.default.error(`Failed to
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
63
|
+
const renderBinaryErrorMessage = (error) => {
|
|
64
|
+
logger_1.default.debug(supportedPlatformsMessage);
|
|
65
|
+
logger_1.default.error(`Failed to find native module for ${platform}: ${error}`);
|
|
66
|
+
bindingPaths.forEach((bindingPath) => {
|
|
67
|
+
logger_1.default.debug(`We looked for a supported build in this location ${node_path_1.default.join(bindingPath ?? node_path_1.default.resolve(), 'prebuilds', platform)}`);
|
|
68
|
+
});
|
|
69
|
+
logger_1.default.debug(`Tip: check there is a prebuild for ${platform} \n
|
|
70
|
+
check the path exists\n
|
|
70
71
|
Wrong Path?: set the load path with PACT_PREBUILD_LOCATION ensuring that ${node_path_1.default.join('$PACT_PREBUILD_LOCATION', 'prebuilds', platform)} exists\n
|
|
71
72
|
- Note: You dont need to include the prebuilds/${platform} part of the path, just the parent directory\n
|
|
72
73
|
- Let us know: We can add more supported path lookups easily, chat to us on slack or raise an issue on github`);
|
|
@@ -77,22 +78,25 @@ const initialiseFfi = (logLevel) => {
|
|
|
77
78
|
logger_1.default.debug(`Initalising native core at log level '${logLevel}'`);
|
|
78
79
|
ffiLogLevel = logLevel;
|
|
79
80
|
try {
|
|
80
|
-
bindingPaths.
|
|
81
|
+
bindingPaths.every((bindingPath, i) => {
|
|
81
82
|
try {
|
|
82
|
-
logger_1.default.debug(`
|
|
83
|
+
logger_1.default.debug(`binding path #${i}: ${loadPathMessage(bindingPath)}`);
|
|
83
84
|
ffiLib = bindingsResolver(bindingPath);
|
|
84
|
-
if (
|
|
85
|
-
|
|
85
|
+
if (ffiLib.pactffiVersion() === exports.PACT_FFI_VERSION) {
|
|
86
|
+
logger_1.default.info('pact native library successfully found, and the correct version', ffiLib.pactffiVersion());
|
|
87
|
+
return false;
|
|
86
88
|
}
|
|
89
|
+
return true;
|
|
87
90
|
}
|
|
88
91
|
catch (error) {
|
|
89
|
-
|
|
92
|
+
return true;
|
|
90
93
|
}
|
|
91
94
|
});
|
|
92
95
|
ffiLib.pactffiInitWithLogLevel(logLevel);
|
|
93
96
|
}
|
|
94
97
|
catch (error) {
|
|
95
|
-
|
|
98
|
+
renderBinaryErrorMessage(error);
|
|
99
|
+
throw new Error(`Failed to load native module, try setting LOG_LEVEL=debug for more info`);
|
|
96
100
|
}
|
|
97
101
|
return ffiLib;
|
|
98
102
|
};
|
package/src/ffi/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA6B;AAC7B,2CAA4C;AAC5C,oDAAsD;AAIzC,QAAA,gBAAgB,GAAG,OAAO,CAAC;AASxC,MAAM,kBAAkB,GAAG;IACzB,cAAc;IACd,YAAY;IACZ,aAAa;IACb,WAAW;IACX,WAAW;CACZ,CAAC;AACF,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;AAEvD,MAAM,yBAAyB,GAAG;IAChC,2BAA2B;IAC3B,MAAM,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;CACzC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACb,MAAM,eAAe,GAAG,wCAAwC,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,10 +30,10 @@ const types_1 = require("../ffi/types");
|
|
|
30
30
|
const argumentMapper_1 = require("./argumentMapper");
|
|
31
31
|
const pkg = require('../../package.json');
|
|
32
32
|
const verify = (opts) => {
|
|
33
|
-
const ffi = (0, ffi_1.getFfiLib)(opts.logLevel);
|
|
34
33
|
if (opts.logLevel) {
|
|
35
34
|
(0, logger_1.setLogLevel)(opts.logLevel);
|
|
36
35
|
}
|
|
36
|
+
const ffi = (0, ffi_1.getFfiLib)(opts.logLevel);
|
|
37
37
|
const handle = ffi.pactffiVerifierNewForApplication(pkg.name.split('/')[1], pkg.version);
|
|
38
38
|
(0, argumentMapper_1.setupVerification)(ffi, handle, opts);
|
|
39
39
|
return new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nativeVerifier.js","sourceRoot":"","sources":["nativeVerifier.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAAgD;AAChD,gCAAmC;AACnC,wCAAwD;AAExD,qDAAqD;AAKrD,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEnC,MAAM,MAAM,GAAG,CAAC,IAAqB,EAAmB,EAAE;IAC/D,
|
|
1
|
+
{"version":3,"file":"nativeVerifier.js","sourceRoot":"","sources":["nativeVerifier.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,oDAAgD;AAChD,gCAAmC;AACnC,wCAAwD;AAExD,qDAAqD;AAKrD,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEnC,MAAM,MAAM,GAAG,CAAC,IAAqB,EAAmB,EAAE;IAC/D,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,IAAA,oBAAW,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;KAC5B;IACD,MAAM,GAAG,GAAG,IAAA,eAAS,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAErC,MAAM,MAAM,GAAG,GAAG,CAAC,gCAAgC,CACjD,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACtB,GAAG,CAAC,OAAO,CACZ,CAAC;IAEF,IAAA,kCAAiB,EAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAErC,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,GAAG,CAAC,sBAAsB,CAAC,MAAM,EAAE,CAAC,GAAU,EAAE,GAAW,EAAE,EAAE;YAC7D,gBAAM,CAAC,KAAK,CAAC,sCAAsC,MAAM,EAAE,CAAC,CAAC;YAE7D,GAAG,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;YAEpC,gBAAM,CAAC,KAAK,CAAC,2BAA2B,GAAG,KAAK,GAAG,EAAE,CAAC,CAAC;YACvD,IAAI,GAAG,EAAE;gBACP,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;oBAE3B,gBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACnB;qBAAM,IAAI,GAAG,CAAC,OAAO,EAAE;oBACtB,gBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;iBAC3B;gBACD,gBAAM,CAAC,SAAS,CACd,sEAAsE,CACvE,CAAC;gBACF,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,QAAQ,GAAG,EAAE;oBACX,KAAK,gCAAwB,CAAC,uBAAuB;wBACnD,gBAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;wBACvC,OAAO,CAAC,aAAa,GAAG,EAAE,CAAC,CAAC;wBAC5B,MAAM;oBACR,KAAK,gCAAwB,CAAC,mBAAmB;wBAC/C,gBAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;wBAC1C,MAAM,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;wBACxC,MAAM;oBACR,KAAK,gCAAwB,CAAC,iBAAiB;wBAC7C,gBAAM,CAAC,SAAS,CACd,mDAAmD,CACpD,CAAC;wBACF,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC;wBACpD,MAAM;oBACR;wBACE,gBAAM,CAAC,SAAS,CACd,wDAAwD,CACzD,CAAC;wBACF,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;wBACvC,MAAM;iBACT;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAzDW,QAAA,MAAM,UAyDjB"}
|