@contract-case/case-connector 0.20.1 → 0.22.0

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@contract-case/case-connector",
-  "version": "0.20.1",
+  "version": "0.22.0",
   "type": "module",
   "description": "Connector to allow ContractCase to run as a server. Use only if you're creating a custom wrapper for a new language",
   "author": "Timothy Jones <timothy.l.jones@gmail.com> (https://github.com/TimothyJones)",
   "homepage": "https://case.contract-testing.io/docs",
   "license": "BSD-3-Clause",
-  "main": "build/index.js",
+  "exports": {
+    ".": "./dist/src/index.js",
+    "./cjs": "./dist/cjs/src/index.cjs"
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -21,9 +24,9 @@
     "build:proto": "npm run build:proto:js && npm run build:proto:ts && npm run format:fix",
     "build:proto:js": "grpc_tools_node_protoc --js_out=import_style=commonjs,binary:src/connectors/grpc --grpc_out=grpc_js:src/connectors/grpc ./proto/contract_case_stream.proto",
     "build:proto:ts": "grpc_tools_node_protoc --js_out=import_style=commonjs,binary:src/connectors/grpc --grpc_out=grpc_js:src/connectors/grpc --plugin=protoc-gen-grpc=../../node_modules/grpc_tools_node_protoc_ts/bin/protoc-gen-ts ./proto/contract_case_stream.proto",
-    "build": "rimraf {dist,package} && tsc --project tsconfig.build.json && webpack-cli",
-    "lint": "eslint src",
-    "lint:fix": "eslint src --fix",
+    "build": "rimraf {dist,package} && duel --project tsconfig.build.json && webpack-cli",
+    "lint": "eslint",
+    "lint:fix": "eslint --fix",
     "lint:fix:proto": "protolint --fix ./proto",
     "format:base": "prettier --parser typescript \"src/**/*.ts\"",
     "format:check": "npm run format:base -- --list-different",
@@ -33,8 +36,9 @@
     "url": "https://github.com/case-contract-testing/case/issues"
   },
   "devDependencies": {
-    "@contract-case/case-maintainer-config": "0.20.1",
-    "@contract-case/eslint-config-case-maintainer": "0.20.1",
+    "@contract-case/case-maintainer-config": "0.22.0",
+    "@contract-case/eslint-config-case-maintainer": "0.22.0",
+    "@knighted/duel": "^2.0.1",
     "@types/google-protobuf": "^3.15.12",
     "@types/jest": "^29.5.12",
     "@types/uuid": "^10.0.0",
@@ -43,17 +47,18 @@
     "prettier": "3.4.2",
     "rimraf": "^6.0.1",
     "source-map-loader": "^5.0.0",
-    "terser-webpack-plugin": "^5.3.10",
+    "terser-webpack-plugin": "^5.3.14",
     "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
-    "webpack": "^5.97.1",
+    "typescript": "5.8.3",
+    "webpack": "^5.98.0",
     "webpack-cli": "^6.0.1"
   },
   "dependencies": {
-    "@contract-case/case-connector-proto": "0.20.1",
-    "@contract-case/case-core": "0.20.1",
-    "@contract-case/case-entities-internal": "0.20.1",
-    "@grpc/grpc-js": "^1.12.6",
+    "@contract-case/case-connector-proto": "0.22.0",
+    "@contract-case/case-core": "0.22.0",
+    "@contract-case/case-entities-internal": "0.22.0",
+    "@grpc/grpc-js": "^1.13.3",
     "@grpc/proto-loader": "^0.7.10",
     "get-port": "^7.1.0",
     "google-protobuf": "^3.21.4",
@@ -98,5 +103,5 @@
       }
     }
   },
-  "gitHead": "f2e874f6499ec87d403cdb34b563ebe358a38c7e"
+  "gitHead": "89046de716acf02ea727764e34e545b4d64f3fa8"
 }

package/src/connectors/grpc/contract-case-stream.mts

@@ -0,0 +1,70 @@
+import { Server, ServerCredentials } from '@grpc/grpc-js';
+import { ContractCaseService } from '@contract-case/case-connector-proto';
+import getPort from 'get-port';
+
+import { contractDefinition } from './contractDefinition.js';
+import { contractVerification } from './contractVerification.js';
+import { versionString } from '../../entities/versionString.js';
+import { maintainerLog } from '../../domain/maintainerLog.js';
+
+type ServerInfo = { port: string; address: string };
+
+const bind = (
+  server: Server,
+  host: string,
+  freePort: number,
+): Promise<ServerInfo> =>
+  new Promise((resolve, reject) => {
+    const address = `${host}:${freePort}`;
+    maintainerLog(`Attempting to bind server: ${address}`);
+    server.bindAsync(
+      address,
+      ServerCredentials.createInsecure(),
+      (error, port) => {
+        if (error != null) {
+          reject(error);
+        } else {
+          resolve({ port: `${port}`, address });
+        }
+      },
+    );
+  });
+
+/**
+ * Starts a gRPC server for defining and verifying ContractCase contracts
+ */
+export function main(): void {
+  maintainerLog(`Starting ContractCase ${versionString}`);
+  const server = new Server();
+
+  getPort().then((freePort) => {
+    server.addService(ContractCaseService, {
+      contractDefinition,
+      contractVerification,
+    });
+
+    return bind(server, '[::1]', freePort)
+      .catch((error) => {
+        maintainerLog('Server bind failed with error: ', error);
+        return bind(server, '127.0.0.1', freePort);
+      })
+      .then(
+        ({ port, address }) => {
+          maintainerLog(`Successfully started server at ${address}`);
+          // This is needed to communicate with clients
+          // Must have the port number after the `:`
+          // eslint-disable-next-line no-console
+          console.log('[SERVER]', `Started on port: ${port}`);
+        },
+        (error) => {
+          // Console used here because there's nothing sensible we can do with this error
+          // eslint-disable-next-line no-console
+          console.error(
+            `[${versionString}]`,
+            `ContractCase's internal server was unable to start: ${error}`,
+          );
+          process.exit(1);
+        },
+      );
+  });
+}

package/tsconfig.build.json

@@ -1,6 +1,11 @@
 {
   "extends": "./tsconfig.json",
-  "include": ["src/**/*.ts", "src/**/*.js", "bin/**/*.ts", "package.json"],
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.js",
+    "bin/**/*.mts",
+    "src/connectors/grpc/contract-case-stream.mts"
+  ],
   "exclude": [
     "jest.config.ts",
     "dist/**/*.js",

package/webpack.config.cjs

@@ -7,7 +7,7 @@ module.exports = {
   mode: 'production',
   entry: {
     caseconnector: {
-      import: './dist/bin/case-connector.js',
+      import: './dist/bin/case-connector.mjs',
       filename: 'case-connector.js',
     },
   },

package/dist/bin/case-connector.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"case-connector.d.ts","sourceRoot":"","sources":["../../bin/case-connector.ts"],"names":[],"mappings":";AAEA;;;;GAIG"}

package/dist/bin/case-connector.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"case-connector.js","sourceRoot":"","sources":["../../bin/case-connector.ts"],"names":[],"mappings":";AAEA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,gDAAgD,CAAC;AAEtE,IAAI,EAAE,CAAC"}

package/dist/package.json

@@ -1,101 +0,0 @@
-{
-    "name": "@contract-case/case-connector",
-    "version": "0.20.1",
-    "type": "module",
-    "description": "Connector to allow ContractCase to run as a server. Use only if you're creating a custom wrapper for a new language",
-    "author": "Timothy Jones <timothy.l.jones@gmail.com> (https://github.com/TimothyJones)",
-    "homepage": "https://case.contract-testing.io/docs",
-    "license": "BSD-3-Clause",
-    "main": "build/index.js",
-    "publishConfig": {
-        "access": "public"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+ssh://git@github.com/case-contract-testing/case.git"
-    },
-    "bin": {
-        "case-connector": "./dist/bin/case-connector.js"
-    },
-    "scripts": {
-        "build:proto": "npm run build:proto:js && npm run build:proto:ts && npm run format:fix",
-        "build:proto:js": "grpc_tools_node_protoc --js_out=import_style=commonjs,binary:src/connectors/grpc --grpc_out=grpc_js:src/connectors/grpc ./proto/contract_case_stream.proto",
-        "build:proto:ts": "grpc_tools_node_protoc --js_out=import_style=commonjs,binary:src/connectors/grpc --grpc_out=grpc_js:src/connectors/grpc --plugin=protoc-gen-grpc=../../node_modules/grpc_tools_node_protoc_ts/bin/protoc-gen-ts ./proto/contract_case_stream.proto",
-        "build": "rimraf {dist,package} && tsc --project tsconfig.build.json && webpack-cli",
-        "lint": "eslint src",
-        "lint:fix": "eslint src --fix",
-        "lint:fix:proto": "protolint --fix ./proto",
-        "format:base": "prettier --parser typescript \"src/**/*.ts\"",
-        "format:check": "npm run format:base -- --list-different",
-        "format:fix": "npm run format:base -- --write "
-    },
-    "bugs": {
-        "url": "https://github.com/case-contract-testing/case/issues"
-    },
-    "devDependencies": {
-        "@contract-case/case-maintainer-config": "0.20.1",
-        "@contract-case/eslint-config-case-maintainer": "0.20.1",
-        "@types/google-protobuf": "^3.15.12",
-        "@types/jest": "^29.5.12",
-        "@types/uuid": "^10.0.0",
-        "grpc_tools_node_protoc_ts": "^5.3.3",
-        "grpc-tools": "^1.12.4",
-        "prettier": "3.4.2",
-        "rimraf": "^6.0.1",
-        "source-map-loader": "^5.0.0",
-        "terser-webpack-plugin": "^5.3.10",
-        "ts-jest": "^29.2.5",
-        "ts-node": "^10.9.2",
-        "webpack": "^5.97.1",
-        "webpack-cli": "^6.0.1"
-    },
-    "dependencies": {
-        "@contract-case/case-core": "0.20.1",
-        "@contract-case/case-connector-proto": "0.20.1",
-        "@contract-case/case-entities-internal": "0.20.1",
-        "@grpc/grpc-js": "^1.12.6",
-        "@grpc/proto-loader": "^0.7.10",
-        "get-port": "^7.1.0",
-        "google-protobuf": "^3.21.4",
-        "pretty-format": "^29.7.0",
-        "uuid": "^11.0.2"
-    },
-    "stability": "stable",
-    "types": "build/index.d.ts",
-    "nx": {
-        "tasksRunnerOptions": {
-            "default": {
-                "runner": "nx/tasks-runners/default",
-                "options": {
-                    "cacheableOperations": [
-                        "build",
-                        "package",
-                        "lint",
-                        "format:check",
-                        "test"
-                    ]
-                }
-            }
-        },
-        "targetDefaults": {
-            "prebuild": {
-                "dependsOn": [
-                    "^prebuild"
-                ]
-            },
-            "build": {
-                "dependsOn": [
-                    "^build"
-                ],
-                "outputs": [
-                    "{projectRoot}/build"
-                ]
-            },
-            "package": {
-                "outputs": [
-                    "{projectRoot}/dist"
-                ]
-            }
-        }
-    }
-}

package/dist/src/connectors/grpc/contract-case-stream.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"contract-case-stream.d.ts","sourceRoot":"","sources":["../../../../src/connectors/grpc/contract-case-stream.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,wBAAgB,IAAI,IAAI,IAAI,CAyB3B"}

package/dist/src/connectors/grpc/contract-case-stream.js

@@ -1,32 +0,0 @@
-import { Server, ServerCredentials } from '@grpc/grpc-js';
-import { ContractCaseService } from '@contract-case/case-connector-proto';
-import getPort from 'get-port';
-import { contractDefinition } from './contractDefinition.js';
-import { contractVerification } from './contractVerification.js';
-import { versionString } from '../../versionString.js';
-/**
- * Starts a gRPC server for defining and verifying ContractCase contracts
- */
-export function main() {
-    const server = new Server();
-    getPort().then((freePort) => {
-        server.addService(ContractCaseService, {
-            contractDefinition,
-            contractVerification,
-        });
-        server.bindAsync(`0.0.0.0:${freePort}`, ServerCredentials.createInsecure(), (error, port) => {
-            if (error != null) {
-                // Console used here because there's nothing sensible we can do with this error
-                // eslint-disable-next-line no-console
-                console.error(`[${versionString}]`, `Unable to start: ${error}`);
-            }
-            else {
-                // This is needed to communicate with clients
-                // Must have the port number after the `:`
-                // eslint-disable-next-line no-console
-                console.log('[SERVER]', `Started on port: ${port}`);
-            }
-        });
-    });
-}
-//# sourceMappingURL=contract-case-stream.js.map

package/dist/src/connectors/grpc/contract-case-stream.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"contract-case-stream.js","sourceRoot":"","sources":["../../../../src/connectors/grpc/contract-case-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,OAAO,MAAM,UAAU,CAAC;AAE/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD;;GAEG;AACH,MAAM,UAAU,IAAI;IAClB,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;IAE5B,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC1B,MAAM,CAAC,UAAU,CAAC,mBAAmB,EAAE;YACrC,kBAAkB;YAClB,oBAAoB;SACrB,CAAC,CAAC;QACH,MAAM,CAAC,SAAS,CACd,WAAW,QAAQ,EAAE,EACrB,iBAAiB,CAAC,cAAc,EAAE,EAClC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACd,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;gBAClB,+EAA+E;gBAC/E,sCAAsC;gBACtC,OAAO,CAAC,KAAK,CAAC,IAAI,aAAa,GAAG,EAAE,oBAAoB,KAAK,EAAE,CAAC,CAAC;YACnE,CAAC;iBAAM,CAAC;gBACN,6CAA6C;gBAC7C,0CAA0C;gBAC1C,sCAAsC;gBACtC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,oBAAoB,IAAI,EAAE,CAAC,CAAC;YACtD,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/src/versionString.d.ts

@@ -1,2 +0,0 @@
-export declare const versionString: string;
-//# sourceMappingURL=versionString.d.ts.map

package/dist/src/versionString.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"versionString.d.ts","sourceRoot":"","sources":["../../src/versionString.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,aAAa,EAAE,MAGL,CAAC"}

package/dist/src/versionString.js

@@ -1,5 +0,0 @@
-import packageJson from '../package.json';
-export const versionString = packageJson.version != null
-    ? `case-connector@${packageJson.version}`
-    : 'UNKNOWN-VERSION';
-//# sourceMappingURL=versionString.js.map

package/dist/src/versionString.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"versionString.js","sourceRoot":"","sources":["../../src/versionString.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,iBAAiB,CAAC;AAE1C,MAAM,CAAC,MAAM,aAAa,GACxB,WAAW,CAAC,OAAO,IAAI,IAAI;IACzB,CAAC,CAAC,kBAAkB,WAAW,CAAC,OAAO,EAAE;IACzC,CAAC,CAAC,iBAAiB,CAAC"}