tnp-helpers 18.0.18 → 18.0.20
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/shared/shared_folder_info.txt +1 -1
- package/browser/README.md +24 -24
- package/browser/esm2022/lib/base/classes/base-cli-worker.mjs +57 -8
- package/browser/esm2022/lib/base/classes/base-git.mjs +16 -1
- package/browser/esm2022/lib/base/classes/base-library-build.mjs +31 -10
- package/browser/esm2022/lib/base/classes/base-npm-helpers.mjs +5 -6
- package/browser/esm2022/lib/base/classes/base-project.mjs +12 -31
- package/browser/esm2022/lib/base/classes/base-release-process.mjs +8 -43
- package/browser/esm2022/lib/base/classes/base-vscode.mjs +28 -1
- package/browser/esm2022/lib/base/commit-data.mjs +5 -6
- package/browser/esm2022/lib/base/core-project.mjs +1 -1
- package/browser/esm2022/lib/base/tcp-udp-ports/index.mjs +1 -2
- package/browser/esm2022/lib/base/tcp-udp-ports/ports.controller.mjs +169 -17
- package/browser/esm2022/lib/base/tcp-udp-ports/ports.entity.mjs +10 -3
- package/browser/esm2022/lib/base/tcp-udp-ports/tcp-udp-ports.context.mjs +2 -3
- package/browser/esm2022/lib/base/tcp-udp-ports/tcp-upd-ports.worker.mjs +187 -11
- package/browser/esm2022/lib/index.mjs +1 -4
- package/browser/esm2022/lib/models.mjs +1 -1
- package/browser/esm2022/migrations/1736199486472_addingNotAssignablePorts.mjs +16 -8
- package/browser/esm2022/migrations/1736454437350_addFreePorts.mjs +20 -7
- package/browser/fesm2022/tnp-helpers.mjs +544 -150
- package/browser/fesm2022/tnp-helpers.mjs.map +1 -1
- package/browser/lib/base/classes/base-cli-worker.d.ts +28 -5
- package/browser/lib/base/classes/base-git.d.ts +8 -0
- package/browser/lib/base/classes/base-library-build.d.ts +3 -6
- package/browser/lib/base/classes/base-npm-helpers.d.ts +5 -1
- package/browser/lib/base/classes/base-project.d.ts +3 -2
- package/browser/lib/base/classes/base-release-process.d.ts +13 -10
- package/browser/lib/base/core-project.d.ts +1 -1
- package/browser/lib/base/tcp-udp-ports/index.d.ts +0 -1
- package/browser/lib/base/tcp-udp-ports/ports.controller.d.ts +15 -6
- package/browser/lib/base/tcp-udp-ports/ports.entity.d.ts +8 -4
- package/browser/lib/base/tcp-udp-ports/tcp-upd-ports.worker.d.ts +10 -8
- package/browser/lib/index.d.ts +1 -3
- package/browser/lib/models.d.ts +0 -6
- package/client/README.md +24 -24
- package/client/esm2022/lib/base/classes/base-cli-worker.mjs +57 -8
- package/client/esm2022/lib/base/classes/base-git.mjs +16 -1
- package/client/esm2022/lib/base/classes/base-library-build.mjs +31 -10
- package/client/esm2022/lib/base/classes/base-npm-helpers.mjs +5 -6
- package/client/esm2022/lib/base/classes/base-project.mjs +12 -31
- package/client/esm2022/lib/base/classes/base-release-process.mjs +8 -43
- package/client/esm2022/lib/base/classes/base-vscode.mjs +28 -1
- package/client/esm2022/lib/base/commit-data.mjs +5 -6
- package/client/esm2022/lib/base/core-project.mjs +1 -1
- package/client/esm2022/lib/base/tcp-udp-ports/index.mjs +1 -2
- package/client/esm2022/lib/base/tcp-udp-ports/ports.controller.mjs +169 -17
- package/client/esm2022/lib/base/tcp-udp-ports/ports.entity.mjs +10 -3
- package/client/esm2022/lib/base/tcp-udp-ports/tcp-udp-ports.context.mjs +2 -3
- package/client/esm2022/lib/base/tcp-udp-ports/tcp-upd-ports.worker.mjs +187 -11
- package/client/esm2022/lib/index.mjs +1 -4
- package/client/esm2022/lib/models.mjs +1 -1
- package/client/esm2022/migrations/1736199486472_addingNotAssignablePorts.mjs +16 -8
- package/client/esm2022/migrations/1736454437350_addFreePorts.mjs +20 -7
- package/client/fesm2022/tnp-helpers.mjs +544 -150
- package/client/fesm2022/tnp-helpers.mjs.map +1 -1
- package/client/lib/base/classes/base-cli-worker.d.ts +28 -5
- package/client/lib/base/classes/base-git.d.ts +8 -0
- package/client/lib/base/classes/base-library-build.d.ts +3 -6
- package/client/lib/base/classes/base-npm-helpers.d.ts +5 -1
- package/client/lib/base/classes/base-project.d.ts +3 -2
- package/client/lib/base/classes/base-release-process.d.ts +13 -10
- package/client/lib/base/core-project.d.ts +1 -1
- package/client/lib/base/tcp-udp-ports/index.d.ts +0 -1
- package/client/lib/base/tcp-udp-ports/ports.controller.d.ts +15 -6
- package/client/lib/base/tcp-udp-ports/ports.entity.d.ts +8 -4
- package/client/lib/base/tcp-udp-ports/tcp-upd-ports.worker.d.ts +10 -8
- package/client/lib/index.d.ts +1 -3
- package/client/lib/models.d.ts +0 -6
- package/lib/base/classes/base-cli-worker-controller.js +1 -1
- package/lib/base/classes/base-cli-worker-controller.js.map +1 -1
- package/lib/base/classes/base-cli-worker.d.ts +28 -5
- package/lib/base/classes/base-cli-worker.js +104 -34
- package/lib/base/classes/base-cli-worker.js.map +1 -1
- package/lib/base/classes/base-git.d.ts +8 -0
- package/lib/base/classes/base-git.js +32 -0
- package/lib/base/classes/base-git.js.map +1 -1
- package/lib/base/classes/base-global-command-line.backend.d.ts +4 -0
- package/lib/base/classes/base-global-command-line.backend.js +25 -0
- package/lib/base/classes/base-global-command-line.backend.js.map +1 -1
- package/lib/base/classes/base-library-build.d.ts +3 -6
- package/lib/base/classes/base-library-build.js +46 -29
- package/lib/base/classes/base-library-build.js.map +1 -1
- package/lib/base/classes/base-npm-helpers.d.ts +2 -0
- package/lib/base/classes/base-npm-helpers.js +11 -3
- package/lib/base/classes/base-npm-helpers.js.map +1 -1
- package/lib/base/classes/base-project.d.ts +3 -2
- package/lib/base/classes/base-project.js +18 -43
- package/lib/base/classes/base-project.js.map +1 -1
- package/lib/base/classes/base-release-process.d.ts +13 -10
- package/lib/base/classes/base-release-process.js +15 -88
- package/lib/base/classes/base-release-process.js.map +1 -1
- package/lib/base/classes/base-start-config.backend.js +1 -1
- package/lib/base/classes/base-start-config.backend.js.map +1 -1
- package/lib/base/classes/base-vscode.js +45 -25
- package/lib/base/classes/base-vscode.js.map +1 -1
- package/lib/base/commit-data.js +9 -10
- package/lib/base/commit-data.js.map +1 -1
- package/lib/base/core-project.d.ts +1 -1
- package/lib/base/tcp-udp-ports/index.d.ts +0 -1
- package/lib/base/tcp-udp-ports/index.js +0 -1
- package/lib/base/tcp-udp-ports/index.js.map +1 -1
- package/lib/base/tcp-udp-ports/not-assignable-port.entity.d.ts +0 -6
- package/lib/base/tcp-udp-ports/not-assignable-port.entity.js +2 -42
- package/lib/base/tcp-udp-ports/not-assignable-port.entity.js.map +1 -1
- package/lib/base/tcp-udp-ports/ports.controller.d.ts +14 -5
- package/lib/base/tcp-udp-ports/ports.controller.js +227 -19
- package/lib/base/tcp-udp-ports/ports.controller.js.map +1 -1
- package/lib/base/tcp-udp-ports/ports.entity.d.ts +8 -4
- package/lib/base/tcp-udp-ports/ports.entity.js +32 -2
- package/lib/base/tcp-udp-ports/ports.entity.js.map +1 -1
- package/lib/base/tcp-udp-ports/tcp-udp-ports.context.js +1 -2
- package/lib/base/tcp-udp-ports/tcp-udp-ports.context.js.map +1 -1
- package/lib/base/tcp-udp-ports/tcp-upd-ports.worker.d.ts +14 -8
- package/lib/base/tcp-udp-ports/tcp-upd-ports.worker.js +293 -30
- package/lib/base/tcp-udp-ports/tcp-upd-ports.worker.js.map +1 -1
- package/lib/helpers/for-backend/helpers-git.backend.d.ts +10 -0
- package/lib/helpers/for-backend/helpers-git.backend.js +59 -0
- package/lib/helpers/for-backend/helpers-git.backend.js.map +1 -1
- package/lib/helpers/for-browser/angular.helper.js +2 -2
- package/lib/index.d.ts +1 -3
- package/lib/index.js +0 -3
- package/lib/index.js.map +1 -1
- package/lib/models.d.ts +0 -6
- package/lib/old/base-component.js +2 -2
- package/lib/old/base-formly-component.js +2 -2
- package/lib/old/dual-component-ctrl.js +2 -2
- package/migrations/1736199486472_addingNotAssignablePorts.js +33 -10
- package/migrations/1736199486472_addingNotAssignablePorts.js.map +1 -1
- package/migrations/1736454437350_addFreePorts.js +42 -14
- package/migrations/1736454437350_addFreePorts.js.map +1 -1
- package/package.json +5 -5
- package/taon.jsonc +49 -49
- package/tmp-environment.json +29 -29
- package/websql/README.md +24 -24
- package/websql/esm2022/lib/base/classes/base-cli-worker.mjs +57 -8
- package/websql/esm2022/lib/base/classes/base-git.mjs +16 -1
- package/websql/esm2022/lib/base/classes/base-library-build.mjs +31 -10
- package/websql/esm2022/lib/base/classes/base-npm-helpers.mjs +5 -6
- package/websql/esm2022/lib/base/classes/base-project.mjs +12 -31
- package/websql/esm2022/lib/base/classes/base-release-process.mjs +8 -43
- package/websql/esm2022/lib/base/classes/base-vscode.mjs +28 -1
- package/websql/esm2022/lib/base/commit-data.mjs +5 -6
- package/websql/esm2022/lib/base/core-project.mjs +1 -1
- package/websql/esm2022/lib/base/tcp-udp-ports/index.mjs +1 -2
- package/websql/esm2022/lib/base/tcp-udp-ports/ports.controller.mjs +169 -17
- package/websql/esm2022/lib/base/tcp-udp-ports/ports.entity.mjs +25 -3
- package/websql/esm2022/lib/base/tcp-udp-ports/tcp-udp-ports.context.mjs +2 -3
- package/websql/esm2022/lib/base/tcp-udp-ports/tcp-upd-ports.worker.mjs +187 -11
- package/websql/esm2022/lib/index.mjs +1 -4
- package/websql/esm2022/lib/models.mjs +1 -1
- package/websql/esm2022/migrations/1736199486472_addingNotAssignablePorts.mjs +16 -8
- package/websql/esm2022/migrations/1736454437350_addFreePorts.mjs +20 -7
- package/websql/fesm2022/tnp-helpers.mjs +560 -166
- package/websql/fesm2022/tnp-helpers.mjs.map +1 -1
- package/websql/lib/base/classes/base-cli-worker.d.ts +28 -5
- package/websql/lib/base/classes/base-git.d.ts +8 -0
- package/websql/lib/base/classes/base-library-build.d.ts +3 -6
- package/websql/lib/base/classes/base-npm-helpers.d.ts +2 -0
- package/websql/lib/base/classes/base-project.d.ts +3 -2
- package/websql/lib/base/classes/base-release-process.d.ts +13 -10
- package/websql/lib/base/core-project.d.ts +1 -1
- package/websql/lib/base/tcp-udp-ports/index.d.ts +0 -1
- package/websql/lib/base/tcp-udp-ports/ports.controller.d.ts +15 -6
- package/websql/lib/base/tcp-udp-ports/ports.entity.d.ts +8 -4
- package/websql/lib/base/tcp-udp-ports/tcp-upd-ports.worker.d.ts +10 -8
- package/websql/lib/index.d.ts +1 -3
- package/websql/lib/models.d.ts +0 -6
- package/browser/esm2022/lib/base/tcp-udp-ports/not-assignable-port.entity.mjs +0 -19
- package/browser/lib/base/tcp-udp-ports/not-assignable-port.entity.d.ts +0 -7
- package/client/esm2022/lib/base/tcp-udp-ports/not-assignable-port.entity.mjs +0 -19
- package/client/lib/base/tcp-udp-ports/not-assignable-port.entity.d.ts +0 -7
- package/websql/esm2022/lib/base/tcp-udp-ports/not-assignable-port.entity.mjs +0 -34
- package/websql/lib/base/tcp-udp-ports/not-assignable-port.entity.d.ts +0 -7
|
@@ -2,50 +2,220 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PortsController = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
+
//#region imports
|
|
5
6
|
var taon_1 = require("taon");
|
|
6
7
|
var tnp_core_1 = require("tnp-core");
|
|
7
8
|
var base_cli_worker_controller_1 = require("../classes/base-cli-worker-controller");
|
|
8
9
|
var ports_entity_1 = require("./ports.entity");
|
|
10
|
+
//#endregion
|
|
9
11
|
var PortsController = /** @class */ (function (_super) {
|
|
10
12
|
tslib_1.__extends(PortsController, _super);
|
|
11
13
|
function PortsController() {
|
|
12
14
|
var _this = _super.apply(this, tslib_1.__spreadArray([], tslib_1.__read(arguments), false)) || this;
|
|
15
|
+
//#region fields
|
|
13
16
|
_this.START_PORT = 3000;
|
|
14
17
|
_this.END_PORT = 6000;
|
|
15
|
-
_this.
|
|
16
|
-
_this.assignedPorts = new Map();
|
|
18
|
+
_this.portsCache = new Map();
|
|
17
19
|
return _this;
|
|
18
20
|
//#endregion
|
|
21
|
+
//#endregion
|
|
19
22
|
}
|
|
20
23
|
Object.defineProperty(PortsController.prototype, "firstFreePort", {
|
|
24
|
+
//#endregion
|
|
25
|
+
//#region methods
|
|
26
|
+
//#region methods / first free port
|
|
21
27
|
get: function () {
|
|
22
|
-
|
|
28
|
+
//#region @backendFunc
|
|
29
|
+
if (!this.portsCache) {
|
|
23
30
|
return null;
|
|
24
31
|
}
|
|
25
|
-
return Array.from(this.
|
|
32
|
+
return Array.from(this.portsCache.values()).find(function (p) { return p.status === 'unassigned'; });
|
|
33
|
+
//#endregion
|
|
26
34
|
},
|
|
27
35
|
enumerable: false,
|
|
28
36
|
configurable: true
|
|
29
37
|
});
|
|
38
|
+
//#endregion
|
|
39
|
+
//#region methods / get first unassigned port more than
|
|
30
40
|
PortsController.prototype.firstUnassignedPortMoreThan = function (port) {
|
|
31
|
-
|
|
41
|
+
//#region @backendFunc
|
|
42
|
+
if (!this.portsCache) {
|
|
32
43
|
return null;
|
|
33
44
|
}
|
|
34
|
-
return Array.from(this.
|
|
45
|
+
return Array.from(this.portsCache.values()).find(function (p) { return p.status === 'unassigned' && p.port > port; });
|
|
46
|
+
//#endregion
|
|
47
|
+
};
|
|
48
|
+
//#endregion
|
|
49
|
+
//#endregion
|
|
50
|
+
//#region public methods
|
|
51
|
+
//#region public methods / get
|
|
52
|
+
//#region public methods / get / first free port
|
|
53
|
+
PortsController.prototype.getFirstFreePort = function () {
|
|
54
|
+
var _this = this;
|
|
55
|
+
return function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
56
|
+
return tslib_1.__generator(this, function (_a) {
|
|
57
|
+
return [2 /*return*/, this.firstFreePort];
|
|
58
|
+
});
|
|
59
|
+
}); };
|
|
35
60
|
};
|
|
36
|
-
//#
|
|
37
|
-
|
|
61
|
+
//#endregion
|
|
62
|
+
//#region public methods / get / port by number
|
|
63
|
+
PortsController.prototype.getPortByNumber = function (portNumber) {
|
|
64
|
+
var _this = this;
|
|
65
|
+
return function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
66
|
+
return tslib_1.__generator(this, function (_a) {
|
|
67
|
+
portNumber = Number(portNumber);
|
|
68
|
+
return [2 /*return*/, Array.from(this.portsCache.values()).find(function (f) { return f.port === portNumber; })];
|
|
69
|
+
});
|
|
70
|
+
}); };
|
|
71
|
+
};
|
|
72
|
+
//#endregion
|
|
73
|
+
//#region public methods / get / ports by status
|
|
74
|
+
PortsController.prototype.getPortsByStatus = function (status) {
|
|
38
75
|
var _this = this;
|
|
39
76
|
return function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
40
77
|
return tslib_1.__generator(this, function (_a) {
|
|
41
|
-
|
|
42
|
-
|
|
78
|
+
return [2 /*return*/, Array.from(this.portsCache.values())
|
|
79
|
+
.filter(function (f) { return f.status === status; })
|
|
80
|
+
.sort(
|
|
81
|
+
// sort by port number
|
|
82
|
+
function (a, b) {
|
|
83
|
+
if (a.port < b.port) {
|
|
84
|
+
return -1;
|
|
85
|
+
}
|
|
86
|
+
if (a.port > b.port) {
|
|
87
|
+
return 1;
|
|
88
|
+
}
|
|
89
|
+
return 0;
|
|
90
|
+
})];
|
|
91
|
+
});
|
|
92
|
+
}); };
|
|
93
|
+
};
|
|
94
|
+
//#endregion
|
|
95
|
+
//#endregion
|
|
96
|
+
//#region public methods / ports take by os
|
|
97
|
+
//#region public methods / ports take by os / DELETE port (make it unassigned)
|
|
98
|
+
/**
|
|
99
|
+
* make it unassigned
|
|
100
|
+
*/
|
|
101
|
+
PortsController.prototype.deletePort = function (portNumber) {
|
|
102
|
+
var _this = this;
|
|
103
|
+
//#region @backendFunc
|
|
104
|
+
return function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
105
|
+
var repoPort, port, oldServiceId;
|
|
106
|
+
return tslib_1.__generator(this, function (_a) {
|
|
107
|
+
switch (_a.label) {
|
|
108
|
+
case 0:
|
|
109
|
+
portNumber = Number(portNumber);
|
|
110
|
+
repoPort = this.ctx.connection.getRepository(ports_entity_1.Port);
|
|
111
|
+
return [4 /*yield*/, repoPort.findOneBy({
|
|
112
|
+
port: portNumber,
|
|
113
|
+
})];
|
|
114
|
+
case 1:
|
|
115
|
+
port = _a.sent();
|
|
116
|
+
oldServiceId = port.serviceId;
|
|
117
|
+
port.status = 'unassigned';
|
|
118
|
+
port.serviceId = ports_entity_1.Port.getTitleForFreePort(port.port);
|
|
119
|
+
return [4 /*yield*/, repoPort.update({
|
|
120
|
+
port: portNumber,
|
|
121
|
+
}, port)];
|
|
122
|
+
case 2:
|
|
123
|
+
_a.sent();
|
|
124
|
+
return [4 /*yield*/, repoPort.findOneBy({
|
|
125
|
+
port: portNumber,
|
|
126
|
+
})];
|
|
127
|
+
case 3:
|
|
128
|
+
port = _a.sent();
|
|
129
|
+
this.portsCache.delete(oldServiceId);
|
|
130
|
+
this.portsCache.set(port.serviceId, port);
|
|
131
|
+
return [2 /*return*/, port];
|
|
43
132
|
}
|
|
44
|
-
return [2 /*return*/, Array.from(this.assignedPorts.values()).filter(function (f) { return f.status === status; })];
|
|
45
133
|
});
|
|
46
134
|
}); };
|
|
135
|
+
//#endregion
|
|
47
136
|
};
|
|
48
137
|
//#endregion
|
|
138
|
+
//#region public methods / ports take by os / UPDATE port unique id
|
|
139
|
+
/**
|
|
140
|
+
* make it unassigned
|
|
141
|
+
*/
|
|
142
|
+
PortsController.prototype.updatePortUniqueId = function (portNumber, serviceId) {
|
|
143
|
+
var _this = this;
|
|
144
|
+
//#region @backendFunc
|
|
145
|
+
return function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
146
|
+
var repoPort, port, oldServiceId;
|
|
147
|
+
return tslib_1.__generator(this, function (_a) {
|
|
148
|
+
switch (_a.label) {
|
|
149
|
+
case 0:
|
|
150
|
+
portNumber = Number(portNumber);
|
|
151
|
+
serviceId = decodeURIComponent(serviceId);
|
|
152
|
+
repoPort = this.ctx.connection.getRepository(ports_entity_1.Port);
|
|
153
|
+
return [4 /*yield*/, repoPort.findOneBy({
|
|
154
|
+
port: portNumber,
|
|
155
|
+
})];
|
|
156
|
+
case 1:
|
|
157
|
+
port = _a.sent();
|
|
158
|
+
oldServiceId = port.serviceId;
|
|
159
|
+
port.serviceId = serviceId;
|
|
160
|
+
return [4 /*yield*/, repoPort.update({
|
|
161
|
+
port: portNumber,
|
|
162
|
+
}, port)];
|
|
163
|
+
case 2:
|
|
164
|
+
_a.sent();
|
|
165
|
+
return [4 /*yield*/, repoPort.findOneBy({
|
|
166
|
+
port: portNumber,
|
|
167
|
+
})];
|
|
168
|
+
case 3:
|
|
169
|
+
port = _a.sent();
|
|
170
|
+
this.portsCache.delete(oldServiceId);
|
|
171
|
+
this.portsCache.set(port.serviceId, port);
|
|
172
|
+
return [2 /*return*/, port];
|
|
173
|
+
}
|
|
174
|
+
});
|
|
175
|
+
}); };
|
|
176
|
+
//#endregion
|
|
177
|
+
};
|
|
178
|
+
//#endregion
|
|
179
|
+
//#region public methods / ports take by os / ADD port take by os
|
|
180
|
+
PortsController.prototype.addTakeByOsPort = function (portNumber, uniqueId) {
|
|
181
|
+
var _this = this;
|
|
182
|
+
//#region @backendFunc
|
|
183
|
+
return function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
184
|
+
var repoPort, port, oldServiceId;
|
|
185
|
+
return tslib_1.__generator(this, function (_a) {
|
|
186
|
+
switch (_a.label) {
|
|
187
|
+
case 0:
|
|
188
|
+
portNumber = Number(portNumber);
|
|
189
|
+
uniqueId = decodeURIComponent(uniqueId);
|
|
190
|
+
repoPort = this.ctx.connection.getRepository(ports_entity_1.Port);
|
|
191
|
+
return [4 /*yield*/, repoPort.findOneBy({
|
|
192
|
+
port: portNumber,
|
|
193
|
+
})];
|
|
194
|
+
case 1:
|
|
195
|
+
port = _a.sent();
|
|
196
|
+
oldServiceId = port.serviceId;
|
|
197
|
+
port.serviceId = uniqueId;
|
|
198
|
+
port.status = 'assigned-taken-by-os';
|
|
199
|
+
return [4 /*yield*/, repoPort.update({
|
|
200
|
+
port: portNumber,
|
|
201
|
+
}, port)];
|
|
202
|
+
case 2:
|
|
203
|
+
_a.sent();
|
|
204
|
+
return [4 /*yield*/, repoPort.findOneBy({
|
|
205
|
+
port: portNumber,
|
|
206
|
+
})];
|
|
207
|
+
case 3:
|
|
208
|
+
port = _a.sent();
|
|
209
|
+
this.portsCache.delete(oldServiceId);
|
|
210
|
+
this.portsCache.set(port.serviceId, port);
|
|
211
|
+
return [2 /*return*/, port];
|
|
212
|
+
}
|
|
213
|
+
});
|
|
214
|
+
}); };
|
|
215
|
+
//#endregion
|
|
216
|
+
};
|
|
217
|
+
//#endregion
|
|
218
|
+
//#endregion
|
|
49
219
|
//#region public methods / register and assign port
|
|
50
220
|
/**
|
|
51
221
|
* @param uniqueServiceName unique service name
|
|
@@ -56,13 +226,13 @@ var PortsController = /** @class */ (function (_super) {
|
|
|
56
226
|
var _this = this;
|
|
57
227
|
//#region @backendFunc
|
|
58
228
|
return function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
59
|
-
var repo, searchingWithStartPort, firstFreePort, oldServiceId;
|
|
229
|
+
var repo, searchingWithStartPort, firstFreePort, takenByOsPorts, oldServiceId;
|
|
60
230
|
return tslib_1.__generator(this, function (_a) {
|
|
61
231
|
switch (_a.label) {
|
|
62
232
|
case 0:
|
|
63
233
|
uniqueServiceName = decodeURIComponent(uniqueServiceName);
|
|
64
|
-
if (this.
|
|
65
|
-
return [2 /*return*/, this.
|
|
234
|
+
if (this.portsCache.has(uniqueServiceName)) {
|
|
235
|
+
return [2 /*return*/, this.portsCache.get(uniqueServiceName)];
|
|
66
236
|
}
|
|
67
237
|
repo = this.ctx.connection.getRepository(ports_entity_1.Port);
|
|
68
238
|
startFrom = Number(startFrom);
|
|
@@ -79,8 +249,10 @@ var PortsController = /** @class */ (function (_super) {
|
|
|
79
249
|
// TODO wait and free up some ports
|
|
80
250
|
throw new Error('[taon] No free ports available');
|
|
81
251
|
}
|
|
82
|
-
|
|
83
|
-
|
|
252
|
+
takenByOsPorts = Array.from(this.portsCache.values())
|
|
253
|
+
.filter(function (f) { return f.status === 'assigned-taken-by-os'; })
|
|
254
|
+
.map(function (f) { return f.port; });
|
|
255
|
+
if (takenByOsPorts.includes(firstFreePort.port)) {
|
|
84
256
|
return [3 /*break*/, 1];
|
|
85
257
|
}
|
|
86
258
|
return [4 /*yield*/, tnp_core_1.UtilsOs.isPortInUse(firstFreePort.port)];
|
|
@@ -97,8 +269,8 @@ var PortsController = /** @class */ (function (_super) {
|
|
|
97
269
|
oldServiceId = firstFreePort.serviceId;
|
|
98
270
|
firstFreePort.serviceId = uniqueServiceName;
|
|
99
271
|
firstFreePort.whenAssignedTimestamp = Date.now();
|
|
100
|
-
this.
|
|
101
|
-
this.
|
|
272
|
+
this.portsCache.set(uniqueServiceName, firstFreePort);
|
|
273
|
+
this.portsCache.delete(oldServiceId);
|
|
102
274
|
return [4 /*yield*/, repo.update(firstFreePort.port, firstFreePort)];
|
|
103
275
|
case 5:
|
|
104
276
|
_a.sent();
|
|
@@ -109,13 +281,49 @@ var PortsController = /** @class */ (function (_super) {
|
|
|
109
281
|
}); };
|
|
110
282
|
//#endregion
|
|
111
283
|
};
|
|
284
|
+
tslib_1.__decorate([
|
|
285
|
+
taon_1.Taon.Http.GET(),
|
|
286
|
+
tslib_1.__metadata("design:type", Function),
|
|
287
|
+
tslib_1.__metadata("design:paramtypes", []),
|
|
288
|
+
tslib_1.__metadata("design:returntype", Object)
|
|
289
|
+
], PortsController.prototype, "getFirstFreePort", null);
|
|
290
|
+
tslib_1.__decorate([
|
|
291
|
+
taon_1.Taon.Http.GET(),
|
|
292
|
+
tslib_1.__param(0, taon_1.Taon.Http.Param.Query('portNumber')),
|
|
293
|
+
tslib_1.__metadata("design:type", Function),
|
|
294
|
+
tslib_1.__metadata("design:paramtypes", [Number]),
|
|
295
|
+
tslib_1.__metadata("design:returntype", Object)
|
|
296
|
+
], PortsController.prototype, "getPortByNumber", null);
|
|
112
297
|
tslib_1.__decorate([
|
|
113
298
|
taon_1.Taon.Http.GET(),
|
|
114
299
|
tslib_1.__param(0, taon_1.Taon.Http.Param.Query('status')),
|
|
115
300
|
tslib_1.__metadata("design:type", Function),
|
|
116
301
|
tslib_1.__metadata("design:paramtypes", [String]),
|
|
117
302
|
tslib_1.__metadata("design:returntype", Object)
|
|
118
|
-
], PortsController.prototype, "
|
|
303
|
+
], PortsController.prototype, "getPortsByStatus", null);
|
|
304
|
+
tslib_1.__decorate([
|
|
305
|
+
taon_1.Taon.Http.DELETE(),
|
|
306
|
+
tslib_1.__param(0, taon_1.Taon.Http.Param.Query('portNumber')),
|
|
307
|
+
tslib_1.__metadata("design:type", Function),
|
|
308
|
+
tslib_1.__metadata("design:paramtypes", [Number]),
|
|
309
|
+
tslib_1.__metadata("design:returntype", Object)
|
|
310
|
+
], PortsController.prototype, "deletePort", null);
|
|
311
|
+
tslib_1.__decorate([
|
|
312
|
+
taon_1.Taon.Http.PUT(),
|
|
313
|
+
tslib_1.__param(0, taon_1.Taon.Http.Param.Query('portNumber')),
|
|
314
|
+
tslib_1.__param(1, taon_1.Taon.Http.Param.Query('serviceId')),
|
|
315
|
+
tslib_1.__metadata("design:type", Function),
|
|
316
|
+
tslib_1.__metadata("design:paramtypes", [Number, String]),
|
|
317
|
+
tslib_1.__metadata("design:returntype", Object)
|
|
318
|
+
], PortsController.prototype, "updatePortUniqueId", null);
|
|
319
|
+
tslib_1.__decorate([
|
|
320
|
+
taon_1.Taon.Http.POST(),
|
|
321
|
+
tslib_1.__param(0, taon_1.Taon.Http.Param.Query('portNumber')),
|
|
322
|
+
tslib_1.__param(1, taon_1.Taon.Http.Param.Query('uniqueId')),
|
|
323
|
+
tslib_1.__metadata("design:type", Function),
|
|
324
|
+
tslib_1.__metadata("design:paramtypes", [Number, String]),
|
|
325
|
+
tslib_1.__metadata("design:returntype", Object)
|
|
326
|
+
], PortsController.prototype, "addTakeByOsPort", null);
|
|
119
327
|
tslib_1.__decorate([
|
|
120
328
|
taon_1.Taon.Http.PUT(),
|
|
121
329
|
tslib_1.__param(0, taon_1.Taon.Http.Param.Query('uniqueServiceName')),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ports.controller.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AAAA,6BAA4B;AAC5B,qCAAsC;AACtC,oFAAgF;AAChF,+CAAkD;
|
|
1
|
+
{"version":3,"file":"ports.controller.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Taon } from 'taon';
|
|
2
2
|
export type PortStatus = 'unassigned' | 'assigned' | 'assigned-not-registered' | 'assigned-taken-by-os';
|
|
3
3
|
export declare const PortStatusArr: PortStatus[];
|
|
4
|
-
export declare class Port extends
|
|
5
|
-
static from(opt: Omit<Port, 'version' | '_' | 'clone'>): Port & Omit<Port, "version" | "_" | "clone">;
|
|
4
|
+
export declare class Port extends Taon.Base.Entity {
|
|
5
|
+
static from(opt: Omit<Port, 'version' | '_' | 'clone' | 'titleOnList'>): Port & Omit<Port, "version" | "_" | "clone" | "titleOnList">;
|
|
6
|
+
static getTitleForFreePort(port: Number): string;
|
|
7
|
+
get titleOnList(): string;
|
|
8
|
+
port: number;
|
|
9
|
+
serviceId: string;
|
|
6
10
|
/**
|
|
7
11
|
* Port status
|
|
8
12
|
*/
|
|
9
|
-
status
|
|
13
|
+
status: PortStatus;
|
|
10
14
|
/**
|
|
11
15
|
* When port was assigned as registered service
|
|
12
16
|
*/
|
|
@@ -4,7 +4,6 @@ exports.Port = exports.PortStatusArr = void 0;
|
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var taon_1 = require("taon");
|
|
6
6
|
var tnp_core_1 = require("tnp-core");
|
|
7
|
-
var not_assignable_port_entity_1 = require("./not-assignable-port.entity");
|
|
8
7
|
exports.PortStatusArr = [
|
|
9
8
|
'unassigned',
|
|
10
9
|
'assigned',
|
|
@@ -20,7 +19,38 @@ var Port = /** @class */ (function (_super) {
|
|
|
20
19
|
Port.from = function (opt) {
|
|
21
20
|
return tnp_core_1._.merge(new Port_1(), opt);
|
|
22
21
|
};
|
|
22
|
+
Port.getTitleForFreePort = function (port) {
|
|
23
|
+
return "free port ".concat(port);
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(Port.prototype, "titleOnList", {
|
|
26
|
+
get: function () {
|
|
27
|
+
//#region @backendFunc
|
|
28
|
+
return "- ".concat(this.port, " <").concat(tnp_core_1.chalk.gray(this.serviceId), ">");
|
|
29
|
+
//#endregion
|
|
30
|
+
},
|
|
31
|
+
enumerable: false,
|
|
32
|
+
configurable: true
|
|
33
|
+
});
|
|
23
34
|
var Port_1;
|
|
35
|
+
tslib_1.__decorate([
|
|
36
|
+
taon_1.Taon.Orm.Column.Primary({
|
|
37
|
+
type: 'int',
|
|
38
|
+
unique: true,
|
|
39
|
+
})
|
|
40
|
+
//#endregion
|
|
41
|
+
,
|
|
42
|
+
tslib_1.__metadata("design:type", Number)
|
|
43
|
+
], Port.prototype, "port", void 0);
|
|
44
|
+
tslib_1.__decorate([
|
|
45
|
+
taon_1.Taon.Orm.Column.Custom({
|
|
46
|
+
type: 'varchar',
|
|
47
|
+
length: 1000,
|
|
48
|
+
unique: true,
|
|
49
|
+
})
|
|
50
|
+
//#endregion
|
|
51
|
+
,
|
|
52
|
+
tslib_1.__metadata("design:type", String)
|
|
53
|
+
], Port.prototype, "serviceId", void 0);
|
|
24
54
|
tslib_1.__decorate([
|
|
25
55
|
taon_1.Taon.Orm.Column.String500('unassigned')
|
|
26
56
|
//#endregion
|
|
@@ -40,6 +70,6 @@ var Port = /** @class */ (function (_super) {
|
|
|
40
70
|
})
|
|
41
71
|
], Port);
|
|
42
72
|
return Port;
|
|
43
|
-
}(
|
|
73
|
+
}(taon_1.Taon.Base.Entity));
|
|
44
74
|
exports.Port = Port;
|
|
45
75
|
//# sourceMappingURL=ports.entity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ports.entity.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AAAA,6BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"ports.entity.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AAAA,6BAA4B;AAC5B,qCAAoC;AAQvB,QAAA,aAAa,GAAiB;IACzC,YAAY;IACZ,UAAU;IACV,yBAAyB;IACzB,sBAAsB;CACvB,CAAC;AAMF;IAA0B,gCAAgB;IAA1C;;IAuDA,CAAC;aAvDY,IAAI;IACR,SAAI,GAAX,UAAY,GAA0D;QACpE,OAAO,YAAC,CAAC,KAAK,CAAC,IAAI,MAAI,EAAE,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;IAEM,wBAAmB,GAA1B,UAA2B,IAAY;QACrC,OAAO,oBAAa,IAAI,CAAE,CAAA;IAC5B,CAAC;IAED,sBAAI,6BAAW;aAAf;YACE,sBAAsB;YACtB,OAAO,YAAK,IAAI,CAAC,IAAI,eAAK,gBAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAG,CAAC;YACxD,YAAY;QACd,CAAC;;;OAAA;;IASD;QALC,WAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;YACvB,IAAI,EAAE,KAAK;YACX,MAAM,EAAE,IAAI;SACb,CAAC;QACF,YAAY;;;sCACC;IAWb;QANC,WAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC;YACtB,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,IAAI;SACb,CAAC;QACF,YAAY;;;2CACM;IAUlB;QAFC,WAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAa,YAAY,CAAC;QACpD,YAAY;;;wCACO;IAUnB;QAFC,WAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE;QACzB,YAAY;;0CACY,MAAM;uDAAC;IArDpB,IAAI;QAJhB,WAAI,CAAC,MAAM,CAAC;YACX,SAAS,EAAE,MAAM;YACjB,aAAa,EAAE,MAAM;SACtB,CAAC;OACW,IAAI,CAuDhB;IAAD,WAAC;CAAA,AAvDD,CAA0B,WAAI,CAAC,IAAI,CAAC,MAAM,GAuDzC;AAvDY,oBAAI"}
|
|
@@ -9,7 +9,6 @@ var taon_1 = require("taon");
|
|
|
9
9
|
var tnp_core_2 = require("tnp-core");
|
|
10
10
|
var ports_controller_1 = require("./ports.controller");
|
|
11
11
|
var ports_entity_1 = require("./ports.entity");
|
|
12
|
-
var not_assignable_port_entity_1 = require("./not-assignable-port.entity");
|
|
13
12
|
var migrations_1 = require("../../../migrations");
|
|
14
13
|
//#region @backend
|
|
15
14
|
var portsWorkerDatabaseLocation = (0, tnp_core_2.crossPlatformPath)([
|
|
@@ -25,7 +24,7 @@ exports.PortsContext = taon_1.Taon.createContext(function () { return ({
|
|
|
25
24
|
contextName: 'PortsContext',
|
|
26
25
|
contexts: { BaseContext: taon_1.BaseContext },
|
|
27
26
|
controllers: { PortsController: ports_controller_1.PortsController },
|
|
28
|
-
entities: { Port: ports_entity_1.Port
|
|
27
|
+
entities: { Port: ports_entity_1.Port },
|
|
29
28
|
migrations: tslib_1.__assign({}, migrations_1.MIGRATIONS_CLASSES_FOR_PortsContext),
|
|
30
29
|
skipWritingServerRoutes: true,
|
|
31
30
|
//#region @backend
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tcp-udp-ports.context.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AAAA,kBAAkB;AAClB,qCAA8B;AAC9B,YAAY;AACZ,6BAAyC;AACzC,qCAA4D;AAC5D,uDAAqD;AACrD,+CAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"tcp-udp-ports.context.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;AAAA,kBAAkB;AAClB,qCAA8B;AAC9B,YAAY;AACZ,6BAAyC;AACzC,qCAA4D;AAC5D,uDAAqD;AACrD,+CAAsC;AACtC,kDAA0E;AAE1E,kBAAkB;AAClB,IAAM,2BAA2B,GAAG,IAAA,4BAAiB,EAAC;IACpD,aAAE,CAAC,QAAQ,EAAE,CAAC,OAAO;IACrB,kDAAkD;CACnD,CAAC,CAAC;AACH,IAAI,CAAC,kBAAO,CAAC,MAAM,CAAC,eAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC,EAAE,CAAC;IAC/D,kBAAO,CAAC,MAAM,CAAC,eAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC,CAAC;AAC5D,CAAC;AACD,2EAA2E;AAC3E,YAAY;AAEC,QAAA,YAAY,GAAG,WAAI,CAAC,aAAa,CAAC,cAAM,OAAA,CAAC;IACpD,WAAW,EAAE,cAAc;IAC3B,QAAQ,EAAE,EAAE,WAAW,oBAAA,EAAE;IACzB,WAAW,EAAE,EAAE,eAAe,oCAAA,EAAE;IAChC,QAAQ,EAAE,EAAE,IAAI,qBAAA,EAAE;IAClB,UAAU,uBAAO,gDAAmC,CAAE;IACtD,uBAAuB,EAAE,IAAI;IAC7B,kBAAkB;IAClB,QAAQ,EAAE;QACR,YAAY,EAAE,oBAAoB;QAClC,QAAQ,EAAE,2BAA2B;KACtC;IACD,YAAY;IACZ,IAAI,EAAE;QACJ,UAAU,EAAE,IAAI;KACjB;CACF,CAAC,EAhBmD,CAgBnD,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BaseCliWorker, CfontStyle } from '../classes/base-cli-worker';
|
|
2
|
-
import { PortStatus } from '../../index';
|
|
2
|
+
import { Port, PortStatus } from '../../index';
|
|
3
3
|
import { PortsController } from '../tcp-udp-ports/ports.controller';
|
|
4
4
|
export declare class PortsWorker extends BaseCliWorker<PortsController> {
|
|
5
5
|
private portsController;
|
|
@@ -12,20 +12,26 @@ export declare class PortsWorker extends BaseCliWorker<PortsController> {
|
|
|
12
12
|
*/
|
|
13
13
|
startNormallyInCurrentProcess(): Promise<void>;
|
|
14
14
|
protected displayItemsForPortsStatus(status: PortStatus): Promise<void>;
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
getWorkerTerminalActions(options?: {
|
|
16
|
+
exitIsOnlyReturn?: boolean;
|
|
17
|
+
}): {
|
|
18
|
+
previewPorts: {
|
|
17
19
|
name: string;
|
|
18
|
-
action: () => Promise<
|
|
20
|
+
action: () => Promise<void>;
|
|
19
21
|
};
|
|
20
|
-
|
|
21
|
-
getWorkerTerminalActions(): {
|
|
22
|
-
emptyAction: {
|
|
22
|
+
editAddTakeByOsPort: {
|
|
23
23
|
name: string;
|
|
24
24
|
action: () => Promise<void>;
|
|
25
25
|
};
|
|
26
|
-
|
|
26
|
+
emptyAction: {
|
|
27
27
|
name: string;
|
|
28
28
|
action: () => Promise<void>;
|
|
29
29
|
};
|
|
30
30
|
};
|
|
31
|
+
protected getNewPortToAdd(): Promise<number>;
|
|
32
|
+
protected addPortTerminalUiProcess(): Promise<void>;
|
|
33
|
+
protected selectPortProcess(ports: Port[], title: string): Promise<Port>;
|
|
34
|
+
protected deletePortTerminalUiProcess(): Promise<void>;
|
|
35
|
+
protected editPortTerminalUiProcess(): Promise<void>;
|
|
36
|
+
protected crudMenuForTakeByOsPorts(): Promise<void>;
|
|
31
37
|
}
|