patreon-dl 3.3.0 → 3.3.1

package/README.md

@@ -267,6 +267,12 @@ Note the URL shown in the output. Open this URL in a web browser to begin viewin
 
 ## Changelog
 
+v3.3.1
+- Fix bugs affecting library usage:
+  - `DB.getInstance()` returning same instance despite different DB path
+  - `API.getInstance()` returning same instance despite different DB instance
+  - DB not closed when downloader ends or web server stops
+
 v3.3.0
 - Fix:
   - YouTube stream fetching error ([patreon-dl-gui#28](https://github.com/patrickkfkan/patreon-dl-gui/issues/28))

package/dist/browse/api/index.d.ts

@@ -5,7 +5,6 @@ export type APIConstructor = new (...args: any[]) => APIBase;
 export type APIInstance = InstanceType<typeof API>;
 export declare class APIBase {
     name: string;
-    protected static instance: APIInstance | null;
     db: DBInstance;
     logger?: Logger | null;
     constructor(db: DBInstance, logger?: Logger | null);

package/dist/browse/api/index.js

@@ -19,10 +19,7 @@ export class APIBase {
         this.logger = logger;
     }
     static getInstance(db, logger) {
-        if (!this.instance) {
-            this.instance = new API(db, logger);
-        }
-        return this.instance;
+        return new API(db, logger);
     }
     sanitizeHTML(html) {
         return _sanitizeHTML(html, SANITIZE_HTML_OPTIONS);
@@ -35,7 +32,6 @@ export class APIBase {
         commonLog(this.logger, level, this.name, ...msg);
     }
 }
-APIBase.instance = null;
 const API = FilterAPIMixin(MediaAPIMixin(SettingsAPIMixin(ContentAPIMixin(CampaignAPIMixin(APIBase)))));
 export default API;
 //# sourceMappingURL=index.js.map

package/dist/browse/api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browse/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAiB,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrD,MAAM,qBAAqB,GAAG;IAC5B,WAAW,EAAE,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;IAC/D,iBAAiB,EAAE;QACjB,GAAG,aAAa,CAAC,QAAQ,CAAC,iBAAiB;QAC3C,GAAG,EAAE,CAAC,OAAO,CAAC;KACf;CACF,CAAC;AAEF,MAAM,OAAO,OAAO;IAOlB,YAAY,EAAc,EAAE,MAAsB;QANlD,SAAI,GAAG,KAAK,CAAC;QAOX,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,EAAc,EAAE,MAAsB;QACvD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,OAAO,aAAa,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IACpD,CAAC;IAED,GAAG,CAAC,KAAe,EAAE,GAAG,GAAU;QAChC,MAAM,kBAAkB,GAAG,GAAG,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,oBAAoB,CAChE,CAAC;QACF,IAAI,kBAAkB,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC;IACnD,CAAC;;AA5BgB,gBAAQ,GAAuB,IAAI,AAA3B,CAA4B;AA+BvD,MAAM,GAAG,GAAG,cAAc,CAAC,aAAa,CAAC,gBAAgB,CAAC,eAAe,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAExG,eAAe,GAAG,CAAC","sourcesContent":["import _sanitizeHTML from 'sanitize-html';\nimport type Logger from '../../utils/logging/Logger.js';\nimport { commonLog, type LogLevel } from '../../utils/logging/Logger.js';\nimport { CampaignAPIMixin } from './CampaignAPIMixin.js';\nimport { type DBInstance } from '../db';\nimport { ContentAPIMixin } from './ContentAPIMixin.js';\nimport { SettingsAPIMixin } from './SettingsAPIMixin.js';\nimport { MediaAPIMixin } from './MediaAPIMixin.js';\nimport { FilterAPIMixin } from './FilterAPIMixin.js';\n\nexport type APIConstructor = new (...args: any[]) => APIBase;\nexport type APIInstance = InstanceType<typeof API>;\n\nconst SANITIZE_HTML_OPTIONS = {\n  allowedTags: _sanitizeHTML.defaults.allowedTags.concat(['img']),\n  allowedAttributes: {\n    ..._sanitizeHTML.defaults.allowedAttributes,\n    '*': ['class']\n  }\n};\n\nexport class APIBase {\n  name = 'API';\n\n  protected static instance: APIInstance | null = null;\n  db: DBInstance;\n  logger?: Logger | null;\n\n  constructor(db: DBInstance, logger?: Logger | null) {\n    this.db = db;\n    this.logger = logger;\n  }\n\n  static getInstance(db: DBInstance, logger?: Logger | null) {\n    if (!this.instance) {\n      this.instance = new API(db, logger);\n    }\n    return this.instance;\n  }\n\n  sanitizeHTML(html: string) {\n    return _sanitizeHTML(html, SANITIZE_HTML_OPTIONS);\n  }\n\n  log(level: LogLevel, ...msg: any[]) {\n    const limiterStopOnError = msg.find(\n      (m) => m instanceof Error && m.message === 'LimiterStopOnError'\n    );\n    if (limiterStopOnError) {\n      return;\n    }\n    commonLog(this.logger, level, this.name, ...msg);\n  }\n}\n\nconst API = FilterAPIMixin(MediaAPIMixin(SettingsAPIMixin(ContentAPIMixin(CampaignAPIMixin(APIBase)))));\n\nexport default API;\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browse/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAiB,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrD,MAAM,qBAAqB,GAAG;IAC5B,WAAW,EAAE,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;IAC/D,iBAAiB,EAAE;QACjB,GAAG,aAAa,CAAC,QAAQ,CAAC,iBAAiB;QAC3C,GAAG,EAAE,CAAC,OAAO,CAAC;KACf;CACF,CAAC;AAEF,MAAM,OAAO,OAAO;IAMlB,YAAY,EAAc,EAAE,MAAsB;QALlD,SAAI,GAAG,KAAK,CAAC;QAMX,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,EAAc,EAAE,MAAsB;QACvD,OAAO,IAAI,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,OAAO,aAAa,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IACpD,CAAC;IAED,GAAG,CAAC,KAAe,EAAE,GAAG,GAAU;QAChC,MAAM,kBAAkB,GAAG,GAAG,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,oBAAoB,CAChE,CAAC;QACF,IAAI,kBAAkB,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC;IACnD,CAAC;CACF;AAED,MAAM,GAAG,GAAG,cAAc,CAAC,aAAa,CAAC,gBAAgB,CAAC,eAAe,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAExG,eAAe,GAAG,CAAC","sourcesContent":["import _sanitizeHTML from 'sanitize-html';\nimport type Logger from '../../utils/logging/Logger.js';\nimport { commonLog, type LogLevel } from '../../utils/logging/Logger.js';\nimport { CampaignAPIMixin } from './CampaignAPIMixin.js';\nimport { type DBInstance } from '../db';\nimport { ContentAPIMixin } from './ContentAPIMixin.js';\nimport { SettingsAPIMixin } from './SettingsAPIMixin.js';\nimport { MediaAPIMixin } from './MediaAPIMixin.js';\nimport { FilterAPIMixin } from './FilterAPIMixin.js';\n\nexport type APIConstructor = new (...args: any[]) => APIBase;\nexport type APIInstance = InstanceType<typeof API>;\n\nconst SANITIZE_HTML_OPTIONS = {\n  allowedTags: _sanitizeHTML.defaults.allowedTags.concat(['img']),\n  allowedAttributes: {\n    ..._sanitizeHTML.defaults.allowedAttributes,\n    '*': ['class']\n  }\n};\n\nexport class APIBase {\n  name = 'API';\n\n  db: DBInstance;\n  logger?: Logger | null;\n\n  constructor(db: DBInstance, logger?: Logger | null) {\n    this.db = db;\n    this.logger = logger;\n  }\n\n  static getInstance(db: DBInstance, logger?: Logger | null) {\n    return new API(db, logger);\n  }\n\n  sanitizeHTML(html: string) {\n    return _sanitizeHTML(html, SANITIZE_HTML_OPTIONS);\n  }\n\n  log(level: LogLevel, ...msg: any[]) {\n    const limiterStopOnError = msg.find(\n      (m) => m instanceof Error && m.message === 'LimiterStopOnError'\n    );\n    if (limiterStopOnError) {\n      return;\n    }\n    commonLog(this.logger, level, this.name, ...msg);\n  }\n}\n\nconst API = FilterAPIMixin(MediaAPIMixin(SettingsAPIMixin(ContentAPIMixin(CampaignAPIMixin(APIBase)))));\n\nexport default API;\n"]}

package/dist/browse/db/CampaignDBMixin.d.ts

@@ -45,6 +45,7 @@ export declare function CampaignDBMixin<TBase extends UserDBConstructor>(Base: T
             limitOffset?: string;
         }): string;
         name: string;
+        dbPath: string | null;
         db: import("better-sqlite3").Database;
         logger?: import("../../index.js").Logger | null;
         exec(sql: string): void;

package/dist/browse/db/ContentDBMixin.d.ts

@@ -84,6 +84,7 @@ export declare function ContentDBMixin<TBase extends CampaignDBConstructor>(Base
             limitOffset?: string;
         }): string;
         name: string;
+        dbPath: string | null;
         db: import("better-sqlite3").Database;
         logger?: import("../..").Logger | null;
         exec(sql: string): void;

package/dist/browse/db/EnvDBMixin.d.ts

@@ -6,6 +6,7 @@ export declare function EnvDBMixin<TBase extends DBConstructor>(Base: TBase): {
         getEnvValue<T = any>(key: string): T | null;
         checkEnvExists(key: string): boolean;
         name: string;
+        dbPath: string | null;
         db: import("better-sqlite3").Database;
         logger?: import("../..").Logger | null;
         exec(sql: string): void;

package/dist/browse/db/MediaDBMixin.d.ts

@@ -35,6 +35,7 @@ export declare function MediaDBMixin<TBase extends DBConstructor>(Base: TBase):
             limitOffset?: string;
         }): string;
         name: string;
+        dbPath: string | null;
         db: import("better-sqlite3").Database;
         logger?: import("../..").Logger | null;
         exec(sql: string): void;

package/dist/browse/db/UserDBMixin.d.ts

@@ -36,6 +36,7 @@ export declare function UserDBMixin<TBase extends MediaDBConstructor>(Base: TBas
             limitOffset?: string;
         }): string;
         name: string;
+        dbPath: string | null;
         db: import("better-sqlite3").Database;
         logger?: import("../..").Logger | null;
         exec(sql: string): void;

package/dist/browse/db/index.d.ts

@@ -3,246 +3,20 @@ import type Logger from '../../utils/logging/Logger.js';
 import { type LogLevel } from '../../utils/logging/Logger.js';
 export type DBConstructor = new (...args: any[]) => DBBase;
 export type DBInstance = InstanceType<typeof DB>;
+interface DBPool {
+    [dbPath: string]: {
+        db: Database.Database;
+        count: number;
+    } | undefined;
+}
 export declare class DBBase {
     name: string;
-    static instance: DBInstance | null;
+    dbPath: string | null;
+    static dbPool: DBPool;
     db: Database.Database;
     logger?: Logger | null;
-    constructor(db: Database.Database, logger?: Logger | null);
-    static getInstance(file: string, dryRun?: boolean, logger?: Logger | null): Promise<{
-        saveEnvValue(key: string, value: any): void;
-        getEnvValue<T = any>(key: string): T | null;
-        checkEnvExists(key: string): boolean;
-        name: string;
-        db: Database.Database;
-        logger?: Logger | null;
-        exec(sql: string): void;
-        run(sql: string, params?: any[]): Database.RunResult;
-        get<T = any>(sql: string, params?: any[]): T | undefined;
-        all<T = any>(sql: string, params?: any[]): T[];
-        close(): void;
-        transaction(fn: (...args: any[]) => any): (...args: any[]) => any;
-        log(level: LogLevel, ...msg: any[]): void;
-    } & {
-        saveContent(content: import("../../index.js").Post | import("../../index.js").Product): void;
-        "__#120@#saveContentMedia"(content: import("../../index.js").Post | import("../../index.js").Product): void;
-        "__#120@#savepostMedia"(post: import("../../index.js").Post): void;
-        "__#120@#saveProductMedia"(product: import("../../index.js").Product): void;
-        "__#120@#doSaveContentMedia"(content: import("../../index.js").Post | import("../../index.js").Product, media: import("../../index.js").Downloadable, mediaIndex: number, isPreview: boolean): void;
-        "__#120@#publishedAtToTime"(publishedAt: string | null): number | null;
-        "__#120@#savePostTiers"(post: import("../../index.js").Post): void;
-        "__#120@#doSaveTier"(post: import("../../index.js").Post, tier: import("../../index.js").Tier): void;
-        savePostComments(post: import("../../index.js").Post, comments: import("../../index.js").Comment[]): void;
-        checkPostCommentsExist(post: import("../../index.js").Post): boolean;
-        getContent(id: string, contentType: "post"): import("../types/Content.js").PostWithComments | null;
-        getContent(id: string, contentType: "product"): import("../../index.js").Product | null;
-        getPreviousNextContent<T extends import("../types/Content.js").ContentType>(content: import("../../index.js").Post | import("../../index.js").Product, context: import("../types/Content.js").GetContentContext<T>): import("../types/Content.js").GetPreviousNextContentResult<T>;
-        getContentList<T extends import("../types/Content.js").ContentType>(params: import("../types/Content.js").GetContentListParams<T>, db?: {
-            whereClauses: string[];
-            whereValues: any[];
-        } | undefined, includeTotal?: boolean): import("../types/Content.js").ContentList<T>;
-        "__#120@#parseContentRowJoinedComments"(row: any): any;
-        getContentCountByDate(contentType: import("../types/Content.js").ContentType, groupBy: "year" | "month", filter?: {
-            campaign?: import("../../index.js").Campaign | string | null;
-            date?: Date | null;
-        } | undefined): {
-            dt: string;
-            count: number;
-        }[];
-        getPostCountByType(campaign: import("../../index.js").Campaign | string): {
-            postType: string;
-            count: number;
-        }[];
-        getPostCountByTier(campaign: import("../../index.js").Campaign | string): {
-            tierId: string;
-            title: string;
-            count: number;
-        }[];
-        checkContentExists(id: string, contentType: import("../types/Content.js").ContentType, campaign: import("../../index.js").Campaign | null): boolean;
-        getPostComments(post: import("../../index.js").Post | string): import("../../index.js").Comment[] | null;
-        saveCampaign(campaign: import("../../index.js").Campaign | null, downloadDate: Date, overwriteIfExists?: boolean): void;
-        getCampaign(params: import("../types/Campaign.js").GetCampaignParams): import("../../index.js").Campaign | null;
-        "__#119@#saveRewards"(campaign: import("../../index.js").Campaign): void;
-        "__#119@#doSaveReward"(campaign: import("../../index.js").Campaign, reward: import("../../index.js").Reward): void;
-        getCampaignList(params: import("../types/Campaign.js").GetCampaignListParams): import("../types/Campaign.js").CampaignList;
-        "__#119@#getCampaignWithCounts"(params: import("../types/Campaign.js").GetCampaignParams): import("../types/Campaign.js").CampaignWithCounts | null;
-        checkCampaignExists(id: string): boolean;
-        saveUser(user: import("../../index.js").User | null): void;
-        getUserByID(id: string): import("../../index.js").User | null;
-        checkUserExists(id: string): boolean;
-        saveMedia(media: import("../../index.js").Downloadable): void;
-        checkMediaExists(media: import("../../index.js").Downloadable): boolean;
-        checkContentMediaExists(content: import("../../index.js").Post | import("../../index.js").Product, media: import("../../index.js").Downloadable): boolean;
-        getMediaByID(id: string): import("../../index.js").Downloaded | null;
-        getMediaList<T extends import("../types/Content.js").ContentType>(params: import("../types/Media.js").GetMediaListParams<T>): import("../types/Media.js").MediaList<T>;
-        getMediaCountByDate(groupBy: "year" | "month", filter?: {
-            campaign?: import("../../index.js").Campaign | string | null;
-            date?: Date | null;
-        } | undefined): {
-            dt: string;
-            count: number;
-        }[];
-        getMediaCountByContentType(campaign?: import("../../index.js").Campaign | string | null): {
-            contentType: "post" | "product";
-            count: number;
-        }[];
-        getMediaCountByTier(campaign: import("../../index.js").Campaign | string): {
-            tierId: string;
-            title: string;
-            count: number;
-        }[];
-        getMediaListSQL(params: {
-            select: string;
-            join?: string;
-            where?: string;
-            groupBy?: string;
-            orderBy?: string;
-            limitOffset?: string;
-        }): string;
-        name: string;
-        db: Database.Database;
-        logger?: Logger | null;
-        exec(sql: string): void;
-        run(sql: string, params?: any[]): Database.RunResult;
-        get<T = any>(sql: string, params?: any[]): T | undefined;
-        all<T = any>(sql: string, params?: any[]): T[];
-        close(): void;
-        transaction(fn: (...args: any[]) => any): (...args: any[]) => any;
-        log(level: LogLevel, ...msg: any[]): void;
-    } & {
-        saveCampaign(campaign: import("../../index.js").Campaign | null, downloadDate: Date, overwriteIfExists?: boolean): void;
-        getCampaign(params: import("../types/Campaign.js").GetCampaignParams): import("../../index.js").Campaign | null;
-        "__#119@#saveRewards"(campaign: import("../../index.js").Campaign): void;
-        "__#119@#doSaveReward"(campaign: import("../../index.js").Campaign, reward: import("../../index.js").Reward): void;
-        getCampaignList(params: import("../types/Campaign.js").GetCampaignListParams): import("../types/Campaign.js").CampaignList;
-        "__#119@#getCampaignWithCounts"(params: import("../types/Campaign.js").GetCampaignParams): import("../types/Campaign.js").CampaignWithCounts | null;
-        checkCampaignExists(id: string): boolean;
-        saveUser(user: import("../../index.js").User | null): void;
-        getUserByID(id: string): import("../../index.js").User | null;
-        checkUserExists(id: string): boolean;
-        saveMedia(media: import("../../index.js").Downloadable): void;
-        checkMediaExists(media: import("../../index.js").Downloadable): boolean;
-        checkContentMediaExists(content: import("../../index.js").Post | import("../../index.js").Product, media: import("../../index.js").Downloadable): boolean;
-        getMediaByID(id: string): import("../../index.js").Downloaded | null;
-        getMediaList<T extends import("../types/Content.js").ContentType>(params: import("../types/Media.js").GetMediaListParams<T>): import("../types/Media.js").MediaList<T>;
-        getMediaCountByDate(groupBy: "year" | "month", filter?: {
-            campaign?: import("../../index.js").Campaign | string | null;
-            date?: Date | null;
-        } | undefined): {
-            dt: string;
-            count: number;
-        }[];
-        getMediaCountByContentType(campaign?: import("../../index.js").Campaign | string | null): {
-            contentType: "post" | "product";
-            count: number;
-        }[];
-        getMediaCountByTier(campaign: import("../../index.js").Campaign | string): {
-            tierId: string;
-            title: string;
-            count: number;
-        }[];
-        getMediaListSQL(params: {
-            select: string;
-            join?: string;
-            where?: string;
-            groupBy?: string;
-            orderBy?: string;
-            limitOffset?: string;
-        }): string;
-        name: string;
-        db: Database.Database;
-        logger?: Logger | null;
-        exec(sql: string): void;
-        run(sql: string, params?: any[]): Database.RunResult;
-        get<T = any>(sql: string, params?: any[]): T | undefined;
-        all<T = any>(sql: string, params?: any[]): T[];
-        close(): void;
-        transaction(fn: (...args: any[]) => any): (...args: any[]) => any;
-        log(level: LogLevel, ...msg: any[]): void;
-    } & {
-        saveUser(user: import("../../index.js").User | null): void;
-        getUserByID(id: string): import("../../index.js").User | null;
-        checkUserExists(id: string): boolean;
-        saveMedia(media: import("../../index.js").Downloadable): void;
-        checkMediaExists(media: import("../../index.js").Downloadable): boolean;
-        checkContentMediaExists(content: import("../../index.js").Post | import("../../index.js").Product, media: import("../../index.js").Downloadable): boolean;
-        getMediaByID(id: string): import("../../index.js").Downloaded | null;
-        getMediaList<T extends import("../types/Content.js").ContentType>(params: import("../types/Media.js").GetMediaListParams<T>): import("../types/Media.js").MediaList<T>;
-        getMediaCountByDate(groupBy: "year" | "month", filter?: {
-            campaign?: import("../../index.js").Campaign | string | null;
-            date?: Date | null;
-        } | undefined): {
-            dt: string;
-            count: number;
-        }[];
-        getMediaCountByContentType(campaign?: import("../../index.js").Campaign | string | null): {
-            contentType: "post" | "product";
-            count: number;
-        }[];
-        getMediaCountByTier(campaign: import("../../index.js").Campaign | string): {
-            tierId: string;
-            title: string;
-            count: number;
-        }[];
-        getMediaListSQL(params: {
-            select: string;
-            join?: string;
-            where?: string;
-            groupBy?: string;
-            orderBy?: string;
-            limitOffset?: string;
-        }): string;
-        name: string;
-        db: Database.Database;
-        logger?: Logger | null;
-        exec(sql: string): void;
-        run(sql: string, params?: any[]): Database.RunResult;
-        get<T = any>(sql: string, params?: any[]): T | undefined;
-        all<T = any>(sql: string, params?: any[]): T[];
-        close(): void;
-        transaction(fn: (...args: any[]) => any): (...args: any[]) => any;
-        log(level: LogLevel, ...msg: any[]): void;
-    } & {
-        saveMedia(media: import("../../index.js").Downloadable): void;
-        checkMediaExists(media: import("../../index.js").Downloadable): boolean;
-        checkContentMediaExists(content: import("../../index.js").Post | import("../../index.js").Product, media: import("../../index.js").Downloadable): boolean;
-        getMediaByID(id: string): import("../../index.js").Downloaded | null;
-        getMediaList<T extends import("../types/Content.js").ContentType>(params: import("../types/Media.js").GetMediaListParams<T>): import("../types/Media.js").MediaList<T>;
-        getMediaCountByDate(groupBy: "year" | "month", filter?: {
-            campaign?: import("../../index.js").Campaign | string | null;
-            date?: Date | null;
-        } | undefined): {
-            dt: string;
-            count: number;
-        }[];
-        getMediaCountByContentType(campaign?: import("../../index.js").Campaign | string | null): {
-            contentType: "post" | "product";
-            count: number;
-        }[];
-        getMediaCountByTier(campaign: import("../../index.js").Campaign | string): {
-            tierId: string;
-            title: string;
-            count: number;
-        }[];
-        getMediaListSQL(params: {
-            select: string;
-            join?: string;
-            where?: string;
-            groupBy?: string;
-            orderBy?: string;
-            limitOffset?: string;
-        }): string;
-        name: string;
-        db: Database.Database;
-        logger?: Logger | null;
-        exec(sql: string): void;
-        run(sql: string, params?: any[]): Database.RunResult;
-        get<T = any>(sql: string, params?: any[]): T | undefined;
-        all<T = any>(sql: string, params?: any[]): T[];
-        close(): void;
-        transaction(fn: (...args: any[]) => any): (...args: any[]) => any;
-        log(level: LogLevel, ...msg: any[]): void;
-    } & DBBase>;
+    constructor(dbPath: string | null, db: Database.Database, logger?: Logger | null);
+    static getInstance(file: string, dryRun?: boolean, logger?: Logger | null): Promise<DBInstance>;
     exec(sql: string): void;
     run(sql: string, params?: any[]): Database.RunResult;
     get<T = any>(sql: string, params?: any[]): T | undefined;
@@ -257,6 +31,7 @@ declare const DB: {
         getEnvValue<T = any>(key: string): T | null;
         checkEnvExists(key: string): boolean;
         name: string;
+        dbPath: string | null;
         db: Database.Database;
         logger?: Logger | null;
         exec(sql: string): void;
@@ -345,6 +120,7 @@ declare const DB: {
             limitOffset?: string;
         }): string;
         name: string;
+        dbPath: string | null;
         db: Database.Database;
         logger?: Logger | null;
         exec(sql: string): void;
@@ -397,6 +173,7 @@ declare const DB: {
             limitOffset?: string;
         }): string;
         name: string;
+        dbPath: string | null;
         db: Database.Database;
         logger?: Logger | null;
         exec(sql: string): void;
@@ -442,6 +219,7 @@ declare const DB: {
             limitOffset?: string;
         }): string;
         name: string;
+        dbPath: string | null;
         db: Database.Database;
         logger?: Logger | null;
         exec(sql: string): void;
@@ -484,6 +262,7 @@ declare const DB: {
             limitOffset?: string;
         }): string;
         name: string;
+        dbPath: string | null;
         db: Database.Database;
         logger?: Logger | null;
         exec(sql: string): void;

package/dist/browse/db/index.js

@@ -5,18 +5,39 @@ import { UserDBMixin } from './UserDBMixin.js';
 import { CampaignDBMixin } from './CampaignDBMixin.js';
 import { ContentDBMixin } from './ContentDBMixin.js';
 import { EnvDBMixin } from './EnvDBMixin.js';
+import path from 'path';
 export class DBBase {
-    constructor(db, logger) {
+    constructor(dbPath, db, logger) {
         this.name = 'DB';
+        this.dbPath = dbPath;
         this.db = db;
         this.logger = logger;
     }
     static async getInstance(file, dryRun = false, logger) {
-        if (!this.instance) {
-            const db = await openDB(file, dryRun, logger);
-            this.instance = new DB(db, logger);
+        let db;
+        let dbPath;
+        if (dryRun) {
+            dbPath = null;
+            db = await openDB(file, dryRun, logger);
         }
-        return this.instance;
+        else {
+            dbPath = path.resolve(file);
+            const poolEntry = this.dbPool[dbPath];
+            if (poolEntry) {
+                db = poolEntry.db;
+                poolEntry.count++;
+                commonLog(logger, 'debug', 'DB', `Obtained DB from pool (shares: ${poolEntry.count})`);
+            }
+            else {
+                db = await openDB(file, dryRun, logger);
+                this.dbPool[dbPath] = {
+                    db,
+                    count: 1
+                };
+                commonLog(logger, 'debug', 'DB', `Added DB to pool`);
+            }
+        }
+        return new DB(dbPath, db, logger);
     }
     exec(sql) {
         this.db.exec(sql);
@@ -35,7 +56,23 @@ export class DBBase {
         return (params ? stmt.all(...params) : stmt.all());
     }
     close() {
-        this.db.close();
+        if (!this.dbPath) {
+            this.log('debug', '(dry-run) Close in-memory DB');
+            this.db.close();
+            return;
+        }
+        const poolEntry = DBBase.dbPool[this.dbPath];
+        if (poolEntry && poolEntry.count > 0) {
+            poolEntry.count--;
+            if (poolEntry.count === 0) {
+                this.log('debug', 'Close DB (no shares remaining)');
+                delete DBBase.dbPool[this.dbPath];
+                this.db.close();
+            }
+            else {
+                this.log('debug', `Close DB skipped - ${poolEntry.count} shares remaining`);
+            }
+        }
     }
     transaction(fn) {
         return this.db.transaction(fn);
@@ -48,7 +85,7 @@ export class DBBase {
         commonLog(this.logger, level, this.name, ...msg);
     }
 }
-DBBase.instance = null;
+DBBase.dbPool = {};
 const DB = EnvDBMixin(ContentDBMixin(CampaignDBMixin(UserDBMixin(MediaDBMixin(DBBase)))));
 export default DB;
 //# sourceMappingURL=index.js.map

package/dist/browse/db/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browse/db/index.ts"],"names":[],"mappings":"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","sourcesContent":["import type Database from 'better-sqlite3';\nimport type Logger from '../../utils/logging/Logger.js';\nimport { commonLog, type LogLevel } from '../../utils/logging/Logger.js';\nimport { openDB } from './Init.js';\nimport { MediaDBMixin } from './MediaDBMixin.js';\nimport { UserDBMixin } from './UserDBMixin.js';\nimport { CampaignDBMixin } from './CampaignDBMixin.js';\nimport { ContentDBMixin } from './ContentDBMixin.js';\nimport { EnvDBMixin } from './EnvDBMixin.js';\n\nexport type DBConstructor = new (...args: any[]) => DBBase;\nexport type DBInstance = InstanceType<typeof DB>;\n\nexport class DBBase {\n  name = 'DB';\n\n  static instance: DBInstance | null = null;\n  db: Database.Database;\n  logger?: Logger | null;\n\n  constructor(db: Database.Database, logger?: Logger | null) {\n    this.db = db;\n    this.logger = logger;\n  }\n\n  static async getInstance(file: string, dryRun = false, logger?: Logger | null) {\n    if (!this.instance) {\n      const db = await openDB(file, dryRun, logger);\n      this.instance = new DB(db, logger);\n    }\n    return this.instance;\n  }\n\n  exec(sql: string): void {\n    this.db.exec(sql);\n  }\n\n  run(sql: string, params?: any[]): Database.RunResult {\n    const stmt = this.db.prepare(sql);\n    return params ? stmt.run(...params) : stmt.run();\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters\n  get<T = any>(sql: string, params?: any[]): T | undefined {\n    const stmt = this.db.prepare(sql);\n    return (params ? stmt.get(...params) : stmt.get()) as T | undefined;\n  }\n\n  all<T = any>(sql: string, params?: any[]): T[] {\n    const stmt = this.db.prepare(sql);\n    return (params ? stmt.all(...params) : stmt.all()) as T[];\n  }\n\n  close(): void {\n    this.db.close();\n  }\n\n  transaction(fn: (...args: any[]) => any): (...args: any[]) => any {\n    return this.db.transaction(fn);\n  }\n\n  log(level: LogLevel, ...msg: any[]) {\n    const limiterStopOnError = msg.find(\n      (m) => m instanceof Error && m.message === 'LimiterStopOnError'\n    );\n    if (limiterStopOnError) {\n      return;\n    }\n    commonLog(this.logger, level, this.name, ...msg);\n  }\n}\n\nconst DB = EnvDBMixin(\n  ContentDBMixin(\n    CampaignDBMixin(\n      UserDBMixin(\n        MediaDBMixin(DBBase)\n      )\n    )\n  )\n);\n\nexport default DB;"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browse/db/index.ts"],"names":[],"mappings":"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","sourcesContent":["import type Database from 'better-sqlite3';\nimport type Logger from '../../utils/logging/Logger.js';\nimport { commonLog, type LogLevel } from '../../utils/logging/Logger.js';\nimport { openDB } from './Init.js';\nimport { MediaDBMixin } from './MediaDBMixin.js';\nimport { UserDBMixin } from './UserDBMixin.js';\nimport { CampaignDBMixin } from './CampaignDBMixin.js';\nimport { ContentDBMixin } from './ContentDBMixin.js';\nimport { EnvDBMixin } from './EnvDBMixin.js';\nimport path from 'path';\n\nexport type DBConstructor = new (...args: any[]) => DBBase;\nexport type DBInstance = InstanceType<typeof DB>;\n\ninterface DBPool {\n  [dbPath: string]: { db: Database.Database; count: number; } | undefined;\n}\n\nexport class DBBase {\n  name = 'DB';\n\n  dbPath: string | null;\n  static dbPool: DBPool = {};\n  db: Database.Database;\n  logger?: Logger | null;\n\n  constructor(dbPath: string | null, db: Database.Database, logger?: Logger | null) {\n    this.dbPath = dbPath;\n    this.db = db;\n    this.logger = logger;\n  }\n\n  static async getInstance(file: string, dryRun = false, logger?: Logger | null): Promise<DBInstance> {\n    let db: Database.Database;\n    let dbPath: string | null;\n    if (dryRun) {\n      dbPath = null;\n      db = await openDB(file, dryRun, logger);\n    }\n    else {\n      dbPath = path.resolve(file);\n      const poolEntry = this.dbPool[dbPath];\n      if (poolEntry) {\n        db = poolEntry.db;\n        poolEntry.count++;\n        commonLog(\n          logger,\n          'debug',\n          'DB',\n          `Obtained DB from pool (shares: ${poolEntry.count})`\n        );\n      }\n      else {\n        db = await openDB(file, dryRun, logger);\n        this.dbPool[dbPath] = {\n          db,\n          count: 1\n        };\n        commonLog(\n          logger,\n          'debug',\n          'DB',\n          `Added DB to pool`\n        );\n      }\n    }\n    return new DB(dbPath, db, logger);\n  }\n\n  exec(sql: string): void {\n    this.db.exec(sql);\n  }\n\n  run(sql: string, params?: any[]): Database.RunResult {\n    const stmt = this.db.prepare(sql);\n    return params ? stmt.run(...params) : stmt.run();\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters\n  get<T = any>(sql: string, params?: any[]): T | undefined {\n    const stmt = this.db.prepare(sql);\n    return (params ? stmt.get(...params) : stmt.get()) as T | undefined;\n  }\n\n  all<T = any>(sql: string, params?: any[]): T[] {\n    const stmt = this.db.prepare(sql);\n    return (params ? stmt.all(...params) : stmt.all()) as T[];\n  }\n\n  close(): void {\n    if (!this.dbPath) {\n      this.log('debug', '(dry-run) Close in-memory DB');\n      this.db.close();\n      return;\n    }\n    const poolEntry = DBBase.dbPool[this.dbPath];\n    if (poolEntry && poolEntry.count > 0) {\n      poolEntry.count--;\n      if (poolEntry.count === 0) {\n        this.log('debug', 'Close DB (no shares remaining)');\n        delete DBBase.dbPool[this.dbPath];\n        this.db.close();\n      }\n      else {\n        this.log('debug', `Close DB skipped - ${poolEntry.count} shares remaining`)\n      }\n    }\n  }\n\n  transaction(fn: (...args: any[]) => any): (...args: any[]) => any {\n    return this.db.transaction(fn);\n  }\n\n  log(level: LogLevel, ...msg: any[]) {\n    const limiterStopOnError = msg.find(\n      (m) => m instanceof Error && m.message === 'LimiterStopOnError'\n    );\n    if (limiterStopOnError) {\n      return;\n    }\n    commonLog(this.logger, level, this.name, ...msg);\n  }\n}\n\nconst DB = EnvDBMixin(\n  ContentDBMixin(\n    CampaignDBMixin(\n      UserDBMixin(\n        MediaDBMixin(DBBase)\n      )\n    )\n  )\n);\n\nexport default DB;"]}

package/dist/browse/server/WebServer.js

@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _WebServer_instances, _WebServer_config, _WebServer_app, _WebServer_server, _WebServer_status, _WebServer_port, _WebServer_getPort;
+var _WebServer_instances, _WebServer_config, _WebServer_app, _WebServer_server, _WebServer_status, _WebServer_port, _WebServer_db, _WebServer_getPort;
 import express from 'express';
 import path from 'path';
 import fs from 'fs';
@@ -27,11 +27,13 @@ export class WebServer {
         _WebServer_server.set(this, void 0);
         _WebServer_status.set(this, void 0);
         _WebServer_port.set(this, void 0);
+        _WebServer_db.set(this, void 0);
         __classPrivateFieldSet(this, _WebServer_config, config, "f");
         __classPrivateFieldSet(this, _WebServer_app, express(), "f");
         __classPrivateFieldSet(this, _WebServer_server, null, "f");
         __classPrivateFieldSet(this, _WebServer_status, 'stopped', "f");
         __classPrivateFieldSet(this, _WebServer_port, config.port || null, "f");
+        __classPrivateFieldSet(this, _WebServer_db, null, "f");
     }
     async start() {
         if (__classPrivateFieldGet(this, _WebServer_status, "f") === 'started') {
@@ -57,6 +59,7 @@ export class WebServer {
         __classPrivateFieldGet(this, _WebServer_app, "f").use('/themes', express.static(path.resolve(import.meta.dirname, '../web/themes')));
         __classPrivateFieldGet(this, _WebServer_app, "f").use('/images', express.static(path.resolve(import.meta.dirname, '../web/images')));
         __classPrivateFieldGet(this, _WebServer_app, "f").use(router);
+        __classPrivateFieldSet(this, _WebServer_db, db, "f");
         __classPrivateFieldSet(this, _WebServer_port, await __classPrivateFieldGet(this, _WebServer_instances, "m", _WebServer_getPort).call(this), "f");
         return new Promise((resolve, reject) => {
             __classPrivateFieldSet(this, _WebServer_server, __classPrivateFieldGet(this, _WebServer_app, "f").listen(__classPrivateFieldGet(this, _WebServer_port, "f"), (error) => {
@@ -77,12 +80,20 @@ export class WebServer {
             if (__classPrivateFieldGet(this, _WebServer_server, "f")) {
                 __classPrivateFieldGet(this, _WebServer_server, "f").close((error) => {
                     if (error) {
-                        reject(error);
-                        return;
+                        return reject(error);
+                        ;
                     }
                     __classPrivateFieldSet(this, _WebServer_server, null, "f");
                     __classPrivateFieldSet(this, _WebServer_port, null, "f");
                     __classPrivateFieldSet(this, _WebServer_status, 'stopped', "f");
+                    if (__classPrivateFieldGet(this, _WebServer_db, "f")) {
+                        try {
+                            __classPrivateFieldGet(this, _WebServer_db, "f").close();
+                        }
+                        catch (error) {
+                            return reject(error instanceof Error ? error : Error(String(error)));
+                        }
+                    }
                     resolve();
                 });
             }
@@ -98,7 +109,7 @@ export class WebServer {
         };
     }
 }
-_WebServer_config = new WeakMap(), _WebServer_app = new WeakMap(), _WebServer_server = new WeakMap(), _WebServer_status = new WeakMap(), _WebServer_port = new WeakMap(), _WebServer_instances = new WeakSet(), _WebServer_getPort = function _WebServer_getPort() {
+_WebServer_config = new WeakMap(), _WebServer_app = new WeakMap(), _WebServer_server = new WeakMap(), _WebServer_status = new WeakMap(), _WebServer_port = new WeakMap(), _WebServer_db = new WeakMap(), _WebServer_instances = new WeakSet(), _WebServer_getPort = function _WebServer_getPort() {
     if (typeof __classPrivateFieldGet(this, _WebServer_config, "f").port === 'number') {
         return __classPrivateFieldGet(this, _WebServer_config, "f").port;
     }

package/dist/browse/server/WebServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebServer.js","sourceRoot":"","sources":["../../../src/browse/server/WebServer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEhC,OAAO,OAAO,MAAM,UAAU,CAAC;AAE/B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAElC,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,CAAC;AAQ5C,MAAM,OAAO,SAAS;IASpB,YAAY,MAAuB;;QARnC,SAAI,GAAG,WAAW,CAAC;QAEnB,oCAAyB;QACzB,iCAAsB;QACtB,oCAAuB;QACvB,oCAA+B;QAC/B,kCAAqB;QAGnB,uBAAA,IAAI,qBAAW,MAAM,MAAA,CAAC;QACtB,uBAAA,IAAI,kBAAQ,OAAO,EAAE,MAAA,CAAC;QACtB,uBAAA,IAAI,qBAAW,IAAI,MAAA,CAAC;QACpB,uBAAA,IAAI,qBAAW,SAAS,MAAA,CAAC;QACzB,uBAAA,IAAI,mBAAS,MAAM,CAAC,IAAI,IAAI,IAAI,MAAA,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,uBAAA,IAAI,yBAAQ,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,uBAAA,IAAI,yBAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACtD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,MAAM,KAAK,CAAC,mBAAmB,uBAAA,IAAI,yBAAQ,CAAC,OAAO,kBAAkB,CAAC,CAAC;QACzE,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YACxC,MAAM,KAAK,CAAC,IAAI,uBAAA,IAAI,yBAAQ,CAAC,OAAO,sBAAsB,CAAC,CAAC;QAC9D,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QACjE,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,MAAM,KAAK,CAAC,YAAY,MAAM,kBAAkB,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,uBAAA,IAAI,yBAAQ,CAAC,MAAM,CAAC,CAAC;QACpE,MAAM,GAAG,GAAG,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,uBAAA,IAAI,yBAAQ,CAAC,MAAM,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,uBAAA,IAAI,yBAAQ,CAAC,MAAM,CAAC,CAAC;QAEhE,uBAAA,IAAI,sBAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9B,uBAAA,IAAI,sBAAK,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACtD,uBAAA,IAAI,sBAAK,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;QAC7F,uBAAA,IAAI,sBAAK,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;QAC7F,uBAAA,IAAI,sBAAK,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;QAC7F,uBAAA,IAAI,sBAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEtB,uBAAA,IAAI,mBAAS,MAAM,uBAAA,IAAI,gDAAS,MAAb,IAAI,CAAW,MAAA,CAAC;QAEnC,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,uBAAA,IAAI,qBAAW,uBAAA,IAAI,sBAAK,CAAC,MAAM,CAAC,uBAAA,IAAI,uBAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBACpD,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,CAAC,KAAK,CAAC,CAAC;oBACd,OAAO;gBACT,CAAC;gBACD,uBAAA,IAAI,qBAAW,SAAS,MAAA,CAAC;gBACzB,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,MAAA,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI;QACF,IAAI,uBAAA,IAAI,yBAAQ,KAAK,SAAS,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QACD,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,IAAI,uBAAA,IAAI,yBAAQ,EAAE,CAAC;gBACjB,uBAAA,IAAI,yBAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC3B,IAAI,KAAK,EAAE,CAAC;wBACV,MAAM,CAAC,KAAK,CAAC,CAAC;wBACd,OAAO;oBACT,CAAC;oBACD,uBAAA,IAAI,qBAAW,IAAI,MAAA,CAAC;oBACpB,uBAAA,IAAI,mBAAS,IAAI,MAAA,CAAC;oBAClB,uBAAA,IAAI,qBAAW,SAAS,MAAA,CAAC;oBACzB,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IASD,SAAS;QACP,OAAO;YACL,GAAG,uBAAA,IAAI,yBAAQ;YACf,IAAI,EAAE,uBAAA,IAAI,uBAAM;SACjB,CAAC;IACJ,CAAC;CACF;;IAZG,IAAI,OAAO,uBAAA,IAAI,yBAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC1C,OAAO,uBAAA,IAAI,yBAAQ,CAAC,IAAI,CAAC;IAC3B,CAAC;IACD,OAAO,OAAO,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC,CAAC;AACpD,CAAC","sourcesContent":["import express from 'express';\nimport path from 'path';\nimport fs from 'fs';\nimport DB from '../db/index.js';\nimport { type Server } from 'http';\nimport getPort from 'get-port';\nimport { type Logger } from '../../utils/logging/index.js';\nimport { getRouter } from './Router.js';\nimport API from '../api/index.js';\n\nexport const DEFAULT_WEB_SERVER_PORT = 3000;\n\nexport interface WebServerConfig {\n  dataDir?: string;\n  port?: number | null;\n  logger?: Logger | null;\n}\n\nexport class WebServer {\n  name = 'WebServer';\n\n  #config: WebServerConfig;\n  #app: express.Express;\n  #server: Server | null;\n  #status: 'stopped' | 'started';\n  #port: number | null;\n\n  constructor(config: WebServerConfig) {\n    this.#config = config;\n    this.#app = express();\n    this.#server = null;\n    this.#status = 'stopped';\n    this.#port = config.port || null;\n  }\n\n  async start() {\n    if (this.#status === 'started') {\n      return;\n    }\n\n    const dataDir = this.#config.dataDir || process.cwd();\n    if (!fs.existsSync(dataDir)) {\n      throw Error(`Data directory \"${this.#config.dataDir}\" does not exist`);\n    }\n    if (!fs.statSync(dataDir).isDirectory()) {\n      throw Error(`\"${this.#config.dataDir}\" is not a directory`);\n    }\n\n    const dbFile = path.resolve(dataDir, '.patreon-dl', 'db.sqlite');\n    if (!fs.existsSync(dbFile)) {\n      throw Error(`DB file \"${dbFile}\" does not exist`);\n    }\n    const db = await DB.getInstance(dbFile, false, this.#config.logger);\n    const api = API.getInstance(db, this.#config.logger);\n    const router = getRouter(db, api, dataDir, this.#config.logger);\n\n    this.#app.use(express.json());\n    this.#app.use(express.urlencoded({ extended: true }));\n    this.#app.use('/assets', express.static(path.resolve(import.meta.dirname, '../web/assets')));\n    this.#app.use('/themes', express.static(path.resolve(import.meta.dirname, '../web/themes')));\n    this.#app.use('/images', express.static(path.resolve(import.meta.dirname, '../web/images')));\n    this.#app.use(router);\n\n    this.#port = await this.#getPort();\n\n    return new Promise<void>((resolve, reject) => {\n      this.#server = this.#app.listen(this.#port, (error) => {\n        if (error) {\n          reject(error);\n          return;\n        }\n        this.#status = 'started';\n        resolve();\n      });\n    });\n  }\n\n  stop() {\n    if (this.#status === 'stopped') {\n      return;\n    }\n    return new Promise<void>((resolve, reject) => {\n      if (this.#server) {\n        this.#server.close((error) => {\n          if (error) {\n            reject(error);\n            return;\n          }\n          this.#server = null;\n          this.#port = null;\n          this.#status = 'stopped';\n          resolve();\n        });\n      } else {\n        resolve();\n      }\n    });\n  }\n\n  #getPort() {\n    if (typeof this.#config.port === 'number') {\n      return this.#config.port;\n    }\n    return getPort({ port: DEFAULT_WEB_SERVER_PORT });\n  }\n\n  getConfig(): WebServerConfig {\n    return {\n      ...this.#config,\n      port: this.#port\n    };\n  }\n}\n"]}
+{"version":3,"file":"WebServer.js","sourceRoot":"","sources":["../../../src/browse/server/WebServer.ts"],"names":[],"mappings":"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","sourcesContent":["import express from 'express';\nimport path from 'path';\nimport fs from 'fs';\nimport DB, { type DBInstance } from '../db/index.js';\nimport { type Server } from 'http';\nimport getPort from 'get-port';\nimport { type Logger } from '../../utils/logging/index.js';\nimport { getRouter } from './Router.js';\nimport API from '../api/index.js';\n\nexport const DEFAULT_WEB_SERVER_PORT = 3000;\n\nexport interface WebServerConfig {\n  dataDir?: string;\n  port?: number | null;\n  logger?: Logger | null;\n}\n\nexport class WebServer {\n  name = 'WebServer';\n\n  #config: WebServerConfig;\n  #app: express.Express;\n  #server: Server | null;\n  #status: 'stopped' | 'started';\n  #port: number | null;\n\n  #db: DBInstance | null;\n\n  constructor(config: WebServerConfig) {\n    this.#config = config;\n    this.#app = express();\n    this.#server = null;\n    this.#status = 'stopped';\n    this.#port = config.port || null;\n    this.#db = null;\n  }\n\n  async start() {\n    if (this.#status === 'started') {\n      return;\n    }\n\n    const dataDir = this.#config.dataDir || process.cwd();\n    if (!fs.existsSync(dataDir)) {\n      throw Error(`Data directory \"${this.#config.dataDir}\" does not exist`);\n    }\n    if (!fs.statSync(dataDir).isDirectory()) {\n      throw Error(`\"${this.#config.dataDir}\" is not a directory`);\n    }\n\n    const dbFile = path.resolve(dataDir, '.patreon-dl', 'db.sqlite');\n    if (!fs.existsSync(dbFile)) {\n      throw Error(`DB file \"${dbFile}\" does not exist`);\n    }\n    const db = await DB.getInstance(dbFile, false, this.#config.logger);\n    const api = API.getInstance(db, this.#config.logger);\n    const router = getRouter(db, api, dataDir, this.#config.logger);\n\n    this.#app.use(express.json());\n    this.#app.use(express.urlencoded({ extended: true }));\n    this.#app.use('/assets', express.static(path.resolve(import.meta.dirname, '../web/assets')));\n    this.#app.use('/themes', express.static(path.resolve(import.meta.dirname, '../web/themes')));\n    this.#app.use('/images', express.static(path.resolve(import.meta.dirname, '../web/images')));\n    this.#app.use(router);\n\n    this.#db = db;\n    this.#port = await this.#getPort();\n\n    return new Promise<void>((resolve, reject) => {\n      this.#server = this.#app.listen(this.#port, (error) => {\n        if (error) {\n          reject(error);\n          return;\n        }\n        this.#status = 'started';\n        resolve();\n      });\n    });\n  }\n\n  stop() {\n    if (this.#status === 'stopped') {\n      return;\n    }\n    return new Promise<void>((resolve, reject) => {\n      if (this.#server) {\n        this.#server.close((error) => {\n          if (error) {\n            return reject(error);;\n          }\n          this.#server = null;\n          this.#port = null;\n          this.#status = 'stopped';\n          if (this.#db) {\n            try {\n              this.#db.close();\n            }\n            catch (error) {\n              return reject(error instanceof Error ? error : Error(String(error)));\n            }\n          }\n          resolve();\n        });\n      } else {\n        resolve();\n      }\n    });\n  }\n\n  #getPort() {\n    if (typeof this.#config.port === 'number') {\n      return this.#config.port;\n    }\n    return getPort({ port: DEFAULT_WEB_SERVER_PORT });\n  }\n\n  getConfig(): WebServerConfig {\n    return {\n      ...this.#config,\n      port: this.#port\n    };\n  }\n}\n"]}

package/dist/downloaders/Downloader.d.ts

@@ -78,6 +78,7 @@ export default abstract class Downloader<T extends DownloaderType> extends Event
         json: any;
         error: any;
     }>;
+    protected closeDB(): Promise<void>;
     on<T extends DownloaderEvent>(event: T, listener: (args: DownloaderEventPayloadOf<T>) => void): this;
     once<T extends DownloaderEvent>(event: T, listener: (args: DownloaderEventPayloadOf<T>) => void): this;
     off<T extends DownloaderEvent>(event: T, listener: (args: DownloaderEventPayloadOf<T>) => void): this;

package/dist/downloaders/Downloader.js

@@ -410,6 +410,12 @@ class Downloader extends EventEmitter {
         this.log('debug', `Fetch user data from API URL "${url}"`);
         return this.commonFetchAPI(url, signal);
     }
+    async closeDB() {
+        if (__classPrivateFieldGet(this, _Downloader_dbPromise, "f")) {
+            (await __classPrivateFieldGet(this, _Downloader_dbPromise, "f")).close();
+            __classPrivateFieldSet(this, _Downloader_dbPromise, null, "f");
+        }
+    }
     on(event, listener) {
         return super.on(event, listener);
     }