swpp-backends 2.2.0 → 2.2.2

package/dist/ServiceWorkerBuilder.js

@@ -17,7 +17,7 @@ const Variant_1 = require("./Variant");
 function buildServiceWorker() {
     const rules = (0, Variant_1.readRules)();
     const eject = (0, Utils_1.readEjectData)();
-    const { modifyRequest, fetchFile, getRaceUrls, getSpareUrls, blockRequest, config } = rules;
+    const { modifyRequest, skipRequest, fetchFile, getRaceUrls, getSpareUrls, blockRequest, config } = rules;
     if (!config.serviceWorker) {
         (0, Utils_1.error)('ServiceWorkerBuilder', '插件未开启该项');
         throw '功能未开启';
@@ -44,7 +44,7 @@ function buildServiceWorker() {
         cache += `(${(0, Utils_1.getSource)(rules['afterJoin'])})()\n`;
     if ('afterTheme' in rules)
         cache += `(${(0, Utils_1.getSource)(rules['afterTheme'])})()\n`;
-    const keyword = "const { cacheRules, fetchFile, getSpareUrls, skipRequest } = require('../sw-rules')";
+    const keyword = "const { cacheRules, fetchFile, getSpareUrls } = require('../sw-rules')";
     // noinspection JSUnresolvedVariable
     let content = fs_1.default.readFileSync(templatePath, 'utf8')
         .replaceAll("// [insertion site] values", eject?.strValue ?? '')
@@ -62,6 +62,9 @@ function buildServiceWorker() {
                 else if (modify) handleFetch(fetchWithCors(request, false).catch(err => new Response(err, {status: 499})))
             `);
     }
+    if (skipRequest) {
+        content = content.replaceAll('// [skipRequest call]', `if (skipRequest(request)) return;`);
+    }
     if (blockRequest) {
         content = content.replace('// [blockRequest call]', `
                 if (blockRequest(url))

package/dist/index.js

@@ -10,7 +10,7 @@ const VersionAnalyzer_1 = require("./VersionAnalyzer");
 const DomBuilder_1 = require("./DomBuilder");
 // noinspection JSUnusedGlobalSymbols
 exports.default = {
-    version: '2.2.0',
+    version: '2.2.2',
     cache: {
         readEjectData: Utils_1.readEjectData, readUpdateJson: Variant_1.readUpdateJson,
         readRules: Variant_1.readRules, readMergeVersionMap: Variant_1.readMergeVersionMap,

package/dist/resources/sw-template.js

@@ -45,7 +45,7 @@
     self.addEventListener('activate', event => event.waitUntil(clients.claim()))
 
     // noinspection JSFileReferences
-    const { cacheRules, fetchFile, getSpareUrls, skipRequest } = require('../sw-rules')
+    const { cacheRules, fetchFile, getSpareUrls } = require('../sw-rules')
 
     // 检查请求是否成功
     // noinspection JSUnusedLocalSymbols
@@ -83,7 +83,7 @@
         // [blockRequest call]
         if (request.method !== 'GET' || !request.url.startsWith('http')) return
         // [modifyRequest call]
-        if (skipRequest?.(request)) return
+        // [skipRequest call]
         let cacheKey = url.hostname + url.pathname + url.search
         let cache = cacheMap.get(cacheKey)
         if (cache) {
@@ -152,14 +152,15 @@
      * @param optional {RequestInit?} 额外的配置项
      * @return {Promise<Response>}
      */
-    const fetchWithCors = (request, banCache, optional) => fetch(
-        request,
-        Object.assign({
-            cache: optional ? "no-store" : "default",
-            mode: 'cors',
-            credentials: 'same-origin'
-        }, optional || {})
-    )
+    const fetchWithCors = (request, banCache, optional) => {
+        if (!optional) optional = {}
+        optional.cache = banCache ? 'no-store' : 'default'
+        if (request.headers.get('Content-Type')?.startsWith('image/')) {
+            optional.mode = 'cors'
+            optional.credentials = 'same-origin'
+        }
+        return fetch(request, optional)
+    }
 
     /**
      * 判断指定 url 击中了哪一种缓存，都没有击中则返回 null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swpp-backends",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "main": "dist/index.js",
   "typings": "types/index.d.ts",
   "description": "Generate a powerful ServiceWorker for your website.",