bitbucket-repository-provider 4.0.1 → 4.1.2

package/README.md

@@ -121,9 +121,9 @@ Supported name schemes are
 Known environment variables
 
 *   BITBUCKET_API api
-*   BB_TOKEN api token
 *   BITBUCKET_TOKEN api token
 *   BITBUCKET_USERNAME username
+*   BITBUCKET_APP_PASSWORD password
 *   BITBUCKET_PASSWORD password
 
 ### Parameters

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitbucket-repository-provider",
-  "version": "4.0.1",
+  "version": "4.1.2",
   "publishConfig": {
     "access": "public"
   },
@@ -31,16 +31,17 @@
   },
   "dependencies": {
     "content-entry": "^5.0.0",
+    "fetch-rate-limit-util": "^2.8.1",
     "matching-iterator": "^2.0.4",
     "node-fetch": "^3.2.3",
     "one-time-execution-method": "^2.0.13",
-    "repository-provider": "^28.0.0"
+    "repository-provider": "^28.1.1"
   },
   "devDependencies": {
     "ava": "^4.2.0",
     "c8": "^7.11.2",
     "documentation": "^13.2.5",
-    "repository-provider-test-support": "^2.0.4",
+    "repository-provider-test-support": "^2.1.2",
     "semantic-release": "^19.0.2"
   },
   "engines": {

package/src/bitbucket-branch.mjs

@@ -25,17 +25,13 @@ export class BitbucketBranch extends Branch {
     };
   }
 
-  fetch(...args) {
-    return this.provider.fetch(...args);
-  }
-
   /**
    * {@link https://developer.atlassian.com/bitbucket/api/2/reference/resource/repositories/%7Busername%7D/%7Brepo_slug%7D/src/%7Bnode%7D/%7Bpath%7D}
    * @param {string} name
    * @return {Promise<ContentEntry>}
    */
   async entry(name) {
-    const res = await this.fetch(
+    const res = await this.provider.fetch(
       `repositories/${this.slug}/src/${this.hash}/${name}`
     );
     if(res.ok) {
@@ -48,13 +44,11 @@ export class BitbucketBranch extends Branch {
    * @param patterns
    */
   async *entries(patterns) {
-    const r = await this.fetch(
+    const { json } = await this.provider.fetchJSON(
       `repositories/${this.slug}/src/${this.hash}/?max_depth=99`
     );
 
-    const res = await r.json();
-
-    for (const entry of matcher(res.values, patterns, { name: "path" })) {
+    for (const entry of matcher(json.values, patterns, { name: "path" })) {
       yield entry.type === "commit_directory"
           ? new BaseCollectionEntry(entry.path)
           : new LazyBufferContentEntry(entry.path, this);
@@ -78,7 +72,7 @@ export class BitbucketBranch extends Branch {
       searchParams.set(u.name, await u.string);
     }
 
-    return this.fetch(`repositories/${this.slug}/src`, {
+    return this.provider.fetch(`repositories/${this.slug}/src`, {
       method: "POST",
       headers: {
         "Content-Type": "application/x-www-form-urlencoded"
@@ -108,7 +102,7 @@ class LazyBufferContentEntry extends BufferContentEntryMixin(ContentEntry) {
   async _buffer() {
     const branch = this.branch;
 
-    const res = await branch.fetch(
+    const res = await branch.provider.fetch(
       `repositories/${branch.slug}/src/${branch.hash}/${this.name}`
     );
 

package/src/bitbucket-provider.mjs

@@ -1,6 +1,6 @@
 import fetch from "node-fetch";
 import { replaceWithOneTimeExecutionMethod } from "one-time-execution-method";
-
+import { stateActionHandler } from "fetch-rate-limit-util";
 import { MultiGroupProvider } from "repository-provider";
 import { BitbucketBranch } from "./bitbucket-branch.mjs";
 import { BitbucketRepositoryGroup } from "./bitbucket-repository-group.mjs";
@@ -26,9 +26,9 @@ const domain = "bitbucket.org";
  * - owner/repo-name
  * Known environment variables
  * - BITBUCKET_API api
- * - BB_TOKEN api token
  * - BITBUCKET_TOKEN api token
  * - BITBUCKET_USERNAME username
+ * - BITBUCKET_APP_PASSWORD password
  * - BITBUCKET_PASSWORD password
  * @param {Object} config
  * @param {string} config.url provider scm base
@@ -153,27 +153,22 @@ export class BitbucketProvider extends MultiGroupProvider {
    * {@link https://developer.atlassian.com/bitbucket/api/2/reference/resource/repositories}
    */
   async initializeRepositories() {
-    let next = "repositories/?role=contributor";
-
-    do {
-      const response = await this.fetch(next);
-
-      if (!response.ok) {
-        console.log(response);
-        break;
-      }
-
-      const res = await response.json();
-
-      next = res.next;
-      res.values.map(b => {
-        const groupName = b.owner.nickname || b.owner.username;
-        this.addRepositoryGroup(groupName, b.owner).addRepository(b.name, b);
-      });
-    } while (next);
+    try {
+      let next = "repositories/?role=contributor";
+
+      do {
+        const { json } = await this.fetchJSON(next);
+
+        next = json.next;
+        json.values.map(b => {
+          const groupName = b.owner.nickname || b.owner.username;
+          this.addRepositoryGroup(groupName, b.owner).addRepository(b.name, b);
+        });
+      } while (next);
+    } catch {}
   }
 
-  fetch(url, options = {}) {
+  fetch(url, options = {}, responseHandler) {
     let authorization;
 
     if (this.authentication.username) {
@@ -199,9 +194,22 @@ export class BitbucketProvider extends MultiGroupProvider {
       headers["Content-Type"] = "application/json";
     }
 
-    return fetch(new URL(url, this.api), {
-      ...options,
-      headers
+    return stateActionHandler(
+      fetch,
+      new URL(url, this.api),
+      {
+        ...options,
+        headers
+      },
+      responseHandler,
+      undefined,
+      (url, ...args) => this.trace(url.toString(), ...args)
+    );
+  }
+
+  fetchJSON(url, options) {
+    return this.fetch(url, options, async response => {
+      return { response, json: await response.json() };
     });
   }
 }

package/src/bitbucket-pull-request.mjs

@@ -31,12 +31,11 @@ export class BitbucketPullRequest extends PullRequest {
     let url = `repositories/${repository.slug}/pullrequests${query}`;
 
     do {
-      const r = await repository.fetch(url);
-      const res = await r.json();
-      url = res.next;
+      const { json } = await repository.provider.fetchJSON(url);
+      url = json.next;
 
-      if (res.values) {
-        for (const p of res.values) {
+      if (json.values) {
+        for (const p of json.values) {
           const source = await getBranch(p.source);
 
           if (filter.source && !filter.source.equals(source)) {
@@ -73,7 +72,7 @@ export class BitbucketPullRequest extends PullRequest {
 
     const url = `repositories/${destination.slug}/pullrequests`;
 
-    const res = await destination.fetch(url, {
+    const { json } = await destination.provider.fetchJSON(url, {
       method: "POST",
       data: {
         source: {
@@ -91,8 +90,6 @@ export class BitbucketPullRequest extends PullRequest {
       }
     });
 
-    const json = await res.json();
-
     if (json.type === "error" && json.error) {
       throw new Error(json.error.message);
     }
@@ -109,7 +106,7 @@ export class BitbucketPullRequest extends PullRequest {
    */
   async _merge(method = "merge_commit") {
     const url = `repositories/${this.destination.slug}/pullrequests/${this.number}/merge`;
-    return this.destination.fetch(url, {
+    return this.destination.provider.fetch(url, {
       type: "a type",
       message: "a message",
       method: "POST",

package/src/bitbucket-repository-group.mjs

@@ -20,7 +20,6 @@ export class BitbucketRepositoryGroup extends RepositoryGroup {
    * @return {Repository} newly created repository
    */
   async createRepository(name, options) {
-    //console.log(`repositories/${this.name}/${name}`);
     const response = await this.provider.fetch(
       `repositories/${this.name}/${name}`,
       {
@@ -32,8 +31,6 @@ export class BitbucketRepositoryGroup extends RepositoryGroup {
       }
     );
 
-    //console.log(response);
-
     if (response.ok) {
       return this.addRepository(name, options);
     }

package/src/bitbucket-repository.mjs

@@ -53,14 +53,10 @@ export class BitbucketRepository extends Repository {
     return `${this.provider.url}/${this.slug}/issues`;
   }
 
-  fetch(...args) {
-    return this.provider.fetch(...args);
-  }
-
   /**
    * {@link https://developer.atlassian.com/cloud/bitbucket/rest/api-group-repositories/#api-repositories-workspace-repo-slug-put}
    */
-   async update() {
+  async update() {
     return this.provider.fetch(`repositories/${this.slug}`, {
       method: "PUT",
       body: JSON.stringify(
@@ -76,13 +72,11 @@ export class BitbucketRepository extends Repository {
     let url = `repositories/${this.slug}/hooks`;
 
     do {
-      const r = await this.fetch(url);
-      const res = await r.json();
-      res.values.forEach(h =>
-        this.addHook(
-          new this.hookClass(this, h.id, new Set(h.events), h)
-        ));
-      url = res.next;
+      const { json } = await this.provider.fetchJSON(url);
+      json.values.forEach(h =>
+        this.addHook(new this.hookClass(this, h.id, new Set(h.events), h))
+      );
+      url = json.next;
     } while (url);
   }
 
@@ -90,16 +84,15 @@ export class BitbucketRepository extends Repository {
     let url = `repositories/${this.slug}/refs/branches`;
 
     do {
-      const r = await this.fetch(url);
-      const res = await r.json();
+      const { json } = await this.provider.fetchJSON(url);
 
-      if (res.type === "error") {
+      if (json.type === "error") {
         break;
       }
 
-      res.values.forEach(b => this.addBranch(b.name, b.target));
+      json.values.forEach(b => this.addBranch(b.name, b.target));
 
-      url = res.next;
+      url = json.next;
     } while (url);
   }
 
@@ -112,23 +105,25 @@ export class BitbucketRepository extends Repository {
    * @param {string} options.message
    */
   async createBranch(name, from = this.defaultBranch, options) {
+    const branch = this._branches.get(name);
+    if (branch) {
+      return branch;
+    }
+
     from = await from;
-    const res = await this.fetch(`repositories/${this.slug}/refs/branches`, {
-      method: "POST",
-      data: {
-        name,
-        target: {
-          hash: from.hash
+    
+    const { json } = await this.provider.fetchJSON(
+      `repositories/${this.slug}/refs/branches`,
+      {
+        method: "POST",
+        data: {
+          name,
+          target: {
+            hash: from.hash
+          }
         }
       }
-    });
-
-    if(!res.ok) {
-      // TODO handle error
-      console.log(res.ok, res.status, res.statusText);
-    }
-
-    const json = await res.json();
+    );
 
     return super.addBranch(name, json);
   }
@@ -139,17 +134,13 @@ export class BitbucketRepository extends Repository {
    */
   async deleteBranch(name) {
     const url = `repositories/${this.slug}/refs/branches/${name}`;
-    // console.log(url);
-
-    const res = await this.fetch(url, { method: "DELETE" });
+    const response = await this.provider.fetch(url, { method: "DELETE" });
 
-    //console.log(res.ok, res.status, res.statusText);
-    //const p = await res.json();
-    //console.log(p);
-
-    if(res.ok) {
-      return super.deleteBranch(name);
+    if(!response.ok) {
+      throw new Error(response.statusText);
     }
+
+    return super.deleteBranch(name);
   }
 }