swpp-backends 2.3.0 → 2.3.1

package/dist/ServiceWorkerBuilder.js

@@ -59,7 +59,7 @@ function buildServiceWorker() {
                     url = new URL(request.url)
                 }
             `).replaceAll('// [modifyRequest else-if]', `
-                else if (modify) handleFetch(fetchWithCors(request, false).catch(err => new Response(err, {status: 499})))
+                else if (modify) handleFetch(fetchWithCache(request, false).catch(err => new Response(err, {status: 499})))
             `);
     }
     if (skipRequest) {

package/dist/SwppRules.js

@@ -80,6 +80,6 @@ exports.addRulesMapEvent = addRulesMapEvent;
 const defRules = {
     config: {},
     // @ts-ignore
-    isCors: request => !request.headers.get('Accept')?.startsWith('image/'),
+    isCors: () => false,
     isMemoryQueue: () => false
 };

package/dist/index.js

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

package/dist/resources/sw-template.js

@@ -136,7 +136,7 @@
             const spare = getSpareUrls(request.url)
             if (spare) handleFetch(fetchFile(request, false, spare))
             // [modifyRequest else-if]
-            else handleFetch(fetchWithCors(request, false).catch(err => new Response(err, {status: 499})))
+            else handleFetch(fetchWithCache(request).catch(err => new Response(err, {status: 499})))
         }
     })
 
@@ -150,22 +150,43 @@
     })
 
     /**
-     * 添加 cors 配置请求指定资源
+     * 基础 fetch
      * @param request {Request|string}
-     * @param banCache {boolean} 是否禁用 HTTP 缓存
+     * @param banCache {boolean} 是否禁用缓存
+     * @param cors {boolean} 是否启用 cors
      * @param optional {RequestInit?} 额外的配置项
      * @return {Promise<Response>}
      */
-    const fetchWithCors = (request, banCache, optional) => {
+    const baseFetcher = (request, banCache, cors, optional) => {
         if (!optional) optional = {}
         optional.cache = banCache ? 'no-store' : 'default'
-        if (isCors(request)) {
+        if (cors) {
             optional.mode = 'cors'
             optional.credentials = 'same-origin'
         }
         return fetch(request, optional)
     }
 
+    /**
+     * 添加 cors 配置请求指定资源
+     * @param request {Request}
+     * @param optional {RequestInit?} 额外的配置项
+     * @return {Promise<Response>}
+     */
+    const fetchWithCache = (request, optional) =>
+        baseFetcher(request, false, isCors(request), optional)
+
+    // noinspection JSUnusedLocalSymbols
+    /**
+     * 添加 cors 配置请求指定资源
+     * @param request {Request}
+     * @param banCache {boolean} 是否禁用 HTTP 缓存
+     * @param optional {RequestInit?} 额外的配置项
+     * @return {Promise<Response>}
+     */
+    const fetchWithCors = (request, banCache, optional) =>
+        baseFetcher(request, banCache, true, optional)
+
     /**
      * 判断指定 url 击中了哪一种缓存，都没有击中则返回 null
      * @param url {URL}

package/package.json

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

package/types/SwppRules.d.ts

@@ -21,10 +21,7 @@ export interface SwppRules {
         [propName: string]: CacheRules;
     };
     /**
-     * 判断指定请求是否使用 CORS
-     *
-     * **注意：对于需要使用缓存、竞速等功能的 URL 必须使用 CORS，否则无法判断状态码从而使得功能失效或工作异常**
-     *
+     * 判断指定请求是否使用 CORS（必须启用 CORS 的请求将不通过该函数判断）
      * @param request 当前请求的 request
      */
     isCors?: (request: Request) => boolean;