feat(browser): synchronize server-side and client-side time errors

lib/browser/object/put.js

@@ -56,7 +56,7 @@ async function put(name, file, options = {}) {
         }
         catch (err) {
             if (err.code === 'RequestTimeTooSkewed') {
-                this.options.amendTimeSkewed = +new Date(err.serverTime) - new Date().valueOf();
+                this.amendTimeSkewed = +new Date(err.serverTime) - new Date().valueOf();
                 return await put.call(this, name, file, options);
             }
             else {

lib/common/client/_createRequest.js

@@ -27,8 +27,8 @@ function delHeader(headers, name) {
 }
 function _createRequest(params) {
     let date = new Date();
-    if (this.options.amendTimeSkewed) {
-        date = +new Date() + this.options.amendTimeSkewed;
+    if (this.amendTimeSkewed) {
+        date = +new Date() + this.amendTimeSkewed;
     }
     const headers = {
         'x-oss-date': dateformat_1.default(date, "UTC:ddd, dd mmm yyyy HH:MM:ss 'GMT'")

lib/common/client/initOptions.js

@@ -63,7 +63,6 @@ function initOptions(options) {
         sldEnable: false,
         useFetch: false,
         headerEncoding: 'utf-8',
-        amendTimeSkewed: 0,
         refreshSTSTokenInterval: 60000 * 5,
         refreshSTSToken: null,
         enableProxy: false,

lib/common/client/request.js

@@ -55,7 +55,7 @@ async function _request(params) {
         err = await this.requestError(result);
         // not use stream
         if (err.code === 'RequestTimeTooSkewed' && !useStream && !isNode) {
-            this.options.amendTimeSkewed = +new Date(err.serverTime) - new Date().valueOf();
+            this.amendTimeSkewed = +new Date(err.serverTime) - new Date().valueOf();
             return await this.request(params);
         }
         err.params = params;

lib/setConfig.d.ts

@@ -7,6 +7,7 @@ declare class Client {
     userAgent: any;
     _createStream: any;
     stsTokenFreshTime: any;
+    amendTimeSkewed: any;
     constructor(options: any, ctx: any);
     static use(...fn: any): typeof Client;
     setConfig(options: any, ctx: any): void;

lib/setConfig.js

@@ -26,6 +26,7 @@ class Client {
         Object.keys(client_1.default).forEach(prop => {
             Client.prototype[prop] = client_1.default[prop];
         });
+        this.amendTimeSkewed = 0;
         this.setConfig(options, ctx);
     }
     static use(...fn) {

src/browser/object/put.ts

@@ -50,7 +50,7 @@ export async function put(this: any, name: string, file: any, options: PutObject
       return result;
     } catch (err) {
       if (err.code === 'RequestTimeTooSkewed') {
-        this.options.amendTimeSkewed = +new Date(err.serverTime) - new Date().valueOf();
+        this.amendTimeSkewed = +new Date(err.serverTime) - new Date().valueOf();
         return await put.call(this, name, file, options);
       } else {
         throw err;

src/common/client/_createRequest.ts

@@ -35,8 +35,8 @@ function delHeader(headers: Headers, name: string) {
 
 export function _createRequest(this: any, params) {
   let date = new Date();
-  if (this.options.amendTimeSkewed) {
-    date = +new Date() + this.options.amendTimeSkewed;
+  if (this.amendTimeSkewed) {
+    date = +new Date() + this.amendTimeSkewed;
   }
   const headers: Headers = {
     'x-oss-date': dateFormat(date, "UTC:ddd, dd mmm yyyy HH:MM:ss 'GMT'")

src/common/client/initOptions.ts

@@ -68,7 +68,6 @@ export function initOptions(options) {
       sldEnable: false,
       useFetch: false,
       headerEncoding: 'utf-8',
-      amendTimeSkewed: 0, // record the time difference between client and server
       refreshSTSTokenInterval: 60000 * 5,
       refreshSTSToken: null, // auto set sts config
       enableProxy: false,

src/common/client/request.ts

@@ -52,7 +52,7 @@ export async function _request(this: any, params) {
     err = await this.requestError(result);
     // not use stream
     if (err.code === 'RequestTimeTooSkewed' && !useStream && !isNode) {
-      this.options.amendTimeSkewed = +new Date(err.serverTime) - new Date().valueOf();
+      this.amendTimeSkewed = +new Date(err.serverTime) - new Date().valueOf();
       return await this.request(params);
     }
     err.params = params;

src/setConfig.ts

@@ -24,8 +24,11 @@ class Client {
   public userAgent;
 
   public _createStream;
+
   public stsTokenFreshTime;
 
+  public amendTimeSkewed;
+
   public constructor(options, ctx) {
     if (!(this instanceof Client)) {
       return new Client(options, ctx);
@@ -40,6 +43,8 @@ class Client {
       Client.prototype[prop] = base[prop];
     });
 
+    this.amendTimeSkewed = 0;
+
     this.setConfig(options, ctx);
   }
 
@@ -74,11 +79,8 @@ class Client {
   }
 }
 
-
 export const initClient = (options, ctx) => {
   return new Client(options, ctx);
 };
 
-export {
-  Client
-};
+export { Client };