Update ipfs endpoints, improve error handling (#1337)

subquery · Oct 5, 2022 · 63c0b23 · 63c0b23
1 parent e2e6b97
commit 63c0b23
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/packages/cli/src/controller/publish-controller.ts b/packages/cli/src/controller/publish-controller.ts
@@ -115,7 +115,7 @@ export async function uploadFile(
   }
   let ipfsClusterCid: string;
   try {
-    ipfsClusterCid = await UploadFileByCluster(
+    ipfsClusterCid = await uploadFileByCluster(
       determineStringOrFsStream(content) ? await fs.promises.readFile(content.path, 'utf8') : content,
       authToken
     );
@@ -134,7 +134,7 @@ function determineStringOrFsStream(toBeDetermined: unknown): toBeDetermined is f
   return !!(toBeDetermined as fs.ReadStream).path;
 }
 
-async function UploadFileByCluster(content: string, authToken: string): Promise<string> {
+async function uploadFileByCluster(content: string, authToken: string): Promise<string> {
   const bodyFormData = new FormData();
   bodyFormData.append('data', content);
   const result = (
@@ -151,7 +151,17 @@ async function UploadFileByCluster(content: string, authToken: string): Promise<
       maxContentLength: 50 * 1024 * 1024,
     })
   ).data as ClusterResponseData;
-  return result.cid?.['/'];
+
+  if (typeof result.cid === 'string') {
+    return result.cid;
+  }
+  const cid = result.cid?.['/'];
+
+  if (!cid) {
+    throw new Error('Failed to get CID from response');
+  }
+
+  return cid;
 }
 
 function mapToObject(map: Map<string | number, unknown>): Record<string | number, unknown> {
@@ -170,10 +180,10 @@ function isFileReference(value: any): value is FileReference {
 
 interface ClusterResponseData {
   name: string;
-  cid: cidSpec;
+  cid: CidSpec | string;
   size: number;
 }
 // cluster response cid stored as {'/': 'QmVq2bqunmkmEmMCY3x9U9kDcgoRBGRbuBm5j7XKZDvSYt'}
-interface cidSpec {
+interface CidSpec {
   '/': string;
 }
diff --git a/packages/common/src/constants.ts b/packages/common/src/constants.ts
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //IPFS
-export const IPFS_DEV = 'https://interipfs.thechaindata.com';
-export const IPFS_PROD = 'https://ipfs.subquery.network';
-export const IPFS_NODE_ENDPOINT = `${IPFS_PROD}/ipfs/api/v0`;
-export const IPFS_CLUSTER_ENDPOINT = `${IPFS_PROD}/cluster/add`;
+export const IPFS_READ = 'https://unauthipfs.subquery.network';
+export const IPFS_WRITE = 'https://authipfs.subquery.network';
+export const IPFS_NODE_ENDPOINT = `${IPFS_READ}/ipfs/api/v0`;
+export const IPFS_CLUSTER_ENDPOINT = `${IPFS_WRITE}/cluster/add`;
 export const IPFS_REGEX = /^ipfs:\/\//i;
 
 // MANIFEST