refactor: mount HttpServer and Generator under Joplin

src/driver/db/joplinPlugin/index.ts

@@ -1,11 +1,9 @@
 import { cloneDeep, get, set } from 'lodash';
 import joplin from 'api';
 import { Low } from 'lowdb/lib';
-import { singleton } from 'tsyringe';
 import fs from 'driver/fs/joplinPlugin';
 import { JSONFile } from './adaptor';
 
-@singleton()
 export class Db {
  private db: Low<Record<string, unknown>> | null = null;
  private ready = this.init();

src/driver/generator/joplinPlugin/PageRenderer.ts

@@ -10,7 +10,6 @@ import _, {
 } from 'lodash';
 import ejs from 'ejs';
 import moment from 'moment';
-import { container } from 'tsyringe';
 import { Feed } from 'feed';
 import Ajv from 'ajv';
 import { loadFront } from 'yaml-front-matter';
@@ -40,7 +39,6 @@ import {
 
 ejs.fileLoader = fs.readFileSync;
 
-const db = container.resolve(Db);
 const articleValidator = new Ajv().compile<Article>(ARTICLE_SCHEMA);
 const validateArticle = getValidator(articleValidator, 'Invalid article');
 
@@ -59,6 +57,8 @@ export class PageRenderer {
  generatedPages: 0,
  };
 
+ constructor(private readonly db: Db) {}
+
  async init() {
  this.progress.totalPages = 0;
  this.progress.generatedPages = 0;
@@ -79,8 +79,8 @@ export class PageRenderer {
  }
 
  private async getSite() {
- const site = await db.fetch<Site>(['site']);
- const githubInfo = await db.fetch<Github>(['github']);
+ const site = await this.db.fetch<Site>(['site']);
+ const githubInfo = await this.db.fetch<Github>(['github']);
 
  this.cname = githubInfo?.cname;
  this.site = defaultsDeep({ ...site, generatedAt: Date.now() }, DEFAULT_SITE) as Required<Site>;
@@ -96,7 +96,7 @@ export class PageRenderer {
  }
 
  const articlePageUrl = this.getPageUrl(ARTICLE_PAGE_NAME);
- const articles = (await db.fetch<Article[]>(['articles'])) || [];
+ const articles = (await this.db.fetch<Article[]>(['articles'])) || [];
 
  articles.forEach(validateArticle);
  this.articles = sortBy(filter(articles, { published: true }), ['createdAt'])
@@ -123,7 +123,8 @@ export class PageRenderer {
  throw new Error(`fail to load theme config: ${themeName}`);
  }
 
- const pagesValues = (await db.fetch<Record<string, unknown>>(['pagesValues', themeName])) || {};
+ const pagesValues =
+ (await this.db.fetch<Record<string, unknown>>(['pagesValues', themeName])) || {};
  const defaultPagesValues = mapValues(themeConfig.pages, (fields, pageName) => {
  const allFields = [...(fields || []), ...(PREDEFINED_FIELDS[pageName] || [])];
  return allFields.reduce((values, field) => {

src/driver/generator/joplinPlugin/index.ts

@@ -1,16 +1,24 @@
 import { PageRenderer } from './PageRenderer';
+import type { Db } from 'driver/db/joplinPlugin';
 
-const pageRenderer = new PageRenderer();
-export async function generateSite() {
- try {
- await pageRenderer.init();
- return await pageRenderer.outputPages();
- } catch (error) {
- console.warn(error);
- throw error;
+export class Generator {
+ private readonly pageRenderer: PageRenderer;
+
+ constructor(db: Db) {
+ this.pageRenderer = new PageRenderer(db);
  }
-}
 
-export function getProgress() {
- return pageRenderer.progress;
+ async generateSite() {
+ try {
+ await this.pageRenderer.init();
+ return await this.pageRenderer.outputPages();
+ } catch (error) {
+ console.warn(error);
+ throw error;
+ }
+ }
+
+ getProgress() {
+ return this.pageRenderer.progress;
+ }
 }

src/driver/joplin/joplinPlugin.ts

@@ -2,12 +2,13 @@ import joplinApi from 'api';
 import { SettingItemType, ViewHandle } from 'api/types';
 import type JoplinViewsPanels from 'api/JoplinViewsPanels';
 import type JoplinViewsDialogs from 'api/JoplinViewsDialogs';
-import { container } from 'tsyringe';
 import { isNumber } from 'lodash';
 
 import type { JoplinGetParams } from 'domain/service/AppService';
 import { Db } from 'driver/db/joplinPlugin';
+import { HttpServer } from 'driver/server/joplinPlugin';
 import webviewBridge from 'driver/webview/webviewBridge';
+import { Generator } from 'driver/generator/joplinPlugin';
 
 const OPEN_PAGES_PUBLISHER_COMMAND = 'openPagesPublisher';
 enum UIType {
@@ -53,7 +54,10 @@ export async function fetchAllData<T>(...[path, query]: JoplinGetParams) {
 export default class Joplin {
  private windowHandler?: ViewHandle;
  private uiType?: UIType;
- readonly db = container.resolve(Db);
+ readonly db = new Db();
+ readonly httpServer = new HttpServer();
+ readonly generator = new Generator(this.db);
+
  fetchData(...args: JoplinGetParams) {
  return fetchData(...args);
  }

src/driver/webview/webviewBridge.ts

@@ -4,18 +4,14 @@ import type { GitRequest } from 'driver/git/webviewApi';
 import type { FsRequest } from 'driver/fs/webviewApi';
 import type { GeneratorRequest } from 'driver/generator/webviewApi';
 import type { ThemeConfigRequest } from 'driver/themeLoader/webviewApi';
+import type { ServerRequest } from 'driver/server/webviewApi';
 
 import { loadTheme, loadThemes } from 'driver/themeLoader/joplinPlugin';
-import { generateSite, getProgress } from 'driver/generator/joplinPlugin';
 import { getOutputDir, getGitRepositoryDir } from 'driver/generator/joplinPlugin/pathHelper';
 import { mockNodeFsCall } from 'driver/fs/joplinPlugin';
-import type { ServerRequest } from 'driver/server/webviewApi';
-import { HttpServer } from 'driver/server/joplinPlugin';
 import type Joplin from 'driver/joplin/joplinPlugin';
 
 export default (joplin: Joplin) => {
- const httpServer = new HttpServer();
-
  return (
  request:
  | DbRequest
@@ -56,9 +52,9 @@ export default (joplin: Joplin) => {
  case 'setAsOldUser':
  return joplin.setAsOldUser();
  case 'generateSite':
- return generateSite();
+ return joplin.generator.generateSite();
  case 'getGeneratingProgress':
- return getProgress();
+ return joplin.generator.getProgress();
  case 'openNote':
  return joplin.openNote(request.payload);
  case 'getOutputDir':
@@ -70,9 +66,9 @@ export default (joplin: Joplin) => {
  case 'getJoplinPluginSetting':
  return joplin.getSettingOf(request.key);
  case 'startServer':
- return httpServer.start();
+ return joplin.httpServer.start();
  case 'closeServer':
- return httpServer.close();
+ return joplin.httpServer.close();
  default:
  throw new Error(`unknown bridge request: ${request}`);
  }