clickgo 3.1.13 → 3.1.14

package/README.md

@@ -28,7 +28,7 @@ Load the module loader first, and then load it using the module loader.
 **index.html**
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.4.9/dist/loader.min.js?path=index&npm={'clickgo':'3.1.13'}"></script>
+<script src="https://cdn.jsdelivr.net/npm/@litert/loader@3.4.9/dist/loader.min.js?path=index&npm={'clickgo':'3.1.14'}"></script>
 ```
 
 **index.js**

package/dist/lib/core.js

@@ -449,9 +449,19 @@ function trigger(name, taskId = 0, formId = 0, param1 = '', param2 = '') {
 exports.trigger = trigger;
 function readApp(blob) {
     return __awaiter(this, void 0, void 0, function* () {
-        const iconLength = parseInt(yield blob.slice(0, 7).text());
-        const icon = yield tool.blob2DataUrl(blob.slice(7, 7 + iconLength));
-        const z = yield zip.get(blob.slice(7 + iconLength));
+        const head = yield tool.blob2Text(blob.slice(0, 5));
+        if (head !== '-CGA-') {
+            return false;
+        }
+        const iconLength = parseInt(yield blob.slice(21, 28).text());
+        if (Number.isNaN(iconLength)) {
+            return false;
+        }
+        const icon = iconLength ? yield tool.blob2DataUrl(blob.slice(28, 28 + iconLength)) : '';
+        const nb = new Blob([blob.slice(5, 21), blob.slice(28 + iconLength)], {
+            'type': blob.type
+        });
+        const z = yield zip.get(nb);
         if (!z) {
             return false;
         }
@@ -502,6 +512,17 @@ function fetchApp(url, opt = {}, taskId) {
                 return null;
             }
         }
+        if (!taskId &&
+            !url.startsWith('/clickgo/') &&
+            !url.startsWith('/storage/') &&
+            !url.startsWith('/mounted/') &&
+            !url.startsWith('/package/') &&
+            !url.startsWith('/current/') &&
+            !url.startsWith('http:') &&
+            !url.startsWith('https:') &&
+            !url.startsWith('file:')) {
+            url = tool.urlResolve(location.href, url);
+        }
         if (cga) {
             try {
                 const blob = yield fs.getContent(url, {

package/dist/lib/core.ts

@@ -533,9 +533,19 @@ export function trigger(name: types.TGlobalEvent, taskId: number | string | bool
  * @param blob blob 对象
  */
 export async function readApp(blob: Blob): Promise<false | types.IApp> {
-    const iconLength = parseInt(await blob.slice(0, 7).text());
-    const icon = await tool.blob2DataUrl(blob.slice(7, 7 + iconLength));
-    const z = await zip.get(blob.slice(7 + iconLength));
+    const head = await tool.blob2Text(blob.slice(0, 5));
+    if (head !== '-CGA-') {
+        return false;
+    }
+    const iconLength = parseInt(await blob.slice(21, 28).text());
+    if (Number.isNaN(iconLength)) {
+        return false;
+    }
+    const icon = iconLength ? await tool.blob2DataUrl(blob.slice(28, 28 + iconLength)) : '';
+    const nb = new Blob([blob.slice(5, 21), blob.slice(28 + iconLength)], {
+        'type': blob.type
+    });
+    const z = await zip.get(nb);
     if (!z) {
         return false;
     }
@@ -598,6 +608,19 @@ export async function fetchApp(
             return null;
         }
     }
+    // --- 非 taskId 模式下 current 以 location 为准 ---
+    if (!taskId &&
+        !url.startsWith('/clickgo/') &&
+        !url.startsWith('/storage/') &&
+        !url.startsWith('/mounted/') &&
+        !url.startsWith('/package/') &&
+        !url.startsWith('/current/') &&
+        !url.startsWith('http:') &&
+        !url.startsWith('https:') &&
+        !url.startsWith('file:')
+    ) {
+        url = tool.urlResolve(location.href, url);
+    }
     // --- 如果是 cga 文件，直接读取并交给 readApp 函数处理 ---
     if (cga) {
         try {

package/dist/lib/task.js

@@ -193,41 +193,50 @@ function getList() {
 }
 exports.getList = getList;
 function run(url, opt = {}, ntid) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     return __awaiter(this, void 0, void 0, function* () {
-        if (!url.endsWith('/') && !url.endsWith('.cga')) {
-            return 0;
-        }
-        let icon = __dirname + '/../icon.png';
-        if (opt.icon) {
-            icon = opt.icon;
-        }
-        if (opt.notify === undefined) {
-            opt.notify = true;
+        let app = null;
+        if (typeof url === 'string') {
+            if (!url.endsWith('/') && !url.endsWith('.cga')) {
+                return 0;
+            }
+            let icon = __dirname + '/../icon.png';
+            if (opt.icon) {
+                icon = opt.icon;
+            }
+            if (opt.notify === undefined) {
+                opt.notify = true;
+            }
+            const notifyId = opt.notify ? form.notify({
+                'title': (_b = (_a = localeData[core.config.locale]) === null || _a === void 0 ? void 0 : _a.loading) !== null && _b !== void 0 ? _b : localeData['en'].loading,
+                'content': url,
+                'icon': icon,
+                'timeout': 0,
+                'progress': true
+            }) : undefined;
+            if (!ntid &&
+                !url.startsWith('/clickgo/') &&
+                !url.startsWith('/storage/') &&
+                !url.startsWith('/mounted/') &&
+                !url.startsWith('/package/') &&
+                !url.startsWith('/current/')) {
+                url = tool.urlResolve(location.href, url);
+            }
+            app = yield core.fetchApp(url, {
+                'notifyId': notifyId,
+                'progress': opt.progress
+            }, ntid);
+            if (notifyId) {
+                setTimeout(function () {
+                    form.hideNotify(notifyId);
+                }, 2000);
+            }
         }
-        const notifyId = opt.notify ? form.notify({
-            'title': (_b = (_a = localeData[core.config.locale]) === null || _a === void 0 ? void 0 : _a.loading) !== null && _b !== void 0 ? _b : localeData['en'].loading,
-            'content': url,
-            'icon': icon,
-            'timeout': 0,
-            'progress': true
-        }) : undefined;
-        if (!ntid &&
-            !url.startsWith('/clickgo/') &&
-            !url.startsWith('/storage/') &&
-            !url.startsWith('/mounted/') &&
-            !url.startsWith('/package/') &&
-            !url.startsWith('/current/')) {
-            url = tool.urlResolve(location.href, url);
+        else if (url.type !== 'app') {
+            return -1;
         }
-        const app = yield core.fetchApp(url, {
-            'notifyId': notifyId,
-            'progress': opt.progress
-        }, ntid);
-        if (notifyId) {
-            setTimeout(function () {
-                form.hideNotify(notifyId);
-            }, 2000);
+        else {
+            app = url;
         }
         if (!app) {
             return -1;
@@ -966,7 +975,7 @@ function run(url, opt = {}, ntid) {
             return code;
         };
         app.files['/invoke/clickgo.js'] = `module.exports = invokeClickgo;`;
-        const path = url;
+        const path = (_c = opt.path) !== null && _c !== void 0 ? _c : ((typeof url === 'string') ? url : '/runtime/' + tool.random(8, tool.RANDOM_LUN) + '.cga');
         const lio = path.endsWith('.cga') ? path.lastIndexOf('/') : path.slice(0, -1).lastIndexOf('/');
         const current = path.slice(0, lio);
         exports.list[taskId] = {
@@ -981,7 +990,7 @@ function run(url, opt = {}, ntid) {
             'current': current,
             'runtime': clickgo.vue.reactive({
                 'dialogFormIds': [],
-                'permissions': (_c = opt.permissions) !== null && _c !== void 0 ? _c : []
+                'permissions': (_d = opt.permissions) !== null && _d !== void 0 ? _d : []
             }),
             'forms': {},
             'controls': {},
@@ -994,6 +1003,7 @@ function run(url, opt = {}, ntid) {
                 if (!path.endsWith('.json')) {
                     path += '.json';
                 }
+                yield ((_e = opt.initProgress) === null || _e === void 0 ? void 0 : _e.call(opt, 'Load local ' + path + ' ...'));
                 const lcontent = yield fs.getContent(path, {
                     'encoding': 'utf8'
                 }, taskId);
@@ -1004,7 +1014,7 @@ function run(url, opt = {}, ntid) {
                     const data = JSON.parse(lcontent);
                     loadLocaleData(locale, data, '', taskId);
                 }
-                catch (_f) {
+                catch (_p) {
                 }
             }
         }
@@ -1033,16 +1043,18 @@ function run(url, opt = {}, ntid) {
             return -3;
         }
         dom.createToStyleList(taskId);
+        yield ((_f = opt.initProgress) === null || _f === void 0 ? void 0 : _f.call(opt, 'Control initialization ...'));
         const r = yield control.init(taskId, invoke);
         if (r < 0) {
             dom.removeFromStyleList(taskId);
             delete exports.list[taskId];
             return -400 + r;
         }
-        if ((_d = app.config.themes) === null || _d === void 0 ? void 0 : _d.length) {
+        if ((_g = app.config.themes) === null || _g === void 0 ? void 0 : _g.length) {
             for (let path of app.config.themes) {
                 path += '.cgt';
                 path = tool.urlResolve('/', path);
+                yield ((_h = opt.initProgress) === null || _h === void 0 ? void 0 : _h.call(opt, 'Load theme ' + path + ' ...'));
                 const file = yield fs.getContent(path, undefined, taskId);
                 if (file && typeof file !== 'string') {
                     const th = yield theme.read(file);
@@ -1054,6 +1066,7 @@ function run(url, opt = {}, ntid) {
         }
         else {
             if (theme.global) {
+                yield ((_j = opt.initProgress) === null || _j === void 0 ? void 0 : _j.call(opt, 'Load global theme ...'));
                 yield theme.load(undefined, taskId);
             }
         }
@@ -1063,16 +1076,19 @@ function run(url, opt = {}, ntid) {
             }, taskId);
             if (style) {
                 const r = tool.stylePrepend(style, 'cg-task' + taskId.toString() + '_');
+                yield ((_k = opt.initProgress) === null || _k === void 0 ? void 0 : _k.call(opt, 'Style initialization ...'));
                 dom.pushStyle(taskId, yield tool.styleUrl2DataUrl(app.config.style, r.style, app.files));
             }
         }
         core.trigger('taskStarted', taskId);
         if (app.config.permissions) {
+            yield ((_l = opt.initProgress) === null || _l === void 0 ? void 0 : _l.call(opt, 'Style initialization ...'));
             yield checkPermission(app.config.permissions, true, undefined, taskId);
         }
         const appCls = new expo.default();
         exports.list[taskId].class = appCls;
-        yield appCls.main((_e = opt.data) !== null && _e !== void 0 ? _e : {});
+        yield ((_m = opt.initProgress) === null || _m === void 0 ? void 0 : _m.call(opt, 'Starting ...'));
+        yield appCls.main((_o = opt.data) !== null && _o !== void 0 ? _o : {});
         return taskId;
     });
 }

package/dist/lib/task.ts

@@ -227,50 +227,59 @@ export function getList(): Record<string, types.ITaskInfo> {
 
 /**
  * --- 运行一个应用，cga 直接文件全部正常加载，url 则静态文件需要去 config 里加载 ---
- * @param url app 路径（以 / 为结尾的路径或以 .cga 结尾的文件）
+ * @param url app 路径（以 / 为结尾的路径或以 .cga 结尾的文件），或 APP 包对象
  * @param opt 选项
  * @param ntid App 模式下无效
  */
-export async function run(url: string, opt: types.ITaskRunOptions = {}, ntid?: number): Promise<number> {
-    // --- 检测 url 是否合法 ---
-    if (!url.endsWith('/') && !url.endsWith('.cga')) {
-        return 0;
+export async function run(url: string | types.IApp, opt: types.ITaskRunOptions = {}, ntid?: number): Promise<number> {
+    let app: types.IApp | null = null;
+    if (typeof url === 'string') {
+        // --- 检测 url 是否合法 ---
+        if (!url.endsWith('/') && !url.endsWith('.cga')) {
+            return 0;
+        }
+        /** --- 要显示的应用图标 --- */
+        let icon = __dirname + '/../icon.png';
+        if (opt.icon) {
+            icon = opt.icon;
+        }
+        if (opt.notify === undefined) {
+            opt.notify = true;
+        }
+        const notifyId: number | undefined = opt.notify ? form.notify({
+            'title': localeData[core.config.locale]?.loading ?? localeData['en'].loading,
+            'content': url,
+            'icon': icon,
+            'timeout': 0,
+            'progress': true
+        }) : undefined;
+        // --- 非 ntid 模式下 current 以 location 为准 ---
+        if (!ntid &&
+            !url.startsWith('/clickgo/') &&
+            !url.startsWith('/storage/') &&
+            !url.startsWith('/mounted/') &&
+            !url.startsWith('/package/') &&
+            !url.startsWith('/current/')
+        ) {
+            url = tool.urlResolve(location.href, url);
+        }
+        // --- 获取并加载 app 对象 ---
+        app = await core.fetchApp(url, {
+            'notifyId': notifyId,
+            'progress': opt.progress
+        }, ntid);
+        // --- 无论是否成功，都可以先隐藏 notify 了 ---
+        if (notifyId) {
+            setTimeout(function(): void {
+                form.hideNotify(notifyId);
+            }, 2000);
+        }
     }
-    /** --- 要显示的应用图标 --- */
-    let icon = __dirname + '/../icon.png';
-    if (opt.icon) {
-        icon = opt.icon;
-    }
-    if (opt.notify === undefined) {
-        opt.notify = true;
-    }
-    const notifyId: number | undefined = opt.notify ? form.notify({
-        'title': localeData[core.config.locale]?.loading ?? localeData['en'].loading,
-        'content': url,
-        'icon': icon,
-        'timeout': 0,
-        'progress': true
-    }) : undefined;
-    // --- 非 ntid 模式下 current 以 location 为准 ---
-    if (!ntid &&
-        !url.startsWith('/clickgo/') &&
-        !url.startsWith('/storage/') &&
-        !url.startsWith('/mounted/') &&
-        !url.startsWith('/package/') &&
-        !url.startsWith('/current/')
-    ) {
-        url = tool.urlResolve(location.href, url);
-    }
-    // --- 获取并加载 app 对象 ---
-    const app = await core.fetchApp(url, {
-        'notifyId': notifyId,
-        'progress': opt.progress
-    }, ntid);
-    // --- 无论是否成功，都可以先隐藏 notify 了 ---
-    if (notifyId) {
-        setTimeout(function(): void {
-            form.hideNotify(notifyId);
-        }, 2000);
+    else if (url.type !== 'app') {
+        return -1;
+    }
+    else {
+        app = url;
     }
     if (!app) {
         return -1;
@@ -1076,7 +1085,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}, ntid?: n
     };
     app.files['/invoke/clickgo.js'] = `module.exports = invokeClickgo;`;
     /** --- .cga 文件，或者不含 / 结尾的路径 --- */
-    const path = url;
+    const path = opt.path ?? ((typeof url === 'string') ? url : '/runtime/' + tool.random(8, tool.RANDOM_LUN) + '.cga');
     const lio = path.endsWith('.cga') ? path.lastIndexOf('/') : path.slice(0, -1).lastIndexOf('/');
     const current = path.slice(0, lio);
     // --- 创建任务对象 ---
@@ -1108,6 +1117,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}, ntid?: n
             if (!path.endsWith('.json')) {
                 path += '.json';
             }
+            await opt.initProgress?.('Load local ' + path + ' ...');
             const lcontent = await fs.getContent(path, {
                 'encoding': 'utf8'
             }, taskId);
@@ -1150,6 +1160,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}, ntid?: n
     // --- 创建 Task 总 style ---
     dom.createToStyleList(taskId);
     // --- 加载 control ---
+    await opt.initProgress?.('Control initialization ...');
     const r = await control.init(taskId, invoke);
     if (r < 0) {
         dom.removeFromStyleList(taskId);
@@ -1161,6 +1172,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}, ntid?: n
         for (let path of app.config.themes) {
             path += '.cgt';
             path = tool.urlResolve('/', path);
+            await opt.initProgress?.('Load theme ' + path + ' ...');
             const file = await fs.getContent(path, undefined, taskId);
             if (file && typeof file !== 'string') {
                 const th = await theme.read(file);
@@ -1173,6 +1185,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}, ntid?: n
     else {
         // --- 加载全局主题 ---
         if (theme.global) {
+            await opt.initProgress?.('Load global theme ...');
             await theme.load(undefined, taskId);
         }
     }
@@ -1183,6 +1196,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}, ntid?: n
         }, taskId);
         if (style) {
             const r = tool.stylePrepend(style, 'cg-task' + taskId.toString() + '_');
+            await opt.initProgress?.('Style initialization ...');
             dom.pushStyle(taskId, await tool.styleUrl2DataUrl(app.config.style, r.style, app.files));
         }
     }
@@ -1190,11 +1204,13 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}, ntid?: n
     core.trigger('taskStarted', taskId);
     // --- 请求权限 ---
     if (app.config.permissions) {
+        await opt.initProgress?.('Style initialization ...');
         await checkPermission(app.config.permissions, true, undefined, taskId);
     }
     // --- 执行 app ---
     const appCls: core.AbstractApp = new expo.default();
     list[taskId].class = appCls;
+    await opt.initProgress?.('Starting ...');
     await appCls.main(opt.data ?? {});
     return taskId;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.1.13",
+  "version": "3.1.14",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",
@@ -24,5 +24,8 @@
     "electron": "^22.0.2",
     "jszip": "^3.10.1",
     "typescript": "^4.9.4"
+  },
+  "dependencies": {
+    "terser": "^5.16.1"
   }
 }

package/types/index.d.ts

@@ -421,6 +421,8 @@ export interface ITaskRunOptions {
     'icon'?: string;
     /** --- 加载进度回调 --- */
     'progress'?: (loaded: number, total: number) => void | Promise<void>;
+    /** --- 初始化进度回调 --- */
+    'initProgress'?: (state: string) => void | Promise<void>;
     /** --- 显示 notify 窗口 --- */
     'notify'?: boolean;
     /** --- 不禁止某些浏览器对象，App 模式下仅能设置基任务中已经 unblock 的值 --- */
@@ -429,6 +431,8 @@ export interface ITaskRunOptions {
     'permissions'?: string[];
     /** --- 给 task 传值 --- */
     'data'?: Record<string, any>;
+    /** --- 执行文件的基路径，一般在传入 APP 包时使用，以 .cga 结尾或不以 / 结尾的路径 --- */
+    'path'?: string;
 }
 
 export interface ICreateTimerOptions {