@faasjs/react 0.0.2-beta.293 → 0.0.2-beta.294

package/lib/browser/src/index.d.ts

@@ -1,11 +1,14 @@
 export declare type Params = {
     [key: string]: any;
 };
-export declare type Options = {
-    beforeRequest?: ({ action, params, xhr }: {
+export declare type Options = RequestInit & {
+    headers?: {
+        [key: string]: string;
+    };
+    beforeRequest?: ({ action, params, options }: {
         action: string;
         params: Params;
-        xhr: XMLHttpRequest;
+        options: Options;
     }) => Promise<void> | void;
 };
 export declare type ResponseHeaders = {
@@ -47,6 +50,6 @@ export declare class FaasBrowserClient {
      * @param params {any} 动作参数
      * @param options {object} 默认配置项
      */
-    action<T = any>(action: string, params: Params, options?: Options): Promise<Response<T>>;
+    action<T = any>(action: string, params?: Params, options?: Options): Promise<Response<T>>;
 }
 export default FaasBrowserClient;

package/lib/index.js

@@ -32,7 +32,7 @@
       constructor(baseUrl, options) {
           this.host = baseUrl[baseUrl.length - 1] === '/' ? baseUrl : baseUrl + '/';
           this.defaultOptions = options || Object.create(null);
-          console.debug('[faas] baseUrl: ' + this.host);
+          console.debug('[Faas] baseUrl: ' + this.host);
       }
       /**
        * 发起请求
@@ -40,71 +40,34 @@
        * @param params {any} 动作参数
        * @param options {object} 默认配置项
        */
-      async action(action, params, options = {}) {
+      async action(action, params = {}, options = {}) {
           const url = this.host + action.toLowerCase() + '?_=' + new Date().getTime().toString();
-          options = Object.assign(Object.assign({}, this.defaultOptions), options);
-          const xhr = new XMLHttpRequest();
-          xhr.open('POST', url);
-          xhr.withCredentials = true;
-          xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
+          options = Object.assign(Object.assign({ method: 'POST', headers: { 'Content-Type': 'application/json; charset=UTF-8' }, mode: 'cors', body: JSON.stringify(params) }, this.defaultOptions), options);
           if (options.beforeRequest)
               await options.beforeRequest({
                   action,
                   params,
-                  xhr
+                  options
               });
-          return new Promise(function (resolve, reject) {
-              xhr.onload = function () {
-                  var _a;
-                  let res = xhr.response;
-                  const headersList = xhr.getAllResponseHeaders().trim().split(/[\r\n]+/);
-                  const headers = {};
-                  headersList.forEach(function (line) {
-                      const parts = line.split(': ');
-                      const key = parts.shift();
-                      const value = parts.join(': ');
-                      if (key)
-                          headers[key] = value;
-                  });
-                  if (xhr.response && ((_a = xhr.getResponseHeader('Content-Type')) === null || _a === void 0 ? void 0 : _a.includes('json')))
-                      try {
-                          res = JSON.parse(xhr.response);
-                          if (res.error && res.error.message)
-                              reject(new ResponseError({
-                                  message: res.error.message,
-                                  status: xhr.status,
-                                  headers,
-                                  body: res
-                              }));
-                      }
-                      catch (error) {
-                          console.error(error);
-                      }
-                  if (xhr.status >= 200 && xhr.status < 300)
-                      resolve(new Response({
-                          status: xhr.status,
+          return fetch(url, options)
+              .then(async (response) => {
+              const headers = {};
+              response.headers.forEach((value, key) => headers[key] = value);
+              return response.json().then(res => {
+                  if (res.error && res.error.message)
+                      return Promise.reject(new ResponseError({
+                          message: res.error.message,
+                          status: response.status,
                           headers,
-                          data: res.data
+                          body: response
                       }));
-                  else {
-                      console.error(xhr, res);
-                      reject(new ResponseError({
-                          message: xhr.statusText || xhr.status.toString(),
-                          status: xhr.status,
+                  else
+                      return new Response({
+                          status: response.status,
                           headers,
-                          body: res
-                      }));
-                  }
-              };
-              xhr.onerror = function () {
-                  reject(new ResponseError({
-                      message: 'Network Error',
-                      status: xhr.status,
-                      headers: {},
-                      body: null
-                  }));
-              };
-              xhr.send(JSON.stringify(params));
+                          data: res.data
+                      });
+              });
           });
       }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/react",
-  "version": "0.0.2-beta.293",
+  "version": "0.0.2-beta.294",
   "license": "MIT",
   "main": "lib/index.js",
   "types": "lib/react/src/index.d.ts",
@@ -17,7 +17,7 @@
     "lib"
   ],
   "peerDependencies": {
-    "@faasjs/browser": "*",
+    "@faasjs/browser": "^0.0.2-beta.280",
     "react": "*"
   },
   "devDependencies": {
@@ -27,5 +27,5 @@
     "rollup-plugin-typescript2": "*",
     "typescript": "*"
   },
-  "gitHead": "e9f3f18f87e199d4d5d2fdee04225b993700018b"
+  "gitHead": "da80db41bf31736e49762c06c7c2ffe0f1496c72"
 }