@sfmc-bds/cli 0.2.0-beta.9 → 0.2.1

package/dist/pack-lifecycle.js

@@ -1,5 +1,6 @@
 import {
   configPath,
+  DEFAULT_DB_CONFIG,
   modulePath,
   readJson,
   writeJson
@@ -25,7 +26,10 @@ import {
   readLevelNameSync,
   readPackManifestHeader,
   readWorldPackList,
-  worldPackListHas as pmWorldPackListHas
+  worldPackListHas as pmWorldPackListHas,
+  BASELINE_BEDROCK_DEPENDENCIES,
+  negotiateBedrockDependencies,
+  NATIVE_BEDROCK_SCRIPT_MODULES
 } from "@sfmc-bds/bds-tools/pack-manager-lib";
 import { ROOT, PACKAGES_DIR, resolveSdkPackageRoot, getRoot } from "./runtime.js";
 import { c } from "./theme.js";
@@ -33,7 +37,7 @@ const BP_NAME = "sfmc-modules";
 const RP_NAME = "sfmc-modules-rp";
 const DEPLOY_CATALOG_NAME = "sfmc-deploy-catalog.json";
 const DEFAULT_PACK_VERSION = [1, 0, 0];
-function createSdkResolvePlugin(sdkRoot) {
+function createSdkResolvePlugin(sdkRoot, dbPort) {
   const pkg = JSON.parse(readFileSync(path.join(sdkRoot, "package.json"), "utf8"));
   const exportsMap = pkg.exports ?? {};
   function resolveExportSubpath(subpath) {
@@ -48,9 +52,59 @@ function createSdkResolvePlugin(sdkRoot) {
   return {
     name: "sfmc-sdk-resolve",
     setup(build) {
+      build.onResolve({ filter: /^sfmc:host$/ }, () => ({
+        path: "sfmc:host",
+        namespace: "sfmc-host"
+      }));
+      build.onLoad({ filter: /.*/, namespace: "sfmc-host" }, () => ({
+        contents: [
+          'import { installHostBootstrap } from "@sfmc-bds/sdk/module-loader/install";',
+          `installHostBootstrap({ dbServerUrl: ${JSON.stringify(`http://127.0.0.1:${dbPort}`)} });`
+        ].join("\n"),
+        loader: "ts"
+      }));
       build.onResolve({ filter: /^@sfmc(?:-bds)?\/sdk(?:\/|$)/ }, (args) => {
         const normalized = args.path.replace(/^@sfmc\/sdk/, "@sfmc-bds/sdk");
         const sub = normalized === "@sfmc-bds/sdk" ? "" : normalized.slice("@sfmc-bds/sdk/".length);
+        const importerNorm = (args.importer || "").replace(/\\/g, "/");
+        const sapiIdx = importerNorm.indexOf("/sapi/");
+        if (sapiIdx !== -1 && !importerNorm.includes("@sfmc-sdk") && !importerNorm.includes("@sfmc/sdk")) {
+          const sapiDir = importerNorm.slice(0, sapiIdx + "/sapi".length);
+          const manifestFile = path.join(sapiDir, "manifest.json");
+          let logicalId = "";
+          let configKey = "";
+          if (existsSync(manifestFile)) {
+            try {
+              const man = JSON.parse(readFileSync(manifestFile, "utf8"));
+              if (man.id) logicalId = man.id;
+              if (man.configKey) configKey = man.configKey;
+            } catch {
+            }
+          }
+          if (!logicalId) {
+            const rootDir = importerNorm.slice(0, sapiIdx);
+            logicalId = path.basename(rootDir).replace(/^sfmc-module-/, "");
+            configKey = logicalId;
+          }
+          if (sub === "sapi/db") {
+            return {
+              path: `sfmc-scoped:db?mod=${encodeURIComponent(logicalId)}`,
+              namespace: "sfmc-scoped-db"
+            };
+          }
+          if (sub === "sapi/config") {
+            return {
+              path: `sfmc-scoped:config?cfg=${encodeURIComponent(configKey)}`,
+              namespace: "sfmc-scoped-config"
+            };
+          }
+          if (sub === "sapi/service") {
+            return {
+              path: `sfmc-scoped:service?mod=${encodeURIComponent(logicalId)}`,
+              namespace: "sfmc-scoped-service"
+            };
+          }
+        }
         const resolved = resolveExportSubpath(sub);
         if (!resolved) {
           return {
@@ -61,7 +115,64 @@ function createSdkResolvePlugin(sdkRoot) {
             ]
           };
         }
-        return { path: resolved };
+        return { path: resolved, namespace: "file" };
+      });
+      build.onLoad({ filter: /.*/, namespace: "sfmc-scoped-db" }, (args) => {
+        const u = new URL(args.path);
+        const mod = u.searchParams.get("mod") || "";
+        return {
+          contents: [
+            'import { getDbClient } from "@sfmc-bds/sdk/sapi/db";',
+            'export * from "@sfmc-bds/sdk/sapi/db";',
+            "export const db = new Proxy({}, {",
+            "  get(_t, prop) {",
+            `    const c = getDbClient(${JSON.stringify(mod)});`,
+            "    const val = (c as any)[prop];",
+            '    return typeof val === "function" ? val.bind(c) : val;',
+            "  }",
+            "});"
+          ].join("\n"),
+          loader: "ts",
+          resolveDir: sdkRoot
+        };
+      });
+      build.onLoad({ filter: /.*/, namespace: "sfmc-scoped-config" }, (args) => {
+        const u = new URL(args.path);
+        const cfg = u.searchParams.get("cfg") || "";
+        return {
+          contents: [
+            'import { getConfigClient } from "@sfmc-bds/sdk/sapi/config";',
+            'export * from "@sfmc-bds/sdk/sapi/config";',
+            "export const config = new Proxy({}, {",
+            "  get(_t, prop) {",
+            `    const c = getConfigClient(${JSON.stringify(cfg)});`,
+            "    const val = (c as any)[prop];",
+            '    return typeof val === "function" ? val.bind(c) : val;',
+            "  }",
+            "});"
+          ].join("\n"),
+          loader: "ts",
+          resolveDir: sdkRoot
+        };
+      });
+      build.onLoad({ filter: /.*/, namespace: "sfmc-scoped-service" }, (args) => {
+        const u = new URL(args.path);
+        const mod = u.searchParams.get("mod") || "";
+        return {
+          contents: [
+            'import { getServiceClient } from "@sfmc-bds/sdk/sapi/service";',
+            'export * from "@sfmc-bds/sdk/sapi/service";',
+            "export const service = new Proxy({}, {",
+            "  get(_t, prop) {",
+            `    const c = getServiceClient(${JSON.stringify(mod)});`,
+            "    const val = (c as any)[prop];",
+            '    return typeof val === "function" ? val.bind(c) : val;',
+            "  }",
+            "});"
+          ].join("\n"),
+          loader: "ts",
+          resolveDir: sdkRoot
+        };
       });
     }
   };
@@ -90,12 +201,21 @@ function lockPath() {
 function catalogPath() {
   return modulePath(path.join(ROOT, "modules"), "catalog.json");
 }
+function configuredDbPort(root) {
+  const configured = readJson(configPath(root, "db_config.json"));
+  const port = configured?.db_port ?? DEFAULT_DB_CONFIG.db_port ?? 3001;
+  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    throw new Error(`configs/db_config.json: db_port \u5FC5\u987B\u662F 1\u201365535 \u7684\u6574\u6570 (\u5F53\u524D ${port})`);
+  }
+  return port;
+}
 function resolveBdsContext(root = getRoot()) {
   const cfg = readJson(configPath(root, "bds_updater.json")) ?? {};
-  const bdsRoot = cfg.bds_path;
-  if (!bdsRoot) {
+  const rawBds = cfg.bds_path;
+  if (!rawBds) {
     throw new Error("bds_path not configured. Run `sfmc init` first.");
   }
+  const bdsRoot = path.isAbsolute(rawBds) ? rawBds : path.resolve(root, rawBds);
   return { bdsRoot, levelName: readLevelNameSync(bdsRoot) };
 }
 function deployedBpDir(bdsRoot, levelName) {
@@ -124,11 +244,71 @@ function collectDeployedPackUuids(bdsRoot, levelName) {
   if (liveRp?.uuid) rp.add(liveRp.uuid);
   return { bp, rp };
 }
+async function extractModuleBedrockDependencies(modPath) {
+  const deps = [];
+  const seen = /* @__PURE__ */ new Set();
+  const manifestPath = path.join(modPath, "sapi", "manifest.json");
+  if (existsSync(manifestPath)) {
+    try {
+      const raw = JSON.parse(await fs.readFile(manifestPath, "utf8"));
+      if (Array.isArray(raw.dependencies)) {
+        for (const d of raw.dependencies) {
+          if (d && typeof d === "object" && typeof d.module_name === "string" && d.module_name.startsWith("@minecraft/") && NATIVE_BEDROCK_SCRIPT_MODULES.has(d.module_name)) {
+            const modName = d.module_name;
+            const ver = String(d.version ?? "1.0.0");
+            const uuid = typeof d.uuid === "string" ? d.uuid : void 0;
+            deps.push({ module_name: modName, version: ver, ...uuid ? { uuid } : {} });
+            seen.add(modName);
+          }
+        }
+      } else if (raw.dependencies && typeof raw.dependencies === "object") {
+        for (const [modName, ver] of Object.entries(raw.dependencies)) {
+          if (modName.startsWith("@minecraft/") && !seen.has(modName) && NATIVE_BEDROCK_SCRIPT_MODULES.has(modName)) {
+            deps.push({ module_name: modName, version: String(ver ?? "1.0.0") });
+            seen.add(modName);
+          }
+        }
+      }
+      if (raw.minecraft && typeof raw.minecraft === "object") {
+        const mc = raw.minecraft;
+        const mcDeps = Array.isArray(mc.dependencies) ? mc.dependencies : mc;
+        if (typeof mcDeps === "object" && !Array.isArray(mcDeps)) {
+          for (const [modName, ver] of Object.entries(mcDeps)) {
+            if (modName.startsWith("@minecraft/") && !seen.has(modName) && NATIVE_BEDROCK_SCRIPT_MODULES.has(modName)) {
+              deps.push({ module_name: modName, version: String(ver ?? "1.0.0") });
+              seen.add(modName);
+            }
+          }
+        }
+      }
+    } catch {
+    }
+  }
+  const pkgPath = path.join(modPath, "package.json");
+  if (existsSync(pkgPath)) {
+    try {
+      const pkg = JSON.parse(await fs.readFile(pkgPath, "utf8"));
+      const candidateMap = {
+        ...pkg.devDependencies ?? {},
+        ...pkg.dependencies ?? {},
+        ...pkg.peerDependencies ?? {}
+      };
+      for (const [modName, ver] of Object.entries(candidateMap)) {
+        if (modName.startsWith("@minecraft/") && !seen.has(modName) && NATIVE_BEDROCK_SCRIPT_MODULES.has(modName)) {
+          deps.push({ module_name: modName, version: ver });
+          seen.add(modName);
+        }
+      }
+    } catch {
+    }
+  }
+  return deps;
+}
 async function scanLocalModules() {
   const dir = packagesDir();
   if (!existsSync(dir)) return [];
   const lock = readJson(lockPath()) ?? { version: 1, modules: {} };
-  const cat = readJson(catalogPath()) ?? {};
+  const cat = readJson(catalogPath()) ?? { version: 1, modules: [] };
   const defaults = /* @__PURE__ */ new Map();
   if (Array.isArray(cat.modules)) {
     for (const m of cat.modules) {
@@ -166,6 +346,7 @@ async function scanLocalModules() {
     const hasResourcePack = existsSync(path.join(modPath, "resource_pack"));
     const fingerprint = await dirFingerprint(modPath);
     const enabled = isModuleEnabled(logicalId, lock, defaults);
+    const declaredDependencies = await extractModuleBedrockDependencies(modPath);
     out.push({
       folderId,
       logicalId,
@@ -174,7 +355,8 @@ async function scanLocalModules() {
       hasSapi,
       hasResourcePack,
       fingerprint,
-      entryPath: hasSapi ? entryPath : null
+      entryPath: hasSapi ? entryPath : null,
+      declaredDependencies
     });
   }
   out.sort((a, b) => a.folderId.localeCompare(b.folderId));
@@ -207,8 +389,26 @@ async function computeDesiredCatalog(opts) {
     rpVersion = opts?.rpVersion ?? localRp?.version ?? DEFAULT_PACK_VERSION;
     rpModuleUuid = opts?.rpModuleUuid ?? localRp?.moduleUuid;
   }
+  let sdkVersion;
+  try {
+    const sdkRoot = resolveSdkPackageRoot();
+    const pkg = JSON.parse(readFileSync(path.join(sdkRoot, "package.json"), "utf8"));
+    sdkVersion = pkg.version;
+  } catch {
+  }
+  const enabledModuleReqs = mods.filter((m) => m.enabled && m.declaredDependencies.length > 0).map((m) => ({ folderId: m.folderId, dependencies: m.declaredDependencies }));
+  const negotiated = negotiateBedrockDependencies(BASELINE_BEDROCK_DEPENDENCIES, enabledModuleReqs);
+  if (negotiated.promotions.length > 0) {
+    for (const p of negotiated.promotions) {
+      packLog(
+        `promoted ${p.moduleName} ${p.from} -> ${p.to} (requested by: ${p.requestedBy.join(", ")})`,
+        "info"
+      );
+    }
+  }
   return {
     schemaVersion: 1,
+    dbPort: configuredDbPort(getRoot()),
     bpUuid,
     rpUuid,
     bpVersion,
@@ -216,6 +416,8 @@ async function computeDesiredCatalog(opts) {
     ...bpModuleUuid ? { bpModuleUuid } : {},
     ...rpModuleUuid ? { rpModuleUuid } : {},
     generatedAt: Date.now(),
+    ...sdkVersion ? { sdkVersion } : {},
+    dependencies: negotiated.dependencies,
     modules
   };
 }
@@ -229,8 +431,20 @@ function readDeployedCatalog(bdsRoot, levelName) {
   }
 }
 function catalogsEqual(a, b) {
+  if (a.dbPort !== b.dbPort) return false;
   if (a.bpUuid !== b.bpUuid) return false;
   if ((a.rpUuid ?? null) !== (b.rpUuid ?? null)) return false;
+  if ((a.sdkVersion ?? null) !== (b.sdkVersion ?? null)) return false;
+  const depsA = a.dependencies ?? [];
+  const depsB = b.dependencies ?? [];
+  if (depsA.length !== depsB.length) return false;
+  for (let i = 0; i < depsA.length; i++) {
+    const da = depsA[i];
+    const db = depsB[i];
+    if (!da || !db || da.module_name !== db.module_name || da.version !== db.version) {
+      return false;
+    }
+  }
   const aKeys = Object.keys(a.modules).sort();
   const bKeys = Object.keys(b.modules).sort();
   if (aKeys.length !== bKeys.length) return false;
@@ -270,19 +484,23 @@ async function buildPacks(desired) {
     const sdkRoot = resolveSdkPackageRoot();
     packLog(`SDK root: ${sdkRoot}`);
     await build({
-      entryPoints: entries,
+      stdin: {
+        contents: [
+          'import "sfmc:host";',
+          ...entries.map((e) => `import ${JSON.stringify(path.resolve(e).replace(/\\/g, "/"))};`)
+        ].join("\n"),
+        resolveDir: ROOT,
+        sourcefile: "bootstrap.ts",
+        loader: "ts"
+      },
       outfile: outFile,
       bundle: true,
       platform: "neutral",
       format: "esm",
       target: "es2022",
       logLevel: "warning",
-      sourcemap: false,
+      sourcemap: true,
       external: ["@minecraft/*"],
-      // BDS host 启动：与 module-loader barrel 分离（DIP），须在模块 register 之前执行
-      banner: {
-        js: 'import { installHostBootstrap } from "@sfmc-bds/sdk/module-loader/install";\ninstallHostBootstrap();\n'
-      },
       // 避免读取模块内残缺的 extends（如 ../../../sdk/@sfmc-sdk/tsconfig.json）
       tsconfigRaw: JSON.stringify({
         compilerOptions: {
@@ -293,7 +511,7 @@ async function buildPacks(desired) {
           skipLibCheck: true
         }
       }),
-      plugins: [createSdkResolvePlugin(sdkRoot)]
+      plugins: [createSdkResolvePlugin(sdkRoot, catalog.dbPort)]
     });
     packLog(`esbuild bundled ${entries.length} entr(y/ies)`, "success");
   }
@@ -305,7 +523,8 @@ async function buildPacks(desired) {
       version: catalog.bpVersion,
       description: "ScriptsForMinecraftServer aggregated behavior pack",
       uuid: catalog.bpUuid,
-      ...catalog.bpModuleUuid ? { moduleUuid: catalog.bpModuleUuid } : {}
+      ...catalog.bpModuleUuid ? { moduleUuid: catalog.bpModuleUuid } : {},
+      ...catalog.dependencies ? { dependencies: catalog.dependencies } : {}
     });
   } catch (e) {
     throw new Error(`assemble-bp failed: ${e.message}`);
@@ -431,6 +650,10 @@ function formatPackLoadInfo(catalog, rebuilt) {
     catalog.rpUuid ? `  RP ${catalog.rpUuid}  v${(catalog.rpVersion ?? DEFAULT_PACK_VERSION).join(".")}` : `  RP (none)`,
     `  modules: ${enabled.length} enabled / ${disabled.length} disabled / ${mods.length} installed`
   ];
+  if (catalog.dependencies && catalog.dependencies.length > 0) {
+    const depStr = catalog.dependencies.map((d) => `${d.module_name}@${d.version}`).join(" ");
+    lines.push(`  dependencies: ${depStr}`);
+  }
   for (const [folderId, m] of enabled.sort((a, b) => a[0].localeCompare(b[0]))) {
     lines.push(`    \u25CF ${folderId} (${m.logicalId}) ${m.version}${m.hasResourcePack ? " +rp" : ""}`);
   }
@@ -474,6 +697,8 @@ async function ensurePacksReady() {
     if (deployed.rpUuid && !worldPackListHas(bdsRoot, levelName, "resource", deployed.rpUuid)) {
       needRebuild = true;
     }
+    const deployedMainJs = path.join(deployedBpDir(bdsRoot, levelName), "scripts", "main.js");
+    if (!existsSync(deployedMainJs)) needRebuild = true;
     if (!hasConfigPermission(bdsRoot, deployed.bpUuid)) {
       try {
         const wrote = await ensureConfigPermission(bdsRoot, deployed.bpUuid);
@@ -630,11 +855,13 @@ export {
   cmdPackList,
   cmdPackStatus,
   computeDesiredCatalog,
+  createSdkResolvePlugin,
   deployPacks,
   deployedBpDir,
   deployedCatalogPath,
   deployedRpDir,
   ensurePacksReady,
+  extractModuleBedrockDependencies,
   formatPackLoadInfo,
   readDeployedCatalog,
   resolveBdsContext,