clickgo 3.1.4-dev13 → 3.1.6-dev15

package/dist/lib/task.ts

@@ -119,7 +119,7 @@ export function onFrame(fun: () => void | Promise<void>, opt: {
                 // --- 接着循环 ---
                 timer = requestAnimationFrame(function() {
                     timerHandler().catch(function(e) {
-                        console.log(e);
+                        console.log('task.onFrame: -3', e);
                     });
                 });
                 frameMaps[ft] = timer;
@@ -134,7 +134,7 @@ export function onFrame(fun: () => void | Promise<void>, opt: {
             // --- 无限循环 ---
             timer = requestAnimationFrame(function() {
                 timerHandler().catch(function(e) {
-                    console.log(e);
+                    console.log('task.onFrame: -2', e);
                 });
             });
             frameMaps[ft] = timer;
@@ -143,7 +143,7 @@ export function onFrame(fun: () => void | Promise<void>, opt: {
     /** --- timer 对象 number --- */
     timer = requestAnimationFrame(function() {
         timerHandler().catch(function(e) {
-            console.log(e);
+            console.log('task.onFrame: -1', e);
         });
     });
     frameMaps[ft] = timer;
@@ -194,6 +194,17 @@ export function get(tid: number): types.ITaskInfo | null {
     };
 }
 
+/**
+ * --- 获取某个任务的已授权权限列表 ---
+ * @param tid 任务 id
+ */
+export function getPermissions(tid: number): string[] {
+    if (list[tid] === undefined) {
+        return [];
+    }
+    return tool.clone(list[tid].runtime.permissions);
+}
+
 /**
  * --- 获取 task list 的简略情况 ---
  */
@@ -218,13 +229,9 @@ export function getList(): Record<string, types.ITaskInfo> {
  * --- 运行一个应用，cga 直接文件全部正常加载，url 则静态文件需要去 config 里加载 ---
  * @param url app 路径（以 / 为结尾的路径或以 .cga 结尾的文件）
  * @param opt 选项
+ * @param ntid App 模式下无效
  */
-export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise<number> {
-    /** --- 是否是在任务当中启动的任务 --- */
-    let ntask: types.ITask | null = null;
-    if (opt.taskId) {
-        ntask = list[opt.taskId];
-    }
+export async function run(url: string, opt: types.ITaskRunOptions = {}, ntid?: number): Promise<number> {
     // --- 检测 url 是否合法 ---
     if (!url.endsWith('/') && !url.endsWith('.cga')) {
         return 0;
@@ -244,12 +251,21 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
         '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,
-        'current': ntask ? ntask.current : undefined,
         'progress': opt.progress
-    });
+    }, ntid);
     // --- 无论是否成功，都可以先隐藏 notify 了 ---
     if (notifyId) {
         setTimeout(function(): void {
@@ -266,7 +282,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
     const unblock = opt.unblock ? tool.clone(opt.unblock) : [];
     const unblockSys = [
         'require',
-        '__awaiter', 'eval', 'Math', 'Array', 'Blob', 'Error', 'Infinity', 'parseInt', 'parseFloat', 'Promise', 'Date', 'JSON', 'fetch', 'Number'
+        '__awaiter', 'eval', 'Math', 'Array', 'Blob', 'Error', 'Infinity', 'parseInt', 'parseFloat', 'Promise', 'Date', 'JSON', 'fetch', 'Number', 'Object'
     ];
     for (const name of unblockSys) {
         if (unblock.includes(name)) {
@@ -457,6 +473,9 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             }
         },
         'dom': {
+            inPage: function(el: HTMLElement): boolean {
+                return dom.inPage(el);
+            },
             setGlobalCursor: function(type?: string): void {
                 dom.setGlobalCursor(type);
             },
@@ -466,6 +485,9 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             getStyleCount: function(taskId: number, type: 'theme' | 'control' | 'form'): number {
                 return dom.getStyleCount(taskId, type);
             },
+            getWatchSizeCount: function(taskId?: number): number {
+                return dom.getWatchSizeCount(taskId);
+            },
             watchSize: function(
                 el: HTMLElement,
                 cb: () => void | Promise<void>,
@@ -476,9 +498,12 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             unwatchSize: function(el: HTMLElement): void {
                 dom.unwatchSize(el, taskId);
             },
-            isWatchSize(el: HTMLElement): boolean {
+            isWatchSize: function(el: HTMLElement): boolean {
                 return dom.isWatchSize(el);
             },
+            getWatchCount: function(taskId?: number): number {
+                return dom.getWatchCount(taskId);
+            },
             watch: function(el: HTMLElement, cb: () => void, mode: 'child' | 'childsub' | 'style' | 'default' = 'default', immediate: boolean = false): void {
                 dom.watch(el, cb, mode, immediate, taskId);
             },
@@ -499,7 +524,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             isWatchStyle: function(el: HTMLElement): boolean {
                 return dom.isWatchStyle(el);
             },
-            watchProperty(
+            watchProperty: function(
                 el: HTMLElement,
                 name: string | string[],
                 cb: (name: string, value: string) => void,
@@ -510,7 +535,10 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             isWatchProperty(el: HTMLElement): boolean {
                 return dom.isWatchProperty(el);
             },
-            bindClick(e: MouseEvent | TouchEvent, handler: () => void): void {
+            getWatchInfo: function(): types.IGetWatchInfoResult {
+                return dom.getWatchInfo();
+            },
+            bindClick: function(e: MouseEvent | TouchEvent, handler: () => void): void {
                 dom.bindClick(e, handler);
             },
             bindDown: function(oe: MouseEvent | TouchEvent, opt: types.IBindDownOptions) {
@@ -535,8 +563,8 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             bindResize: function(e: MouseEvent | TouchEvent, opt: types.IBindResizeOptions): void {
                 dom.bindResize(e, opt);
             },
-            findParentByData: function(el: HTMLElement, name: string): HTMLElement | null {
-                return dom.findParentByData(el, name);
+            findParentByData: function(el: HTMLElement, name: string, value?: string): HTMLElement | null {
+                return dom.findParentByData(el, name, value);
             },
             findParentByClass: function(el: HTMLElement, name: string): HTMLElement | null {
                 return dom.findParentByClass(el, name);
@@ -552,6 +580,11 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             }
         },
         'form': {
+            'AbstractPanel': class extends form.AbstractPanel {
+                public get taskId(): number {
+                    return taskId;
+                }
+            },
             'AbstractForm': class extends form.AbstractForm {
                 public get taskId(): number {
                     return taskId;
@@ -584,6 +617,15 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             getFocus: function(): number | null {
                 return form.getFocus();
             },
+            getActivePanel: function(formId: number): number[] {
+                return form.getActivePanel(formId);
+            },
+            removeActivePanel: function(panelId: number, formId: number): boolean {
+                return form.removeActivePanel(panelId, formId, taskId);
+            },
+            setActivePanel: function(panelId: number, formId: number): boolean {
+                return form.setActivePanel(panelId, formId, taskId);
+            },
             changeFocus: function(fid: number = 0): void {
                 form.changeFocus(fid);
             },
@@ -632,6 +674,30 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             hidePop: function(pop?: HTMLElement): void {
                 form.hidePop(pop);
             },
+            removePanel(id: number, vapp: types.IVApp, el: HTMLElement): boolean {
+                return form.removePanel(id, vapp, el);
+            },
+            createPanel<T extends form.AbstractPanel>(
+                cls: (new () => T),
+                el: HTMLElement,
+                formId: number
+            ): Promise<{
+                'vapp': types.IVApp;
+                'vroot': T;
+            }> {
+                return form.createPanel(cls, el, formId, taskId);
+            },
+            create: function<T extends form.AbstractForm>(
+                cls: string | (new () => T),
+                data?: Record<string, any>,
+                opt?: {
+                    'layout'?: string;
+                    'style'?: string;
+                    'path'?: string;
+                }
+            ): Promise<T> {
+                return form.create(cls, data, opt, taskId);
+            },
             dialog: function(opt: string | types.IFormDialogOptions): Promise<string> {
                 if (typeof opt === 'string') {
                     opt = {
@@ -661,119 +727,62 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             }
         },
         'fs': {
+            mount: function(name: string, handler: types.IMountHandler): boolean {
+                return clickgo.fs.mount(name, handler, taskId);
+            },
+            unmount: function(name: string): Promise<boolean> {
+                return clickgo.fs.unmount(name);
+            },
             getContent: function(
                 path: string,
                 options: any = {}
             ): Promise<Blob | string | null> {
-                if (!options.files) {
-                    options.files = list[taskId].app.files;
-                }
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.getContent(path, options);
+                return fs.getContent(path, options, taskId);
             },
             putContent: function(path: string, data: string | Blob, options: any = {}) {
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.putContent(path, data, options);
+                return fs.putContent(path, data, options, taskId);
             },
             readLink: function(path: string, options: any = {}): Promise<string | null> {
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.readLink(path, options);
+                return fs.readLink(path, options, taskId);
             },
             symlink: function(fPath: string, linkPath: string, options: any = {}): Promise<boolean> {
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.symlink(fPath, linkPath, options);
+                return fs.symlink(fPath, linkPath, options, taskId);
             },
-            unlink: function(path: string, options: any = {}): Promise<boolean> {
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.unlink(path, options);
+            unlink: function(path: string): Promise<boolean> {
+                return fs.unlink(path, taskId);
             },
-            stats: function(path: string, options: any = {}): Promise<types.IStats | null> {
-                if (!options.files) {
-                    options.files = list[taskId].app.files;
-                }
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.stats(path, options);
+            stats: function(path: string): Promise<types.IStats | null> {
+                return fs.stats(path, taskId);
             },
-            isDir: function(path: string, options: any = {}): Promise<types.IStats | false> {
-                if (!options.files) {
-                    options.files = list[taskId].app.files;
-                }
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.isDir(path, options);
+            isDir: function(path: string): Promise<types.IStats | false> {
+                return fs.isDir(path, taskId);
             },
-            isFile: function(path: string, options: any = {}): Promise<types.IStats | false> {
-                if (!options.files) {
-                    options.files = list[taskId].app.files;
-                }
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.isFile(path, options);
+            isFile: function(path: string): Promise<types.IStats | false> {
+                return fs.isFile(path, taskId);
             },
-            mkdir: function(path: string, mode?: number, options: any = {}): Promise<boolean> {
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.mkdir(path, mode, options);
+            mkdir: function(path: string, mode?: number): Promise<boolean> {
+                return fs.mkdir(path, mode, taskId);
             },
-            rmdir: function(path: string, options: any = {}): Promise<boolean> {
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.rmdir(path, options);
+            rmdir: function(path: string): Promise<boolean> {
+                return fs.rmdir(path, taskId);
             },
-            rmdirDeep: function(path: string, options: any = {}): Promise<boolean> {
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.rmdirDeep(path, options);
+            rmdirDeep: function(path: string): Promise<boolean> {
+                return fs.rmdirDeep(path, taskId);
             },
-            chmod: function(path: string, mod: string | number, options: any = {}): Promise<boolean> {
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.chmod(path, mod, options);
+            chmod: function(path: string, mod: string | number): Promise<boolean> {
+                return fs.chmod(path, mod, taskId);
             },
-            rename(oldPath: string, newPath: string, options: any = {}): Promise<boolean> {
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.rename(oldPath, newPath, options);
+            rename(oldPath: string, newPath: string): Promise<boolean> {
+                return fs.rename(oldPath, newPath, taskId);
             },
-            readDir(path: string, options: any = {}): Promise<types.IDirent[]> {
-                if (!options.files) {
-                    options.files = list[taskId].app.files;
-                }
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.readDir(path, options);
+            readDir(path: string, encoding?: BufferEncoding): Promise<types.IDirent[]> {
+                return fs.readDir(path, encoding, taskId);
             },
             copyFolder(from: string, to: string, options: any = {}): Promise<number> {
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.copyFolder(from, to, options);
+                return fs.copyFolder(from, to, options, taskId);
             },
-            copyFile(src: string, dest: string, options: any = {}): Promise<boolean> {
-                if (!options.current) {
-                    options.current = list[taskId].current;
-                }
-                return fs.copyFile(src, dest, options);
+            copyFile(src: string, dest: string): Promise<boolean> {
+                return fs.copyFile(src, dest, taskId);
             }
         },
         'native': {
@@ -863,11 +872,13 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             get: function(tid: number): types.ITaskInfo | null {
                 return get(tid);
             },
+            getPermissions: function(tid: number): string[] {
+                return getPermissions(tid);
+            },
             getList: function(): Record<string, types.ITaskInfo> {
                 return getList();
             },
             run: function(url: string, opt: types.ITaskRunOptions = {}): Promise<number> {
-                opt.taskId = taskId;
                 if (opt.unblock) {
                     const inUnblock: string[] = [];
                     // --- 只能解除屏蔽当前函数里面被解除的变量 ---
@@ -880,11 +891,11 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
                     opt.unblock = inUnblock;
                 }
                 if (opt.permissions) {
-                    if (ntask && !ntask.runtime.permissions.includes('root')) {
+                    if (!list[taskId]?.runtime.permissions.includes('root')) {
                         opt.permissions = undefined;
                     }
                 }
-                return run(url, opt);
+                return run(url, opt, taskId);
             },
             checkPermission: function(
                 vals: string | string[],
@@ -1005,6 +1016,9 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             escapeHTML: function(html: string): string {
                 return tool.escapeHTML(html);
             },
+            rgb2hsl: function(rgb: string): number[] {
+                return tool.rgb2hsl(rgb);
+            },
             request: function(url: string, opt: types.IRequestOptions): Promise<null | any> {
                 return tool.request(url, opt);
             },
@@ -1014,6 +1028,9 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             urlResolve: function(from: string, to: string): string {
                 return tool.urlResolve(from, to);
             },
+            urlAtom: function(url: string): string {
+                return tool.urlAtom(url);
+            },
             blob2Text: function(blob: Blob): Promise<string> {
                 return tool.blob2Text(blob);
             },
@@ -1043,7 +1060,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             return '';
         }
         // --- 给 form 的 class 增加 filename 的 get ---
-        code = code.replace(/extends[\s\S]+?\.\s*(AbstractApp|AbstractForm)\s*{/, (t: string) => {
+        code = code.replace(/extends[\s\S]+?\.\s*(AbstractApp|AbstractForm|AbstractPanel)\s*{/, (t: string) => {
             return t + 'get filename() {return __filename;}';
         });
         return code;
@@ -1083,10 +1100,8 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
                 path += '.json';
             }
             const lcontent = await fs.getContent(path, {
-                'encoding': 'utf8',
-                'files': app.files,
-                'current': current
-            });
+                'encoding': 'utf8'
+            }, taskId);
             if (!lcontent) {
                 continue;
             }
@@ -1101,13 +1116,17 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
     }
     let expo: any = [];
     try {
+        const map = {
+            'clickgo': '/invoke/clickgo'
+        };
+        if (app.config.map) {
+            Object.assign(map, app.config.map);
+        }
         expo = loader.require('/app.js', app.files, {
             'dir': '/',
             'invoke': invoke,
             'preprocess': preprocess,
-            'map': {
-                'clickgo': '/invoke/clickgo'
-            }
+            'map': map
         })[0];
     }
     catch (e: any) {
@@ -1133,10 +1152,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
         for (let path of app.config.themes) {
             path += '.cgt';
             path = tool.urlResolve('/', path);
-            const file = await fs.getContent(path, {
-                'files': app.files,
-                'current': current
-            });
+            const file = await fs.getContent(path, undefined, taskId);
             if (file && typeof file !== 'string') {
                 const th = await theme.read(file);
                 if (th) {
@@ -1154,10 +1170,8 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
     // --- 加载任务级全局样式 ---
     if (app.config.style) {
         const style = await fs.getContent(app.config.style + '.css', {
-            'encoding': 'utf8',
-            'files': app.files,
-            'current': current
-        });
+            'encoding': 'utf8'
+        }, taskId);
         if (style) {
             const r = tool.stylePrepend(style, 'cg-task' + taskId.toString() + '_');
             dom.pushStyle(taskId, await tool.styleUrl2DataUrl(app.config.style, r.style, app.files));
@@ -1179,6 +1193,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
 /** --- 本页用到的语言包 --- */
 const locale: Record<string, {
     'unknown': string;
+    'root': string;
     // eslint-disable-next-line @typescript-eslint/naming-convention
     'apply-permission': string;
     // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -1191,6 +1206,7 @@ const locale: Record<string, {
 }> = {
     'sc': {
         'unknown': '未知权限',
+        'root': '<b>危险！</b>最高权限！请一定确认是否允许！',
         'apply-permission': '正在申请权限，请您仔细确认',
         'native.form': '实体窗体控制',
         'hash': '可修改地址栏 hash',
@@ -1200,6 +1216,7 @@ const locale: Record<string, {
     },
     'tc': {
         'unknown': '未知許可權',
+        'root': '<b>危險！</b>最高許可權！請一定確認是否允許！',
         'apply-permission': '正在申請許可權，請您仔細確認',
         'native.form': '實體視窗控制',
         'hash': '可修改位址列 hash',
@@ -1209,6 +1226,7 @@ const locale: Record<string, {
     },
     'en': {
         'unknown': 'Unknown',
+        'root': '<b>Danger!</b> Highest authorization! Please confirm whether to authorize?',
         'apply-permission': 'is applying for permissions, please check carefully',
         'native.form': 'Native window control',
         'hash': 'Can modify the location hash',
@@ -1218,6 +1236,7 @@ const locale: Record<string, {
     },
     'ja': {
         'unknown': '不明な許可',
+        'root': '<b>危険！</b>最高の許可！承認するかどうかを確認してください！',
         'apply-permission': '許可申請中、よくご確認ください',
         'native.form': 'ローカルウィンドウを操作する',
         'hash': '網址の hash 変更可能',
@@ -1390,6 +1409,7 @@ export function end(taskId: number): boolean {
         form.elements.popList.querySelector('[data-form-id="' + f.id.toString() + '"]')?.remove();
         dom.clearWatchStyle(fid);
         dom.clearWatchProperty(fid);
+        delete form.activePanels[fid];
     }
     // --- 移除可能残留的 form wrap ---
     const flist = form.elements.list.querySelectorAll('.cg-form-wrap[data-task-id="' + taskId.toString() + '"]');
@@ -1465,10 +1485,8 @@ export async function loadLocale(lang: string, path: string, taskId?: number): P
     path = tool.urlResolve(task.current + '/', path) + '.json';
     /** --- 获取的语言文件 --- */
     const fcontent = await fs.getContent(path, {
-        'encoding': 'utf8',
-        'files': task.app.files,
-        'current': task.current
-    });
+        'encoding': 'utf8'
+    }, taskId);
     if (!fcontent) {
         return false;
     }

package/dist/lib/theme.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,10 +33,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearGlobal = exports.setGlobal = exports.clear = exports.remove = exports.load = exports.read = exports.global = void 0;
-const zip = require("./zip");
-const tool = require("./tool");
-const task = require("./task");
-const dom = require("./dom");
+const zip = __importStar(require("./zip"));
+const tool = __importStar(require("./tool"));
+const task = __importStar(require("./task"));
+const dom = __importStar(require("./dom"));
 exports.global = null;
 function read(blob) {
     return __awaiter(this, void 0, void 0, function* () {

package/dist/lib/tool.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execCommand = exports.blob2DataUrl = exports.blob2Text = exports.urlResolve = exports.parseUrl = exports.request = exports.escapeHTML = exports.getArray = exports.getNumber = exports.getBoolean = exports.random = exports.RANDOM_LUNS = exports.RANDOM_V = exports.RANDOM_LUN = exports.RANDOM_LU = exports.RANDOM_LN = exports.RANDOM_UN = exports.RANDOM_L = exports.RANDOM_U = exports.RANDOM_N = exports.rand = exports.getMimeByPath = exports.stylePrepend = exports.teleportGlue = exports.eventsAttrWrap = exports.layoutClassPrepend = exports.layoutInsertAttr = exports.layoutAddTagClassAndReTagName = exports.styleUrl2DataUrl = exports.purify = exports.sleepFrame = exports.nextFrame = exports.sleep = exports.clone = exports.blob2ArrayBuffer = exports.getClassPrototype = void 0;
+exports.execCommand = exports.blob2DataUrl = exports.blob2Text = exports.urlAtom = exports.urlResolve = exports.parseUrl = exports.request = exports.rgb2hsl = exports.escapeHTML = exports.getArray = exports.getNumber = exports.getBoolean = exports.random = exports.RANDOM_LUNS = exports.RANDOM_V = exports.RANDOM_LUN = exports.RANDOM_LU = exports.RANDOM_LN = exports.RANDOM_UN = exports.RANDOM_L = exports.RANDOM_U = exports.RANDOM_N = exports.rand = exports.getMimeByPath = exports.stylePrepend = exports.teleportGlue = exports.eventsAttrWrap = exports.layoutClassPrepend = exports.layoutInsertAttr = exports.layoutAddTagClassAndReTagName = exports.styleUrl2DataUrl = exports.match = exports.purify = exports.sleepFrame = exports.nextFrame = exports.sleep = exports.clone = exports.blob2ArrayBuffer = exports.getClassPrototype = void 0;
 function getClassPrototype(obj, over = [], level = 0) {
     if (level === 0) {
         return getClassPrototype(Object.getPrototypeOf(obj), over, level + 1);
@@ -114,12 +114,29 @@ function sleepFrame(count) {
 exports.sleepFrame = sleepFrame;
 function purify(text) {
     text = '>' + text + '<';
-    text = text.replace(/<!--([\s\S]*?)-->/g, '').replace(/>([\s\S]*?)</g, function (t, t1) {
+    const scripts = [];
+    let num = -1;
+    text = text.replace(/<!--([\s\S]*?)-->/g, '').replace(/<script[\s\S]+?<\/script>/g, function (t) {
+        scripts.push(t);
+        return '[SCRIPT]';
+    }).replace(/>([\s\S]*?)</g, function (t, t1) {
         return '>' + t1.replace(/\t|\r\n| {2}/g, '').replace(/\n|\r/g, '') + '<';
+    }).replace(/\[SCRIPT\]/g, function () {
+        ++num;
+        return scripts[num];
     });
     return text.slice(1, -1);
 }
 exports.purify = purify;
+function match(str, regs) {
+    for (const reg of regs) {
+        if (reg.test(str)) {
+            return true;
+        }
+    }
+    return false;
+}
+exports.match = match;
 function styleUrl2DataUrl(path, style, files) {
     return __awaiter(this, void 0, void 0, function* () {
         const reg = /url\(["']{0,1}(.+?)["']{0,1}\)/ig;
@@ -430,6 +447,40 @@ function escapeHTML(html) {
     return html.replace(/</g, '&lt;').replace(/>/g, '&gt;');
 }
 exports.escapeHTML = escapeHTML;
+function rgb2hsl(rgb) {
+    if (rgb.includes('(')) {
+        const match = /[0-9., ]+/.exec(rgb);
+        if (!match) {
+            return [0, 0, 0];
+        }
+        rgb = match[0];
+    }
+    const arr = rgb.split(',');
+    const [r, g, b] = arr.map(v => parseInt(v) / 255);
+    const max = Math.max(r, g, b);
+    const min = Math.min(r, g, b);
+    const diff = max - min;
+    let h = 0;
+    const l = (max + min) / 2;
+    const s2 = 1 - Math.abs(max + min - 1);
+    const s = s2 ? (diff / s2) : 0;
+    switch (min) {
+        case max:
+            h = 0;
+            break;
+        case r:
+            h = (60 * ((b - g) / diff)) + 180;
+            break;
+        case g:
+            h = (60 * ((r - b) / diff)) + 300;
+            break;
+        case b:
+            h = (60 * ((g - r) / diff)) + 60;
+            break;
+    }
+    return [h, s, l];
+}
+exports.rgb2hsl = rgb2hsl;
 function request(url, opt) {
     return new Promise(function (resove) {
         var _a;
@@ -541,6 +592,10 @@ function urlResolve(from, to) {
     return loader.urlResolve(from, to);
 }
 exports.urlResolve = urlResolve;
+function urlAtom(url) {
+    return loader.urlAtom(url);
+}
+exports.urlAtom = urlAtom;
 function blob2Text(blob) {
     return loader.blob2Text(blob);
 }