@lark-apaas/miaoda-cli 0.1.46 → 0.1.47

package/dist/services/app/init/async-install.js

@@ -10,6 +10,7 @@ const node_child_process_1 = require("node:child_process");
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const env_1 = require("../../../utils/env");
+const engineering_state_1 = require("../../../utils/engineering-state");
 const install_1 = require("./install");
 /**
  * event marker 目录，写死 `/tmp/event`；写前 mkdir -p。沙箱里 code server 轮询此目录，
@@ -61,6 +62,7 @@ function runAsyncInstallWorker(opts) {
     }
     catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
+        recordInstallState(opts.targetDir, msg);
         if (sandbox) {
             writeMarker(eventDir, MARKER_FAILED, {
                 ts: nowIso(),
@@ -70,6 +72,7 @@ function runAsyncInstallWorker(opts) {
         }
         return;
     }
+    recordInstallState(opts.targetDir, result.source === 'failed' ? (result.error ?? 'npm install failed') : undefined);
     if (!sandbox)
         return;
     if (result.source === 'failed') {
@@ -87,6 +90,24 @@ function runAsyncInstallWorker(opts) {
         });
     }
 }
+/**
+ * 本地执行记录：init --strict 据此区分"后台安装成功 / 失败 / 仍在进行或被中断"。
+ * 中断（worker 没跑完）时记录停在 dispatch 写下的 running，不会被当成成功。
+ */
+function recordInstallState(targetDir, error) {
+    try {
+        (0, engineering_state_1.writeEngineeringState)(targetDir, {
+            operation: 'init',
+            status: error === undefined ? 'succeeded' : 'failed',
+            stage: 'install',
+            code: error === undefined ? undefined : 'INIT_INSTALL_FAILED',
+            message: error?.slice(0, 500),
+        });
+    }
+    catch {
+        // 执行记录写不了不影响安装结果与 marker
+    }
+}
 /**
  * 派发 detached 后台进程跑依赖安装并立即返回。
  * 用 `node -e` 直接 require 本模块（编译产物）调 runAsyncInstallWorker，

package/dist/services/app/init/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ASYNC_INSTALL_LOG = exports.runAsyncInstallWorker = exports.dispatchAsyncInstall = exports.resolveNpmInstallRegistry = exports.installDependencies = exports.writeSparkMeta = exports.readSparkMeta = exports.IMPORT_SKIP_FILES = exports.IMPORT_SKIP_DIRS = exports.importSourceSrc = exports.TEMPLATE_PACKAGE_BY_STACK = exports.STACK_BY_APP_TYPE = exports.APP_TYPES = exports.LOCAL_STEERING_STACKS = exports.SUPPORTED_STACKS = exports.resolveStack = exports.renderTemplate = void 0;
+exports.checkWorkspaceReady = exports.ASYNC_INSTALL_LOG = exports.runAsyncInstallWorker = exports.dispatchAsyncInstall = exports.resolveNpmInstallRegistry = exports.installDependencies = exports.writeSparkMeta = exports.readSparkMeta = exports.IMPORT_SKIP_FILES = exports.IMPORT_SKIP_DIRS = exports.importSourceSrc = exports.TEMPLATE_PACKAGE_BY_STACK = exports.STACK_BY_APP_TYPE = exports.APP_TYPES = exports.LOCAL_STEERING_STACKS = exports.SUPPORTED_STACKS = exports.resolveStack = exports.renderTemplate = void 0;
 var template_1 = require("./template");
 Object.defineProperty(exports, "renderTemplate", { enumerable: true, get: function () { return template_1.renderTemplate; } });
 Object.defineProperty(exports, "resolveStack", { enumerable: true, get: function () { return template_1.resolveStack; } });
@@ -23,3 +23,5 @@ var async_install_1 = require("./async-install");
 Object.defineProperty(exports, "dispatchAsyncInstall", { enumerable: true, get: function () { return async_install_1.dispatchAsyncInstall; } });
 Object.defineProperty(exports, "runAsyncInstallWorker", { enumerable: true, get: function () { return async_install_1.runAsyncInstallWorker; } });
 Object.defineProperty(exports, "ASYNC_INSTALL_LOG", { enumerable: true, get: function () { return async_install_1.ASYNC_INSTALL_LOG; } });
+var workspace_check_1 = require("./workspace-check");
+Object.defineProperty(exports, "checkWorkspaceReady", { enumerable: true, get: function () { return workspace_check_1.checkWorkspaceReady; } });

package/dist/services/app/init/workspace-check.js

@@ -0,0 +1,105 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkWorkspaceReady = checkWorkspaceReady;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const fullstack_managed_files_1 = require("../../../config/fullstack-managed-files");
+const engineering_state_1 = require("../../../utils/engineering-state");
+const error_1 = require("../../../utils/error");
+const spark_meta_1 = require("../../../utils/spark-meta");
+const detect_1 = require("../../../services/app/migrate/detect");
+/** 各 stack 的必要文件（相对项目根） */
+const REQUIRED_FILES_BY_STACK = {
+    'nestjs-react-fullstack': [
+        'package.json',
+        'server/main.ts',
+        'server/app.module.ts',
+        'client/index.html',
+        'vite.config.ts',
+        'nest-cli.json',
+        'tsconfig.node.json',
+        ...fullstack_managed_files_1.FULLSTACK_MANAGED_SCRIPT_FILES,
+    ],
+    'vite-react': ['package.json', 'index.html', 'vite.config.ts'],
+};
+function hasDeclaredDeps(pkgPath) {
+    try {
+        const pkg = JSON.parse(node_fs_1.default.readFileSync(pkgPath, 'utf-8'));
+        return (Object.keys(pkg.dependencies ?? {}).length + Object.keys(pkg.devDependencies ?? {}).length > 0);
+    }
+    catch {
+        return true;
+    }
+}
+function nodeModulesPopulated(targetDir) {
+    const nm = node_path_1.default.join(targetDir, 'node_modules');
+    try {
+        return node_fs_1.default.readdirSync(nm).some((name) => !name.startsWith('.'));
+    }
+    catch {
+        return false;
+    }
+}
+function checkWorkspaceReady(opts) {
+    const { targetDir } = opts;
+    const problems = [];
+    let stack;
+    try {
+        const meta = (0, spark_meta_1.readSparkMetaStrict)(targetDir);
+        stack = meta?.stack !== undefined && meta.stack !== '' ? meta.stack : undefined;
+        if (stack === undefined) {
+            problems.push({
+                code: 'META_INCOMPLETE',
+                message: '.spark/meta.json missing stack',
+                path: '.spark/meta.json',
+            });
+        }
+    }
+    catch (err) {
+        problems.push({
+            code: err instanceof error_1.AppError ? err.code : 'SPARK_META_CORRUPT',
+            message: err instanceof Error ? err.message : String(err),
+            path: '.spark/meta.json',
+        });
+        return { ready: false, problems };
+    }
+    if (opts.expectedStack !== undefined && stack !== undefined && stack !== opts.expectedStack) {
+        problems.push({
+            code: 'STACK_MISMATCH',
+            message: `project stack '${stack}' differs from requested '${opts.expectedStack}'`,
+        });
+    }
+    if (stack !== undefined) {
+        const detected = (0, detect_1.detectDiskStack)(targetDir);
+        if (detected !== 'unknown' && detected !== stack) {
+            problems.push({
+                code: 'LAYOUT_MISMATCH',
+                message: `.spark/meta.json says '${stack}' but project layout on disk is '${detected}'; run \`miaoda app migrate --to ${stack}\``,
+            });
+        }
+        for (const rel of REQUIRED_FILES_BY_STACK[stack] ?? ['package.json']) {
+            if (!node_fs_1.default.existsSync(node_path_1.default.join(targetDir, rel))) {
+                problems.push({ code: 'REQUIRED_FILE_MISSING', message: `${rel} not found`, path: rel });
+            }
+        }
+    }
+    const pkgPath = node_path_1.default.join(targetDir, 'package.json');
+    if (node_fs_1.default.existsSync(pkgPath) && hasDeclaredDeps(pkgPath) && !nodeModulesPopulated(targetDir)) {
+        problems.push({
+            code: 'DEPS_NOT_INSTALLED',
+            message: 'node_modules missing or empty; run `miaoda app sync` to install dependencies',
+            path: 'node_modules',
+        });
+    }
+    const state = (0, engineering_state_1.readEngineeringState)(targetDir);
+    if (state !== undefined && state.status !== 'succeeded') {
+        problems.push({
+            code: state.status === 'running' ? 'LAST_OPERATION_UNFINISHED' : 'LAST_OPERATION_FAILED',
+            message: `last ${state.operation} ${state.status} at stage '${state.stage}'${state.code !== undefined ? ` (${state.code})` : ''}`,
+        });
+    }
+    return { ready: problems.length === 0, stack, problems };
+}

package/dist/services/app/migrate/detect.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectDiskStack = detectDiskStack;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const VITE_CONFIG_FILES = [
+    'vite.config.ts',
+    'vite.config.js',
+    'vite.config.mjs',
+    'vite.config.mts',
+    'vite.config.cjs',
+];
+function isDir(p) {
+    try {
+        return node_fs_1.default.statSync(p).isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
+function detectDiskStack(dir) {
+    const has = (rel) => node_fs_1.default.existsSync(node_path_1.default.join(dir, rel));
+    const hasViteConfig = VITE_CONFIG_FILES.some(has);
+    const legacyLayout = isDir(node_path_1.default.join(dir, 'src')) || has('index.html');
+    if (hasViteConfig && legacyLayout)
+        return 'vite-react';
+    const fullstackLayout = has('server/main.ts') && (isDir(node_path_1.default.join(dir, 'client', 'src')) || has('client/index.html'));
+    if (fullstackLayout)
+        return 'nestjs-react-fullstack';
+    return 'unknown';
+}

package/dist/services/app/migrate/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectDiskStack = exports.MIGRATION_PURPOSES = exports.runMigration = void 0;
+var run_1 = require("./run");
+Object.defineProperty(exports, "runMigration", { enumerable: true, get: function () { return run_1.runMigration; } });
+Object.defineProperty(exports, "MIGRATION_PURPOSES", { enumerable: true, get: function () { return run_1.MIGRATION_PURPOSES; } });
+var detect_1 = require("./detect");
+Object.defineProperty(exports, "detectDiskStack", { enumerable: true, get: function () { return detect_1.detectDiskStack; } });

package/dist/services/app/migrate/restart.js

@@ -0,0 +1,59 @@
+"use strict";
+/**
+ * 沙箱内重启被转换工程的 dev 进程：向 `node …scripts/dev.js` 主进程发 SIGTERM，由平台
+ * supervisor 重新 exec dev.sh → dev.js 加载新脚本与依赖。这只是重启信号，新进程是否健康由
+ * 调用方核验。
+ *
+ * 只认工作目录等于被转换目录的进程：dev.js 启动即 chdir 到自己所在的工程根，cwd 唯一对应它
+ * 服务的工程。按命令行全局匹配会连带杀掉同一沙箱里其他目录的预览进程（例如在工程副本里执行
+ * migrate 时，真实应用的预览也被重启）。.spark/meta.json 的 app_id 区分不了副本与原工程，沙箱
+ * 也没有所有调用方都会设置的工作区路径环境变量，所以都不用来判定。
+ *
+ * 读 /proc 是 Linux-only：只在沙箱（恒为 Linux）调用；/proc 不可读时视为没有可重启的进程。
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.signalDevRestart = signalDevRestart;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+const DEV_PROCESS_RE = /node.*scripts\/dev\.js/;
+/** 返回已发出重启信号的进程号；没有命中返回空数组 */
+function signalDevRestart(projectDir, deps = {}) {
+    const procRoot = deps.procRoot ?? '/proc';
+    const kill = deps.kill ??
+        ((pid) => {
+            process.kill(pid, 'SIGTERM');
+        });
+    let project;
+    let entries;
+    try {
+        project = node_fs_1.default.realpathSync(projectDir);
+        entries = node_fs_1.default.readdirSync(procRoot);
+    }
+    catch {
+        return [];
+    }
+    const signaled = [];
+    for (const entry of entries) {
+        if (!/^\d+$/.test(entry) || Number(entry) === process.pid)
+            continue;
+        try {
+            const cmdline = node_fs_1.default
+                .readFileSync(node_path_1.default.join(procRoot, entry, 'cmdline'), 'utf-8')
+                .replaceAll('\0', ' ');
+            if (!DEV_PROCESS_RE.test(cmdline))
+                continue;
+            // 内核给出的 cwd 已是解析过符号链接的绝对路径
+            if (node_fs_1.default.readlinkSync(node_path_1.default.join(procRoot, entry, 'cwd')) !== project)
+                continue;
+            kill(Number(entry));
+            signaled.push(Number(entry));
+        }
+        catch {
+            // 进程已退出或无权读取：不是本工程可重启的进程
+        }
+    }
+    return signaled;
+}