重构 格式化代码

Author: yumao233

src/entity/commands/docker/docker _start.ts

@@ -81,8 +81,7 @@ export class DockerProcessAdapter extends EventEmitter implements IInstanceProce
   public async destroy() {
     try {
       await this.container.remove();
-    } catch (error) {
-    }
+    } catch (error) {}
   }
 
   private wait() {
@@ -99,10 +98,8 @@ export default class DockerStartCommand extends InstanceCommand {
   }
 
   async exec(instance: Instance, source = "Unknown") {
-    if (!instance.config.startCommand || !instance.config.cwd || !instance.config.ie || !instance.config.oe)
-      return instance.failure(new StartupDockerProcessError("启动命令，输入输出编码或工作目录为空值"));
-    if (!fs.existsSync(instance.absoluteCwdPath()))
-      return instance.failure(new StartupDockerProcessError("工作目录并不存在"));
+    if (!instance.config.startCommand || !instance.config.cwd || !instance.config.ie || !instance.config.oe) return instance.failure(new StartupDockerProcessError("启动命令，输入输出编码或工作目录为空值"));
+    if (!fs.existsSync(instance.absoluteCwdPath())) return instance.failure(new StartupDockerProcessError("工作目录并不存在"));
 
     try {
       // 锁死实例
@@ -145,23 +142,25 @@ export default class DockerStartCommand extends InstanceCommand {
       // 解析额外路径挂载
       const extraVolumes = instance.config.docker.extraVolumes;
       const extraBinds = [];
-      for (let it of extraVolumes) {
-        if (!it) continue;
-        const element = it.split(":");
-        if (element.length != 2) continue;
-        let [hostPath, containerPath] = element;
+      if (extraVolumes) {
+        for (let it of extraVolumes) {
+          if (!it) continue;
+          const element = it.split(":");
+          if (element.length != 2) continue;
+          let [hostPath, containerPath] = element;
 
-        if (path.isAbsolute(containerPath)) {
-          containerPath = path.normalize(containerPath);
-        } else {
-          containerPath = path.normalize(path.join("/workspace/", containerPath));
-        }
-        if (path.isAbsolute(hostPath)) {
-          hostPath = path.normalize(hostPath);
-        } else {
-          hostPath = path.normalize(path.join(process.cwd(), hostPath));
+          if (path.isAbsolute(containerPath)) {
+            containerPath = path.normalize(containerPath);
+          } else {
+            containerPath = path.normalize(path.join("/workspace/", containerPath));
+          }
+          if (path.isAbsolute(hostPath)) {
+            hostPath = path.normalize(hostPath);
+          } else {
+            hostPath = path.normalize(path.join(process.cwd(), hostPath));
+          }
+          extraBinds.push(`${hostPath}:${containerPath}`);
         }
-        extraBinds.push(`${hostPath}:${containerPath}`);
       }
 
       // 内存限制
@@ -202,8 +201,7 @@ export default class DockerStartCommand extends InstanceCommand {
       logger.info(`工作目录: ${cwd}`);
       logger.info(`网络模式: ${instance.config.docker.networkMode}`);
       logger.info(`端口映射: ${JSON.stringify(publicPortArray)}`);
-      if(extraBinds.length > 0)
-        logger.info(`额外挂载: ${JSON.stringify(extraBinds)}`);
+      if (extraBinds.length > 0) logger.info(`额外挂载: ${JSON.stringify(extraBinds)}`);
       logger.info(`网络别名: ${JSON.stringify(instance.config.docker.networkAliases)}`);
       if (maxMemory) logger.info(`内存限制: ${maxMemory} MB`);
       logger.info(`类型: Docker 容器`);
@@ -237,7 +235,7 @@ export default class DockerStartCommand extends InstanceCommand {
         NetworkingConfig: {
           EndpointsConfig: {
             [instance.config.docker.networkMode]: {
-              "Aliases": instance.config.docker.networkAliases
+              Aliases: instance.config.docker.networkAliases
             }
           }
         }

src/service/system_instance.ts

@@ -78,10 +78,8 @@ class InstanceSubsystem extends EventEmitter {
       // 所有实例全部进行功能调度器
       instance
         .forceExec(new FuntionDispatcher())
-        .then((v) => {
-        })
-        .catch((v) => {
-        });
+        .then((v) => {})
+        .catch((v) => {});
       this.addInstance(instance);
     });
     // 处理自动启动
@@ -161,8 +159,7 @@ class InstanceSubsystem extends EventEmitter {
       // 删除计划任务
       InstanceControl.deleteInstanceAllTask(instanceUuid);
       // 异步删除文件
-      if (deleteFile) fs.remove(instance.config.cwd, (err) => {
-      });
+      if (deleteFile) fs.remove(instance.config.cwd, (err) => {});
       return true;
     }
     throw new Error("Instance does not exist");
@@ -171,15 +168,13 @@ class InstanceSubsystem extends EventEmitter {
   forward(targetInstanceUuid: string, socket: Socket) {
     try {
       this.instanceStream.requestForward(socket, targetInstanceUuid);
-    } catch (err) {
-    }
+    } catch (err) {}
   }
 
   stopForward(targetInstanceUuid: string, socket: Socket) {
     try {
       this.instanceStream.cannelForward(socket, targetInstanceUuid);
-    } catch (err) {
-    }
+    } catch (err) {}
   }
 
   forEachForward(instanceUuid: string, callback: (socket: Socket) => void) {
@@ -206,10 +201,12 @@ class InstanceSubsystem extends EventEmitter {
       const instance = iterator[1];
       if (instance.status() != Instance.STATUS_STOP) {
         logger.info(`Instance ${instance.config.nickname} (${instance.instanceUuid}) is running or busy, and is being forced to end.`);
-        promises.push(instance.execCommand(new KillCommand()).then(() => {
-          StorageSubsystem.store("InstanceConfig", instance.instanceUuid, instance.config);
-          logger.info(`Instance ${instance.config.nickname} (${instance.instanceUuid}) saved successfully.`);
-        }));
+        promises.push(
+          instance.execCommand(new KillCommand()).then(() => {
+            StorageSubsystem.store("InstanceConfig", instance.instanceUuid, instance.config);
+            logger.info(`Instance ${instance.config.nickname} (${instance.instanceUuid}) saved successfully.`);
+          })
+        );
       }
     }
     await Promise.all(promises);