@mdfriday/foundry 26.3.20 → 26.3.22

package/dist/cli.js

@@ -4599,6 +4599,7 @@ var init_identity2 = __esm({
     IdentityAppService = class {
       userFactory;
       currentUser = null;
+      cachedServerConfig = null;
       constructor(options) {
         this.userFactory = options.userFactory;
       }
@@ -4606,16 +4607,22 @@ var init_identity2 = __esm({
       // Initialization
       // ============================================================================
       /**
-       * 初始化服务（加载已保存的用户）
+       * 初始化服务（加载已保存的用户和服务器配置）
        */
       async initialize() {
         try {
-          this.currentUser = await this.userFactory.load();
+          [this.currentUser, this.cachedServerConfig] = await Promise.all([
+            this.userFactory.load(),
+            this.userFactory.loadServerConfig()
+          ]);
           if (this.currentUser) {
             log7.info("User session restored");
           } else {
             log7.debug("No existing user session");
           }
+          if (this.cachedServerConfig) {
+            log7.debug("Server config loaded from storage");
+          }
         } catch (error) {
           log7.error("Failed to initialize identity service", error);
         }
@@ -4627,18 +4634,18 @@ var init_identity2 = __esm({
        * 用户登录
        */
       async login(email, password) {
-        const savedConfig = await this.userFactory.loadServerConfig();
-        const user = await this.userFactory.login(email, password, savedConfig || void 0);
+        const user = await this.userFactory.login(email, password, this.cachedServerConfig || void 0);
         this.currentUser = user;
+        this.cachedServerConfig = user.getServerConfig();
         return user;
       }
       /**
        * 用户注册
        */
       async register(email, password) {
-        const savedConfig = await this.userFactory.loadServerConfig();
-        const user = await this.userFactory.register(email, password, savedConfig || void 0);
+        const user = await this.userFactory.register(email, password, this.cachedServerConfig || void 0);
         this.currentUser = user;
+        this.cachedServerConfig = user.getServerConfig();
         return user;
       }
       /**
@@ -4682,7 +4689,7 @@ var init_identity2 = __esm({
           return {
             isAuthenticated: false,
             email: "",
-            serverUrl: ServerConfig.createDefault().getApiUrl(),
+            serverUrl: this.getServerConfig().getApiUrl(),
             tokenExpired: true,
             hasToken: false,
             hasLicense: false,
@@ -4703,12 +4710,14 @@ var init_identity2 = __esm({
       // ============================================================================
       /**
        * 获取服务器配置
+       * 
+       * 优先级：当前用户配置 > 缓存配置 > 默认配置
        */
       getServerConfig() {
         if (this.currentUser) {
           return this.currentUser.getServerConfig();
         }
-        return ServerConfig.createDefault();
+        return this.cachedServerConfig || ServerConfig.createDefault();
       }
       /**
        * 更新服务器配置
@@ -4718,6 +4727,7 @@ var init_identity2 = __esm({
           this.currentUser = this.userFactory.createAnonymous();
         }
         await this.userFactory.updateServerConfig(this.currentUser, updates);
+        this.cachedServerConfig = this.currentUser.getServerConfig();
       }
       // ============================================================================
       // License Management
@@ -4729,8 +4739,7 @@ var init_identity2 = __esm({
        * @returns 试用 License 信息和凭证
        */
       async requestTrial(email) {
-        const savedConfig = await this.userFactory.loadServerConfig();
-        return this.userFactory.requestTrialLicense(email, savedConfig || void 0);
+        return this.userFactory.requestTrialLicense(email, this.cachedServerConfig || void 0);
       }
       /**
        * 使用 License Key 登录
@@ -4741,9 +4750,9 @@ var init_identity2 = __esm({
        * @returns 登录成功的用户
        */
       async loginWithLicense(licenseKey) {
-        const savedConfig = await this.userFactory.loadServerConfig();
-        const user = await this.userFactory.loginWithLicense(licenseKey, savedConfig || void 0);
+        const user = await this.userFactory.loginWithLicense(licenseKey, this.cachedServerConfig || void 0);
         this.currentUser = user;
+        this.cachedServerConfig = user.getServerConfig();
         return user;
       }
       /**
@@ -4785,9 +4794,9 @@ var init_identity2 = __esm({
        * @returns 登录并激活后的 User
        */
       async requestAndActivateTrial(email) {
-        const savedConfig = await this.userFactory.loadServerConfig();
-        const user = await this.userFactory.requestAndActivateTrial(email, savedConfig || void 0);
+        const user = await this.userFactory.requestAndActivateTrial(email, this.cachedServerConfig || void 0);
         this.currentUser = user;
+        this.cachedServerConfig = user.getServerConfig();
         return user;
       }
       /**
@@ -8660,7 +8669,7 @@ var init_mdfriday_publisher = __esm({
         try {
           log12.info(`Starting MDFriday deployment from: ${sourceDir}`);
           log12.info(`Deployment type: ${this.config.deploymentType}`);
-          if (!this.config.accessToken) {
+          if (this.config.deploymentType !== "free" && !this.config.accessToken) {
             throw new Error(
               "MDFriday access token not found.\nPlease login first:\n  mdf auth login"
             );
@@ -8755,7 +8764,7 @@ var init_mdfriday_publisher = __esm({
        */
       async testConnection() {
         try {
-          if (!this.config.accessToken) {
+          if (this.config.deploymentType !== "free" && !this.config.accessToken) {
             return {
               success: false,
               error: "Access token not found. Please login first: mdf auth login"
@@ -8825,12 +8834,16 @@ var init_mdfriday_publisher = __esm({
             this.config.path || "",
             this.config.deploymentType
           );
+          const isFreeDeployment = this.config.deploymentType === "free";
+          const uploadUrl = isFreeDeployment ? `${this.getApiUrl()}/api/mdf/preview/friday?type=MDFPreview` : `${this.getApiUrl()}/api/mdf/preview?type=MDFPreview`;
+          const headers = {};
+          if (!isFreeDeployment && this.config.accessToken) {
+            headers["Authorization"] = `Bearer ${this.config.accessToken}`;
+          }
           const response = await this.httpClient.postMultipart(
-            `${this.getApiUrl()}/api/mdf/preview?type=MDFPreview`,
+            uploadUrl,
             formData,
-            {
-              "Authorization": `Bearer ${this.config.accessToken}`
-            }
+            headers
           );
           clearInterval(progressInterval);
           progressCallback?.(100);
@@ -8863,12 +8876,16 @@ var init_mdfriday_publisher = __esm({
             host_name: "MDFriday Preview",
             license_key: this.config.licenseKey || ""
           };
+          const isFreeDeployment = this.config.deploymentType === "free";
+          const deployApiUrl = isFreeDeployment ? `${this.getApiUrl()}/api/mdf/preview/friday/deploy?type=MDFPreview&id=${previewId}` : `${this.getApiUrl()}/api/mdf/preview/deploy?type=MDFPreview&id=${previewId}`;
+          const headers = {};
+          if (!isFreeDeployment && this.config.accessToken) {
+            headers["Authorization"] = `Bearer ${this.config.accessToken}`;
+          }
           const response = await this.httpClient.postMultipart(
-            `${this.getApiUrl()}/api/mdf/preview/deploy?type=MDFPreview&id=${previewId}`,
+            deployApiUrl,
             formData,
-            {
-              "Authorization": `Bearer ${this.config.accessToken}`
-            }
+            headers
           );
           if (!response.ok) {
             const errorText = await response.text();
@@ -55163,7 +55180,7 @@ For more information, visit: https://help.mdfriday.com
    * Show version
    */
   showVersion() {
-    const version = "26.3.20";
+    const version = "26.3.22";
     return {
       success: true,
       message: `MDFriday CLI v${version}`