fix sync

src/background/sync/base.js

@@ -1,4 +1,4 @@
-import { debounce, normalizeKeys, noop, request } from 'src/common';
+import { debounce, normalizeKeys, request, noop } from 'src/common';
 import getEventEmitter from '../utils/events';
 import { getOption, setOption, hookOptions } from '../utils/options';
 import { getScriptsByIndex, parseScript, saveScript, removeScript } from '../utils/db';
@@ -108,25 +108,32 @@ export function getStates() {
 }
 
 function serviceFactory(base) {
-  const initService = (...args) => {
-    const service = Object.create(base);
-    service.initialize(...args);
-    return service;
+  const Service = function constructor(...args) {
+    if (!(this instanceof Service)) return new Service(...args);
+    this.initialize(...args);
   };
-  initService.extend = options => serviceFactory(Object.assign(Object.create(base), options));
-  return initService;
+  Service.prototype = base;
+  Service.extend = extendService;
+  return Service;
 }
+function extendService(options) {
+  return serviceFactory(Object.assign(Object.create(this.prototype), options));
+}
+
+const onStateChange = debounce(() => {
+  browser.runtime.sendMessage({
+    cmd: 'UpdateSync',
+    data: getStates(),
+  });
+});
+
 export const BaseService = serviceFactory({
   name: 'base',
   displayName: 'BaseService',
   delayTime: 1000,
   urlPrefix: '',
   metaFile: 'Violentmonkey',
-  delay(time) {
-    return new Promise(resolve => { setTimeout(resolve, time); });
-  },
   initialize(name) {
-    this.onStateChange = debounce(this.onStateChange.bind(this));
     if (name) this.name = name;
     this.progress = {
       finished: 0,
@@ -140,13 +147,13 @@ export const BaseService = serviceFactory({
       'authorized',
       'unauthorized',
       'error',
-    ], null, this.onStateChange);
+    ], null, onStateChange);
     this.syncState = serviceState([
       'idle',
       'ready',
       'syncing',
       'error',
-    ], null, this.onStateChange);
+    ], null, onStateChange);
     // this.initToken();
     this.lastFetch = Promise.resolve();
     this.startSync = this.syncFactory();
@@ -156,12 +163,6 @@ export const BaseService = serviceFactory({
       this[key] = (...args) => { events[key](...args); };
     });
   },
-  onStateChange() {
-    browser.runtime.sendMessage({
-      cmd: 'UpdateSync',
-      data: getStates(),
-    });
-  },
   log(...args) {
     console.log(...args);  // eslint-disable-line no-console
   },
@@ -232,7 +233,7 @@ export const BaseService = serviceFactory({
     this.headers.Authorization = token ? `Bearer ${token}` : null;
     return !!token;
   },
-  request(options) {
+  loadData(options) {
     const { progress } = this;
     let lastFetch;
     if (options.delay == null) {
@@ -253,23 +254,26 @@ export const BaseService = serviceFactory({
     }
     this.lastFetch = lastFetch;
     progress.total += 1;
-    this.onStateChange();
+    onStateChange();
     return lastFetch.then(() => {
       let { prefix } = options;
       if (prefix == null) prefix = this.urlPrefix;
       const headers = Object.assign({}, this.headers, options.headers);
-      return request(prefix + options.url, {
+      let { url } = options;
+      if (url.startsWith('/')) url = prefix + url;
+      return request(url, {
         headers,
         method: options.method,
         body: options.body,
-      })
-      .then(data => ({ data }), error => ({ error }))
-      .then(({ data, error }) => {
-        progress.finished += 1;
-        this.onStateChange();
-        if (error) return Promise.reject(error);
-        return data;
+        responseType: options.responseType,
       });
+    })
+    .then(({ data }) => ({ data }), error => ({ error }))
+    .then(({ data, error }) => {
+      progress.finished += 1;
+      onStateChange();
+      if (error) return Promise.reject(error);
+      return data;
     });
   },
   sync() {
@@ -399,7 +403,7 @@ export const BaseService = serviceFactory({
         return Promise.all(promises);
       }));
       // ignore errors to ensure all promises are fulfilled
-      return Promise.all(promiseQueue.map(promise => promise.catch(err => err || true)))
+      return Promise.all(promiseQueue.map(promise => promise.then(noop, err => err || true)))
       .then(errors => errors.filter(Boolean))
       .then(errors => { if (errors.length) throw errors; });
     })

src/background/sync/dropbox.js

@@ -10,7 +10,7 @@ const Dropbox = BaseService.extend({
   name: 'dropbox',
   displayName: 'Dropbox',
   user() {
-    return this.request({
+    return this.loadData({
       method: 'POST',
       url: 'https://api.dropboxapi.com/2/users/get_current_account',
     })
@@ -27,14 +27,14 @@ const Dropbox = BaseService.extend({
     });
   },
   getMeta() {
-    return BaseService.getMeta.call(this)
+    return BaseService.prototype.getMeta.call(this)
     .catch(res => {
       if (res.status === 409) return {};
       throw res;
     });
   },
   list() {
-    return this.request({
+    return this.loadData({
       method: 'POST',
       url: 'https://api.dropboxapi.com/2/files/list_folder',
       body: {
@@ -47,7 +47,7 @@ const Dropbox = BaseService.extend({
     ));
   },
   get(path) {
-    return this.request({
+    return this.loadData({
       method: 'POST',
       url: 'https://content.dropboxapi.com/2/files/download',
       headers: {
@@ -58,7 +58,7 @@ const Dropbox = BaseService.extend({
     });
   },
   put(path, data) {
-    return this.request({
+    return this.loadData({
       method: 'POST',
       url: 'https://content.dropboxapi.com/2/files/upload',
       headers: {
@@ -74,7 +74,7 @@ const Dropbox = BaseService.extend({
     .then(normalize);
   },
   remove(path) {
-    return this.request({
+    return this.loadData({
       method: 'POST',
       url: 'https://api.dropboxapi.com/2/files/delete',
       body: {

src/background/sync/onedrive.js

@@ -24,7 +24,7 @@ const OneDrive = BaseService.extend({
     .then(() => this.prepare());
   },
   user() {
-    const requestUser = () => this.request({
+    const requestUser = () => this.loadData({
       url: '/drive',
       responseType: 'json',
     });
@@ -48,7 +48,7 @@ const OneDrive = BaseService.extend({
     });
   },
   getMeta() {
-    const getMeta = () => BaseService.getMeta.call(this);
+    const getMeta = () => BaseService.prototype.getMeta.call(this);
     return getMeta()
     .catch(res => {
       if (res.status === 404) {
@@ -62,24 +62,24 @@ const OneDrive = BaseService.extend({
     });
   },
   list() {
-    return this.request({
+    return this.loadData({
       url: '/drive/special/approot/children',
       responseType: 'json',
     })
     .then(data => data.value.filter(item => item.file && isScriptFile(item.name)).map(normalize));
   },
   get(path) {
-    return this.request({
+    return this.loadData({
       url: `/drive/special/approot:/${encodeURIComponent(path)}`,
       responseType: 'json',
     })
-    .then(data => this.request({
+    .then(data => this.loadData({
       url: data['@content.downloadUrl'],
       delay: 0,
     }));
   },
   put(path, data) {
-    return this.request({
+    return this.loadData({
       method: 'PUT',
       url: `/drive/special/approot:/${encodeURIComponent(path)}:/content`,
       headers: {
@@ -92,7 +92,7 @@ const OneDrive = BaseService.extend({
   },
   remove(path) {
     // return 204
-    return this.request({
+    return this.loadData({
       method: 'DELETE',
       url: `/drive/special/approot:/${encodeURIComponent(path)}`,
     })
@@ -128,7 +128,7 @@ const OneDrive = BaseService.extend({
     return this.prepare();
   },
   authorized(params) {
-    return this.request({
+    return this.loadData({
       method: 'POST',
       url: 'https://login.live.com/oauth20_token.srf',
       prefix: '',

src/common/index.js

@@ -118,7 +118,7 @@ export function request(url, options = {}) {
     const xhr = new XMLHttpRequest();
     const { responseType } = options;
     xhr.open(options.method || 'GET', url, true);
-    if (responseType) xhr.responseType = responseType;
+    if (['blob'].includes(responseType)) xhr.responseType = responseType;
     const headers = Object.assign({}, options.headers);
     let { body } = options;
     if (body && typeof body === 'object') {