@naturalcycles/js-lib 14.131.2 → 14.133.0

package/dist/http/fetcher.js

@@ -30,26 +30,25 @@ class Fetcher {
         this.cfg = this.normalizeCfg(cfg);
         // Dynamically create all helper methods
         http_model_1.HTTP_METHODS.forEach(method => {
-            // mode=void
-            this[`${method}Void`] = async (url, opt) => {
+            const m = method.toLowerCase();
+            this[`${m}Void`] = async (url, opt) => {
                 return await this.fetch(url, {
                     method,
                     mode: 'void',
                     ...opt,
                 });
             };
-            if (method === 'head')
+            if (method === 'HEAD')
                 return // mode=text
                 ;
-            this[`${method}Text`] = async (url, opt) => {
+            this[`${m}Text`] = async (url, opt) => {
                 return await this.fetch(url, {
                     method,
                     mode: 'text',
                     ...opt,
                 });
             };
-            // Default mode=json, but overridable
-            this[method] = async (url, opt) => {
+            this[m] = async (url, opt) => {
                 return await this.fetch(url, {
                     method,
                     mode: 'json',
@@ -118,7 +117,7 @@ class Fetcher {
         };
         const fullUrl = new URL(req.url);
         const shortUrl = this.getShortUrl(fullUrl);
-        const signature = [method.toUpperCase(), shortUrl].join(' ');
+        const signature = [method, shortUrl].join(' ');
         /* eslint-disable no-await-in-loop */
         while (!res.retryStatus.retryStopped) {
             const started = Date.now();
@@ -263,7 +262,7 @@ class Fetcher {
     shouldRetry(res) {
         const { retryPost, retry4xx, retry5xx } = res.req;
         const { method } = res.req.init;
-        if (method === 'post' && !retryPost)
+        if (method === 'POST' && !retryPost)
             return false;
         const { statusFamily } = res;
         const statusCode = res.fetchResponse?.status || 0;
@@ -336,7 +335,7 @@ class Fetcher {
             logWithSearchParams: true,
             retry: { ...defRetryOptions },
             init: {
-                method: cfg.method || 'get',
+                method: cfg.method || 'GET',
                 headers: cfg.headers || {},
                 credentials: cfg.credentials,
             },
@@ -346,7 +345,7 @@ class Fetcher {
         return norm;
     }
     normalizeOptions(url, opt) {
-        const { baseUrl, timeoutSeconds, throwHttpErrors, retryPost, retry4xx, retry5xx, retry, mode, jsonReviver, } = this.cfg;
+        const { timeoutSeconds, throwHttpErrors, retryPost, retry4xx, retry5xx, retry, mode, jsonReviver, } = this.cfg;
         const req = {
             mode,
             url,
@@ -371,6 +370,7 @@ class Fetcher {
             }),
         };
         // setup url
+        const baseUrl = opt.baseUrl || this.cfg.baseUrl;
         if (baseUrl) {
             if (url.startsWith('/')) {
                 console.warn(`Fetcher: url should not start with / when baseUrl is specified`);

package/dist/http/fetcher.model.d.ts

@@ -68,7 +68,7 @@ export interface FetcherRetryOptions {
     timeoutMax: number;
     timeoutMultiplier: number;
 }
-export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers'> {
+export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers' | 'baseUrl'> {
     url: string;
     init: RequestInitNormalized;
     mode: FetcherMode;
@@ -81,6 +81,7 @@ export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers
 }
 export interface FetcherOptions {
     method?: HttpMethod;
+    baseUrl?: string;
     throwHttpErrors?: boolean;
     /**
      * Default: 30.

package/dist/http/http.model.d.ts

@@ -1,3 +1,3 @@
-export type HttpMethod = 'get' | 'post' | 'put' | 'patch' | 'delete' | 'head';
+export type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'HEAD';
 export type HttpStatusFamily = 5 | 4 | 3 | 2 | 1;
 export declare const HTTP_METHODS: HttpMethod[];

package/dist/http/http.model.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTTP_METHODS = void 0;
-exports.HTTP_METHODS = ['get', 'post', 'put', 'patch', 'delete', 'head'];
+exports.HTTP_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD'];

package/dist-esm/http/fetcher.js

@@ -28,18 +28,17 @@ export class Fetcher {
         this.cfg = this.normalizeCfg(cfg);
         // Dynamically create all helper methods
         HTTP_METHODS.forEach(method => {
-            // mode=void
-            this[`${method}Void`] = async (url, opt) => {
+            const m = method.toLowerCase();
+            this[`${m}Void`] = async (url, opt) => {
                 return await this.fetch(url, Object.assign({ method, mode: 'void' }, opt));
             };
-            if (method === 'head')
+            if (method === 'HEAD')
                 return // mode=text
                 ;
-            this[`${method}Text`] = async (url, opt) => {
+            this[`${m}Text`] = async (url, opt) => {
                 return await this.fetch(url, Object.assign({ method, mode: 'text' }, opt));
             };
-            // Default mode=json, but overridable
-            this[method] = async (url, opt) => {
+            this[m] = async (url, opt) => {
                 return await this.fetch(url, Object.assign({ method, mode: 'json' }, opt));
             };
         });
@@ -126,7 +125,7 @@ export class Fetcher {
         };
         const fullUrl = new URL(req.url);
         const shortUrl = this.getShortUrl(fullUrl);
-        const signature = [method.toUpperCase(), shortUrl].join(' ');
+        const signature = [method, shortUrl].join(' ');
         /* eslint-disable no-await-in-loop */
         while (!res.retryStatus.retryStopped) {
             const started = Date.now();
@@ -302,7 +301,7 @@ export class Fetcher {
         var _a;
         const { retryPost, retry4xx, retry5xx } = res.req;
         const { method } = res.req.init;
-        if (method === 'post' && !retryPost)
+        if (method === 'POST' && !retryPost)
             return false;
         const { statusFamily } = res;
         const statusCode = ((_a = res.fetchResponse) === null || _a === void 0 ? void 0 : _a.status) || 0;
@@ -377,7 +376,7 @@ export class Fetcher {
             logWithSearchParams: true,
             retry: Object.assign({}, defRetryOptions),
             init: {
-                method: cfg.method || 'get',
+                method: cfg.method || 'GET',
                 headers: cfg.headers || {},
                 credentials: cfg.credentials,
             },
@@ -388,7 +387,7 @@ export class Fetcher {
     }
     normalizeOptions(url, opt) {
         var _a, _b;
-        const { baseUrl, timeoutSeconds, throwHttpErrors, retryPost, retry4xx, retry5xx, retry, mode, jsonReviver, } = this.cfg;
+        const { timeoutSeconds, throwHttpErrors, retryPost, retry4xx, retry5xx, retry, mode, jsonReviver, } = this.cfg;
         const req = Object.assign(Object.assign({ mode,
             url,
             timeoutSeconds,
@@ -400,6 +399,7 @@ export class Fetcher {
                 headers: _mapKeys(opt.headers || {}, k => k.toLowerCase()),
             }) });
         // setup url
+        const baseUrl = opt.baseUrl || this.cfg.baseUrl;
         if (baseUrl) {
             if (url.startsWith('/')) {
                 console.warn(`Fetcher: url should not start with / when baseUrl is specified`);

package/dist-esm/http/http.model.js

@@ -1 +1 @@
-export const HTTP_METHODS = ['get', 'post', 'put', 'patch', 'delete', 'head'];
+export const HTTP_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.131.2",
+  "version": "14.133.0",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/src/http/fetcher.model.ts

@@ -79,7 +79,7 @@ export interface FetcherRetryOptions {
   timeoutMultiplier: number
 }
 
-export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers'> {
+export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers' | 'baseUrl'> {
   url: string
   init: RequestInitNormalized
   mode: FetcherMode
@@ -93,6 +93,9 @@ export interface FetcherRequest extends Omit<FetcherOptions, 'method' | 'headers
 
 export interface FetcherOptions {
   method?: HttpMethod
+
+  baseUrl?: string
+
   throwHttpErrors?: boolean
   /**
    * Default: 30.

package/src/http/fetcher.ts

@@ -51,8 +51,10 @@ export class Fetcher {
 
     // Dynamically create all helper methods
     HTTP_METHODS.forEach(method => {
+      const m = method.toLowerCase()
+
       // mode=void
-      this[`${method}Void`] = async (url: string, opt?: FetcherOptions): Promise<void> => {
+      ;(this as any)[`${m}Void`] = async (url: string, opt?: FetcherOptions): Promise<void> => {
         return await this.fetch<void>(url, {
           method,
           mode: 'void',
@@ -60,11 +62,8 @@ export class Fetcher {
         })
       }
 
-      if (method === 'head') return // mode=text
-      ;(this as any)[`${method}Text`] = async (
-        url: string,
-        opt?: FetcherOptions,
-      ): Promise<string> => {
+      if (method === 'HEAD') return // mode=text
+      ;(this as any)[`${m}Text`] = async (url: string, opt?: FetcherOptions): Promise<string> => {
         return await this.fetch<string>(url, {
           method,
           mode: 'text',
@@ -73,7 +72,7 @@ export class Fetcher {
       }
 
       // Default mode=json, but overridable
-      this[method] = async <T = unknown>(url: string, opt?: FetcherOptions): Promise<T> => {
+      ;(this as any)[m] = async <T = unknown>(url: string, opt?: FetcherOptions): Promise<T> => {
         return await this.fetch<T>(url, {
           method,
           mode: 'json',
@@ -181,7 +180,7 @@ export class Fetcher {
 
     const fullUrl = new URL(req.url)
     const shortUrl = this.getShortUrl(fullUrl)
-    const signature = [method.toUpperCase(), shortUrl].join(' ')
+    const signature = [method, shortUrl].join(' ')
 
     /* eslint-disable no-await-in-loop */
     while (!res.retryStatus.retryStopped) {
@@ -347,7 +346,7 @@ export class Fetcher {
   private shouldRetry(res: FetcherResponse): boolean {
     const { retryPost, retry4xx, retry5xx } = res.req
     const { method } = res.req.init
-    if (method === 'post' && !retryPost) return false
+    if (method === 'POST' && !retryPost) return false
     const { statusFamily } = res
     const statusCode = res.fetchResponse?.status || 0
     if (statusFamily === 5 && !retry5xx) return false
@@ -421,7 +420,7 @@ export class Fetcher {
         logWithSearchParams: true,
         retry: { ...defRetryOptions },
         init: {
-          method: cfg.method || 'get',
+          method: cfg.method || 'GET',
           headers: cfg.headers || {},
           credentials: cfg.credentials,
         },
@@ -437,7 +436,6 @@ export class Fetcher {
 
   private normalizeOptions(url: string, opt: FetcherOptions): FetcherRequest {
     const {
-      baseUrl,
       timeoutSeconds,
       throwHttpErrors,
       retryPost,
@@ -476,6 +474,7 @@ export class Fetcher {
     }
 
     // setup url
+    const baseUrl = opt.baseUrl || this.cfg.baseUrl
     if (baseUrl) {
       if (url.startsWith('/')) {
         console.warn(`Fetcher: url should not start with / when baseUrl is specified`)

package/src/http/http.model.ts

@@ -1,5 +1,6 @@
-export type HttpMethod = 'get' | 'post' | 'put' | 'patch' | 'delete' | 'head'
+// Should be uppercase, because e.g this browser issue: https://github.com/axios/axios/issues/26
+export type HttpMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'HEAD'
 
 export type HttpStatusFamily = 5 | 4 | 3 | 2 | 1
 
-export const HTTP_METHODS: HttpMethod[] = ['get', 'post', 'put', 'patch', 'delete', 'head']
+export const HTTP_METHODS: HttpMethod[] = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD']