From f608c7e901fcd606325368f0352d7ec2fc8ea67c Mon Sep 17 00:00:00 2001 From: rykci Date: Tue, 24 Jan 2023 15:47:11 -0500 Subject: [PATCH] change throw error to log --- sdk-test/makePayment.js | 3 +-- sdk-test/mcs.test.js | 2 +- sdk/api/buckets/files.js | 6 +++--- sdk/api/dealDetail.js | 2 +- sdk/api/dealList.js | 2 +- sdk/api/fileStatus.js | 2 +- sdk/api/makePayment.js | 4 ++-- sdk/api/mint.js | 2 +- sdk/helper/getJwt.js | 2 +- sdk/index.js | 12 ++++++------ sdk/package-lock.json | 4 ++-- sdk/package.json | 2 +- 12 files changed, 21 insertions(+), 22 deletions(-) diff --git a/sdk-test/makePayment.js b/sdk-test/makePayment.js index 3cac76d..c1fe27b 100644 --- a/sdk-test/makePayment.js +++ b/sdk-test/makePayment.js @@ -4,7 +4,6 @@ const { mcsSDK } = require('js-mcs-sdk') async function main() { const SOURCE_FILE_UPLOAD_ID = '' const FILE_SIZE = '' - const MIN_AMOUNT = '' // leave blank for estimated price const mcs = await mcsSDK.initialize({ privateKey: process.env.PRIVATE_KEY, @@ -14,7 +13,7 @@ async function main() { console.log('version:', mcs.version) - const tx = await mcs.makePayment(SOURCE_FILE_UPLOAD_ID, MIN_AMOUNT, FILE_SIZE) + const tx = await mcs.makePayment(SOURCE_FILE_UPLOAD_ID, FILE_SIZE) console.log('transaction hash: ' + tx.transactionHash) } diff --git a/sdk-test/mcs.test.js b/sdk-test/mcs.test.js index 0ce547a..cf5d370 100644 --- a/sdk-test/mcs.test.js +++ b/sdk-test/mcs.test.js @@ -65,7 +65,7 @@ describe('MCS SDK', function () { }) it('Should pay for file', async () => { - await mcs.makePayment(sourceFileUploadId, '', size) + await mcs.makePayment(sourceFileUploadId, size) }) it('Should mint NFT', async () => { diff --git a/sdk/api/buckets/files.js b/sdk/api/buckets/files.js index 3077e26..5b955e4 100644 --- a/sdk/api/buckets/files.js +++ b/sdk/api/buckets/files.js @@ -124,7 +124,7 @@ const uploadFile = async (api, jwt, filePath, bucketUid, folder, log) => { let res = await check(api, jwt, md5.filename, md5.hash, bucketUid, folder) if (res.status === 'error') { - throw new Error(res.message) + console.error(res.message) } await uploadChunks(api, jwt, filePath, md5.filename, md5.hash, log) @@ -170,7 +170,7 @@ const downloadFile = async (api, jwt, fileId, outputDirectory) => { let file = await getFileInfo(api, jwt, fileId) if (!file) { - throw new Error('file not found') + console.error('file not found') } let name = outputDirectory.endsWith('/') @@ -181,7 +181,7 @@ const downloadFile = async (api, jwt, fileId, outputDirectory) => { await fs.promises.writeFile(name, res.data, (err) => { if (err) { - throw new Error(err.message) + console.error(err.message) } }) return { status: 'success' } diff --git a/sdk/api/dealDetail.js b/sdk/api/dealDetail.js index d344ad3..5f2dcfd 100644 --- a/sdk/api/dealDetail.js +++ b/sdk/api/dealDetail.js @@ -10,7 +10,7 @@ const getDealDetail = async (api, jwt, sourceFileUploadId, dealId) => { config, ) if (res?.data.status === 'error') { - throw new Error(res.data.message) + console.error(res.data.message) } return res.data } catch (err) { diff --git a/sdk/api/dealList.js b/sdk/api/dealList.js index 10f8f54..6fe83f7 100644 --- a/sdk/api/dealList.js +++ b/sdk/api/dealList.js @@ -19,7 +19,7 @@ const getDealList = async ( config, ) if (res?.data.status === 'error') { - throw new Error(res.data.message) + console.error(res.data.message) } return res?.data } catch (err) { diff --git a/sdk/api/fileStatus.js b/sdk/api/fileStatus.js index 474c629..11f9293 100644 --- a/sdk/api/fileStatus.js +++ b/sdk/api/fileStatus.js @@ -7,7 +7,7 @@ const getFileStatus = async (api, jwt, dealId) => { try { const res = await axios.get(`${api}/v1/storage/deal/log/${dealId}`, config) if (res?.data.status === 'error') { - throw new Error(res.data.message) + console.error(res.data.message) } return res.data } catch (err) { diff --git a/sdk/api/makePayment.js b/sdk/api/makePayment.js index 11f8cad..b241668 100644 --- a/sdk/api/makePayment.js +++ b/sdk/api/makePayment.js @@ -14,7 +14,7 @@ const getFilePaymentStatus = async (api, jwt, sourceFileUploadId) => { config, ) if (res?.data.status === 'error') { - throw new Error(res.data.message) + console.error(res.data.message) } return res?.data @@ -45,7 +45,7 @@ const lockToken = async ( let paymentStatus = filePaymentStatus.data.source_file_upload if (paymentStatus?.is_free || paymentStatus?.status != 'Pending') { - throw new Error('This file is already paid for.') + console.error('This file is already paid for.') } const wCid = paymentStatus.w_cid diff --git a/sdk/api/mint.js b/sdk/api/mint.js index 42c1b74..d598eb4 100644 --- a/sdk/api/mint.js +++ b/sdk/api/mint.js @@ -31,7 +31,7 @@ const postMintInfo = async (api, jwt, mintInfo) => { ) if (res?.data.status === 'error') { - throw new Error(res.data.message) + console.error(res.data.message) } return res?.data diff --git a/sdk/helper/getJwt.js b/sdk/helper/getJwt.js index 89a3cc7..dfeee43 100644 --- a/sdk/helper/getJwt.js +++ b/sdk/helper/getJwt.js @@ -9,7 +9,7 @@ const getJwt = async (api, accessToken, apiKey, loginNetwork) => { }) if (response?.data.status === 'error') { - throw new Error(response.data.message) + console.error(response.data.message) } return response.data?.data diff --git a/sdk/index.js b/sdk/index.js index 1cd0c15..f502e37 100644 --- a/sdk/index.js +++ b/sdk/index.js @@ -56,11 +56,11 @@ class mcsSDK { } else if (chainName == 'polygon.mumbai') { api = API.MCS_MUMBAI_API } else { - throw new Error('unknown chain name') + console.error('unknown chain name') } if (!accessToken || !apiKey) { - throw new Error( + console.error( 'Missing access token/API key. Please check your parameters, or visit https://www.multichain.storage/ to generate an API key.', ) } @@ -91,7 +91,7 @@ class mcsSDK { if (chainId != this.mapChainName(this.chainName)) { this.web3Initialized = false - throw new Error( + console.error( `RPC Chain ID (${chainId}) does not match SDK chain name (${this.chainName})`, ) } @@ -112,7 +112,7 @@ class mcsSDK { */ upload = async (files, options) => { if (!this.web3Initialized) { - throw new Error('web3 not setup, call setupWeb3 first') + console.error('web3 not setup, call setupWeb3 first') } return await mcsUpload( @@ -132,9 +132,9 @@ class mcsSDK { * @param {string} size - file size in bytes * @returns {Object} payment transaction response */ - makePayment = async (sourceFileUploadId, amount, size) => { + makePayment = async (sourceFileUploadId, size, amount = '') => { if (!this.web3Initialized) { - throw new Error('web3 not setup, call setupWeb3 first') + console.error('web3 not setup, call setupWeb3 first') } let tx = await lockToken( diff --git a/sdk/package-lock.json b/sdk/package-lock.json index 649561e..7ff3441 100644 --- a/sdk/package-lock.json +++ b/sdk/package-lock.json @@ -1,12 +1,12 @@ { "name": "js-mcs-sdk", - "version": "4.0.2", + "version": "4.0.3-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "js-mcs-sdk", - "version": "4.0.2", + "version": "4.0.3-beta.1", "license": "ISC", "dependencies": { "axios": "^0.26.1", diff --git a/sdk/package.json b/sdk/package.json index cf0c673..7722361 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -1,6 +1,6 @@ { "name": "js-mcs-sdk", - "version": "4.0.2", + "version": "4.0.3-beta.1", "description": "A SDK for the MCS service. It provides a convenient interface for working with the MCS API from a web browser or Node.js", "homepage": "https://github.com/filswan/js-mcs-sdk", "main": "index.js",