pixuireactcomponents 1.3.79 → 1.3.81

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pixuireactcomponents",
-    "version": "1.3.79",
+    "version": "1.3.81",
     "description": "pixui react components",
     "main": "index.js",
     "scripts": {

package/src/components/tools/assetCache.d.ts

@@ -6,8 +6,15 @@ export declare namespace assetCache {
      * 缓存url资源到本地
      * @param url 资源url
      * @param force 是否强制缓存，如果为true，会强制重新下载并覆盖本地缓存
-     * @returns 返回本地缓存文件路径
+     * @returns 返回本地缓存文件路径，成功后resolve资源的本地路径，失败后reject函数的url参数
      */
     const cache: (url: string, force?: boolean, retryTimes?: number) => Promise<string>;
+    /**
+     *
+     * @param url 资源url
+     * @param responseType responseType
+     * @param retryTimes 重试次数
+     * @returns 下载成功是，返回xhr.response，否则返回空字符串
+     */
     const download: (url: string, responseType: 'arraybuffer' | 'json' | 'text', retryTimes?: number) => Promise<string>;
 }

package/src/components/tools/assetCache.js

@@ -37,29 +37,21 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 import { GameletAPI } from 'gamelet-pixui-frame';
 import path from 'path';
 import { tools } from './tools';
+import { LibMgr } from '../../../lib/loadlib/lib_mgr';
 var assetPrefix = 'cacheAsset';
 var isJssdkEnv = function () {
     return GameletAPI.getRuntimeEnv() == 'jssdk-appwindow' || GameletAPI.getRuntimeEnv() == 'jssdk-preprocessor';
 };
 //动态导入lib_mgr
-var getLibMgr = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var module_1, error_1;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                _a.trys.push([0, 2, , 3]);
-                return [4 /*yield*/, import('../../../lib/loadlib/lib_mgr')];
-            case 1:
-                module_1 = _a.sent();
-                return [2 /*return*/, module_1.LibMgr];
-            case 2:
-                error_1 = _a.sent();
-                console.error('need puerts env');
-                return [2 /*return*/, null];
-            case 3: return [2 /*return*/];
-        }
-    });
-}); };
+// const getLibMgr = async () => {
+//     try {
+//         const module = await import('../../../lib/loadlib/lib_mgr');
+//         return module.LibMgr;
+//     } catch (error) {
+//         console.error('need puerts env');
+//         return null;
+//     }
+// };
 /**
  * 缓存资源到本地，仅jssdk环境可用
  */
@@ -70,7 +62,7 @@ export var assetCache;
      * 缓存url资源到本地
      * @param url 资源url
      * @param force 是否强制缓存，如果为true，会强制重新下载并覆盖本地缓存
-     * @returns 返回本地缓存文件路径
+     * @returns 返回本地缓存文件路径，成功后resolve资源的本地路径，失败后reject函数的url参数
      */
     assetCache.cache = function (url, force, retryTimes) {
         if (retryTimes === void 0) { retryTimes = 3; }
@@ -79,32 +71,23 @@ export var assetCache;
             return __generator(this, function (_a) {
                 console.log('cacheAsset---', url);
                 return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                        var mgr, lib, localPath, xhr;
+                        var lib, localPath, xhr;
                         var _this = this;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
                                     if (!isJssdkEnv()) {
                                         console.log('非jssdk环境');
-                                        reject();
-                                        return [2 /*return*/];
-                                    }
-                                    return [4 /*yield*/, getLibMgr()];
-                                case 1:
-                                    mgr = _a.sent();
-                                    if (!mgr) {
-                                        reject();
-                                        return [2 /*return*/];
+                                        reject(url);
                                     }
-                                    lib = mgr.getInstance().getMainLib();
+                                    lib = LibMgr.getInstance().getMainLib();
                                     return [4 /*yield*/, getLocalPath(url)];
-                                case 2:
+                                case 1:
                                     localPath = _a.sent();
                                     if (!force) {
                                         if (lib.fileExists(localPath)) {
                                             console.log('cacheAsset file exist', localPath);
                                             resolve(localPath);
-                                            return [2 /*return*/];
                                         }
                                     }
                                     xhr = new XMLHttpRequest();
@@ -125,7 +108,7 @@ export var assetCache;
                                                     assetCache.cache(url, force, retryTimes - 1).then(resolve, reject);
                                                 }
                                                 else {
-                                                    reject();
+                                                    reject(url);
                                                 }
                                             }
                                             return [2 /*return*/];
@@ -138,7 +121,7 @@ export var assetCache;
                                             assetCache.cache(url, force, retryTimes - 1).then(resolve, reject);
                                         }
                                         else {
-                                            reject();
+                                            reject(url);
                                         }
                                     };
                                     xhr.send();
@@ -149,6 +132,13 @@ export var assetCache;
             });
         });
     };
+    /**
+     *
+     * @param url 资源url
+     * @param responseType responseType
+     * @param retryTimes 重试次数
+     * @returns 下载成功是，返回xhr.response，否则返回空字符串
+     */
     assetCache.download = function (url, responseType, retryTimes) {
         if (retryTimes === void 0) { retryTimes = 3; }
         console.log('download---', url);
@@ -168,7 +158,7 @@ export var assetCache;
                             assetCache.download(url, responseType, retryTimes - 1).then(resolve, reject);
                         }
                         else {
-                            reject();
+                            reject('');
                         }
                     }
                     return [2 /*return*/];
@@ -181,33 +171,24 @@ export var assetCache;
                     assetCache.download(url, responseType, retryTimes - 1).then(resolve, reject);
                 }
                 else {
-                    reject();
+                    reject('');
                 }
             };
             xhr.send();
         });
     };
     var getLocalPath = function (url) { return __awaiter(_this, void 0, void 0, function () {
-        var mgr, lib, filePath, fileName;
+        var lib, filePath, fileName;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    console.log('getLocalPath', url);
-                    return [4 /*yield*/, getLibMgr()];
-                case 1:
-                    mgr = _a.sent();
-                    if (!mgr) {
-                        return [2 /*return*/, ''];
-                    }
-                    lib = mgr.getInstance().getMainLib();
-                    filePath = path.join(lib.getCachePath(), 'assetcache');
-                    //检查assetcache文件夹
-                    if (!lib.dirExists(filePath)) {
-                        lib.makeDir(filePath);
-                    }
-                    fileName = tools.getHashStr(assetPrefix + url) + path.extname(url);
-                    return [2 /*return*/, path.join(filePath, fileName)];
+            console.log('getLocalPath', url);
+            lib = LibMgr.getInstance().getMainLib();
+            filePath = path.join(lib.getCachePath(), 'assetcache');
+            //检查assetcache文件夹
+            if (!lib.dirExists(filePath)) {
+                lib.makeDir(filePath);
             }
+            fileName = tools.getHashStr(assetPrefix + url) + path.extname(url);
+            return [2 /*return*/, path.join(filePath, fileName)];
         });
     }); };
 })(assetCache || (assetCache = {}));