@cloudbase/manager-node 4.11.0-alpha.4 → 4.11.0-alpha.6

package/lib/function/index.js

@@ -488,22 +488,25 @@ class FunctionService {
      * @param {string} qualifier 需要删除的版本号，不填默认删除函数下全部版本。
      * @returns {Promise<IResponseInfo>}
      */
-    async deleteFunction({ name }) {
+    async deleteFunction(name) {
         var _a;
+        const funcName = typeof name === 'string'
+            ? name
+            : name === null || name === void 0 ? void 0 : name.name;
         const { namespace } = this.getFunctionConfig();
         // 检测是否绑定了 API 网关
         const accessService = this.environment.getAccessService();
         const res = await accessService.getAccessList({
-            name
+            name: funcName
         });
         // 删除绑定的 API 网关
         if (((_a = res === null || res === void 0 ? void 0 : res.APISet) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             await accessService.deleteAccess({
-                name
+                name: funcName
             });
         }
-        await this.scfService.request('DeleteFunction', {
-            FunctionName: name,
+        return await this.scfService.request('DeleteFunction', {
+            FunctionName: funcName,
             Namespace: namespace
         });
     }
@@ -741,10 +744,13 @@ class FunctionService {
             // 注意：dnsCache 需要 'TRUE'/'FALSE' 字符串，在特殊处理阶段处理
             'intranetconfig': 'IntranetConfig',
         };
+        const { TopicId, LogsetId } = this.getClsServiceConfig();
         // 构建参数
         const params = {
             Namespace: namespace,
-            FunctionName: func.name
+            FunctionName: func.name,
+            ClsTopicId: TopicId,
+            ClsLogsetId: LogsetId
         };
         // 白名单字段自动转换（大小写不敏感，统一输出 PascalCase）
         for (const key of Object.keys(func)) {
@@ -1047,13 +1053,12 @@ class FunctionService {
     async deleteFunctionTrigger(name, triggerName) {
         const { namespace } = this.getFunctionConfig();
         try {
-            await this.scfService.request('DeleteTrigger', {
+            return await this.scfService.request('DeleteTrigger', {
                 FunctionName: name,
                 Namespace: namespace,
                 TriggerName: triggerName,
                 Type: 'timer'
             });
-            (0, utils_1.successLog)(`[${name}] 删除云函数触发器 ${triggerName} 成功！`);
         }
         catch (e) {
             throw new error_1.CloudBaseError(`[${name}] 删除触发器失败：${e.message}`);

package/lib/user/index.js

@@ -114,6 +114,194 @@ class UserService {
     async getTcbAccountInfo() {
         return this.tcbService.request('DescribeTcbAccountInfo');
     }
+    async createUser(options) {
+        const { EnvId } = this.environment.lazyEnvironmentConfig;
+        const { name, uid, type, password, userStatus, nickName, phone, email, avatarUrl, description } = options;
+        // name 校验：1-64，字母/数字开头，仅字母数字._-
+        if (!/^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/.test(name)) {
+            throw new Error('Invalid name');
+        }
+        // uid 校验：<=64
+        if (uid && uid.length > 64) {
+            throw new Error('Invalid uid');
+        }
+        // type / status 白名单
+        if (type && !['internalUser', 'externalUser'].includes(type)) {
+            throw new Error('Invalid type');
+        }
+        if (userStatus && !['ACTIVE', 'BLOCKED'].includes(userStatus)) {
+            throw new Error('Invalid userStatus');
+        }
+        if (password) {
+            if (password.length < 8 || password.length > 32) {
+                throw new Error('Invalid password length');
+            }
+            if (!/^[A-Za-z0-9]/.test(password)) {
+                throw new Error('Password cannot start with special character');
+            }
+            const kinds = [
+                /[a-z]/.test(password),
+                /[A-Z]/.test(password),
+                /[0-9]/.test(password),
+                /[()!@#$%^&*|?><_-]/.test(password)
+            ].filter(Boolean).length;
+            if (kinds < 3) {
+                throw new Error('Password must include at least 3 character categories');
+            }
+        }
+        // 其他字段校验
+        if (nickName && (nickName.length < 2 || nickName.length > 64)) {
+            throw new Error('Invalid nickName');
+        }
+        if (description && description.length > 200) {
+            throw new Error('Invalid description');
+        }
+        if (phone && !/^1\d{10}$/.test(phone)) {
+            throw new Error('Invalid phone');
+        }
+        if (email && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+            throw new Error('Invalid email');
+        }
+        const reqData = {
+            EnvId,
+            Name: name
+        };
+        if (uid)
+            reqData.Uid = uid;
+        if (type)
+            reqData.Type = type;
+        if (password)
+            reqData.Password = password;
+        if (userStatus)
+            reqData.UserStatus = userStatus;
+        if (nickName)
+            reqData.NickName = nickName;
+        if (phone)
+            reqData.Phone = phone;
+        if (email)
+            reqData.Email = email;
+        if (avatarUrl)
+            reqData.AvatarUrl = avatarUrl;
+        if (description)
+            reqData.Description = description;
+        return this.tcbService.request('CreateUser', reqData);
+    }
+    async describeUserList(options = {}) {
+        const { EnvId } = this.environment.lazyEnvironmentConfig;
+        const { pageNo = 1, pageSize = 20, name, nickName, phone, email } = options;
+        if (!Number.isInteger(pageNo) || pageNo < 1) {
+            throw new Error('Invalid pageNo');
+        }
+        if (!Number.isInteger(pageSize) || pageSize < 1 || pageSize > 100) {
+            throw new Error('Invalid pageSize');
+        }
+        const reqData = {
+            EnvId,
+            PageNo: pageNo,
+            PageSize: pageSize
+        };
+        if (this.isValidStr(name))
+            reqData.Name = name;
+        if (this.isValidStr(nickName))
+            reqData.NickName = nickName;
+        if (this.isValidStr(phone))
+            reqData.Phone = phone;
+        if (this.isValidStr(email))
+            reqData.Email = email;
+        return this.tcbService.request('DescribeUserList', reqData);
+    }
+    async modifyUser(options) {
+        const { EnvId } = this.environment.lazyEnvironmentConfig;
+        const { uid, name, type, password, userStatus, nickName, phone, email, avatarUrl, description } = options;
+        if (!this.isValidStr(uid) || uid.length > 64) {
+            throw new Error('Invalid uid');
+        }
+        // Name: 不传或空字符串 => 不修改；传了非空则校验
+        if (name !== undefined && name !== '' && !/^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/.test(name)) {
+            throw new Error('Invalid name');
+        }
+        // Type / UserStatus: 不传或空字符串 => 不修改；非空时白名单校验
+        if (type !== undefined && !['internalUser', 'externalUser'].includes(type)) {
+            throw new Error('Invalid type');
+        }
+        if (userStatus !== undefined && !['ACTIVE', 'BLOCKED'].includes(userStatus)) {
+            throw new Error('Invalid userStatus');
+        }
+        // Password: 不传或空字符串 => 不修改；非空时校验复杂度
+        if (password !== undefined && password !== '') {
+            if (password.length < 8 || password.length > 32) {
+                throw new Error('Invalid password length');
+            }
+            if (!/^[A-Za-z0-9]/.test(password)) {
+                throw new Error('Password cannot start with special character');
+            }
+            const kinds = [
+                /[a-z]/.test(password),
+                /[A-Z]/.test(password),
+                /[0-9]/.test(password),
+                /[()!@#$%^&*|?><_-]/.test(password)
+            ].filter(Boolean).length;
+            if (kinds < 3) {
+                throw new Error('Password must include at least 3 character categories');
+            }
+        }
+        // 这些字段：不传 => 不修改；传空字符串 => 清空（允许）
+        if (nickName !== undefined && nickName !== '' && (nickName.length < 2 || nickName.length > 64)) {
+            throw new Error('Invalid nickName');
+        }
+        if (phone !== undefined && phone !== '' && !/^1\d{10}$/.test(phone)) {
+            throw new Error('Invalid phone');
+        }
+        if (email !== undefined && email !== '' && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
+            throw new Error('Invalid email');
+        }
+        if (description !== undefined && description !== '' && description.length > 200) {
+            throw new Error('Invalid description');
+        }
+        const reqData = {
+            EnvId,
+            Uid: uid
+        };
+        // Name/Type/Password/UserStatus：空字符串视为不修改
+        if (name !== undefined && name !== '')
+            reqData.Name = name;
+        if (type !== undefined)
+            reqData.Type = type;
+        if (password !== undefined && password !== '')
+            reqData.Password = password;
+        if (userStatus !== undefined)
+            reqData.UserStatus = userStatus;
+        // 这些字段支持传空字符串清空：只要“传了”就下发
+        if (Object.prototype.hasOwnProperty.call(options, 'nickName'))
+            reqData.NickName = nickName;
+        if (Object.prototype.hasOwnProperty.call(options, 'phone'))
+            reqData.Phone = phone;
+        if (Object.prototype.hasOwnProperty.call(options, 'email'))
+            reqData.Email = email;
+        if (Object.prototype.hasOwnProperty.call(options, 'avatarUrl'))
+            reqData.AvatarUrl = avatarUrl;
+        if (Object.prototype.hasOwnProperty.call(options, 'description'))
+            reqData.Description = description;
+        return this.tcbService.request('ModifyUser', reqData);
+    }
+    async deleteUsers(options) {
+        const { EnvId } = this.environment.lazyEnvironmentConfig;
+        const { uids } = options;
+        if (!Array.isArray(uids) || uids.length === 0) {
+            throw new Error('uids is required');
+        }
+        if (uids.length > 100) {
+            throw new Error('uids length must be <= 100');
+        }
+        const invalidUid = uids.find(uid => !this.isValidStr(uid));
+        if (invalidUid) {
+            throw new Error('Invalid uid in uids');
+        }
+        return this.tcbService.request('DeleteUsers', {
+            EnvId,
+            Uids: uids
+        });
+    }
     isValidStr(obj) {
         return typeof obj === 'string' && obj.trim().length > 0;
     }
@@ -137,3 +325,15 @@ __decorate([
 __decorate([
     (0, utils_1.preLazy)()
 ], UserService.prototype, "updateEndUser", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], UserService.prototype, "createUser", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], UserService.prototype, "describeUserList", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], UserService.prototype, "modifyUser", null);
+__decorate([
+    (0, utils_1.preLazy)()
+], UserService.prototype, "deleteUsers", null);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "4.11.0-alpha.4",
+    "version": "4.11.0-alpha.6",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {

package/types/function/index.d.ts

@@ -277,9 +277,9 @@ export declare class FunctionService {
      * @param {string} qualifier 需要删除的版本号，不填默认删除函数下全部版本。
      * @returns {Promise<IResponseInfo>}
      */
-    deleteFunction({ name }: {
-        name: any;
-    }): Promise<void>;
+    deleteFunction(name: string | {
+        name: string;
+    }): Promise<IResponseInfo>;
     /**
      * 批量删除云函数
      * @param {Object} options
@@ -404,7 +404,7 @@ export declare class FunctionService {
      * @param {string} triggerName 云函数触发器名称
      * @returns {Promise<IResponseInfo>}
      */
-    deleteFunctionTrigger(name: string, triggerName: string): Promise<void>;
+    deleteFunctionTrigger(name: string, triggerName: string): Promise<IResponseInfo>;
     batchDeleteTriggers(options: IFunctionBatchOptions): Promise<void>;
     /**
      * 下载云函数代码

package/types/user/index.d.ts

@@ -1,5 +1,5 @@
 import { Environment } from '../environment';
-import { EndUserInfo, EndUserStatus } from './types';
+import { EndUserInfo, EndUserStatus, CreateUserOptions, CreateUserResp, DescribeUserListOptions, DescribeUserListResp, ModifyUserOptions, ModifyUserResp, DeleteUsersOptions, DeleteUsersResp } from './types';
 export declare class UserService {
     private environment;
     private tcbService;
@@ -54,5 +54,21 @@ export declare class UserService {
         WxAppId: string;
         Channel: "ide" | "low_code";
     }>;
+    createUser(options: CreateUserOptions): Promise<{
+        Data: CreateUserResp;
+        RequestId: string;
+    }>;
+    describeUserList(options?: DescribeUserListOptions): Promise<{
+        Data: DescribeUserListResp;
+        RequestId: string;
+    }>;
+    modifyUser(options: ModifyUserOptions): Promise<{
+        Data: ModifyUserResp | null;
+        RequestId: string;
+    }>;
+    deleteUsers(options: DeleteUsersOptions): Promise<{
+        Data: DeleteUsersResp;
+        RequestId: string;
+    }>;
     private isValidStr;
 }

package/types/user/types.d.ts

@@ -18,3 +18,65 @@ export interface EndUserInfo {
     UserName: string;
 }
 export type EndUserStatus = 'ENABLE' | 'DISABLE';
+export type TcbUserType = 'internalUser' | 'externalUser';
+export type TcbUserStatus = 'ACTIVE' | 'BLOCKED';
+export interface CreateUserOptions {
+    name: string;
+    uid?: string;
+    type?: TcbUserType;
+    password?: string;
+    userStatus?: TcbUserStatus;
+    nickName?: string;
+    phone?: string;
+    email?: string;
+    avatarUrl?: string;
+    description?: string;
+}
+export interface CreateUserResp {
+    Uid: string;
+}
+export interface DescribeUserListOptions {
+    pageNo?: number;
+    pageSize?: number;
+    name?: string;
+    nickName?: string;
+    phone?: string;
+    email?: string;
+}
+export interface TcbUserItem {
+    Uid?: string;
+    Name?: string;
+    Type?: 'internalUser' | 'externalUser';
+    UserStatus?: 'ACTIVE' | 'BLOCKED';
+    NickName?: string;
+    Phone?: string;
+    Email?: string;
+    AvatarUrl?: string;
+    Description?: string;
+}
+export interface DescribeUserListResp {
+    Total: number;
+    UserList: TcbUserItem[];
+}
+export interface ModifyUserOptions {
+    uid: string;
+    name?: string;
+    type?: TcbUserType;
+    password?: string;
+    userStatus?: TcbUserStatus;
+    nickName?: string;
+    phone?: string;
+    email?: string;
+    avatarUrl?: string;
+    description?: string;
+}
+export interface ModifyUserResp {
+    Success: boolean;
+}
+export interface DeleteUsersOptions {
+    uids: string[];
+}
+export interface DeleteUsersResp {
+    SuccessCount: number;
+    FailedCount: number;
+}