fontastic 1.1.0 → 1.3.0

package/app/core/MessageHandler.js

@@ -12,15 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const electron_1 = require("electron");
 const FontObject_1 = require("./FontObject");
 const AppLogger_1 = require("./AppLogger");
-// import { Logger } from '../database/entity/Logger.schema';
-// import { Store, StoreManyAndCountType } from '../database/entity/Store.schema';
 const ChannelType_1 = require("../enums/ChannelType");
 class MessageHandler {
-    constructor(systemManager, configManager, connectionManager, fontManager) {
+    constructor(systemManager, configManager, connectionManager, fontManager, mainWindow) {
         this.systemManager = systemManager;
         this.configManager = configManager;
         this.connectionManager = connectionManager;
         this.fontManager = fontManager;
+        this.mainWindow = mainWindow;
     }
     on(channel, done) {
         return electron_1.ipcMain.on(channel, done);
@@ -44,6 +43,17 @@ class MessageHandler {
         this.handle(ChannelType_1.ChannelType.IPC_SET_CONFIG, (_event, args) => __awaiter(this, void 0, void 0, function* () { return this.configManager.set(args.key, args.values); }));
         this.handle(ChannelType_1.ChannelType.IPC_GET_CONFIG, (_event, args) => __awaiter(this, void 0, void 0, function* () { return this.configManager.get(args.key); }));
         this.handle(ChannelType_1.ChannelType.IPC_ZAP_CONFIG, (_event) => __awaiter(this, void 0, void 0, function* () { return this.configManager.clear(); }));
+        // Safe Storage
+        this.handle(ChannelType_1.ChannelType.IPC_SAFE_STORE, (_event, args) => __awaiter(this, void 0, void 0, function* () {
+            this.configManager.setSecure(args.key, args.value);
+        }));
+        this.handle(ChannelType_1.ChannelType.IPC_SAFE_RETRIEVE, (_event, key) => __awaiter(this, void 0, void 0, function* () {
+            return this.configManager.getSecure(key);
+        }));
+        // Session: Clear Cache
+        this.handle(ChannelType_1.ChannelType.IPC_CLEAR_CACHE, () => __awaiter(this, void 0, void 0, function* () {
+            yield electron_1.session.defaultSession.clearCache();
+        }));
         // Connection Manager
         this.handle(ChannelType_1.ChannelType.IPC_DBCONNECTION_CREATE, (_event, args) => __awaiter(this, void 0, void 0, function* () { return this.configManager.createDbConnection(args); }));
         this.handle(ChannelType_1.ChannelType.IPC_DBCONNECTION_ENABLE, (_event, args) => this.configManager.enableDbConnection(args));
@@ -68,21 +78,45 @@ class MessageHandler {
         this.handle(ChannelType_1.ChannelType.IPC_EXEC_CMD, (_event, args) => __awaiter(this, void 0, void 0, function* () { return this.fontManager.executeCommand(args).catch((err) => this.sendMessage('error', err.message)); }));
         this.handle(ChannelType_1.ChannelType.IPC_AUTH_USER, (_event, args) => __awaiter(this, void 0, void 0, function* () { return this.fontManager.systemAuthenticate(args); }));
         this.handle(ChannelType_1.ChannelType.IPC_SCAN_FILES, (_event, args) => __awaiter(this, void 0, void 0, function* () {
-            console.log('[IPC_SCAN_FILES] args:', JSON.stringify(args));
-            const catalogFiles = yield this.fontManager.copyFiles(args.files, args.collectionId);
-            console.log('[IPC_SCAN_FILES] copied to catalog:', catalogFiles);
-            yield this.fontManager.scanFiles(catalogFiles, { collection_id: args.collectionId });
-            console.log('[IPC_SCAN_FILES] scan complete');
+            const { port1, port2 } = new electron_1.MessageChannelMain();
+            this.mainWindow.webContents.postMessage(ChannelType_1.ChannelType.IPC_SCAN_PROGRESS_PORT, null, [port2]);
+            const onProgress = (progress) => {
+                try {
+                    port1.postMessage(progress);
+                }
+                catch (_a) {
+                    // Port may be closed if renderer navigated away
+                }
+            };
+            try {
+                const catalogFiles = yield this.fontManager.copyFiles(args.files, args.collectionId);
+                yield this.fontManager.scanFiles(catalogFiles, { collection_id: args.collectionId }, onProgress);
+            }
+            finally {
+                port1.close();
+            }
         }));
         this.handle(ChannelType_1.ChannelType.IPC_SCAN_FOLDERS, (_event, args) => __awaiter(this, void 0, void 0, function* () {
-            console.log('[IPC_SCAN_FOLDERS] args:', JSON.stringify(args));
-            const promises = args.folders.map((sourceFolder) => __awaiter(this, void 0, void 0, function* () {
-                const dest = yield this.fontManager.copyFolder(sourceFolder, args.collectionId);
-                console.log('[IPC_SCAN_FOLDERS] copied to:', dest);
-                yield this.fontManager.scanFolder(dest, { collection_id: args.collectionId });
-                console.log('[IPC_SCAN_FOLDERS] scan complete for:', dest);
-            }));
-            yield Promise.allSettled(promises);
+            const { port1, port2 } = new electron_1.MessageChannelMain();
+            this.mainWindow.webContents.postMessage(ChannelType_1.ChannelType.IPC_SCAN_PROGRESS_PORT, null, [port2]);
+            const onProgress = (progress) => {
+                try {
+                    port1.postMessage(progress);
+                }
+                catch (_a) {
+                    // Port may be closed if renderer navigated away
+                }
+            };
+            try {
+                const promises = args.folders.map((sourceFolder) => __awaiter(this, void 0, void 0, function* () {
+                    const dest = yield this.fontManager.copyFolder(sourceFolder, args.collectionId);
+                    yield this.fontManager.scanFolder(dest, { collection_id: args.collectionId }, onProgress);
+                }));
+                yield Promise.allSettled(promises);
+            }
+            finally {
+                port1.close();
+            }
         }));
         this.handle(ChannelType_1.ChannelType.IPC_FETCH_NEWS, (_event, args) => __awaiter(this, void 0, void 0, function* () { return this.fontManager.fetchLatestNews(args); }));
         this.handle(ChannelType_1.ChannelType.IPC_SHOW_MESSAGE_BOX, (_event, options) => __awaiter(this, void 0, void 0, function* () { return this.fontManager.showMessageBox(options); }));
@@ -158,13 +192,30 @@ class MessageHandler {
             const sc = yield 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 (_a) {
+                return [[], 0];
+            }
             return yield this.connectionManager.getStoreRepository().evaluateSmartRules(rules, sc.match_type, {
                 skip: args.skip,
                 take: args.take,
                 order: args.order,
             });
         }));
+        this.handle(ChannelType_1.ChannelType.IPC_SMART_COLLECTION_PREVIEW, (_event, args) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            let rules;
+            try {
+                rules = typeof args.rules === 'string' ? JSON.parse(args.rules) : args.rules;
+            }
+            catch (_b) {
+                return [[], 0];
+            }
+            return yield this.connectionManager.getStoreRepository().evaluateSmartRules(rules, (_a = args.match_type) !== null && _a !== void 0 ? _a : 'AND', {});
+        }));
         // Store
         this.handle(ChannelType_1.ChannelType.IPC_STORE_FIND, (_event, args) => __awaiter(this, void 0, void 0, function* () {
             return yield this.connectionManager.getStore().find(args);
@@ -219,7 +270,7 @@ class MessageHandler {
         }));
         this.handle(ChannelType_1.ChannelType.IPC_FONT_METRICS, (_event, filePath) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e;
-            const fontObject = new FontObject_1.default(filePath);
+            const fontObject = FontObject_1.default.fromCache(filePath);
             if (fontObject.hasError()) {
                 return null;
             }
@@ -233,7 +284,7 @@ class MessageHandler {
             };
         }));
         this.handle(ChannelType_1.ChannelType.IPC_FONT_GLYPHS, (_event, filePath) => __awaiter(this, void 0, void 0, function* () {
-            const fontObject = new FontObject_1.default(filePath);
+            const fontObject = FontObject_1.default.fromCache(filePath);
             if (fontObject.hasError()) {
                 return [];
             }

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() {