@byted-apaas/server-sdk-node 1.0.10 → 1.0.12

package/context/resources/impl/resources.js

@@ -105,7 +105,18 @@ class _KunlunFile {
             if (typeof (fileTokenOrInfo.id) !== "string") {
                 throw new exceptions.InvalidParamError(`The type of fileInfo.id should be string, but ${typeof (fileTokenOrInfo)}`);
             }
-            return await Request.GetInstance().downloadFileByID(fileTokenOrInfo.id, filePath);
+            let tokenListStr = await Request.GetInstance().mGetFileToken([fileTokenOrInfo.id]);
+            let id2token;
+            try {
+                id2token = JSON.parse(tokenListStr);
+            }
+            catch (err) {
+                throw new exceptions.InternalError(`parse mGetFileToken resp failed: ${err.message}`);
+            }
+            if (!id2token[fileTokenOrInfo.id]) {
+                throw new exceptions.InternalError(`id (${fileTokenOrInfo.id})'s token is empty`);
+            }
+            return await Request.GetInstance().downloadFileByToken(id2token[fileTokenOrInfo.id], filePath);
         }
         else {
             throw new exceptions.InvalidParamError(`The type of first param should be string or object, but ${typeof (fileTokenOrInfo)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byted-apaas/server-sdk-node",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "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.11",
+    "@byted-apaas/server-common-node": "^1.0.12",
     "@jorgeferrero/stream-to-buffer": "^2.0.6",
     "dayjs": "^1.9.6",
     "form-data": "^3.0.0",

package/request/innerapi.d.ts

@@ -51,6 +51,7 @@ export declare class RequestRpc implements IInnerAPIRequest {
     revokeExecution(executionId: number, revokeOptions: RevokeExecutionOptions): Promise<void>;
     getExecutionInfo(executionId: number): Promise<ExecutionInfo>;
     getTenantInfo(appCtx: AppCtx): Promise<any>;
+    mGetFileToken(ids: string[]): Promise<string>;
     openSDKCreateRecordBySync(objectApiName: string, record: object): any;
     openSDKUpdateRecordBySync(objectApiName: string, recordID: number, record: object): any;
     openSDKDeleteRecordBySync(objectApiName: string, recordID: number): any;

package/request/innerapi.js

@@ -52,7 +52,7 @@ async function createRecordBySync(objectApiName, record) {
     param.Namespace = await (0, common_1.getNamespaceForOpenAndFaaSSDK)();
     param.ObjectAPIAlias = objectApiName;
     param.Data = utils.stringify(record);
-    param.Operator = BigInt(-1);
+    param.Operator = BigInt(utils.getUserIDFromCtx());
     if (task_id) {
         param.TaskID = BigInt(task_id);
     }
@@ -82,7 +82,7 @@ async function updateRecordBySync(objectApiName, recordID, record) {
     param.ObjectAPIAlias = objectApiName;
     param.RecordID = BigInt(recordID);
     param.Data = utils.stringify(record);
-    param.Operator = BigInt(-1);
+    param.Operator = BigInt(utils.getUserIDFromCtx());
     if (task_id) {
         param.TaskID = BigInt(task_id);
     }
@@ -111,7 +111,7 @@ async function deleteRecordBySync(objectApiName, recordID) {
     param.Namespace = await (0, common_1.getNamespaceForOpenAndFaaSSDK)();
     param.ObjectAPIAlias = objectApiName;
     param.RecordID = BigInt(recordID);
-    param.Operator = BigInt(-1);
+    param.Operator = BigInt(utils.getUserIDFromCtx());
     if (task_id) {
         param.TaskID = BigInt(task_id);
     }
@@ -140,7 +140,7 @@ async function createRecordsByAsync(objectApiName, records) {
     param.Namespace = await (0, common_1.getNamespaceForOpenAndFaaSSDK)();
     param.ObjectAPIAlias = objectApiName;
     param.Data = utils.stringify(records);
-    param.OperatorID = BigInt(-1);
+    param.OperatorID = BigInt(utils.getUserIDFromCtx());
     if (task_id) {
         param.AutomationTaskID = BigInt(task_id);
     }
@@ -169,7 +169,7 @@ async function updateRecordsByAsync(objectApiName, recordMap) {
     param.Namespace = await (0, common_1.getNamespaceForOpenAndFaaSSDK)();
     param.ObjectAPIAlias = objectApiName;
     param.Data = utils.stringify(recordMap);
-    param.OperatorID = BigInt(-1);
+    param.OperatorID = BigInt(utils.getUserIDFromCtx());
     if (task_id) {
         param.AutomationTaskID = BigInt(task_id);
     }
@@ -202,7 +202,7 @@ async function deleteRecordsByAsync(objectApiName, recordIDs) {
     param.Namespace = await (0, common_1.getNamespaceForOpenAndFaaSSDK)();
     param.ObjectAPIAlias = objectApiName;
     param.RecordIDList = recordIDList;
-    param.OperatorID = BigInt(-1);
+    param.OperatorID = BigInt(utils.getUserIDFromCtx());
     if (task_id) {
         param.AutomationTaskID = BigInt(task_id);
     }
@@ -231,7 +231,8 @@ async function createRecordsBySync(objectApiName, records) {
     param.Namespace = await (0, common_1.getNamespaceForOpenAndFaaSSDK)();
     param.ObjectAPIAlias = objectApiName;
     param.Data = utils.stringify(records);
-    param.OperatorID = BigInt(-1);
+    param.OperatorID = BigInt(utils.getUserIDFromCtx());
+    param.SetSystemField = 2;
     if (task_id) {
         param.AutomationTaskID = BigInt(task_id);
     }
@@ -271,7 +272,8 @@ async function updateRecordsBySync(objectApiName, recordMap) {
     param.Namespace = await (0, common_1.getNamespaceForOpenAndFaaSSDK)();
     param.ObjectAPIAlias = objectApiName;
     param.Data = utils.stringify(recordMap);
-    param.OperatorID = BigInt(-1);
+    param.OperatorID = BigInt(utils.getUserIDFromCtx());
+    param.SetSystemField = 2;
     if (task_id) {
         param.AutomationTaskID = BigInt(task_id);
     }
@@ -308,7 +310,8 @@ async function deleteRecordsBySync(objectApiName, recordIDs) {
     param.Namespace = await (0, common_1.getNamespaceForOpenAndFaaSSDK)();
     param.ObjectAPIAlias = objectApiName;
     param.RecordIDs = recordIDList;
-    param.OperatorID = BigInt(-1);
+    param.OperatorID = BigInt(utils.getUserIDFromCtx());
+    param.SetSystemField = 2;
     if (task_id) {
         param.AutomationTaskID = BigInt(task_id);
     }
@@ -481,6 +484,22 @@ async function downloadFileByToken(fileToken, filePath) {
         return resp.Data;
     }
 }
+async function mGetFileToken(ids) {
+    // 1. params
+    let param = {};
+    param.AttachmentIDs = ids;
+    // 2. prepare request
+    let ctx = await pre();
+    // 3. do request
+    let resp;
+    try {
+        resp = await rpc.getInnerAPICli().GetAttachmentTokens(ctx, param);
+    }
+    catch (err) {
+        throw new exceptions.InternalError(`Call InnerAPI failed: ${err.message}`);
+    }
+    return resp.Tokens;
+}
 async function createMessage(msg) {
     // 1. prepare args
     if (!msg.icon) {
@@ -707,7 +726,8 @@ async function modifyRecordsWithTransaction(placeholders, operations) {
     param.Placeholders = ph;
     // TODO: change operations type
     param.Operations = operations;
-    param.OperatorID = BigInt(-1);
+    param.OperatorID = BigInt(utils.getUserIDFromCtx());
+    param.SetSystemField = 1;
     const taskID = utils.getTriggerTaskID();
     if (taskID) {
         param.TaskID = BigInt(taskID);
@@ -1055,6 +1075,7 @@ class RequestRpc {
         this.uploadFile = uploadFile;
         this.downloadFileByID = downloadFileByID;
         this.downloadFileByToken = downloadFileByToken;
+        this.mGetFileToken = mGetFileToken;
         this.createMessage = createMessage;
         this.updateMessage = updateMessage;
         this.getFields = getFields;
@@ -1154,6 +1175,9 @@ class RequestRpc {
     async getTenantInfo(appCtx) {
         return await appCtx.credential.getTenantInfo();
     }
+    async mGetFileToken(ids) {
+        return null;
+    }
     // open sdk empty implement
     openSDKCreateRecordBySync(objectApiName, record) {
     }
@@ -1333,6 +1357,10 @@ async function getExecutionUserTaskInfo(executionId) {
 exports.getExecutionUserTaskInfo = getExecutionUserTaskInfo;
 async function invokeFuncSync(idOrName, params) {
     let ctx = await pre(true);
+    // 兼容 params 不传的情况
+    if (params === undefined) {
+        params = {};
+    }
     let param = {};
     param.Namespace = await (0, common_1.getNamespaceForOpenAndFaaSSDK)();
     if (idOrName.isInvokeByAPIName) {

package/request/interface.d.ts

@@ -70,6 +70,7 @@ export interface IInnerAPIBaseRequest {
     revokeExecution(executionId: number, revokeOptions: RevokeExecutionOptions): Promise<void>;
     getExecutionInfo(executionId: number): Promise<ExecutionInfo>;
     getTenantInfo(appCtx: AppCtx): Promise<any>;
+    mGetFileToken(ids: string[]): Promise<string>;
 }
 export interface IInnerAPIOpenSDKRequest {
     openSDKCreateRecordBySync(objectApiName: string, record: object): any;

package/request/openapi.d.ts

@@ -52,6 +52,7 @@ export declare class RequestHttp implements IInnerAPIRequest {
     revokeExecution(executionId: number, revokeOptions: RevokeExecutionOptions): Promise<void>;
     getExecutionInfo(executionId: number): Promise<ExecutionInfo>;
     getTenantInfo(appCtx: AppCtx): Promise<any>;
+    mGetFileToken(ids: string[]): Promise<string>;
     openSDKCreateRecordBySync(objectApiName: string, record: object): any;
     openSDKUpdateRecordBySync(objectApiName: string, recordID: number, record: object): any;
     openSDKDeleteRecordBySync(objectApiName: string, recordID: number): any;

package/request/openapi.js

@@ -44,7 +44,7 @@ async function createRecordBySync(objectApiName, record) {
     urlPath = urlPath.replace(replaceKeys.objectApiName, objectApiName);
     // 3.请求
     options.json = {
-        "operator": -1,
+        "operator": utils.getUserIDFromCtx(),
         "data": record,
     };
     let task_id = utils.getTriggerTaskID();
@@ -71,7 +71,7 @@ async function updateRecordBySync(objectApiName, recordID, record) {
     urlPath = urlPath.replace(replaceKeys.objectApiName, objectApiName);
     // 3.请求
     options.json = {
-        "operator": -1,
+        "operator": utils.getUserIDFromCtx(),
         "record_id": recordID,
         "data": record,
     };
@@ -92,7 +92,7 @@ async function deleteRecordBySync(objectApiName, recordID) {
     urlPath = urlPath.replace(replaceKeys.objectApiName, objectApiName);
     // 3.请求
     options.json = {
-        "operator": -1,
+        "operator": utils.getUserIDFromCtx(),
         "record_id": recordID,
     };
     let task_id = utils.getTriggerTaskID();
@@ -108,7 +108,7 @@ async function createRecordsByAsync(objectApiName, records) {
     urlPath = urlPath.replace(replaceKeys.objectApiName, objectApiName);
     // 2.请求
     options.json = {
-        "operator": -1,
+        "operator": utils.getUserIDFromCtx(),
         "data": records,
     };
     let task_id = utils.getTriggerTaskID();
@@ -124,7 +124,7 @@ async function updateRecordsByAsync(objectApiName, recordMap) {
     urlPath = urlPath.replace(replaceKeys.objectApiName, objectApiName);
     // 2.请求
     options.json = {
-        "operator": -1,
+        "operator": utils.getUserIDFromCtx(),
         "data": recordMap,
     };
     let task_id = utils.getTriggerTaskID();
@@ -140,7 +140,7 @@ async function deleteRecordsByAsync(objectApiName, recordIDs) {
     urlPath = urlPath.replace(replaceKeys.objectApiName, objectApiName);
     // 2.请求
     options.json = {
-        "operator": -1,
+        "operator": utils.getUserIDFromCtx(),
         "record_id_list": recordIDs,
     };
     let task_id = utils.getTriggerTaskID();
@@ -156,7 +156,8 @@ async function createRecordsBySync(objectApiName, records) {
     urlPath = urlPath.replace(replaceKeys.objectApiName, objectApiName);
     // 2.请求
     options.json = {
-        "operator": -1,
+        "operator": utils.getUserIDFromCtx(),
+        "set_system_mod": 2,
         "data": records,
     };
     let task_id = utils.getTriggerTaskID();
@@ -172,7 +173,8 @@ async function updateRecordsBySync(objectApiName, recordMap) {
     urlPath = urlPath.replace(replaceKeys.objectApiName, objectApiName);
     // 2.请求
     options.json = {
-        "operator": -1,
+        "operator": utils.getUserIDFromCtx(),
+        "set_system_mod": 2,
         "data": recordMap,
     };
     let task_id = utils.getTriggerTaskID();
@@ -188,7 +190,8 @@ async function deleteRecordsBySync(objectApiName, recordIDs) {
     urlPath = urlPath.replace(replaceKeys.objectApiName, objectApiName);
     // 2.请求
     options.json = {
-        "operator": -1,
+        "operator": utils.getUserIDFromCtx(),
+        "set_system_mod": 2,
         "record_id_list": recordIDs,
     };
     let task_id = utils.getTriggerTaskID();
@@ -305,7 +308,11 @@ async function mGetFileToken(ids) {
     options.json = {
         attachmentIds: ids
     };
-    return await openapi.doRequest(null, urlPath, options);
+    let res = await openapi.doRequest(null, urlPath, options);
+    if (!res || !res.tokens) {
+        throw new exceptions.InternalError(`mGetFileToken result is empty`);
+    }
+    return res.tokens;
 }
 async function createMessage(msg) {
     // 1.解析参数 icon/receiverIds/percent
@@ -485,7 +492,8 @@ async function modifyRecordsWithTransaction(placeholders, operations) {
     options.json = {
         "placeholders": placeholders,
         "operations": operations,
-        "operatorId": -1,
+        "operatorId": utils.getUserIDFromCtx(),
+        "setSystemField": 1,
     };
     let taskId = utils.getTriggerTaskID();
     if (taskId) {
@@ -684,6 +692,7 @@ class RequestHttp {
         this.uploadFile = uploadFile;
         this.downloadFileByID = downloadFileByID;
         this.downloadFileByToken = downloadFileByToken;
+        this.mGetFileToken = mGetFileToken;
         this.createMessage = createMessage;
         this.updateMessage = updateMessage;
         this.getFields = getFields;
@@ -782,6 +791,9 @@ class RequestHttp {
     async getTenantInfo(appCtx) {
         return await appCtx.credential.getTenantInfo();
     }
+    mGetFileToken(ids) {
+        return null;
+    }
     // open sdk empty implement
     openSDKCreateRecordBySync(objectApiName, record) {
     }