@blamejs/core 0.6.70 → 0.7.1

package/lib/object-store/azure-blob.js

@@ -34,18 +34,31 @@ var nodeCrypto = require("crypto");
 var { URL } = require("url");
 var { Readable } = require("stream");
 var safeXml = require("../parsers/safe-xml");
+var sharedRequest = require("./http-request");
 var C = require("../constants");
 var { ObjectStoreError } = require("../framework-error");
-var httpClient = require("../http-client");
+var time = require("../time");
 var safeUrl = require("../safe-url");
 
 // Azure Blob list responses are commonly multi-thousand-key paginated
 // payloads — well above the parser's default 1 MiB / 10K element ceilings.
 var LIST_PARSE_OPTS = {
   maxBytes:    C.BYTES.mib(8),
-  maxElements: 50000,
+  maxElements: C.BYTES.bytes(50000),
 };
 
+// Internal URL builder — endpoint + path string from validated config.
+// Routes through safeUrl.parse so the protocol allowlist + length cap
+// apply uniformly. Cap is generous since SAS-presigned URLs carry many
+// query params.
+function _internalUrl(input, allowedProtocols) {
+  return safeUrl.parse(input, {
+    allowedProtocols: allowedProtocols || safeUrl.ALLOW_HTTP_TLS,
+    errorClass:       ObjectStoreError,
+    maxUrlLength:     C.BYTES.kib(32),
+  });
+}
+
 function _arrayify(value) {
   if (value == null) return [];
   return Array.isArray(value) ? value : [value];
@@ -57,25 +70,13 @@ var DEFAULT_API_VERSION = "2024-08-04";
 // matching the SigV4 / V4 7-day cap keeps semantics uniform across
 // backends and reflects best practice (long-lived SAS tokens are
 // effectively credentials).
-var SAS_DEFAULT_EXPIRES_SECONDS = 15 * 60;
-var SAS_MAX_EXPIRES_SECONDS     = 7 * 24 * 60 * 60;
+var SAS_DEFAULT_EXPIRES_SECONDS = C.TIME.minutes(15) / C.TIME.seconds(1);
+var SAS_MAX_EXPIRES_SECONDS     = C.TIME.days(7)     / C.TIME.seconds(1);
 var SAS_MIN_EXPIRES_SECONDS     = 1;
 
 var _err = ObjectStoreError.factory;
 
-function _httpRequest(method, urlObj, headers, body, opts) {
-  return httpClient.request({
-    method:           method,
-    url:              urlObj,
-    headers:          headers,
-    body:             body,
-    idleTimeoutMs:    opts && opts.timeoutMs,
-    maxResponseBytes: opts && opts.maxResponseBytes,
-    errorClass:       ObjectStoreError,
-    allowedProtocols: opts && opts.allowedProtocols,
-  ...((opts && opts.allowInternal !== undefined) ? { allowInternal: opts.allowInternal } : {}),
-  });
-}
+var _httpRequest = sharedRequest;
 
 // ---- Shared Key signing ----
 //
@@ -101,7 +102,7 @@ function _httpRequest(method, urlObj, headers, body, opts) {
 
 function buildStringToSign(opts) {
   var headers = opts.headers || {};
-  var url = opts.url instanceof URL ? opts.url : new URL(opts.url);
+  var url = opts.url instanceof URL ? opts.url : _internalUrl(opts.url);
 
   var canonicalHeaders = (function () {
     var pairs = [];
@@ -133,7 +134,13 @@ function buildStringToSign(opts) {
       if (!grouped[p[0]]) grouped[p[0]] = [];
       grouped[p[0]].push(p[1]);
     });
-    var queryLines = Object.keys(grouped).sort().map(function (name) {
+    // Azure Shared Key canonicalized resource: sorted query param names,
+    // each on its own line as `name:value` — Azure-spec, not JSON
+    // canonicalization.
+    var groupedKeys = [];
+    for (var gk in grouped) groupedKeys.push(gk);
+    groupedKeys.sort();
+    var queryLines = groupedKeys.map(function (name) {
       return "\n" + name + ":" + grouped[name].join(",");
     }).join("");
     return resourcePath + queryLines;
@@ -163,7 +170,7 @@ function signRequest(opts) {
   if (!headers["x-ms-version"]) headers["x-ms-version"] = opts.apiVersion || DEFAULT_API_VERSION;
   if (!headers["x-ms-date"])    headers["x-ms-date"]    = new Date().toUTCString();
 
-  var url = opts.url instanceof URL ? opts.url : new URL(opts.url);
+  var url = opts.url instanceof URL ? opts.url : _internalUrl(opts.url);
   if (!headers["host"])         headers["host"]         = url.host;
 
   var sts = buildStringToSign({
@@ -200,7 +207,7 @@ function create(config) {
   if (allowInternal !== null) reqOpts.allowInternal = allowInternal;
 
   function _blobUrl(key, params) {
-    var u = new URL(endpoint + "/" + config.container + "/" + key);
+    var u = _internalUrl(endpoint + "/" + config.container + "/" + key, allowedProtocols);
     if (params) {
       Object.keys(params).forEach(function (k) { u.searchParams.set(k, params[k]); });
     }
@@ -208,7 +215,7 @@ function create(config) {
   }
 
   function _containerUrl(params) {
-    var u = new URL(endpoint + "/" + config.container);
+    var u = _internalUrl(endpoint + "/" + config.container, allowedProtocols);
     if (params) {
       Object.keys(params).forEach(function (k) { u.searchParams.set(k, params[k]); });
     }
@@ -323,7 +330,7 @@ function create(config) {
     var nowDate = opts.date || new Date();
     var expiry = new Date(nowDate.getTime() + C.TIME.seconds(expiresIn));
     // Azure accepts ISO 8601 with second precision; strip ms.
-    var signedExpiry = expiry.toISOString().replace(/\.\d{3}Z$/, "Z");
+    var signedExpiry = time.toIso8601NoMs(expiry);
     var signedStart  = "";  // omitted = SAS valid immediately
     var signedVersion = apiVersion;
     var signedResource = "b";  // blob
@@ -383,7 +390,7 @@ function create(config) {
     }
 
     var token = _buildSasToken(permissions, opts);
-    var url = new URL(endpoint + "/" + config.container + "/" + opts.key + "?" + token.sas);
+    var url = _internalUrl(endpoint + "/" + config.container + "/" + opts.key + "?" + token.sas, allowedProtocols);
 
     var clientHeaders = {};
     if (opts.contentType) clientHeaders["Content-Type"] = opts.contentType;

package/lib/object-store/gcs-bucket-ops.js

@@ -30,10 +30,28 @@ var httpClient = require("../http-client");
 var safeJson = require("../safe-json");
 var safeUrl = require("../safe-url");
 var C = require("../constants");
+var requestHelpers = require("../request-helpers");
 var { ObjectStoreError } = require("../framework-error");
 
 var _err = ObjectStoreError.factory;
 
+// HTTP status constants used in the bucket-ops expectStatus arrays.
+var HTTP_OK         = requestHelpers.HTTP_STATUS.OK;
+var HTTP_NO_CONTENT = requestHelpers.HTTP_STATUS.NO_CONTENT;
+var HTTP_NOT_FOUND  = requestHelpers.HTTP_STATUS.NOT_FOUND;
+var HTTP_CONFLICT   = requestHelpers.HTTP_STATUS.CONFLICT;
+
+// Internal URL builder — endpoint + path string from validated config.
+// Routes through safeUrl.parse so the protocol allowlist + length cap
+// apply uniformly.
+function _internalUrl(input, allowedProtocols) {
+  return safeUrl.parse(input, {
+    allowedProtocols: allowedProtocols || safeUrl.ALLOW_HTTP_TLS,
+    errorClass:       ObjectStoreError,
+    maxUrlLength:     C.BYTES.kib(32),
+  });
+}
+
 // GCS bucket names: 3-63 chars, lowercase letters / digits / hyphens /
 // underscores / dots; can't start or end with hyphen; can't contain '..'
 // or 'goog' prefix; can't be IP address. Most violations the API will
@@ -49,7 +67,9 @@ function _validateBucketName(name) {
     throw _err("BUCKET_INVALID_NAME",
       "gcs bucketOps: bucket name must be 3-63 chars (got " + name.length + ")", true);
   }
-  if (!BUCKET_NAME_RE.test(name)) {
+  // Length is bounded above (3..63) before the regex runs so the
+  // pattern can't be driven against an unbounded input.
+  if (name.length > 63 || !BUCKET_NAME_RE.test(name)) {
     throw _err("BUCKET_INVALID_NAME",
       "gcs bucketOps: bucket name '" + name + "' is invalid; lowercase " +
       "letters / digits / hyphens / underscores / dots only, must start " +
@@ -194,10 +214,10 @@ function create(config) {
     var bodyStr = "grant_type=" + encodeURIComponent("urn:ietf:params:oauth:grant-type:jwt-bearer") +
                   "&assertion=" + encodeURIComponent(assertion);
     var bodyBuf = Buffer.from(bodyStr, "utf8");
-    var res = await _request("POST", new URL(tokenEndpoint), {
+    var res = await _request("POST", _internalUrl(tokenEndpoint, allowedProtocols), {
       "Content-Type":   "application/x-www-form-urlencoded",
       "Content-Length": String(bodyBuf.length),
-    }, bodyBuf, [200]);
+    }, bodyBuf, [HTTP_OK]);
     var tokenResp = safeJson.parse(res.body);
     if (!tokenResp.access_token) {
       throw _err("AUTH_FAILED",
@@ -212,15 +232,19 @@ function create(config) {
     return cachedToken.accessToken;
   }
 
-  function _bucketBaseUrl() {
-    return endpoint + "/storage/v1/b";
+  // Returns a parsed URL ready for `.searchParams` mutation. The bucket
+  // base path is "/storage/v1/b"; suffix (e.g., "/" + bucket name) is
+  // appended before parsing so safeUrl.parse owns every URL we hand to
+  // httpClient.
+  function _bucketBaseUrl(suffix) {
+    return _internalUrl(endpoint + "/storage/v1/b" + (suffix || ""), allowedProtocols);
   }
 
   async function createBucket(name, opts) {
     _validateBucketName(name);
     opts = opts || {};
     var token = await _ensureToken();
-    var url = new URL(_bucketBaseUrl());
+    var url = _bucketBaseUrl();
     url.searchParams.set("project", projectId);
     var bodyObj = { name: name };
     if (opts.location)     bodyObj.location     = opts.location;
@@ -231,8 +255,8 @@ function create(config) {
       "Content-Type":   "application/json",
       "Content-Length": String(bodyBuf.length),
     });
-    var res = await _request("POST", url, headers, bodyBuf, [200, 409]);
-    if (res.statusCode === 409) {
+    var res = await _request("POST", url, headers, bodyBuf, [HTTP_OK, HTTP_CONFLICT]);
+    if (res.statusCode === HTTP_CONFLICT) {
       throw _err("BUCKET_ALREADY_OWNED",
         "gcs bucketOps: bucket '" + name + "' already exists", true);
     }
@@ -247,22 +271,22 @@ function create(config) {
   async function deleteBucket(name) {
     _validateBucketName(name);
     var token = await _ensureToken();
-    var url = new URL(_bucketBaseUrl() + "/" + encodeURIComponent(name));
+    var url = _bucketBaseUrl("/" + encodeURIComponent(name));
     var headers = authHeader.bearer(token);
-    var res = await _request("DELETE", url, headers, null, [204, 404]);
-    return res.statusCode === 204;
+    var res = await _request("DELETE", url, headers, null, [HTTP_NO_CONTENT, HTTP_NOT_FOUND]);
+    return res.statusCode === HTTP_NO_CONTENT;
   }
 
   async function listBuckets(opts) {
     opts = opts || {};
     var token = await _ensureToken();
-    var url = new URL(_bucketBaseUrl());
+    var url = _bucketBaseUrl();
     url.searchParams.set("project", projectId);
     if (opts.prefix)     url.searchParams.set("prefix", opts.prefix);
     if (opts.maxResults) url.searchParams.set("maxResults", String(opts.maxResults));
     if (opts.pageToken)  url.searchParams.set("pageToken", opts.pageToken);
     var headers = authHeader.bearer(token);
-    var res = await _request("GET", url, headers, null, [200]);
+    var res = await _request("GET", url, headers, null, [HTTP_OK]);
     var parsed = safeJson.parse(res.body);
     var items = Array.isArray(parsed.items) ? parsed.items : [];
     return items.map(function (item) {
@@ -284,14 +308,14 @@ function create(config) {
     }
     rules.forEach(_validateLifecycleRule);
     var token = await _ensureToken();
-    var url = new URL(_bucketBaseUrl() + "/" + encodeURIComponent(name));
+    var url = _bucketBaseUrl("/" + encodeURIComponent(name));
     var bodyObj = { lifecycle: { rule: rules } };
     var bodyBuf = Buffer.from(JSON.stringify(bodyObj), "utf8");
     var headers = Object.assign(authHeader.bearer(token), {
       "Content-Type":   "application/json",
       "Content-Length": String(bodyBuf.length),
     });
-    await _request("PATCH", url, headers, bodyBuf, [200]);
+    await _request("PATCH", url, headers, bodyBuf, [HTTP_OK]);
     return { rulesApplied: rules.length };
   }
 
@@ -303,14 +327,14 @@ function create(config) {
     }
     rules.forEach(_validateCorsRule);
     var token = await _ensureToken();
-    var url = new URL(_bucketBaseUrl() + "/" + encodeURIComponent(name));
+    var url = _bucketBaseUrl("/" + encodeURIComponent(name));
     var bodyObj = { cors: rules };
     var bodyBuf = Buffer.from(JSON.stringify(bodyObj), "utf8");
     var headers = Object.assign(authHeader.bearer(token), {
       "Content-Type":   "application/json",
       "Content-Length": String(bodyBuf.length),
     });
-    await _request("PATCH", url, headers, bodyBuf, [200]);
+    await _request("PATCH", url, headers, bodyBuf, [HTTP_OK]);
     return { rulesApplied: rules.length };
   }
 

package/lib/object-store/gcs.js

@@ -24,16 +24,28 @@
  */
 var fs = require("fs");
 var nodeCrypto = require("crypto");
-var { URL } = require("url");
 var { Readable } = require("stream");
 var safeJson = require("../safe-json");
 var C = require("../constants");
+var nb = require("../numeric-bounds");
 var { ObjectStoreError } = require("../framework-error");
-var httpClient = require("../http-client");
 var safeUrl = require("../safe-url");
+var sharedRequest = require("./http-request");
 var authHeader = require("../auth-header");
 var sigv4 = require("./sigv4");
 
+// Internal URL builder — endpoint + path string from validated config.
+// Routes through safeUrl.parse so the protocol allowlist + length cap
+// apply uniformly. Cap is generous since presigned URLs can carry many
+// query params.
+function _internalUrl(input, allowedProtocols) {
+  return safeUrl.parse(input, {
+    allowedProtocols: allowedProtocols || safeUrl.ALLOW_HTTP_TLS,
+    errorClass:       ObjectStoreError,
+    maxUrlLength:     C.BYTES.kib(32),
+  });
+}
+
 // V4 query-string presigning. GCS uses the same canonical-request
 // shape as AWS SigV4, differing only in:
 //   - algorithm:        GOOG4-RSA-SHA256 (RSA service-account signing)
@@ -47,8 +59,8 @@ var GCS_V4_SERVICE   = "storage";
 var GCS_V4_REGION    = "auto";
 
 // Same expiry bounds as SigV4 — V4 presigning shares the spec's 7-day cap.
-var PRESIGN_DEFAULT_EXPIRES_SECONDS = 15 * 60;
-var PRESIGN_MAX_EXPIRES_SECONDS     = 7 * 24 * 60 * 60;
+var PRESIGN_DEFAULT_EXPIRES_SECONDS = C.TIME.minutes(15) / C.TIME.seconds(1);
+var PRESIGN_MAX_EXPIRES_SECONDS     = C.TIME.days(7)     / C.TIME.seconds(1);
 var PRESIGN_MIN_EXPIRES_SECONDS     = 1;
 
 var SERVICE_ACCOUNT_SCHEMA = {
@@ -71,19 +83,7 @@ var _err = ObjectStoreError.factory;
 
 // ---- Generic HTTP helper (separate from sigv4's; no signing here) ----
 
-function _httpRequest(method, urlObj, headers, body, opts) {
-  return httpClient.request({
-    method:           method,
-    url:              urlObj,
-    headers:          headers,
-    body:             body,
-    idleTimeoutMs:    opts && opts.timeoutMs,
-    maxResponseBytes: opts && opts.maxResponseBytes,
-    errorClass:       ObjectStoreError,
-    allowedProtocols: opts && opts.allowedProtocols,
-  ...((opts && opts.allowInternal !== undefined) ? { allowInternal: opts.allowInternal } : {}),
-  });
-}
+var _httpRequest = sharedRequest;
 
 // ---- JWT signing for service-account auth ----
 
@@ -95,14 +95,14 @@ function _base64UrlEncode(buf) {
 }
 
 function _signJwt(serviceAccount, scope, audience) {
-  var nowSec = Math.floor(Date.now() / 1000);
+  var nowSec = Math.floor(Date.now() / C.TIME.seconds(1));
   var header = { alg: "RS256", typ: "JWT" };
   var claim = {
     iss:   serviceAccount.client_email,
     scope: scope,
     aud:   audience || TOKEN_ENDPOINT,
     iat:   nowSec,
-    exp:   nowSec + 3600,
+    exp:   nowSec + (C.TIME.hours(1) / C.TIME.seconds(1)),
   };
   var headerB64 = _base64UrlEncode(JSON.stringify(header));
   var claimB64  = _base64UrlEncode(JSON.stringify(claim));
@@ -163,7 +163,7 @@ function create(config) {
     var bodyBuf = Buffer.from(bodyStr, "utf8");
     var res = await _httpRequest(
       "POST",
-      new URL(tokenEndpoint),
+      _internalUrl(tokenEndpoint, allowedProtocols),
       {
         "Content-Type":   "application/x-www-form-urlencoded",
         "Content-Length": String(bodyBuf.length),
@@ -184,8 +184,8 @@ function create(config) {
   }
 
   function _objectUrl(key, params) {
-    var u = new URL(endpoint + "/storage/v1/b/" + encodeURIComponent(bucket) +
-                    "/o/" + encodeURIComponent(key));
+    var u = _internalUrl(endpoint + "/storage/v1/b/" + encodeURIComponent(bucket) +
+                    "/o/" + encodeURIComponent(key), allowedProtocols);
     if (params) {
       Object.keys(params).forEach(function (k) { u.searchParams.set(k, params[k]); });
     }
@@ -193,14 +193,14 @@ function create(config) {
   }
 
   function _uploadUrl(key) {
-    var u = new URL(endpoint + "/upload/storage/v1/b/" + encodeURIComponent(bucket) + "/o");
+    var u = _internalUrl(endpoint + "/upload/storage/v1/b/" + encodeURIComponent(bucket) + "/o", allowedProtocols);
     u.searchParams.set("uploadType", "media");
     u.searchParams.set("name", key);
     return u;
   }
 
   function _listUrl(prefix, opts) {
-    var u = new URL(endpoint + "/storage/v1/b/" + encodeURIComponent(bucket) + "/o");
+    var u = _internalUrl(endpoint + "/storage/v1/b/" + encodeURIComponent(bucket) + "/o", allowedProtocols);
     if (prefix)                      u.searchParams.set("prefix", prefix);
     if (opts && opts.maxResults)     u.searchParams.set("maxResults", String(opts.maxResults));
     if (opts && opts.pageToken)      u.searchParams.set("pageToken", opts.pageToken);
@@ -303,19 +303,22 @@ function create(config) {
     var encodedKey = opts.key.split("/")
       .map(function (s) { return sigv4.awsUriEncode(s, true); })
       .join("/");
-    var url = new URL(endpoint + "/" + encodeURIComponent(bucket) + "/" + encodedKey);
+    var url = _internalUrl(endpoint + "/" + encodeURIComponent(bucket) + "/" + encodedKey, allowedProtocols);
 
     var date = opts.date || new Date();
     // Reuse SigV4's date formatters — the wire format is identical.
-    var iso = date.toISOString().replace(/[-:]/g, "");
-    var amzDate = iso.slice(0, 8) + "T" + iso.slice(9, 15) + "Z";
-    var dateStamp = date.toISOString().slice(0, 10).replace(/-/g, "");
+    var amzDate = sigv4.formatAmzDate(date);
+    var dateStamp = sigv4.formatDateStamp(date);
     var credentialScope = dateStamp + "/" + GCS_V4_REGION + "/" +
                           GCS_V4_SERVICE + "/goog4_request";
 
     var headers = { host: url.host };
     if (opts.contentType) headers["content-type"] = opts.contentType;
-    var signedHeadersStr = Object.keys(headers).sort().join(";");
+    // GCS V4 SignedHeaders: lowercase, semicolon-joined, AWS-spec order.
+    var signedHeaderKeys = [];
+    for (var hk in headers) signedHeaderKeys.push(hk);
+    signedHeaderKeys.sort();
+    var signedHeadersStr = signedHeaderKeys.join(";");
 
     url.searchParams.set("X-Goog-Algorithm",     GCS_V4_ALGORITHM);
     url.searchParams.set("X-Goog-Credential",    serviceAccount.client_email + "/" + credentialScope);
@@ -379,7 +382,12 @@ function create(config) {
         "POST-form policy enforces body size via the content-length-range condition; " +
         "use presignedUploadUrl if size enforcement is not needed", true);
     }
-    var minBytes = (typeof opts.minBytes === "number" && opts.minBytes >= 0) ? opts.minBytes : 0;
+    if (opts.minBytes !== undefined && !nb.isNonNegativeFiniteInt(opts.minBytes)) {
+      throw _err("INVALID_MIN_BYTES",
+        "presignedUploadPolicy: minBytes must be a non-negative finite integer; got " +
+        nb.shape(opts.minBytes), true);
+    }
+    var minBytes = opts.minBytes !== undefined ? opts.minBytes : 0;
     var expiresIn = opts.expiresIn != null ? opts.expiresIn : PRESIGN_DEFAULT_EXPIRES_SECONDS;
     if (typeof expiresIn !== "number" ||
         expiresIn < PRESIGN_MIN_EXPIRES_SECONDS ||
@@ -391,9 +399,8 @@ function create(config) {
     }
 
     var date = opts.date || new Date();
-    var iso = date.toISOString().replace(/[-:]/g, "");
-    var amzDate = iso.slice(0, 8) + "T" + iso.slice(9, 15) + "Z";
-    var dateStamp = date.toISOString().slice(0, 10).replace(/-/g, "");
+    var amzDate = sigv4.formatAmzDate(date);
+    var dateStamp = sigv4.formatDateStamp(date);
     var credentialScope = dateStamp + "/" + GCS_V4_REGION + "/" +
                           GCS_V4_SERVICE + "/goog4_request";
     var credential = serviceAccount.client_email + "/" + credentialScope;
@@ -431,7 +438,7 @@ function create(config) {
     };
     if (opts.contentType) fields["content-type"] = opts.contentType;
 
-    var url = new URL(endpoint + "/" + encodeURIComponent(bucket) + "/");
+    var url = _internalUrl(endpoint + "/" + encodeURIComponent(bucket) + "/", allowedProtocols);
 
     return {
       url:         url.toString(),

package/lib/object-store/http-put.js

@@ -18,8 +18,8 @@
  */
 var { Readable } = require("stream");
 var { ObjectStoreError } = require("../framework-error");
-var httpClient = require("../http-client");
 var safeUrl = require("../safe-url");
+var sharedRequest = require("./http-request");
 var authHeader = require("../auth-header");
 
 var _err = ObjectStoreError.factory;
@@ -36,16 +36,7 @@ function _authHeaders(authConfig) {
 }
 
 function _request(method, url, body, headers, opts) {
-  return httpClient.request({
-    method:           method,
-    url:              url,
-    headers:          headers,
-    body:             body,
-    idleTimeoutMs:    opts && opts.timeoutMs,
-    errorClass:       ObjectStoreError,
-    allowedProtocols: opts && opts.allowedProtocols,
-  ...((opts && opts.allowInternal !== undefined) ? { allowInternal: opts.allowInternal } : {}),
-  });
+  return sharedRequest(method, url, headers, body, opts);
 }
 
 function _keyToUrl(baseUrl, key) {

package/lib/object-store/http-request.js

@@ -0,0 +1,38 @@
+"use strict";
+/**
+ * Shared HTTP-request helper for object-store backends.
+ *
+ * Every protocol backend (azure-blob / gcs / sigv4 / http-put)
+ * previously rolled an identical wrapper around httpClient.request that
+ * threaded the same five opts: idleTimeoutMs / maxResponseBytes /
+ * errorClass / allowedProtocols / allowInternal. Centralized here so a
+ * future change to the call shape (new opt, different error class
+ * default, etc.) is a one-file change.
+ *
+ *   var sharedRequest = require("./http-request");
+ *   sharedRequest("PUT", url, headers, body, { timeoutMs: 5000 });
+ *
+ * The errorClass defaults to ObjectStoreError; backends that need a
+ * different class pass `errorClass: SomeError` in opts.
+ */
+
+var httpClient = require("../http-client");
+var { ObjectStoreError } = require("../framework-error");
+
+function request(method, url, headers, body, opts) {
+  opts = opts || {};
+  var req = {
+    method:           method,
+    url:              url,
+    headers:          headers,
+    body:             body,
+    idleTimeoutMs:    opts.timeoutMs,
+    errorClass:       opts.errorClass || ObjectStoreError,
+    allowedProtocols: opts.allowedProtocols,
+  };
+  if (opts.maxResponseBytes !== undefined) req.maxResponseBytes = opts.maxResponseBytes;
+  if (opts.allowInternal !== undefined) req.allowInternal = opts.allowInternal;
+  return httpClient.request(req);
+}
+
+module.exports = request;

package/lib/object-store/index.js

@@ -35,7 +35,7 @@ var gcsProto               = require("./gcs");
 var gcsBucketOps           = require("./gcs-bucket-ops");
 var azureBlobProto         = require("./azure-blob");
 var azureBlobBucketOps     = require("./azure-blob-bucket-ops");
-var retryHelper            = require("./retry");
+var retryHelper            = require("../retry");
 var protocolDispatcher     = require("../protocol-dispatcher");
 var { ObjectStoreError }   = require("../framework-error");