tnp-helpers 18.0.18 → 18.0.19

package/websql/fesm2022/tnp-helpers.mjs

@@ -1717,10 +1717,24 @@ class ProjectDatabase extends BaseDb {
 ;
 ({}); // @--end-of-file-for-module=tnp-helpers lib/base/project-database.ts
 
-var NotAssignablePort_1;
-let NotAssignablePort = NotAssignablePort_1 = class NotAssignablePort extends Taon.Base.Entity {
+var Port_1;
+const PortStatusArr = [
+    'unassigned',
+    'assigned',
+    'assigned-not-registered',
+    'assigned-taken-by-os',
+];
+let Port = Port_1 = class Port extends Taon.Base.Entity {
     static from(opt) {
-        return _.merge(new NotAssignablePort_1(), opt);
+        return _.merge(new Port_1(), opt);
+    }
+    static getTitleForFreePort(port) {
+        return `free port ${port}`;
+    }
+    get titleOnList() {
+        /* */
+        /* */
+        return (void 0);
     }
 };
 __decorate([
@@ -1729,7 +1743,7 @@ __decorate([
         unique: true,
     }),
     __metadata("design:type", Number)
-], NotAssignablePort.prototype, "port", void 0);
+], Port.prototype, "port", void 0);
 __decorate([
     Taon.Orm.Column.Custom({
         type: 'varchar',
@@ -1737,28 +1751,7 @@ __decorate([
         unique: true,
     }),
     __metadata("design:type", String)
-], NotAssignablePort.prototype, "serviceId", void 0);
-NotAssignablePort = NotAssignablePort_1 = __decorate([
-    Taon.Entity({
-        className: 'NotAssignablePort',
-        uniqueKeyProp: 'port',
-    })
-], NotAssignablePort);
-;
-({}); // @--end-of-file-for-module=tnp-helpers lib/base/tcp-udp-ports/not-assignable-port.entity.ts
-
-var Port_1;
-const PortStatusArr = [
-    'unassigned',
-    'assigned',
-    'assigned-not-registered',
-    'assigned-taken-by-os',
-];
-let Port = Port_1 = class Port extends NotAssignablePort {
-    static from(opt) {
-        return _.merge(new Port_1(), opt);
-    }
-};
+], Port.prototype, "serviceId", void 0);
 __decorate([
     Taon.Orm.Column.String500('unassigned'),
     __metadata("design:type", String)
@@ -1941,29 +1934,142 @@ let PortsController = class PortsController extends BaseCliWorkerController {
         super(...arguments);
         this.START_PORT = 3000;
         this.END_PORT = 6000;
-        this.takenByOsPorts = new Map();
-        this.assignedPorts = new Map();
+        this.portsCache = new Map();
     }
     get firstFreePort() {
-        if (!this.assignedPorts) {
-            return null;
-        }
-        return Array.from(this.assignedPorts.values()).find(p => p.status === 'unassigned');
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        return (void 0);
     }
     firstUnassignedPortMoreThan(port) {
-        if (!this.assignedPorts) {
-            return null;
-        }
-        return Array.from(this.assignedPorts.values()).find(p => p.status === 'unassigned' && p.port > port);
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        return (void 0);
     }
-    getPortByStatus(status) {
+    getFirstFreePort() {
         return async () => {
-            if (status === 'assigned-taken-by-os') {
-                return Array.from(this.takenByOsPorts.values());
-            }
-            return Array.from(this.assignedPorts.values()).filter(f => f.status === status);
+            return this.firstFreePort;
         };
     }
+    getPortByNumber(portNumber) {
+        return async () => {
+            portNumber = Number(portNumber);
+            return Array.from(this.portsCache.values()).find(f => f.port === portNumber);
+        };
+    }
+    getPortsByStatus(status) {
+        return async () => {
+            return Array.from(this.portsCache.values())
+                .filter(f => f.status === status)
+                .sort((a, b) => {
+                if (a.port < b.port) {
+                    return -1;
+                }
+                if (a.port > b.port) {
+                    return 1;
+                }
+                return 0;
+            });
+        };
+    }
+    /**
+     * make it unassigned
+     */
+    deletePort(portNumber) {
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        return (void 0);
+    }
+    /**
+     * make it unassigned
+     */
+    updatePortUniqueId(portNumber, serviceId) {
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        return (void 0);
+    }
+    addTakeByOsPort(portNumber, uniqueId) {
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        return (void 0);
+    }
     /**
      * @param uniqueServiceName unique service name
      * @param startFrom start searching for free port from this number
@@ -2014,16 +2120,55 @@ let PortsController = class PortsController extends BaseCliWorkerController {
         /* */
         /* */
         /* */
+        /* */
+        /* */
+        /* */
         return (void 0);
     }
 };
+__decorate([
+    Taon.Http.GET(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Object)
+], PortsController.prototype, "getFirstFreePort", null);
+__decorate([
+    Taon.Http.GET(),
+    __param(0, Taon.Http.Param.Query('portNumber')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number]),
+    __metadata("design:returntype", Object)
+], PortsController.prototype, "getPortByNumber", null);
 __decorate([
     Taon.Http.GET(),
     __param(0, Taon.Http.Param.Query('status')),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Object)
-], PortsController.prototype, "getPortByStatus", null);
+], PortsController.prototype, "getPortsByStatus", null);
+__decorate([
+    Taon.Http.DELETE(),
+    __param(0, Taon.Http.Param.Query('portNumber')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number]),
+    __metadata("design:returntype", Object)
+], PortsController.prototype, "deletePort", null);
+__decorate([
+    Taon.Http.PUT(),
+    __param(0, Taon.Http.Param.Query('portNumber')),
+    __param(1, Taon.Http.Param.Query('serviceId')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, String]),
+    __metadata("design:returntype", Object)
+], PortsController.prototype, "updatePortUniqueId", null);
+__decorate([
+    Taon.Http.POST(),
+    __param(0, Taon.Http.Param.Query('portNumber')),
+    __param(1, Taon.Http.Param.Query('uniqueId')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, String]),
+    __metadata("design:returntype", Object)
+], PortsController.prototype, "addTakeByOsPort", null);
 __decorate([
     Taon.Http.PUT(),
     __param(0, Taon.Http.Param.Query('uniqueServiceName')),
@@ -2059,6 +2204,7 @@ class BaseCliWorker {
         this.serviceID = serviceID;
         this.startCommand = startCommand;
         this.serviceVersion = serviceVersion;
+        this.SPECIAL_WORKER_READY_MESSAGE = '$$$ WORKER_READY $$$';
     }
     get pathToProcessLocalInfoJson() {
         /* */
@@ -2080,7 +2226,7 @@ class BaseCliWorker {
         /* */
         return (void 0);
     }
-    async startDetachedIfNeedsToBeStarted() {
+    async startDetachedIfNeedsToBeStarted(options) {
         /* */
         /* */
         /* */
@@ -2136,7 +2282,7 @@ class BaseCliWorker {
         //longer because os is disposing process previous process
         if (options.detached) {
             Helpers.info(`Restarting service "${this.serviceID}" in detached mode...`);
-            await this.startDetached();
+            await this.startDetached(options);
         }
         else {
             Helpers.info(`Restarting service "${this.serviceID}" in current process...`);
@@ -2302,12 +2448,25 @@ class BaseCliWorker {
         /* */
         /* */
         /* */
+        /* */
+        /* */
+        /* */
         return (void 0);
     }
     /**
      * start if not started detached process
      */
-    async startDetached() {
+    async startDetached(options) {
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
         /* */
         /* */
         /* */
@@ -2376,7 +2535,36 @@ class BaseCliWorker {
         /* */
         return (void 0);
     }
-    getWorkerTerminalActions() {
+    get backAction() {
+        return {
+            back: {
+                name: 'Back',
+            },
+        };
+    }
+    get chooseAction() {
+        return {
+            emptyAction: {
+                name: ' -- choose any action below --',
+                action: async () => { },
+            },
+        };
+    }
+    displaySpecialWorkerReadyMessage() {
+        console.log(this.SPECIAL_WORKER_READY_MESSAGE);
+    }
+    getWorkerTerminalActions(options) {
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
         /* */
         /* */
         /* */
@@ -2403,18 +2591,22 @@ class BaseCliWorker {
         /* */
         return (void 0);
     }
-    async _infoScreen() {
+    async infoScreen(options) {
+        options = options || {};
         while (true) {
             Helpers.clearConsole();
             await this.header();
             await this.infoMessageBelowHeader();
-            const choices = this.getWorkerTerminalActions();
+            const choices = this.getWorkerTerminalActions(options);
             const choice = await UtilsTerminal.select({
                 choices,
                 question: 'Choose action',
             });
             const action = choices[choice].action;
             await action();
+            if (choice === 'exit') {
+                break;
+            }
         }
     }
     saveProcessInfo(processConfig) {
@@ -2568,20 +2760,28 @@ let PortsContext_1736199486472_addingNotAssignablePorts = class PortsContext_173
         this.commonPortsFrom3000to6000 = Object.keys(portsWithDescription).map(Number);
     }
     async up(queryRunner) {
-        const db = await queryRunner.manager.getRepository(NotAssignablePort);
-        const allPorts = this.commonPortsFrom3000to6000.map(port => NotAssignablePort.from({
+        const db = await queryRunner.manager.getRepository(Port);
+        const allPorts = this.commonPortsFrom3000to6000.map(port => Port.from({
             port,
             serviceId: `not assignable (${portsWithDescription[port]})`,
+            status: 'assigned-taken-by-os',
         }));
         await db.save(allPorts);
         for (const commonPortObj of allPorts) {
-            this.portsController.takenByOsPorts.set(commonPortObj.port, commonPortObj);
+            this.portsController.portsCache.set(commonPortObj.serviceId, commonPortObj);
         }
     }
     async down(queryRunner) {
-        const db = await queryRunner.manager.getRepository(NotAssignablePort);
-        db.clear();
-        this.portsController.takenByOsPorts.clear();
+        const db = await queryRunner.manager.getRepository(Port);
+        await db.remove(await db.find({
+            where: {
+                status: 'assigned-taken-by-os',
+            },
+        }));
+        const allPorts = Array.from(this.portsController.portsCache.values()).filter(f => f.status === 'assigned-taken-by-os');
+        for (const port of allPorts) {
+            this.portsController.portsCache.delete(port.serviceId);
+        }
     }
 };
 PortsContext_1736199486472_addingNotAssignablePorts = __decorate([
@@ -2601,19 +2801,32 @@ let PortsContext_1736454437350_addFreePorts = class PortsContext_1736454437350_a
     async up(queryRunner) {
         const portsTableRepo = await queryRunner.manager.getRepository(Port);
         const addFreePortsInRange = _.range(this.portsController.START_PORT, this.portsController.END_PORT + 1);
+        const allTakeByOsPort = (await portsTableRepo.find({
+            where: {
+                status: 'assigned-taken-by-os',
+            },
+        })).map(f => f.port);
         const freePortsInRange = addFreePortsInRange.map(port => Port.from({
             port: port,
-            serviceId: `free port ${port}`,
-        }));
+            serviceId: Port.getTitleForFreePort(port),
+            status: 'unassigned',
+        })).filter(f => !allTakeByOsPort.includes(f.port));
         await portsTableRepo.save(freePortsInRange);
         for (const port of freePortsInRange) {
-            this.portsController.assignedPorts.set(port.serviceId, port);
+            this.portsController.portsCache.set(port.serviceId, port);
         }
     }
     async down(queryRunner) {
-        this.portsController.assignedPorts.clear();
-        const portsTableRepo = await queryRunner.manager.getRepository(Port);
-        portsTableRepo.clear();
+        const db = await queryRunner.manager.getRepository(Port);
+        await db.remove(await db.find({
+            where: {
+                status: 'unassigned',
+            },
+        }));
+        const allPorts = Array.from(this.portsController.portsCache.values()).filter(f => f.status === 'unassigned');
+        for (const port of allPorts) {
+            this.portsController.portsCache.delete(port.serviceId);
+        }
     }
 };
 PortsContext_1736454437350_addFreePorts = __decorate([
@@ -2654,7 +2867,7 @@ const PortsContext = Taon.createContext(() => ({
     contextName: 'PortsContext',
     contexts: { BaseContext },
     controllers: { PortsController },
-    entities: { Port, NotAssignablePort },
+    entities: { Port },
     migrations: { ...MIGRATIONS_CLASSES_FOR_PortsContext },
     skipWritingServerRoutes: true,
     /* */
@@ -2708,9 +2921,54 @@ class PortsWorker extends BaseCliWorker {
         /* */
         /* */
         /* */
+        /* */
         return (void 0);
     }
     async displayItemsForPortsStatus(status) {
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        return (void 0);
+    }
+    getWorkerTerminalActions(options) {
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
         /* */
         /* */
         /* */
@@ -2732,17 +2990,47 @@ class PortsWorker extends BaseCliWorker {
         /* */
         return (void 0);
     }
-    get backAction() {
-        return {
-            back: {
-                name: 'Back',
-                action: async () => {
-                    return true;
-                },
-            },
-        };
+    async getNewPortToAdd() {
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        return (void 0);
     }
-    getWorkerTerminalActions() {
+    async addPortTerminalUiProcess() {
+        /* */
+        /* */
         /* */
         /* */
         /* */
@@ -2766,6 +3054,10 @@ class PortsWorker extends BaseCliWorker {
         /* */
         /* */
         /* */
+        /* */
+        return (void 0);
+    }
+    async selectPortProcess(ports, title) {
         /* */
         /* */
         /* */
@@ -2784,6 +3076,102 @@ class PortsWorker extends BaseCliWorker {
         /* */
         return (void 0);
     }
+    async deletePortTerminalUiProcess() {
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        return (void 0);
+    }
+    async editPortTerminalUiProcess() {
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        return (void 0);
+    }
+    async crudMenuForTakeByOsPorts() {
+        const { selected: actionChoice } = await UtilsTerminal.selectActionAndExecute({
+            back: {
+                name: ' - back - ',
+            },
+            editPort: {
+                name: 'Edit port',
+            },
+            addPort: {
+                name: 'Add port',
+            },
+            deletePort: {
+                name: 'Delete port (make it unassigned)',
+            },
+        });
+        switch (actionChoice) {
+            case 'editPort':
+                await this.editPortTerminalUiProcess();
+                break;
+            case 'addPort':
+                await this.addPortTerminalUiProcess();
+                break;
+            case 'deletePort':
+                await this.deletePortTerminalUiProcess();
+                break;
+        }
+    }
 }
 ;
 ({}); // @--end-of-file-for-module=tnp-helpers lib/base/tcp-udp-ports/tcp-upd-ports.worker.ts
@@ -6893,6 +7281,31 @@ class BaseVscodeHelpers extends BaseFeatureForProject {
         /* */
         /* */
         /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
+        /* */
         return (void 0);
     }
 }
@@ -8483,5 +8896,5 @@ const Helpers = HelpersTaon.Instance;
  * Generated bundle index. Do not edit.
  */
 
-export { BaseCliWorker, BaseCliWorkerConfig, BaseCliWorkerController, BaseCompilerForProject, BaseDebounceCompilerForProject, BaseFeatureForProject, BaseGit, BaseLibraryBuild, BaseLinkedProjects, BaseNpmHelpers, BaseProject, BaseProjectResolver, BaseProjectTypeArr, BaseQuickFixes, BaseReleaseProcess, BaseVscodeHelpers, CommitData, CoreAngularProject, CoreProject, CoreTypescriptProject, Helpers, HelpersAngular, LinkedPorjectsConfig, LinkedProject, NotAssignablePort, Port, PortStatusArr, PortsController, PortsWorker, UtilsHttp, UtilsMd, UtilsNpm, UtilsQuickFixes, UtilsTypescript, Validators };
+export { BaseCliWorker, BaseCliWorkerConfig, BaseCliWorkerController, BaseCompilerForProject, BaseDebounceCompilerForProject, BaseFeatureForProject, BaseGit, BaseLibraryBuild, BaseLinkedProjects, BaseNpmHelpers, BaseProject, BaseProjectResolver, BaseProjectTypeArr, BaseQuickFixes, BaseReleaseProcess, BaseVscodeHelpers, CommitData, CoreAngularProject, CoreProject, CoreTypescriptProject, Helpers, HelpersAngular, LinkedPorjectsConfig, LinkedProject, Port, PortStatusArr, PortsController, PortsWorker, UtilsHttp, UtilsMd, UtilsNpm, UtilsQuickFixes, UtilsTypescript, Validators };
 //# sourceMappingURL=tnp-helpers.mjs.map