fix: use defaultAxiosCacheAdapterKeyFixed

lisaogren/axios-cache-adapter#250

Author: bluelovers

packages/@bluelovers/axios-extend/lib/cache.js

@@ -8,6 +8,7 @@ import { ITSPartialPick } from 'ts-type';
 import { IAxiosCacheAdapterOptionsConfig } from './types';
 import { CacheStoreByMapLike } from 'axios-cache-adapter-util/lib/createCacheStoreByMapLike';
 import LRUCache from 'lru-cache2';
+import { defaultAxiosCacheAdapterKeyFixed } from 'axios-cache-adapter-util/lib/util/key';
 
 export { IAxiosCacheAdapterOptions, ISetupCache, IAxiosCacheAdapterOptionsConfig }
 
@@ -54,7 +55,8 @@ export function mixinCacheConfig<T extends IAxiosCacheAdapterOptionsConfig>(conf
 				{
 					return res.status >= 500;
 				}
-			}
+			},
+			key: defaultAxiosCacheAdapterKeyFixed,
 		})
 	}
 

packages/@bluelovers/axios-extend/lib/cache.ts

@@ -40,10 +40,12 @@
     "@types/bluebird": "*",
     "@types/follow-redirects": "^1.13.1",
     "axios-cache-adapter": "*",
+    "axios-cache-adapter-util": "^1.0.53",
     "axios-cookiejar-support": "*",
     "bluebird": "*",
     "get-value": "^3.0.1",
     "lodash": "^4",
+    "lru-cache2": "^6.0.7",
     "reflect-metadata-util": "^1.0.12",
     "retry-axios": "^2.4.0",
     "ts-type": "^1.2.39",

packages/@bluelovers/axios-extend/package.json

@@ -0,0 +1,12 @@
+import { AxiosRequestConfig } from 'axios';
+declare module 'axios-cache-adapter' {
+    function serializeQuery(req: Pick<AxiosRequestConfig, 'params'>): string;
+}
+/**
+ * bug fixed version of key
+ *
+ * @see https://github.com/RasCarlito/axios-cache-adapter/blob/master/src/cache.js#L66
+ * @see https://github.com/RasCarlito/axios-cache-adapter/pull/250
+ */
+export declare function defaultAxiosCacheAdapterKeyFixed(req: AxiosRequestConfig): string;
+export declare function axiosCacheAdapterKeyExtra(cb: (req: Partial<AxiosRequestConfig>) => Pick<AxiosRequestConfig, 'url' | 'baseURL' | 'data' | 'params'>): (req: AxiosRequestConfig) => string;

packages/axios-cache-adapter-fs/lib/util/key.d.ts

@@ -0,0 +1,29 @@
+import md5 from 'md5'
+import { serializeQuery } from 'axios-cache-adapter'
+import { LazyURL } from 'lazy-url'
+import { AxiosRequestConfig } from 'axios';
+
+declare module 'axios-cache-adapter'
+{
+	function serializeQuery(req: Pick<AxiosRequestConfig, 'params'>): string;
+}
+
+/**
+ * bug fixed version of key
+ *
+ * @see https://github.com/RasCarlito/axios-cache-adapter/blob/master/src/cache.js#L66
+ * @see https://github.com/RasCarlito/axios-cache-adapter/pull/250
+ */
+export function defaultAxiosCacheAdapterKeyFixed(req: AxiosRequestConfig)
+{
+	const url = new LazyURL(req.url, req.baseURL).toRealString();
+	const key = url + serializeQuery(req)
+	return req.data ? key + md5(req.data) : key
+}
+
+export function axiosCacheAdapterKeyExtra(cb: (req: Partial<AxiosRequestConfig>) => Pick<AxiosRequestConfig, 'url' | 'baseURL' | 'data' | 'params'>)
+{
+	return (req: AxiosRequestConfig) => {
+		return defaultAxiosCacheAdapterKeyFixed(cb(req))
+	}
+}

packages/axios-cache-adapter-fs/lib/util/key.js

@@ -24,6 +24,8 @@
   "license": "ISC",
   "author": "",
   "main": "./lib/index",
+  "types": "./lib/index.d.ts",
+  "typings": "./lib/index.d.ts",
   "scripts": {
     "coverage": "npx nyc npm run test",
     "lint": "npx eslint **/*.ts",
@@ -37,12 +39,15 @@
     "bluebird": "^3.7.2",
     "free-gc": "^1.0.6",
     "fs-extra": "^10.0.0",
+    "lazy-url": "^1.0.12",
+    "md5": "^2.3.0",
     "restful-decorator": "^1.0.57",
     "ts-type": "^1.2.39",
     "tslib": "^2.3.0",
     "typed-http-headers": "^1.0.7"
   },
   "devDependencies": {
+    "@types/md5": "^2.3.1",
     "fs-extra": "^10.0.0",
     "lru-cache2": "^6.0.7"
   },

packages/axios-cache-adapter-fs/lib/util/key.ts

@@ -1137,6 +1137,13 @@
   resolved "https://registry.npmjs.org/@types/luxon/-/luxon-1.27.1.tgz#aceeb2d5be8fccf541237e184e37ecff5faa9096"
   integrity sha512-cPiXpOvPFDr2edMnOXlz3UBDApwUfR+cpizvxCy0n3vp9bz/qe8BWzHPIEFcy+ogUOyjKuCISgyq77ELZPmkkg==
 
+"@types/md5@^2.3.1":
+  version "2.3.1"
+  resolved "https://registry.npmjs.org/@types/md5/-/md5-2.3.1.tgz#010bcf3bb50a2cff3a574cb1c0b4051a9c67d6bc"
+  integrity sha512-OK3oe+ALIoPSo262lnhAYwpqFNXbiwH2a+0+Z5YBnkQEwWD8fk5+PIeRhYA48PzvX9I4SGNpWy+9bLj8qz92RQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/moment-timezone@^0.5.30":
   version "0.5.30"
   resolved "https://registry.npmjs.org/@types/moment-timezone/-/moment-timezone-0.5.30.tgz#340ed45fe3e715f4a011f5cfceb7cb52aad46fc7"
@@ -3694,7 +3701,7 @@ [email protected]:
   resolved "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz#4faad28d26ede351a7a1aaa5fec67915c869e355"
   integrity sha512-EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw==
 
-md5@^2.2.1:
+md5@^2.2.1, md5@^2.3.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
   integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==