@stacks/storage 4.0.3-beta.0 → 4.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stacks/storage",
-  "version": "4.0.3-beta.0",
+  "version": "4.1.0",
   "description": "Stacks storage library",
   "author": "yknl <yukanliao@gmail.com>",
   "homepage": "https://blockstack.org",
@@ -32,12 +32,13 @@
     "url": "https://github.com/blockstack/blockstack.js/issues"
   },
   "dependencies": {
-    "@stacks/auth": "^4.0.3-beta.0",
-    "@stacks/common": "^4.0.3-beta.0",
-    "@stacks/encryption": "^4.0.3-beta.0",
+    "@stacks/auth": "^4.1.0",
+    "@stacks/common": "^4.1.0",
+    "@stacks/encryption": "^4.1.0",
     "jsontokens": "^3.0.0"
   },
   "devDependencies": {
+    "@stacks/network": "^4.1.0",
     "@types/jest": "^26.0.22",
     "@types/jsdom": "^16.2.10",
     "jest": "^26.6.3",
@@ -61,5 +62,5 @@
   "browser": "dist/polyfill/index.js",
   "umd:main": "dist/umd/index.js",
   "unpkg": "dist/umd/index.js",
-  "gitHead": "e65defc1a2bef36884bdcc2010763935955e2856"
+  "gitHead": "d0ca86ec4547a21d7da7730a1074f410b3e85b2a"
 }

package/src/hub.ts

@@ -3,7 +3,6 @@ import {
   Buffer,
   ConflictError,
   DoesNotExist,
-  fetchPrivate,
   GaiaHubErrorResponse,
   Logger,
   megabytesToBytes,
@@ -21,6 +20,7 @@ import {
   randomBytes,
   Signature,
 } from '@stacks/encryption';
+import { createFetchFn, FetchFn } from '@stacks/network';
 import { TokenSigner } from 'jsontokens';
 
 /**
@@ -62,7 +62,8 @@ export async function uploadToGaiaHub(
   contentType = 'application/octet-stream',
   newFile = true,
   etag?: string,
-  dangerouslyIgnoreEtag?: boolean
+  dangerouslyIgnoreEtag?: boolean,
+  fetchFn: FetchFn = createFetchFn()
 ): Promise<UploadResponse> {
   Logger.debug(`uploadToGaiaHub: uploading ${filename} to ${hubConfig.server}`);
 
@@ -79,14 +80,11 @@ export async function uploadToGaiaHub(
     }
   }
 
-  const response = await fetchPrivate(
-    `${hubConfig.server}/store/${hubConfig.address}/${filename}`,
-    {
-      method: 'POST',
-      headers,
-      body: contents,
-    }
-  );
+  const response = await fetchFn(`${hubConfig.server}/store/${hubConfig.address}/${filename}`, {
+    method: 'POST',
+    headers,
+    body: contents,
+  });
   if (!response.ok) {
     throw await getBlockstackErrorFromResponse(
       response,
@@ -102,17 +100,18 @@ export async function uploadToGaiaHub(
  * @param filename
  * @param hubConfig
  */
-export async function deleteFromGaiaHub(filename: string, hubConfig: GaiaHubConfig): Promise<void> {
+export async function deleteFromGaiaHub(
+  filename: string,
+  hubConfig: GaiaHubConfig,
+  fetchFn: FetchFn = createFetchFn()
+): Promise<void> {
   Logger.debug(`deleteFromGaiaHub: deleting ${filename} from ${hubConfig.server}`);
-  const response = await fetchPrivate(
-    `${hubConfig.server}/delete/${hubConfig.address}/${filename}`,
-    {
-      method: 'DELETE',
-      headers: {
-        Authorization: `bearer ${hubConfig.token}`,
-      },
-    }
-  );
+  const response = await fetchFn(`${hubConfig.server}/delete/${hubConfig.address}/${filename}`, {
+    method: 'DELETE',
+    headers: {
+      Authorization: `bearer ${hubConfig.token}`,
+    },
+  });
   if (!response.ok) {
     throw await getBlockstackErrorFromResponse(
       response,
@@ -208,11 +207,12 @@ function makeV1GaiaAuthToken(
 export async function connectToGaiaHub(
   gaiaHubUrl: string,
   challengeSignerHex: string,
-  associationToken?: string
+  associationToken?: string,
+  fetchFn: FetchFn = createFetchFn()
 ): Promise<GaiaHubConfig> {
   Logger.debug(`connectToGaiaHub: ${gaiaHubUrl}/hub_info`);
 
-  const response = await fetchPrivate(`${gaiaHubUrl}/hub_info`);
+  const response = await fetchFn(`${gaiaHubUrl}/hub_info`);
   const hubInfo = await response.json();
   const readURL = hubInfo.read_url_prefix;
   const token = makeV1GaiaAuthToken(hubInfo, challengeSignerHex, gaiaHubUrl, associationToken);
@@ -233,8 +233,12 @@ export async function connectToGaiaHub(
  *
  * @ignore
  */
-export async function getBucketUrl(gaiaHubUrl: string, appPrivateKey: string): Promise<string> {
-  const response = await fetchPrivate(`${gaiaHubUrl}/hub_info`);
+export async function getBucketUrl(
+  gaiaHubUrl: string,
+  appPrivateKey: string,
+  fetchFn: FetchFn = createFetchFn()
+): Promise<string> {
+  const response = await fetchFn(`${gaiaHubUrl}/hub_info`);
   const responseText = await response.text();
   const responseJSON = JSON.parse(responseText);
   const readURL = responseJSON.read_url_prefix;

package/src/storage.ts

@@ -1,10 +1,7 @@
-// @ts-ignore
-import { Buffer } from '@stacks/common';
 import { lookupProfile, NAME_LOOKUP_PATH, UserSession } from '@stacks/auth';
 import {
   BLOCKSTACK_DEFAULT_GAIA_HUB_URL,
   DoesNotExist,
-  fetchPrivate,
   GaiaHubError,
   getGlobalObject,
   InvalidStateError,
@@ -20,6 +17,7 @@ import {
   signECDSA,
   verifyECDSA,
 } from '@stacks/encryption';
+import { createFetchFn, FetchFn } from '@stacks/network';
 import { FileContentLoader } from './fileContentLoader';
 import {
   connectToGaiaHub,
@@ -272,11 +270,12 @@ export class Storage {
     app: string,
     username: string | undefined,
     zoneFileLookupURL: string | undefined,
-    forceText: boolean
+    forceText: boolean,
+    fetchFn: FetchFn = createFetchFn()
   ): Promise<string | ArrayBuffer | null> {
     const opts = { app, username, zoneFileLookupURL };
     const readUrl = await this.getFileUrl(path, opts);
-    const response = await fetchPrivate(readUrl);
+    const response = await fetchFn(readUrl);
     if (!response.ok) {
       throw await getBlockstackErrorFromResponse(response, `getFile ${path} failed.`, null);
     }
@@ -394,6 +393,7 @@ export class Storage {
     privateKey?: string,
     username?: string,
     zoneFileLookupURL?: string
+    // eslint-disable-next-line node/prefer-global/buffer
   ): Promise<string | Buffer> {
     const appPrivateKey = privateKey || this.userSession.loadUserData().appPrivateKey;
 
@@ -460,6 +460,7 @@ export class Storage {
    */
   async putFile(
     path: string,
+    // eslint-disable-next-line node/prefer-global/buffer
     content: string | Buffer | ArrayBufferView | Blob,
     options?: PutFileOptions
   ): Promise<string> {
@@ -556,6 +557,7 @@ export class Storage {
       };
     } else {
       // In all other cases, we only need one upload.
+      // eslint-disable-next-line node/prefer-global/buffer
       let contentForUpload: string | Buffer | Blob;
       if (!opt.encrypt && !opt.sign) {
         // If content does not need encrypted or signed, it can be passed directly
@@ -693,7 +695,8 @@ export class Storage {
     page: string | null,
     callCount: number,
     fileCount: number,
-    callback: (name: string) => boolean
+    callback: (name: string) => boolean,
+    fetchFn: FetchFn = createFetchFn()
   ): Promise<number> {
     if (callCount > 65536) {
       // this is ridiculously huge, and probably indicates
@@ -714,10 +717,7 @@ export class Storage {
         },
         body: pageRequest,
       };
-      response = await fetchPrivate(
-        `${hubConfig.server}/list-files/${hubConfig.address}`,
-        fetchOptions
-      );
+      response = await fetchFn(`${hubConfig.server}/list-files/${hubConfig.address}`, fetchOptions);
       if (!response.ok) {
         throw await getBlockstackErrorFromResponse(response, 'ListFiles failed.', hubConfig);
       }