Oak-Team
/
oak-cli
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 19 Wiki Activity

Merge branch 'release'

This commit is contained in:
Xu Chang 2026-01-09 16:17:55 +08:00
parent 6cef7018dc f3e6ed4917
commit 404380990e
8 changed files with 118 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/server/start.js
View File

@ -200,7 +200,7 @@ async function startup(path, connector, omitWatchers, omitTimers, routine) {
catch (err) { catch (err) {
console.error(err); console.error(err);
const { request } = ctx; const { request } = ctx;
const exception = err instanceof types_1.OakException const exception = (0, types_1.isOakException)(err)
? err ? err
: new types_1.OakException(serverConfiguration?.internalExceptionMask || : new types_1.OakException(serverConfiguration?.internalExceptionMask ||
ExceptionMask); ExceptionMask);
@ -236,6 +236,10 @@ async function startup(path, connector, omitWatchers, omitTimers, routine) {
ctx.set('Access-Control-Allow-Origin', '*'); ctx.set('Access-Control-Allow-Origin', '*');
ctx.set('Access-Control-Allow-Headers', corsHeaders.concat(connector.getCorsHeader())); ctx.set('Access-Control-Allow-Headers', corsHeaders.concat(connector.getCorsHeader()));
ctx.set('Access-Control-Allow-Methods', corsMethods); ctx.set('Access-Control-Allow-Methods', corsMethods);
if (connector.getCorsExposeHeaders) {
const exposeHeaders = connector.getCorsExposeHeaders();
ctx.set('Access-Control-Expose-Headers', exposeHeaders);
}
if (ctx.method == 'OPTIONS') { if (ctx.method == 'OPTIONS') {
ctx.body = 200; ctx.body = 200;
} }
@ -269,12 +273,39 @@ async function startup(path, connector, omitWatchers, omitTimers, routine) {
} }
}); });
} }
const connectorCustomAspects = connector.registerCustomAspect ? connector.registerCustomAspect() : null;
router.post(connector.getRouter(), async (ctx) => { router.post(connector.getRouter(), async (ctx) => {
const { request } = ctx; const { request } = ctx;
const { contextString, aspectName, data } = connector.parseRequest(request.headers, request.body, request.files); const { contextString, aspectName, data } = await connector.parseRequest(request.headers, request.body, request.files);
const { result, opRecords, message } = await appLoader.execAspect(aspectName, request.headers, contextString, data); let result;
let opRecords = [];
let message = undefined;
if (connectorCustomAspects &&
connectorCustomAspects.findIndex(a => a.name === aspectName) >= 0) {
// 自定义aspect处理
console.log(`调用Connector自定义Aspect: ${aspectName}`);
const aspect = connectorCustomAspects.find(a => a.name === aspectName);
const res = await aspect.handler({
headers: request.headers,
contextString,
params: data,
});
result = res.result;
opRecords = res.opRecords || [];
message = res.message;
}
else {
const res = await appLoader.execAspect(aspectName, request.headers, contextString, data);
result = res.result;
opRecords = res.opRecords || [];
message = res.message;
}
const { body, headers } = await connector.serializeResult(result, opRecords, request.headers, request.body, message); const { body, headers } = await connector.serializeResult(result, opRecords, request.headers, request.body, message);
ctx.response.body = body; ctx.response.body = body;
// headers 要拼上
Object.keys(headers || {}).forEach(key => {
ctx.set(key, headers?.[key]);
});
return; return;
}); });
// 桥接访问外部资源的入口 // 桥接访问外部资源的入口

4
lib/server/watch.js
View File

@ -280,11 +280,12 @@ const createCompiler = async (projectPath, options, projectReferences, treatFile
}; };
const compileTask = async (task) => { const compileTask = async (task) => {
const { filePath, changeType } = task; const { filePath, changeType } = task;
const modulePath = path_1.default.resolve(filePath);
// 判断文件类型 // 判断文件类型
if (!filePath.endsWith(".ts")) { if (!filePath.endsWith(".ts")) {
// 处理非TypeScript文件 (如JSON文件) // 处理非TypeScript文件 (如JSON文件)
if (filePath.endsWith(".json")) { if (filePath.endsWith(".json")) {
const targetPath = filePath.replace(path_1.default.join(projectPath, "src"), path_1.default.join(projectPath, "lib")); const targetPath = modulePath.replace(path_1.default.join(projectPath, "src"), path_1.default.join(projectPath, "lib"));
try { try {
if (changeType === "remove") { if (changeType === "remove") {
if (fs_1.default.existsSync(targetPath)) { if (fs_1.default.existsSync(targetPath)) {
@ -331,7 +332,6 @@ const createCompiler = async (projectPath, options, projectReferences, treatFile
// 处理TypeScript文件 // 处理TypeScript文件
console.clear(); console.clear();
console.warn(`File ${filePath} has been ${changeType}d`); console.warn(`File ${filePath} has been ${changeType}d`);
const modulePath = path_1.default.resolve(filePath);
const libPath = modulePath const libPath = modulePath
.replace(path_1.default.join(projectPath, "src"), path_1.default.join(projectPath, "lib")) .replace(path_1.default.join(projectPath, "src"), path_1.default.join(projectPath, "lib"))
.replace(/\.ts$/, ".js"); .replace(/\.ts$/, ".js");

12
lib/template.js
View File

@ -85,7 +85,7 @@ function packageJsonContent({ name, version, description, cliName, cliBinName, i
"build-analyze:mp:staging": "${cliBinName} build --target mp --mode staging --analyze", "build-analyze:mp:staging": "${cliBinName} build --target mp --mode staging --analyze",
"build:mp": "${cliBinName} build --target mp --mode production", "build:mp": "${cliBinName} build --target mp --mode production",
"build-analyze:mp": "${cliBinName} build --target mp --mode production --analyze", "build-analyze:mp": "${cliBinName} build --target mp --mode production --analyze",
"build:watch": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && npm run copy-config-json && npm run server:start:watch", "build:watch": "node --stack-size=4096 ./scripts/build.js -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && npm run copy-config-json && npm run server:start:watch",
"start:web": "${cliBinName} start --target web --mode development --devMode frontend", "start:web": "${cliBinName} start --target web --mode development --devMode frontend",
"start:web:server": "${cliBinName} start --target web --mode development", "start:web:server": "${cliBinName} start --target web --mode development",
"start:native": "${cliBinName} start --target rn --mode development --devMode frontend", "start:native": "${cliBinName} start --target rn --mode development --devMode frontend",
@ -97,7 +97,7 @@ function packageJsonContent({ name, version, description, cliName, cliBinName, i
"build-sourcemap:web": "${cliBinName} build --target web --mode production --sourcemap", "build-sourcemap:web": "${cliBinName} build --target web --mode production --sourcemap",
"build-analyze:web": "${cliBinName} build --target web --mode production --analyze", "build-analyze:web": "${cliBinName} build --target web --mode production --analyze",
"build-sourcemap-analyze:web": "${cliBinName} build --target web --mode production --sourcemap --analyze", "build-sourcemap-analyze:web": "${cliBinName} build --target web --mode production --sourcemap --analyze",
"build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && npm run copy-config-json", "build": "node --stack-size=4096 ./scripts/build.js -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && npm run copy-config-json",
"prebuild": "npm run make:locale", "prebuild": "npm run make:locale",
"run:ios": "oak-cli run -p ios", "run:ios": "oak-cli run -p ios",
"run:android": "oak-cli run -p android", "run:android": "oak-cli run -p android",
@ -397,7 +397,13 @@ function tsConfigBuildJsonContent() {
"test", "test",
"src/pages/**/*", "src/pages/**/*",
"src/components/**/*" "src/components/**/*"
] ],
"oakBuildChecks": {
"context": {
"checkAsyncContext": true,
"targetModules": ["context/BackendRuntimeContext"]
}
}
}`; }`;
} }
function tsConfigPathsJsonContent(deps) { function tsConfigPathsJsonContent(deps) {

8
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@xuchangzju/oak-cli", "name": "@xuchangzju/oak-cli",
"version": "4.0.30", "version": "4.0.31",
"description": "client for oak framework", "description": "client for oak framework",
"main": "lib/index.js", "main": "lib/index.js",
"scripts": { "scripts": {
@ -112,9 +112,9 @@
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mini-css-extract-plugin": "^2.5.3", "mini-css-extract-plugin": "^2.5.3",
"node-watch": "^0.7.4", "node-watch": "^0.7.4",
"oak-backend-base": "^4.1.25", "oak-backend-base": "^4.1.26",
"oak-domain": "^5.1.31", "oak-domain": "^5.1.33",
"oak-frontend-base": "^5.3.43", "oak-frontend-base": "^5.3.45",
"parse-asn1": "5.1.6", "parse-asn1": "5.1.6",
"postcss": "^8.4.4", "postcss": "^8.4.4",
"postcss-flexbugs-fixes": "^5.0.2", "postcss-flexbugs-fixes": "^5.0.2",

64
src/server/start.ts
View File

@ -9,7 +9,7 @@ import KoaBody from 'koa-body';
import { AppLoader, getClusterInfo, ClusterAppLoader } from 'oak-backend-base'; import { AppLoader, getClusterInfo, ClusterAppLoader } from 'oak-backend-base';
import { BackendRuntimeContext } from 'oak-frontend-base/lib/context/BackendRuntimeContext'; import { BackendRuntimeContext } from 'oak-frontend-base/lib/context/BackendRuntimeContext';
import { OakException, Connector, EntityDict, ClusterInfo } from 'oak-domain/lib/types'; import { OakException, Connector, EntityDict, ClusterInfo, OpRecord, isOakException } from 'oak-domain/lib/types';
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain'; import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncRowStore, AsyncContext } from 'oak-domain/lib/store/AsyncRowStore'; import { AsyncRowStore, AsyncContext } from 'oak-domain/lib/store/AsyncRowStore';
import { SyncContext } from 'oak-domain/lib/store/SyncRowStore'; import { SyncContext } from 'oak-domain/lib/store/SyncRowStore';
@ -245,7 +245,7 @@ export async function startup<ED extends EntityDict & BaseEntityDict, FrontCxt e
console.error(err); console.error(err);
const { request } = ctx; const { request } = ctx;
const exception = const exception =
err instanceof OakException isOakException(err)
? err ? err
: new OakException<ED>( : new OakException<ED>(
serverConfiguration?.internalExceptionMask || serverConfiguration?.internalExceptionMask ||
@ -260,11 +260,13 @@ export async function startup<ED extends EntityDict & BaseEntityDict, FrontCxt e
return; return;
} }
}); });
koa.use( koa.use(
KoaBody(Object.assign({ KoaBody(Object.assign({
multipart: true, multipart: true,
}, serverConfiguration.koaBody)) }, serverConfiguration.koaBody))
); );
// 注册自定义中间件 // 注册自定义中间件
if (serverConfiguration.middleware) { if (serverConfiguration.middleware) {
if (Array.isArray(serverConfiguration.middleware)) { if (Array.isArray(serverConfiguration.middleware)) {
@ -290,6 +292,10 @@ export async function startup<ED extends EntityDict & BaseEntityDict, FrontCxt e
ctx.set('Access-Control-Allow-Origin', '*'); ctx.set('Access-Control-Allow-Origin', '*');
ctx.set('Access-Control-Allow-Headers', corsHeaders.concat(connector.getCorsHeader())); ctx.set('Access-Control-Allow-Headers', corsHeaders.concat(connector.getCorsHeader()));
ctx.set('Access-Control-Allow-Methods', corsMethods); ctx.set('Access-Control-Allow-Methods', corsMethods);
if (connector.getCorsExposeHeaders) {
const exposeHeaders = connector.getCorsExposeHeaders();
ctx.set('Access-Control-Expose-Headers', exposeHeaders);
}
if (ctx.method == 'OPTIONS') { if (ctx.method == 'OPTIONS') {
ctx.body = 200; ctx.body = 200;
} else { } else {
@ -328,20 +334,48 @@ export async function startup<ED extends EntityDict & BaseEntityDict, FrontCxt e
}); });
} }
const connectorCustomAspects = connector.registerCustomAspect ? connector.registerCustomAspect() : null;
router.post(connector.getRouter(), async (ctx) => { router.post(connector.getRouter(), async (ctx) => {
const { request } = ctx; const { request } = ctx;
const { contextString, aspectName, data } = connector.parseRequest( const { contextString, aspectName, data } = await connector.parseRequest(
request.headers, request.headers,
request.body, request.body,
request.files request.files
); );
const { result, opRecords, message } = await appLoader.execAspect( let result: any;
aspectName, let opRecords: OpRecord<ED>[] = [];
request.headers, let message: string | undefined = undefined;
contextString,
data if (connectorCustomAspects &&
); connectorCustomAspects.findIndex(a => a.name === aspectName) >= 0
) {
// 自定义aspect处理
console.log(`调用Connector自定义Aspect: ${aspectName}`);
const aspect = connectorCustomAspects!.find(a => a.name === aspectName)!;
const res = await aspect.handler(
{
headers: request.headers,
contextString,
params: data,
}
);
result = res.result;
opRecords = res.opRecords || [];
message = res.message;
} else {
const res = await appLoader.execAspect(
aspectName,
request.headers,
contextString,
data
);
result = res.result;
opRecords = res.opRecords || [];
message = res.message;
}
const { body, headers } = await connector.serializeResult( const { body, headers } = await connector.serializeResult(
result, result,
opRecords, opRecords,
@ -350,6 +384,12 @@ export async function startup<ED extends EntityDict & BaseEntityDict, FrontCxt e
message message
); );
ctx.response.body = body; ctx.response.body = body;
// headers 要拼上
Object.keys(headers || {}).forEach(key => {
ctx.set(key, headers?.[key])
})
return; return;
}); });
@ -519,15 +559,15 @@ export async function startup<ED extends EntityDict & BaseEntityDict, FrontCxt e
return; return;
} }
shutdownStarted = true; shutdownStarted = true;
console.log(`\n收到 ${signal} 信号，准备关闭服务器...`); console.log(`\n收到 ${signal} 信号，准备关闭服务器...`);
// 移除所有信号处理器，防止重复触发 // 移除所有信号处理器，防止重复触发
process.removeAllListeners('SIGINT'); process.removeAllListeners('SIGINT');
process.removeAllListeners('SIGTERM'); process.removeAllListeners('SIGTERM');
process.removeAllListeners('SIGQUIT'); process.removeAllListeners('SIGQUIT');
process.removeAllListeners('SIGHUP'); process.removeAllListeners('SIGHUP');
try { try {
await shutdown(); await shutdown();
process.exit(0); process.exit(0);

4
src/server/watch.ts
View File

@ -477,11 +477,12 @@ const createCompiler = async (
const compileTask = async (task: CompileTask): Promise<CompileResult> => { const compileTask = async (task: CompileTask): Promise<CompileResult> => {
const { filePath, changeType } = task; const { filePath, changeType } = task;
const modulePath = pathLib.resolve(filePath);
// 判断文件类型 // 判断文件类型
if (!filePath.endsWith(".ts")) { if (!filePath.endsWith(".ts")) {
// 处理非TypeScript文件 (如JSON文件) // 处理非TypeScript文件 (如JSON文件)
if (filePath.endsWith(".json")) { if (filePath.endsWith(".json")) {
const targetPath = filePath.replace( const targetPath = modulePath.replace(
pathLib.join(projectPath, "src"), pathLib.join(projectPath, "src"),
pathLib.join(projectPath, "lib") pathLib.join(projectPath, "lib")
); );
@ -533,7 +534,6 @@ const createCompiler = async (
console.clear(); console.clear();
console.warn(`File ${filePath} has been ${changeType}d`); console.warn(`File ${filePath} has been ${changeType}d`);
const modulePath = pathLib.resolve(filePath);
const libPath = modulePath const libPath = modulePath
.replace(pathLib.join(projectPath, "src"), pathLib.join(projectPath, "lib")) .replace(pathLib.join(projectPath, "src"), pathLib.join(projectPath, "lib"))
.replace(/\.ts$/, ".js"); .replace(/\.ts$/, ".js");

12
src/template.ts
View File

@ -92,7 +92,7 @@ export function packageJsonContent({
"build-analyze:mp:staging": "${cliBinName} build --target mp --mode staging --analyze", "build-analyze:mp:staging": "${cliBinName} build --target mp --mode staging --analyze",
"build:mp": "${cliBinName} build --target mp --mode production", "build:mp": "${cliBinName} build --target mp --mode production",
"build-analyze:mp": "${cliBinName} build --target mp --mode production --analyze", "build-analyze:mp": "${cliBinName} build --target mp --mode production --analyze",
"build:watch": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && npm run copy-config-json && npm run server:start:watch", "build:watch": "node --stack-size=4096 ./scripts/build.js -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && npm run copy-config-json && npm run server:start:watch",
"start:web": "${cliBinName} start --target web --mode development --devMode frontend", "start:web": "${cliBinName} start --target web --mode development --devMode frontend",
"start:web:server": "${cliBinName} start --target web --mode development", "start:web:server": "${cliBinName} start --target web --mode development",
"start:native": "${cliBinName} start --target rn --mode development --devMode frontend", "start:native": "${cliBinName} start --target rn --mode development --devMode frontend",
@ -104,7 +104,7 @@ export function packageJsonContent({
"build-sourcemap:web": "${cliBinName} build --target web --mode production --sourcemap", "build-sourcemap:web": "${cliBinName} build --target web --mode production --sourcemap",
"build-analyze:web": "${cliBinName} build --target web --mode production --analyze", "build-analyze:web": "${cliBinName} build --target web --mode production --analyze",
"build-sourcemap-analyze:web": "${cliBinName} build --target web --mode production --sourcemap --analyze", "build-sourcemap-analyze:web": "${cliBinName} build --target web --mode production --sourcemap --analyze",
"build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && npm run copy-config-json", "build": "node --stack-size=4096 ./scripts/build.js -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && npm run copy-config-json",
"prebuild": "npm run make:locale", "prebuild": "npm run make:locale",
"run:ios": "oak-cli run -p ios", "run:ios": "oak-cli run -p ios",
"run:android": "oak-cli run -p android", "run:android": "oak-cli run -p android",
@ -406,7 +406,13 @@ export function tsConfigBuildJsonContent() {
"test", "test",
"src/pages/**/*", "src/pages/**/*",
"src/components/**/*" "src/components/**/*"
] ],
"oakBuildChecks": {
"context": {
"checkAsyncContext": true,
"targetModules": ["context/BackendRuntimeContext"]
}
}
}`; }`;
} }

6
template/scripts/build.js Normal file
View File

@ -0,0 +1,6 @@
/* eslint-disable @typescript-eslint/no-require-imports */
const { build } = require('oak-domain/lib/compiler/tscBuilder.js')
const pwd = process.cwd();
build(pwd, process.argv);