aqua ipfs nodejs (WIP)

This commit is contained in:
Pavel Murygin 2022-02-16 02:00:27 +03:00
parent 26984f3179
commit f3a0d16380
10 changed files with 48884 additions and 46505 deletions

View File

@ -0,0 +1,8 @@
module.exports = {
semi: true,
trailingComma: 'all',
singleQuote: true,
printWidth: 120,
tabWidth: 4,
useTabs: false,
};

View File

@ -0,0 +1,5 @@
module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
testPathIgnorePatterns: ['dist'],
};

View File

@ -1,41 +1,46 @@
{ {
"name": "@fluencelabs/ipfs-execution", "name": "@fluencelabs/ipfs-execution",
"version": "0.1.0", "version": "0.1.0",
"description": "An example of executing WASM code from IPFS over IPFS files", "description": "An example of executing WASM code from IPFS over IPFS files",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {
"build": "tsc", "build": "tsc",
"prestart": "npm run build", "prestart": "npm run build",
"start:local": "node dist/demo.js local", "start:local": "node dist/demo.js local",
"start:remote": "node dist/demo.js krasnodar", "start:remote": "node dist/demo.js krasnodar",
"start": "npm run start:remote" "start": "npm run start:remote",
}, "test": "jest"
"keywords": [ },
"fluence", "keywords": [
"wasm", "fluence",
"ipfs", "wasm",
"functions", "ipfs",
"faas", "functions",
"decentralization", "faas",
"p2p", "decentralization",
"libp2p" "p2p",
], "libp2p"
"author": "Fluence Labs", ],
"license": "MIT", "author": "Fluence Labs",
"dependencies": { "license": "MIT",
"@fluencelabs/ipfs-execution-aqua": "file:../aqua", "dependencies": {
"@fluencelabs/fluence": "0.19.1", "@fluencelabs/ipfs-execution-aqua": "file:../aqua",
"@fluencelabs/fluence-network-environment": "1.0.13", "@fluencelabs/fluence": "0.19.1",
"@fluencelabs/aqua-lib": "0.4.0", "@fluencelabs/fluence-network-environment": "1.0.13",
"@fluencelabs/aqua-ipfs": "0.5.2", "@fluencelabs/aqua-lib": "0.4.0",
"ipfs-http-client": "^50.1.2", "@fluencelabs/aqua-ipfs": "0.5.2",
"it-all": "^1.0.5", "ipfs-http-client": "^50.1.2",
"uint8arrays": "^2.1.5", "it-all": "^1.0.5",
"multiaddr": "^10.0.0" "uint8arrays": "^2.1.5",
}, "multiaddr": "^10.0.0"
"devDependencies": { },
"@fluencelabs/aqua": "^0.6.0-275", "devDependencies": {
"@fluencelabs/aqua-lib": "^0.4.0", "@fluencelabs/aqua": "^0.6.0-275",
"typescript": "^4.5.5" "@fluencelabs/aqua-lib": "^0.4.0",
} "typescript": "^4.5.5",
"ts-node": "^10.2.1",
"@types/jest": "^27.0.3",
"jest": "^27.4.0",
"ts-jest": "^27.0.7"
}
} }

View File

@ -0,0 +1,13 @@
import { krasnodar } from '@fluencelabs/fluence-network-environment';
import { main } from '../main';
describe('smoke test', () => {
it('should work', async () => {
console.log = jest.fn();
await main(krasnodar);
expect(console.log).toBeCalledTimes(0);
// TODO::
});
});

View File

@ -1,143 +1,27 @@
/* import { krasnodar, stage, testNet, Node } from '@fluencelabs/fluence-network-environment';
* Copyright 2020 Fluence Labs Limited import { main } from './main';
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { provideFile } from "./provider";
import { Fluence, FluencePeer, setLogLevel } from "@fluencelabs/fluence";
import {
stage,
krasnodar,
Node,
testNet,
} from "@fluencelabs/fluence-network-environment";
import {
deploy_service,
put_file_size,
remove_service,
set_timeout,
} from "@fluencelabs/ipfs-execution-aqua";
import { globSource, urlSource } from "ipfs-http-client";
async function main(environment: Node[]) {
// setLogLevel('DEBUG');
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);
let path = globSource("../service/artifacts/process_files.wasm");
let { file, swarmAddr, rpcAddr } = await provideFile(path, providerClient);
console.log("📗 swarmAddr", swarmAddr);
console.log("📗 rpcAddr", rpcAddr);
await Fluence.start({ connectTo: relay });
console.log(
"📗 created a fluence client %s with relay %s",
Fluence.getStatus().peerId,
Fluence.getStatus().relayPeerId
);
// default IPFS timeout is 1 sec, set to 10 secs to retrieve file from remote node
await set_timeout(serviceHost.peerId, 10);
console.log("\n\n📘 Will deploy ProcessFiles service");
var service_id = await deploy_service(
serviceHost.peerId,
file.cid.toString(),
rpcAddr,
(label, error) => {
console.error("📕 deploy_service failed: ", label, error);
},
{ ttl: 10000 }
);
service_id = fromOption(service_id);
if (service_id === null) {
return;
}
console.log(
"📗 ProcessFiles service is now deployed and available as",
service_id
);
console.log("\n\n📘 Will upload file & calculate its size");
let { file: newFile } = await provideFile(
urlSource("https://i.imgur.com/NZgK6DB.png"),
providerClient
);
var putResult = await put_file_size(
serviceHost.peerId,
newFile.cid.toString(),
rpcAddr,
service_id,
(fileSize) => console.log("📗 Calculated file size:", fileSize),
(label, error) => {
console.error("📕 put_file_size failed: ", label, error);
},
{ ttl: 10000 }
);
putResult = fromOption(putResult);
if (putResult !== null) {
console.log("📗 File size is saved to IPFS:", putResult);
}
let result = await remove_service(serviceHost.peerId, service_id);
console.log("📗 ProcessFiles service removed", result);
return;
}
function fromOption<T>(opt: T | T[] | null): T | null {
if (Array.isArray(opt)) {
if (opt.length === 0) {
return null;
}
opt = opt[0];
}
if (opt === null) {
return null;
}
return opt;
}
let args = process.argv.slice(2); let args = process.argv.slice(2);
var environment: Node[]; var environment: Node[];
if (args.length >= 1 && args[0] == "testnet") { if (args.length >= 1 && args[0] == 'testnet') {
environment = testNet; environment = testNet;
console.log("📘 Will connect to testNet"); console.log('📘 Will connect to testNet');
} else if (args[0] == "stage") { } else if (args[0] == 'stage') {
environment = stage; environment = stage;
console.log("📘 Will connect to stage"); console.log('📘 Will connect to stage');
} else if (args[0] == "krasnodar") { } else if (args[0] == 'krasnodar') {
environment = krasnodar; environment = krasnodar;
console.log("📘 Will connect to krasnodar"); console.log('📘 Will connect to krasnodar');
} else if (args[0] == "testnet") { } else if (args[0] == 'testnet') {
environment = testNet; environment = testNet;
console.log("📘 Will connect to testNet"); console.log('📘 Will connect to testNet');
} else { } else {
throw "Specify environment"; throw 'Specify environment';
} }
main(environment) main(environment)
.then(() => process.exit(0)) .then(() => process.exit(0))
.catch((error) => { .catch((error) => {
console.error(error); console.error(error);
process.exit(1); process.exit(1);
}); });

View File

@ -0,0 +1,102 @@
/*
* Copyright 2020 Fluence Labs Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { provideFile } from './provider';
import { Fluence, FluencePeer } from '@fluencelabs/fluence';
import { Node } from '@fluencelabs/fluence-network-environment';
import { deploy_service, put_file_size, remove_service, set_timeout } from '@fluencelabs/ipfs-execution-aqua';
import { globSource, urlSource } from 'ipfs-http-client';
export async function main(environment: Node[]) {
// setLogLevel('DEBUG');
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);
let path = globSource('../service/artifacts/process_files.wasm');
let { file, swarmAddr, rpcAddr } = await provideFile(path, providerClient);
console.log('📗 swarmAddr', swarmAddr);
console.log('📗 rpcAddr', rpcAddr);
await Fluence.start({ connectTo: relay });
console.log(
'📗 created a fluence client %s with relay %s',
Fluence.getStatus().peerId,
Fluence.getStatus().relayPeerId,
);
// default IPFS timeout is 1 sec, set to 10 secs to retrieve file from remote node
await set_timeout(serviceHost.peerId, 10);
console.log('\n\n📘 Will deploy ProcessFiles service');
var service_id = await deploy_service(
serviceHost.peerId,
file.cid.toString(),
rpcAddr,
(label, error) => {
console.error('📕 deploy_service failed: ', label, error);
},
{ ttl: 10000 },
);
service_id = fromOption(service_id);
if (service_id === null) {
return;
}
console.log('📗 ProcessFiles service is now deployed and available as', service_id);
console.log('\n\n📘 Will upload file & calculate its size');
let { file: newFile } = await provideFile(urlSource('https://i.imgur.com/NZgK6DB.png'), providerClient);
var putResult = await put_file_size(
serviceHost.peerId,
newFile.cid.toString(),
rpcAddr,
service_id,
(fileSize) => console.log('📗 Calculated file size:', fileSize),
(label, error) => {
console.error('📕 put_file_size failed: ', label, error);
},
{ ttl: 10000 },
);
putResult = fromOption(putResult);
if (putResult !== null) {
console.log('📗 File size is saved to IPFS:', putResult);
}
let result = await remove_service(serviceHost.peerId, service_id);
console.log('📗 ProcessFiles service removed', result);
return;
}
function fromOption<T>(opt: T | T[] | null): T | null {
if (Array.isArray(opt)) {
if (opt.length === 0) {
return null;
}
opt = opt[0];
}
if (opt === null) {
return null;
}
return opt;
}

View File

@ -1,65 +1,50 @@
import { create, CID } from "ipfs-http-client"; import { create, CID } from 'ipfs-http-client';
import { AddResult } from "ipfs-core-types/src/root"; import { AddResult } from 'ipfs-core-types/src/root';
import { Multiaddr, protocols } from "multiaddr"; import { Multiaddr, protocols } from 'multiaddr';
import { FluencePeer } from "@fluencelabs/fluence"; import { FluencePeer } from '@fluencelabs/fluence';
import { import { get_external_api_multiaddr, get_external_swarm_multiaddr } from '@fluencelabs/ipfs-execution-aqua';
get_external_api_multiaddr,
get_external_swarm_multiaddr,
} from "@fluencelabs/ipfs-execution-aqua";
export async function provideFile( export async function provideFile(
source: any, source: any,
provider: FluencePeer provider: FluencePeer,
): Promise<{ file: AddResult; swarmAddr: string; rpcAddr: string }> { ): Promise<{ file: AddResult; swarmAddr: string; rpcAddr: string }> {
const relayPeerId = provider.getStatus().relayPeerId!; const relayPeerId = provider.getStatus().relayPeerId!;
let swarmAddr; let swarmAddr;
let result = await get_external_swarm_multiaddr( let result = await get_external_swarm_multiaddr(provider, provider.getStatus().relayPeerId!, { ttl: 20000 });
provider, if (result.success) {
provider.getStatus().relayPeerId!, swarmAddr = result.multiaddr;
{ ttl: 20000 } } else {
); console.error('Failed to retrieve external swarm multiaddr from %s: ', provider.getStatus().relayPeerId!);
if (result.success) { throw result.error;
swarmAddr = result.multiaddr; }
} else {
console.error(
"Failed to retrieve external swarm multiaddr from %s: ",
provider.getStatus().relayPeerId!
);
throw result.error;
}
let rpcAddr; let rpcAddr;
result = await get_external_api_multiaddr(provider, relayPeerId); result = await get_external_api_multiaddr(provider, relayPeerId);
if (result.success) { if (result.success) {
rpcAddr = result.multiaddr; rpcAddr = result.multiaddr;
} else { } else {
console.error( console.error('Failed to retrieve external api multiaddr from %s: ', relayPeerId);
"Failed to retrieve external api multiaddr from %s: ", throw result.error;
relayPeerId }
);
throw result.error;
}
let rpcMaddr = new Multiaddr(rpcAddr).decapsulateCode( let rpcMaddr = new Multiaddr(rpcAddr).decapsulateCode(protocols.names.p2p.code);
protocols.names.p2p.code // HACK: `as any` is needed because ipfs-http-client forgot to add `| Multiaddr` to the `create` types
); const ipfs = create(rpcMaddr as any);
// HACK: `as any` is needed because ipfs-http-client forgot to add `| Multiaddr` to the `create` types console.log('📗 created ipfs client to %s', rpcMaddr);
const ipfs = create(rpcMaddr as any);
console.log("📗 created ipfs client to %s", rpcMaddr);
await ipfs.id(); await ipfs.id();
console.log("📗 connected to ipfs"); console.log('📗 connected to ipfs');
const file = await ipfs.add(source); const file = await ipfs.add(source);
console.log("📗 uploaded file:", file); console.log('📗 uploaded file:', file);
// To download the file, uncomment the following code: // To download the file, uncomment the following code:
// let files = await ipfs.get(file.cid); // let files = await ipfs.get(file.cid);
// for await (const file of files) { // for await (const file of files) {
// const content = uint8ArrayConcat(await all(file.content)); // const content = uint8ArrayConcat(await all(file.content));
// console.log("📗 downloaded file of length ", content.length); // console.log("📗 downloaded file of length ", content.length);
// } // }
return { file, swarmAddr, rpcAddr }; return { file, swarmAddr, rpcAddr };
} }

File diff suppressed because it is too large Load Diff

View File

@ -1,23 +1,23 @@
{ {
"name": "aqua-ipfs-integration", "name": "aqua-ipfs-integration",
"workspaces": [ "workspaces": [
"aqua", "aqua",
"nodejs", "nodejs",
"web" "web"
], ],
"scripts": { "scripts": {
"build": "check-node-version --npm '>= 7' && npm run build -w aqua -w nodejs -w web" "build": "check-node-version --npm '>= 7' && npm run build -w aqua -w nodejs -w web"
}, },
"dependencies": { "dependencies": {
"@fluencelabs/fluence": "0.19.1", "@fluencelabs/fluence": "0.19.1",
"typescript": "^4.4.4" "typescript": "^4.4.4"
}, },
"engines": { "engines": {
"npm": ">=7", "npm": ">=7",
"node": ">=15.0.0" "node": ">=15.0.0"
}, },
"devDependencies": { "devDependencies": {
"check-node-version": "^4.2.1", "check-node-version": "^4.2.1",
"@fluencelabs/avm": "0.20.3" "@fluencelabs/avm": "0.20.3"
} }
} }

View File

@ -1,54 +1,54 @@
{ {
"name": "ipfs-aqua-browser", "name": "ipfs-aqua-browser",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@fluencelabs/ipfs-execution-aqua": "file:../aqua", "@fluencelabs/ipfs-execution-aqua": "file:../aqua",
"@fluencelabs/fluence": "0.19.1", "@fluencelabs/fluence": "0.19.1",
"@fluencelabs/fluence-network-environment": "1.0.13", "@fluencelabs/fluence-network-environment": "1.0.13",
"@testing-library/jest-dom": "^5.14.1", "@testing-library/jest-dom": "^5.14.1",
"@testing-library/react": "^11.2.7", "@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^12.8.3", "@testing-library/user-event": "^12.8.3",
"@types/jest": "^26.0.24", "@types/jest": "^26.0.24",
"@types/node": "^12.20.16", "@types/node": "^12.20.16",
"@types/react": "^17.0.14", "@types/react": "^17.0.14",
"@types/react-dom": "^17.0.9", "@types/react-dom": "^17.0.9",
"ipfs-http-client": "^50.1.2", "ipfs-http-client": "^50.1.2",
"multiaddr": "^10.0.0", "multiaddr": "^10.0.0",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-scripts": "4.0.3", "react-scripts": "4.0.3",
"recoil": "^0.3.1", "recoil": "^0.3.1",
"typescript": "^4.3.5", "typescript": "^4.3.5",
"web-vitals": "^1.1.2" "web-vitals": "^1.1.2"
}, },
"scripts": { "scripts": {
"postinstall": "copy-avm-public public", "postinstall": "copy-avm-public public",
"start": "react-scripts start", "start": "react-scripts start",
"build": "react-scripts build", "build": "react-scripts build",
"test": "react-scripts test", "test": "react-scripts test",
"eject": "react-scripts eject" "eject": "react-scripts eject"
}, },
"eslintConfig": { "eslintConfig": {
"extends": [ "extends": [
"react-app", "react-app",
"react-app/jest" "react-app/jest"
] ]
}, },
"browserslist": { "browserslist": {
"production": [ "production": [
">0.2%", ">0.2%",
"not dead", "not dead",
"not op_mini all" "not op_mini all"
], ],
"development": [ "development": [
"last 1 chrome version", "last 1 chrome version",
"last 1 firefox version", "last 1 firefox version",
"last 1 safari version" "last 1 safari version"
] ]
}, },
"devDependencies": { "devDependencies": {
"node-sass": "^6.0.1", "node-sass": "^6.0.1",
"@fluencelabs/aqua-lib": "^0.4.0" "@fluencelabs/aqua-lib": "^0.4.0"
} }
} }