Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/ootb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ jobs:
shell: pwsh
run: npm run build --workspaces --if-present

- name: Populate configs/ from configs-default/
shell: pwsh
run: |
New-Item -ItemType Directory -Force -Path configs | Out-Null
Get-ChildItem configs-default/*.json | ForEach-Object {
$dest = Join-Path configs $_.Name
if (-not (Test-Path $dest)) { Copy-Item $_.FullName $dest }
}

- name: Run check-ootb
shell: pwsh
run: node tools/check-ootb.js
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
bds-tools/dist/
db-server/dist/
panel/dist/
qq-bridge/dist/
sfmc/dist/
remote-controller/dist/
modules/sdk/@sfmc-sdk/dist/
modules/sdk/@sfmc-sdk/node_modules/
shared/**/dist/
Expand Down
2 changes: 1 addition & 1 deletion configs-default/db_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"db_port": 3001,
"http_auth": "",
"dbDir": "./data/sfmc_data.db",
"modulesDir": "../modules"
"modulesDir": "modules"
}
4 changes: 3 additions & 1 deletion db-server/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ log.success(
);

// ── enabled 集合(从 lock file)─────────────────────────────
const lockFile = loadModuleLock(env.MODULE_LOCK_PATH);
let lockFile = loadModuleLock(env.MODULE_LOCK_PATH);
const moduleCatalog = readJsonFile<{ modules?: unknown[] }>(env.MODULE_CATALOG_PATH, {
modules: [],
});
Expand Down Expand Up @@ -194,6 +194,8 @@ function setModuleEnabled(mod: { id: string; canDisable: boolean }, enabled: boo
const lock = loadModuleLock(env.MODULE_LOCK_PATH);
updateModuleState(lock, mod.id, { enabled: !!enabled });
writeJsonFile(env.MODULE_LOCK_PATH, lock);
// 同步内存缓存,避免写入后立即读取(如 enable/disable 接口的返回值)仍是旧状态
lockFile = lock;
}

// ── 路由工厂实例 (旧业务路径 — 保留直到各模块迁 v2) ────────────────
Expand Down
8 changes: 3 additions & 5 deletions tools/check-catalog.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@
* - entry.init 仅在 sapi 类型可选
* - 不允许循环依赖(拓扑排序检测)
*/
import { accessSync, constants, readFileSync } from "node:fs";
import { resolve, join, dirname } from "node:path";
import { fileURLToPath } from 'node:url';
import path from "node:path";
const { accessSync, constants, readFileSync } = require("node:fs");
const { resolve, join } = require("node:path");

const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "..");
const ROOT = resolve(__dirname, "..");
const CATALOG = join(ROOT, "modules", "catalog.json");
const SERVICES_CATALOG = join(ROOT, "services", "catalog.json");
/* SAPI modules no longer register through a single static entry.ts —
Expand Down
2 changes: 1 addition & 1 deletion tools/check-ootb.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function fileContains(p, needle) {
{
let dbProc = null;
try {
dbProc = spawn(process.execPath, [path.join(ROOT, "db-server", "index.js")], {
dbProc = spawn(process.execPath, [path.join(ROOT, "db-server", "dist", "index.js")], {
cwd: ROOT,
env: { ...process.env },
stdio: ["ignore", "pipe", "pipe"],
Expand Down
2 changes: 1 addition & 1 deletion tools/sim-new-user.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let dbProc = null;

function startDb(simDir) {
const env = { ...process.env, SFMC_ROOT: simDir, DB_PORT: String(DB_PORT) };
dbProc = spawn(process.execPath, [path.join(ROOT, "db-server", "index.js")], {
dbProc = spawn(process.execPath, [path.join(ROOT, "db-server", "dist", "index.js")], {
cwd: ROOT,
env,
stdio: ["ignore", "pipe", "pipe"],
Expand Down