clickgo 3.1.3-dev12 → 3.1.5-dev14

package/dist/lib/task.ts

@@ -266,7 +266,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'
+        '__awaiter', 'eval', 'Math', 'Array', 'Blob', 'Error', 'Infinity', 'parseInt', 'parseFloat', 'Promise', 'Date', 'JSON', 'fetch', 'Number'
     ];
     for (const name of unblockSys) {
         if (unblock.includes(name)) {
@@ -306,8 +306,65 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
     }
     // --- console ---
     invoke.console = {
-        log: function(message?: any, ...optionalParams: any[]) {
-            console.log(message, ...optionalParams);
+        assert: function(condition?: boolean, ...data: any[]): void {
+            console.assert(condition, ...data);
+        },
+        clear: function(): void {
+            console.clear();
+        },
+        count: function(label?: string): void {
+            console.count(label);
+        },
+        countReset: function(label?: string): void {
+            console.countReset(label);
+        },
+        debug: function(...data: any[]): void {
+            console.debug(...data);
+        },
+        dir: function(item?: any, options?: any): void {
+            console.dir(item, options);
+        },
+        dirxml: function(...data: any[]): void {
+            console.dirxml(...data);
+        },
+        error: function(...data: any[]): void {
+            console.error(...data);
+        },
+        group: function(...data: any[]): void {
+            console.group(...data);
+        },
+        groupCollapsed: function(...data: any[]): void {
+            console.groupCollapsed(...data);
+        },
+        groupEnd: function(): void {
+            console.groupEnd();
+        },
+        info: function(...data: any[]): void {
+            console.info(...data);
+        },
+        log: function(...data: any[]): void {
+            console.log(...data);
+        },
+        table: function(tabularData?: any, properties?: string[]): void {
+            console.table(tabularData, properties);
+        },
+        time: function(label?: string): void {
+            console.time(label);
+        },
+        timeEnd: function(label?: string): void {
+            console.timeEnd(label);
+        },
+        timeLog: function(label?: string, ...data: any[]): void {
+            console.timeLog(label, ...data);
+        },
+        timeStamp: function(label?: string): void {
+            console.timeStamp(label);
+        },
+        trace: function(...data: any[]): void {
+            console.trace(...data);
+        },
+        warn: function(...data: any[]): void {
+            console.warn(...data);
         }
     };
     // --- loader ---
@@ -394,6 +451,9 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             },
             getAvailArea: function(): types.IAvailArea {
                 return core.getAvailArea();
+            },
+            hash: function(hash: string): boolean {
+                return core.hash(hash, taskId);
             }
         },
         'dom': {
@@ -572,6 +632,17 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
             hidePop: function(pop?: HTMLElement): void {
                 form.hidePop(pop);
             },
+            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 = {
@@ -613,7 +684,7 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
                 }
                 return fs.getContent(path, options);
             },
-            putContent: function(path: string, data: string | Buffer, options: any = {}) {
+            putContent: function(path: string, data: string | Blob, options: any = {}) {
                 if (!options.current) {
                     options.current = list[taskId].current;
                 }
@@ -745,17 +816,40 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
                 return native.invoke(name, ...param);
             },
             max: async function(): Promise<void> {
+                const rtn = await checkPermission('native.form', false, undefined, taskId);
+                if (!rtn[0]) {
+                    return;
+                }
                 await native.max();
             },
             min: async function(): Promise<void> {
+                const rtn = await checkPermission('native.form', false, undefined, taskId);
+                if (!rtn[0]) {
+                    return;
+                }
                 await native.min();
             },
             restore: async function(): Promise<void> {
+                const rtn = await checkPermission('native.form', false, undefined, taskId);
+                if (!rtn[0]) {
+                    return;
+                }
                 await native.restore();
             },
             size: async function(width: number, height: number): Promise<void> {
+                const rtn = await checkPermission('native.form', false, undefined, taskId);
+                if (!rtn[0]) {
+                    return;
+                }
                 await native.size(width, height);
             },
+            maximizable: async function(val: boolean): Promise<void> {
+                const rtn = await checkPermission('native.form', false, undefined, taskId);
+                if (!rtn[0]) {
+                    return;
+                }
+                await native.maximizable(val);
+            },
             ping: function(val: string): Promise<string> {
                 return native.ping(val);
             },
@@ -796,8 +890,20 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
                     }
                     opt.unblock = inUnblock;
                 }
+                if (opt.permissions) {
+                    if (ntask && !ntask.runtime.permissions.includes('root')) {
+                        opt.permissions = undefined;
+                    }
+                }
                 return run(url, opt);
             },
+            checkPermission: function(
+                vals: string | string[],
+                apply: boolean = false,
+                applyHandler?: (list: string[]) => void | Promise<void>
+            ): Promise<boolean[]> {
+                return checkPermission(vals, apply, applyHandler, taskId);
+            },
             end: function(tid: number): boolean {
                 return end(tid ?? taskId);
             },
@@ -910,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);
             },
@@ -919,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);
             },
@@ -972,8 +1084,8 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
         'current': current,
 
         'runtime': clickgo.vue.reactive({
-            'permissions': {},
-            'dialogFormIds': []
+            'dialogFormIds': [],
+            'permissions': opt.permissions ?? []
         }),
         'forms': {},
         'controls': {},
@@ -1006,13 +1118,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) {
@@ -1070,9 +1186,9 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
     }
     // --- 触发 taskStarted 事件 ---
     core.trigger('taskStarted', taskId);
-    // --- 第一个任务给 native 发送任务启动成功的消息 ---
-    if (taskId === 1) {
-        await native.invoke('cg-init', native.getToken());
+    // --- 请求权限 ---
+    if (app.config.permissions) {
+        await checkPermission(app.config.permissions, true, undefined, taskId);
     }
     // --- 执行 app ---
     const appCls: core.AbstractApp = new expo.default();
@@ -1081,6 +1197,176 @@ export async function run(url: string, opt: types.ITaskRunOptions = {}): Promise
     return taskId;
 }
 
+/** --- 本页用到的语言包 --- */
+const locale: Record<string, {
+    'unknown': string;
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'apply-permission': string;
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'native.form': string;
+    'hash': string;
+    'fs': string;
+    'readonly': string;
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'read-write': string;
+}> = {
+    'sc': {
+        'unknown': '未知权限',
+        'apply-permission': '正在申请权限，请您仔细确认',
+        'native.form': '实体窗体控制',
+        'hash': '可修改地址栏 hash',
+        'fs': '文件系统',
+        'readonly': '只读',
+        'read-write': '读写'
+    },
+    'tc': {
+        'unknown': '未知許可權',
+        'apply-permission': '正在申請許可權，請您仔細確認',
+        'native.form': '實體視窗控制',
+        'hash': '可修改位址列 hash',
+        'fs': '檔案系統',
+        'readonly': '唯讀',
+        'read-write': '讀寫'
+    },
+    'en': {
+        'unknown': 'Unknown',
+        'apply-permission': 'is applying for permissions, please check carefully',
+        'native.form': 'Native window control',
+        'hash': 'Can modify the location hash',
+        'fs': 'File system',
+        'readonly': 'Read only',
+        'read-write': 'Read and write'
+    },
+    'ja': {
+        'unknown': '不明な許可',
+        'apply-permission': '許可申請中、よくご確認ください',
+        'native.form': 'ローカルウィンドウを操作する',
+        'hash': '網址の hash 変更可能',
+        'fs': '資料システム',
+        'readonly': '読み取り専用',
+        'read-write': '読み書き'
+    }
+};
+
+// fs.{path}{r/w}，path 以 / 结尾则是路径权限，不以 / 结尾是文件权限
+
+/**
+ * --- 检测应用是否有相应的权限 ---
+ * @param vals 要检测的权限
+ * @param apply 如果没有权限是否自动弹出申请，默认为否
+ * @param applyHandler 向用户申请成功的权限列表回调
+ * @param taskId 要检查的任务 ID，App 模式下无效
+ */
+export async function checkPermission(
+    vals: string | string[],
+    apply: boolean = false,
+    applyHandler?: (list: string[]) => void | Promise<void>,
+    taskId?: number
+): Promise<boolean[]> {
+    if (!taskId) {
+        return [false];
+    }
+    const task = list[taskId];
+    if (!task) {
+        return [false];
+    }
+    if (typeof vals === 'string') {
+        vals = [vals];
+    }
+    const rtn: boolean[] = [];
+    /** --- 需要申请的权限 --- */
+    const applyList: string[] = [];
+    for (const val of vals) {
+        if (task.runtime.permissions.includes('root')) {
+            // --- 有 root 权限，一定成功 ---
+            rtn.push(true);
+            continue;
+        }
+        if (val.startsWith('fs.')) {
+            // --- fs 判断比较特殊 ---
+            let yes = false;
+            const path = val.slice(3, -1);
+            for (const v of task.runtime.permissions) {
+                if (!v.startsWith('fs.')) {
+                    continue;
+                }
+                const pa = v.slice(3, -1);
+                if (pa.endsWith('/')) {
+                    if (!path.startsWith(pa)) {
+                        continue;
+                    }
+                }
+                else if (pa !== path) {
+                    continue;
+                }
+                // --- 找到了 ---
+                if (val.endsWith('w')) {
+                    // --- 用户要求读写 ---
+                    if (v.endsWith('r')) {
+                        // --- 但目前只有读的权限 ---
+                        continue;
+                    }
+                }
+                // --- 正常，有权限 ---
+                yes = true;
+                break;
+            }
+            rtn.push(yes);
+            if (!yes && apply) {
+                // --- 要申请权限 ---
+                applyList.push(val);
+            }
+            continue;
+        }
+        // --- 其他权限判断 ---
+        const result = task.runtime.permissions.includes(val);
+        if (!result && apply) {
+            // --- 要申请权限 ---
+            applyList.push(val);
+        }
+        rtn.push(result);
+    }
+    // --- 申请权限 ---
+    if (applyList.length) {
+        let html = '<div>"' + tool.escapeHTML(task.app.config.name) + '" ' + ((locale[core.config.locale]?.['apply-permission'] ?? locale['en']['apply-permission']) + ':') + '</div>';
+        for (const item of applyList) {
+            if (item.startsWith('fs.')) {
+                // --- fs 判断比较特殊 ---
+                const path = item.slice(3, -1);
+                html += '<div style="margin-top: 10px;">' +
+                    (locale[core.config.locale]?.fs ?? locale['en'].fs) + ' ' + tool.escapeHTML(path) + ' ' + (item.endsWith('r') ? (locale[core.config.locale]?.readonly ?? locale['en'].readonly) : (locale[core.config.locale]?.['read-write'] ?? locale['en']['read-write'])) +
+                    '<div style="color: var(--system-border-color);">' + tool.escapeHTML(item) + '</div>' +
+                '</div>';
+                continue;
+            }
+            const lang = (locale as any)[core.config.locale]?.[item] ?? (locale as any)['en'][item];
+            html += '<div style="margin-top: 10px;">' +
+                (lang ?? locale[core.config.locale]?.unknown ?? locale['en'].unknown) +
+                '<div style="color: var(--system-border-color);">' + tool.escapeHTML(item) + '</div>' +
+            '</div>';
+        }
+        if (await form.superConfirm(html)) {
+            // --- 所有 false 变成 true ---
+            for (let i = 0; i < rtn.length; ++i) {
+                if (rtn[i]) {
+                    continue;
+                }
+                rtn[i] = true;
+            }
+            for (const item of applyList) {
+                task.runtime.permissions.push(item);
+            }
+            try {
+                applyHandler?.(applyList) as any;
+            }
+            catch (e) {
+                console.log('task.checkPermission', e);
+            }
+        }
+    }
+    return rtn;
+}
+
 /**
  * --- 完全结束任务 ---
  * @param taskId 任务 id

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.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);
@@ -430,6 +430,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 +575,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);
 }

package/dist/lib/tool.ts

@@ -573,6 +573,47 @@ export function escapeHTML(html: string): string {
     return html.replace(/</g, '&lt;').replace(/>/g, '&gt;');
 }
 
+/**
+ * --- rgb 字符串转 hsl 数组 ---
+ * @param rgb rgb(x, x, x) 或直接 x,x,x
+ */
+export function rgb2hsl(rgb: string): number[] {
+    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] ;
+}
+
 /**
  * --- 发起一个网络请求 ---
  * @param url 网址
@@ -680,6 +721,10 @@ export function urlResolve(from: string, to: string): string {
     return loader.urlResolve(from, to);
 }
 
+export function urlAtom(url: string): string {
+    return loader.urlAtom(url);
+}
+
 export function blob2Text(blob: Blob): Promise<string> {
     return loader.blob2Text(blob);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickgo",
-  "version": "3.1.3-dev12",
+  "version": "3.1.5-dev14",
   "description": "Background interface, software interface, mobile phone APP interface operation library.",
   "keywords": [
     "deskrt",
@@ -19,8 +19,8 @@
   },
   "devDependencies": {
     "@litert/eslint-plugin-rules": "^0.1.0",
-    "@litert/loader": "^3.4.3",
-    "@types/node": "^17.0.21",
+    "@litert/loader": "^3.4.4",
+    "@types/node": "^18.11.14",
     "electron": "^19.1.3",
     "typescript": "^4.8.4"
   },