greybel-mock-environment 1.3.5 → 1.3.7

package/dist/environment.js

@@ -150,6 +150,7 @@ var MockEnvironment = /** @class */ (function () {
     MockEnvironment.prototype.findRoutersCloseToLocation = function (loc) {
         var e_1, _a;
         var me = this;
+        var session = me.getLatestSession();
         var getDistance = function (routerLoc) {
             var y = routerLoc.x - loc.x;
             var x = routerLoc.y - loc.y;
@@ -159,6 +160,8 @@ var MockEnvironment = /** @class */ (function () {
         try {
             for (var _b = __values(me.networkGenerator.serverMap.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var serverMapGenerator = _c.value;
+                if (session.device.getRouter() === serverMapGenerator.router)
+                    continue;
                 var distance = getDistance(serverMapGenerator.router.location);
                 if (distance < me.WIFI_MAX_DISTANCE) {
                     var percentage = Math.round(((me.WIFI_MAX_DISTANCE - distance) * 100) / me.WIFI_MAX_DISTANCE);

package/dist/generators/network.js

@@ -33,6 +33,7 @@ var random_seed_1 = __importDefault(require("random-seed"));
 var fs_1 = require("../fs");
 var types_1 = require("../types");
 var net_card_1 = require("../types/net-card");
+var utils_1 = require("../utils");
 var ServerMapGenerator = /** @class */ (function () {
     function ServerMapGenerator(_a) {
         var router = _a.router, networkRng = _a.networkRng, portRng = _a.portRng, basicGenerator = _a.basicGenerator, userGenerator = _a.userGenerator, networkGenerator = _a.networkGenerator, libraryManager = _a.libraryManager;
@@ -47,7 +48,7 @@ var ServerMapGenerator = /** @class */ (function () {
     ServerMapGenerator.prototype.generateLocalIp = function (router) {
         var me = this;
         var ip = "192.168.".concat(me.networkRng.intBetween(0, 255), ".").concat(me.networkRng.intBetween(0, 255));
-        if (router.devices.has(ip)) {
+        if (router.findByLanIp(ip) !== null) {
             return me.generateLocalIp(router);
         }
         return ip;
@@ -143,10 +144,11 @@ var ServerMapGenerator = /** @class */ (function () {
         var portAmount = me.portRng.intBetween(1, 3);
         var result = new Map();
         for (var i = 0; i < portAmount; i++) {
+            var service = types_1.ServiceTypeList[me.portRng.intBetween(0, 5)];
             var port = new types_1.Port({
-                port: me.portRng.intBetween(1, 1000),
-                isClosed: !!me.portRng.intBetween(0, 1),
-                service: types_1.ServiceTypeList[me.portRng.intBetween(0, 5)]
+                port: (0, utils_1.getServicePort)(service),
+                isClosed: me.portRng.intBetween(0, 100) < 20,
+                service: service
             });
             result.set(port.port, port);
         }

package/dist/types/computer.js

@@ -28,7 +28,7 @@ var Computer = /** @class */ (function (_super) {
     }
     Computer.prototype.isForwarded = function (port) {
         var router = this.getRouter();
-        if (router.forwarded.has(port)) {
+        if (!router.forwarded.has(port)) {
             return false;
         }
         var ip = router.forwarded.get(port).ip;

package/dist/types/device.js

@@ -756,7 +756,10 @@ var Device = /** @class */ (function () {
     Device.prototype.addService = function (serviceType, portNumber) {
         var libFolder = this.getFile(['lib']);
         if (!(libFolder instanceof file_system_1.Folder)) {
-            return;
+            return null;
+        }
+        if (this.services.has(serviceType)) {
+            return null;
         }
         var libFile;
         var configFile;
@@ -822,7 +825,9 @@ var Device = /** @class */ (function () {
         if (this.ports.has(port.port) || this.services.has(port.service)) {
             return false;
         }
-        this.addService(port.service, port.port);
+        if (this.addService(port.service, port.port) === null) {
+            return false;
+        }
         this.ports.set(port.port, port);
         this.forward(port.port);
         return true;

package/dist/types/router.js

@@ -76,11 +76,7 @@ var Router = /** @class */ (function (_super) {
         return this.devices.get(ip);
     };
     Router.prototype.isForwarded = function (port) {
-        if (!this.forwarded.has(port)) {
-            return false;
-        }
-        var ip = this.forwarded.get(port).ip;
-        return ip === this.localIp;
+        return this.forwarded.has(port);
     };
     Router.prototype.forward = function (port) {
         if (this.forwarded.has(port)) {

package/dist/types/switch.js

@@ -28,9 +28,6 @@ var Switch = /** @class */ (function (_super) {
     }
     Switch.prototype.isForwarded = function (port) {
         var router = this.getRouter();
-        if (router.forwarded.has(port)) {
-            return false;
-        }
         if (!router.forwarded.has(port)) {
             return false;
         }

package/dist/utils.d.ts

@@ -4,6 +4,7 @@ import { User } from './types/user';
 export declare function isValidIp(target: string): boolean;
 export declare function isLanIp(target: string): boolean;
 export declare function getServiceLibrary(service: ServiceType): Library | null;
+export declare function getServicePort(service: ServiceType): number;
 export declare function getUserPath(user: User): string;
 export declare function getTraversalPath(path: string | null, currentLocation?: string[]): null | string[];
 export declare function getRandom(min: number, max: number): number;

package/dist/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.capitalize = exports.getRandomInt = exports.getRandom = exports.getTraversalPath = exports.getUserPath = exports.getServiceLibrary = exports.isLanIp = exports.isValidIp = void 0;
+exports.capitalize = exports.getRandomInt = exports.getRandom = exports.getTraversalPath = exports.getUserPath = exports.getServicePort = exports.getServiceLibrary = exports.isLanIp = exports.isValidIp = void 0;
 var random_seed_1 = __importDefault(require("random-seed"));
 var library_1 = require("./types/library");
 var service_1 = require("./types/service");
@@ -38,6 +38,29 @@ function getServiceLibrary(service) {
     return null;
 }
 exports.getServiceLibrary = getServiceLibrary;
+function getServicePort(service) {
+    switch (service) {
+        case service_1.ServiceType.FTP:
+            return 21;
+        case service_1.ServiceType.HTTP:
+            return 80;
+        case service_1.ServiceType.RSHELL:
+            return 1222;
+        case service_1.ServiceType.SMTP:
+            return 25;
+        case service_1.ServiceType.SQL:
+            return 141;
+        case service_1.ServiceType.SSH:
+            return 22;
+        case service_1.ServiceType.CHAT:
+            return 6667;
+        case service_1.ServiceType.REPOSITORY:
+            return 1542;
+        default:
+    }
+    return getRandomInt(1, 1000);
+}
+exports.getServicePort = getServicePort;
 function getUserPath(user) {
     switch (user.username) {
         case 'root':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "greybel-mock-environment",
-  "version": "1.3.5",
+  "version": "1.3.7",
   "description": "Mock environment",
   "main": "dist/index",
   "typings": "dist/index",