alemonjs 2.1.89 → 2.1.91

package/bin/README.md

@@ -105,17 +105,24 @@ alemonc version update
 ```sh
 alemonc publish
 alemonc publish patch
+alemonc publish prepatch --preid beta
+alemonc publish v1.0.33-rc.0
 alemonc publish --dry-run
 ```
 
 行为说明：
 
 - 默认会查询 git tag 历史作为版本基线
+- 版本格式严格为：
+  - 正式版：`v1.0.33`
+  - 预发布版：`v1.0.33-alpha.0`、`v1.0.33-beta.0`、`v1.0.33-rc.0`、`v1.0.33-next.0`
+- `package.json.version` 保存为不带 `v` 的形式，如 `1.0.33`、`1.0.33-beta.0`
 - 不传参数时：
   - 如果本地版本高于最新 tag，直接发布本地版本
   - 否则自动按最新 tag `patch +1`
 - 传 `patch/minor/major/prepatch/preminor/premajor/prerelease` 时会自动递增
-- 传具体版本号时会直接以该版本发布
+- 传具体版本号时可写 `v1.0.33` 或 `1.0.33`
+- `--preid` 仅允许 `alpha`、`beta`、`rc`、`next`
 - 默认先执行 `npm run build`
 - 默认发布内容是 `lib/`、`package.json`、`README.md`
 - 如果项目配置了 `.npmignore` 或 `package.json.files`，则切换为 npm 文件选择规则

package/bin/alemonc.js

@@ -78,8 +78,7 @@ program
 program
   .command('publish [release]')
   .description('智能发布当前包到 git release 仓库，支持 patch/minor/major 或直接指定版本号')
-  .option('--tag <tag>', 'git 标签通道，默认 stable 为 latest，预发布为 next')
-  .option('--preid <preid>', '预发布标识，默认 beta', 'beta')
+  .option('--preid <preid>', '预发布标识，仅允许 alpha/beta/rc/next', 'beta')
   .option('--branch <branch>', '发布目标分支，默认 release')
   .option('--dry-run', '只执行检查和打包，不真正发布')
   .option('--skip-build', '跳过构建')

package/bin/publish.js

@@ -5,7 +5,9 @@ import os from 'os';
 import { execSync, spawnSync } from 'child_process';
 
 const RELEASE_TYPES = new Set(['patch', 'minor', 'major', 'prepatch', 'preminor', 'premajor', 'prerelease']);
-const SEMVER_RE = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/;
+const PRERELEASE_IDS = new Set(['alpha', 'beta', 'rc', 'next']);
+const SEMVER_RE = /^\d+\.\d+\.\d+(?:-(alpha|beta|rc|next)\.\d+)?$/;
+const TAG_RE = /^v\d+\.\d+\.\d+(?:-(alpha|beta|rc|next)\.\d+)?$/;
 const DEFAULT_PUBLISH_FILES = ['lib', 'package.json', 'README.md'];
 
 function readPackageJson() {
@@ -70,8 +72,21 @@ function ensureCleanGit() {
   }
 }
 
+function normalizeVersionInput(version) {
+  return String(version).trim().replace(/^v/, '');
+}
+
+function validatePreid(preid) {
+  const value = String(preid || 'beta').trim();
+  if (!PRERELEASE_IDS.has(value)) {
+    throw new Error(`非法预发布标识: ${value}，仅允许 alpha、beta、rc、next`);
+  }
+
+  return value;
+}
+
 function parseVersion(version) {
-  const matched = version.match(/^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/);
+  const matched = normalizeVersionInput(version).match(/^(\d+)\.(\d+)\.(\d+)(?:-((alpha|beta|rc|next)\.(\d+)))?$/);
   if (!matched) {
     throw new Error(`非法版本号: ${version}`);
   }
@@ -80,7 +95,9 @@ function parseVersion(version) {
     major: Number(matched[1]),
     minor: Number(matched[2]),
     patch: Number(matched[3]),
-    prerelease: matched[4] ?? null
+    prerelease: matched[4] ?? null,
+    prereleaseId: matched[5] ?? null,
+    prereleaseNum: matched[6] ? Number(matched[6]) : null
   };
 }
 
@@ -102,6 +119,7 @@ function compareVersions(a, b) {
 
 function incrementVersion(baseVersion, releaseType, preid = 'beta') {
   const parsed = parseVersion(baseVersion);
+  const safePreid = validatePreid(preid);
 
   if (releaseType === 'patch') {
     return `${parsed.major}.${parsed.minor}.${parsed.patch + 1}`;
@@ -116,28 +134,23 @@ function incrementVersion(baseVersion, releaseType, preid = 'beta') {
   }
 
   if (releaseType === 'prepatch') {
-    return `${parsed.major}.${parsed.minor}.${parsed.patch + 1}-${preid}.0`;
+    return `${parsed.major}.${parsed.minor}.${parsed.patch + 1}-${safePreid}.0`;
   }
 
   if (releaseType === 'preminor') {
-    return `${parsed.major}.${parsed.minor + 1}.0-${preid}.0`;
+    return `${parsed.major}.${parsed.minor + 1}.0-${safePreid}.0`;
   }
 
   if (releaseType === 'premajor') {
-    return `${parsed.major + 1}.0.0-${preid}.0`;
+    return `${parsed.major + 1}.0.0-${safePreid}.0`;
   }
 
   if (releaseType === 'prerelease') {
-    if (parsed.prerelease) {
-      const next = parsed.prerelease.match(/^(.*?)(\d+)$/);
-      if (next) {
-        return `${parsed.major}.${parsed.minor}.${parsed.patch}-${next[1]}${Number(next[2]) + 1}`;
-      }
-
-      return `${parsed.major}.${parsed.minor}.${parsed.patch}-${parsed.prerelease}.1`;
+    if (parsed.prerelease && parsed.prereleaseId === safePreid && parsed.prereleaseNum !== null) {
+      return `${parsed.major}.${parsed.minor}.${parsed.patch}-${safePreid}.${parsed.prereleaseNum + 1}`;
     }
 
-    return `${parsed.major}.${parsed.minor}.${parsed.patch + 1}-${preid}.0`;
+    return `${parsed.major}.${parsed.minor}.${parsed.patch + 1}-${safePreid}.0`;
   }
 
   throw new Error(`不支持的发布类型: ${releaseType}`);
@@ -161,8 +174,10 @@ function resolveTargetVersion(localVersion, remoteVersion, release, preid) {
     return incrementVersion(base, release, preid);
   }
 
-  if (SEMVER_RE.test(release)) {
-    return release;
+  const normalizedRelease = normalizeVersionInput(release);
+
+  if (SEMVER_RE.test(normalizedRelease)) {
+    return normalizedRelease;
   }
 
   throw new Error(`无法识别的发布参数: ${release}`);
@@ -261,6 +276,22 @@ function ensureGitRepo() {
   }
 }
 
+function getLatestReleaseVersion() {
+  const tags = getCommandOutput('git tag --list --sort=-v:refname');
+  if (!tags) {
+    return '';
+  }
+
+  for (const tag of tags.split('\n')) {
+    const value = tag.trim();
+    if (TAG_RE.test(value)) {
+      return value.slice(1);
+    }
+  }
+
+  return '';
+}
+
 function remoteBranchExists(branch) {
   const result = spawnSync('git', ['ls-remote', '--exit-code', '--heads', 'origin', branch], {
     cwd: process.cwd(),
@@ -317,7 +348,7 @@ export async function publish(release, options = {}) {
 
   const { pkgPath, pkg } = readPackageJson();
   const packageName = pkg.name;
-  const localVersion = String(pkg.version || '').trim();
+  const localVersion = normalizeVersionInput(String(pkg.version || '').trim());
 
   if (!packageName) {
     throw new Error('package.json 缺少 name');
@@ -333,7 +364,7 @@ export async function publish(release, options = {}) {
   ensureGitRepo();
 
   const releaseBranch = options.branch || 'release';
-  const remoteVersion = getCommandOutput(`git tag --list "v*" --sort=-v:refname | head -n 1`).replace(/^v/, '');
+  const remoteVersion = getLatestReleaseVersion();
   if (remoteVersion) {
     console.log(`最新 git tag: v${remoteVersion}`);
   } else {
@@ -344,9 +375,9 @@ export async function publish(release, options = {}) {
     ensureCleanGit();
   }
 
-  const targetVersion = resolveTargetVersion(localVersion, remoteVersion, release, options.preid);
-  const distTag = options.tag || (targetVersion.includes('-') ? 'next' : 'latest');
-  const gitTagName = distTag === 'latest' ? `v${targetVersion}` : `v${targetVersion}-${distTag}`;
+  const preid = validatePreid(options.preid);
+  const targetVersion = resolveTargetVersion(localVersion, remoteVersion, release, preid);
+  const gitTagName = `v${targetVersion}`;
   console.log(`目标版本: ${targetVersion}`);
   console.log(`发布分支: ${releaseBranch}`);
   console.log(`git 标签: ${gitTagName}`);
@@ -383,6 +414,10 @@ export async function publish(release, options = {}) {
     console.log(`发布文件数: ${publishFiles.length}`);
 
     if (options.dryRun) {
+      if (targetVersion !== localVersion) {
+        updateVersion(pkgPath, pkg, localVersion);
+        console.log(`已回滚 package.json 版本到 ${localVersion}`);
+      }
       console.log('dry-run 模式，不会真正推送到 git');
       return;
     }
@@ -402,8 +437,8 @@ export async function publish(release, options = {}) {
       console.log(`已推送到分支: ${releaseBranch}`);
     }
 
-    runCommand('git', ['tag', '-f', gitTagName]);
-    runCommand('git', ['push', 'origin', gitTagName, '--force']);
+    runCommand('git', ['-C', worktreeDir, 'tag', '-f', gitTagName]);
+    runCommand('git', ['-C', worktreeDir, 'push', 'origin', gitTagName, '--force']);
     console.log(`发布完成: ${packageName}@${targetVersion}`);
   } catch (error) {
     if (targetVersion !== localVersion) {

package/lib/application/runtime/cbp/connects/client.js

@@ -15,6 +15,11 @@ import { normalizeInboundMessage } from '../../../../common/cbp/normalize.js';
 import { apiRequestResolves, apiRequestTimeouts, actionRequestResolves, actionRequestTimeouts } from '../processor/request-registry.js';
 import { setDirectSend } from '../processor/transport.js';
 
+const notifyTransportReady = (transport) => {
+    if (typeof process.send === 'function') {
+        process.send({ type: 'transport_ready', protocolVersion: 'v2', transport });
+    }
+};
 const handleInboundMessage = (message) => {
     const normalized = normalizeInboundMessage(message);
     if (!normalized) {
@@ -72,6 +77,7 @@ const cbpClientDirect = (sockPath, open) => {
     })
         .then(channel => {
         setDirectSend(channel.send);
+        notifyTransportReady('direct');
         open();
         logger.debug({
             code: ResultCode.Ok,
@@ -104,6 +110,7 @@ const cbpClientIPC = (open) => {
             });
         }
     });
+    notifyTransportReady('ipc');
     open();
     logger.debug({
         code: ResultCode.Ok,
@@ -128,7 +135,10 @@ const cbpClient = (url, options = {}) => {
         extraHeaders: {
             [FULL_RECEIVE_HEADER]: isFullReceive ? '1' : '0'
         },
-        onOpen: open,
+        onOpen: () => {
+            notifyTransportReady('ws');
+            open();
+        },
         onMessage: (messageStr) => {
             try {
                 const parsedMessage = flattedJSON.parse(messageStr);

package/lib/application/runtime/client-runtime.d.ts

@@ -7,3 +7,5 @@ import './event-response.js';
 import './event-middleware.js';
 import './event-utils.js';
 import './event-group.js';
+export declare const disposeClientRuntime: () => Promise<void>;
+export declare const startClientRuntime: () => Promise<void>;

package/lib/application/runtime/client-runtime.js

@@ -28,7 +28,8 @@ import { dispatchDisposeAllApps } from './lifecycle-callbacks.js';
 
 global.__client_loaded = true;
 let runtimeDisposed = false;
-const disposeRuntime = async () => {
+let runtimeStarted = false;
+const disposeClientRuntime = async () => {
     if (runtimeDisposed) {
         return;
     }
@@ -40,11 +41,6 @@ const disposeRuntime = async () => {
         unregisterAppDir(app.name);
     });
 };
-const shutdown = async (reason) => {
-    logger.info?.(`[alemonjs][${reason}] 收到信号，正在关闭...`);
-    await disposeRuntime();
-    process.exit(0);
-};
 const mainServer = () => {
     const port = process.env.serverPort;
     if (!port) {
@@ -68,37 +64,19 @@ const main = () => {
     else {
         cbpClient(`http://127.0.0.1:${port}`, { isFullReceive });
     }
-    loadModels();
 };
-const mainProcess = () => {
-    process.on('unhandledRejection', (reason) => {
-        logger.error('[alemonjs][unhandledRejection] 未捕获的 Promise 拒绝:', reason);
-    });
-    process.on('uncaughtException', (error) => {
-        logger.error('[alemonjs][uncaughtException] 未捕获的异常:', error);
-    });
-    ['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
-        process?.on?.(sig, () => void shutdown(sig));
-    });
-    process?.on?.('exit', code => {
-        void disposeRuntime();
-        logger.info?.(`[alemonjs][exit] 进程退出，code=${code}`);
-    });
-    process.on('message', msg => {
-        try {
-            const data = typeof msg === 'string' ? JSON.parse(msg) : msg;
-            if (data?.type === 'start') {
-                main();
-                mainServer();
-            }
-            else if (data?.type === 'stop') {
-                void shutdown('stop');
-            }
-        }
-        catch { }
-    });
+const startClientRuntime = async () => {
+    if (runtimeStarted) {
+        return;
+    }
+    runtimeStarted = true;
+    runtimeDisposed = false;
+    main();
+    mainServer();
+    await loadModels();
     if (process.send) {
-        process.send({ type: 'ready' });
+        process.send({ type: 'app_ready', protocolVersion: 'v2' });
     }
 };
-mainProcess();
+
+export { disposeClientRuntime, startClientRuntime };

package/lib/application/runtime/load-modules/load.d.ts

@@ -1,2 +1,2 @@
-export declare const run: (input: string) => void;
-export declare function loadModels(): void;
+export declare const run: (input: string) => Promise<void>;
+export declare function loadModels(): Promise<void>;

package/lib/application/runtime/load-modules/load.js

@@ -13,7 +13,7 @@ const loadApps = () => {
             .filter(([, enabled]) => Boolean(enabled))
             .map(([name]) => name);
     const uniqueApps = Array.from(new Set(apps));
-    uniqueApps.forEach(app => {
+    return Promise.all(uniqueApps.map(async (app) => {
         registerRuntimeApp({
             name: app,
             kind: 'plugin',
@@ -22,10 +22,10 @@ const loadApps = () => {
             rootDir: '',
             mainPath: ''
         });
-        void loadChildrenFile(app);
-    });
+        await loadChildrenFile(app);
+    }));
 };
-const run = (input) => {
+const run = async (input) => {
     if (!input) {
         return;
     }
@@ -46,12 +46,12 @@ const run = (input) => {
         rootDir: join(process.cwd(), dirname(input)),
         mainPath
     });
-    void loadChildren(mainPath, 'main');
+    await loadChildren(mainPath, 'main');
 };
-function loadModels() {
+async function loadModels() {
     const input = process.env.input ?? '';
-    run(input);
-    loadApps();
+    await run(input);
+    await loadApps();
 }
 
 export { loadModels, run };

package/lib/application/runtime/load-modules/loadChild.d.ts

@@ -1,2 +1,2 @@
 export declare const loadChildren: (mainPath: string, appName: string) => Promise<void>;
-export declare const loadChildrenFile: (appName: string) => void;
+export declare const loadChildrenFile: (appName: string) => Promise<void>;

package/lib/application/runtime/load-modules/loadChild.js

@@ -287,7 +287,7 @@ const loadChildren = async (mainPath, appName) => {
         App.un();
     }
 };
-const loadChildrenFile = (appName) => {
+const loadChildrenFile = async (appName) => {
     if (typeof appName !== 'string') {
         logger.error({
             code: ResultCode.FailParams,
@@ -322,7 +322,7 @@ const loadChildrenFile = (appName) => {
             rootDir: dirname(mainPath),
             mainPath
         });
-        void loadChildren(mainPath, appName);
+        await loadChildren(mainPath, appName);
     }
     catch (e) {
         const packageDir = resolvePackageDir(appName);
@@ -336,7 +336,7 @@ const loadChildrenFile = (appName) => {
                 rootDir: dirname(fallbackMainPath),
                 mainPath: fallbackMainPath
             });
-            void loadChildren(fallbackMainPath, appName);
+            await loadChildren(fallbackMainPath, appName);
             return;
         }
         updateRuntimeAppStatus(appName, 'failed', e);

package/lib/client.d.ts

@@ -1 +1 @@
-import './application/runtime/client-runtime.js';
+export {};

package/lib/client.js

@@ -1 +1,91 @@
-import './application/runtime/client-runtime.js';
+import { logger } from './common/logger.js';
+
+let runtimeModulePromise = null;
+let runtimeStarted = false;
+let stopping = false;
+const notifyParent = (message) => {
+    if (typeof process.send === 'function') {
+        process.send(message);
+    }
+};
+const normalizeError = (error) => {
+    if (error instanceof Error) {
+        return {
+            message: error.message,
+            stack: error.stack
+        };
+    }
+    return {
+        message: typeof error === 'string' ? error : 'Unknown client bootstrap error'
+    };
+};
+const loadRuntimeModule = async () => {
+    runtimeModulePromise ??= import('./application/runtime/client-runtime.js');
+    return runtimeModulePromise;
+};
+const shutdown = async (reason) => {
+    if (stopping) {
+        return;
+    }
+    stopping = true;
+    logger.info?.(`[client-bootstrap][${reason}] 收到信号，正在关闭...`);
+    try {
+        const runtimeModule = runtimeModulePromise ? await runtimeModulePromise : null;
+        if (runtimeModule?.disposeClientRuntime) {
+            await runtimeModule.disposeClientRuntime();
+        }
+    }
+    catch (error) {
+        logger.error?.('[client-bootstrap] 关闭失败', error);
+    }
+    process.exit(0);
+};
+const startRuntime = async () => {
+    if (runtimeStarted) {
+        return;
+    }
+    runtimeStarted = true;
+    try {
+        const runtimeModule = await loadRuntimeModule();
+        if (typeof runtimeModule.startClientRuntime !== 'function') {
+            throw new Error('Client runtime missing startClientRuntime');
+        }
+        await runtimeModule.startClientRuntime();
+    }
+    catch (error) {
+        notifyParent({
+            type: 'boot_error',
+            protocolVersion: 'v2',
+            stage: 'app',
+            error: normalizeError(error)
+        });
+        logger.error?.('[client-bootstrap] 启动失败', error);
+        process.exitCode = 1;
+        setImmediate(() => process.exit(1));
+    }
+};
+process.on('unhandledRejection', (reason) => {
+    logger.error?.('[client-bootstrap][unhandledRejection]', reason);
+});
+process.on('uncaughtException', (error) => {
+    logger.error?.('[client-bootstrap][uncaughtException]', error);
+});
+['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
+    process?.on?.(sig, () => void shutdown(sig));
+});
+process?.on?.('exit', code => {
+    logger.info?.(`[client-bootstrap][exit] 进程退出，code=${code}`);
+});
+process.on('message', msg => {
+    try {
+        const data = typeof msg === 'string' ? JSON.parse(msg) : msg;
+        if (data?.type === 'start') {
+            void startRuntime();
+        }
+        else if (data?.type === 'stop') {
+            void shutdown('stop');
+        }
+    }
+    catch { }
+});
+notifyParent({ type: 'ready', protocolVersion: 'v2' });

package/lib/core/index.d.ts

@@ -1 +1,4 @@
 export { start } from './start.js';
+export { startModuleAdapter, restartModuleAdapter, getModuleAdapterState } from './process/module.js';
+export { startPlatformAdapterWithFallback, restartPlatformAdapter, getPlatformAdapterState } from './process/platform.js';
+export type { ProcessAdapterState, AdapterPhase, AdapterProtocolVersion, AdapterTransportMode, AdapterBootTimings } from './process/types.js';

package/lib/core/index.js

@@ -1 +1,3 @@
 export { start } from './start.js';
+export { getModuleAdapterState, restartModuleAdapter, startModuleAdapter } from './process/module.js';
+export { getPlatformAdapterState, restartPlatformAdapter, startPlatformAdapterWithFallback } from './process/platform.js';

package/lib/core/process/index.d.ts

@@ -1,3 +1,4 @@
 export * from './module.js';
 export * from './platform.js';
 export * from './ipc-bridge.js';
+export * from './types.js';

package/lib/core/process/index.js

@@ -1,3 +1,3 @@
-export { startModuleAdapter } from './module.js';
-export { startPlatformAdapterWithFallback } from './platform.js';
+export { getModuleAdapterState, restartModuleAdapter, startModuleAdapter } from './module.js';
+export { getPlatformAdapterState, restartPlatformAdapter, startPlatformAdapterWithFallback } from './platform.js';
 export { forwardFromClient, forwardFromPlatform, getClientChild, getPlatformChild, setClientChild, setPlatformChild } from './ipc-bridge.js';

package/lib/core/process/ipc-bridge.js

@@ -27,6 +27,12 @@ const forwardFromPlatform = (data) => {
     if (clientChild?.connected) {
         clientChild.send({ type: 'ipc:data', data: safeData });
     }
+    else if (process.env.NODE_ENV === 'development') {
+        logger.debug?.({
+            message: 'skip forwarding platform message before client transport ready',
+            data: null
+        });
+    }
     if (fullClient.size > 0) {
         try {
             const messageStr = flattedJSON.stringify(safeData);
@@ -48,6 +54,12 @@ const forwardFromClient = (data) => {
     if (platformChild?.connected) {
         platformChild.send({ type: 'ipc:data', data: safeData });
     }
+    else if (process.env.NODE_ENV === 'development') {
+        logger.debug?.({
+            message: 'skip forwarding client message before platform transport ready',
+            data: null
+        });
+    }
     if (global.__sandbox && global.testoneClient) {
         try {
             const normalized = normalizeInboundMessage(safeData);

package/lib/core/process/module.d.ts

@@ -1 +1,4 @@
+import type { ProcessAdapterState } from './types';
+export declare const getModuleAdapterState: () => ProcessAdapterState;
+export declare function restartModuleAdapter(): void;
 export declare function startModuleAdapter(): void;