缓存 node 和 python 依赖

back/config/const.ts

@@ -23,3 +23,5 @@ export const SAMPLE_FILES = [
     target: 'data/scripts/notify.py',
   },
 ];
+
+export const PYTHON_INSTALL_DIR = process.env.PYTHON_HOME;

back/config/util.ts

@@ -8,9 +8,10 @@ import psTreeFun from 'pstree.remy';
 import { promisify } from 'util';
 import { load } from 'js-yaml';
 import config from './index';
-import { TASK_COMMAND } from './const';
+import { PYTHON_INSTALL_DIR, TASK_COMMAND } from './const';
 import Logger from '../loaders/logger';
 import { writeFileWithLock } from '../shared/utils';
+import { DependenceTypes } from '../data/dependence';
 
 export * from './share';
 
@@ -558,3 +559,34 @@ export async function setSystemTimezone(timezone: string): Promise<boolean> {
     return false;
   }
 }
+
+export function getInstallCommand(type: DependenceTypes, name: string): string {
+  const baseCommands = {
+    [DependenceTypes.nodejs]: 'pnpm add -g',
+    [DependenceTypes.python3]:
+      'pip3 install --disable-pip-version-check --root-user-action=ignore',
+    [DependenceTypes.linux]: 'apk add --no-check-certificate',
+  };
+
+  let command = baseCommands[type];
+
+  if (type === DependenceTypes.python3 && PYTHON_INSTALL_DIR) {
+    command = `${command} --prefix=${PYTHON_INSTALL_DIR}`;
+  }
+
+  return `${command} ${name.trim()}`;
+}
+
+export function getUninstallCommand(
+  type: DependenceTypes,
+  name: string,
+): string {
+  const baseCommands = {
+    [DependenceTypes.nodejs]: 'pnpm remove -g',
+    [DependenceTypes.python3]:
+      'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
+    [DependenceTypes.linux]: 'apk del',
+  };
+
+  return `${baseCommands[type]} ${name.trim()}`;
+}

back/data/dependence.ts

@@ -41,12 +41,6 @@ export enum DependenceTypes {
   'linux',
 }
 
-export enum InstallDependenceCommandTypes {
-  'pnpm add -g',
-  'pip3 install --disable-pip-version-check --root-user-action=ignore',
-  'apk add --no-check-certificate',
-}
-
 export enum GetDependenceCommandTypes {
   'pnpm ls -g ',
   'pip3 show --disable-pip-version-check',
@@ -59,12 +53,6 @@ export enum versionDependenceCommandTypes {
   '=',
 }
 
-export enum unInstallDependenceCommandTypes {
-  'pnpm remove -g',
-  'pip3 uninstall --disable-pip-version-check --root-user-action=ignore -y',
-  'apk del',
-}
-
 export interface DependenceInstance
   extends Model<Dependence, Dependence>,
     Dependence {}

back/services/dependence.ts

@@ -3,10 +3,8 @@ import winston from 'winston';
 import config from '../config';
 import {
   Dependence,
-  InstallDependenceCommandTypes,
   DependenceStatus,
   DependenceTypes,
-  unInstallDependenceCommandTypes,
   DependenceModel,
   GetDependenceCommandTypes,
   versionDependenceCommandTypes,
@@ -19,6 +17,8 @@ import {
   getPid,
   killTask,
   promiseExecSuccess,
+  getInstallCommand,
+  getUninstallCommand,
 } from '../config/util';
 import dayjs from 'dayjs';
 import taskLimit from '../shared/pLimit';
@@ -153,8 +153,8 @@ export default class DependenceService {
     const docs = await DependenceModel.findAll({ where: { id: ids } });
     for (const doc of docs) {
       taskLimit.removeQueuedDependency(doc);
-      const depInstallCommand = InstallDependenceCommandTypes[doc.type];
-      const depUnInstallCommand = unInstallDependenceCommandTypes[doc.type];
+      const depInstallCommand = getInstallCommand(doc.type, doc.name);
+      const depUnInstallCommand = getUninstallCommand(doc.type, doc.name);
       const installCmd = `${depInstallCommand} ${doc.name.trim()}`;
       const unInstallCmd = `${depUnInstallCommand} ${doc.name.trim()}`;
       const pids = await Promise.all([
@@ -226,11 +226,9 @@ export default class DependenceService {
           ? 'installDependence'
           : 'uninstallDependence';
         let depName = dependency.name.trim();
-        const depRunCommand = (
-          isInstall
-            ? InstallDependenceCommandTypes
-            : unInstallDependenceCommandTypes
-        )[dependency.type];
+        const command = isInstall
+          ? getInstallCommand(dependency.type, depName)
+          : getUninstallCommand(dependency.type, depName);
         const actionText = isInstall ? '安装' : '删除';
         const startTime = dayjs();
 
@@ -304,12 +302,9 @@ export default class DependenceService {
         const proxyStr = dependenceProxyFileExist
           ? `source ${config.dependenceProxyFile} &&`
           : '';
-        const cp = spawn(
-          `${proxyStr} ${depRunCommand} ${dependency.name.trim()}`,
-          {
-            shell: '/bin/bash',
-          },
-        );
+        const cp = spawn(`${proxyStr} ${command}`, {
+          shell: '/bin/bash',
+        });
 
         cp.stdout.on('data', async (data) => {
           this.sockService.sendMessage({