swpp-backends 1.1.2 → 1.2.1

package/README.md

@@ -6,29 +6,29 @@ swpp 的全拼为“ServiceWorkerPlusPlus”（或“ServiceWorker++”），但
 
 swpp 生成的 SW 与其它插件的对比：
 
-|            | swpp  | hexo-offline |
-|:----------:|:-----:|:------------:|
-|    本地缓存    |  ✔️   |      ✔️      |
-|   缓存增量更新   |  ✔️   |      ❌       |
-|   缓存过期时间   | ❌^1^  |      ✔️      |
-|   缓存大小限制   |   ❌   |      ✔️      |
-|    预缓存     |   ❌   |      ✔️      |
-| Request 篡改 |  ✔️   |      ❌       |
-|   URL 竞速   |  ✔️   |      ❌       |
-|   备用 URL   |  ✔️   |      ❌       |
-|    阻塞响应    |  ✔️   |      ❌       |
-|    逃生门     |  ✔️   |      ❌       |
-|    跨平台     | ✔️^2^ |      ❌       |
-|    高度自由    |  ✔️   |      ❌       |
-|     更新     | 非常频繁  |   超过两年没有更新   |
+|            |     swpp      | hexo-offline |
+|:----------:|:-------------:|:------------:|
+|    本地缓存    |      ✔️       |      ✔️      |
+|   缓存增量更新   |      ✔️       |      ❌       |
+|   缓存过期时间   | ❌<sup>1</sup> |      ✔️      |
+|   缓存大小限制   |       ❌       |      ✔️      |
+|    预缓存     |       ❌       |      ✔️      |
+| Request 篡改 |      ✔️       |      ❌       |
+|   URL 竞速   |      ✔️       |      ❌       |
+|   备用 URL   |      ✔️       |      ❌       |
+|    阻塞响应    |      ✔️       |      ❌       |
+|    逃生门     |      ✔️       |      ❌       |
+|    跨平台     |      ✔️       |      ❌       |
+|    高度自由    |      ✔️       |      ❌       |
+|     更新     |     非常频繁      |   超过两年没有更新   |
+
+<small>&emsp;注：上面提到的跨平台是指跨越框架（比如 Hexo、WordPress 等）。</small>
 
 + ✔️：支持
 + ❌：不支持
 
 1. 因为有增量更新，所以没提供过期的实现，没必要
-2. 目前只有 hexo 平台存在具体实现，其它平台的暂时还没有
 
-注：上面提到的跨平台是指跨越框架（比如 Hexo、WordPress 等）。
 
 目前支持的平台：
 

package/dist/FileAnalyzer.js

@@ -34,7 +34,6 @@ const SwppRules_1 = require("./SwppRules");
 const crypto = __importStar(require("crypto"));
 const buffer_1 = require("buffer");
 const fast_html_parser_1 = __importDefault(require("fast-html-parser"));
-const css_1 = __importDefault(require("css"));
 const Utils_1 = require("./Utils");
 /**
  * 遍历指定目录及其子目录中包含的所有文件（不遍历文件夹）
@@ -316,7 +315,6 @@ async function eachAllLinkInUrl(domain, url, result, event) {
 }
 exports.eachAllLinkInUrl = eachAllLinkInUrl;
 async function eachAllLinkInHtml(domain, url, content, result, event) {
-    const root = url.substring(0, url.lastIndexOf('/') + 1);
     const taskList = [];
     const each = (node) => {
         let subUrl = undefined;
@@ -364,48 +362,64 @@ async function eachAllLinkInHtml(domain, url, content, result, event) {
     return Promise.all(taskList);
 }
 async function eachAllLinkInCss(domain, url, content, result, event) {
-    const root = url.substring(0, url.lastIndexOf('/') + 1);
-    const taskList = [];
-    const each = (any) => {
-        if (!any)
-            return;
-        for (let rule of any) {
-            if (rule.declarations)
-                each(rule.declarations);
-            switch (rule.type) {
-                case 'declaration':
-                    const value = rule.value;
-                    const list = value.match(/url\(['"]?([^'")]+)['"]?\)/g)
-                        ?.map(it => it.replace(/(^url\(['"]?)|(['"]?\)$)/g, ''));
-                    if (list) {
-                        for (let url of list) {
-                            if (!/^(https?:)|(\/\/)/.test(url)) {
-                                if (url[0] === '/')
-                                    url = root + url.substring(1);
-                                else
-                                    url = root + url;
-                            }
-                            taskList.push(eachAllLinkInUrl(domain, url, result, event));
-                        }
-                    }
+    const root = url.substring(0, url.lastIndexOf('/'));
+    const urls = new Set();
+    /** 从指定位置开始查询注释 */
+    const findComment = (tag, start) => {
+        for (let i = start; i < content.length;) {
+            const item = content[i];
+            switch (item) {
+                case tag[0]:
+                    if (content[i + 1] === tag[1])
+                        return i;
+                    ++i;
                     break;
-                case 'import':
-                    const url = rule.import.trim().replace(/^["']|["']$/g, '');
-                    taskList.push(eachAllLinkInUrl(domain, url, result, event));
+                case '"':
+                case '\'':
+                    while (true) {
+                        const index = content.indexOf(item, i + 1);
+                        if (index < 0)
+                            return -1;
+                        i = index + 1;
+                        if (content[index - 1] !== '\\')
+                            break;
+                    }
                     break;
             }
         }
+        return -1;
     };
-    let css;
-    try {
-        css = css_1.default.parse(content).stylesheet?.rules;
-    }
-    catch (e) {
-        (0, Utils_1.error)('CssParser', `CSS [root=${root}] 中存在错误语法`);
+    for (let i = 0; i < content.length;) {
+        const left = findComment('/*', i);
+        let sub;
+        if (left === -1) {
+            sub = content.substring(i);
+            i = Number.MAX_VALUE;
+        }
+        else {
+            sub = content.substring(i, left);
+            const right = findComment('*/', left + 2);
+            if (right === -1)
+                i = Number.MAX_VALUE;
+            else
+                i = right + 2;
+        }
+        sub.match(/(url\(.*?\))|(@import\s+['"].*?['"])|((https?:)?\/\/[^\s/$.?#].\S*)/g)
+            ?.map(it => it.replace(/(^url\((['"]?))|((['"]?)\)$)|(^@import\s+['"])|(['"]$)/g, ''))
+            ?.map(it => {
+            switch (true) {
+                case it.startsWith('http'):
+                    return it;
+                case it.startsWith('//'):
+                    return 'http' + it;
+                case it.startsWith('/'):
+                    return root + it;
+                default:
+                    return root + '/' + it;
+            }
+        })?.forEach(it => urls.add(it));
     }
-    if (css)
-        each(css);
-    return Promise.all(taskList);
+    return Promise.all(Array.from(urls).map(it => eachAllLinkInUrl(domain, it, result, event)));
 }
 function eachAllLinkInJavaScript(domain, _, content, result, event) {
     const taskList = [];
@@ -414,6 +428,16 @@ function eachAllLinkInJavaScript(domain, _, content, result, event) {
         (0, Utils_1.error)('LinkItorInJS', '不应发生的异常');
         throw 'ruleList 为空';
     }
+    const calcRegLength = (item) => {
+        let length = item.length;
+        for (let i = 0; i < item.length; ++i) {
+            if (item[i] === '\\') {
+                ++i;
+                --length;
+            }
+        }
+        return length;
+    };
     for (let value of ruleList) {
         if (typeof value === 'function') {
             const urls = value(content);
@@ -423,9 +447,11 @@ function eachAllLinkInJavaScript(domain, _, content, result, event) {
         }
         else {
             const { head, tail } = value;
+            const headLength = calcRegLength(head);
+            const tailLength = calcRegLength(tail);
             const reg = new RegExp(`${head}(['"\`])(.*?)(['"\`])${tail}`, 'mg');
             const list = content.match(reg)
-                ?.map(it => it.substring(head.length, it.length - tail.length).trim())
+                ?.map(it => it.substring(headLength, it.length - tailLength).trim())
                 ?.map(it => it.replace(/^['"`]|['"`]$/g, ''));
             if (list) {
                 for (let url of list) {

package/dist/index.js

@@ -8,6 +8,7 @@ const UpdateJsonBuilder_1 = require("./UpdateJsonBuilder");
 const VersionAnalyzer_1 = require("./VersionAnalyzer");
 // noinspection JSUnusedGlobalSymbols
 exports.default = {
+    version: '1.2.1',
     cache: {
         readEjectData: Utils_1.readEjectData, readUpdateJson: UpdateJsonBuilder_1.readUpdateJson,
         readRules: SwppRules_1.readRules, readMergeVersionMap: FileAnalyzer_1.readMergeVersionMap,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swpp-backends",
-  "version": "1.1.2",
+  "version": "1.2.1",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
   "description": "Generate a powerful ServiceWorker for your website.",
@@ -19,7 +19,6 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "css": "^3.0.0",
     "fast-html-parser": "^1.0.1",
     "hexo-log": "^4.1.0",
     "node-fetch": "^2.6.12"

package/types/index.d.ts

@@ -5,6 +5,7 @@ import { readRules, loadRules, addRulesMapEvent } from './SwppRules';
 import { readUpdateJson, loadUpdateJson, submitChange, getShorthand, buildNewInfo } from './UpdateJsonBuilder';
 import { refreshUrl, analyze } from './VersionAnalyzer';
 declare const _default: {
+    version: string;
     cache: {
         readEjectData: typeof readEjectData;
         readUpdateJson: typeof readUpdateJson;