clickgo 3.1.3-dev12 → 3.1.4-dev13

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': {
@@ -613,7 +673,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 +805,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 +879,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);
             },
@@ -972,8 +1067,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': {},
@@ -1070,9 +1165,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 +1176,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/package.json

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

package/types/index.d.ts

@@ -83,7 +83,7 @@ export interface IAvailArea {
 }
 
 /** --- 全局事件类型 --- */
-export type TGlobalEvent = 'error' | 'screenResize' | 'configChanged' | 'formCreated' | 'formRemoved' | 'formTitleChanged' | 'formIconChanged' | 'formStateMinChanged' | 'formStateMaxChanged' | 'formShowChanged' | 'formFocused' | 'formBlurred' | 'formFlash' | 'taskStarted' | 'taskEnded' | 'launcherFolderNameChanged';
+export type TGlobalEvent = 'error' | 'screenResize' | 'configChanged' | 'formCreated' | 'formRemoved' | 'formTitleChanged' | 'formIconChanged' | 'formStateMinChanged' | 'formStateMaxChanged' | 'formShowChanged' | 'formFocused' | 'formBlurred' | 'formFlash' | 'taskStarted' | 'taskEnded' | 'launcherFolderNameChanged' | 'hashChanged';
 
 /** --- 现场下载 app 的参数 --- */
 export interface ICoreFetchAppOptions {
@@ -99,7 +99,7 @@ export interface IApp {
     'config': IAppConfig;
     /** --- 所有已加载的文件内容 --- */
     'files': Record<string, Blob | string>;
-    /** --- 应用图标，net 模式下可能为空 --- */
+    /** --- 应用图标 --- */
     'icon': string;
 }
 
@@ -119,7 +119,7 @@ export interface IAppConfig {
     /** --- 将自动加载的主题 --- */
     'themes'?: string[];
     /** --- 将自动申请的权限 --- */
-    'permissions'?: Record<string, any>;
+    'permissions'?: string[];
     /** --- 将自动加载的语言包，path: lang --- */
     'locales'?: Record<string, string>;
     /** --- 全局样式，不带扩展名，系统会在末尾添加 .css --- */
@@ -321,21 +321,64 @@ export interface IFormCreateCode {
 // --------- fs lib ---------
 // --------------------------
 
+export interface IMountHandler {
+    'taskId'?: number;
+    getContent?: (path: string, options?: BufferEncoding | {
+        'encoding'?: BufferEncoding;
+        'start'?: number;
+        'end'?: number;
+        'files'?: Record<string, Blob | string>;
+        'current'?: string;
+        'progress'?: (loaded: number, total: number) => void | Promise<void>;
+    }) => Promise<Blob | string | null>;
+    putContent?: (path: string, data: string | Blob, options?: {
+        'encoding'?: BufferEncoding | null;
+        'mode'?: string | number;
+        'flag'?: string | number;
+        'current'?: string;
+    }) => Promise<boolean>;
+    readLink?: (path: string, options?: BufferEncoding | {
+        'encoding'?: BufferEncoding;
+        /** --- 不以 / 结尾的路径 --- */
+        'current'?: string;
+    }) => Promise<string | null>;
+    symlink?: (filePath: string, linkPath: string, options?: {
+        'type'?: 'dir' | 'file' | 'junction';
+        'current'?: string;
+    }) => Promise<boolean>;
+    unlink?: (path: string, options?: {
+        'current'?: string;
+    }) => Promise<boolean>;
+    stats: (path: string, options?: {
+        'files'?: Record<string, Blob | string>;
+        'current'?: string;
+    }) => Promise<IStats | null>;
+    mkdir: (path: string, mode?: number, options?: {
+        'current'?: string;
+    }) => Promise<boolean>;
+    rmdir: (path: string, options?: {
+        'current'?: string;
+    }) => Promise<boolean>;
+    chmod: (path: string, mod: string | number, options?: {
+        'current'?: string;
+    }) => Promise<boolean>;
+}
+
 /** --- 文件/文件夹信息对象 --- */
 export interface IStats {
     isFile(): boolean;
     isDirectory(): boolean;
     isSymbolicLink(): boolean;
-    size: number;
-    blksize: number;
-    atimeMs: number;
-    mtimeMs: number;
-    ctimeMs: number;
-    birthtimeMs: number;
-    atime: Date;
-    mtime: Date;
-    ctime: Date;
-    birthtime: Date;
+    'size': number;
+    'blksize': number;
+    'atimeMs': number;
+    'mtimeMs': number;
+    'ctimeMs': number;
+    'birthtimeMs': number;
+    'atime': Date;
+    'mtime': Date;
+    'ctime': Date;
+    'birthtime': Date;
 }
 
 /** --- 目录下项目 ---  */
@@ -343,7 +386,7 @@ export interface IDirent {
     isFile(): boolean;
     isDirectory(): boolean;
     isSymbolicLink(): boolean;
-    name: string;
+    'name': string;
 }
 
 // --------------------------
@@ -370,7 +413,7 @@ export interface ITask {
         /** --- 独占窗体序列 --- */
         'dialogFormIds': number[];
         /** --- 已申请的权限列表 --- */
-        'permissions': Record<string, any>;
+        'permissions': string[];
     };
     /** --- 窗体对象列表 --- */
     'forms': Record<string, IForm>;
@@ -403,8 +446,10 @@ export interface ITaskRunOptions {
     'notify'?: boolean;
     /** --- 所属任务，App 模式无法设置 --- */
     'taskId'?: number;
-    /** --- 不禁止某些浏览器对象，App 模式下无法设置 --- */
+    /** --- 不禁止某些浏览器对象，App 模式下仅能设置基任务中已经 unblock 的值 --- */
     'unblock'?: string[];
+    /** --- 直接赋予此任务相应权限，App 模式下有 "root" 权限的应用才能设置 --- */
+    'permissions'?: string[];
 }
 
 export interface ICreateTimerOptions {