Merge branch 'master' of ssh://github.com/aleph-im/aleph-js

Author: moshemalawach

package.json

@@ -36,6 +36,7 @@
     "eciesjs": "^0.3.1",
     "elliptic": "^6.5.1",
     "ethers": "^4.0.45",
+    "form-data": "^4.0.0",
     "neon-js": "^1.1.2",
     "ripemd160": "^2.0.2",
     "secp256k1": "^3.6.2",

src/api/aggregates.js

@@ -4,24 +4,24 @@ import {DEFAULT_SERVER} from './base'
 import {sign_and_broadcast, put_content} from './create'
 const shajs = require('sha.js')
 
-export async function fetch_one(address, key, {api_server = DEFAULT_SERVER} = {}) {
-  let response = await axios.get(`${api_server}/api/v0/aggregates/${address}.json?keys=${key}`)
+export async function fetch_one(address, key, {api_server = DEFAULT_SERVER, limit = 1000} = {}) {
+  let response = await axios.get(`${api_server}/api/v0/aggregates/${address}.json?keys=${key}&limit=${limit}`)
   if ((response.data.data !== undefined) && (response.data.data[key] !== undefined))
   {
     return response.data.data[key]
   } else
     return null
 }
 
-export async function fetch(address, {keys = null, api_server = DEFAULT_SERVER} = {}) {
+export async function fetch(address, {keys = null, api_server = DEFAULT_SERVER, limit = 1000} = {}) {
 
   if (keys !== null)
     keys = keys.join(',')
 
   let response = await axios.get(
     `${api_server}/api/v0/aggregates/${address}.json`,
     {
-      params: {keys: keys}
+      params: {keys: keys, limit: limit}
     })
   if ((response.data.data !== undefined))
   {

src/api/create.js

@@ -6,8 +6,11 @@ import * as cosmos from './cosmos'
 import * as substrate from './substrate'
 import * as solana from './solana'
 import * as avalanche from './avalanche'
+import FormDataNode from 'form-data'
 const shajs = require('sha.js')
 
+const isBrowser = typeof FormData !== 'undefined'
+
 export async function put_content(
   message, content, inline_requested, storage_engine, api_server) {
 
@@ -66,8 +69,14 @@ export async function storage_push (
 
 export async function ipfs_push_file (
   fileobject, {api_server = DEFAULT_SERVER} = {}) {
-  let formData = new FormData()
-  formData.append('file', fileobject)
+  let formData = null
+  if (isBrowser) {
+    formData = new FormData()
+    formData.append('file', fileobject)
+  } else {
+    formData = new FormDataNode()
+    formData.append('file', fileobject, 'random.txt') // FileName is required but does not seem to have any effect
+  }
 
   let response = await axios.post( `${api_server}/api/v0/ipfs/add_file`,
     formData,
@@ -87,8 +96,14 @@ export async function ipfs_push_file (
 
 export async function storage_push_file (
   fileobject, {api_server = DEFAULT_SERVER} = {}) {
-  let formData = new FormData()
-  formData.append('file', fileobject)
+  let formData = null
+  if (isBrowser) {
+    formData = new FormData()
+    formData.append('file', fileobject)
+  } else {
+    formData = new FormDataNode()
+    formData.append('file', fileobject, 'random.txt') // FileName is required but does not seem to have any effect
+  }
 
   let response = await axios.post( `${api_server}/api/v0/storage/add_file`,
     formData,

yarn.lock

@@ -2043,10 +2043,10 @@ available-typed-arrays@^1.0.2:
   dependencies:
     array-filter "^1.0.0"
 
-avalanche@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/avalanche/-/avalanche-3.2.0.tgz#d971b6628f595d9c5ec007f96180cb156536b86c"
-  integrity sha512-bfrkmwT1EXeo6/HogAlCHYc1huoNeX3p3hElNjm+CfTSLsCGYOM0O33mK9cSuo/zq9/kOVAXPSEj6jSKMtxxfQ==
+[email protected]:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/avalanche/-/avalanche-3.1.0.tgz#e13b5b5a069192be8d6ff8fe576f05afb6bebea9"
+  integrity sha512-WgGWBOfqCWAaBuTeiMbpmNk2Gn6EoI2oWreRSJQT5DfUcwh+YvVxpXr/IXP56l9mp2LH99G3myoz4yt0R5VxvA==
   dependencies:
     axios "0.19.2"
     bech32 "1.1.4"
@@ -2936,7 +2936,7 @@ colorette@^1.2.1:
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
   integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4468,6 +4468,15 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"