@byted-apaas/server-sdk-node 1.1.26-beta.1 → 1.1.26-beta.2

package/kunlun/operator/impl/logic.js

@@ -404,6 +404,8 @@ async function handleCriterion(criterion) {
     return criterion;
 }
 exports.handleCriterion = handleCriterion;
+const NodeCache = require('node-cache');
+const localCache = new NodeCache();
 async function handleLookupCondition(conditions) {
     if (!(conditions && conditions[0] && conditions[0].left && conditions[0].left.settings && conditions[0].left.settings.fieldPath)) {
         return null;
@@ -422,15 +424,32 @@ async function handleLookupCondition(conditions) {
     let lookupMap = new Map(), dateSet = new Set();
     let firstObjApiName = conditions[0].left.settings.fieldPath[0].objectApiName;
     let fields = [];
-    // 获取对象的字段
-    if (queryMap.size === 1) {
+    let needReadCache = server_common_node_1.utils.getLaneID() !== ''; // 仅打包发布 2.0 支持走 cache
+    let cacheResult = null;
+    if (needReadCache) { // 打包发布 2.0 读缓存
+        cacheResult = getLookupObjectAPINamesFromCache(firstObjApiName, queryMap);
+        // todo wby 方便 qa 测试的日志
+        console.log(`\n=====>[handleLookupCondition] getLookupObjectAPINamesFromCache: ${JSON.stringify(cacheResult)}\n`);
+    }
+    // 命中缓存
+    if (cacheResult !== null && cacheResult.missFields.length === 0) {
+        fields = cacheResult.successFields;
+    }
+    // 未命中缓存 / 不读缓存
+    if ((cacheResult !== null && cacheResult.missFields.length === 1) || (!needReadCache && queryMap.size === 1)) {
+        if (cacheResult !== null && cacheResult.missFields.length === 1) {
+            fieldName = cacheResult.missFields[0];
+        }
         fields.push(await Request.GetInstance().getField(firstObjApiName, fieldName));
     }
-    else {
+    if ((cacheResult !== null && cacheResult.missFields.length > 1) || (!needReadCache && queryMap.size > 1)) {
         fields = await Request.GetInstance().getFields(firstObjApiName);
     }
     for (const field of fields) {
         parseFieldInfo(field, lookupMap, dateSet);
+        if (needReadCache) {
+            setFieldCache(firstObjApiName, field.api_name, field);
+        }
     }
     return {
         lookupMap: lookupMap,
@@ -571,3 +590,30 @@ function dateAdd(date, num) {
         return date;
     }
 }
+function setFieldCache(objectApiName, fieldName, field) {
+    localCache.set(getFieldCacheKey(objectApiName, fieldName), field, 60); // 缓存60s
+}
+function getFieldCache(objectApiName, fieldName) {
+    let field = localCache.get(getFieldCacheKey(objectApiName, fieldName));
+    return field;
+}
+function getFieldCacheKey(objectApiName, fieldName) {
+    return `${objectApiName}_${fieldName}`;
+}
+function getLookupObjectAPINamesFromCache(firstObjApiName, queryMap) {
+    var missFields = [];
+    var successFields = [];
+    for (const [fieldName, _] of queryMap) {
+        let field = getFieldCache(firstObjApiName, fieldName);
+        if (field) {
+            successFields.push(field);
+        }
+        else {
+            missFields.push(fieldName);
+        }
+    }
+    if (successFields.length === 0 && missFields.length === 0) {
+        return null;
+    }
+    return { successFields, missFields };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byted-apaas/server-sdk-node",
-  "version": "1.1.26-beta.1",
+  "version": "1.1.26-beta.2",
   "description": "aPaaS Server SDK",
   "author": "zhouwexin <zhouwexin@bytedance.com>",
   "homepage": "",
@@ -13,7 +13,7 @@
     "clean": "tsc --build --clean && rm -rf **/*.js.map"
   },
   "dependencies": {
-    "@byted-apaas/server-common-node": "^2.0.25-beta.1",
+    "@byted-apaas/server-common-node": "^2.0.24",
     "@jorgeferrero/stream-to-buffer": "^2.0.6",
     "dayjs": "^1.9.6",
     "form-data": "^3.0.0",

package/request/openapi.js

@@ -1409,6 +1409,7 @@ async function getExecutionUserTaskInfo(executionId) {
     let options = commonHttp.getOptions(null, constants_2.openapiHttpPath.getExecutionUserTaskInfo);
     let urlPath = options._reqPath.replace(replaceKeys.namespace, await (0, common_1.getNamespaceForOpenAndFaaSSDK)()).replace(replaceKeys.id, `${executionId}`);
     urlPath += `?operator=${utils.getUserIDFromCtx()}`;
+    options.headers.User = utils.getUserIDFromCtx();
     let res = await openapi.doRequest(null, urlPath, options);
     if (!res) {
         throw new exceptions.InternalError('getExecutionUserTaskInfo result is empty');
@@ -1422,6 +1423,7 @@ async function executeFlow(apiName, option, async) {
     }
     let options = commonHttp.getOptions(null, constants_2.openapiHttpPath.executeFlow);
     const urlPath = options._reqPath.replace(replaceKeys.namespace, await (0, common_1.getNamespaceForOpenAndFaaSSDK)()).replace(replaceKeys.apiName, apiName);
+    options.headers.User = utils.getUserIDFromCtx();
     options.json = {
         'operator': utils.getUserIDFromCtx(),
         'variables': (0, common_1.transMapToFlowVariable)(option.params),
@@ -1446,6 +1448,7 @@ async function revokeExecution(executionId, revokeOptions) {
     }
     let options = commonHttp.getOptions(null, constants_2.openapiHttpPath.revokeExecution);
     let urlPath = options._reqPath.replace(replaceKeys.namespace, await (0, common_1.getNamespaceForOpenAndFaaSSDK)()).replace(replaceKeys.id, `${executionId}`);
+    options.headers.User = utils.getUserIDFromCtx();
     let reason = undefined;
     if (revokeOptions && revokeOptions.reason) {
         reason = {
@@ -1467,6 +1470,7 @@ async function getExecutionInfo(executionId) {
     let options = commonHttp.getOptions(null, constants_2.openapiHttpPath.getExecutionInfo);
     let urlPath = options._reqPath.replace(replaceKeys.namespace, await (0, common_1.getNamespaceForOpenAndFaaSSDK)()).replace(replaceKeys.id, `${executionId}`);
     urlPath += `?operator=${utils.getUserIDFromCtx()}`;
+    options.headers.User = utils.getUserIDFromCtx();
     let res = await openapi.doRequest(null, urlPath, options);
     if (!res || !res.executionInfo) {
         throw new exceptions.InternalError(`getExecutionInfo result is empty`);