clickgo 3.1.2-dev11 → 3.1.3-dev12

package/dist/lib/core.js

@@ -9,16 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAvailArea = exports.fetchApp = exports.readApp = exports.trigger = exports.getModule = exports.initModules = exports.regModule = exports.boot = exports.getCdn = exports.AbstractApp = exports.config = void 0;
+exports.getAvailArea = exports.fetchApp = exports.readApp = exports.trigger = exports.getModule = exports.regModule = exports.boot = exports.getCdn = exports.AbstractApp = exports.config = void 0;
 const clickgo = require("../clickgo");
 const fs = require("./fs");
 const form = require("./form");
 const task = require("./task");
 const tool = require("./tool");
-const control = require("./control");
-const theme = require("./theme");
 const zip = require("./zip");
-const dom = require("./dom");
 const configOrigin = {
     'locale': 'en',
     'task.position': 'bottom',
@@ -53,147 +50,6 @@ class AbstractApp {
             'type': 'danger'
         });
     }
-    config(config) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const t = task.list[this.taskId];
-            if (!t) {
-                return false;
-            }
-            t.config = config;
-            if (t.app.net) {
-                if (!t.config.files) {
-                    return false;
-                }
-                const files = t.config.files;
-                const net = t.app.net;
-                yield new Promise(function (resolve) {
-                    var _a;
-                    let loaded = 0;
-                    const total = files.length;
-                    const beforeTotal = Object.keys(t.app.files).length;
-                    (_a = net.progress) === null || _a === void 0 ? void 0 : _a.call(net, loaded + beforeTotal, total + beforeTotal);
-                    for (const file of files) {
-                        fs.getContent(net.url + file.slice(1), {
-                            'current': net.current
-                        }).then(function (blob) {
-                            var _a;
-                            return __awaiter(this, void 0, void 0, function* () {
-                                if (blob === null || typeof blob === 'string') {
-                                    clickgo.form.notify({
-                                        'title': 'File not found',
-                                        'content': net.url + file.slice(1),
-                                        'type': 'danger'
-                                    });
-                                    return;
-                                }
-                                const mime = tool.getMimeByPath(file);
-                                if (['txt', 'json', 'js', 'css', 'xml', 'html'].includes(mime.ext)) {
-                                    t.app.files[file] = (yield tool.blob2Text(blob)).replace(/^\ufeff/, '');
-                                }
-                                else {
-                                    t.app.files[file] = blob;
-                                }
-                                ++loaded;
-                                (_a = net.progress) === null || _a === void 0 ? void 0 : _a.call(net, loaded + beforeTotal, total + beforeTotal);
-                                if (net.notify) {
-                                    form.notifyProgress(net.notify, (loaded / total) / 2 + 0.5);
-                                }
-                                if (loaded < total) {
-                                    return;
-                                }
-                                resolve();
-                            });
-                        }).catch(function () {
-                            var _a;
-                            ++loaded;
-                            (_a = net.progress) === null || _a === void 0 ? void 0 : _a.call(net, loaded + beforeTotal, total + beforeTotal);
-                            if (net.notify) {
-                                form.notifyProgress(net.notify, (loaded / total) / 2 + 0.5);
-                            }
-                            if (loaded < total) {
-                                return;
-                            }
-                            resolve();
-                        });
-                    }
-                });
-                if (net.notify) {
-                    setTimeout(function () {
-                        form.hideNotify(net.notify);
-                    }, 2000);
-                }
-            }
-            if (!(yield control.init(this.taskId))) {
-                return false;
-            }
-            if ((_a = config.themes) === null || _a === void 0 ? void 0 : _a.length) {
-                for (let path of config.themes) {
-                    path += '.cgt';
-                    path = tool.urlResolve('/', path);
-                    const file = yield fs.getContent(path, {
-                        'files': t.app.files,
-                        'current': t.current
-                    });
-                    if (file && typeof file !== 'string') {
-                        const th = yield theme.read(file);
-                        if (th) {
-                            yield theme.load(th, t.id);
-                        }
-                    }
-                }
-            }
-            else {
-                if (theme.global) {
-                    yield theme.load(undefined, this.taskId);
-                }
-            }
-            if (config.locales) {
-                for (let path in config.locales) {
-                    const locale = config.locales[path];
-                    if (!path.endsWith('.json')) {
-                        path += '.json';
-                    }
-                    const lcontent = yield fs.getContent(path, {
-                        'encoding': 'utf8',
-                        'files': t.app.files,
-                        'current': t.current
-                    });
-                    if (!lcontent) {
-                        continue;
-                    }
-                    try {
-                        const data = JSON.parse(lcontent);
-                        task.loadLocaleData(locale, data, '', t.id);
-                    }
-                    catch (_b) {
-                    }
-                }
-            }
-            if (config.style) {
-                const style = yield fs.getContent(config.style + '.css', {
-                    'encoding': 'utf8',
-                    'files': t.app.files,
-                    'current': t.current
-                });
-                if (style) {
-                    const r = tool.stylePrepend(style, 'cg-task' + this.taskId.toString() + '_');
-                    dom.pushStyle(this.taskId, yield tool.styleUrl2DataUrl(config.style, r.style, t.app.files));
-                }
-            }
-            if (config.icon) {
-                const icon = yield fs.getContent(config.icon, {
-                    'files': t.app.files,
-                    'current': t.current
-                });
-                if (icon && typeof icon !== 'string') {
-                    t.app.icon = yield tool.blob2DataUrl(icon);
-                }
-            }
-            t.class = this;
-            return true;
-        });
-    }
     run(form) {
         if (typeof form === 'number') {
             const msg = 'Application run error, Form creation failed (' + form.toString() + ').';
@@ -322,7 +178,8 @@ const modules = {
             });
         },
         'obj': null,
-        'loading': false
+        'loading': false,
+        'resolve': []
     }
 };
 function regModule(name, func) {
@@ -332,87 +189,53 @@ function regModule(name, func) {
     modules[name] = {
         func: func,
         'obj': null,
-        'loading': false
+        'loading': false,
+        'resolve': []
     };
     return true;
 }
 exports.regModule = regModule;
-function initModules(names) {
-    return new Promise(function (resolve) {
-        if (typeof names === 'string') {
-            names = [names];
-        }
-        if (names.length === 0) {
-            resolve(0);
-            return;
+function getModule(name) {
+    return new Promise((resolve) => {
+        if (!modules[name]) {
+            return null;
         }
-        let loaded = 0;
-        let successful = 0;
-        for (const name of names) {
-            if (!modules[name]) {
-                ++loaded;
-                if (loaded === names.length) {
-                    resolve(successful);
-                    return;
-                }
-                continue;
-            }
-            if (modules[name].obj) {
-                ++loaded;
-                ++successful;
-                if (loaded === names.length) {
-                    resolve(successful);
-                    return;
-                }
-                continue;
-            }
+        if (!modules[name].obj) {
             if (modules[name].loading) {
-                ++loaded;
-                if (loaded === names.length) {
-                    resolve(successful);
-                    return;
-                }
-                continue;
-            }
-            modules[name].loading = true;
-            const rtn = modules[name].func();
-            if (rtn instanceof Promise) {
-                rtn.then(function (obj) {
-                    modules[name].obj = obj;
-                    modules[name].loading = false;
-                    ++loaded;
-                    ++successful;
-                    if (loaded === names.length) {
-                        resolve(successful);
-                        return;
-                    }
-                }).catch(function () {
-                    modules[name].loading = false;
-                    ++loaded;
-                    if (loaded === names.length) {
-                        resolve(successful);
-                    }
+                modules[name].resolve.push(() => {
+                    resolve(modules[name].obj);
                 });
             }
             else {
-                modules[name].obj = rtn;
-                modules[name].loading = false;
-                ++loaded;
-                ++successful;
-                if (loaded === names.length) {
-                    resolve(successful);
+                const rtn = modules[name].func();
+                if (rtn instanceof Promise) {
+                    modules[name].loading = true;
+                    rtn.then(function (obj) {
+                        modules[name].obj = obj;
+                        modules[name].loading = false;
+                        resolve(obj);
+                        for (const r of modules[name].resolve) {
+                            r();
+                        }
+                    }).catch(function () {
+                        modules[name].loading = false;
+                        resolve(null);
+                        for (const r of modules[name].resolve) {
+                            r();
+                        }
+                    });
+                }
+                else {
+                    modules[name].obj = rtn;
+                    resolve(rtn);
                 }
             }
+            return;
         }
+        resolve(modules[name].obj);
+        return;
     });
 }
-exports.initModules = initModules;
-function getModule(name) {
-    if (!modules[name]) {
-        return null;
-    }
-    return modules[name].obj;
-}
 exports.getModule = getModule;
 const globalEvents = {
     screenResize: function () {
@@ -598,6 +421,11 @@ function readApp(blob) {
             return false;
         }
         const files = {};
+        const configContent = yield z.getContent('/config.json');
+        if (!configContent) {
+            return false;
+        }
+        const config = JSON.parse(configContent);
         const list = z.readDir('/', {
             'hasChildren': true
         });
@@ -621,8 +449,10 @@ function readApp(blob) {
             }
         }
         return {
-            'icon': icon,
-            'files': files
+            'type': 'app',
+            'config': config,
+            'files': files,
+            'icon': icon
         };
     });
 }
@@ -679,50 +509,76 @@ function fetchApp(url, opt = {}) {
                 return null;
             }
         }
-        let loaded = 0;
-        let total = 30;
-        const files = yield loader.sniffFiles(url + 'app.js', {
-            'dir': '/',
-            adapter: (url) => __awaiter(this, void 0, void 0, function* () {
-                const r = yield fs.getContent(url, {
-                    'encoding': 'utf8',
-                    'current': current
-                });
-                return r;
-            }),
-            'loaded': () => {
-                ++loaded;
-                if (loaded === total) {
-                    ++total;
-                }
-                if (opt.notifyId) {
-                    form.notifyProgress(opt.notifyId, (loaded / total) / 2);
+        let config;
+        const files = {};
+        try {
+            const blob = yield fs.getContent(url + 'config.json', {
+                'current': current
+            });
+            if (blob === null || typeof blob === 'string') {
+                return null;
+            }
+            config = JSON.parse(yield tool.blob2Text(blob));
+            yield new Promise(function (resolve) {
+                if (!config.files) {
+                    return;
                 }
-                if (opt.progress) {
-                    opt.progress(loaded, total);
+                const total = config.files.length;
+                let loaded = 0;
+                for (const file of config.files) {
+                    fs.getContent(url + file.slice(1), {
+                        'current': current
+                    }).then(function (blob) {
+                        return __awaiter(this, void 0, void 0, function* () {
+                            if (blob === null || typeof blob === 'string') {
+                                clickgo.form.notify({
+                                    'title': 'File not found',
+                                    'content': url + file.slice(1),
+                                    'type': 'danger'
+                                });
+                                return;
+                            }
+                            const mime = tool.getMimeByPath(file);
+                            if (['txt', 'json', 'js', 'css', 'xml', 'html'].includes(mime.ext)) {
+                                files[file] = (yield tool.blob2Text(blob)).replace(/^\ufeff/, '');
+                            }
+                            else {
+                                files[file] = blob;
+                            }
+                            ++loaded;
+                            if (opt.notifyId) {
+                                form.notifyProgress(opt.notifyId, loaded / total);
+                            }
+                            if (loaded < total) {
+                                return;
+                            }
+                            resolve();
+                        });
+                    }).catch(function () {
+                        ++loaded;
+                        if (opt.notifyId) {
+                            form.notifyProgress(opt.notifyId, loaded / total);
+                        }
+                        if (loaded < total) {
+                            return;
+                        }
+                        resolve();
+                    });
                 }
-            }
-        });
-        if (opt.notifyId) {
-            form.notifyProgress(opt.notifyId, 0.5);
+            });
         }
-        if (Object.keys(files).length === 0) {
+        catch (_b) {
             return null;
         }
-        const ul = url.length - 1;
-        for (const fn in files) {
-            files[fn.slice(ul)] = files[fn];
-            delete files[fn];
+        let icon = '/clickgo/icon.png';
+        if (config.icon && (files[config.icon] instanceof Blob)) {
+            icon = yield tool.blob2DataUrl(files[config.icon]);
         }
         return {
-            'net': {
-                'current': current,
-                'notify': opt.notifyId,
-                'url': url,
-                'progress': opt.progress
-            },
-            'icon': '',
-            'files': files
+            'type': 'app',
+            'config': config,
+            'files': files,
+            'icon': icon
         };
     });
 }