修复依赖安装状态流转

This commit is contained in:
whyour 2023-05-31 15:07:40 +08:00
parent a7f97bd729
commit f305d45225
3 changed files with 9 additions and 14 deletions

View File

@ -15,7 +15,7 @@ export class Dependence {
this.status =
typeof options.status === 'number' && DependenceStatus[options.status]
? options.status
: DependenceStatus.installing;
: DependenceStatus.queued;
this.type = options.type || DependenceTypes.nodejs;
this.timestamp = new Date().toString();
this.name = options.name;

View File

@ -26,13 +26,6 @@ export interface AppToken {
export type AppScope = 'envs' | 'crons' | 'configs' | 'scripts' | 'logs';
export enum CrontabStatus {
'running',
'idle',
'disabled',
'queued',
}
interface AppInstance extends Model<App, App>, App {}
export const AppModel = sequelize.define<AppInstance>('App', {
name: { type: DataTypes.STRING, unique: 'name' },

View File

@ -105,11 +105,7 @@ export default class DependenceService {
isInstall: boolean = true,
force: boolean = false,
) {
docs.forEach(async (dep) => {
const status = isInstall
? DependenceStatus.installing
: DependenceStatus.removing;
await DependenceModel.update({ status }, { where: { id: dep.id } });
docs.forEach((dep) => {
this.installOrUninstallDependencies(
[dep],
isInstall,
@ -161,6 +157,13 @@ export default class DependenceService {
resolve(null);
return;
}
const depIds = dependencies.map((x) => x.id) as number[];
const status = isInstall
? DependenceStatus.installing
: DependenceStatus.removing;
await DependenceModel.update({ status }, { where: { id: depIds } });
const socketMessageType = !force
? 'installDependence'
: 'uninstallDependence';
@ -171,7 +174,6 @@ export default class DependenceService {
: unInstallDependenceCommandTypes
)[dependencies[0].type as any];
const actionText = isInstall ? '安装' : '删除';
const depIds = dependencies.map((x) => x.id) as number[];
const startTime = dayjs();
const message = `开始${actionText}依赖 ${depNames},开始时间 ${startTime.format(