@mdfriday/foundry 26.3.8 → 26.3.9

package/dist/cli.js

@@ -9173,20 +9173,15 @@ var init_publish2 = __esm({
       }
       /**
        * Publish project to specified platform
+       * 
+       * @param project - 项目实例
+       * @param config - 已合并的发布配置（由调用方准备）
+       * @param options - 发布选项
+       * @param onProgress - 进度回调
        */
-      async publish(project, method, options, onProgress) {
-        log17.info(`Publishing project: ${project.getName()} to ${method}`);
+      async publish(project, config, options, onProgress) {
+        log17.info(`Publishing project: ${project.getName()} to ${config.type}`);
         try {
-          const workspace = await this.workspaceService.loadWorkspace();
-          const globalConfig = await workspace.getAllConfig();
-          const publishConfig = WorkspacePublishConfig.fromGlobalConfig(globalConfig);
-          let config;
-          if (options?.config) {
-            const mergedConfig = publishConfig.merge(options.config, method);
-            config = await this.getMethodConfig(mergedConfig, method);
-          } else {
-            config = await this.getMethodConfig(publishConfig, method);
-          }
           const publicDir = await project.getPublishDir();
           const publisher = this.publisherFactory.create(
             project.getId(),
@@ -9205,27 +9200,59 @@ var init_publish2 = __esm({
           const result = await publisher.publish(publicDir, publishOptions);
           return result;
         } catch (error) {
-          log17.error(`Publish failed: ${method}`, error);
+          log17.error(`Publish failed: ${config.type}`, error);
           throw error;
         }
       }
       /**
        * Test connection
+       * 
+       * @param project - 项目实例
+       * @param config - 已合并的发布配置（由调用方准备）
        */
-      async testConnection(project, method) {
-        const workspace = await this.workspaceService.loadWorkspace();
+      async testConnection(project, config) {
+        log17.info(`Testing ${config.type} connection for project: ${project.getName()}`);
+        try {
+          const publisher = this.publisherFactory.create(
+            project.getId(),
+            project.getPath(),
+            config
+          );
+          if (publisher.testConnection) {
+            return await publisher.testConnection();
+          }
+          return { success: true };
+        } catch (error) {
+          log17.error(`Test connection failed: ${config.type}`, error);
+          return {
+            success: false,
+            error: error.message
+          };
+        }
+      }
+      /**
+       * 准备最终的发布配置
+       * 
+       * 配置查找优先级（两级）：
+       * 1. 项目配置 (project.config.publish)
+       * 2. 全局配置 (workspace global config)
+       * 
+       * @param workspace - Workspace 实例
+       * @param project - Project 实例
+       * @param method - 发布方法
+       * @returns 最终的发布配置
+       */
+      async prepareFinalConfig(workspace, project, method) {
         const globalConfig = await workspace.getAllConfig();
-        const publishConfig = WorkspacePublishConfig.fromGlobalConfig(globalConfig);
-        const config = await this.getMethodConfig(publishConfig, method);
-        const publisher = this.publisherFactory.create(
-          project.getId(),
-          project.getPath(),
-          config
-        );
-        if (publisher.testConnection) {
-          return await publisher.testConnection();
+        let publishConfig = WorkspacePublishConfig.fromGlobalConfig(globalConfig);
+        await project.loadConfig();
+        const projectConfig = project.getConfig();
+        if (projectConfig?.publish) {
+          log17.debug("Merging project publish config");
+          const projectPublishData = projectConfig.publish;
+          publishConfig = publishConfig.merge(projectPublishData, method);
         }
-        return { success: true };
+        return this.getMethodConfig(publishConfig, method, workspace);
       }
       // ============================================================================
       // Private Methods
@@ -9233,7 +9260,7 @@ var init_publish2 = __esm({
       /**
        * Get method-specific config from WorkspacePublishConfig
        */
-      async getMethodConfig(publishConfig, method) {
+      async getMethodConfig(publishConfig, method, workspace) {
         switch (method) {
           case "ftp":
             const ftpConfig = publishConfig.getFTPConfig();
@@ -9267,15 +9294,14 @@ var init_publish2 = __esm({
             const licenseKey = mdConfig.licenseKey || "";
             if (!licenseKey) {
               throw new Error(
-                "\u274C MDFriday license key is required for publishing.\n\nDifferent licenses deploy to different servers.\nYou must explicitly configure or provide a license key:\n\n1\uFE0F\u20E3  Configure license globally (recommended):\n    mdf config:set publish.mdfriday.licenseKey MDF-XXXX-XXXX-XXXX --global\n\n2\uFE0F\u20E3  Pass license via CLI:\n    mdf publish mdfriday --license-key MDF-XXXX-XXXX-XXXX\n\n\u{1F4A1} Note: License login (mdf license:login) only gets TOKEN.\n   Publishing requires explicitly setting a license key."
+                "\u274C MDFriday license key is required for publishing.\n\nDifferent licenses deploy to different servers.\nYou must explicitly configure a license key:\n\nConfigure license globally (recommended):\n  mdf config:set publish.mdfriday.licenseKey MDF-XXXX-XXXX-XXXX --global\n\nOr configure for project only:\n  mdf config:set publish.mdfriday.licenseKey MDF-XXXX-XXXX-XXXX\n\n\u{1F4A1} Note: License login (mdf license:login) only gets TOKEN.\n   Publishing requires explicitly setting a license key."
               );
             }
-            const workspace = await this.workspaceService.loadWorkspace();
             const { createIdentityService: createIdentityService2 } = await Promise.resolve().then(() => (init_container(), container_exports));
             let accessToken = null;
             let apiUrl = "https://app.mdfriday.com";
             try {
-              const identityService = await createIdentityService2();
+              const identityService = await createIdentityService2(workspace.getInfo().path);
               await identityService.initialize();
               accessToken = identityService.getToken();
               const serverConfig = identityService.getServerConfig();
@@ -9288,33 +9314,30 @@ var init_publish2 = __esm({
             }
             if (!accessToken) {
               throw new Error(
-                "\u274C MDFriday access token not found.\n\nPlease login first to get an access token:\n\nOption 1 - Login with email/password:\n  mdf auth:login --email <email> --password <password>\n\nOption 2 - Login with license key:\n  mdf license:login --key MDF-XXXX-XXXX-XXXX"
+                "\u274C Not authenticated.\n\nPlease login first:\n  mdf auth:login\n\nOr use license login:\n  mdf license:login --key YOUR-LICENSE-KEY"
               );
             }
             return {
               type: "mdfriday",
-              deploymentType: mdConfig.type || "share",
-              // Already merged with CLI override
               licenseKey,
-              // Required, from merged config
-              enabled: mdConfig.enabled,
               accessToken,
-              // From Identity Service
-              apiUrl
-              // From Identity Service (ServerConfig)
+              apiUrl,
+              deploymentType: mdConfig.type || "share",
+              enabled: true
             };
           default:
-            throw new Error(`Unknown publish method: ${method}`);
+            throw new Error(`Unsupported publish method: ${method}`);
         }
       }
     };
   }
 });
 
-// internal/interfaces/cli/container.ts
+// internal/application/container.ts
 var container_exports = {};
 __export(container_exports, {
   createIdentityService: () => createIdentityService,
+  createIdentityServiceForObsidian: () => createIdentityServiceForObsidian,
   createPublishAppService: () => createPublishAppService,
   createWorkspaceAppService: () => createWorkspaceAppService,
   createWorkspaceFactory: () => createWorkspaceFactory
@@ -9334,19 +9357,30 @@ function createWorkspaceAppService() {
     workspaceFactory
   });
 }
-async function createIdentityService(projectPath) {
+async function createIdentityService(workspacePath) {
   const httpClient = new NodeHttpClient();
   const workspaceAppService = createWorkspaceAppService();
-  const workspace = await workspaceAppService.loadWorkspace(projectPath);
+  const workspace = await workspaceAppService.loadWorkspace(workspacePath);
   const storageProvider = workspaceAppService.createIdentityStorage(workspace);
   const userFactory = new UserFactory({
     httpClient,
     storageProvider
   });
-  const identityAppService = new IdentityAppService({
+  return new IdentityAppService({
+    userFactory
+  });
+}
+async function createIdentityServiceForObsidian(workspacePath, httpClient) {
+  const workspaceAppService = createWorkspaceAppService();
+  const workspace = await workspaceAppService.loadWorkspace(workspacePath);
+  const storageProvider = workspaceAppService.createIdentityStorage(workspace);
+  const userFactory = new UserFactory({
+    httpClient,
+    storageProvider
+  });
+  return new IdentityAppService({
     userFactory
   });
-  return identityAppService;
 }
 function createPublishAppService() {
   const { PublishAppService: PublishAppService2 } = (init_publish2(), __toCommonJS(publish_exports2));
@@ -9362,7 +9396,7 @@ function createPublishAppService() {
   );
 }
 var init_container = __esm({
-  "internal/interfaces/cli/container.ts"() {
+  "internal/application/container.ts"() {
     "use strict";
     init_workspace2();
     init_workspace3();
@@ -9372,6 +9406,22 @@ var init_container = __esm({
   }
 });
 
+// internal/interfaces/cli/container.ts
+var container_exports2 = {};
+__export(container_exports2, {
+  createIdentityService: () => createIdentityService,
+  createIdentityServiceForObsidian: () => createIdentityServiceForObsidian,
+  createPublishAppService: () => createPublishAppService,
+  createWorkspaceAppService: () => createWorkspaceAppService,
+  createWorkspaceFactory: () => createWorkspaceFactory
+});
+var init_container2 = __esm({
+  "internal/interfaces/cli/container.ts"() {
+    "use strict";
+    init_container();
+  }
+});
+
 // internal/domain/config/type.ts
 var ConfigError, ErrConfigNotFound, ErrInvalidConfig, ErrWorkspaceNotFound, ErrConfigFileNotFound, ErrInvalidConfigFormat;
 var init_type4 = __esm({
@@ -50558,7 +50608,7 @@ __export(cli_exports, {
 module.exports = __toCommonJS(cli_exports);
 
 // internal/interfaces/cli/router.ts
-init_container();
+init_container2();
 
 // internal/interfaces/cli/commands/workspace.ts
 init_log();
@@ -52870,17 +52920,7 @@ var ServeCommand = class {
         },
         onSuccess: async () => {
           if (options.publish && this.publishAppService) {
-            const publishOptions = {};
-            if (options.type)
-              publishOptions.type = options.type;
-            if (options.licenseKey)
-              publishOptions.licenseKey = options.licenseKey;
-            await this.autoPublish(
-              project,
-              options.publish,
-              options.publishDelay,
-              publishOptions
-            );
+            await this.autoPublish(workspace, project, options.publish, options.publishDelay);
           }
         }
       };
@@ -52980,7 +53020,7 @@ Press Ctrl+C to stop`,
   /**
    * 自动发布（带防抖）
    */
-  async autoPublish(project, method, delayMs, options) {
+  async autoPublish(workspace, project, method, delayMs) {
     if (this.publishTimer) {
       clearTimeout(this.publishTimer);
     }
@@ -52995,17 +53035,11 @@ Press Ctrl+C to stop`,
           clearOnComplete: true
         });
         const startTime = Date.now();
-        const publishOptions = { incremental: true };
-        if (options && (options.type || options.licenseKey)) {
-          publishOptions.config = {
-            type: options.type,
-            licenseKey: options.licenseKey
-          };
-        }
+        const config = await this.publishAppService.prepareFinalConfig(workspace, project, method);
         const result = await this.publishAppService.publish(
           project,
-          method,
-          publishOptions,
+          config,
+          { incremental: true },
           (progress) => {
             progressBar.update(progress.percentage, progress.message);
           }
@@ -53186,7 +53220,7 @@ var SnapshotDeleteCommand = class {
 };
 
 // internal/interfaces/cli/commands/auth.ts
-init_container();
+init_container2();
 init_log();
 var log90 = getDomainLogger("auth-command", { component: "cli" });
 async function getIdentityService() {
@@ -54335,18 +54369,22 @@ var PublishCommand = class {
   description = "Publish project to hosting platform";
   async execute(args, options) {
     try {
-      const method = args[0];
+      const subcommand = args[0];
+      if (subcommand === "test") {
+        return await this.executeTest(args.slice(1), options);
+      }
+      const method = subcommand;
       if (!method || !["ftp", "netlify", "mdfriday"].includes(method)) {
         return {
           success: false,
-          message: "Please specify publish method: ftp, netlify, or mdfriday\n\nUsage:\n  mdf publish ftp [options]\n  mdf publish netlify [options]\n  mdf publish mdfriday [options]\n\nOptions:\n  --project <name>      Project to publish\n  --force               Force full publish (ignore incremental)\n  --verbose             Show detailed progress\n\nFTP Options:\n  --host <host>         FTP server host\n  --username <user>     FTP username\n  --password <pass>     FTP password\n  --remote-path <path>  Remote directory path\n\nExamples:\n  mdf publish ftp\n  mdf publish ftp --project my-blog\n  mdf publish ftp --host ftp.example.com --username admin"
+          message: "Please specify publish method: ftp, netlify, or mdfriday\n\nUsage:\n  mdf publish ftp [options]\n  mdf publish netlify [options]\n  mdf publish mdfriday [options]\n  mdf publish test <method>\n\nOptions:\n  --project <name>      Project to publish\n  --force               Force full publish (ignore incremental)\n  --verbose             Show detailed progress\n\nConfiguration:\n  All publish settings are configured via config command:\n    mdf config:set publish.<method>.<key> <value> --global\n    mdf config:set publish.<method>.<key> <value> (project-level)\n\nExamples:\n  mdf publish ftp\n  mdf publish ftp --project my-blog --force\n  mdf publish test ftp"
         };
       }
       const { workspace, project } = await this.workspaceAppService.loadWorkspaceAndProject(
         options.project
       );
       log92.info(`Publishing project: ${project.getName()} to ${method}`);
-      const configOverride = this.parseConfigOverride(method, options);
+      const config = await this.publishService.prepareFinalConfig(workspace, project, method);
       const progressBar = new ProgressBar({
         width: 30,
         showPercentage: true,
@@ -54354,17 +54392,10 @@ var PublishCommand = class {
         clearOnComplete: true
       });
       const startTime = Date.now();
-      const appPublishOptions = {};
-      if (options.force) {
-        appPublishOptions.force = true;
-      }
-      if (configOverride) {
-        appPublishOptions.config = configOverride;
-      }
       const result = await this.publishService.publish(
         project,
-        method,
-        appPublishOptions,
+        config,
+        options.force ? { force: true } : {},
         (progress) => {
           if (options.verbose) {
             console.log(
@@ -54424,40 +54455,48 @@ var PublishCommand = class {
     }
   }
   /**
-   * Parse config override from command line options
+   * Execute test connection command
    */
-  parseConfigOverride(method, options) {
-    switch (method) {
-      case "ftp":
-        if (options.host || options.username) {
-          return {
-            host: options.host,
-            port: options.port || 21,
-            username: options.username,
-            password: options.password,
-            remotePath: options.remotePath || "/",
-            secure: options.secure !== false
-          };
-        }
-        break;
-      case "netlify":
-        if (options.siteId || options.token) {
-          return {
-            siteId: options.siteId,
-            accessToken: options.token
-          };
-        }
-        break;
-      case "mdfriday":
-        if (options.type || options.licenseKey) {
-          return {
-            type: options.type,
-            licenseKey: options.licenseKey
-          };
-        }
-        break;
+  async executeTest(args, options) {
+    try {
+      const method = args[0];
+      if (!method || !["ftp", "netlify", "mdfriday"].includes(method)) {
+        return {
+          success: false,
+          message: "Please specify publish method to test: ftp, netlify, or mdfriday\n\nUsage:\n  mdf publish test ftp\n  mdf publish test netlify\n  mdf publish test mdfriday\n\nOptions:\n  --project <name>      Project to test (optional)\n\nConfiguration:\n  All publish settings are configured via config command:\n    mdf config:set publish.<method>.<key> <value> --global\n    mdf config:set publish.<method>.<key> <value> (project-level)\n\nExamples:\n  mdf publish test ftp\n  mdf publish test netlify"
+        };
+      }
+      const { workspace, project } = await this.workspaceAppService.loadWorkspaceAndProject(
+        options.project
+      );
+      log92.info(`Testing ${method} connection for project: ${project.getName()}`);
+      const config = await this.publishService.prepareFinalConfig(workspace, project, method);
+      console.log(`
+Testing ${method.toUpperCase()} connection...`);
+      console.log("Configuration priority: Project config > Global config\n");
+      const result = await this.publishService.testConnection(project, config);
+      if (result.success) {
+        return {
+          success: true,
+          message: `
+\u2713 ${method.toUpperCase()} connection test passed!`
+        };
+      } else {
+        return {
+          success: false,
+          message: `
+\u2717 ${method.toUpperCase()} connection test failed: ${result.error}`,
+          error: new Error(result.error)
+        };
+      }
+    } catch (error) {
+      log92.error("Test connection command failed", error);
+      return {
+        success: false,
+        message: `Test connection failed: ${error.message}`,
+        error
+      };
     }
-    return void 0;
   }
 };
 
@@ -54480,7 +54519,7 @@ var CommandRegistry = class {
     this.register(new ProjectShowCommand(workspaceAppService));
     this.register(new ProjectDeleteCommand(workspaceAppService));
     this.register(new BuildCommand(workspaceAppService));
-    const { createPublishAppService: createPublishAppService2 } = (init_container(), __toCommonJS(container_exports));
+    const { createPublishAppService: createPublishAppService2 } = (init_container2(), __toCommonJS(container_exports2));
     const publishAppService = createPublishAppService2();
     this.register(new PublishCommand(publishAppService, workspaceAppService));
     this.register(new ServeCommand(workspaceAppService, publishAppService));
@@ -54832,7 +54871,7 @@ For more information, visit: https://help.mdfriday.com
    * Show version
    */
   showVersion() {
-    const version = "26.3.8";
+    const version = "26.3.9";
     return {
       success: true,
       message: `MDFriday CLI v${version}`

package/dist/index.d.ts

@@ -3,4 +3,4 @@ export { processSSGParallel, ParallelSSGStats } from './internal/application/ssg
 export { startIncrementalBuild, IncrementalBuildConfig, IncrementalBuildCoordinator } from './internal/application/incremental-ssg';
 export { MarkdownRenderer, AutoIDGenerator, ParsingResult, Header, TocFragments, Link, Paragraph } from './internal/domain/markdown';
 export { PageTask } from './pkg/page-filter';
-export { ObsidianWorkspaceService, createObsidianWorkspaceService, ObsidianWorkspaceInitOptions, ObsidianWorkspaceInfo, ObsidianWorkspaceResult, ObsidianProjectService, createObsidianProjectService, ObsidianProjectCreateOptions, ObsidianProjectInfo, ObsidianProjectResult, ObsidianBuildService, createObsidianBuildService, ObsidianBuildOptions, ObsidianBuildResult, ObsidianGlobalConfigService, ObsidianProjectConfigService, createObsidianGlobalConfigService, createObsidianProjectConfigService, ObsidianConfigResult, ConfigGetResult, ConfigListResult, ObsidianPublishService, createObsidianPublishService, ObsidianPublishMethod, ObsidianPublishOptions, ObsidianPublishProgress, ObsidianPublishResult, ObsidianTestConnectionResult, ObsidianServeService, createObsidianServeService, ObsidianServeOptions, ObsidianServeResult, ObsidianServeProgress, ObsidianLicenseService, createObsidianLicenseService, ObsidianLicenseInfo, ObsidianLicenseUsage, ObsidianLicenseResult, ObsidianAuthService, createObsidianAuthService, ObsidianAuthStatus, ObsidianServerConfig, ObsidianAuthResult, ObsidianDomainService, createObsidianDomainService, ObsidianDomainInfo, ObsidianSubdomainCheckResult, ObsidianSubdomainUpdateResult, ObsidianCustomDomainCheckResult, ObsidianCustomDomainAddResult, ObsidianHttpsCertificate, ObsidianHttpsStatusResult, ObsidianDomainResult, createWorkspaceAppService, createWorkspaceFactory, type HttpClient, type HttpResponse, } from './internal/interfaces/obsidian';
+export { ObsidianWorkspaceService, createObsidianWorkspaceService, ObsidianWorkspaceInitOptions, ObsidianWorkspaceInfo, ObsidianWorkspaceResult, ObsidianProjectService, createObsidianProjectService, ObsidianProjectCreateOptions, ObsidianProjectInfo, ObsidianProjectResult, ObsidianBuildService, createObsidianBuildService, ObsidianBuildOptions, ObsidianBuildResult, ObsidianGlobalConfigService, ObsidianProjectConfigService, createObsidianGlobalConfigService, createObsidianProjectConfigService, ObsidianConfigResult, ConfigGetResult, ConfigListResult, ObsidianPublishService, createObsidianPublishService, ObsidianPublishMethod, ObsidianPublishOptions, ObsidianPublishProgress, ObsidianPublishResult, ObsidianTestConnectionResult, ObsidianServeService, createObsidianServeService, ObsidianServeOptions, ObsidianServeResult, ObsidianServeProgress, ObsidianLicenseService, createObsidianLicenseService, ObsidianLicenseInfo, ObsidianLicenseUsage, ObsidianLicenseResult, ObsidianAuthService, createObsidianAuthService, ObsidianAuthStatus, ObsidianServerConfig, ObsidianAuthResult, ObsidianDomainService, createObsidianDomainService, ObsidianDomainInfo, ObsidianSubdomainCheckResult, ObsidianSubdomainUpdateResult, ObsidianCustomDomainCheckResult, ObsidianCustomDomainAddResult, ObsidianHttpsCertificate, ObsidianHttpsStatusResult, ObsidianDomainResult, createWorkspaceAppService, createWorkspaceFactory, type PublishHttpClient, type PublishHttpResponse, type IdentityHttpClient, type IdentityHttpResponse, type AnyPublishConfig, type FTPConfig, type NetlifyConfig, type MDFridayConfig, } from './internal/interfaces/obsidian';