fontastic 1.2.0 → 1.3.0

package/app/core/MessageHandler.ts

@@ -1,4 +1,4 @@
-import { ipcMain, IpcMainEvent } from 'electron';
+import { ipcMain, IpcMainEvent, BrowserWindow, MessageChannelMain, session } from 'electron';
 
 import SystemManager from './SystemManager';
 import ConfigManager from './ConfigManager';
@@ -8,8 +8,6 @@ import FontObject from './FontObject';
 import AppLogger from './AppLogger';
 
 import { Collection } from '../database/entity/Collection.schema';
-// import { Logger } from '../database/entity/Logger.schema';
-// import { Store, StoreManyAndCountType } from '../database/entity/Store.schema';
 
 import { ChannelType } from '../enums/ChannelType';
 import { StorageType } from '../enums/StorageType';
@@ -19,12 +17,20 @@ export default class MessageHandler {
   configManager: ConfigManager;
   connectionManager: ConnectionManager;
   fontManager: FontManager;
-
-  constructor(systemManager: SystemManager, configManager: ConfigManager, connectionManager: ConnectionManager, fontManager: FontManager) {
+  mainWindow: BrowserWindow;
+
+  constructor(
+    systemManager: SystemManager,
+    configManager: ConfigManager,
+    connectionManager: ConnectionManager,
+    fontManager: FontManager,
+    mainWindow: BrowserWindow,
+  ) {
     this.systemManager = systemManager;
     this.configManager = configManager;
     this.connectionManager = connectionManager;
     this.fontManager = fontManager;
+    this.mainWindow = mainWindow;
   }
 
   on(channel: string, done: any) {
@@ -57,6 +63,22 @@ export default class MessageHandler {
     this.handle(ChannelType.IPC_GET_CONFIG, async (_event: IpcMainEvent, args: any) => this.configManager.get(args.key));
     this.handle(ChannelType.IPC_ZAP_CONFIG, async (_event: IpcMainEvent) => this.configManager.clear());
 
+    // Safe Storage
+
+    this.handle(ChannelType.IPC_SAFE_STORE, async (_event: IpcMainEvent, args: { key: string; value: string }) => {
+      this.configManager.setSecure(args.key, args.value);
+    });
+
+    this.handle(ChannelType.IPC_SAFE_RETRIEVE, async (_event: IpcMainEvent, key: string) => {
+      return this.configManager.getSecure(key);
+    });
+
+    // Session: Clear Cache
+
+    this.handle(ChannelType.IPC_CLEAR_CACHE, async () => {
+      await session.defaultSession.clearCache();
+    });
+
     // Connection Manager
 
     this.handle(ChannelType.IPC_DBCONNECTION_CREATE, async (_event: IpcMainEvent, args: any) =>
@@ -93,22 +115,46 @@ export default class MessageHandler {
     this.handle(ChannelType.IPC_AUTH_USER, async (_event: IpcMainEvent, args: any) => this.fontManager.systemAuthenticate(args));
 
     this.handle(ChannelType.IPC_SCAN_FILES, async (_event: IpcMainEvent, args: any) => {
-      console.log('[IPC_SCAN_FILES] args:', JSON.stringify(args));
-      const catalogFiles = await this.fontManager.copyFiles(args.files, args.collectionId);
-      console.log('[IPC_SCAN_FILES] copied to catalog:', catalogFiles);
-      await this.fontManager.scanFiles(catalogFiles, { collection_id: args.collectionId });
-      console.log('[IPC_SCAN_FILES] scan complete');
+      const { port1, port2 } = new MessageChannelMain();
+      this.mainWindow.webContents.postMessage(ChannelType.IPC_SCAN_PROGRESS_PORT, null, [port2]);
+
+      const onProgress = (progress: any) => {
+        try {
+          port1.postMessage(progress);
+        } catch {
+          // Port may be closed if renderer navigated away
+        }
+      };
+
+      try {
+        const catalogFiles = await this.fontManager.copyFiles(args.files, args.collectionId);
+        await this.fontManager.scanFiles(catalogFiles, { collection_id: args.collectionId }, onProgress);
+      } finally {
+        port1.close();
+      }
     });
 
     this.handle(ChannelType.IPC_SCAN_FOLDERS, async (_event: IpcMainEvent, args: any) => {
-      console.log('[IPC_SCAN_FOLDERS] args:', JSON.stringify(args));
-      const promises = args.folders.map(async (sourceFolder: string) => {
-        const dest = await this.fontManager.copyFolder(sourceFolder, args.collectionId);
-        console.log('[IPC_SCAN_FOLDERS] copied to:', dest);
-        await this.fontManager.scanFolder(dest, { collection_id: args.collectionId });
-        console.log('[IPC_SCAN_FOLDERS] scan complete for:', dest);
-      });
-      await Promise.allSettled(promises);
+      const { port1, port2 } = new MessageChannelMain();
+      this.mainWindow.webContents.postMessage(ChannelType.IPC_SCAN_PROGRESS_PORT, null, [port2]);
+
+      const onProgress = (progress: any) => {
+        try {
+          port1.postMessage(progress);
+        } catch {
+          // Port may be closed if renderer navigated away
+        }
+      };
+
+      try {
+        const promises = args.folders.map(async (sourceFolder: string) => {
+          const dest = await this.fontManager.copyFolder(sourceFolder, args.collectionId);
+          await this.fontManager.scanFolder(dest, { collection_id: args.collectionId }, onProgress);
+        });
+        await Promise.allSettled(promises);
+      } finally {
+        port1.close();
+      }
     });
 
     this.handle(ChannelType.IPC_FETCH_NEWS, async (_event: IpcMainEvent, args: any) => this.fontManager.fetchLatestNews(args));
@@ -205,7 +251,12 @@ export default class MessageHandler {
     this.handle(ChannelType.IPC_SMART_COLLECTION_EVALUATE, async (_event: IpcMainEvent, args: any) => {
       const sc = await this.connectionManager.getSmartCollectionRepository().findOneBy({ id: args.id });
       if (!sc) return [[], 0];
-      const rules = JSON.parse(sc.rules);
+      let rules;
+      try {
+        rules = JSON.parse(sc.rules);
+      } catch {
+        return [[], 0];
+      }
       return await this.connectionManager.getStoreRepository().evaluateSmartRules(rules, sc.match_type, {
         skip: args.skip,
         take: args.take,
@@ -213,6 +264,16 @@ export default class MessageHandler {
       });
     });
 
+    this.handle(ChannelType.IPC_SMART_COLLECTION_PREVIEW, async (_event: IpcMainEvent, args: any) => {
+      let rules;
+      try {
+        rules = typeof args.rules === 'string' ? JSON.parse(args.rules) : args.rules;
+      } catch {
+        return [[], 0];
+      }
+      return await this.connectionManager.getStoreRepository().evaluateSmartRules(rules, args.match_type ?? 'AND', {});
+    });
+
     // Store
 
     this.handle(ChannelType.IPC_STORE_FIND, async (_event: IpcMainEvent, args: any) => {
@@ -278,7 +339,7 @@ export default class MessageHandler {
     });
 
     this.handle(ChannelType.IPC_FONT_METRICS, async (_event: IpcMainEvent, filePath: string) => {
-      const fontObject = new FontObject(filePath);
+      const fontObject = FontObject.fromCache(filePath);
       if (fontObject.hasError()) {
         return null;
       }
@@ -293,7 +354,7 @@ export default class MessageHandler {
     });
 
     this.handle(ChannelType.IPC_FONT_GLYPHS, async (_event: IpcMainEvent, filePath: string) => {
-      const fontObject = new FontObject(filePath);
+      const fontObject = FontObject.fromCache(filePath);
       if (fontObject.hasError()) {
         return [];
       }

package/app/core/SystemManager.js

@@ -7,6 +7,7 @@ const system_1 = require("../config/system");
 const root = process.cwd();
 class ConfigManager {
     constructor(machineId, isProduction) {
+        this.cachedFontPaths = null;
         this.machineId = machineId;
         this.isProduction = isProduction;
     }
@@ -68,9 +69,12 @@ class ConfigManager {
         return path.join(os.tmpdir(), file);
     }
     getPlatformFontPaths() {
+        if (this.cachedFontPaths)
+            return this.cachedFontPaths;
         const paths = system_1.systemFontPaths.get(this.getPlatform()) || [];
         const home = os.homedir();
-        return paths.map((p) => (p.startsWith('~') ? path.join(home, p.slice(1)) : p));
+        this.cachedFontPaths = paths.map((p) => (p.startsWith('~') ? path.join(home, p.slice(1)) : p));
+        return this.cachedFontPaths;
     }
     getUpTime() {
         let sec = os.uptime();

package/app/core/SystemManager.ts

@@ -90,10 +90,14 @@ export default class ConfigManager {
     return path.join(os.tmpdir(), file);
   }
 
+  private cachedFontPaths: string[] | null = null;
+
   getPlatformFontPaths() {
+    if (this.cachedFontPaths) return this.cachedFontPaths;
     const paths = systemFontPaths.get(this.getPlatform()) || [];
     const home = os.homedir();
-    return paths.map((p: string) => (p.startsWith('~') ? path.join(home, p.slice(1)) : p));
+    this.cachedFontPaths = paths.map((p: string) => (p.startsWith('~') ? path.join(home, p.slice(1)) : p));
+    return this.cachedFontPaths;
   }
 
   getUpTime() {

package/app/database/entity/Collection.schema.js

@@ -21,63 +21,63 @@ __decorate([
 ], Collection.prototype, "id", void 0);
 __decorate([
     (0, typeorm_1.Column)({
-        length: 100
+        length: 100,
     }),
     __metadata("design:type", String)
 ], Collection.prototype, "title", void 0);
 __decorate([
     (0, typeorm_1.Column)({
-        type: "int",
-        default: 0
+        type: 'int',
+        default: 0,
     }),
     __metadata("design:type", Number)
 ], Collection.prototype, "parent_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({
-        type: "smallint",
-        default: 0
+        type: 'smallint',
+        default: 0,
     }),
     __metadata("design:type", Number)
 ], Collection.prototype, "left_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({
-        type: "smallint",
-        default: 0
+        type: 'smallint',
+        default: 0,
     }),
     __metadata("design:type", Number)
 ], Collection.prototype, "right_id", void 0);
 __decorate([
     (0, typeorm_1.Column)({
-        type: "smallint",
-        default: 0
+        type: 'smallint',
+        default: 0,
     }),
     __metadata("design:type", Number)
 ], Collection.prototype, "count", void 0);
 __decorate([
     (0, typeorm_1.Column)({
-        type: "smallint",
-        default: 0
+        type: 'smallint',
+        default: 0,
     }),
     __metadata("design:type", Number)
 ], Collection.prototype, "is_system", void 0);
 __decorate([
     (0, typeorm_1.Column)({
-        type: "smallint",
-        default: 0
+        type: 'smallint',
+        default: 0,
     }),
     __metadata("design:type", Number)
 ], Collection.prototype, "orderby", void 0);
 __decorate([
     (0, typeorm_1.Column)({
-        type: "smallint",
-        default: 0
+        type: 'smallint',
+        default: 0,
     }),
     __metadata("design:type", Boolean)
 ], Collection.prototype, "enabled", void 0);
 __decorate([
     (0, typeorm_1.Column)({
-        type: "smallint",
-        default: 0
+        type: 'smallint',
+        default: 0,
     }),
     __metadata("design:type", Boolean)
 ], Collection.prototype, "collapsed", void 0);
@@ -94,6 +94,8 @@ __decorate([
     __metadata("design:type", Array)
 ], Collection.prototype, "stores", void 0);
 exports.Collection = Collection = __decorate([
-    (0, typeorm_1.Entity)()
+    (0, typeorm_1.Entity)(),
+    (0, typeorm_1.Index)(['left_id', 'right_id']),
+    (0, typeorm_1.Index)(['parent_id'])
 ], Collection);
 //# sourceMappingURL=Collection.schema.js.map

package/app/database/entity/Collection.schema.ts

@@ -1,62 +1,63 @@
-import { Entity, Column, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn, OneToMany } from "typeorm";
-import { Store } from "./Store.schema"
+import { Entity, Column, Index, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn, OneToMany } from 'typeorm';
+import { Store } from './Store.schema';
 
 @Entity()
+@Index(['left_id', 'right_id'])
+@Index(['parent_id'])
 export class Collection {
-
   @PrimaryGeneratedColumn()
   id: number;
 
   @Column({
-    length: 100
+    length: 100,
   })
   title: string;
 
   @Column({
-    type: "int",
-    default: 0
+    type: 'int',
+    default: 0,
   })
   parent_id: number;
 
   @Column({
-    type: "smallint",
-    default: 0
+    type: 'smallint',
+    default: 0,
   })
   left_id: number;
 
   @Column({
-    type: "smallint",
-    default: 0
+    type: 'smallint',
+    default: 0,
   })
   right_id: number;
 
   @Column({
-    type: "smallint",
-    default: 0
+    type: 'smallint',
+    default: 0,
   })
   count: number;
 
   @Column({
-    type: "smallint",
-    default: 0
+    type: 'smallint',
+    default: 0,
   })
   is_system: number;
 
   @Column({
-    type: "smallint",
-    default: 0
+    type: 'smallint',
+    default: 0,
   })
   orderby: number;
 
   @Column({
-    type: "smallint",
-    default: 0
+    type: 'smallint',
+    default: 0,
   })
   enabled: boolean;
 
   @Column({
-    type: "smallint",
-    default: 0
+    type: 'smallint',
+    default: 0,
   })
   collapsed: boolean;
 
@@ -64,5 +65,5 @@ export class Collection {
   @UpdateDateColumn() public updated: Date;
 
   @OneToMany(() => Store, (store) => store.collection, { cascade: true })
-  stores: Store[]
+  stores: Store[];
 }

package/app/database/repository/Collection.repository.js

@@ -68,13 +68,7 @@ exports.CollectionRepository = {
     },
     updateCollectionCounts(items) {
         return __awaiter(this, void 0, void 0, function* () {
-            return items.forEach((item) => __awaiter(this, void 0, void 0, function* () {
-                return yield this.createQueryBuilder()
-                    .update(entity_1.Collection)
-                    .set({ count: item.total })
-                    .where('id = :id', { id: item.collection_id })
-                    .execute();
-            }));
+            yield Promise.all(items.map((item) => this.createQueryBuilder().update(entity_1.Collection).set({ count: item.total }).where('id = :id', { id: item.collection_id }).execute()));
         });
     },
     updateCollection(collectionId, data) {
@@ -109,10 +103,12 @@ exports.CollectionRepository = {
     },
     createParent(title) {
         return __awaiter(this, void 0, void 0, function* () {
-            const data = yield this.createQueryBuilder()
-                .select('MAX(collection.right_id)', 'right_id')
-                .addSelect('MAX(collection.orderby)', 'orderby')
-                .getRawOne();
+            const data = yield this.createQueryBuilder().select('MAX(collection.right_id)', 'right_id').getRawOne();
+            yield this.createQueryBuilder()
+                .update(entity_1.Collection)
+                .set({ orderby: () => 'orderby + 1' })
+                .where({ parent_id: 0 })
+                .execute();
             return yield this.createQueryBuilder()
                 .insert()
                 .into(entity_1.Collection)
@@ -121,7 +117,7 @@ exports.CollectionRepository = {
                 parent_id: 0,
                 left_id: data.right_id + 1,
                 right_id: data.right_id + 2,
-                orderby: data.orderby + 1,
+                orderby: 0,
             })
                 .execute();
         });
@@ -129,16 +125,21 @@ exports.CollectionRepository = {
     createChild(parentId, title) {
         return __awaiter(this, void 0, void 0, function* () {
             const row = yield this.findOne({ where: { id: parentId } });
-            this.createQueryBuilder()
+            yield this.createQueryBuilder()
                 .update(entity_1.Collection)
                 .set({ left_id: () => 'left_id + 2', right_id: () => 'right_id + 2' })
                 .where({ left_id: (0, typeorm_1.MoreThan)(row.right_id) })
                 .execute();
-            this.createQueryBuilder()
+            yield this.createQueryBuilder()
                 .update(entity_1.Collection)
                 .set({ right_id: () => 'right_id + 2' })
                 .where({ left_id: (0, typeorm_1.LessThanOrEqual)(row.left_id), right_id: (0, typeorm_1.MoreThanOrEqual)(row.left_id) })
                 .execute();
+            yield this.createQueryBuilder()
+                .update(entity_1.Collection)
+                .set({ orderby: () => 'orderby + 1' })
+                .where({ parent_id: parentId })
+                .execute();
             return yield this.createQueryBuilder()
                 .insert()
                 .into(entity_1.Collection)
@@ -147,7 +148,7 @@ exports.CollectionRepository = {
                 parent_id: parentId,
                 left_id: row.right_id,
                 right_id: row.right_id + 1,
-                orderby: row.orderby + 1,
+                orderby: 0,
             })
                 .execute();
         });
@@ -249,9 +250,7 @@ exports.CollectionRepository = {
                 .where('collection.parent_id = :parentId', { parentId: newParentId })
                 .orderBy('collection.left_id', 'ASC')
                 .getMany();
-            for (let i = 0; i < newSiblings.length; i++) {
-                yield this.createQueryBuilder().update(entity_1.Collection).set({ orderby: i }).where('id = :id', { id: newSiblings[i].id }).execute();
-            }
+            yield Promise.all(newSiblings.map((sibling, i) => this.createQueryBuilder().update(entity_1.Collection).set({ orderby: i }).where('id = :id', { id: sibling.id }).execute()));
         });
     },
     createSystemCollection() {

package/app/database/repository/Collection.repository.ts

@@ -72,13 +72,11 @@ export const CollectionRepository = {
   },
 
   async updateCollectionCounts(items: any[]) {
-    return items.forEach(async (item) => {
-      return await this.createQueryBuilder()
-        .update(Collection)
-        .set({ count: item.total })
-        .where('id = :id', { id: item.collection_id })
-        .execute();
-    });
+    await Promise.all(
+      items.map((item) =>
+        this.createQueryBuilder().update(Collection).set({ count: item.total }).where('id = :id', { id: item.collection_id }).execute(),
+      ),
+    );
   },
 
   updateCollection(collectionId: number, data: any) {
@@ -112,10 +110,13 @@ export const CollectionRepository = {
   },
 
   async createParent(title: string) {
-    const data = await this.createQueryBuilder()
-      .select('MAX(collection.right_id)', 'right_id')
-      .addSelect('MAX(collection.orderby)', 'orderby')
-      .getRawOne();
+    const data = await this.createQueryBuilder().select('MAX(collection.right_id)', 'right_id').getRawOne();
+
+    await this.createQueryBuilder()
+      .update(Collection)
+      .set({ orderby: () => 'orderby + 1' })
+      .where({ parent_id: 0 })
+      .execute();
 
     return await this.createQueryBuilder()
       .insert()
@@ -125,7 +126,7 @@ export const CollectionRepository = {
         parent_id: 0,
         left_id: data.right_id + 1,
         right_id: data.right_id + 2,
-        orderby: data.orderby + 1,
+        orderby: 0,
       })
       .execute();
   },
@@ -133,18 +134,24 @@ export const CollectionRepository = {
   async createChild(parentId: number, title: string) {
     const row = await this.findOne({ where: { id: parentId } });
 
-    this.createQueryBuilder()
+    await this.createQueryBuilder()
       .update(Collection)
       .set({ left_id: () => 'left_id + 2', right_id: () => 'right_id + 2' })
       .where({ left_id: MoreThan(row.right_id) })
       .execute();
 
-    this.createQueryBuilder()
+    await this.createQueryBuilder()
       .update(Collection)
       .set({ right_id: () => 'right_id + 2' })
       .where({ left_id: LessThanOrEqual(row.left_id), right_id: MoreThanOrEqual(row.left_id) })
       .execute();
 
+    await this.createQueryBuilder()
+      .update(Collection)
+      .set({ orderby: () => 'orderby + 1' })
+      .where({ parent_id: parentId })
+      .execute();
+
     return await this.createQueryBuilder()
       .insert()
       .into(Collection)
@@ -153,7 +160,7 @@ export const CollectionRepository = {
         parent_id: parentId,
         left_id: row.right_id,
         right_id: row.right_id + 1,
-        orderby: row.orderby + 1,
+        orderby: 0,
       })
       .execute();
   },
@@ -264,9 +271,11 @@ export const CollectionRepository = {
       .orderBy('collection.left_id', 'ASC')
       .getMany();
 
-    for (let i = 0; i < newSiblings.length; i++) {
-      await this.createQueryBuilder().update(Collection).set({ orderby: i }).where('id = :id', { id: newSiblings[i].id }).execute();
-    }
+    await Promise.all(
+      newSiblings.map((sibling: Collection, i: number) =>
+        this.createQueryBuilder().update(Collection).set({ orderby: i }).where('id = :id', { id: sibling.id }).execute(),
+      ),
+    );
   },
 
   async createSystemCollection() {

package/app/database/repository/Store.repository.js

@@ -131,9 +131,8 @@ exports.StoreRepository = {
                     }
                 });
             }
-            if (options.take) {
-                db.limit(options.take);
-            }
+            const MAX_SEARCH_LIMIT = 5000;
+            db.limit(Math.min(options.take || 500, MAX_SEARCH_LIMIT));
             if (options.skip) {
                 db.offset(options.skip);
             }
@@ -298,13 +297,7 @@ exports.StoreRepository = {
             if (item.version && item.version !== '') {
                 data.version = item.version;
             }
-            //@todo Log errors in log table.
-            return yield this.createQueryBuilder()
-                .insert()
-                .into(entity_1.Store)
-                .values(data)
-                .execute()
-                .catch((err) => console.log('insert-error', err));
+            return yield this.createQueryBuilder().insert().into(entity_1.Store).values(data).execute();
         });
     },
     evaluateSmartRules(rules_1, matchType_1) {
@@ -416,15 +409,17 @@ exports.StoreRepository = {
     },
     fetchSystemStats() {
         return __awaiter(this, void 0, void 0, function* () {
-            const rowCount = yield this.createQueryBuilder().select('COUNT(*)', 'total').getRawOne();
-            const favoriteCount = yield this.createQueryBuilder().select('COUNT(*)', 'total').where('store.favorite = 1').getRawOne();
-            const systemCount = yield this.createQueryBuilder().select('COUNT(*)', 'total').where('store.system = 1').getRawOne();
-            const temporaryCount = yield this.createQueryBuilder().select('COUNT(*)', 'total').where('store.temporary = 1').getRawOne();
+            const stats = yield this.createQueryBuilder()
+                .select('COUNT(*)', 'rowCount')
+                .addSelect('SUM(CASE WHEN store.favorite = 1 THEN 1 ELSE 0 END)', 'favoriteCount')
+                .addSelect('SUM(CASE WHEN store.system = 1 THEN 1 ELSE 0 END)', 'systemCount')
+                .addSelect('SUM(CASE WHEN store.temporary = 1 THEN 1 ELSE 0 END)', 'temporaryCount')
+                .getRawOne();
             return {
-                rowCount: rowCount.total,
-                favoriteCount: favoriteCount.total,
-                systemCount: systemCount.total,
-                temporaryCount: temporaryCount.total,
+                rowCount: Number(stats.rowCount) || 0,
+                favoriteCount: Number(stats.favoriteCount) || 0,
+                systemCount: Number(stats.systemCount) || 0,
+                temporaryCount: Number(stats.temporaryCount) || 0,
             };
         });
     },