ddan-js 2.9.1 → 2.9.3

package/bin/lib/modules/fetch.js

@@ -3,44 +3,48 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const base_1 = require("./hook/base");
 const convert_1 = require("./convert");
 const math_1 = require("./math");
-const getDataURL = (url) => {
+const getDataURL = (url, cache) => {
     const result = {
         contentType: '',
         dataUrl: '',
     };
-    return base_1.default.to(fetch(url)
+    return base_1.default.to(fetch(url, { cache })
         .then((response) => {
         result.contentType = response.headers.get('content-type') || '';
         return response.arrayBuffer();
     })
         .then((data) => {
-        result.dataUrl =
-            `data:${result.contentType};base64,` + convert_1.default.ab2str(data, true);
+        result.dataUrl = `data:${result.contentType};base64,` + convert_1.default.ab2str(data, true);
         return result;
     }));
 };
-const getArrayBuffer = async (url) => {
-    return base_1.default.to(fetch(url).then((response) => {
+const getArrayBuffer = async (url, cache) => {
+    return base_1.default.to(fetch(url, { cache }).then((response) => {
         return response.arrayBuffer();
     }));
 };
-const getJson = async (url) => {
-    return base_1.default.to(fetch(url).then((response) => {
+const getJson = async (url, cache) => {
+    return base_1.default.to(fetch(url, { cache }).then((response) => {
         return response.json();
     }));
 };
-const getText = async (url) => {
-    return base_1.default.to(fetch(url).then((response) => {
+const getText = async (url, cache) => {
+    return base_1.default.to(fetch(url, { cache }).then((response) => {
         return response.text();
     }));
 };
+const cache = async (url, cache) => {
+    return base_1.default.to(fetch(url, { cache }).then(() => {
+        return true;
+    }));
+};
 const download = (url, opts = {}) => {
-    return new Promise(resolve => fetch(url)
+    return new Promise((resolve) => fetch(url)
         .then(async (response) => {
         if (!response.ok || response.status !== 200) {
             throw new Error(response.statusText);
         }
-        const contentLength = +(response.headers.get("content-length") || "");
+        const contentLength = +(response.headers.get('content-length') || '');
         const reader = response.body?.getReader();
         let receivedLength = 0;
         const chunks = [];
@@ -63,7 +67,7 @@ const download = (url, opts = {}) => {
         opts?.success && opts?.success(chunksAll);
         resolve(chunksAll);
     })
-        .catch(err => {
+        .catch((err) => {
         opts?.fail && opts?.fail(err);
         resolve(undefined);
     }));
@@ -73,5 +77,6 @@ exports.default = {
     getArrayBuffer,
     getJson,
     download,
-    getText
+    getText,
+    cache,
 };

package/bin/lib/modules/html.js

@@ -252,16 +252,17 @@ const isAllowed = (status, prompt = true) => {
 const takeHtmlLinks = (htmlContent) => {
     if (!htmlContent)
         return [];
-    const resgexs = [
+    const regexs = [
         /<script[^>]+src="([^"]+)"/g,
         /<link[^>]+rel="stylesheet"[^>]+href="([^"]+)"/g,
         /<link[^>]+rel="icon"[^>]+href="([^"]+)"/g,
     ];
     const results = [];
-    resgexs.forEach((e) => {
-        results.concat(takeHtml(htmlContent, e));
+    regexs.forEach((e) => {
+        const r = takeHtml(htmlContent, e);
+        results.push(r);
     });
-    return results;
+    return [].concat(...results);
 };
 const takeHtml = (htmlContent, regex) => {
     if (!htmlContent || !regex)

package/bin/types/browser.d.ts

@@ -501,7 +501,7 @@ declare const dMini: {
         queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
         isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
         legacyCopy: (text: string) => boolean;
-        takeHtmlLinks: (htmlContent: string) => string[];
+        takeHtmlLinks: (htmlContent: string) => never[];
         takeHtml: (htmlContent: string, regex: RegExp) => string[];
     };
 };
@@ -550,18 +550,19 @@ declare const dLogger: {
 declare const dWeb: {
     Ecdh: typeof import("./modules/browser/ecdh").default;
     fetch: {
-        getDataURL: (url: string) => Promise<[any, undefined] | [null, {
+        getDataURL: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, {
             contentType: string;
             dataUrl: string;
         }]>;
-        getArrayBuffer: (url: string) => Promise<[any, undefined] | [null, ArrayBuffer]>;
-        getJson: (url: string) => Promise<[any, undefined] | [null, any]>;
+        getArrayBuffer: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, ArrayBuffer]>;
+        getJson: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, any]>;
         download: (url: string, opts?: {
             success?: ((buffer: Uint8Array) => void) | undefined;
             progress?: ((percentage: number, current: number, total: number) => void) | undefined;
             fail?: ((error: Error) => void) | undefined;
         }) => Promise<Uint8Array | undefined>;
-        getText: (url: string) => Promise<[any, undefined] | [null, string]>;
+        getText: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, string]>;
+        cache: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, boolean]>;
     };
     Http: typeof Http;
     css: {
@@ -645,7 +646,7 @@ declare const dWeb: {
         queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
         isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
         legacyCopy: (text: string) => boolean;
-        takeHtmlLinks: (htmlContent: string) => string[];
+        takeHtmlLinks: (htmlContent: string) => never[];
         takeHtml: (htmlContent: string, regex: RegExp) => string[];
     };
     rsa: {
@@ -975,7 +976,7 @@ declare const _default: {
         queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
         isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
         legacyCopy: (text: string) => boolean;
-        takeHtmlLinks: (htmlContent: string) => string[];
+        takeHtmlLinks: (htmlContent: string) => never[];
         takeHtml: (htmlContent: string, regex: RegExp) => string[];
     };
     icon: import("./class/icon").DIcon;
@@ -1064,18 +1065,19 @@ declare const _default: {
         }) => void;
     };
     fetch: {
-        getDataURL: (url: string) => Promise<[any, undefined] | [null, {
+        getDataURL: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, {
             contentType: string;
             dataUrl: string;
         }]>;
-        getArrayBuffer: (url: string) => Promise<[any, undefined] | [null, ArrayBuffer]>;
-        getJson: (url: string) => Promise<[any, undefined] | [null, any]>;
+        getArrayBuffer: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, ArrayBuffer]>;
+        getJson: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, any]>;
         download: (url: string, opts?: {
             success?: ((buffer: Uint8Array) => void) | undefined;
             progress?: ((percentage: number, current: number, total: number) => void) | undefined;
             fail?: ((error: Error) => void) | undefined;
         }) => Promise<Uint8Array | undefined>;
-        getText: (url: string) => Promise<[any, undefined] | [null, string]>;
+        getText: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, string]>;
+        cache: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, boolean]>;
     };
     rsa: {
         generateKeys: () => Promise<{

package/bin/types/index.d.ts

@@ -501,7 +501,7 @@ declare const dMini: {
         queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
         isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
         legacyCopy: (text: string) => boolean;
-        takeHtmlLinks: (htmlContent: string) => string[];
+        takeHtmlLinks: (htmlContent: string) => never[];
         takeHtml: (htmlContent: string, regex: RegExp) => string[];
     };
 };
@@ -550,18 +550,19 @@ declare const dLogger: {
 declare const dWeb: {
     Ecdh: typeof import("./modules/browser/ecdh").default;
     fetch: {
-        getDataURL: (url: string) => Promise<[any, undefined] | [null, {
+        getDataURL: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, {
             contentType: string;
             dataUrl: string;
         }]>;
-        getArrayBuffer: (url: string) => Promise<[any, undefined] | [null, ArrayBuffer]>;
-        getJson: (url: string) => Promise<[any, undefined] | [null, any]>;
+        getArrayBuffer: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, ArrayBuffer]>;
+        getJson: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, any]>;
         download: (url: string, opts?: {
             success?: ((buffer: Uint8Array) => void) | undefined;
             progress?: ((percentage: number, current: number, total: number) => void) | undefined;
             fail?: ((error: Error) => void) | undefined;
         }) => Promise<Uint8Array | undefined>;
-        getText: (url: string) => Promise<[any, undefined] | [null, string]>;
+        getText: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, string]>;
+        cache: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, boolean]>;
     };
     Http: typeof Http;
     css: {
@@ -645,7 +646,7 @@ declare const dWeb: {
         queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
         isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
         legacyCopy: (text: string) => boolean;
-        takeHtmlLinks: (htmlContent: string) => string[];
+        takeHtmlLinks: (htmlContent: string) => never[];
         takeHtml: (htmlContent: string, regex: RegExp) => string[];
     };
     rsa: {
@@ -1011,7 +1012,7 @@ declare const _default: {
         queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
         isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
         legacyCopy: (text: string) => boolean;
-        takeHtmlLinks: (htmlContent: string) => string[];
+        takeHtmlLinks: (htmlContent: string) => never[];
         takeHtml: (htmlContent: string, regex: RegExp) => string[];
     };
     icon: import("./class/icon").DIcon;
@@ -1100,18 +1101,19 @@ declare const _default: {
         }) => void;
     };
     fetch: {
-        getDataURL: (url: string) => Promise<[any, undefined] | [null, {
+        getDataURL: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, {
             contentType: string;
             dataUrl: string;
         }]>;
-        getArrayBuffer: (url: string) => Promise<[any, undefined] | [null, ArrayBuffer]>;
-        getJson: (url: string) => Promise<[any, undefined] | [null, any]>;
+        getArrayBuffer: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, ArrayBuffer]>;
+        getJson: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, any]>;
         download: (url: string, opts?: {
             success?: ((buffer: Uint8Array) => void) | undefined;
             progress?: ((percentage: number, current: number, total: number) => void) | undefined;
             fail?: ((error: Error) => void) | undefined;
         }) => Promise<Uint8Array | undefined>;
-        getText: (url: string) => Promise<[any, undefined] | [null, string]>;
+        getText: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, string]>;
+        cache: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, boolean]>;
     };
     rsa: {
         generateKeys: () => Promise<{

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

@@ -1,15 +1,16 @@
 declare const _default: {
-    getDataURL: (url: string) => Promise<[null, {
+    getDataURL: (url: string, cache?: RequestCache | undefined) => Promise<[null, {
         contentType: string;
         dataUrl: string;
     }] | [any, undefined]>;
-    getArrayBuffer: (url: string) => Promise<[any, undefined] | [null, ArrayBuffer]>;
-    getJson: (url: string) => Promise<[any, undefined] | [null, any]>;
+    getArrayBuffer: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, ArrayBuffer]>;
+    getJson: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, any]>;
     download: (url: string, opts?: {
         success?: ((buffer: Uint8Array) => void) | undefined;
         progress?: ((percentage: number, current: number, total: number) => void) | undefined;
         fail?: ((error: Error) => void) | undefined;
     }) => Promise<Uint8Array | undefined>;
-    getText: (url: string) => Promise<[any, undefined] | [null, string]>;
+    getText: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, string]>;
+    cache: (url: string, cache?: RequestCache | undefined) => Promise<[any, undefined] | [null, boolean]>;
 };
 export default _default;

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

@@ -20,7 +20,7 @@ declare const _default: {
     queryPermission: (name: string, def?: PermissionState) => Promise<PermissionState>;
     isAllowed: (status: PermissionState | undefined, prompt?: boolean) => boolean;
     legacyCopy: (text: string) => boolean;
-    takeHtmlLinks: (htmlContent: string) => string[];
+    takeHtmlLinks: (htmlContent: string) => never[];
     takeHtml: (htmlContent: string, regex: RegExp) => string[];
 };
 export default _default;

package/package.json

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