@byted-apaas/server-sdk-node 1.0.4 → 1.0.5-beta.6

package/constants/constants.d.ts

@@ -8,3 +8,6 @@ export declare const httpHeaderKeys: {
 export declare const httpStatusCodes: {
     redirect: number;
 };
+export declare const triggerType: {
+    defaultTrigger: string;
+};

package/constants/constants.js

@@ -2,7 +2,7 @@
 // Copyright 2022 ByteDance Ltd. and/or its affiliates
 // SPDX-License-Identifier: MIT
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpStatusCodes = exports.httpHeaderKeys = exports.notifyModel = void 0;
+exports.triggerType = exports.httpStatusCodes = exports.httpHeaderKeys = exports.notifyModel = void 0;
 exports.notifyModel = {
     key: "ee.kunlun.cloudfunction.faas_buildin",
 };
@@ -13,3 +13,6 @@ exports.httpHeaderKeys = {
 exports.httpStatusCodes = {
     redirect: 302,
 };
+exports.triggerType = {
+    defaultTrigger: "default-trigger"
+};

package/context/context.d.ts

@@ -4,7 +4,7 @@ import { Message } from "./msg/msg";
 import { IDBGetter } from "./db/db";
 import { Context as CommonContext } from '@byted-apaas/server-common-node';
 import { IMetaData } from "./metadata/metadata";
-export declare class Context<T, mt, cf, gv> extends CommonContext<T> implements IContext<T, mt, cf, gv> {
+export declare class Context<T, mt, cf, gv> extends CommonContext implements IContext<T, mt, cf, gv> {
     /**
      * 操作数据库中的记录数据
      */

package/context/tasks/tasks.js

@@ -23,7 +23,7 @@ class Tasks {
     async createAsyncTask(apiName, params) {
         if (apiName && params) {
             // low_code 1.0
-            if (utils.isOnlineDev()) { // TODO 区分 4.0 vs 5.0
+            if (utils.isOnlineDev()) {
                 // 1.debug模式
                 if (utils.isDebug()) {
                     return await this.f(apiName).invoke(params);

package/hooks/api.d.ts

@@ -1,5 +1,5 @@
 import * as common from "@byted-apaas/server-common-node";
-import { IGfCtx } from "@byted-apaas/server-common-node/context/IContext";
+import { IFuCtx } from "@byted-apaas/server-common-node/context/IContext";
 import { Tasks } from "../context/tasks/tasks";
 import { DB } from "../context/db/impl/db";
 import { _Resources } from "../context/resources/impl/resources";
@@ -33,7 +33,7 @@ export declare function invokeMicroservice(): (apiName: string) => {
      */
     invokeAsync: (path: string, method?: string, params?: any) => Promise<any>;
 };
-export declare const db: DB<IGfCtx, import("../data").metadataMap>;
+export declare const db: DB<IFuCtx, import("../data").metadataMap>;
 export declare const resources: _Resources;
 export declare const msg: Message;
 export declare const tasks: Tasks<unknown>;

package/hooks/api.js

@@ -11,14 +11,12 @@ const resources_1 = require("../context/resources/impl/resources");
 const msg_1 = require("../context/msg/msg");
 const Request = require("../request/interface");
 const constants = require("../constants/constants");
-const utils_1 = require("@byted-apaas/server-common-node/utils/utils");
 const metadata_1 = require("../context/metadata/metadata");
 const nodeCls = require("node-cls");
 const nodeClsCtx = common.nodeClsCtx;
 const exceptions = common.exceptions;
 const utils = common.utils;
 const checkUtils = common.checkUtils;
-const functionSources = common.constants.functionSources;
 // 同步调用云函数
 function getFunctionSync(context, logger) {
     return (funcName) => {
@@ -79,7 +77,6 @@ function getFunctionSync(context, logger) {
                         ctx.loopMasks = loopMasks;
                         return await ctx.run(async () => {
                             const dynCtx = nodeClsCtx.getDynCtx();
-                            dynCtx.source = functionSources.globalFunction;
                             return await dynCtx.run(async () => {
                                 return await common.hooks.invoke(func, params, context, logger);
                             });
@@ -89,29 +86,12 @@ function getFunctionSync(context, logger) {
             };
         }
         return {
+            // 多语言函数开发, 走远端
             invoke: async (params) => {
-                let func = (0, utils_1.getRequireFunc)()(funcName);
-                if (!func) {
-                    throw new exceptions.InvalidParamError(`The function (${funcName}) does not exist.`);
-                }
-                let loopMasks = [funcName];
-                let reqCtx = nodeCls.get("loopCtx");
-                if (reqCtx && reqCtx.loopMasks && Array.isArray(reqCtx.loopMasks)) {
-                    if (reqCtx.loopMasks.includes(funcName)) {
-                        throw new exceptions.InvalidParamError(`Task execution forms a loop.`);
-                    }
-                    loopMasks.push(...reqCtx.loopMasks);
-                }
-                // 修改 source 全局函数
-                let ctx = nodeCls.create("loopCtx");
-                ctx.loopMasks = loopMasks;
-                return await ctx.run(async () => {
-                    const dynCtx = nodeClsCtx.getDynCtx();
-                    dynCtx.source = functionSources.globalFunction;
-                    return await dynCtx.run(async () => {
-                        return await common.hooks.invoke(func, params, context, logger);
-                    });
-                });
+                return await Request.GetInstance().invokeFuncSync({
+                    APIName: funcName,
+                    isInvokeByAPIName: true
+                }, params);
             }
         };
     };

package/hooks/hooks.js

@@ -6,7 +6,6 @@ const msg_1 = require("../context/msg/msg");
 const server_common_node_1 = require("@byted-apaas/server-common-node");
 const api = require("./api");
 const operator_1 = require("../kunlun/operator/impl/operator");
-const constants_1 = require("@byted-apaas/server-common-node/constants/constants");
 const db_1 = require("../context/db/impl/db");
 const common_1 = require("../request/common");
 /**
@@ -38,31 +37,12 @@ function pre(params, context, logger, requireFunc) {
  * @param requireFunc
  */
 function mountContext(context, logger, requireFunc) {
-    const source = server_common_node_1.utils.getSource();
-    // 1. 根据不同调用场景差异化初始化内容
-    //    - db 是否包含 currentObject，transaction 是否包含 currentObject
-    //    - global function 场景需要初始化 setRespHeader 和 RedirectLocation 方法，以及 method 属性
-    switch (source) {
-        case constants_1.functionSources.workflow:
-            context.db = new db_1.DBWithCurrentObject(context.objectApiName);
-            break;
-        case constants_1.functionSources.globalFunction:
-            context.db = new db_1.DBWithCurrentObject(null);
-            // set response headers
-            context.setResponseHeader = api.setRespHeader();
-            context.setRedirectLocation = api.setRedirectLocation(context);
-            // 暴露context.method属性
-            context.method = server_common_node_1.utils.getHttpMethod();
-            break;
-        case constants_1.functionSources.recordAutomation:
-            context.db = new db_1.DBWithCurrentObject(context.objectApiName);
-            break;
-        case constants_1.functionSources.scheduleAutomation:
-            context.db = new db_1.DBWithCurrentObject(null);
-            break;
-        default:
-            throw new server_common_node_1.exceptions.InvalidParamError(`This npm package does not contain this source ${source}`);
-    }
+    // 1. 全量挂载
+    context.db = new db_1.DBWithCurrentObject(context.objectApiName);
+    // set response headers
+    context.setResponseHeader = api.setRespHeader();
+    context.setRedirectLocation = api.setRedirectLocation(context);
+    context.method = server_common_node_1.utils.getHttpMethod();
     // 2. 初始化 core 包中需要初始化的内容，因此强转为 IContext 类型
     //    - function
     //    - tasks

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byted-apaas/server-sdk-node",
-  "version": "1.0.4",
+  "version": "1.0.5-beta.6",
   "description": "aPaaS Server SDK",
   "author": "zhouwexin <zhouwexin@bytedance.com>",
   "homepage": "",
@@ -12,7 +12,7 @@
     "pre-build": "rm -rf build && tsc"
   },
   "dependencies": {
-    "@byted-apaas/server-common-node": "^1.0.4",
+    "@byted-apaas/server-common-node": "^1.0.7-beta.6",
     "@jorgeferrero/stream-to-buffer": "^2.0.6",
     "dayjs": "^1.9.6",
     "form-data": "^3.0.0",
@@ -37,6 +37,5 @@
       "ts-node/register"
     ],
     "timeout": 20000
-  },
-  "gitHead": "e2274551684797a45a4fa5e2168f1c54a7559c7e"
+  }
 }

package/request/innerapi.js

@@ -1345,7 +1345,7 @@ async function invokeFuncSync(idOrName, params) {
     }
     param.Params = JSON.stringify(params);
     param.Context = JSON.stringify((0, common_1.getTriggerCtx)());
-    param.TriggerType = utils.getTriggerType();
+    param.TriggerType = constants_1.triggerType.defaultTrigger;
     let resp;
     try {
         resp = await rpc.getInnerAPICli().InvokeFuncSync(ctx, param);
@@ -1380,7 +1380,7 @@ async function createAsyncTaskV1(idOrName, params) {
     }
     param.Params = JSON.stringify(params);
     param.Context = JSON.stringify((0, common_1.getTriggerCtx)());
-    param.TriggerType = utils.getTriggerType();
+    param.TriggerType = constants_1.triggerType.defaultTrigger;
     let resp;
     try {
         resp = await rpc.getInnerAPICli().CreateAsyncTaskOld(ctx, param);
@@ -1399,7 +1399,7 @@ async function createAsyncTaskV2(APIName, params) {
     param.APIAlias = APIName;
     param.Params = JSON.stringify(params);
     param.Context = JSON.stringify((0, common_1.getTriggerCtx)());
-    param.TriggerType = utils.getTriggerType();
+    param.TriggerType = constants_1.triggerType.defaultTrigger;
     param.Extra = (0, common_1.getDebugExtraInfo)();
     let resp;
     try {

package/request/openapi.js

@@ -852,7 +852,7 @@ async function invokeFuncSync(idOrName, params) {
     options.json = {
         "params": JSON.stringify(params),
         "context": JSON.stringify(getTriggerCtx()),
-        "triggerType": utils.getTriggerType(),
+        "triggerType": constants_1.triggerType.defaultTrigger,
     };
     //  相等时，表示是新版本函数的场景
     if (idOrName.isInvokeByAPIName) {
@@ -877,7 +877,7 @@ async function createAsyncTaskV1(idOrName, params) {
     options.json = {
         "params": JSON.stringify(params),
         "context": JSON.stringify(getTriggerCtx()),
-        "triggerType": utils.getTriggerType(),
+        "triggerType": constants_1.triggerType.defaultTrigger,
     };
     //  相等时，表示是新版本函数的场景
     if (idOrName.isInvokeByAPIName) {
@@ -914,7 +914,7 @@ async function createAsyncTaskV2(APIName, params) {
         "apiAlias": APIName,
         "params": JSON.stringify(params),
         "context": JSON.stringify(getTriggerCtx()),
-        "triggerType": utils.getTriggerType(),
+        "triggerType": constants_1.triggerType.defaultTrigger,
         "extra": (0, common_1.getDebugExtraInfo)()
     };
     let res = await openapi.doRequest(null, urlPath, options);