ddan-js 2.4.8 → 2.4.10

package/bin/lib/modules/html.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAllowed = exports.queryPermission = exports.legacyCopy = exports.copyText = void 0;
 const qs_1 = require("./qs");
 const dataURLtoFile = (dataurl, filename) => {
     // const _dataurl = decodeURIComponent(dataurl);
-    let arr = dataurl.split(",");
+    let arr = dataurl.split(',');
     let mime = arr[0].match(/:(.*?);/)[1];
     let bstr = window.atob(arr[1]);
     let n = bstr.length;
@@ -14,7 +15,7 @@ const dataURLtoFile = (dataurl, filename) => {
     return new File([u8arr], filename, { type: mime });
 };
 const dataURLtoBlob = (dataurl) => {
-    let arr = dataurl.split(",");
+    let arr = dataurl.split(',');
     let mime = arr[0].match(/:(.*?);/)[1];
     let bstr = window.atob(arr[1]);
     let n = bstr.length;
@@ -39,7 +40,7 @@ const readAsDataURL = (file, cb) => {
 };
 const _downloadUrl = (url, filename) => {
     try {
-        const ele = document.createElement("a");
+        const ele = document.createElement('a');
         ele.style.display = 'none';
         ele.href = url;
         ele.download = filename;
@@ -51,7 +52,7 @@ const _downloadUrl = (url, filename) => {
         console.error(`[ddan] _downloadUrl ${url}`, err);
     }
 };
-const downloadUrl = (url, filename = "", checkSomeOrigin = false) => {
+const downloadUrl = (url, filename = '', checkSomeOrigin = false) => {
     try {
         if (!url)
             return;
@@ -66,8 +67,8 @@ const downloadUrl = (url, filename = "", checkSomeOrigin = false) => {
             params.t = Date.now();
             const _url = `${map.path}?${qs_1.default.stringify(params, { uri: false })}`;
             const xhr = new XMLHttpRequest();
-            xhr.open("GET", _url, true);
-            xhr.responseType = "blob";
+            xhr.open('GET', _url, true);
+            xhr.responseType = 'blob';
             xhr.onload = function () {
                 downloadFile(xhr.response, _filename);
             };
@@ -94,7 +95,7 @@ const getBlob = (url) => {
         xhr.send();
     });
 };
-const downloadFile = (data, filename = "") => {
+const downloadFile = (data, filename = '') => {
     try {
         if (!data)
             return;
@@ -108,10 +109,10 @@ const downloadFile = (data, filename = "") => {
         console.error(`[ddan] downloadFile`, error);
     }
 };
-const download = (urlOrFile, filename = "") => {
+const download = (urlOrFile, filename = '') => {
     if (!urlOrFile)
         return;
-    if (typeof urlOrFile === "string") {
+    if (typeof urlOrFile === 'string') {
         downloadUrl(urlOrFile, filename);
         return;
     }
@@ -125,32 +126,32 @@ const downloadImage = (url) => {
         //下载群二维码
         const img = new Image();
         img.onload = () => {
-            let canvas = document.createElement("canvas");
+            let canvas = document.createElement('canvas');
             canvas.width = img.width;
             canvas.height = img.height;
-            let context = canvas.getContext("2d");
+            let context = canvas.getContext('2d');
             context && context.drawImage(img, 0, 0, img.width, img.height);
             let base64 = canvas.toDataURL(); //得到图片的base64编码数据
             downloadUrl(base64, name);
         };
         img.src = url; // 将canvas对象转换为图片的data url
-        img.setAttribute("crossOrigin", "Anonymous");
+        img.setAttribute('crossOrigin', 'Anonymous');
     }
     catch (err) {
         console.error(`[ddan] downloadImage`, err);
     }
     return Promise.resolve();
 };
-const watermark = (text, { width = 400, height = 300, angle = 0, fillStyle = "rgba(0, 0, 0, 0.2)", font = "16px Arial", textAlign = "left", textBaseline = "middle" } = {}) => {
+const watermark = (text, { width = 400, height = 300, angle = 0, fillStyle = 'rgba(0, 0, 0, 0.2)', font = '16px Arial', textAlign = 'left', textBaseline = 'middle', } = {}) => {
     try {
         if (!text)
-            return "";
-        const canvas = document.createElement("canvas");
+            return '';
+        const canvas = document.createElement('canvas');
         canvas.width = width;
         canvas.height = height;
-        const ctx = canvas.getContext("2d");
+        const ctx = canvas.getContext('2d');
         if (!ctx)
-            return "";
+            return '';
         angle && ctx.rotate((angle * Math.PI) / 180);
         fillStyle && (ctx.fillStyle = fillStyle);
         font && (ctx.font = font);
@@ -161,9 +162,75 @@ const watermark = (text, { width = 400, height = 300, angle = 0, fillStyle = "rg
     }
     catch (err) {
         console.error(`[ddan] watermark`, err);
-        return "";
+        return '';
     }
 };
+const copyText = (text, legacy = false) => {
+    return new Promise((resolve) => {
+        if (legacy || !navigator.clipboard) {
+            resolve((0, exports.legacyCopy)(text));
+            return;
+        }
+        (0, exports.queryPermission)('clipboard-write')
+            .then((state) => {
+            if ((0, exports.isAllowed)(state, false)) {
+                navigator.clipboard.writeText(text);
+                resolve(true);
+            }
+            else {
+                resolve((0, exports.legacyCopy)(text));
+            }
+        })
+            .catch(() => {
+            resolve(false);
+        });
+    });
+};
+exports.copyText = copyText;
+const legacyCopy = (text) => {
+    try {
+        const _textarea = document.createElement('textarea');
+        document.body.appendChild(_textarea);
+        // 隐藏此输入框
+        _textarea.style.position = 'fixed';
+        _textarea.style.clip = 'rect(0 0 0 0)';
+        _textarea.style.top = '10px';
+        _textarea.style.opacity = '0';
+        // 赋值
+        _textarea.value = text ?? '';
+        // 选中
+        _textarea.select();
+        // 复制
+        const result = document.execCommand('copy');
+        // 移除输入框
+        document.body.removeChild(_textarea);
+        return result;
+    }
+    catch (err) {
+        console.error(`[ddan] copyText`, err);
+        return false;
+    }
+};
+exports.legacyCopy = legacyCopy;
+const queryPermission = (name, def = 'denied') => {
+    return new Promise((resolve) => {
+        const permissions = navigator?.permissions;
+        if (!permissions || !permissions.query)
+            return resolve(def);
+        const desc = { name };
+        permissions
+            .query(desc)
+            .then((res) => resolve(res.state))
+            .catch(() => resolve(def));
+    });
+};
+exports.queryPermission = queryPermission;
+const isAllowed = (status, prompt = true) => {
+    if (prompt && status === 'prompt')
+        return true;
+    return status === 'granted';
+};
+exports.isAllowed = isAllowed;
 exports.default = {
     dataURLtoFile,
     dataURLtoBlob,
@@ -174,4 +241,7 @@ exports.default = {
     downloadFile,
     downloadImage,
     watermark,
+    copyText: exports.copyText,
+    queryPermission: exports.queryPermission,
+    isAllowed: exports.isAllowed,
 };

package/bin/types/class/store.d.ts

@@ -1,5 +1,5 @@
-import DEvent from "./event";
-import { Ddan } from "../typings";
+import DEvent from './event';
+import { Ddan } from '../typings';
 export default class DStore extends DEvent implements Ddan.IDStore {
     setters: Record<string, Ddan.TStoreSetterFunction>;
     getters: Record<string, Ddan.TStoreGetterFunction>;

package/bin/types/class/task.d.ts

@@ -1,7 +1,7 @@
 export default class DTask<T = any> {
     __source: any;
     constructor(source?: any);
-    run(): Promise<[null, T] | [any, undefined]>;
+    run: () => Promise<[any, undefined] | [null, T]>;
     static _lockedMap: Map<string, Promise<any[]>>;
     static _lock(id: string, func: Function): Promise<[any, undefined] | [null, any]> | undefined;
     static _unlock(id: string): void;

package/bin/types/index.d.ts

@@ -186,6 +186,7 @@ declare const dUtil: {
     };
 };
 declare const dHook: {
+    sleep: (ms?: number) => Promise<unknown>;
     run: <T = any>(task?: Function | Promise<T> | undefined, wait?: number) => Promise<[any, undefined] | [null, T]>;
     exec: (func: Function, taskId?: string) => Promise<any[]>;
     debounce: typeof import("./modules/hook/debounce").default;
@@ -194,7 +195,23 @@ declare const dHook: {
     mutex: typeof import("./modules/hook/mutex").default;
     polling: typeof import("./modules/hook/polling").default;
     to: <T_1 = any, U extends object = any>(promise: Promise<T_1>, errorExt?: object | undefined) => Promise<[null, T_1] | [U, undefined]>;
-    delay: (time?: number) => Promise<unknown>;
+    go: <T_2 = any>(task?: Function | Promise<T_2> | undefined) => Promise<[any, undefined] | [null, T_2]>;
+    delay: (ms?: number) => Promise<unknown>;
+    safeDo: <T_3 = any>(func: any) => Promise<[null, T_3] | [any, undefined]>;
+    base64: {
+        encode: (input: string) => string;
+        decode: (input: string) => string;
+        encodeByOss: (input: string) => string;
+    };
+    uuid: (len?: number, radix?: number) => string;
+    guid: (len: number, prefix?: boolean, sep?: string) => string;
+    keyNumber: string;
+    keyLower: string;
+    keyUpper: string;
+    keyChars: string;
+    uint8ArrayToString: (arr: any) => string;
+    stringToArrayBuffer: (str: any) => ArrayBuffer;
+    arrayBufferToString: (data: ArrayBuffer, base64?: boolean) => string;
 };
 declare const dMini: {
     mini: {
@@ -268,7 +285,7 @@ declare const dMini: {
         download: (urlOrFile: string | Blob | MediaSource, filename?: string) => void;
         downloadFile: (data: Blob | MediaSource, filename?: string) => void;
         downloadImage: (url: string) => Promise<void> | undefined;
-        watermark: (text: string, { width, height, angle, fillStyle, font, textAlign, textBaseline }?: {
+        watermark: (text: string, { width, height, angle, fillStyle, font, textAlign, textBaseline, }?: {
             width?: number | undefined;
             height?: number | undefined;
             angle?: number | undefined;
@@ -277,6 +294,9 @@ declare const dMini: {
             textAlign?: "center" | "end" | "left" | "right" | "start" | undefined;
             textBaseline?: "alphabetic" | "bottom" | "hanging" | "ideographic" | "middle" | "top" | undefined;
         }) => string;
+        copyText: (text: string, legacy?: boolean) => Promise<unknown>;
+        queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
+        isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
     };
 };
 declare const dCdn: {
@@ -397,7 +417,7 @@ declare const dWeb: {
         download: (urlOrFile: string | Blob | MediaSource, filename?: string) => void;
         downloadFile: (data: Blob | MediaSource, filename?: string) => void;
         downloadImage: (url: string) => Promise<void> | undefined;
-        watermark: (text: string, { width, height, angle, fillStyle, font, textAlign, textBaseline }?: {
+        watermark: (text: string, { width, height, angle, fillStyle, font, textAlign, textBaseline, }?: {
             width?: number | undefined;
             height?: number | undefined;
             angle?: number | undefined;
@@ -406,6 +426,9 @@ declare const dWeb: {
             textAlign?: "center" | "end" | "left" | "right" | "start" | undefined;
             textBaseline?: "alphabetic" | "bottom" | "hanging" | "ideographic" | "middle" | "top" | undefined;
         }) => string;
+        copyText: (text: string, legacy?: boolean) => Promise<unknown>;
+        queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
+        isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
     };
 };
 export { dUtil, dHook, dWeb, dMini, dCdn, dStore, dJoker, dTracker, dLogger };
@@ -436,6 +459,7 @@ declare const _default: {
         oneSecond: number;
     };
     hook: {
+        sleep: (ms?: number) => Promise<unknown>;
         run: <T = any>(task?: Function | Promise<T> | undefined, wait?: number) => Promise<[any, undefined] | [null, T]>;
         exec: (func: Function, taskId?: string) => Promise<any[]>;
         debounce: typeof import("./modules/hook/debounce").default;
@@ -444,7 +468,9 @@ declare const _default: {
         mutex: typeof import("./modules/hook/mutex").default;
         polling: typeof import("./modules/hook/polling").default;
         to: <T_1 = any, U extends object = any>(promise: Promise<T_1>, errorExt?: object | undefined) => Promise<[null, T_1] | [U, undefined]>;
-        delay: (time?: number) => Promise<unknown>;
+        go: <T_2 = any>(task?: Function | Promise<T_2> | undefined) => Promise<[any, undefined] | [null, T_2]>;
+        delay: (ms?: number) => Promise<unknown>;
+        safeDo: <T_3 = any>(func: any) => Promise<[null, T_3] | [any, undefined]>;
     };
     math: {
         random: (max: number) => number;
@@ -469,12 +495,12 @@ declare const _default: {
     util: {
         includes: typeof import("./util/includes").default;
         forof: (source: any, cb: (key: any, val: any) => void) => void;
-        singleton: <T_2>() => {
+        singleton: <T_4>() => {
             new (): {};
             __instance__: any;
-            readonly Instance: T_2;
+            readonly Instance: T_4;
         };
-        getset: <T_3 = any>(t?: T_3 | undefined) => import("./typings").Ddan.IGetset<T_3>;
+        getset: <T_5 = any>(t?: T_5 | undefined) => import("./typings").Ddan.IGetset<T_5>;
         copy: (source: any, options?: {
             fields?: string[] | undefined;
             camel?: boolean | undefined;
@@ -487,7 +513,7 @@ declare const _default: {
             number?: boolean | undefined;
             boolean?: boolean | undefined;
         }) => any;
-        cloneClass: <T_4>(source: T_4) => T_4;
+        cloneClass: <T_6>(source: T_6) => T_6;
         combine: (target: any, source: any, options?: import("./typings").Ddan.IIgnoreParams) => any;
         combines: (objs: any[], options?: import("./typings").Ddan.IIgnoreParams) => {};
         observe: (obj: any, key: any, watchFun: any, owner: any, deep?: boolean) => void;
@@ -513,16 +539,16 @@ declare const _default: {
         isPromise: (value: any) => boolean;
     };
     list: {
-        stepAction: <T_5>(list: T_5[], func: import("./typings").Ddan.Task<T_5, void>, stepCount?: number) => void;
-        skip: <T_6>(list: T_6[], count: number) => T_6[];
-        take: <T_7>(list: T_7[], count: number, skip?: number) => T_7[];
-        distinct: <T_8>(list: T_8[]) => T_8[];
-        randoms: <T_9>(list: T_9[], count?: number, repeat?: boolean) => T_9[];
+        stepAction: <T_7>(list: T_7[], func: import("./typings").Ddan.Task<T_7, void>, stepCount?: number) => void;
+        skip: <T_8>(list: T_8[], count: number) => T_8[];
+        take: <T_9>(list: T_9[], count: number, skip?: number) => T_9[];
+        distinct: <T_10>(list: T_10[]) => T_10[];
+        randoms: <T_11>(list: T_11[], count?: number, repeat?: boolean) => T_11[];
         toKV: (list: import("./typings").Ddan.KV<any>[], key: string, value: string) => import("./typings").Ddan.KV<any>;
-        groupBy: <T_10>(list: T_10[], key: string) => Record<string, T_10[]>;
-        first: <T_11>(list: T_11[]) => T_11 | undefined;
-        last: <T_12>(list: T_12[]) => T_12 | undefined;
-        toList: <T_13>(val: T_13 | T_13[]) => T_13[];
+        groupBy: <T_12>(list: T_12[], key: string) => Record<string, T_12[]>;
+        first: <T_13>(list: T_13[]) => T_13 | undefined;
+        last: <T_14>(list: T_14[]) => T_14 | undefined;
+        toList: <T_15>(val: T_15 | T_15[]) => T_15[];
     };
     string: {
         toString: (value: any) => any;
@@ -554,7 +580,7 @@ declare const _default: {
             number?: boolean | undefined;
             boolean?: boolean | undefined;
         }) => any;
-        cloneClass: <T_4>(source: T_4) => T_4;
+        cloneClass: <T_6>(source: T_6) => T_6;
         combine: (target: any, source: any, options?: import("./typings").Ddan.IIgnoreParams) => any;
         combines: (objs: any[], options?: import("./typings").Ddan.IIgnoreParams) => {};
         observe: (obj: any, key: any, watchFun: any, owner: any, deep?: boolean) => void;
@@ -658,7 +684,7 @@ declare const _default: {
         download: (urlOrFile: string | Blob | MediaSource, filename?: string) => void;
         downloadFile: (data: Blob | MediaSource, filename?: string) => void;
         downloadImage: (url: string) => Promise<void> | undefined;
-        watermark: (text: string, { width, height, angle, fillStyle, font, textAlign, textBaseline }?: {
+        watermark: (text: string, { width, height, angle, fillStyle, font, textAlign, textBaseline, }?: {
             width?: number | undefined;
             height?: number | undefined;
             angle?: number | undefined;
@@ -667,6 +693,9 @@ declare const _default: {
             textAlign?: "center" | "end" | "left" | "right" | "start" | undefined;
             textBaseline?: "alphabetic" | "bottom" | "hanging" | "ideographic" | "middle" | "top" | undefined;
         }) => string;
+        copyText: (text: string, legacy?: boolean) => Promise<unknown>;
+        queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
+        isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
     };
     icon: import("./class/icon").DIcon;
     rule: {

package/bin/types/modules/hook/base.d.ts

@@ -1,6 +1,8 @@
 declare function to<T = any, U extends object = any>(promise: Promise<T>, errorExt?: object): Promise<[null, T] | [U, undefined]>;
 declare const _default: {
     to: typeof to;
-    delay: (time?: number) => Promise<unknown>;
+    go: <T = any>(task?: Function | Promise<T> | undefined) => Promise<[any, undefined] | [null, T]>;
+    delay: (ms?: number) => Promise<unknown>;
+    safeDo: <T_1 = any>(func: any) => Promise<[null, T_1] | [any, undefined]>;
 };
 export default _default;

package/bin/types/modules/hook/index.d.ts

@@ -1,9 +1,9 @@
-import debounce from "./debounce";
-import throttle from "./throttle";
-import mutex from "./mutex";
-import DPipeTask from "../../class/pipeTask";
-import { Ddan } from "../../typings";
-import polling from "./polling";
+import debounce from './debounce';
+import throttle from './throttle';
+import mutex from './mutex';
+import DPipeTask from '../../class/pipeTask';
+import { Ddan } from '../../typings';
+import polling from './polling';
 /**
  *
  * @param task 任务
@@ -12,6 +12,7 @@ import polling from "./polling";
  */
 declare function run<T = any>(task?: Promise<T> | Function, wait?: number): Promise<[any, undefined] | [null, T]>;
 declare const _default: {
+    sleep: (ms?: number) => Promise<unknown>;
     run: typeof run;
     exec: (func: Function, taskId?: string) => Promise<any[]>;
     debounce: typeof debounce;
@@ -20,6 +21,8 @@ declare const _default: {
     mutex: typeof mutex;
     polling: typeof polling;
     to: <T = any, U extends object = any>(promise: Promise<T>, errorExt?: object | undefined) => Promise<[null, T] | [U, undefined]>;
-    delay: (time?: number) => Promise<unknown>;
+    go: <T_1 = any>(task?: Function | Promise<T_1> | undefined) => Promise<[any, undefined] | [null, T_1]>;
+    delay: (ms?: number) => Promise<unknown>;
+    safeDo: <T_2 = any>(func: any) => Promise<[null, T_2] | [any, undefined]>;
 };
 export default _default;

package/bin/types/modules/html.d.ts

@@ -1,3 +1,7 @@
+export declare const copyText: (text: string, legacy?: boolean) => Promise<unknown>;
+export declare const legacyCopy: (text: string) => boolean;
+export declare const queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
+export declare const isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
 declare const _default: {
     dataURLtoFile: (dataurl: any, filename: any) => File;
     dataURLtoBlob: (dataurl: any) => Blob;
@@ -7,7 +11,7 @@ declare const _default: {
     download: (urlOrFile: string | Blob | MediaSource, filename?: string) => void;
     downloadFile: (data: Blob | MediaSource, filename?: string) => void;
     downloadImage: (url: string) => Promise<void> | undefined;
-    watermark: (text: string, { width, height, angle, fillStyle, font, textAlign, textBaseline }?: {
+    watermark: (text: string, { width, height, angle, fillStyle, font, textAlign, textBaseline, }?: {
         width?: number | undefined;
         height?: number | undefined;
         angle?: number | undefined;
@@ -16,5 +20,8 @@ declare const _default: {
         textAlign?: "center" | "end" | "left" | "right" | "start" | undefined;
         textBaseline?: "alphabetic" | "bottom" | "hanging" | "ideographic" | "middle" | "top" | undefined;
     }) => string;
+    copyText: (text: string, legacy?: boolean) => Promise<unknown>;
+    queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
+    isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
 };
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddan-js",
-  "version": "2.4.8",
+  "version": "2.4.10",
   "description": "",
   "keywords": [
     "ddan-js",