keybase-proofs 2.3.29 → 2.3.30

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.3.30 (2025-02-28)
+
+- Fix BaseScraper not properly handling promise rejections when fetching text
+  body.
+
 ## 2.3.29 (2024-07-22)
 
 - Fix Twitter scraper to handle empty result list case.

package/README.md

@@ -2,3 +2,5 @@ proofs
 ======
 
 Public Keybase Proof System
+
+Post issues to: https://github.com/keybase/keybase-issues

package/lib/scrapers/base.js

@@ -96,7 +96,7 @@
             (function(__iced_k) {
               __iced_deferrals = new iced.Deferrals(__iced_k, {
                 parent: ___iced_passed_deferral,
-                filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/server_test_progs/proofs/src/scrapers/base.iced",
+                filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/base.iced",
                 funcname: "BaseScraper.validate"
               });
               _this.check_status(args, __iced_deferrals.defer({
@@ -171,7 +171,7 @@
         return (function(__iced_k) {
           __iced_deferrals = new iced.Deferrals(__iced_k, {
             parent: ___iced_passed_deferral,
-            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/server_test_progs/proofs/src/scrapers/base.iced",
+            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/base.iced",
             funcname: "BaseScraper._get_url_body"
           });
           _this.libs.fetch(opts.url, opts, __iced_deferrals.defer({
@@ -213,7 +213,7 @@
                   (function(__iced_k) {
                     __iced_deferrals = new iced.Deferrals(__iced_k, {
                       parent: ___iced_passed_deferral,
-                      filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/server_test_progs/proofs/src/scrapers/base.iced",
+                      filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/base.iced",
                       funcname: "BaseScraper._get_url_body"
                     });
                     f.call(response, __iced_deferrals.defer({
@@ -234,9 +234,30 @@
                     return __iced_k(cb(err, rc, body));
                   });
                 } else {
-                  return __iced_k(response.text().then(function(body) {
-                    return cb(err, rc, body);
-                  }));
+                  f = callbackify(response.text);
+                  (function(__iced_k) {
+                    __iced_deferrals = new iced.Deferrals(__iced_k, {
+                      parent: ___iced_passed_deferral,
+                      filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/base.iced",
+                      funcname: "BaseScraper._get_url_body"
+                    });
+                    f.call(response, __iced_deferrals.defer({
+                      assign_fn: (function() {
+                        return function() {
+                          err = arguments[0];
+                          return body = arguments[1];
+                        };
+                      })(),
+                      lineno: 129
+                    }));
+                    __iced_deferrals._fulfill();
+                  })(function() {
+                    if (err) {
+                      _this.log("| _get_url_body response.text() failed with: " + (err.toString()));
+                      rc = v_codes.CONTENT_FAILURE;
+                    }
+                    return __iced_k(cb(err, rc, body));
+                  });
                 }
               } catch (_error) {
                 err = _error;
@@ -279,11 +300,11 @@
         return (function(__iced_k) {
           __iced_deferrals = new iced.Deferrals(__iced_k, {
             parent: ___iced_passed_deferral,
-            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/server_test_progs/proofs/src/scrapers/base.iced",
+            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/base.iced",
             funcname: "BaseBearerToken.get"
           });
           _this._lock.acquire(__iced_deferrals.defer({
-            lineno: 160
+            lineno: 164
           }));
           __iced_deferrals._fulfill();
         });
@@ -315,7 +336,7 @@
               (function(__iced_k) {
                 __iced_deferrals = new iced.Deferrals(__iced_k, {
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/server_test_progs/proofs/src/scrapers/base.iced",
+                  filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/base.iced",
                   funcname: "BaseBearerToken.get"
                 });
                 _this.base._get_url_body(opts, __iced_deferrals.defer({
@@ -326,7 +347,7 @@
                       return body = arguments[2];
                     };
                   })(),
-                  lineno: 185
+                  lineno: 189
                 }));
                 __iced_deferrals._fulfill();
               })(function() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keybase-proofs",
-  "version": "2.3.29",
+  "version": "2.3.30",
   "description": "Publicly-verifiable proofs of identity",
   "main": "lib/main.js",
   "scripts": {

package/src/scrapers/base.iced

@@ -126,8 +126,12 @@ class BaseScraper
             rc = v_codes.CONTENT_FAILURE
           cb err, rc, body
         else
-          response.text().then (body) ->
-            cb err, rc, body
+          f = callbackify response.text
+          await f.call response, defer err, body
+          if err
+            @log "| _get_url_body response.text() failed with: #{err.toString()}"
+            rc = v_codes.CONTENT_FAILURE
+          cb err, rc, body
       catch err
         cb err, rc, null
     else