@larksuiteoapi/node-sdk 1.9.0 → 1.10.0

package/es/index.js

@@ -114,9 +114,17 @@ class DefaultCache {
     constructor() {
         this.values = new Map();
     }
-    get(key) {
+    // When there is a namespace, splice the namespace and key to form a new key
+    getCacheKey(key, namespace) {
+        if (namespace) {
+            return `${namespace}/${key.toString()}`;
+        }
+        return key;
+    }
+    get(key, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const data = this.values.get(key);
+            const cacheKey = this.getCacheKey(key, get(options, 'namespace'));
+            const data = this.values.get(cacheKey);
             if (data) {
                 const { value, expiredTime } = data;
                 if (!expiredTime || expiredTime - new Date().getTime() > 0) {
@@ -126,9 +134,10 @@ class DefaultCache {
             return undefined;
         });
     }
-    set(key, value, expiredTime) {
+    set(key, value, expiredTime, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.values.set(key, {
+            const cacheKey = this.getCacheKey(key, get(options, 'namespace'));
+            this.values.set(cacheKey, {
                 value,
                 expiredTime,
             });
@@ -20400,7 +20409,9 @@ class AppTicketManager {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.appType === AppType.ISV) {
-                const appTicket = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(CAppTicket));
+                const appTicket = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(CAppTicket, {
+                    namespace: this.appId
+                }));
                 if (!appTicket) {
                     this.requestAppTicket();
                 }
@@ -20423,7 +20434,9 @@ class AppTicketManager {
     getAppTicket() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const appTicket = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(CAppTicket));
+            const appTicket = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(CAppTicket, {
+                namespace: this.appId
+            }));
             if (appTicket) {
                 this.logger.debug('use cache app ticket');
                 return appTicket;
@@ -20455,7 +20468,9 @@ class TokenManager {
     getCustomTenantAccessToken() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const cachedTenantAccessToken = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(CTenantAccessToken));
+            const cachedTenantAccessToken = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(CTenantAccessToken, {
+                namespace: this.appId
+            }));
             if (cachedTenantAccessToken) {
                 this.logger.debug('use cache token');
                 return cachedTenantAccessToken;
@@ -20472,7 +20487,9 @@ class TokenManager {
             });
             yield ((_b = this.cache) === null || _b === void 0 ? void 0 : _b.set(CTenantAccessToken, tenant_access_token, 
             // Due to the time-consuming network, the expiration time needs to be 3 minutes earlier
-            new Date().getTime() + expire * 1000 - 3 * 60 * 1000));
+            new Date().getTime() + expire * 1000 - 3 * 60 * 1000, {
+                namespace: this.appId
+            }));
             return tenant_access_token;
         });
     }
@@ -20483,7 +20500,9 @@ class TokenManager {
                 this.logger.error('market app request need tenant key');
                 return undefined;
             }
-            const tenantAccessToken = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(`larkMarketAccessToken${tenantKey}`));
+            const tenantAccessToken = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(`larkMarketAccessToken${tenantKey}`, {
+                namespace: this.appId
+            }));
             if (tenantAccessToken) {
                 this.logger.debug('use cache token');
                 return tenantAccessToken;
@@ -20520,7 +20539,9 @@ class TokenManager {
             // 设置tenant_access_token
             yield this.cache.set(`larkMarketAccessToken${tenantKey}`, tenant_access_token, 
             // Due to the time-consuming network, the expiration time needs to be 3 minutes earlier
-            new Date().getTime() + expire * 1000 - 3 * 60 * 1000);
+            new Date().getTime() + expire * 1000 - 3 * 60 * 1000, {
+                namespace: this.appId
+            });
             return tenant_access_token;
         });
     }
@@ -20746,9 +20767,11 @@ class EventDispatcher {
     registerAppTicketHandle() {
         this.register({
             app_ticket: (data) => __awaiter(this, void 0, void 0, function* () {
-                const { app_ticket } = data;
+                const { app_ticket, app_id } = data;
                 if (app_ticket) {
-                    yield this.cache.set(CAppTicket, app_ticket);
+                    yield this.cache.set(CAppTicket, app_ticket, undefined, {
+                        namespace: app_id
+                    });
                     this.logger.debug('set app ticket');
                 }
                 else {
@@ -20809,9 +20832,11 @@ class CardActionHandler {
     registerAppTicketHandle() {
         this.register({
             app_ticket: (data) => __awaiter(this, void 0, void 0, function* () {
-                const { app_ticket } = data;
+                const { app_ticket, app_id } = data;
                 if (app_ticket) {
-                    yield this.cache.set(CAppTicket, app_ticket);
+                    yield this.cache.set(CAppTicket, app_ticket, undefined, {
+                        namespace: app_id
+                    });
                     this.logger.debug('set app ticket');
                 }
                 else {

package/lib/index.js

@@ -129,9 +129,17 @@ class DefaultCache {
     constructor() {
         this.values = new Map();
     }
-    get(key) {
+    // When there is a namespace, splice the namespace and key to form a new key
+    getCacheKey(key, namespace) {
+        if (namespace) {
+            return `${namespace}/${key.toString()}`;
+        }
+        return key;
+    }
+    get(key, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const data = this.values.get(key);
+            const cacheKey = this.getCacheKey(key, get__default["default"](options, 'namespace'));
+            const data = this.values.get(cacheKey);
             if (data) {
                 const { value, expiredTime } = data;
                 if (!expiredTime || expiredTime - new Date().getTime() > 0) {
@@ -141,9 +149,10 @@ class DefaultCache {
             return undefined;
         });
     }
-    set(key, value, expiredTime) {
+    set(key, value, expiredTime, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.values.set(key, {
+            const cacheKey = this.getCacheKey(key, get__default["default"](options, 'namespace'));
+            this.values.set(cacheKey, {
                 value,
                 expiredTime,
             });
@@ -20415,7 +20424,9 @@ class AppTicketManager {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.appType === exports.AppType.ISV) {
-                const appTicket = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(CAppTicket));
+                const appTicket = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(CAppTicket, {
+                    namespace: this.appId
+                }));
                 if (!appTicket) {
                     this.requestAppTicket();
                 }
@@ -20438,7 +20449,9 @@ class AppTicketManager {
     getAppTicket() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const appTicket = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(CAppTicket));
+            const appTicket = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(CAppTicket, {
+                namespace: this.appId
+            }));
             if (appTicket) {
                 this.logger.debug('use cache app ticket');
                 return appTicket;
@@ -20470,7 +20483,9 @@ class TokenManager {
     getCustomTenantAccessToken() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const cachedTenantAccessToken = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(CTenantAccessToken));
+            const cachedTenantAccessToken = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(CTenantAccessToken, {
+                namespace: this.appId
+            }));
             if (cachedTenantAccessToken) {
                 this.logger.debug('use cache token');
                 return cachedTenantAccessToken;
@@ -20487,7 +20502,9 @@ class TokenManager {
             });
             yield ((_b = this.cache) === null || _b === void 0 ? void 0 : _b.set(CTenantAccessToken, tenant_access_token, 
             // Due to the time-consuming network, the expiration time needs to be 3 minutes earlier
-            new Date().getTime() + expire * 1000 - 3 * 60 * 1000));
+            new Date().getTime() + expire * 1000 - 3 * 60 * 1000, {
+                namespace: this.appId
+            }));
             return tenant_access_token;
         });
     }
@@ -20498,7 +20515,9 @@ class TokenManager {
                 this.logger.error('market app request need tenant key');
                 return undefined;
             }
-            const tenantAccessToken = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(`larkMarketAccessToken${tenantKey}`));
+            const tenantAccessToken = yield ((_a = this.cache) === null || _a === void 0 ? void 0 : _a.get(`larkMarketAccessToken${tenantKey}`, {
+                namespace: this.appId
+            }));
             if (tenantAccessToken) {
                 this.logger.debug('use cache token');
                 return tenantAccessToken;
@@ -20535,7 +20554,9 @@ class TokenManager {
             // 设置tenant_access_token
             yield this.cache.set(`larkMarketAccessToken${tenantKey}`, tenant_access_token, 
             // Due to the time-consuming network, the expiration time needs to be 3 minutes earlier
-            new Date().getTime() + expire * 1000 - 3 * 60 * 1000);
+            new Date().getTime() + expire * 1000 - 3 * 60 * 1000, {
+                namespace: this.appId
+            });
             return tenant_access_token;
         });
     }
@@ -20761,9 +20782,11 @@ class EventDispatcher {
     registerAppTicketHandle() {
         this.register({
             app_ticket: (data) => __awaiter(this, void 0, void 0, function* () {
-                const { app_ticket } = data;
+                const { app_ticket, app_id } = data;
                 if (app_ticket) {
-                    yield this.cache.set(CAppTicket, app_ticket);
+                    yield this.cache.set(CAppTicket, app_ticket, undefined, {
+                        namespace: app_id
+                    });
                     this.logger.debug('set app ticket');
                 }
                 else {
@@ -20824,9 +20847,11 @@ class CardActionHandler {
     registerAppTicketHandle() {
         this.register({
             app_ticket: (data) => __awaiter(this, void 0, void 0, function* () {
-                const { app_ticket } = data;
+                const { app_ticket, app_id } = data;
                 if (app_ticket) {
-                    yield this.cache.set(CAppTicket, app_ticket);
+                    yield this.cache.set(CAppTicket, app_ticket, undefined, {
+                        namespace: app_id
+                    });
                     this.logger.debug('set app ticket');
                 }
                 else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@larksuiteoapi/node-sdk",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "description": "larksuite open sdk for nodejs",
   "keywords": [
     "feishu",

package/types/index.d.ts

@@ -13,8 +13,12 @@
 import { AxiosRequestConfig } from 'axios';
 
 interface Cache {
-    set: (key: string | Symbol, value: any, expire?: number) => Promise<boolean>;
-    get: (key: string | Symbol) => Promise<any>;
+    set: (key: string | Symbol, value: any, expire?: number, options?: {
+        namespace?: string;
+    }) => Promise<boolean>;
+    get: (key: string | Symbol, options?: {
+        namespace?: string;
+    }) => Promise<any>;
 }
 interface Logger {
     error: (...msg: any[]) => void | Promise<void>;