@bprotsyk/aso-core 2.0.15 → 2.0.18

package/lib/general/namecheap-domain.d.ts

@@ -65,7 +65,7 @@ export interface INamecheapBuyRequest extends Document {
     fullfilled: boolean;
     id: string;
 }
-export interface NamecheapBuyResult {
+export interface INamecheapBuyResult {
     succeed: {
         [key: string]: string;
     };

package/lib/index.d.ts

@@ -22,5 +22,5 @@ export { IKeitaroOffer } from "./keitaro/keitaro-offer";
 export { IKeitaroStream } from "./keitaro/keitaro-stream";
 export { ICloudflareDomainStatus, ICloudflareDomainType, ICloudflareDomain } from "./general/cloudflare-domain";
 export { IDomain, IDomainSetupResult, DomainStatus, DomainTarget, CONST_CLOUFLARE_STATUS_READY, IDomainsBuyRequestResponse, getDomainTargetByIp } from "./general/domain";
-export { INamecheapDomain, INamecheapBuyRequest, INamecheapContactInfo, NamecheapBuyRequestSchema, INamecheapGetDomainsResult, NamecheapBuyResult } from "./general/namecheap-domain";
+export { INamecheapDomain, INamecheapBuyRequest, INamecheapContactInfo, NamecheapBuyRequestSchema, INamecheapGetDomainsResult, INamecheapBuyResult } from "./general/namecheap-domain";
 export { ServerUtil } from "./utils/server-util";

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

@@ -25,5 +25,5 @@ export declare class ServerUtil {
     refresh(): Promise<boolean>;
     deployLandingPage(host: string, username: string, password: string, remotePath: string, files: any): Promise<void>;
     generateNginxConfig(domain: string, rootPath: string): Promise<string>;
-    serverConect(IP: string): Promise<string>;
+    serverConect(IP: string): Promise<boolean>;
 }

package/lib/utils/server-util.js

@@ -195,11 +195,11 @@ class ServerUtil {
                 username: 'root',
                 password: 'A0a693E4CrK6tdvSlE',
             });
-            return `Successfully connected to ${IP}`;
+            return true;
         }
         catch (error) {
             console.error(`Failed to connect to ${IP}:`, error);
-            return `Failed to connect to ${IP}`;
+            return false;
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bprotsyk/aso-core",
-  "version": "2.0.15",
+  "version": "2.0.18",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {

package/src/general/domain.ts

@@ -18,7 +18,6 @@ export interface IDomain extends Document {
     originalDNSHost: string | null
     createdAt: number
     expiresAt: number
-
     ip: string
     subdomain: string | null
     txtRecords: string[]

package/src/general/namecheap-domain.ts

@@ -45,7 +45,7 @@ export interface INamecheapBuyRequest extends Document {
     id: string
 }
 
-export interface NamecheapBuyResult {
+export interface INamecheapBuyResult {
     succeed: { [key: string]: string },
     failed: { [key: string]: string },
     paidTotal: number

package/src/index.ts

@@ -29,5 +29,5 @@ export { IKeitaroStream } from "./keitaro/keitaro-stream"
 
 export { ICloudflareDomainStatus, ICloudflareDomainType, ICloudflareDomain } from "./general/cloudflare-domain"
 export { IDomain, IDomainSetupResult, DomainStatus, DomainTarget, CONST_CLOUFLARE_STATUS_READY, IDomainsBuyRequestResponse, getDomainTargetByIp } from "./general/domain"
-export { INamecheapDomain, INamecheapBuyRequest, INamecheapContactInfo, NamecheapBuyRequestSchema, INamecheapGetDomainsResult, NamecheapBuyResult } from "./general/namecheap-domain"
+export { INamecheapDomain, INamecheapBuyRequest, INamecheapContactInfo, NamecheapBuyRequestSchema, INamecheapGetDomainsResult, INamecheapBuyResult } from "./general/namecheap-domain"
 export {ServerUtil} from "./utils/server-util";

package/src/templetes/nginx-template.conf

@@ -0,0 +1,35 @@
+server {
+    server_name {{domain}};
+    listen 80;
+
+    return 301 https://{{domain}}$request_uri;
+}
+
+server {
+    listen 443 ssl;
+
+    ssl_certificate "/etc/letsencrypt/live/{{domain}}/fullchain.pem";
+    ssl_certificate_key "/etc/letsencrypt/live/{{domain}}/privkey.pem";
+    ssl_ciphers EECDH:+AES256:-3DES:RSA+AES:!NULL:!RC4;
+    ssl_prefer_server_ciphers on;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always;
+    ssl_stapling on;
+
+    error_log /var/log/nginx/{{domain}}.error.log error;
+
+    root {{rootPath}}{{domain}};
+    error_page 404 /policy/index.html;
+
+    server_name www.{{domain}} {{domain}};
+
+    location / {
+        root {{rootPath}}{{domain}};
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+        add_header 'Access-Control-Allow-Headers' 'Origin, Authorization, Accept, Content-Type, X-Requested-With';
+        if ($request_method = 'OPTIONS') {
+            return 204;
+        }
+    }
+}

package/src/utils/server-util.ts

@@ -224,7 +224,7 @@ export  class ServerUtil {
     return config;
   }
 
-  async serverConect(IP: string): Promise<string> {
+  async serverConect(IP: string): Promise<boolean> {
     if (!this.ssh) {
       this.ssh = new NodeSSH();
     }
@@ -237,10 +237,10 @@ export  class ServerUtil {
         password: 'A0a693E4CrK6tdvSlE',
       });
 
-      return `Successfully connected to ${IP}`;
+      return true;
     } catch (error) {
       console.error(`Failed to connect to ${IP}:`, error);
-      return `Failed to connect to ${IP}`;
+      return false;
     }
   }