build(deps): wip replace packages

Signed-off-by: Michal Bajer <michal.bajer@fujitsu.com>
petermetz · Nov 9, 2023 · 18b9c87 · 18b9c87
1 parent acde2a5
commit 18b9c87
Show file tree

Hide file tree

Showing 22 changed files with 66 additions and 39 deletions.
diff --git a/extensions/cactus-plugin-object-store-ipfs/README.md b/extensions/cactus-plugin-object-store-ipfs/README.md
@@ -46,7 +46,7 @@ This plugin uses OpenAPI to generate the API paths. There are three endpoints de
 Firstly create an instance of the plugin.
 
 ```typescript
-import { create } from "ipfs-http-client";
+import { create } from "kubo-rpc-client";
 
 const logLevel: LogLevelDesc = "TRACE";
 const ipfsClientOrOptions = create();

diff --git a/packages/cactus-plugin-odap-hermes/package.json b/packages/cactus-plugin-odap-hermes/package.json
@@ -68,12 +68,12 @@
     "web3-utils": "1.6.1"
   },
   "devDependencies": {
+    "@hyperledger/cacti-esm-compat-hacks": "2.0.0-alpha.2",
     "@types/crypto-js": "4.0.1",
     "@types/express": "4.17.19",
     "@types/tape": "4.13.4",
     "crypto-js": "4.2.0",
     "fabric-network": "2.2.19",
-    "ipfs-http-client": "60.0.1",
     "typescript": "4.9.5"
   },
   "engines": {

diff --git a/...gin-odap-hermes/src/test/typescript/integration/backup-gateway-after-client-crash.test.ts b/...gin-odap-hermes/src/test/typescript/integration/backup-gateway-after-client-crash.test.ts
@@ -5,7 +5,6 @@ import { Server as SocketIoServer } from "socket.io";
 import { AddressInfo } from "net";
 import { v4 as uuidv4 } from "uuid";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
-import { create } from "ipfs-http-client";
 import bodyParser from "body-parser";
 import express from "express";
 import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -53,6 +52,7 @@ import {
   ReceiptType,
   Web3SigningCredential,
 } from "@hyperledger/cactus-plugin-ledger-connector-besu";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
 import Web3 from "web3";
 
 import { makeSessionDataChecks } from "../make-checks";
@@ -161,7 +161,8 @@ beforeAll(async () => {
 
     const ipfsApiUrl = await ipfsContainer.getApiUrl();
 
-    const ipfsClientOrOptions = create({
+    const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+    const ipfsClientOrOptions = kuboRpcModule.create({
       url: ipfsApiUrl,
     });
 

diff --git a/...lugin-odap-hermes/src/test/typescript/integration/client-crash-after-delete-asset.test.ts b/...lugin-odap-hermes/src/test/typescript/integration/client-crash-after-delete-asset.test.ts
@@ -5,7 +5,6 @@ import { Server as SocketIoServer } from "socket.io";
 import { AddressInfo } from "net";
 import { v4 as uuidv4 } from "uuid";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
-import { create } from "ipfs-http-client";
 import bodyParser from "body-parser";
 import express from "express";
 import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -52,6 +51,7 @@ import {
   ReceiptType,
   Web3SigningCredential,
 } from "@hyperledger/cactus-plugin-ledger-connector-besu";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
 import Web3 from "web3";
 
 import { makeSessionDataChecks } from "../make-checks";
@@ -158,7 +158,8 @@ beforeAll(async () => {
 
     const ipfsApiUrl = await ipfsContainer.getApiUrl();
 
-    const ipfsClientOrOptions = create({
+    const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+    const ipfsClientOrOptions = kuboRpcModule.create({
       url: ipfsApiUrl,
     });
 

diff --git a/...-plugin-odap-hermes/src/test/typescript/integration/client-crash-after-lock-asset.test.ts b/...-plugin-odap-hermes/src/test/typescript/integration/client-crash-after-lock-asset.test.ts
@@ -5,7 +5,6 @@ import { Server as SocketIoServer } from "socket.io";
 import { AddressInfo } from "net";
 import { v4 as uuidv4 } from "uuid";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
-import { create } from "ipfs-http-client";
 import bodyParser from "body-parser";
 import express from "express";
 import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -52,6 +51,7 @@ import {
   ReceiptType,
   Web3SigningCredential,
 } from "@hyperledger/cactus-plugin-ledger-connector-besu";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
 import Web3 from "web3";
 
 import { makeSessionDataChecks } from "../make-checks";
@@ -158,7 +158,8 @@ beforeAll(async () => {
 
     const ipfsApiUrl = await ipfsContainer.getApiUrl();
 
-    const ipfsClientOrOptions = create({
+    const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+    const ipfsClientOrOptions = kuboRpcModule.create({
       url: ipfsApiUrl,
     });
 

diff --git a/...dap-hermes/src/test/typescript/integration/client-crash-after-transfer-initiation.test.ts b/...dap-hermes/src/test/typescript/integration/client-crash-after-transfer-initiation.test.ts
@@ -3,7 +3,6 @@ import type { AddressInfo } from "net";
 import { v4 as uuidv4 } from "uuid";
 import "jest-extended";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
-import { create } from "ipfs-http-client";
 import bodyParser from "body-parser";
 import express, { Express } from "express";
 import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -19,6 +18,7 @@ import {
   PluginOdapGateway,
 } from "../../../main/typescript/gateway/plugin-odap-gateway";
 import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
 import {
   AssetProfile,
   ClientV1Request,
@@ -93,7 +93,8 @@ beforeAll(async () => {
 
     const ipfsApiUrl = await ipfsContainer.getApiUrl();
 
-    const ipfsClientOrOptions = create({
+    const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+    const ipfsClientOrOptions = kuboRpcModule.create({
       url: ipfsApiUrl,
     });
 

diff --git a/...n-odap-hermes/src/test/typescript/integration/odap-api-call-with-ledger-connector.test.ts b/...n-odap-hermes/src/test/typescript/integration/odap-api-call-with-ledger-connector.test.ts
@@ -5,7 +5,6 @@ import { Server as SocketIoServer } from "socket.io";
 import { AddressInfo } from "net";
 import { v4 as uuidv4 } from "uuid";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
-import { create } from "ipfs-http-client";
 import bodyParser from "body-parser";
 import express from "express";
 import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -53,6 +52,7 @@ import {
   PluginFactoryLedgerConnector,
   Web3SigningCredential,
 } from "@hyperledger/cactus-plugin-ledger-connector-besu";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
 
 import { makeSessionDataChecks } from "../make-checks";
 import {
@@ -65,6 +65,7 @@ import {
 } from "../../../main/typescript/gateway/besu-odap-gateway";
 import { ClientGatewayHelper } from "../../../main/typescript/gateway/client/client-helper";
 import { ServerGatewayHelper } from "../../../main/typescript/gateway/server/server-helper";
+
 /**
  * Use this to debug issues with the fabric node SDK
  * ```sh
@@ -152,7 +153,8 @@ beforeAll(async () => {
 
     const ipfsApiUrl = await ipfsContainer.getApiUrl();
 
-    const ipfsClientOrOptions = create({
+    const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+    const ipfsClientOrOptions = kuboRpcModule.create({
       url: ipfsApiUrl,
     });
 

diff --git a/packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap-api-call.test.ts b/packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap-api-call.test.ts
@@ -3,7 +3,6 @@ import type { AddressInfo } from "net";
 import { v4 as uuidv4 } from "uuid";
 import "jest-extended";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
-import { create } from "ipfs-http-client";
 import bodyParser from "body-parser";
 import express from "express";
 import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -18,6 +17,8 @@ import {
 import { Configuration } from "@hyperledger/cactus-core-api";
 
 import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
+
 import {
   PluginOdapGateway,
   IPluginOdapGatewayConstructorOptions,
@@ -33,6 +34,7 @@ import { FabricOdapGateway } from "../../../main/typescript/gateway/fabric-odap-
 import { ClientGatewayHelper } from "../../../main/typescript/gateway/client/client-helper";
 import { ServerGatewayHelper } from "../../../main/typescript/gateway/server/server-helper";
 
+
 const MAX_RETRIES = 5;
 const MAX_TIMEOUT = 5000;
 
@@ -78,7 +80,8 @@ beforeAll(async () => {
 
   const ipfsApiUrl = await ipfsContainer.getApiUrl();
 
-  const ipfsClientOrOptions = create({
+  const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+  const ipfsClientOrOptions = kuboRpcModule.create({
     url: ipfsApiUrl,
   });
 

diff --git a/packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap-rollback.test.ts b/packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap-rollback.test.ts
@@ -5,7 +5,6 @@ import { Server as SocketIoServer } from "socket.io";
 import { AddressInfo } from "net";
 import { v4 as uuidv4 } from "uuid";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
-import { create } from "ipfs-http-client";
 import bodyParser from "body-parser";
 import express from "express";
 import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -52,6 +51,7 @@ import {
   ReceiptType,
   Web3SigningCredential,
 } from "@hyperledger/cactus-plugin-ledger-connector-besu";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
 import Web3 from "web3";
 
 import {
@@ -155,7 +155,8 @@ beforeAll(async () => {
 
     const ipfsApiUrl = await ipfsContainer.getApiUrl();
 
-    const ipfsClientOrOptions = create({
+    const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+    const ipfsClientOrOptions = kuboRpcModule.create({
       url: ipfsApiUrl,
     });
 

diff --git a/packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap.test.ts b/packages/cactus-plugin-odap-hermes/src/test/typescript/integration/odap.test.ts
@@ -3,7 +3,6 @@ import type { AddressInfo } from "net";
 import { v4 as uuidv4 } from "uuid";
 import "jest-extended";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
-import { create } from "ipfs-http-client";
 import bodyParser from "body-parser";
 import express from "express";
 import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -16,6 +15,7 @@ import { v4 as uuidV4 } from "uuid";
 import { Configuration } from "@hyperledger/cactus-core-api";
 import { PluginOdapGateway } from "../../../main/typescript/gateway/plugin-odap-gateway";
 import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
 import {
   AssetProfile,
   ClientV1Request,
@@ -66,7 +66,8 @@ beforeAll(async () => {
 
   const ipfsApiUrl = await ipfsContainer.getApiUrl();
 
-  const ipfsClientOrOptions = create({
+  const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+  const ipfsClientOrOptions = kuboRpcModule.create({
     url: ipfsApiUrl,
   });
 

diff --git a/...lugin-odap-hermes/src/test/typescript/integration/server-crash-after-create-asset.test.ts b/...lugin-odap-hermes/src/test/typescript/integration/server-crash-after-create-asset.test.ts
@@ -5,7 +5,6 @@ import { Server as SocketIoServer } from "socket.io";
 import { AddressInfo } from "net";
 import { v4 as uuidv4 } from "uuid";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
-import { create } from "ipfs-http-client";
 import bodyParser from "body-parser";
 import express from "express";
 import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -52,6 +51,7 @@ import {
   ReceiptType,
   Web3SigningCredential,
 } from "@hyperledger/cactus-plugin-ledger-connector-besu";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
 import Web3 from "web3";
 
 import { makeSessionDataChecks } from "../make-checks";
@@ -157,7 +157,8 @@ beforeAll(async () => {
 
     const ipfsApiUrl = await ipfsContainer.getApiUrl();
 
-    const ipfsClientOrOptions = create({
+    const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+    const ipfsClientOrOptions = kuboRpcModule.create({
       url: ipfsApiUrl,
     });
 

diff --git a/...dap-hermes/src/test/typescript/integration/server-crash-after-transfer-initiation.test.ts b/...dap-hermes/src/test/typescript/integration/server-crash-after-transfer-initiation.test.ts
@@ -3,7 +3,6 @@ import type { AddressInfo } from "net";
 import { v4 as uuidv4 } from "uuid";
 import "jest-extended";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
-import { create } from "ipfs-http-client";
 import bodyParser from "body-parser";
 import express, { Express } from "express";
 import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -15,6 +14,7 @@ import {
 } from "@hyperledger/cactus-common";
 import { Configuration } from "@hyperledger/cactus-core-api";
 import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
 import {
   AssetProfile,
   ClientV1Request,
@@ -93,7 +93,8 @@ beforeAll(async () => {
 
     const ipfsApiUrl = await ipfsContainer.getApiUrl();
 
-    const ipfsClientOrOptions = create({
+    const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+    const ipfsClientOrOptions = kuboRpcModule.create({
       url: ipfsApiUrl,
     });
 

diff --git a/packages/cactus-plugin-odap-hermes/src/test/typescript/unit/client/commit-final.test.ts b/packages/cactus-plugin-odap-hermes/src/test/typescript/unit/client/commit-final.test.ts
@@ -3,7 +3,6 @@ import { SHA256 } from "crypto-js";
 import bodyParser from "body-parser";
 import { v4 as uuidv4 } from "uuid";
 import http, { Server } from "http";
-import { create } from "ipfs-http-client";
 import {
   OdapMessageType,
   PluginOdapGateway,
@@ -21,6 +20,7 @@ import {
 import { Configuration } from "@hyperledger/cactus-core-api";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
 import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
 import express from "express";
 import { AddressInfo } from "net";
 
@@ -76,7 +76,8 @@ beforeAll(async () => {
 
   const ipfsApiUrl = await ipfsContainer.getApiUrl();
 
-  const ipfsClientOrOptions = create({
+  const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+  const ipfsClientOrOptions = kuboRpcModule.create({
     url: ipfsApiUrl,
   });
 

diff --git a/packages/cactus-plugin-odap-hermes/src/test/typescript/unit/recovery/logging.test.ts b/packages/cactus-plugin-odap-hermes/src/test/typescript/unit/recovery/logging.test.ts
@@ -3,7 +3,6 @@ import type { AddressInfo } from "net";
 import { v4 as uuidv4 } from "uuid";
 import "jest-extended";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
-import { create } from "ipfs-http-client";
 import bodyParser from "body-parser";
 import express from "express";
 import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -17,6 +16,8 @@ import { v4 as uuidV4 } from "uuid";
 import { Configuration } from "@hyperledger/cactus-core-api";
 import { PluginOdapGateway } from "../../../../main/typescript/gateway/plugin-odap-gateway";
 import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
+
 import {
   OdapLocalLog,
   SessionData,
@@ -86,7 +87,8 @@ beforeAll(async () => {
 
   const ipfsApiUrl = await ipfsContainer.getApiUrl();
 
-  const ipfsClientOrOptions = create({
+  const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+  const ipfsClientOrOptions = kuboRpcModule.create({
     url: ipfsApiUrl,
   });
 

diff --git a/packages/cactus-plugin-odap-hermes/src/test/typescript/unit/recovery/recover-success.test.ts b/packages/cactus-plugin-odap-hermes/src/test/typescript/unit/recovery/recover-success.test.ts
@@ -3,7 +3,6 @@ import type { AddressInfo } from "net";
 import { v4 as uuidv4 } from "uuid";
 import "jest-extended";
 import { PluginObjectStoreIpfs } from "@hyperledger/cactus-plugin-object-store-ipfs";
-import { create } from "ipfs-http-client";
 import bodyParser from "body-parser";
 import express from "express";
 import { DefaultApi as ObjectStoreIpfsApi } from "@hyperledger/cactus-plugin-object-store-ipfs";
@@ -16,6 +15,7 @@ import { v4 as uuidV4 } from "uuid";
 import { Configuration } from "@hyperledger/cactus-core-api";
 import { PluginOdapGateway } from "../../../../main/typescript/gateway/plugin-odap-gateway";
 import { GoIpfsTestContainer } from "@hyperledger/cactus-test-tooling";
+import { dynamicImportKuboRpcClientESMWorkaround } from "@hyperledger/cacti-esm-compat-hacks";
 import {
   RecoverSuccessV1Message,
   SessionData,
@@ -70,7 +70,8 @@ beforeAll(async () => {
   const ipfsApiUrl = await ipfsContainer.getApiUrl();
   // t.comment(`Go IPFS Test Container API URL: ${ipfsApiUrl}`);
 
-  const ipfsClientOrOptions = create({
+  const kuboRpcModule = await dynamicImportKuboRpcClientESMWorkaround();
+  const ipfsClientOrOptions = kuboRpcModule.create({
     url: ipfsApiUrl,
   });