@galacean/engine-core 0.9.19 → 0.9.20

package/dist/main.js

@@ -18396,18 +18396,10 @@ var defaultInterval = 500;
         var _config_type;
         config.type = (_config_type = config.type) != null ? _config_type : getMimeTypeFromUrl(url);
         var realRequest = config.type === "image" ? requestImage : requestRes;
-        var lastError;
         var executor = new MultiExecutor(function() {
-            return realRequest(url, config).onProgress(setProgress).then(function(res) {
-                resolve(res);
-                executor.stop();
-            }).catch(function(err) {
-                return lastError = err;
-            });
+            return realRequest(url, config).onProgress(setProgress);
         }, retryCount, retryInterval);
-        executor.start(function() {
-            reject(lastError);
-        });
+        executor.start().onError(reject).onComplete(resolve);
     });
 }
 function requestImage(url, config) {
@@ -18494,23 +18486,33 @@ var MultiExecutor = /*#__PURE__*/ function() {
         this.exec = this.exec.bind(this);
     }
     var _proto = MultiExecutor.prototype;
-    _proto.start = function start(done) {
-        this.done = done;
+    _proto.start = function start() {
         this.exec();
+        return this;
     };
-    _proto.stop = function stop() {
-        clearTimeout(this._timeoutId);
+    _proto.onComplete = function onComplete(func) {
+        this._onComplete = func;
+        return this;
+    };
+    _proto.onError = function onError(func) {
+        this._onError = func;
+        return this;
+    };
+    _proto.cancel = function cancel() {
+        window.clearTimeout(this._timeoutId);
     };
     _proto.exec = function exec() {
         var _this = this;
         if (this._currentCount >= this.totalCount) {
-            this.done && this.done();
+            this._onError && this._onError(this._error);
             return;
         }
         this._currentCount++;
-        this.execFunc(this._currentCount).then(function() {
-            //@ts-ignore
-            _this._timeoutId = setTimeout(_this.exec, _this.interval);
+        this.execFunc(this._currentCount).then(function(result) {
+            return _this._onComplete && _this._onComplete(result);
+        }).catch(function(e) {
+            _this._error = e;
+            _this._timeoutId = window.setTimeout(_this.exec, _this.interval);
         });
     };
     return MultiExecutor;