tnp-helpers 18.0.18 → 18.0.19

package/lib/base/tcp-udp-ports/tcp-upd-ports.worker.js

@@ -9,7 +9,6 @@ var index_1 = require("../../index");
 var ports_controller_1 = require("../tcp-udp-ports/ports.controller");
 var tcp_udp_ports_context_1 = require("../tcp-udp-ports/tcp-udp-ports.context");
 var tnp_core_2 = require("tnp-core");
-var tnp_core_3 = require("tnp-core");
 //#endregion
 var PortsWorker = /** @class */ (function (_super) {
     tslib_1.__extends(PortsWorker, _super);
@@ -86,8 +85,9 @@ var PortsWorker = /** @class */ (function (_super) {
                         _a.sent();
                         index_1.Helpers.info("Service started !");
                         this.preventExternalConfigChange();
+                        this.displaySpecialWorkerReadyMessage();
                         // await Helpers.pressKeyAndContinue('Press any key to enter menu');
-                        return [4 /*yield*/, this._infoScreen()];
+                        return [4 /*yield*/, this.infoScreen()];
                     case 6:
                         // await Helpers.pressKeyAndContinue('Press any key to enter menu');
                         _a.sent();
@@ -106,10 +106,10 @@ var PortsWorker = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getControllerForRemoteConnection()];
                     case 1:
                         controller = _a.sent();
-                        return [4 /*yield*/, controller.getPortByStatus(status).received];
+                        return [4 /*yield*/, controller.getPortsByStatus(status).received];
                     case 2:
                         portsData = _a.sent();
-                        ports = portsData.body.json.map(function (c) { return "- ".concat(c.port, " <").concat(tnp_core_3.chalk.gray(c.serviceId), ">"); });
+                        ports = portsData.body.json.map(function (c) { return c.titleOnList; });
                         if (!(ports.length === 0)) return [3 /*break*/, 4];
                         index_1.Helpers.info("\n\n        No ports with status \"".concat(status, "\" as taken by os yet...\n\n        "));
                         return [4 /*yield*/, tnp_core_2.UtilsTerminal.pressAnyKeyToContinueAsync({
@@ -127,29 +127,13 @@ var PortsWorker = /** @class */ (function (_super) {
             });
         });
     };
-    Object.defineProperty(PortsWorker.prototype, "backAction", {
-        //#endregion
-        get: function () {
-            var _this = this;
-            return {
-                back: {
-                    name: 'Back',
-                    action: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                        return tslib_1.__generator(this, function (_a) {
-                            return [2 /*return*/, true];
-                        });
-                    }); },
-                },
-            };
-        },
-        enumerable: false,
-        configurable: true
-    });
+    //#endregion
     //#region methods / get worker terminal actions
-    PortsWorker.prototype.getWorkerTerminalActions = function () {
+    PortsWorker.prototype.getWorkerTerminalActions = function (options) {
         var e_1, _a;
         var _this = this;
         //#region @backendFunc
+        options = options || {};
         var additionalActions = {};
         var _loop_1 = function (portStatus) {
             additionalActions["show".concat(tnp_core_1._.capitalize(portStatus), "Ports")] = {
@@ -179,12 +163,7 @@ var PortsWorker = /** @class */ (function (_super) {
             }
             finally { if (e_1) throw e_1.error; }
         }
-        return tslib_1.__assign({ emptyAction: {
-                name: ' -- choose any action below --',
-                action: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
-                    return [2 /*return*/];
-                }); }); },
-            }, previewPorts: {
+        return tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, this.chooseAction), { previewPorts: {
                 name: 'Preview all ports',
                 action: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                     var selected;
@@ -206,9 +185,293 @@ var PortsWorker = /** @class */ (function (_super) {
                         }
                     });
                 }); },
-            } }, _super.prototype.getWorkerTerminalActions.call(this));
+            }, editAddTakeByOsPort: {
+                name: 'Edit/Add/Delete "Take by os ports"',
+                action: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    return tslib_1.__generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, this.crudMenuForTakeByOsPorts()];
+                            case 1:
+                                _a.sent();
+                                return [2 /*return*/];
+                        }
+                    });
+                }); },
+            } }), _super.prototype.getWorkerTerminalActions.call(this, tslib_1.__assign({ chooseAction: false }, options)));
         //#endregion
     };
+    //#endregion
+    //#region methods / get new port to add
+    PortsWorker.prototype.getNewPortToAdd = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var ctrl, portToAdd, getFreePort, inputNumber, portIsNumber, portInRange;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getControllerForRemoteConnection()];
+                    case 1:
+                        ctrl = _a.sent();
+                        _a.label = 2;
+                    case 2:
+                        if (!true) return [3 /*break*/, 7];
+                        return [4 /*yield*/, ctrl.getFirstFreePort().received];
+                    case 3:
+                        getFreePort = (_a.sent()).body.json
+                            .port;
+                        return [4 /*yield*/, tnp_core_2.UtilsTerminal.input({
+                                defaultValue: getFreePort === null || getFreePort === void 0 ? void 0 : getFreePort.toString(),
+                                question: 'Enter port number',
+                            })];
+                    case 4:
+                        inputNumber = _a.sent();
+                        portToAdd = Number(inputNumber);
+                        portIsNumber = !isNaN(portToAdd);
+                        portInRange = portToAdd >= ctrl.START_PORT && portToAdd <= ctrl.END_PORT;
+                        if (!(!portIsNumber || !portInRange)) return [3 /*break*/, 6];
+                        return [4 /*yield*/, tnp_core_2.UtilsTerminal.confirm({
+                                message: "Port number is not valid. Do you want to try again?",
+                                defaultValue: true,
+                            })];
+                    case 5:
+                        if (_a.sent()) {
+                            return [3 /*break*/, 2];
+                        }
+                        else {
+                            return [2 /*return*/];
+                        }
+                        _a.label = 6;
+                    case 6:
+                        if (portIsNumber && portInRange) {
+                            return [3 /*break*/, 7];
+                        }
+                        return [3 /*break*/, 2];
+                    case 7: return [2 /*return*/, portToAdd];
+                }
+            });
+        });
+    };
+    //#endregion
+    //#region methods / add port process
+    PortsWorker.prototype.addPortTerminalUiProcess = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var ctrl, portToAdd, uniqueId, addedPort, error_1;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getControllerForRemoteConnection()];
+                    case 1:
+                        ctrl = _a.sent();
+                        return [4 /*yield*/, this.getNewPortToAdd()];
+                    case 2:
+                        portToAdd = _a.sent();
+                        _a.label = 3;
+                    case 3:
+                        if (!true) return [3 /*break*/, 12];
+                        return [4 /*yield*/, tnp_core_2.UtilsTerminal.input({
+                                defaultValue: "my-service-on-port-".concat(portToAdd),
+                                question: 'Enter service unique description',
+                            })];
+                    case 4:
+                        uniqueId = _a.sent();
+                        _a.label = 5;
+                    case 5:
+                        _a.trys.push([5, 9, , 11]);
+                        return [4 /*yield*/, tnp_core_2.UtilsTerminal.pressAnyKeyToContinueAsync()];
+                    case 6:
+                        _a.sent();
+                        return [4 /*yield*/, ctrl.addTakeByOsPort(portToAdd, encodeURIComponent(uniqueId))
+                                .received];
+                    case 7:
+                        addedPort = (_a.sent()).body.json;
+                        return [4 /*yield*/, tnp_core_2.UtilsTerminal.pressAnyKeyToContinueAsync({
+                                message: "Port added successfully. Press any key to continue...",
+                            })];
+                    case 8:
+                        _a.sent();
+                        return [2 /*return*/];
+                    case 9:
+                        error_1 = _a.sent();
+                        return [4 /*yield*/, tnp_core_2.UtilsTerminal.pressAnyKeyToContinueAsync({
+                                message: 'Something went wrong. Press any key to continue...',
+                            })];
+                    case 10:
+                        _a.sent();
+                        return [2 /*return*/];
+                    case 11: return [3 /*break*/, 3];
+                    case 12: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    //#endregion
+    //#region methods / select port process
+    PortsWorker.prototype.selectPortProcess = function (ports, title) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var selectedPort;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, tnp_core_2.UtilsTerminal.select({
+                            question: title,
+                            choices: tslib_1.__spreadArray([
+                                {
+                                    name: 'Back',
+                                    value: undefined,
+                                }
+                            ], tslib_1.__read(ports.map(function (p) { return ({
+                                name: p.titleOnList,
+                                value: p.port,
+                            }); })), false),
+                        })];
+                    case 1:
+                        selectedPort = _a.sent();
+                        return [2 /*return*/, ports.find(function (f) { return f.port === selectedPort; })];
+                }
+            });
+        });
+    };
+    //#endregion
+    //#region methods / delete port process
+    PortsWorker.prototype.deletePortTerminalUiProcess = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var ctrl, portsTakeByOs, selectedPort, error_2;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getControllerForRemoteConnection()];
+                    case 1:
+                        ctrl = _a.sent();
+                        return [4 /*yield*/, ctrl.getPortsByStatus('assigned-taken-by-os').received];
+                    case 2:
+                        portsTakeByOs = (_a.sent()).body.json;
+                        return [4 /*yield*/, this.selectPortProcess(portsTakeByOs, 'Select port to delete (make it unassigned)')];
+                    case 3:
+                        selectedPort = _a.sent();
+                        if (!selectedPort) {
+                            return [2 /*return*/];
+                        }
+                        _a.label = 4;
+                    case 4:
+                        _a.trys.push([4, 7, , 9]);
+                        return [4 /*yield*/, ctrl.deletePort(selectedPort.port).received];
+                    case 5:
+                        _a.sent();
+                        return [4 /*yield*/, tnp_core_2.UtilsTerminal.pressAnyKeyToContinueAsync({
+                                message: 'Port deleted successfully. Press any key to continue...',
+                            })];
+                    case 6:
+                        _a.sent();
+                        return [2 /*return*/];
+                    case 7:
+                        error_2 = _a.sent();
+                        return [4 /*yield*/, tnp_core_2.UtilsTerminal.pressAnyKeyToContinueAsync({
+                                message: 'Something went wrong. Press any key to continue...',
+                            })];
+                    case 8:
+                        _a.sent();
+                        return [2 /*return*/];
+                    case 9: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    //#endregion
+    //#region methods / edit port process
+    PortsWorker.prototype.editPortTerminalUiProcess = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var ctrl, portsTakeByOs, selectedPort, newDescription, updatePort, error_3;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getControllerForRemoteConnection()];
+                    case 1:
+                        ctrl = _a.sent();
+                        return [4 /*yield*/, ctrl.getPortsByStatus('assigned-taken-by-os').received];
+                    case 2:
+                        portsTakeByOs = (_a.sent()).body.json;
+                        return [4 /*yield*/, this.selectPortProcess(portsTakeByOs, 'Select port to edit')];
+                    case 3:
+                        selectedPort = _a.sent();
+                        if (!selectedPort) {
+                            return [2 /*return*/];
+                        }
+                        _a.label = 4;
+                    case 4:
+                        if (!true) return [3 /*break*/, 12];
+                        return [4 /*yield*/, tnp_core_2.UtilsTerminal.input({
+                                question: 'Enter new unique Id (description)',
+                                defaultValue: selectedPort.serviceId,
+                            })];
+                    case 5:
+                        newDescription = _a.sent();
+                        _a.label = 6;
+                    case 6:
+                        _a.trys.push([6, 9, , 11]);
+                        return [4 /*yield*/, ctrl.updatePortUniqueId(selectedPort.port, encodeURIComponent(newDescription)).received];
+                    case 7:
+                        updatePort = (_a.sent()).body.json;
+                        return [4 /*yield*/, tnp_core_2.UtilsTerminal.pressAnyKeyToContinueAsync({
+                                message: "Port edited successfully. Press any key to continue...",
+                            })];
+                    case 8:
+                        _a.sent();
+                        return [2 /*return*/];
+                    case 9:
+                        error_3 = _a.sent();
+                        return [4 /*yield*/, tnp_core_2.UtilsTerminal.pressAnyKeyToContinueAsync({
+                                message: 'Something went wrong. Press any key to continue...',
+                            })];
+                    case 10:
+                        _a.sent();
+                        return [2 /*return*/];
+                    case 11: return [3 /*break*/, 4];
+                    case 12: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    //#endregion
+    //#region methods / crud menu for take by os ports
+    PortsWorker.prototype.crudMenuForTakeByOsPorts = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var actionChoice, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, tnp_core_2.UtilsTerminal.selectActionAndExecute({
+                            back: {
+                                name: ' - back - ',
+                            },
+                            editPort: {
+                                name: 'Edit port',
+                            },
+                            addPort: {
+                                name: 'Add port',
+                            },
+                            deletePort: {
+                                name: 'Delete port (make it unassigned)',
+                            },
+                        })];
+                    case 1:
+                        actionChoice = (_b.sent()).selected;
+                        _a = actionChoice;
+                        switch (_a) {
+                            case 'editPort': return [3 /*break*/, 2];
+                            case 'addPort': return [3 /*break*/, 4];
+                            case 'deletePort': return [3 /*break*/, 6];
+                        }
+                        return [3 /*break*/, 8];
+                    case 2: return [4 /*yield*/, this.editPortTerminalUiProcess()];
+                    case 3:
+                        _b.sent();
+                        return [3 /*break*/, 8];
+                    case 4: return [4 /*yield*/, this.addPortTerminalUiProcess()];
+                    case 5:
+                        _b.sent();
+                        return [3 /*break*/, 8];
+                    case 6: return [4 /*yield*/, this.deletePortTerminalUiProcess()];
+                    case 7:
+                        _b.sent();
+                        return [3 /*break*/, 8];
+                    case 8: return [2 /*return*/];
+                }
+            });
+        });
+    };
     return PortsWorker;
 }(base_cli_worker_1.BaseCliWorker));
 exports.PortsWorker = PortsWorker;

package/lib/base/tcp-udp-ports/tcp-upd-ports.worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"tcp-upd-ports.worker.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}
+{"version":3,"file":"tcp-upd-ports.worker.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}

package/lib/helpers/for-browser/angular.helper.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dummy1736908610967 = dummy1736908610967;
-function dummy1736908610967() { }
+exports.dummy1737492932995 = dummy1737492932995;
+function dummy1737492932995() { }
 //# sourceMappingURL=angular.helper.js.map

package/lib/old/base-component.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dummy1736908610463 = dummy1736908610463;
-function dummy1736908610463() { }
+exports.dummy1737492932511 = dummy1737492932511;
+function dummy1737492932511() { }
 //# sourceMappingURL=base-component.js.map

package/lib/old/base-formly-component.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dummy1736908610468 = dummy1736908610468;
-function dummy1736908610468() { }
+exports.dummy1737492932515 = dummy1737492932515;
+function dummy1737492932515() { }
 //# sourceMappingURL=base-formly-component.js.map

package/lib/old/dual-component-ctrl.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dummy1736908610475 = dummy1736908610475;
-function dummy1736908610475() { }
+exports.dummy1737492932523 = dummy1737492932523;
+function dummy1737492932523() { }
 //# sourceMappingURL=dual-component-ctrl.js.map

package/migrations/1736199486472_addingNotAssignablePorts.js

@@ -37,13 +37,14 @@ var PortsContext_1736199486472_addingNotAssignablePorts = /** @class */ (functio
             var e_1, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
-                    case 0: return [4 /*yield*/, queryRunner.manager.getRepository(lib_1.NotAssignablePort)];
+                    case 0: return [4 /*yield*/, queryRunner.manager.getRepository(lib_1.Port)];
                     case 1:
                         db = _b.sent();
                         allPorts = this.commonPortsFrom3000to6000.map(function (port) {
-                            return lib_1.NotAssignablePort.from({
+                            return lib_1.Port.from({
                                 port: port,
                                 serviceId: "not assignable (".concat(portsWithDescription[port], ")"),
+                                status: 'assigned-taken-by-os',
                             });
                         });
                         return [4 /*yield*/, db.save(allPorts)];
@@ -52,7 +53,7 @@ var PortsContext_1736199486472_addingNotAssignablePorts = /** @class */ (functio
                         try {
                             for (allPorts_1 = tslib_1.__values(allPorts), allPorts_1_1 = allPorts_1.next(); !allPorts_1_1.done; allPorts_1_1 = allPorts_1.next()) {
                                 commonPortObj = allPorts_1_1.value;
-                                this.portsController.takenByOsPorts.set(commonPortObj.port, commonPortObj);
+                                this.portsController.portsCache.set(commonPortObj.serviceId, commonPortObj);
                             }
                         }
                         catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -69,14 +70,36 @@ var PortsContext_1736199486472_addingNotAssignablePorts = /** @class */ (functio
     };
     PortsContext_1736199486472_addingNotAssignablePorts.prototype.down = function (queryRunner) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var db;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, queryRunner.manager.getRepository(lib_1.NotAssignablePort)];
+            var db, _a, _b, allPorts, allPorts_2, allPorts_2_1, port;
+            var e_2, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0: return [4 /*yield*/, queryRunner.manager.getRepository(lib_1.Port)];
                     case 1:
-                        db = _a.sent();
-                        db.clear();
-                        this.portsController.takenByOsPorts.clear();
+                        db = _d.sent();
+                        _b = (_a = db).remove;
+                        return [4 /*yield*/, db.find({
+                                where: {
+                                    status: 'assigned-taken-by-os',
+                                },
+                            })];
+                    case 2: return [4 /*yield*/, _b.apply(_a, [_d.sent()])];
+                    case 3:
+                        _d.sent();
+                        allPorts = Array.from(this.portsController.portsCache.values()).filter(function (f) { return f.status === 'assigned-taken-by-os'; });
+                        try {
+                            for (allPorts_2 = tslib_1.__values(allPorts), allPorts_2_1 = allPorts_2.next(); !allPorts_2_1.done; allPorts_2_1 = allPorts_2.next()) {
+                                port = allPorts_2_1.value;
+                                this.portsController.portsCache.delete(port.serviceId);
+                            }
+                        }
+                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                        finally {
+                            try {
+                                if (allPorts_2_1 && !allPorts_2_1.done && (_c = allPorts_2.return)) _c.call(allPorts_2);
+                            }
+                            finally { if (e_2) throw e_2.error; }
+                        }
                         return [2 /*return*/];
                 }
             });

package/migrations/1736199486472_addingNotAssignablePorts.js.map

@@ -1 +1 @@
-{"version":3,"file":"1736199486472_addingNotAssignablePorts.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AAAA,6BAA4B;AAG5B,8BAAkE;AAElE,IAAM,oBAAoB,GAAG;IAC3B,IAAI,EAAE,uCAAuC;IAC7C,IAAI,EAAE,mCAAmC;IACzC,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,+BAA+B;IACrC,IAAI,EAAE,4CAA4C;IAClD,IAAI,EAAE,qCAAqC;IAC3C,IAAI,EAAE,gCAAgC;IACtC,IAAI,EAAE,qBAAqB;IAC3B,IAAI,EAAE,sBAAsB;IAC5B,IAAI,EAAE,mDAAmD;IACzD,IAAI,EAAE,YAAY;IAClB,IAAI,EAAE,iCAAiC;IACvC,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,2BAA2B;IACjC,IAAI,EAAE,oBAAoB;IAC1B,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,8BAA8B;CACrC,CAAC;AAKF;IAAyE,+EACxD;IADjB;;QAEY,qBAAe,GACvB,KAAI,CAAC,gBAAgB,CAAC,qBAAe,CAAC,CAAC;QAExB,+BAAyB,GACxC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;;IAyBlD,CAAC;IAvBO,gEAAE,GAAR,UAAS,WAAwB;;;;;;4BACpB,qBAAM,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,uBAAiB,CAAC,EAAA;;wBAA/D,EAAE,GAAG,SAA0D;wBAE/D,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,UAAA,IAAI;4BACtD,OAAA,uBAAiB,CAAC,IAAI,CAAC;gCACrB,IAAI,MAAA;gCACJ,SAAS,EAAE,0BAAmB,oBAAoB,CAAC,IAAI,CAAC,MAAG;6BAC5D,CAAC;wBAHF,CAGE,CACH,CAAC;wBACF,qBAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAA;;wBAAvB,SAAuB,CAAC;;4BACxB,KAA4B,aAAA,iBAAA,QAAQ,CAAA,0FAAE,CAAC;gCAA5B,aAAa;gCACtB,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,GAAG,CACrC,aAAa,CAAC,IAAI,EAClB,aAAa,CACd,CAAC;4BACJ,CAAC;;;;;;;;;;;;;KACF;IAEK,kEAAI,GAAV,UAAW,WAAwB;;;;;4BACtB,qBAAM,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,uBAAiB,CAAC,EAAA;;wBAA/D,EAAE,GAAG,SAA0D;wBACrE,EAAE,CAAC,KAAK,EAAE,CAAC;wBACX,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;;;;;KAC7C;IA9BU,mDAAmD;QAH/D,WAAI,CAAC,SAAS,CAAC;YACd,SAAS,EAAE,qDAAqD;SACjE,CAAC;OACW,mDAAmD,CA+B/D;IAAD,0DAAC;CAAA,AA/BD,CAAyE,WAAI;KAC1E,IAAI,CAAC,SAAS,GA8BhB;AA/BY,kHAAmD"}
+{"version":3,"file":"1736199486472_addingNotAssignablePorts.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AAAA,6BAA4B;AAG5B,8BAA+C;AAE/C,IAAM,oBAAoB,GAAG;IAC3B,IAAI,EAAE,uCAAuC;IAC7C,IAAI,EAAE,mCAAmC;IACzC,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,+BAA+B;IACrC,IAAI,EAAE,4CAA4C;IAClD,IAAI,EAAE,qCAAqC;IAC3C,IAAI,EAAE,gCAAgC;IACtC,IAAI,EAAE,qBAAqB;IAC3B,IAAI,EAAE,sBAAsB;IAC5B,IAAI,EAAE,mDAAmD;IACzD,IAAI,EAAE,YAAY;IAClB,IAAI,EAAE,iCAAiC;IACvC,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,2BAA2B;IACjC,IAAI,EAAE,oBAAoB;IAC1B,IAAI,EAAE,SAAS;IACf,IAAI,EAAE,8BAA8B;CACrC,CAAC;AAKF;IAAyE,+EACxD;IADjB;;QAEY,qBAAe,GACvB,KAAI,CAAC,gBAAgB,CAAC,qBAAe,CAAC,CAAC;QAExB,+BAAyB,GACxC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;;IAqClD,CAAC;IAnCO,gEAAE,GAAR,UAAS,WAAwB;;;;;;4BACpB,qBAAM,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,UAAI,CAAC,EAAA;;wBAAlD,EAAE,GAAG,SAA6C;wBAElD,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,UAAA,IAAI;4BACtD,OAAA,UAAI,CAAC,IAAI,CAAC;gCACR,IAAI,MAAA;gCACJ,SAAS,EAAE,0BAAmB,oBAAoB,CAAC,IAAI,CAAC,MAAG;gCAC3D,MAAM,EAAE,sBAAsB;6BAC/B,CAAC;wBAJF,CAIE,CACH,CAAC;wBACF,qBAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAA;;wBAAvB,SAAuB,CAAC;;4BACxB,KAA4B,aAAA,iBAAA,QAAQ,CAAA,0FAAE,CAAC;gCAA5B,aAAa;gCACtB,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CACjC,aAAa,CAAC,SAAS,EACvB,aAAa,CACd,CAAC;4BACJ,CAAC;;;;;;;;;;;;;KACF;IAEK,kEAAI,GAAV,UAAW,WAAwB;;;;;;4BACtB,qBAAM,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,UAAI,CAAC,EAAA;;wBAAlD,EAAE,GAAG,SAA6C;wBAClD,KAAA,CAAA,KAAA,EAAE,CAAA,CAAC,MAAM,CAAA;wBACb,qBAAM,EAAE,CAAC,IAAI,CAAC;gCACZ,KAAK,EAAE;oCACL,MAAM,EAAE,sBAAsB;iCAC/B;6BACF,CAAC,EAAA;4BALJ,qBAAM,cACJ,SAIE,EACH,EAAA;;wBAND,SAMC,CAAC;wBACI,QAAQ,GAAG,KAAK,CAAC,IAAI,CACzB,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,MAAM,EAAE,CACzC,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,MAAM,KAAK,sBAAsB,EAAnC,CAAmC,CAAC,CAAC;;4BACnD,KAAmB,aAAA,iBAAA,QAAQ,CAAA,0FAAE,CAAC;gCAAnB,IAAI;gCACb,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;4BACzD,CAAC;;;;;;;;;;;;;KACF;IA1CU,mDAAmD;QAH/D,WAAI,CAAC,SAAS,CAAC;YACd,SAAS,EAAE,qDAAqD;SACjE,CAAC;OACW,mDAAmD,CA2C/D;IAAD,0DAAC;CAAA,AA3CD,CAAyE,WAAI;KAC1E,IAAI,CAAC,SAAS,GA0ChB;AA3CY,kHAAmD"}

package/migrations/1736454437350_addFreePorts.js

@@ -14,7 +14,7 @@ var PortsContext_1736454437350_addFreePorts = /** @class */ (function (_super) {
     }
     PortsContext_1736454437350_addFreePorts.prototype.up = function (queryRunner) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var portsTableRepo, addFreePortsInRange, freePortsInRange, freePortsInRange_1, freePortsInRange_1_1, port;
+            var portsTableRepo, addFreePortsInRange, allTakeByOsPort, freePortsInRange, freePortsInRange_1, freePortsInRange_1_1, port;
             var e_1, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
@@ -22,19 +22,27 @@ var PortsContext_1736454437350_addFreePorts = /** @class */ (function (_super) {
                     case 1:
                         portsTableRepo = _b.sent();
                         addFreePortsInRange = tnp_core_1._.range(this.portsController.START_PORT, this.portsController.END_PORT + 1);
+                        return [4 /*yield*/, portsTableRepo.find({
+                                where: {
+                                    status: 'assigned-taken-by-os',
+                                },
+                            })];
+                    case 2:
+                        allTakeByOsPort = (_b.sent()).map(function (f) { return f.port; });
                         freePortsInRange = addFreePortsInRange.map(function (port) {
                             return lib_1.Port.from({
                                 port: port,
-                                serviceId: "free port ".concat(port),
+                                serviceId: lib_1.Port.getTitleForFreePort(port),
+                                status: 'unassigned',
                             });
-                        });
+                        }).filter(function (f) { return !allTakeByOsPort.includes(f.port); });
                         return [4 /*yield*/, portsTableRepo.save(freePortsInRange)];
-                    case 2:
+                    case 3:
                         _b.sent();
                         try {
                             for (freePortsInRange_1 = tslib_1.__values(freePortsInRange), freePortsInRange_1_1 = freePortsInRange_1.next(); !freePortsInRange_1_1.done; freePortsInRange_1_1 = freePortsInRange_1.next()) {
                                 port = freePortsInRange_1_1.value;
-                                this.portsController.assignedPorts.set(port.serviceId, port);
+                                this.portsController.portsCache.set(port.serviceId, port);
                             }
                         }
                         catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -51,16 +59,36 @@ var PortsContext_1736454437350_addFreePorts = /** @class */ (function (_super) {
     };
     PortsContext_1736454437350_addFreePorts.prototype.down = function (queryRunner) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var portsTableRepo;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        // revert this "something" in db
-                        this.portsController.assignedPorts.clear();
-                        return [4 /*yield*/, queryRunner.manager.getRepository(lib_1.Port)];
+            var db, _a, _b, allPorts, allPorts_1, allPorts_1_1, port;
+            var e_2, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0: return [4 /*yield*/, queryRunner.manager.getRepository(lib_1.Port)];
                     case 1:
-                        portsTableRepo = _a.sent();
-                        portsTableRepo.clear();
+                        db = _d.sent();
+                        _b = (_a = db).remove;
+                        return [4 /*yield*/, db.find({
+                                where: {
+                                    status: 'unassigned',
+                                },
+                            })];
+                    case 2: return [4 /*yield*/, _b.apply(_a, [_d.sent()])];
+                    case 3:
+                        _d.sent();
+                        allPorts = Array.from(this.portsController.portsCache.values()).filter(function (f) { return f.status === 'unassigned'; });
+                        try {
+                            for (allPorts_1 = tslib_1.__values(allPorts), allPorts_1_1 = allPorts_1.next(); !allPorts_1_1.done; allPorts_1_1 = allPorts_1.next()) {
+                                port = allPorts_1_1.value;
+                                this.portsController.portsCache.delete(port.serviceId);
+                            }
+                        }
+                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                        finally {
+                            try {
+                                if (allPorts_1_1 && !allPorts_1_1.done && (_c = allPorts_1.return)) _c.call(allPorts_1);
+                            }
+                            finally { if (e_2) throw e_2.error; }
+                        }
                         return [2 /*return*/];
                 }
             });

package/migrations/1736454437350_addFreePorts.js.map

@@ -1 +1 @@
-{"version":3,"file":"1736454437350_addFreePorts.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AAAA,6BAA4B;AAE5B,qCAA6B;AAC7B,8BAAkE;AAKlE;IAA6D,mEACjD;IADZ;;QAEY,qBAAe,GACvB,KAAI,CAAC,gBAAgB,CAAC,qBAAe,CAAC,CAAC;;IA6B3C,CAAC;IA1BO,oDAAE,GAAR,UAAS,WAAwB;;;;;;4BACR,qBAAM,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,UAAI,CAAC,EAAA;;wBAA9D,cAAc,GAAG,SAA6C;wBAC9D,mBAAmB,GAAG,YAAC,CAAC,KAAK,CACjC,IAAI,CAAC,eAAe,CAAC,UAAU,EAC/B,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,CAAC,CAClC,CAAC;wBACI,gBAAgB,GAAG,mBAAmB,CAAC,GAAG,CAAC,UAAA,IAAI;4BACnD,OAAA,UAAI,CAAC,IAAI,CAAC;gCACR,IAAI,EAAE,IAAI;gCACV,SAAS,EAAE,oBAAa,IAAI,CAAE;6BAC/B,CAAC;wBAHF,CAGE,CACH,CAAC;wBAEF,qBAAM,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAA;;wBAA3C,SAA2C,CAAC;;4BAE5C,KAAmB,qBAAA,iBAAA,gBAAgB,CAAA,kIAAE,CAAC;gCAA3B,IAAI;gCACb,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;4BAC/D,CAAC;;;;;;;;;;;;;KACF;IAEK,sDAAI,GAAV,UAAW,WAAwB;;;;;;wBACjC,gCAAgC;wBAChC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;wBACpB,qBAAM,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,UAAI,CAAC,EAAA;;wBAA9D,cAAc,GAAG,SAA6C;wBACpE,cAAc,CAAC,KAAK,EAAE,CAAC;;;;;KACxB;IA/BU,uCAAuC;QAHnD,WAAI,CAAC,SAAS,CAAC;YACd,SAAS,EAAE,yCAAyC;SACrD,CAAC;OACW,uCAAuC,CAgCnD;IAAD,8CAAC;CAAA,AAhCD,CAA6D,WAAI,CAAC,IAAI;KACnE,SAAS,GA+BX;AAhCY,0FAAuC"}
+{"version":3,"file":"1736454437350_addFreePorts.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AAAA,6BAA4B;AAE5B,qCAA6B;AAC7B,8BAA+C;AAK/C;IAA6D,mEACjD;IADZ;;QAEY,qBAAe,GACvB,KAAI,CAAC,gBAAgB,CAAC,qBAAe,CAAC,CAAC;;IAiD3C,CAAC;IA/CO,oDAAE,GAAR,UAAS,WAAwB;;;;;;4BACR,qBAAM,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,UAAI,CAAC,EAAA;;wBAA9D,cAAc,GAAG,SAA6C;wBAC9D,mBAAmB,GAAG,YAAC,CAAC,KAAK,CACjC,IAAI,CAAC,eAAe,CAAC,UAAU,EAC/B,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,CAAC,CAClC,CAAC;wBAGA,qBAAM,cAAc,CAAC,IAAI,CAAC;gCACxB,KAAK,EAAE;oCACL,MAAM,EAAE,sBAAsB;iCAC/B;6BACF,CAAC,EAAA;;wBALE,eAAe,GAAG,CACtB,SAIE,CACH,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,EAAN,CAAM,CAAC;wBAEZ,gBAAgB,GAAG,mBAAmB,CAAC,GAAG,CAAC,UAAA,IAAI;4BACnD,OAAA,UAAI,CAAC,IAAI,CAAC;gCACR,IAAI,EAAE,IAAI;gCACV,SAAS,EAAE,UAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;gCACzC,MAAM,EAAE,YAAY;6BACrB,CAAC;wBAJF,CAIE,CACH,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAjC,CAAiC,CAAC,CAAC;wBAEjD,qBAAM,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAA;;wBAA3C,SAA2C,CAAC;;4BAE5C,KAAmB,qBAAA,iBAAA,gBAAgB,CAAA,kIAAE,CAAC;gCAA3B,IAAI;gCACb,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;4BAC5D,CAAC;;;;;;;;;;;;;KACF;IAEK,sDAAI,GAAV,UAAW,WAAwB;;;;;;4BAEtB,qBAAM,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,UAAI,CAAC,EAAA;;wBAAlD,EAAE,GAAG,SAA6C;wBAClD,KAAA,CAAA,KAAA,EAAE,CAAA,CAAC,MAAM,CAAA;wBACb,qBAAM,EAAE,CAAC,IAAI,CAAC;gCACZ,KAAK,EAAE;oCACL,MAAM,EAAE,YAAY;iCACrB;6BACF,CAAC,EAAA;4BALJ,qBAAM,cACJ,SAIE,EACH,EAAA;;wBAND,SAMC,CAAC;wBACI,QAAQ,GAAG,KAAK,CAAC,IAAI,CACzB,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,MAAM,EAAE,CACzC,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,MAAM,KAAK,YAAY,EAAzB,CAAyB,CAAC,CAAC;;4BACzC,KAAmB,aAAA,iBAAA,QAAQ,CAAA,0FAAE,CAAC;gCAAnB,IAAI;gCACb,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;4BACzD,CAAC;;;;;;;;;;;;;KACF;IAnDU,uCAAuC;QAHnD,WAAI,CAAC,SAAS,CAAC;YACd,SAAS,EAAE,yCAAyC;SACrD,CAAC;OACW,uCAAuC,CAoDnD;IAAD,8CAAC;CAAA,AApDD,CAA6D,WAAI,CAAC,IAAI;KACnE,SAAS,GAmDX;AApDY,0FAAuC"}

package/package.json

@@ -44,13 +44,13 @@
       "taon-helpers"
     ]
   },
-  "version": "18.0.18",
+  "version": "18.0.19",
   "dependencies": {
-    "incremental-compiler": "~18.0.19",
-    "json10-writer": "~18.0.18",
+    "incremental-compiler": "~18.0.20",
+    "json10-writer": "~18.0.19",
     "lowdb": "7.0.1",
     "task.js": "0.1.5",
-    "tnp-models": "~18.0.19",
+    "tnp-models": "~18.0.20",
     "typescript": "~5.5.4"
   },
   "scripts": {
@@ -65,6 +65,6 @@
   "homepage": "https://github.com/darekf77/tnp-helpers#readme",
   "name": "tnp-helpers",
   "devDependencies": {},
-  "lastBuildTagHash": "fd8dfbaca3e100c19ed0345660ecf7de6f16e4cb",
+  "lastBuildTagHash": "096479abb8520a0abcee567f2156c04237888f45",
   "main": "dist/app.electron.js"
 }