swpp-backends 1.2.0 → 1.2.1

package/dist/FileAnalyzer.js

@@ -364,37 +364,62 @@ async function eachAllLinkInHtml(domain, url, content, result, event) {
 async function eachAllLinkInCss(domain, url, content, 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 '"':
+                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;
+    };
     for (let i = 0; i < content.length;) {
-        const left = content.indexOf('/*', i);
+        const left = findComment('/*', i);
         let sub;
-        if (left < 0) {
+        if (left === -1) {
             sub = content.substring(i);
             i = Number.MAX_VALUE;
         }
         else {
             sub = content.substring(i, left);
-            const right = content.indexOf('*/', left + 2);
-            if (right < 0)
+            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, ''))
-            ?.forEach(it => urls.add(it));
+            ?.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));
     }
-    return Promise.all(Array.from(urls).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;
-        }
-    }).map(it => eachAllLinkInUrl(domain, it, result, event)));
+    return Promise.all(Array.from(urls).map(it => eachAllLinkInUrl(domain, it, result, event)));
 }
 function eachAllLinkInJavaScript(domain, _, content, result, event) {
     const taskList = [];
@@ -403,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);
@@ -412,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,7 +8,7 @@ const UpdateJsonBuilder_1 = require("./UpdateJsonBuilder");
 const VersionAnalyzer_1 = require("./VersionAnalyzer");
 // noinspection JSUnusedGlobalSymbols
 exports.default = {
-    version: '1.2.0',
+    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.2.0",
+  "version": "1.2.1",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
   "description": "Generate a powerful ServiceWorker for your website.",