ddan-js 2.4.7 → 2.4.9

package/bin/lib/modules/html.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAllowed = exports.queryPermission = 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,57 @@ 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) => {
+    try {
+        if (!legacy && navigator.clipboard) {
+            // clipboard api 复制
+            navigator.clipboard.writeText(text);
+        }
+        else {
+            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();
+            // 复制
+            document.execCommand('copy');
+            // 移除输入框
+            document.body.removeChild(_textarea);
+        }
+    }
+    catch (err) {
+        console.error(`[ddan] copyText`, err);
+    }
+};
+exports.copyText = copyText;
+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 +223,7 @@ exports.default = {
     downloadFile,
     downloadImage,
     watermark,
+    copyText: exports.copyText,
+    queryPermission: exports.queryPermission,
+    isAllowed: exports.isAllowed,
 };

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

@@ -1,11 +1,11 @@
-import { Ddan } from "../typings";
+import { Ddan } from '../typings';
 export interface IDEvent {
     name: string;
-    handler: Function | any;
+    listener: Ddan.Function | any;
     tag: string;
 }
 export default class DEvent implements Ddan.IEvent {
-    __map: Map<string, Set<Function | any>>;
+    __map: Map<string, Set<Ddan.Function | any>>;
     __tagList: IDEvent[];
     __eventId: string;
     constructor();
@@ -13,18 +13,18 @@ export default class DEvent implements Ddan.IEvent {
     /**
      * 监听
      * @param name
-     * @param handler
+     * @param listener
      * @returns
      */
-    on(name: string, handler: Function, tag?: string): this;
+    on(name: string, listener: Ddan.Function, tag?: string): this;
     emit(name: string, ...args: any[]): this;
     /**
      * 取消监听
      * @param name
-     * @param handler
+     * @param listener
      * @returns
      */
-    off(name: string, handler?: Function): this;
+    off(name: string, listener?: Ddan.Function): this;
     /**
      * 移除
      * @param name
@@ -35,9 +35,9 @@ export default class DEvent implements Ddan.IEvent {
     /**
      * 一次性监听
      * @param name
-     * @param handler
+     * @param listener
      * @returns
      */
-    once(name: string, handler: Function): this;
+    once(name: string, listener: Ddan.Function): this;
     has(name: string): boolean;
 }

package/bin/types/index.d.ts

@@ -186,15 +186,16 @@ declare const dUtil: {
     };
 };
 declare const dHook: {
+    delay: (ms?: number) => Promise<unknown>;
+    sleep: (ms?: number) => Promise<unknown>;
     run: <T = any>(task?: Function | Promise<T> | undefined, wait?: number) => Promise<[any, undefined] | [null, T]>;
+    to: <T_1 = any>(task?: Function | Promise<T_1> | undefined, wait?: number) => Promise<[any, undefined] | [null, T_1]>;
     exec: (func: Function, taskId?: string) => Promise<any[]>;
     debounce: typeof import("./modules/hook/debounce").default;
     throttle: typeof import("./modules/hook/throttle").default;
     task: (param?: import("./typings").Ddan.Func1<any, any> | undefined) => import("./class/pipeTask").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>;
 };
 declare const dMini: {
     mini: {
@@ -268,7 +269,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 +278,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) => void;
+        queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
+        isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
     };
 };
 declare const dCdn: {
@@ -397,7 +401,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 +410,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) => void;
+        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,15 +443,16 @@ declare const _default: {
         oneSecond: number;
     };
     hook: {
+        delay: (ms?: number) => Promise<unknown>;
+        sleep: (ms?: number) => Promise<unknown>;
         run: <T = any>(task?: Function | Promise<T> | undefined, wait?: number) => Promise<[any, undefined] | [null, T]>;
+        to: <T_1 = any>(task?: Function | Promise<T_1> | undefined, wait?: number) => Promise<[any, undefined] | [null, T_1]>;
         exec: (func: Function, taskId?: string) => Promise<any[]>;
         debounce: typeof import("./modules/hook/debounce").default;
         throttle: typeof import("./modules/hook/throttle").default;
         task: (param?: import("./typings").Ddan.Func1<any, any> | undefined) => import("./class/pipeTask").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>;
     };
     math: {
         random: (max: number) => number;
@@ -658,7 +666,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 +675,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) => void;
+        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,7 @@
 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>;
+    delay: (ms?: number) => Promise<unknown>;
+    run: <T = any>(func: any) => Promise<[null, T] | [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,14 +12,15 @@ import polling from "./polling";
  */
 declare function run<T = any>(task?: Promise<T> | Function, wait?: number): Promise<[any, undefined] | [null, T]>;
 declare const _default: {
+    delay: (ms?: number) => Promise<unknown>;
+    sleep: (ms?: number) => Promise<unknown>;
     run: typeof run;
+    to: <T = any>(task?: Function | Promise<T> | undefined, wait?: number) => Promise<[any, undefined] | [null, T]>;
     exec: (func: Function, taskId?: string) => Promise<any[]>;
     debounce: typeof debounce;
     throttle: typeof throttle;
     task: (param?: Ddan.Func1<any, any> | undefined) => DPipeTask;
     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>;
 };
 export default _default;

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

@@ -1,3 +1,6 @@
+export declare const copyText: (text: string, legacy?: boolean) => void;
+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 +10,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 +19,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) => void;
+    queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
+    isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
 };
 export default _default;

package/bin/types/modules/time/frame.d.ts

@@ -10,7 +10,7 @@ export default class DLoopFrame implements Ddan.ILoopFrame {
     start(): this;
     stop(): this;
     restart(): this;
-    on(cb: Function): this;
-    off(cb: Function | undefined): this;
+    on(cb: Ddan.Function): this;
+    off(cb: Ddan.Function | undefined): this;
     _handleLoop(): void;
 }

package/package.json

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