refactor: 重构项目结构

terwer · Sep 2, 2023 · 9629fbc · 9629fbc
1 parent 3f90230
commit 9629fbc
Show file tree

Hide file tree

Showing 44 changed files with 411 additions and 77 deletions.
diff --git a/src/adaptors/api/base/baseBlogApi.ts b/src/adaptors/api/base/baseBlogApi.ts
@@ -24,7 +24,7 @@
  */
 
 import { BlogApi, BlogConfig, Post, YamlConvertAdaptor } from "zhi-blog-api"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { createAppLogger, ILogger } from "~/src/utils/appLogger.ts"
 import { useProxy } from "~/src/composables/useProxy.ts"
 import { BaseExtendApi } from "~/src/adaptors/base/baseExtendApi.ts"
@@ -48,7 +48,7 @@ export class BaseBlogApi extends BlogApi {
    * @param appInstance 应用实例
    * @param cfg 配置项
    */
-  constructor(appInstance: AppInstance, cfg: BlogConfig) {
+  constructor(appInstance: PublisherAppInstance, cfg: BlogConfig) {
     super()
 
     this.cfg = cfg

diff --git a/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.spec.ts b/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.spec.ts
@@ -24,12 +24,12 @@
  */
 
 import { describe, it } from "vitest"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { CommonGitlabConfig } from "~/src/adaptors/api/base/gitlab/commonGitlabConfig.ts"
 import { CommonGitlabApiAdaptor } from "~/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.ts"
 
 describe("test commonGitlabApiAdaptor", () => {
-  const appInstance = new AppInstance()
+  const appInstance = new PublisherAppInstance()
   const gitlabCfg = new CommonGitlabConfig("terwer", "", "terwer-github-io", "main")
   gitlabCfg.apiUrl = "http://localhost:8002"
   gitlabCfg.home = "http://localhost:8002"

diff --git a/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.ts b/src/adaptors/api/base/gitlab/commonGitlabApiAdaptor.ts
@@ -24,7 +24,7 @@
  */
 
 import { BaseBlogApi } from "~/src/adaptors/api/base/baseBlogApi.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { CommonGitlabConfig } from "~/src/adaptors/api/base/gitlab/commonGitlabConfig.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { CommonGitlabClient } from "zhi-gitlab-middleware"
@@ -44,7 +44,7 @@ import { isDev } from "~/src/utils/constants.ts"
 class CommonGitlabApiAdaptor extends BaseBlogApi {
   private gitlabClient: CommonGitlabClient
 
-  constructor(appInstance: AppInstance, cfg: CommonGitlabConfig) {
+  constructor(appInstance: PublisherAppInstance, cfg: CommonGitlabConfig) {
     super(appInstance, cfg)
     this.logger = createAppLogger("common-gitlab-api-adaptor")
 

diff --git a/src/adaptors/api/cnblogs/cnblogsApiAdaptor.ts b/src/adaptors/api/cnblogs/cnblogsApiAdaptor.ts
@@ -25,7 +25,7 @@
 
 import { CategoryInfo, Post, UserBlog } from "zhi-blog-api"
 import { CnblogsConfig } from "~/src/adaptors/api/cnblogs/cnblogsConfig.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { CnblogsConstants } from "~/src/adaptors/api/cnblogs/cnblogsConstants.ts"
 import { MetaweblogBlogApiAdaptor } from "~/src/adaptors/api/base/metaweblog/metaweblogBlogApiAdaptor.ts"
@@ -49,7 +49,7 @@ class CnblogsApiAdaptor extends MetaweblogBlogApiAdaptor {
    * @param appInstance 应用实例
    * @param cfg 配置项
    */
-  constructor(appInstance: AppInstance, cfg: CnblogsConfig) {
+  constructor(appInstance: PublisherAppInstance, cfg: CnblogsConfig) {
     super(appInstance, cfg)
     this.logger = createAppLogger("cnblogs-api-adaptor")
     this.cfg.blogid = "cnblogs"

diff --git a/src/adaptors/api/cnblogs/useCnblogsApi.ts b/src/adaptors/api/cnblogs/useCnblogsApi.ts
@@ -27,7 +27,7 @@ import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { Utils } from "~/src/utils/utils.ts"
 import { CnblogsConfig } from "~/src/adaptors/api/cnblogs/cnblogsConfig.ts"
 import { CnblogsApiAdaptor } from "~/src/adaptors/api/cnblogs/cnblogsApiAdaptor.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
 import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
 import { getDynPostidKey } from "~/src/platforms/dynamicConfig.ts"
@@ -50,7 +50,7 @@ export const useCnblogsApi = async (key?: string, newCfg?: CnblogsConfig) => {
   logger.info("Start using Cnblogs API...")
 
   // 创建应用实例
-  const appInstance = new AppInstance()
+  const appInstance = new PublisherAppInstance()
 
   let cfg: CnblogsConfig
   if (newCfg) {

diff --git a/src/adaptors/api/gitlab-hexo/useGitlabhexoApi.ts b/src/adaptors/api/gitlab-hexo/useGitlabhexoApi.ts
@@ -24,7 +24,7 @@
  */
 
 import { createAppLogger } from "~/src/utils/appLogger.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
 import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
 import { Utils } from "~/src/utils/utils.ts"
@@ -42,7 +42,7 @@ const useGitlabhexoApi = async (key: string, newCfg?: GitlabhexoConfig) => {
   logger.info("Start using Gitlabhexo API...")
 
   // 创建应用实例
-  const appInstance = new AppInstance()
+  const appInstance = new PublisherAppInstance()
 
   let cfg: GitlabhexoConfig
   if (newCfg) {

diff --git a/src/adaptors/api/hexo/useHexoApi.ts b/src/adaptors/api/hexo/useHexoApi.ts
@@ -24,7 +24,7 @@
  */
 
 import { createAppLogger } from "~/src/utils/appLogger.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
 import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
 import { Utils } from "~/src/utils/utils.ts"
@@ -42,7 +42,7 @@ const useHexoApi = async (key: string, newCfg?: HexoConfig) => {
   logger.info("Start using Hexo API...")
 
   // 创建应用实例
-  const appInstance = new AppInstance()
+  const appInstance = new PublisherAppInstance()
 
   let cfg: HexoConfig
   if (newCfg) {

diff --git a/src/adaptors/api/metaweblog/useMetaweblogApi.ts b/src/adaptors/api/metaweblog/useMetaweblogApi.ts
@@ -25,7 +25,7 @@
 
 import { MetaweblogConfig } from "~/src/adaptors/api/base/metaweblog/metaweblogConfig.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
 import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
 import { Utils } from "~/src/utils/utils.ts"
@@ -50,7 +50,7 @@ export const useMetaweblogApi = async (key?: string, newCfg?: MetaweblogConfig)
   logger.info("Start using Metaweblog API...")
 
   // 创建应用实例
-  const appInstance = new AppInstance()
+  const appInstance = new PublisherAppInstance()
 
   let cfg: MetaweblogConfig
   if (newCfg) {

diff --git a/src/adaptors/api/notion/useNotionApi.ts b/src/adaptors/api/notion/useNotionApi.ts
@@ -24,7 +24,7 @@
  */
 
 import { createAppLogger } from "~/src/utils/appLogger.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { Utils } from "~/src/utils/utils.ts"
 import { NotionConfig } from "~/src/adaptors/api/notion/notionConfig.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
@@ -41,7 +41,7 @@ const useNotionApi = async (key: string, newCfg?: NotionConfig) => {
   logger.info("Start using Notion API...")
 
   // 创建应用实例
-  const appInstance = new AppInstance()
+  const appInstance = new PublisherAppInstance()
 
   let cfg: NotionConfig
   if (newCfg) {

diff --git a/src/adaptors/api/typecho/typechoApiAdaptor.ts b/src/adaptors/api/typecho/typechoApiAdaptor.ts
@@ -23,7 +23,7 @@
  * questions.
  */
 
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { TypechoConfig } from "~/src/adaptors/api/typecho/typechoConfig.ts"
 import { MetaweblogBlogApiAdaptor } from "~/src/adaptors/api/base/metaweblog/metaweblogBlogApiAdaptor.ts"
@@ -42,7 +42,7 @@ class TypechoApiAdaptor extends MetaweblogBlogApiAdaptor {
    * @param appInstance 应用实例
    * @param cfg 配置项
    */
-  constructor(appInstance: AppInstance, cfg: TypechoConfig) {
+  constructor(appInstance: PublisherAppInstance, cfg: TypechoConfig) {
     super(appInstance, cfg)
     this.logger = createAppLogger("typecho-api-adaptor")
     this.cfg.blogid = "typecho"

diff --git a/src/adaptors/api/typecho/useTypechoApi.ts b/src/adaptors/api/typecho/useTypechoApi.ts
@@ -24,7 +24,7 @@
  */
 
 import { createAppLogger } from "~/src/utils/appLogger.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { Utils } from "~/src/utils/utils.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
 import { TypechoConfig } from "~/src/adaptors/api/typecho/typechoConfig.ts"
@@ -50,7 +50,7 @@ export const useTypechoApi = async (key?: string, newCfg?: TypechoConfig) => {
   logger.info("Start using Typecho API...")
 
   // 创建应用实例
-  const appInstance = new AppInstance()
+  const appInstance = new PublisherAppInstance()
 
   let cfg: TypechoConfig
   if (newCfg) {

diff --git a/src/adaptors/api/wordpress/useWordpressApi.ts b/src/adaptors/api/wordpress/useWordpressApi.ts
@@ -24,7 +24,7 @@
  */
 
 import { createAppLogger } from "~/src/utils/appLogger.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { Utils } from "~/src/utils/utils.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
 import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
@@ -50,7 +50,7 @@ export const useWordpressApi = async (key?: string, newCfg?: WordpressConfig) =>
   logger.info("Start using Wordpress API...")
 
   // 创建应用实例
-  const appInstance = new AppInstance()
+  const appInstance = new PublisherAppInstance()
 
   let cfg: WordpressConfig
   if (newCfg) {

diff --git a/src/adaptors/api/wordpress/wordpressApiAdaptor.ts b/src/adaptors/api/wordpress/wordpressApiAdaptor.ts
@@ -24,7 +24,7 @@
  */
 
 import { WordpressConfig } from "~/src/adaptors/api/wordpress/wordpressConfig.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { MetaweblogBlogApiAdaptor } from "~/src/adaptors/api/base/metaweblog/metaweblogBlogApiAdaptor.ts"
 
@@ -42,7 +42,7 @@ class WordpressApiAdaptor extends MetaweblogBlogApiAdaptor {
    * @param appInstance 应用实例
    * @param cfg 配置项
    */
-  constructor(appInstance: AppInstance, cfg: WordpressConfig) {
+  constructor(appInstance: PublisherAppInstance, cfg: WordpressConfig) {
     super(appInstance, cfg)
     this.logger = createAppLogger("wordpress-api-adaptor")
     this.cfg.blogid = "wordpress"

diff --git a/src/adaptors/api/yuque/useYuqueApi.ts b/src/adaptors/api/yuque/useYuqueApi.ts
@@ -24,7 +24,7 @@
  */
 
 import { createAppLogger } from "~/src/utils/appLogger.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { Utils } from "~/src/utils/utils.ts"
 import { YuqueConfig } from "~/src/adaptors/api/yuque/yuqueConfig.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
@@ -41,7 +41,7 @@ const useYuqueApi = async (key: string, newCfg?: YuqueConfig) => {
   logger.info("Start using Yuque API...")
 
   // 创建应用实例
-  const appInstance = new AppInstance()
+  const appInstance = new PublisherAppInstance()
 
   let cfg: YuqueConfig
   if (newCfg) {

diff --git a/src/adaptors/web/base/baseWebApi.ts b/src/adaptors/web/base/baseWebApi.ts
@@ -23,7 +23,7 @@
  * questions.
  */
 import { Attachment, ElectronCookie, MediaObject, Post, WebApi, WebConfig, YamlConvertAdaptor } from "zhi-blog-api"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { createAppLogger, ILogger } from "~/src/utils/appLogger.ts"
 import { useProxy } from "~/src/composables/useProxy.ts"
 import { BaseExtendApi } from "~/src/adaptors/base/baseExtendApi.ts"
@@ -47,7 +47,7 @@ class BaseWebApi extends WebApi {
    * @param appInstance 应用实例
    * @param cfg 配置项
    */
-  constructor(appInstance: AppInstance, cfg: WebConfig) {
+  constructor(appInstance: PublisherAppInstance, cfg: WebConfig) {
     super()
 
     this.cfg = cfg

diff --git a/src/adaptors/web/csdn/csdnUtils.spec.ts b/src/adaptors/web/csdn/csdnUtils.spec.ts
@@ -33,7 +33,8 @@ describe("test csdnUtils", () => {
   })
 
   it("test generateXCaSignature", () => {
-    const url = "https://bizapi.csdn.net/blog-console-api/v1/user/info"
+    // const url = "https://bizapi.csdn.net/blog-console-api/v1/user/info"
+    const url = "https://bizapi.csdn.net/blog/phoenix/console/v1/column/list?type=all"
     const method = "GET"
     const accept = "*/*"
 
@@ -43,4 +44,18 @@ describe("test csdnUtils", () => {
     console.log("x-ca-nonce:", xCaNonce)
     console.log("x-ca-signature:", xCaSignature)
   })
+
+  it("test generateXCaSignature2", () => {
+    // const url = "https://bizapi.csdn.net/blog/phoenix/console/v1/column/save"
+    const url = "https://bizapi.csdn.net/blog/phoenix/console/v1/column/upgrade-column-pay"
+    const method = "POST"
+    const accept = "*/*"
+    const contentType = "application/json"
+
+    const xCaNonce = CsdnUtils.generateXCaNonce()
+    const xCaSignature = CsdnUtils.generateXCaSignature(url, method, accept, xCaNonce, contentType)
+
+    console.log("x-ca-nonce:", xCaNonce)
+    console.log("x-ca-signature:", xCaSignature)
+  })
 })
diff --git a/src/adaptors/web/csdn/csdnWebAdaptor.ts b/src/adaptors/web/csdn/csdnWebAdaptor.ts
@@ -26,10 +26,11 @@
 import { BaseWebApi } from "~/src/adaptors/web/base/baseWebApi.ts"
 import CsdnUtils from "~/src/adaptors/web/csdn/csdnUtils.ts"
 import { CsdnConfig } from "~/src/adaptors/web/csdn/csdnConfig.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { CommonFetchClient } from "zhi-fetch-middleware"
 import { isDev } from "~/src/utils/constants.ts"
+import { UserBlog } from "zhi-blog-api"
 
 /**
  * CSDN网页授权适配器
@@ -48,7 +49,7 @@ class CsdnWebAdaptor extends BaseWebApi {
    * @param appInstance 应用实例
    * @param cfg 配置项
    */
-  constructor(appInstance: AppInstance, cfg: CsdnConfig) {
+  constructor(appInstance: PublisherAppInstance, cfg: CsdnConfig) {
     super(appInstance, cfg)
     this.cfg = cfg
 
@@ -74,6 +75,13 @@ class CsdnWebAdaptor extends BaseWebApi {
     }
   }
 
+  public async getUsersBlogs(): Promise<Array<UserBlog>> {
+    let result: UserBlog[] = []
+
+    this.logger.debug("getUsersBlogs=>", result)
+    return result
+  }
+
   // ================
   // private methods
   // ================

diff --git a/src/adaptors/web/csdn/useCsdnWeb.ts b/src/adaptors/web/csdn/useCsdnWeb.ts
@@ -25,7 +25,7 @@
 
 import { CsdnConfig } from "~/src/adaptors/web/csdn/csdnConfig.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
 import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
 import { Utils } from "~/src/utils/utils.ts"
@@ -44,7 +44,7 @@ const useCsdnWeb = async (key?: string, newCfg?: CsdnConfig) => {
   logger.info("Start using Csdn WebAuth...")
 
   // 创建应用实例
-  const appInstance = new AppInstance()
+  const appInstance = new PublisherAppInstance()
   let cfg: CsdnConfig
   if (newCfg) {
     logger.info("Initialize with the latest newCfg passed in...")

diff --git a/src/adaptors/web/jianshu/useJianshuWeb.ts b/src/adaptors/web/jianshu/useJianshuWeb.ts
@@ -25,7 +25,7 @@
 
 import { JianshuConfig } from "~/src/adaptors/web/jianshu/jianshuConfig.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
 import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
 import { Utils } from "~/src/utils/utils.ts"
@@ -43,7 +43,7 @@ const useJianshuWeb = async (key?: string, newCfg?: JianshuConfig) => {
   logger.info("Start using Jianshu WebAuth...")
 
   // 创建应用实例
-  const appInstance = new AppInstance()
+  const appInstance = new PublisherAppInstance()
   let cfg: JianshuConfig
   if (newCfg) {
     logger.info("Initialize with the latest newCfg passed in...")

diff --git a/src/adaptors/web/juejin/useJuejinWeb.ts b/src/adaptors/web/juejin/useJuejinWeb.ts
@@ -25,7 +25,7 @@
 
 import { JuejinConfig } from "~/src/adaptors/web/juejin/juejinConfig.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
-import { AppInstance } from "~/src/appInstance.ts"
+import { PublisherAppInstance } from "~/src/publisherAppInstance.ts"
 import { useSettingStore } from "~/src/stores/useSettingStore.ts"
 import { JsonUtil, ObjectUtil, StrUtil } from "zhi-common"
 import { Utils } from "~/src/utils/utils.ts"
@@ -43,7 +43,7 @@ const useJuejinWeb = async (key?: string, newCfg?: JuejinConfig) => {
   logger.info("Start using Juejin WebAuth...")
 
   // 创建应用实例
-  const appInstance = new AppInstance()
+  const appInstance = new PublisherAppInstance()
   let cfg: JuejinConfig
   if (newCfg) {
     logger.info("Initialize with the latest newCfg passed in...")