@miso.ai/server-sdk 0.6.5-beta.3 → 0.6.5-beta.5

package/package.json

@@ -16,11 +16,12 @@
     "simonpai <simon.pai@askmiso.com>"
   ],
   "dependencies": {
-    "@miso.ai/server-commons": "0.6.5-beta.3",
+    "@miso.ai/server-commons": "0.6.5-beta.5",
     "axios": "^1.6.2",
+    "axios-retry": "^4.5.0",
     "dotenv": "^16.0.1",
     "split2": "^4.1.0",
     "yargs": "^17.5.1"
   },
-  "version": "0.6.5-beta.3"
+  "version": "0.6.5-beta.5"
 }

package/src/api/base.js

@@ -1,4 +1,3 @@
-import axios from 'axios';
 import { asArray } from '@miso.ai/server-commons';
 import { upload, merge, batchDelete, buildUrl } from './helpers.js';
 import UploadStream from '../stream/upload.js';
@@ -16,7 +15,7 @@ export class Queries {
   async _run(path, payload, options) {
     // TODO: options
     const url = buildUrl(this._client, `${this._group}/${path}`);
-    return (await axios.post(url, payload)).data.data;
+    return (await this._client._axios.post(url, payload)).data.data;
   }
 
 }
@@ -46,13 +45,13 @@ export class Entities extends Writable {
 
   async get(id) {
     const url = buildUrl(this._client, `${this._type}/${id}`);
-    return (await axios.get(url)).data.data;
+    return (await this._client._axios.get(url)).data.data;
   }
 
   async ids({ type } = {}) {
     const options = type ? { params: { type } } : {};
     const url = buildUrl(this._client, `${this._type}/_ids`, options);
-    return (await axios.get(url)).data.data.ids;
+    return (await this._client._axios.get(url)).data.data.ids;
   }
 
   async delete(ids, options = {}) {
@@ -65,7 +64,7 @@ export class Entities extends Writable {
 
   async status(taskId) {
     const url = buildUrl(this._client, `${this._type}/_status/${taskId}`);
-    return (await axios.get(url)).data;
+    return (await this._client._axios.get(url)).data;
   }
 
   statusStream() {

package/src/api/experiments.js

@@ -1,4 +1,3 @@
-import axios from 'axios';
 import { buildUrl } from './helpers.js';
 
 export default class Experiments {
@@ -12,7 +11,7 @@ export default class Experiments {
     const url = buildUrl(this._client, `experiments/${experimentId}/events`);
     // TODO: make content type header global
     const headers = { 'Content-Type': 'application/json' };
-    const response = await axios.post(url, record, { headers });
+    const response = await this._client._axios.post(url, record, { headers });
     // 200 response body does not have .data layer
     return response.data ? response : { data: response };
   }

package/src/api/helpers.js

@@ -1,11 +1,10 @@
 import { asArray, trimObj, computeIfAbsent } from '@miso.ai/server-commons';
-import axios from 'axios';
 import { Buffer } from 'buffer';
 
 export async function upload(client, type, records, options = {}) {
   const url = buildUrl(client, type, { ...options, async: true });
   const payload = buildUploadPayload(records);
-  return axios.post(url, payload);
+  return client._axios.post(url, payload);
 }
 
 export async function merge(client, type, record, { mergeFn = defaultMerge } = {}) {
@@ -98,12 +97,7 @@ export function process422ResponseBody(payload, { data } = {}) {
 export async function batchDelete(client, type, ids, options = {}) {
   const url = buildUrl(client, `${type}/_delete`, { ...options, async: true });
   const payload = buildBatchDeletePayload(type, ids);
-  // TODO: organize axios
-  const { data } = await axios.post(url, payload, {
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  });
+  const { data } = await client._axios.post(url, payload);
   return data;
 }
 

package/src/axios.js

@@ -0,0 +1,27 @@
+import axios from 'axios';
+import axiosRetry from 'axios-retry';
+import version from './version.js';
+
+const DEFAULT_RETRY_OPTIONS = {
+  retries: 3,
+  retryDelay: count => count * 300,
+  retryCondition: (error) => {
+    // Only retry on 5xx server errors
+    return error.response && error.response.status >= 500 && error.response.status < 600;
+  },
+};
+
+export function createAxios(options = {}) {
+  if (typeof options.get === 'function' && typeof options.post === 'function') {
+    return options; // assume this is an axios instance already
+  }
+  const { retry } = options;
+  const instance = axios.create({
+    headers: {
+      'User-Agent': `MisoNodeJSSDK/${version}`,
+      'Content-Type': 'application/json',
+    },
+  });
+  axiosRetry(instance, { ...DEFAULT_RETRY_OPTIONS, ...retry });
+  return instance;
+}

package/src/client.js

@@ -1,12 +1,14 @@
 import version from './version.js';
 import Api from './api/index.js';
+import { createAxios } from './axios.js';
 
 export default class MisoClient {
 
   static version = version;
 
-  constructor(options) {
+  constructor({ axios, ...options } = {}) {
     this._options = normalizeOptions(options);
+    this._axios = createAxios({ ...axios }); // TODO: pass onRetry() for debug message
     this.version = version;
     this.api = new Api(this);
   }

package/src/stream/delete.js

@@ -68,7 +68,7 @@ export default class DeleteStream extends stream.BufferedWriteStream {
     const output = super._output(message, args);
 
     // if upload fails, emit extracted payload at response event
-    if (message.event === 'response' && args.response && args.response.errors && args.payload) {
+    if (message.event === 'response' && args.payload) {
       output.payload = JSON.parse(args.payload);
     }
 

package/src/version.js

@@ -1 +1 @@
-export default '0.6.5-beta.3';
+export default '0.6.5-beta.5';