@snail-js/api 0.1.12 → 0.1.14

package/dist/snail-api.js

@@ -3701,10 +3701,20 @@ function createCache(type, ttl) {
   }
   return void 0;
 }
-const apiKey = (apiInstance) => {
+const apiKey = async (apiInstance) => {
   const { version, method, url, params, headers } = apiInstance;
-  return `[${method}]${version ? `-v${version}` : ""}-${url}${params ? `-${recordToString(params)}` : ""}${headers ? `-${recordToString(headers)}` : ""}`;
+  const str = `${params ? `-${recordToString(params)}` : ""}${headers ? `-${recordToString(headers)}` : ""}`;
+  return `[${method}]${version ? `-v${version}` : ""}-${url}-${await generateShortUniqueHash(str)}`;
 };
+async function generateShortUniqueHash(str) {
+  const encoder = new TextEncoder();
+  const data = encoder.encode(str);
+  const hashBuffer = await window.crypto.subtle.digest("SHA-256", data);
+  const hashArray = Array.from(new Uint8Array(hashBuffer));
+  let hashBase64 = btoa(String.fromCharCode.apply(null, hashArray));
+  hashBase64 = hashBase64.replace(/\+/g, "0").replace(/\//g, "1").replace(/=/g, "");
+  return hashBase64.substring(0, 16);
+}
 function recordToString(record) {
   return Object.keys(record).map((key) => {
     return `${key}=${record[key]}`;
@@ -3916,7 +3926,7 @@ class Snail {
           const hitSource = this.getHitSource(target, propertyKey);
           enableLog && console.log("hitSource:", hitSource);
           if (typeof hitSource == "string") {
-            this.setHitSource(request, hitSource);
+            await this.setHitSource(request, hitSource);
           }
           if (hitSource !== null) {
             const cachedResponse = await this.getCache(request, strategies);
@@ -4020,7 +4030,7 @@ class Snail {
   async getCache(request, strategies) {
     var _a;
     if (!this.cacheStorage) return void 0;
-    const cacheKey = apiKey(request);
+    const cacheKey = await apiKey(request);
     const cached = await ((_a = this.cacheStorage) == null ? void 0 : _a.get(cacheKey));
     if (cached && cached.error === null) {
       let cacheResponse = {
@@ -4051,9 +4061,9 @@ class Snail {
     );
     return apiHitSource;
   }
-  setHitSource(request, hitSource) {
+  async setHitSource(request, hitSource) {
     const cacheKeys = this.sourceMap.get(hitSource);
-    const currentCacheKey = apiKey(request);
+    const currentCacheKey = await apiKey(request);
     if (cacheKeys) {
       cacheKeys.push(currentCacheKey);
       this.sourceMap.set(hitSource, cacheKeys);
@@ -4063,7 +4073,7 @@ class Snail {
   }
   async setCache(request, response) {
     var _a;
-    const cacheKey = apiKey(request);
+    const cacheKey = await apiKey(request);
     await ((_a = this.cacheStorage) == null ? void 0 : _a.set(cacheKey, response.data));
   }
   async expireCache(hitSource) {
@@ -4209,5 +4219,6 @@ export {
   Versioning,
   VersioningType,
   apiKey,
+  generateShortUniqueHash,
   recordToString
 };

package/dist/snail-api.umd.cjs

@@ -3705,10 +3705,20 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     return void 0;
   }
-  const apiKey = (apiInstance) => {
+  const apiKey = async (apiInstance) => {
     const { version, method, url, params, headers } = apiInstance;
-    return `[${method}]${version ? `-v${version}` : ""}-${url}${params ? `-${recordToString(params)}` : ""}${headers ? `-${recordToString(headers)}` : ""}`;
+    const str = `${params ? `-${recordToString(params)}` : ""}${headers ? `-${recordToString(headers)}` : ""}`;
+    return `[${method}]${version ? `-v${version}` : ""}-${url}-${await generateShortUniqueHash(str)}`;
   };
+  async function generateShortUniqueHash(str) {
+    const encoder = new TextEncoder();
+    const data = encoder.encode(str);
+    const hashBuffer = await window.crypto.subtle.digest("SHA-256", data);
+    const hashArray = Array.from(new Uint8Array(hashBuffer));
+    let hashBase64 = btoa(String.fromCharCode.apply(null, hashArray));
+    hashBase64 = hashBase64.replace(/\+/g, "0").replace(/\//g, "1").replace(/=/g, "");
+    return hashBase64.substring(0, 16);
+  }
   function recordToString(record) {
     return Object.keys(record).map((key) => {
       return `${key}=${record[key]}`;
@@ -3920,7 +3930,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
             const hitSource = this.getHitSource(target, propertyKey);
             enableLog && console.log("hitSource:", hitSource);
             if (typeof hitSource == "string") {
-              this.setHitSource(request, hitSource);
+              await this.setHitSource(request, hitSource);
             }
             if (hitSource !== null) {
               const cachedResponse = await this.getCache(request, strategies);
@@ -4024,7 +4034,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     async getCache(request, strategies) {
       var _a;
       if (!this.cacheStorage) return void 0;
-      const cacheKey = apiKey(request);
+      const cacheKey = await apiKey(request);
       const cached = await ((_a = this.cacheStorage) == null ? void 0 : _a.get(cacheKey));
       if (cached && cached.error === null) {
         let cacheResponse = {
@@ -4055,9 +4065,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       );
       return apiHitSource;
     }
-    setHitSource(request, hitSource) {
+    async setHitSource(request, hitSource) {
       const cacheKeys = this.sourceMap.get(hitSource);
-      const currentCacheKey = apiKey(request);
+      const currentCacheKey = await apiKey(request);
       if (cacheKeys) {
         cacheKeys.push(currentCacheKey);
         this.sourceMap.set(hitSource, cacheKeys);
@@ -4067,7 +4077,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     async setCache(request, response) {
       var _a;
-      const cacheKey = apiKey(request);
+      const cacheKey = await apiKey(request);
       await ((_a = this.cacheStorage) == null ? void 0 : _a.set(cacheKey, response.data));
     }
     async expireCache(hitSource) {
@@ -4212,6 +4222,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   exports2.Versioning = Versioning;
   exports2.VersioningType = VersioningType;
   exports2.apiKey = apiKey;
+  exports2.generateShortUniqueHash = generateShortUniqueHash;
   exports2.recordToString = recordToString;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 });

package/dist/utils/function.d.ts

@@ -5,5 +5,6 @@ export declare const apiKey: <T extends {
     version?: string;
     params?: Record<string, any>;
     headers?: Record<string, any>;
-}>(apiInstance: T) => string;
+}>(apiInstance: T) => Promise<string>;
+export declare function generateShortUniqueHash(str: string): Promise<string>;
 export declare function recordToString(record: Record<string, any>): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snail-js/api",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Http Request with Decorators Api, build on axios",
   "type": "module",
   "main": "./src/index.ts",