@bprotsyk/aso-core 1.2.235 → 1.2.237

package/lib/utils/server-util.d.ts

@@ -1,19 +1,26 @@
-import { NodeSSH } from "node-ssh";
-export declare let IP: string;
-export declare let PASSWORD: string;
-export declare let HOST: string;
-export declare let PORT: number;
-export declare class ServerUtil {
-    DOMAIN_HOME: string;
-    ssh?: NodeSSH;
-    constructor(ssh?: NodeSSH);
-    exec(command: string, options?: any): Promise<string>;
-    isNginxActive(): Promise<boolean>;
-    isMongoActive(): Promise<boolean>;
-    mongoInstallCommand: string;
-    domainNginxConfigExists(host: string): Promise<boolean>;
-    domainNginxCertsExist(host: string): Promise<boolean>;
-    isCerbotActive(): Promise<boolean>;
-    setupCertbot(): Promise<boolean>;
-    refresh(): Promise<boolean>;
-}
+import { NodeSSH } from "node-ssh";
+export declare let IP: string;
+export declare let PASSWORD: string;
+export declare let HOST: string;
+export declare let PORT: number;
+export declare class ServerUtil {
+    DOMAIN_HOME: string;
+    ssh?: NodeSSH;
+    constructor(ssh?: NodeSSH);
+    exec(command: string, options?: any): Promise<string>;
+    generateSSHKey(): Promise<string>;
+    createDirectories(): Promise<void>;
+    installGit(): Promise<void>;
+    addBitbucketToKnownHosts(): Promise<void>;
+    cloneRepository(repoName: string, targetPath: string): Promise<void>;
+    installNginx(): Promise<void>;
+    isNginxActive(): Promise<boolean>;
+    isMongoActive(): Promise<boolean>;
+    mongoInstallCommand: string;
+    domainNginxConfigExists(host: string): Promise<boolean>;
+    domainNginxCertsExist(host: string): Promise<boolean>;
+    isCerbotActive(): Promise<boolean>;
+    setupCertbot(): Promise<boolean>;
+    setupSSL(email: string, host: string): Promise<void>;
+    refresh(): Promise<boolean>;
+}

package/lib/utils/server-util.js

@@ -1,115 +1,176 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerUtil = exports.PORT = exports.HOST = exports.PASSWORD = exports.IP = void 0;
-const child_process_1 = require("child_process");
-const { promisify } = require('util');
-const execPromise = promisify(child_process_1.default.exec);
-exports.IP = "185.123.53.227";
-exports.PASSWORD = "xUA3oOX06Kfc9m12rZ";
-exports.HOST = "cg-main-server.com";
-exports.PORT = 56777;
-class ServerUtil {
-    DOMAIN_HOME = "/etc/nginx/sites-enabled";
-    ssh;
-    constructor(ssh) {
-        this.ssh = ssh;
-    }
-    // Выконує команду або по SSH або локально, повертаючи текст незалежно від результату (помилка чи успіх)
-    async exec(command, options) {
-        if (this.ssh) {
-            return (await this.ssh.execCommand(command, options)).stdout;
-        }
-        else {
-            return await new Promise((resolve) => {
-                execPromise(command, (err, stdout) => {
-                    resolve(stdout);
-                });
-            });
-        }
-    }
-    // Nginx
-    async isNginxActive() {
-        try {
-            let result = await this.exec('systemctl status nginx');
-            if (result.includes("Active: active"))
-                return true;
-        }
-        catch (e) {
-            console.error(e);
-        }
-        return false;
-    }
-    // Mongo
-    async isMongoActive() {
-        try {
-            let result = await this.exec('systemctl status mongod');
-            if (result.includes("Active: active"))
-                return true;
-        }
-        catch (e) {
-            console.error(e);
-        }
-        return false;
-    }
-    mongoInstallCommand = `
-        echo "deb http://security.ubuntu.com/ubuntu focal-security main" | tee /etc/apt/sources.list.d/focal-security.list;
-        apt-get update;
-        apt-get install libssl1.1;
-        rm /etc/apt/sources.list.d/focal-security.list;
-
-        curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add -;
-        echo "deb http://security.ubuntu.com/ubuntu impish-security main" | tee /etc/apt/sources.list.d/impish-security.list;
-        echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list;
-        apt-get update;
-        apt-get install -y mongodb-org;
-        systemctl enable mongod.service;
-        systemctl start mongod;
-    `;
-    // Domains
-    async domainNginxConfigExists(host) {
-        try {
-            let result = await this.exec(`ls ${this.DOMAIN_HOME}/${host}.nginx.ssl.conf`);
-            if (result.includes("No such file or directory"))
-                return false;
-        }
-        catch (e) {
-            console.error(e);
-        }
-        return true;
-    }
-    async domainNginxCertsExist(host) {
-    }
-    // Certbot CRON
-    async isCerbotActive() {
-        try {
-            let result = await this.exec('which certbot');
-            if (result.includes("/usr/bin/certbot"))
-                return true;
-        }
-        catch (e) {
-            console.error(e);
-        }
-        return false;
-    }
-    async setupCertbot() {
-        await this.exec(`apt-get install -y certbot python3-certbot-nginx;`);
-        return true;
-    }
-    // Git 
-    async refresh() {
-        // git stash; rm-rf built; git pull
-    }
-}
-exports.ServerUtil = ServerUtil;
-// (async () => {
-//     const ssh = new NodeSSH()
-//     await ssh.connect({
-// 		host: IP,
-// 		port: PORT,
-// 		username: `root`,
-// 		password: PASSWORD
-// 	})
-//     let util = new ServerUtil(ssh)
-//     console.log(`Nginx is active: ${await util.isNginxActive()}`)
-//     process.exit(0)
-// })()
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServerUtil = exports.PORT = exports.HOST = exports.PASSWORD = exports.IP = void 0;
+const child_process_1 = __importDefault(require("child_process"));
+const { promisify } = require("util");
+const execPromise = promisify(child_process_1.default.exec);
+exports.IP = "185.123.53.227";
+exports.PASSWORD = "xUA3oOX06Kfc9m12rZ";
+exports.HOST = "cg-main-server.com";
+exports.PORT = 56777;
+class ServerUtil {
+    DOMAIN_HOME = "/etc/nginx/sites-enabled";
+    ssh;
+    constructor(ssh) {
+        this.ssh = ssh;
+    }
+    // Выконує команду або по SSH або локально, повертаючи текст незалежно від результату (помилка чи успіх)
+    async exec(command, options) {
+        if (this.ssh) {
+            return (await this.ssh.execCommand(command, options)).stdout;
+        }
+        else {
+            return await new Promise((resolve) => {
+                execPromise(command, (err, stdout) => {
+                    resolve(stdout);
+                });
+            });
+        }
+    }
+    // SSH
+    async generateSSHKey() {
+        await this.exec(`ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa <<< n`);
+        let sshFingerprint = await this.exec(`cat ~/.ssh/id_rsa.pub`);
+        return sshFingerprint;
+    }
+    // create Directories in /Var
+    async createDirectories() {
+        await this.exec(`mkdir -p /var/www/ai`);
+    }
+    // install git
+    async installGit() {
+        await this.exec(`apt-get update; apt-get install -y git`);
+    }
+    // add ssh to bitbucket
+    async addBitbucketToKnownHosts() {
+        await this.exec(`ssh-keyscan bitbucket.org >> ~/.ssh/known_hosts`);
+    }
+    // clone bitbucket Repository
+    async cloneRepository(repoName, targetPath) {
+        let gitResponse = await this.exec(`git clone git@bitbucket.org:bprtsk/${repoName}.git`, { cwd: targetPath });
+        if (gitResponse.includes(`Please make sure you have the correct access rights`)) {
+            throw new Error(`No access to the remote repository!`);
+        }
+    }
+    // не знаю чи треба але  додав ?
+    // async checkoutBranch(branch: string, repoPath: string): Promise<void> {
+    //     await this.exec(`git checkout -b ${branch}; git branch --set-upstream-to=origin/${branch} ${branch}; git reset --hard origin/${branch};`, { cwd: repoPath });
+    // }
+    // не знаю чи треба але  додав ?
+    //   async installJava(): Promise<void> {
+    //     await this.exec(`apt-get update; apt-get install -y default-jre default-jdk`);
+    // }
+    // install Nginx
+    async installNginx() {
+        await this.exec(`apt-get update; apt-get install -y nginx`);
+        await this.exec(`systemctl enable nginx`);
+        await this.exec(`systemctl start nginx`);
+    }
+    // Nginx
+    async isNginxActive() {
+        try {
+            let result = await this.exec("systemctl status nginx");
+            if (result.includes("Active: active"))
+                return true;
+        }
+        catch (e) {
+            console.error(e);
+        }
+        return false;
+    }
+    // Mongo
+    async isMongoActive() {
+        try {
+            let result = await this.exec("systemctl status mongod");
+            if (result.includes("Active: active"))
+                return true;
+        }
+        catch (e) {
+            console.error(e);
+        }
+        return false;
+    }
+    mongoInstallCommand = `
+        echo "deb http://security.ubuntu.com/ubuntu focal-security main" | tee /etc/apt/sources.list.d/focal-security.list;
+        apt-get update;
+        apt-get install libssl1.1;
+        rm /etc/apt/sources.list.d/focal-security.list;
+
+        curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add -;
+        echo "deb http://security.ubuntu.com/ubuntu impish-security main" | tee /etc/apt/sources.list.d/impish-security.list;
+        echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list;
+        apt-get update;
+        apt-get install -y mongodb-org;
+        systemctl enable mongod.service;
+        systemctl start mongod;
+    `;
+    // Domains
+    async domainNginxConfigExists(host) {
+        try {
+            let result = await this.exec(`ls ${this.DOMAIN_HOME}/${host}.nginx.ssl.conf`);
+            if (result.includes("No such file or directory"))
+                return false;
+        }
+        catch (e) {
+            console.error(e);
+        }
+        return true;
+    }
+    async domainNginxCertsExist(host) {
+        try {
+            let result = await this.exec(`ls /etc/letsencrypt/live/${host}`);
+            if (result.includes("No such file or directory"))
+                return false;
+        }
+        catch (e) {
+            console.error(e);
+        }
+        return true;
+    }
+    // Certbot CRON
+    async isCerbotActive() {
+        try {
+            let result = await this.exec("which certbot");
+            if (result.includes("/usr/bin/certbot"))
+                return true;
+        }
+        catch (e) {
+            console.error(e);
+        }
+        return false;
+    }
+    // install certbot
+    async setupCertbot() {
+        await this.exec(`apt-get install -y certbot python3-certbot-nginx;`);
+        return true;
+    }
+    // creating a SSL certificate
+    async setupSSL(email, host) {
+        let certbotResponse = await this.exec(`certbot --non-interactive --agree-tos --nginx -m "${email}" -d "${host}"`);
+        if (certbotResponse.includes(`Some challenges have failed.`)) {
+            throw new Error("Certbot encountered an error");
+        }
+        await this.exec(`echo "0 12 * * * /usr/bin/certbot renew --quiet" | crontab -`);
+    }
+    // Git
+    async refresh() {
+        await this.exec(`git stash; rm-rf built; git pull`);
+        return true;
+    }
+}
+exports.ServerUtil = ServerUtil;
+// (async () => {
+//     const ssh = new NodeSSH()
+//     await ssh.connect({
+// 		host: IP,
+// 		port: PORT,
+// 		username: `root`,
+// 		password: PASSWORD
+// 	})
+//     let util = new ServerUtil(ssh)
+//     console.log(`Nginx is active: ${await util.isNginxActive()}`)
+//     process.exit(0)
+// })()

package/package.json

@@ -1,46 +1,46 @@
-{
-  "name": "@bprotsyk/aso-core",
-  "version": "1.2.235",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "scripts": {
-    "prod": "tsc -p ./tsconfig.json; git add .; git commit -m \"Stub\"; git push origin master; npm version patch; npm publish;",
-    "build": "tsc",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "keitaro": "tsc; node lib/utils/keitaro-utils.js",
-    "server": "tsc; node lib/utils/server-util.js"
-  },
-  "author": "bprotsyk",
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@bitbucket.org/bprtsk/aso-core.git"
-  },
-  "bugs": {
-    "url": "https://bitbucket.org/bprtsk/aso-core/issues"
-  },
-  "homepage": "https://bitbucket.org/bprtsk/aso-core#readme",
-  "description": "",
-  "dependencies": {
-    "@types/axios": "^0.14.0",
-    "@types/module-alias": "^2.0.1",
-    "@types/mongoose": "^5.11.97",
-    "@types/node-ssh": "^7.0.6",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "@types/styled-components": "^5.1.26",
-    "axios": "^1.4.0",
-    "module-alias": "^2.2.2",
-    "mongoose": "^6.8.3",
-    "node-ssh": "^13.2.0",
-    "react": "^18.2.0",
-    "replace-in-file": "^7.0.1",
-    "sleep-promise": "^9.1.0",
-    "styled-components": "^5.3.9"
-  },
-  "devDependencies": {
-    "@types/node": "^20.14.12",
-    "typedoc": "^0.23.28",
-    "typescript": "^4.9.5"
-  }
-}
+{
+  "name": "@bprotsyk/aso-core",
+  "version": "1.2.237",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "scripts": {
+    "prod": "tsc; git add .; git commit -m \"Stub\"; git push origin master; npm version patch; npm publish;",
+    "build": "tsc",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "keitaro": "tsc; node lib/utils/keitaro-utils.js",
+    "server": "tsc; node lib/utils/server-util.js"
+  },
+  "author": "bprotsyk",
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@bitbucket.org/bprtsk/aso-core.git"
+  },
+  "bugs": {
+    "url": "https://bitbucket.org/bprtsk/aso-core/issues"
+  },
+  "homepage": "https://bitbucket.org/bprtsk/aso-core#readme",
+  "description": "",
+  "dependencies": {
+    "@types/axios": "^0.14.0",
+    "@types/module-alias": "^2.0.1",
+    "@types/mongoose": "^5.11.97",
+    "@types/node-ssh": "^7.0.6",
+    "@types/styled-components": "^5.1.26",
+    "axios": "^1.4.0",
+    "module-alias": "^2.2.2",
+    "mongoose": "^6.8.3",
+    "mustache": "^4.2.0",
+    "node-ssh": "^13.2.0",
+    "react": "^18.2.0",
+    "replace-in-file": "^7.0.1",
+    "sleep-promise": "^9.1.0",
+    "ssh2-sftp-client": "^10.0.3",
+    "styled-components": "^5.3.9"
+  },
+  "devDependencies": {
+    "@types/mustache": "^4.2.5",
+    "typedoc": "^0.23.28",
+    "typescript": "^4.8.0-dev.20220623"
+  }
+}

package/src/app/app-integration.ts

@@ -1,67 +1,67 @@
-export enum AlternativeNetworkTool {
-    RETROFIT = "Retrofit",
-    VOLLEY = "Volley",
-    HTTP_URL = "HTTPUrlConnection",
-}
-
-export enum AlternativeLogicType {
-    CALLBACKS = "Callback",
-    RX = "RX",
-    COROUTINES = "Coroutines",
-}
-
-export enum AlternativeNavigation {
-    ACTIVITY = "Activity",
-    FRAGMENT_FM = "Fragment",
-    FRAGMENT_NAV_HOST = "Fragment (NavHost)",
-}
-
-export enum AlternativeStorageType {
-    FILE = "File",
-    ROOM = "Room",
-    ENCRYPTED_PREFS = "Encrypted Preferences",
-    SHARED_PREFERENCES = "Shared Preferences",
-    CONTENT_PROVIDER = "Content Provider",
-}
-
-export enum AlternativeLayoutType {
-    DATA_BINDING = "DataBinding",
-    BY_ID = "findViewById",
-    PROGRAMATICALLY = "Create in code"
-}
-
-export enum AlternativeFullscreen {
-    INSETS = "Insets",
-    FLAGS = "Flags",
-    IMMERSIVE = "Immersive"
-}
-
-export enum AlternativeSourceType {
-    FIREBASE_REALTIME_DATABASE = "Firebase Realtime DB",
-    GET_RETROFIT = "From link via Retrofit",
-    GET_VOLLEY = "From link via Volley",
-    GET_HTTP_URL = "From link via HTTPUrlConnection",
-    DIRECT = "Directly from link"
-    // WITHIN_WEBVIEW = "Within webview",
-}
-
-// backpress
-// activity result
-// fulscreen
-
-export enum AlternativeOnBackPressed {
-    OLD = "Old",
-    NEW = "New"
-}
-
-export enum AlternativeOnActivityResult {
-    OVERRIDE = "Override",
-    CALLBACK = "Callback"
-}
-
-export interface IAppIntegration {
-    id: number,
-    name: string,
-    description: string,
-    alterations: [any[]]
+export enum AlternativeNetworkTool {
+    RETROFIT = "Retrofit",
+    VOLLEY = "Volley",
+    HTTP_URL = "HTTPUrlConnection",
+}
+
+export enum AlternativeLogicType {
+    CALLBACKS = "Callback",
+    RX = "RX",
+    COROUTINES = "Coroutines",
+}
+
+export enum AlternativeNavigation {
+    ACTIVITY = "Activity",
+    FRAGMENT_FM = "Fragment",
+    FRAGMENT_NAV_HOST = "Fragment (NavHost)",
+}
+
+export enum AlternativeStorageType {
+    FILE = "File",
+    ROOM = "Room",
+    ENCRYPTED_PREFS = "Encrypted Preferences",
+    SHARED_PREFERENCES = "Shared Preferences",
+    CONTENT_PROVIDER = "Content Provider",
+}
+
+export enum AlternativeLayoutType {
+    DATA_BINDING = "DataBinding",
+    BY_ID = "findViewById",
+    PROGRAMATICALLY = "Create in code"
+}
+
+export enum AlternativeFullscreen {
+    INSETS = "Insets",
+    FLAGS = "Flags",
+    IMMERSIVE = "Immersive"
+}
+
+export enum AlternativeSourceType {
+    FIREBASE_REALTIME_DATABASE = "Firebase Realtime DB",
+    GET_RETROFIT = "From link via Retrofit",
+    GET_VOLLEY = "From link via Volley",
+    GET_HTTP_URL = "From link via HTTPUrlConnection",
+    DIRECT = "Directly from link"
+    // WITHIN_WEBVIEW = "Within webview",
+}
+
+// backpress
+// activity result
+// fulscreen
+
+export enum AlternativeOnBackPressed {
+    OLD = "Old",
+    NEW = "New"
+}
+
+export enum AlternativeOnActivityResult {
+    OVERRIDE = "Override",
+    CALLBACK = "Callback"
+}
+
+export interface IAppIntegration {
+    id: number,
+    name: string,
+    description: string,
+    alterations: [any[]]
 }

package/src/app/app-list-item.ts

@@ -1,5 +1,5 @@
-export interface IAppListItem {
-    id: number,
-    bundle: string,
-    name: string
+export interface IAppListItem {
+    id: number,
+    bundle: string,
+    name: string
 }

package/src/app/app-type.ts

@@ -1,4 +1,4 @@
-export enum AppType {
-    GAMBLING = "gambling", 
-    FINANCES = "finances" // do not change the order!
+export enum AppType {
+    GAMBLING = "gambling", 
+    FINANCES = "finances" // do not change the order!
 }