fix: Keep headers in default options

nervosnetwork · Feb 1, 2021 · 3eaa7f0 · 3eaa7f0
1 parent 0dba16a
commit 3eaa7f0
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 23 deletions.
diff --git a/dist/ckb-js-toolkit.esm.js b/dist/ckb-js-toolkit.esm.js
diff --git a/dist/ckb-js-toolkit.node.js b/dist/ckb-js-toolkit.node.js
diff --git a/dist/ckb-js-toolkit.node.js.map b/dist/ckb-js-toolkit.node.js.map
diff --git a/dist/ckb-js-toolkit.umd.js b/dist/ckb-js-toolkit.umd.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ckb-js-toolkit",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "description": "JavaScript toolkits used to build dapps for Nervos CKB",
   "main": "dist/ckb-js-toolkit.node.js",
   "browser": "dist/ckb-js-toolkit.esm.js",

diff --git a/src/rpc.js b/src/rpc.js
@@ -1,19 +1,34 @@
 import fetch from "cross-fetch";
 import JSBI from "jsbi";
 
+function mergeOptions(overrideOptions, defaultOptions) {
+  defaultOptions = defaultOptions || {};
+  const headers = Object.assign(
+    {},
+    defaultOptions.headers || {},
+    overrideOptions.headers || {}
+  );
+  return Object.assign({}, defaultOptions, overrideOptions, {
+    headers: headers
+  });
+}
+
 const batchHandler = {
   get: (target, method, receiver) => {
     if (method === "send") {
       return async () => {
         const response = await fetch(
           target.uri,
-          Object.assign({}, target.defaultOptions, {
-            method: "post",
-            headers: {
-              "Content-Type": "application/json"
+          mergeOptions(
+            {
+              method: "post",
+              headers: {
+                "Content-Type": "application/json"
+              },
+              body: JSON.stringify(target.payload)
             },
-            body: JSON.stringify(target.payload)
-          })
+            target.defaultOptions
+          )
         );
         return await response.json();
       };
@@ -51,18 +66,21 @@ const handler = {
       const id = Math.round(Math.random() * 10000000);
       const response = await fetch(
         target.uri,
-        Object.assign({}, target.defaultOptions, {
-          method: "post",
-          headers: {
-            "Content-Type": "application/json"
+        mergeOptions(
+          {
+            method: "post",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+              jsonrpc: "2.0",
+              id: id,
+              method: method,
+              params: params
+            })
           },
-          body: JSON.stringify({
-            jsonrpc: "2.0",
-            id: id,
-            method: method,
-            params: params
-          })
-        })
+          target.defaultOptions
+        )
       );
       const data = await response.json();
       if (data.id !== id) {