@scaleway/sdk 0.1.0-beta.9 → 1.0.0

package/dist/scw/errors/standard/resource-expired-error.js

@@ -5,7 +5,6 @@ import { ScalewayError } from '../scw-error.js';
  *
  * @public
  */
-
 class ResourceExpiredError extends ScalewayError {
   constructor(status, body, resource, resourceId, expiredSince) {
     super(status, body, `resource ${resource} with ID ${resourceId} expired since ${expiredSince.toISOString()}`);
@@ -16,12 +15,12 @@ class ResourceExpiredError extends ScalewayError {
     this.expiredSince = expiredSince;
     this.name = 'ResourceExpiredError';
   }
-
   static fromJSON(status, obj) {
-    if (typeof obj.resource !== 'string' || typeof obj.resource_id !== 'string' || typeof obj.expired_since !== 'string') return null;
+    if (typeof obj.resource !== 'string' || typeof obj.resource_id !== 'string' || typeof obj.expired_since !== 'string') {
+      return null;
+    }
     return new ResourceExpiredError(status, obj, obj.resource, obj.resource_id, new Date(obj.expired_since));
   }
-
 }
 
 export { ResourceExpiredError };

package/dist/scw/errors/standard/resource-locked-error.js

@@ -5,7 +5,6 @@ import { ScalewayError } from '../scw-error.js';
  *
  * @public
  */
-
 class ResourceLockedError extends ScalewayError {
   constructor(status, body, resource, resourceId) {
     super(status, body, `resource ${resource} with ID ${resourceId} is locked`);
@@ -15,12 +14,12 @@ class ResourceLockedError extends ScalewayError {
     this.resourceId = resourceId;
     this.name = 'ResourceLockedError';
   }
-
   static fromJSON(status, obj) {
-    if (typeof obj.resource !== 'string' || typeof obj.resource_id !== 'string') return null;
+    if (typeof obj.resource !== 'string' || typeof obj.resource_id !== 'string') {
+      return null;
+    }
     return new ResourceLockedError(status, obj, obj.resource, obj.resource_id);
   }
-
 }
 
 export { ResourceLockedError };

package/dist/scw/errors/standard/resource-not-found-error.js

@@ -5,7 +5,6 @@ import { ScalewayError } from '../scw-error.js';
  *
  * @public
  */
-
 class ResourceNotFoundError extends ScalewayError {
   constructor(status, body, resource, resourceId) {
     super(status, body, `resource ${resource} with ID ${resourceId} is not found`);
@@ -15,12 +14,12 @@ class ResourceNotFoundError extends ScalewayError {
     this.resourceId = resourceId;
     this.name = 'ResourceNotFoundError';
   }
-
   static fromJSON(status, obj) {
-    if (typeof obj.resource !== 'string' || typeof obj.resource_id !== 'string') return null;
+    if (typeof obj.resource !== 'string' || typeof obj.resource_id !== 'string') {
+      return null;
+    }
     return new ResourceNotFoundError(status, obj, obj.resource, obj.resource_id);
   }
-
 }
 
 export { ResourceNotFoundError };

package/dist/scw/errors/standard/too-many-requests-error.js

@@ -14,7 +14,6 @@ import { ScalewayError } from '../scw-error.js';
  */
 const buildMessage = (helpMessage, limit, resetSeconds, resetAt) => {
   const details = [];
-
   if (limit) {
     if (limit.windowSeconds) {
       details.push(`quota is ${limit.quota} for ${limit.windowSeconds}s`);
@@ -22,37 +21,29 @@ const buildMessage = (helpMessage, limit, resetSeconds, resetAt) => {
       details.push(`quota is ${limit.quota}`);
     }
   }
-
   if (resetSeconds) {
     details.push(`resets in ${resetSeconds}s`);
   } else if (resetAt) {
     details.push(`resets at ${resetAt.toISOString()}`);
   }
-
   let output = `too many requests`;
-
   if (details.length > 0) {
     output += ` (${details.join(', ')})`;
   }
-
   if (helpMessage.length > 0) {
     output += `: ${helpMessage}`;
   }
-
   return output;
 };
+
 /**
  * TooManyRequestsError error happens when fetching too many times a resource.
  *
  * @public
  */
-
-
 class TooManyRequestsError extends ScalewayError {
-  constructor(status, body, helpMessage, limit,
-  /** The number of seconds until the quota resets */
-  resetSeconds,
-  /** The timestamp when the quota resets */
+  constructor(status, body, helpMessage, limit, /** The number of seconds until the quota resets */
+  resetSeconds, /** The timestamp when the quota resets */
   resetAt) {
     super(status, body, buildMessage(helpMessage, limit, resetSeconds, resetAt));
     this.status = status;
@@ -63,21 +54,17 @@ class TooManyRequestsError extends ScalewayError {
     this.resetAt = resetAt;
     this.name = 'TooManyRequestsError';
   }
-
   static fromJSON(status, obj) {
     if (typeof obj.help_message !== 'string') return null;
     let limit;
-
     if (isJSONObject(obj.limit) && typeof obj.limit.quota === 'number') {
       limit = {
         quota: obj.limit.quota,
         windowSeconds: typeof obj.limit.window_seconds === 'number' ? obj.limit.window_seconds : undefined
       };
     }
-
     return new TooManyRequestsError(status, obj, obj.help_message, limit, typeof obj.reset_seconds === 'number' ? obj.reset_seconds : undefined, typeof obj.reset_at === 'string' ? new Date(obj.reset_at) : undefined);
   }
-
 }
 
 export { TooManyRequestsError };

package/dist/scw/errors/standard/transient-state-error.js

@@ -5,7 +5,6 @@ import { ScalewayError } from '../scw-error.js';
  *
  * @public
  */
-
 class TransientStateError extends ScalewayError {
   constructor(status, body, resource, resourceId, currentState) {
     super(status, body, `resource ${resource} with ID ${resourceId} is in a transient state: ${currentState}`);
@@ -16,12 +15,12 @@ class TransientStateError extends ScalewayError {
     this.currentState = currentState;
     this.name = 'TransientStateError';
   }
-
   static fromJSON(status, obj) {
-    if (typeof obj.resource !== 'string' || typeof obj.resource_id !== 'string' || typeof obj.current_state !== 'string') return null;
+    if (typeof obj.resource !== 'string' || typeof obj.resource_id !== 'string' || typeof obj.current_state !== 'string') {
+      return null;
+    }
     return new TransientStateError(status, obj, obj.resource, obj.resource_id, obj.current_state);
   }
-
 }
 
 export { TransientStateError };

package/dist/scw/errors/types.js

@@ -8,18 +8,15 @@ import { isJSONObject } from '../../helpers/json.js';
  *
  * @internal
  */
-
 const isRecordOfStringArray = obj => {
   if (!isJSONObject(obj)) {
     return false;
   }
-
   for (const elt of Object.values(obj)) {
     if (!Array.isArray(elt) || Object.values(elt).find(x => typeof x !== 'string') !== undefined) {
       return false;
     }
   }
-
   return true;
 };
 

package/dist/scw/fetch/build-fetcher.js

@@ -17,11 +17,9 @@ const buildRequest = (request, settings) => {
   let {
     path
   } = request;
-
   if (request.urlParams instanceof URLSearchParams) {
     path = path.concat(`?${request.urlParams.toString()}`);
   }
-
   return new Request(`${settings.apiURL}${path}`, {
     body: request.body,
     headers: {
@@ -34,9 +32,7 @@ const buildRequest = (request, settings) => {
     method: request.method
   });
 };
-
 const asIs = response => response;
-
 /**
  * Builds a resource fetcher.
  *
@@ -48,18 +44,14 @@ const asIs = response => response;
  */
 const buildFetcher = (settings, httpClient) => {
   let requestNumber = 0;
-
   const prepareRequest = requestId => composeInterceptors([...settings.requestInterceptors, logRequest(requestId, obfuscateInterceptor(obfuscateAuthHeadersEntry))]);
-
   const prepareResponse = requestId => composeInterceptors([...settings.responseInterceptors, logResponse(requestId)]);
-
   return async function (request, unwrapper) {
     if (unwrapper === void 0) {
       unwrapper = asIs;
     }
-
     const requestId = `${requestNumber += 1}`;
-    return Promise.resolve(buildRequest(request, settings)).then(prepareRequest(requestId)).then(httpClient).then(prepareResponse(requestId)).then(responseParser(unwrapper));
+    return Promise.resolve(buildRequest(request, settings)).then(prepareRequest(requestId)).then(httpClient).then(prepareResponse(requestId)).then(responseParser(unwrapper, request.responseType ?? 'json'));
   };
 };
 

package/dist/scw/fetch/http-dumper.js

@@ -7,6 +7,7 @@
  * @internal
  */
 const toPascalCase = str => str.replace(/\w+/g, word => `${word[0].toUpperCase()}${word.slice(1).toLowerCase()}`);
+
 /**
  * Converts a Headers entry to string.
  *
@@ -15,12 +16,11 @@ const toPascalCase = str => str.replace(/\w+/g, word => `${word[0].toUpperCase()
  *
  * @internal
  */
-
-
 const serializeHeadersEntry = _ref => {
   let [name, value] = _ref;
   return `${toPascalCase(name)}: ${value}`;
 };
+
 /**
  * Converts Headers to safe to log strings (with obfuscated auth secrets).
  *
@@ -29,9 +29,8 @@ const serializeHeadersEntry = _ref => {
  *
  * @internal
  */
-
-
 const serializeHeaders = headers => Array.from(headers.entries(), serializeHeadersEntry);
+
 /**
  * Dumps a Request into a readable string.
  *
@@ -40,9 +39,8 @@ const serializeHeaders = headers => Array.from(headers.entries(), serializeHeade
  *
  * @internal
  */
-
-
 const dumpRequest = async request => [`${request.method.toUpperCase()}: ${request.url}`, ...serializeHeaders(request.headers), await request.clone().text()].join('\r\n');
+
 /**
  * Dumps a Response into a readable string.
  *
@@ -51,7 +49,6 @@ const dumpRequest = async request => [`${request.method.toUpperCase()}: ${reques
  *
  * @internal
  */
-
 const dumpResponse = async response => [`HTTP ${response.status} ${response.ok ? 'OK' : 'NOK'}`, ...serializeHeaders(response.headers), await response.clone().text()].join('\r\n');
 
 export { dumpRequest, dumpResponse };

package/dist/scw/fetch/http-interceptors.js

@@ -19,16 +19,14 @@ class ObfuscatedRequest extends Request {
     this.request = request;
     this.obfuscate = obfuscate;
   }
-
   get headers() {
     return new Headers(Array.from(this.request.headers, this.obfuscate));
   }
-
   clone() {
     return new ObfuscatedRequest(this.request, this.obfuscate);
   }
-
 }
+
 /**
  * Creates an interceptor to obfuscate the requests.
  *
@@ -37,11 +35,9 @@ class ObfuscatedRequest extends Request {
  *
  * @internal
  */
-
-
 const obfuscateInterceptor = obfuscate => request => new ObfuscatedRequest(request, obfuscate);
-
 const identity = instance => instance;
+
 /**
  * Creates an interceptor to log the requests.
  *
@@ -51,20 +47,20 @@ const identity = instance => instance;
  *
  * @internal
  */
-
-
 const logRequest = function (identifier, obfuscate) {
   if (obfuscate === void 0) {
     obfuscate = identity;
   }
-
   return async request => {
-    if (shouldLog(LevelResolver[getLogger().logLevel], 'debug')) getLogger().debug(`--------------- Scaleway SDK REQUEST ${identifier} ---------------
+    if (shouldLog(LevelResolver[getLogger().logLevel], 'debug')) {
+      getLogger().debug(`--------------- Scaleway SDK REQUEST ${identifier} ---------------
 ${await dumpRequest(await obfuscate(request))}
 ---------------------------------------------------------`);
+    }
     return request;
   };
 };
+
 /**
  * Creates an interceptor to log the responses.
  *
@@ -73,11 +69,12 @@ ${await dumpRequest(await obfuscate(request))}
  *
  * @internal
  */
-
 const logResponse = identifier => async response => {
-  if (shouldLog(LevelResolver[getLogger().logLevel], 'debug')) getLogger().debug(`--------------- Scaleway SDK RESPONSE ${identifier} ---------------
+  if (shouldLog(LevelResolver[getLogger().logLevel], 'debug')) {
+    getLogger().debug(`--------------- Scaleway SDK RESPONSE ${identifier} ---------------
 ${await dumpResponse(response)}
 ---------------------------------------------------------`);
+  }
   return response;
 };
 

package/dist/scw/fetch/resource-paginator.js

@@ -1,15 +1,14 @@
 const extract = key => result => result[key];
-
 function* pages(key, fetcher, request, firstPage) {
-  if (!Array.isArray(firstPage[key])) throw new Error(`Property ${key} is not a list in paginated result`);
+  if (!Array.isArray(firstPage[key])) {
+    throw new Error(`Property ${key} is not a list in paginated result`);
+  }
   const getList = extract(key);
   let page = request.page || 1;
-
   if (page === 1) {
     yield Promise.resolve(getList(firstPage));
     page += 1;
   }
-
   const {
     length
   } = firstPage[key];
@@ -17,14 +16,15 @@ function* pages(key, fetcher, request, firstPage) {
   const {
     totalCount
   } = firstPage;
-
   while (page <= Math.floor((totalCount + length - 1) / length)) {
-    yield fetcher({ ...request,
+    yield fetcher({
+      ...request,
       page
     }).then(getList);
     page += 1;
   }
 }
+
 /**
  * Fetches a paginated resource.
  *
@@ -34,15 +34,19 @@ function* pages(key, fetcher, request, firstPage) {
  * @param initial - The first page
  * @returns An async generator of resources arrays
  */
-
-
-async function* fetchPaginated(key, fetcher, request, initial) {
-  if (initial === void 0) {
-    initial = fetcher(request);
+function fetchPaginated(key, fetcher, request, initial) {
+  try {
+    if (initial === void 0) {
+      initial = fetcher(request);
+    }
+    return async function* () {
+      yield* pages(key, fetcher, request, await initial);
+    }();
+  } catch (e) {
+    return Promise.reject(e);
   }
-
-  yield* pages(key, fetcher, request, await initial);
 }
+
 /**
  * Fetches all paginated resource.
  *
@@ -52,14 +56,13 @@ async function* fetchPaginated(key, fetcher, request, initial) {
  * @param initial - The first page
  * @returns A resources array Promise
  */
-
 const fetchAll = async function (key, fetcher, request, initial) {
   if (initial === void 0) {
     initial = fetcher(request);
   }
-
   return (await Promise.all(Array.from(pages(key, fetcher, request, await initial)))).flat();
 };
+
 /**
  * Enriches a listing method with helpers.
  *
@@ -68,7 +71,6 @@ const fetchAll = async function (key, fetcher, request, initial) {
  * @param request - A request with pagination options
  * @returns A resource Promise with the pagination helpers
  */
-
 const enrichForPagination = (key, fetcher, request) => {
   const firstPage = fetcher(request);
   return Object.assign(firstPage, {

package/dist/scw/fetch/response-parser.js

@@ -4,33 +4,29 @@ import { ScalewayError } from '../errors/scw-error.js';
 
 const X_TOTAL_COUNT_HEADER_KEY = 'x-total-count';
 const TOTAL_COUNT_RES_KEY = 'total_count';
+
 /**
  * Fixes the totalCount property for old APIs.
  *
  * @internal
  */
-
 const fixLegacyTotalCount = (obj, headers) => {
   const headerVal = headers.get(X_TOTAL_COUNT_HEADER_KEY);
-
   if (!headerVal) {
     return obj;
   }
-
   const totalCount = parseInt(headerVal, 10);
-
-  if (Number.isNaN(totalCount) === true) {
+  if (Number.isNaN(totalCount)) {
     return obj;
   }
-
   if (isJSONObject(obj) && !(TOTAL_COUNT_RES_KEY in obj)) {
     return Object.assign(obj, {
       [TOTAL_COUNT_RES_KEY]: totalCount
     });
   }
-
   return obj;
 };
+
 /**
  * Makes response parser.
  *
@@ -48,27 +44,25 @@ const fixLegacyTotalCount = (obj, headers) => {
  *
  * @internal
  */
-
-const responseParser = unmarshaller => async response => {
-  if (!(response instanceof Response)) throw new TypeError('Invalid response object');
-
+const responseParser = (unmarshaller, responseType) => async response => {
+  if (!(response instanceof Response)) {
+    throw new TypeError('Invalid response object');
+  }
   if (response.ok) {
     if (response.status === 204) return unmarshaller(undefined);
     const contentType = response.headers.get('Content-Type');
-
-    switch (contentType) {
-      case 'application/json':
-        try {
-          return unmarshaller(fixLegacyTotalCount(await response.json(), response.headers));
-        } catch (err) {
-          throw new ScalewayError(response.status, `could not parse ${contentType} response${err instanceof Error ? `: ${err.message}` : ''}`);
-        }
-
-      default:
-        throw new ScalewayError(response.status, `invalid content type ${contentType ?? ''}`.trim());
+    try {
+      if (responseType === 'json' && contentType === 'application/json') {
+        return unmarshaller(fixLegacyTotalCount(await response.json(), response.headers));
+      }
+      if (responseType === 'blob') {
+        return unmarshaller(await response.blob());
+      }
+      return unmarshaller(await response.text());
+    } catch (err) {
+      throw new ScalewayError(response.status, `could not parse '${contentType ?? ''}' response${err instanceof Error ? `: ${err.message}` : ''}`);
     }
   }
-
   const error = await response.clone().json().catch(() => response.text());
   if (isJSONObject(error)) throw parseScalewayError(response.status, error);
   throw new ScalewayError(response.status, typeof error === 'string' ? error : 'cannot read error response body');