diff --git a/aqua-examples/aqua-ipfs-integration/nodejs/package.json b/aqua-examples/aqua-ipfs-integration/nodejs/package.json index 95abffb..564d7c5 100644 --- a/aqua-examples/aqua-ipfs-integration/nodejs/package.json +++ b/aqua-examples/aqua-ipfs-integration/nodejs/package.json @@ -5,6 +5,7 @@ "main": "dist/index.js", "scripts": { "build": "tsc", + "prestart": "npm run build", "start:local": "node dist/demo.js local", "start:remote": "node dist/demo.js krasnodar", "start": "npm run start:remote" diff --git a/aqua-examples/aqua-ipfs-integration/nodejs/src/demo.ts b/aqua-examples/aqua-ipfs-integration/nodejs/src/demo.ts index e477c84..94ee210 100644 --- a/aqua-examples/aqua-ipfs-integration/nodejs/src/demo.ts +++ b/aqua-examples/aqua-ipfs-integration/nodejs/src/demo.ts @@ -34,7 +34,10 @@ import { globSource, urlSource } from "ipfs-http-client"; async function main(environment: Node[]) { // setLogLevel('DEBUG'); - let providerHost = environment[0]; + let providerHost = environment[4]; + let relay = environment[3]; + let serviceHost = environment[2]; + let providerClient = new FluencePeer(); await providerClient.start({ connectTo: providerHost }); console.log("šŸ“˜ uploading .wasm to node %s", providerHost.multiaddr); @@ -43,7 +46,7 @@ async function main(environment: Node[]) { console.log("šŸ“— swarmAddr", swarmAddr); console.log("šŸ“— rpcAddr", rpcAddr); - await Fluence.start({ connectTo: environment[1] }); + await Fluence.start({ connectTo: relay }); console.log( "šŸ“— created a fluence client %s with relay %s", Fluence.getStatus().peerId, @@ -51,11 +54,11 @@ async function main(environment: Node[]) { ); // default IPFS timeout is 1 sec, set to 10 secs to retrieve file from remote node - await set_timeout(environment[2].peerId, 10); + await set_timeout(serviceHost.peerId, 10); console.log("\n\nšŸ“˜ Will deploy ProcessFiles service"); var service_id = await deploy_service( - environment[2].peerId, + serviceHost.peerId, file.cid.toString(), rpcAddr, (label, error) => { @@ -79,7 +82,7 @@ async function main(environment: Node[]) { providerClient ); var putResult = await put_file_size( - environment[2].peerId, + serviceHost.peerId, newFile.cid.toString(), rpcAddr, service_id, @@ -94,7 +97,7 @@ async function main(environment: Node[]) { console.log("šŸ“— File size is saved to IPFS:", putResult); } - let result = await remove_service(environment[2].peerId, service_id); + let result = await remove_service(serviceHost.peerId, service_id); console.log("šŸ“— ProcessFiles service removed", result); return; } diff --git a/aqua-examples/aqua-ipfs-integration/web/src/appLogic.ts b/aqua-examples/aqua-ipfs-integration/web/src/appLogic.ts index 8b31bfe..b58d214 100644 --- a/aqua-examples/aqua-ipfs-integration/web/src/appLogic.ts +++ b/aqua-examples/aqua-ipfs-integration/web/src/appLogic.ts @@ -20,7 +20,7 @@ import { } from "./appState"; import { decapsulateP2P, fromOption } from "./util"; -export const relayNodes = [krasnodar[0], krasnodar[1], krasnodar[2]]; +export const relayNodes = [krasnodar[2], krasnodar[3], krasnodar[4]]; const requestRpcAddr = async () => { let result = await get_external_api_multiaddr( @@ -122,13 +122,15 @@ export const useRemoveService = () => { const setFileSizeCID = useSetRecoilState(fileSizeCIDState); return async () => { - if (isConnected || serviceId === null) { + console.dir(isConnected, serviceId); + if (!isConnected || serviceId === null) { return; } - + await remove_service(relay!, serviceId, { ttl: 10000, }); + console.log(`Service ${serviceId} was removed`); setServiceId(null); setFileCID(null); setFileSize(null); diff --git a/aqua-examples/aqua-ipfs-integration/web/src/appState.ts b/aqua-examples/aqua-ipfs-integration/web/src/appState.ts index bc0e29b..546a82d 100644 --- a/aqua-examples/aqua-ipfs-integration/web/src/appState.ts +++ b/aqua-examples/aqua-ipfs-integration/web/src/appState.ts @@ -22,7 +22,7 @@ export const serviceIdState = atom({ export const wasmState = atom({ key: "serviceState", - default: "Qmf8fH2cDZXGKS9uDGBcHxv5uQ51ChrigdZKe3QxS2C1AF", + default: "QmSvjkzXbXYwFXcWuFWqFdksvQDgpCeADNxkgkfzCLA4rk", }); export const rpcAddrState = atom({ @@ -32,7 +32,7 @@ export const rpcAddrState = atom({ export const fileCIDState = atom({ key: "fileCIDState", - default: "Qmf8fH2cDZXGKS9uDGBcHxv5uQ51ChrigdZKe3QxS2C1AF", + default: "QmSvjkzXbXYwFXcWuFWqFdksvQDgpCeADNxkgkfzCLA4rk", }); export const fileSizeState = atom({