@mdfriday/foundry 26.4.12 → 26.4.14

package/dist/cli.js

@@ -2646,8 +2646,8 @@ var init_user_factory = __esm({
        */
       async loadServerConfig() {
         try {
-          const config = await this.storageProvider.loadServerConfig();
-          return config;
+          const userData = await this.storageProvider.loadUserData();
+          return userData?.serverConfig || null;
         } catch (error) {
           log4.debug("No server config found in storage");
           return null;
@@ -2739,7 +2739,7 @@ var init_user_factory = __esm({
        */
       async logout() {
         try {
-          await this.storageProvider.clearToken();
+          await this.storageProvider.clearUserData();
           log4.info("Logout successful");
         } catch (error) {
           log4.error("Logout failed", error);
@@ -4084,56 +4084,6 @@ var init_workspace_factory = __esm({
             } catch {
             }
             authentication.markAuthDeleted();
-          },
-          // 保留旧方法以向后兼容
-          async saveToken(token) {
-            const authPath = fsRepo.join(workspacePath, ".mdfriday", "auth-token.json");
-            await fsRepo.createDirectory(fsRepo.dirname(authPath), true);
-            await fsRepo.writeFile(authPath, JSON.stringify(token.toJSON(), null, 2));
-            authentication.markAuthExists();
-          },
-          async loadToken() {
-            const userData = await this.loadUserData();
-            if (userData?.token) {
-              return userData.token;
-            }
-            const authPath = fsRepo.join(workspacePath, ".mdfriday", "auth-token.json");
-            try {
-              const content = await fsRepo.readFile(authPath, "utf-8");
-              const data = JSON.parse(content);
-              const { Token: Token3 } = await Promise.resolve().then(() => (init_identity(), identity_exports));
-              return Token3.create(data.token, data.expiresAt);
-            } catch {
-              return null;
-            }
-          },
-          async clearToken() {
-            const authPath = fsRepo.join(workspacePath, ".mdfriday", "auth-token.json");
-            try {
-              await fsRepo.unlink(authPath);
-            } catch {
-            }
-            authentication.markAuthDeleted();
-          },
-          async saveServerConfig(config) {
-            const configPath = fsRepo.join(workspacePath, ".mdfriday", "auth-config.json");
-            await fsRepo.createDirectory(fsRepo.dirname(configPath), true);
-            await fsRepo.writeFile(configPath, JSON.stringify(config.toJSON(), null, 2));
-          },
-          async loadServerConfig() {
-            const userData = await this.loadUserData();
-            if (userData?.serverConfig) {
-              return userData.serverConfig;
-            }
-            const configPath = fsRepo.join(workspacePath, ".mdfriday", "auth-config.json");
-            try {
-              const content = await fsRepo.readFile(configPath, "utf-8");
-              const data = JSON.parse(content);
-              const { ServerConfig: ServerConfig2 } = await Promise.resolve().then(() => (init_identity(), identity_exports));
-              return ServerConfig2.create(data.apiUrl, data.websiteUrl);
-            } catch {
-              return null;
-            }
           }
         };
       }
@@ -4640,18 +4590,12 @@ var init_identity2 = __esm({
        */
       async initialize() {
         try {
-          [this.currentUser, this.cachedServerConfig] = await Promise.all([
-            this.userFactory.load(),
-            this.userFactory.loadServerConfig()
-          ]);
+          this.currentUser = await this.userFactory.load();
           if (this.currentUser) {
-            log7.info("User session restored");
+            this.cachedServerConfig = this.currentUser.getServerConfig();
           } 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);
         }
@@ -55371,7 +55315,7 @@ For more information, visit: https://help.mdfriday.com
    * Show version
    */
   showVersion() {
-    const version = "26.4.12";
+    const version = "26.4.14";
     return {
       success: true,
       message: `MDFriday CLI v${version}`

package/dist/index.d.ts

@@ -3,4 +3,11 @@ 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, ObsidianSyncConfig, ObsidianServerConfig, ObsidianAuthResult, ObsidianDomainService, createObsidianDomainService, ObsidianDomainInfo, ObsidianSubdomainCheckResult, ObsidianSubdomainUpdateResult, ObsidianCustomDomainCheckResult, ObsidianCustomDomainAddResult, ObsidianHttpsCertificate, ObsidianHttpsStatusResult, ObsidianDomainResult, createWorkspaceAppService, createWorkspaceFactory, createObsidianWorkspaceAppService, createObsidianIdentityService, type ObsidianEnvironmentConfig, type ObsidianFullPersistenceConfig, type ObsidianBasicPersistenceConfig, isFullPersistenceConfig, type WorkspaceRepository, type ProjectRepository, type SnapshotRepository, type FileSystemRepository, type WorkspaceMetadataData, type ProjectMetadataData, type ProjectRegistry, type ProjectEntry, type BuildHistoryEntry, type SnapshotMetadata, type FolderStructure, type FolderScanResult, type ContentFolderInfo, type StaticFolderInfo, type SymlinkResult, type PublishHttpClient, type PublishHttpResponse, type IdentityHttpClient, type IdentityHttpResponse, type AnyPublishConfig, type FTPConfig, type NetlifyConfig, type MDFridayConfig, type SyncConfig, type SyncConfigData, } from './internal/interfaces/obsidian';
+export { createObsidianWorkspaceService, createObsidianAuthService, createObsidianLicenseService, createObsidianGlobalConfigService, createObsidianProjectConfigService, createObsidianProjectService, createObsidianBuildService, createObsidianServeService, createObsidianPublishService, createObsidianDomainService, createWorkspaceAppService, createWorkspaceFactory, createObsidianWorkspaceAppService, createObsidianIdentityService, getIdentityService, } from './internal/interfaces/obsidian/desktop';
+export { type ObsidianWorkspaceInitOptions, type ObsidianWorkspaceInfo, type ObsidianWorkspaceResult, type ObsidianAuthStatus, type ObsidianSyncConfig, type ObsidianServerConfig, type ObsidianAuthResult, type ObsidianLicenseInfo, type ObsidianLicenseUsage, type ObsidianLicenseResult, type ObsidianConfigResult, type ConfigGetResult, type ConfigListResult, type WorkspaceRepository, type ProjectRepository, type SnapshotRepository, type FileSystemRepository, type WorkspaceMetadataData, type ProjectMetadataData, type ProjectRegistry, type ProjectEntry, type BuildHistoryEntry, type SnapshotMetadata, type FolderStructure, type FolderScanResult, type ContentFolderInfo, type StaticFolderInfo, type SymlinkResult, type PublishHttpClient, type PublishHttpResponse, type IdentityHttpClient, type IdentityHttpResponse, type AnyPublishConfig, type FTPConfig, type NetlifyConfig, type MDFridayConfig, type SyncConfig, type SyncConfigData, } from './internal/interfaces/obsidian';
+export { type ObsidianProjectCreateOptions, type ObsidianProjectInfo, type ObsidianProjectResult, type ObsidianFolderStructureInfo, type ObsidianBuildOptions, type ObsidianBuildResult, type ObsidianServeOptions, type ObsidianServeResult, type ObsidianServeProgress, type ObsidianPublishMethod, type ObsidianPublishOptions, type ObsidianPublishProgress, type ObsidianPublishResult, type ObsidianTestConnectionResult, type ObsidianDomainInfo, type ObsidianSubdomainCheckResult, type ObsidianSubdomainUpdateResult, type ObsidianCustomDomainCheckResult, type ObsidianCustomDomainAddResult, type ObsidianHttpsCertificate, type ObsidianHttpsStatusResult, type ObsidianDomainResult, } from './internal/interfaces/obsidian/types';
+export { ObsidianProjectService, } from './internal/interfaces/obsidian/services/project.service';
+export { ObsidianBuildService, } from './internal/interfaces/obsidian/services/build.service';
+export { ObsidianServeService, } from './internal/interfaces/obsidian/services/serve.service';
+export { ObsidianPublishService, } from './internal/interfaces/obsidian/services/publish.service';
+export { ObsidianDomainService, } from './internal/interfaces/obsidian/services/domain.service';