stratus-db 0.2.0 → 0.2.1

package/README.md

@@ -51,7 +51,8 @@ of the intended type.
 ## API
 
 All methods return promises; failures reject with `StratusError` (`status`, `error` - e.g.
-`"invalid-query"`, `"conflict"` -, `message`). 429s are retried with backoff (`retries`).
+`"invalid-query"`, `"conflict"` -, `message`). 429s are retried with backoff (`retries`), and so is API
+Gateway's 403 Forbidden for a brand-new key, which works within a minute or two (`newKeyWaitMs`, 120000).
 
 - Catalog: `listDbs({deleted})`, `dbByName(name)`, `dbRecord(id)`, `createDb({name, primaryKey})`,
   `renameDb(id, name)`, `deleteDb(id)`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stratus-db",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "The stratus-db service from JavaScript: typed JSON over fetch, no dependencies.",
   "homepage": "https://stratus-db.com",
   "license": "Apache-2.0",

package/stratus-db.js

@@ -18,7 +18,7 @@
 // against a local service, opts.caller names the caller (x-stratus-caller).
 
 /** The client's version: package.json's, which release-js.yml checks against it. */
-export const VERSION = "0.2.0";
+export const VERSION = "0.2.1";
 
 const USER_AGENT = `stratus-db-js/${VERSION}`;
 const IN_NODE = typeof process !== "undefined" && process.versions != null && process.versions.node != null;
@@ -537,6 +537,8 @@ export function connect(opts) {
   return new Client(opts);
 }
 
+const GATEWAY_FORBIDDEN = /^\s*\{\s*"message"\s*:\s*"Forbidden"\s*\}\s*$/;
+
 export class Client {
   /**
    * @param {object} opts
@@ -545,6 +547,8 @@ export class Client {
    * @param {"hosted"|"function-urls"} [opts.addressing]
    * @param {string} [opts.caller]       x-stratus-caller, for a local service
    * @param {number} [opts.retries]      attempts after a 429 (default 10)
+   * @param {number} [opts.newKeyWaitMs] how long to keep retrying API Gateway's own 403 Forbidden, which a
+   *                                     brand-new key gets for its first minute or so (default 120000; 0: never)
    * @param {number} [opts.resolveMs]    function-urls: how long a database's URL is cached (5 minutes)
    * @param {typeof fetch} [opts.fetch]  default globalThis.fetch
    */
@@ -556,6 +560,7 @@ export class Client {
     this.apiKey = opts.apiKey;
     this.caller = opts.caller;
     this.retries = opts.retries ?? 10;
+    this.newKeyWaitMs = opts.newKeyWaitMs ?? 120000;
     this.resolveMs = opts.resolveMs ?? 300000;
     this.fetch = opts.fetch ?? globalThis.fetch;
     this.urls = { at: 0, byId: new Map() };
@@ -570,7 +575,8 @@ export class Client {
     if (body !== undefined) headers["content-type"] = "application/json";
     if (this.apiKey) headers.authorization = `Bearer ${this.apiKey}`;
     if (this.caller) headers["x-stratus-caller"] = this.caller;
-    for (let attempt = 0; ; attempt++) {
+    const started = Date.now();
+    for (let attempt = 0, forbidden = 0; ; attempt++) {
       const r = await this.fetch(url, { method, headers, body: body === undefined ? undefined : encode(body) });
       const textBody = await r.text();
       if (r.status === 429 && attempt < this.retries) {
@@ -578,6 +584,12 @@ export class Client {
         await sleep(Math.random() * Math.min(5000, 50 * 2 ** attempt));
         continue;
       }
+      // API Gateway's own refusal of a key it hasn't learned yet (a new key, its first minute or so):
+      // {"message":"Forbidden"} - the service's own errors always carry "error", and aren't retried
+      if (r.status === 403 && GATEWAY_FORBIDDEN.test(textBody) && Date.now() - started < this.newKeyWaitMs) {
+        await sleep(Math.min(15000, 1000 * 2 ** forbidden++));
+        continue;
+      }
       const ct = r.headers.get("content-type") ?? "";
       let value = textBody;
       if (ct.startsWith("application/json") && textBody !== "") {