fanqiang 2.5.0 → 2.6.0

package/README.md

@@ -7,11 +7,12 @@ This project creates a command line tool that helps to automatically deploy a sh
 - Has **Nodejs** installed on local machine. See [download link][1] for more details.
 - Has **Terraform** installed on local machine. See [Install Terraform][5] for more details.
 - Has an AWS access token. See [manage AWS access token][2] for more details.
-- Has an Aliyun access token if you want to use tunnel feature.
+- Has an Aliyun access token. See [Aliyun Account][6] for more details
 
 [1]: https://nodejs.org/en/
 [2]: https://console.aws.amazon.com/iam/home#security_credential
 [5]: https://learn.hashicorp.com/tutorials/terraform/install-cli?in=terraform/aws-get-started
+[6]: https://account.aliyun.com
 
 ## Installation
 
@@ -39,6 +40,8 @@ Options:
                                                                                    [string]
   --aliyun-credentials  Must be in format: <ACCESS_KEY_ID>:<ACCESS_KEY_SECRET>
                                                                                    [string]
+  --public-key          SSH public key for login proxy or tunnel server
+                                                                                   [string]
   --help                Show help                                                 [boolean]
   --version             Show version number                                       [boolean]
 ```

package/lib/core/AwsS3CloudStorage.d.ts

@@ -1,4 +1,4 @@
-import { CloudStorage } from "../domain/CloudStorage";
+import { CloudStorage } from "./CloudStorage";
 export declare class AwsS3CloudStorage implements CloudStorage {
     private readonly region;
     private readonly bucket;

package/lib/core/AwsS3CloudStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AwsS3CloudStorage.d.ts","sourceRoot":"","sources":["AwsS3CloudStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,qBAAa,iBAAkB,YAAW,YAAY;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAxE,MAAM,EAAE,MAAM,EAAmB,MAAM,EAAE,MAAM,EAAmB,MAAM,EAAE,MAAM;IAEvG,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAahE"}
+{"version":3,"file":"AwsS3CloudStorage.d.ts","sourceRoot":"","sources":["AwsS3CloudStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,qBAAa,iBAAkB,YAAW,YAAY;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAU,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAxE,MAAM,EAAE,MAAM,EAAmB,MAAM,EAAE,MAAM,EAAmB,MAAM,EAAE,MAAM;IAEvG,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAahE"}

package/lib/core/AwsS3CloudStorage.ts

@@ -1,5 +1,5 @@
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import { CloudStorage } from "../domain/CloudStorage";
+import { CloudStorage } from "./CloudStorage";
 
 export class AwsS3CloudStorage implements CloudStorage {
   constructor(private readonly region: string, private readonly bucket: string, private readonly domain: string) {}

package/lib/{domain → core}/Clash.d.ts

@@ -1,6 +1,6 @@
-import { ProxyOptions } from "./TunnelProxyOperations";
+import { ProxyOptions } from "../domain/TunnelProxyOperations";
 export declare type TunnelProxyConnectionInfo = ProxyOptions & {
     address: string;
 };
-export declare function generateConfigFrom(endpoints: TunnelProxyConnectionInfo): string;
+export declare function generateConfigFrom(endpoints: TunnelProxyConnectionInfo, ruleUrl: string): string;
 //# sourceMappingURL=Clash.d.ts.map

package/lib/core/Clash.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Clash.d.ts","sourceRoot":"","sources":["Clash.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,oBAAY,yBAAyB,GAAG,YAAY,GAAG;IACrD,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,yBAAyB,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAwChG"}

package/lib/{domain → core}/Clash.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateConfigFrom = void 0;
 const tslib_1 = require("tslib");
 const yaml_1 = tslib_1.__importDefault(require("yaml"));
-function generateConfigFrom(endpoints) {
+function generateConfigFrom(endpoints, ruleUrl) {
     return yaml_1.default.stringify({
         port: 7890,
         "socks-port": 7891,
@@ -27,7 +27,21 @@ function generateConfigFrom(endpoints) {
                 password: endpoints.password,
             },
         ],
-        rules: ["DOMAIN-SUFFIX,google.com,auto", "DOMAIN,ad.com,REJECT", "GEOIP,CN,DIRECT", "MATCH,auto"],
+        "rule-providers": {
+            domestic: {
+                type: "http",
+                behavior: "domain",
+                path: "./direct_domains.yaml",
+                url: ruleUrl,
+            },
+        },
+        rules: [
+            "RULE-SET,domestic,DIRECT",
+            "DOMAIN-SUFFIX,google.com,auto",
+            "DOMAIN,ad.com,REJECT",
+            "GEOIP,CN,DIRECT",
+            "MATCH,auto",
+        ],
     });
 }
 exports.generateConfigFrom = generateConfigFrom;

package/lib/core/Clash.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Clash.js","sourceRoot":"","sources":["Clash.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAOxB,SAAgB,kBAAkB,CAAC,SAAoC,EAAE,OAAe;IACtF,OAAO,cAAI,CAAC,SAAS,CAAC;QACpB,IAAI,EAAE,IAAI;QACV,YAAY,EAAE,IAAI;QAClB,YAAY,EAAE,IAAI;QAClB,aAAa,EAAE,IAAI;QACnB,YAAY,EAAE,IAAI;QAClB,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE;YACH,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,YAAY;YACpB,eAAe,EAAE,YAAY;YAC7B,UAAU,EAAE,CAAC,WAAW,EAAE,cAAc,EAAE,iBAAiB,EAAE,2BAA2B,CAAC;SAC1F;QACD,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,SAAS,CAAC,OAAO;gBACzB,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,MAAM,EAAE,SAAS,CAAC,mBAAmB;gBACrC,QAAQ,EAAE,SAAS,CAAC,QAAQ;aAC7B;SACF;QACD,gBAAgB,EAAE;YAChB,QAAQ,EAAE;gBACR,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,QAAQ;gBAClB,IAAI,EAAE,uBAAuB;gBAC7B,GAAG,EAAE,OAAO;aACb;SACF;QACD,KAAK,EAAE;YACL,0BAA0B;YAC1B,+BAA+B;YAC/B,sBAAsB;YACtB,iBAAiB;YACjB,YAAY;SACb;KACF,CAAC,CAAC;AACL,CAAC;AAxCD,gDAwCC"}

package/lib/{domain → core}/Clash.ts

@@ -1,11 +1,11 @@
 import yaml from "yaml";
-import { ProxyOptions } from "./TunnelProxyOperations";
+import { ProxyOptions } from "../domain/TunnelProxyOperations";
 
 export type TunnelProxyConnectionInfo = ProxyOptions & {
   address: string;
 };
 
-export function generateConfigFrom(endpoints: TunnelProxyConnectionInfo): string {
+export function generateConfigFrom(endpoints: TunnelProxyConnectionInfo, ruleUrl: string): string {
   return yaml.stringify({
     port: 7890,
     "socks-port": 7891,
@@ -29,6 +29,20 @@ export function generateConfigFrom(endpoints: TunnelProxyConnectionInfo): string
         password: endpoints.password,
       },
     ],
-    rules: ["DOMAIN-SUFFIX,google.com,auto", "DOMAIN,ad.com,REJECT", "GEOIP,CN,DIRECT", "MATCH,auto"],
+    "rule-providers": {
+      domestic: {
+        type: "http",
+        behavior: "domain",
+        path: "./direct_domains.yaml",
+        url: ruleUrl,
+      },
+    },
+    rules: [
+      "RULE-SET,domestic,DIRECT",
+      "DOMAIN-SUFFIX,google.com,auto",
+      "DOMAIN,ad.com,REJECT",
+      "GEOIP,CN,DIRECT",
+      "MATCH,auto",
+    ],
   });
 }

package/lib/core/Terraform.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-export declare type TerraformVariableType = string | number | boolean;
+export declare type TerraformVariableType = string | number | boolean | Record<string, string | number | boolean>;
 declare type ApplyResult = Record<string, TerraformVariableType>;
 export default class Terraform {
     private readonly workdir;

package/lib/core/Terraform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Terraform.d.ts","sourceRoot":"","sources":["Terraform.ts"],"names":[],"mappings":";AAIA,oBAAY,qBAAqB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAC9D,aAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;AAIzD,MAAM,CAAC,OAAO,OAAO,SAAS;IACR,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAU,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAhF,OAAO;IAED,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAMhG,OAAO,CAAC,OAAO;IAMT,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ9B,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;WAIlB,cAAc,CACzB,YAAY,EAAE,MAAM,EACpB,SAAS,GAAE,MAAM,CAAC,UAAe,EACjC,OAAO,GAAE,MAAqB,GAC7B,OAAO,CAAC,SAAS,CAAC;CAQtB"}
+{"version":3,"file":"Terraform.d.ts","sourceRoot":"","sources":["Terraform.ts"],"names":[],"mappings":";AAIA,oBAAY,qBAAqB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;AAC1G,aAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;AAIzD,MAAM,CAAC,OAAO,OAAO,SAAS;IACR,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAU,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAhF,OAAO;IAED,KAAK,CAAC,CAAC,SAAS,WAAW,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAMhG,OAAO,CAAC,OAAO;IAMT,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ9B,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;WAIlB,cAAc,CACzB,YAAY,EAAE,MAAM,EACpB,SAAS,GAAE,MAAM,CAAC,UAAe,EACjC,OAAO,GAAE,MAAqB,GAC7B,OAAO,CAAC,SAAS,CAAC;CAOtB"}

package/lib/core/Terraform.js

@@ -32,7 +32,6 @@ class Terraform {
         return fs.pathExists(path_1.default.join(this.workdir, StateFile));
     }
     static async createInstance(configSource, customEnv = {}, workdir = configSource) {
-        await fs.ensureDir(workdir);
         if (workdir != configSource) {
             await fs.copy(configSource, workdir, { recursive: true, overwrite: true });
         }

package/lib/core/Terraform.js.map

@@ -1 +1 @@
-{"version":3,"file":"Terraform.js","sourceRoot":"","sources":["Terraform.ts"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,wDAAwB;AACxB,uCAAoD;AAIpD,MAAM,SAAS,GAAG,mBAAmB,CAAC;AACtC,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAE7C,MAAqB,SAAS;IAC5B,YAAqC,OAAe,EAAmB,YAA+B,EAAE;QAAnE,YAAO,GAAP,OAAO,CAAQ;QAAmB,cAAS,GAAT,SAAS,CAAwB;IAAG,CAAC;IAE5G,KAAK,CAAC,KAAK,CAAwB,SAAgD;QACjF,MAAM,EAAE,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,SAAS,CAAC,CAAC;QACrE,MAAM,wBAAc,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5F,OAAU,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,iBAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACpG,CAAC;IAEO,OAAO,CAAC,gBAAqB;QACnC,MAAM,MAAM,GAAgB,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACtF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE;YAC/B,OAAO,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YAChD,OAAO;SACR;QACD,MAAM,wBAAc,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAChG,CAAC;IAED,WAAW;QACT,OAAO,EAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc,CACzB,YAAoB,EACpB,YAA+B,EAAE,EACjC,UAAkB,YAAY;QAE9B,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,OAAO,IAAI,YAAY,EAAE;YAC3B,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;SAC5E;QACD,MAAM,wBAAc,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;QACrD,OAAO,IAAI,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;CACF;AAvCD,4BAuCC"}
+{"version":3,"file":"Terraform.js","sourceRoot":"","sources":["Terraform.ts"],"names":[],"mappings":";;;AAAA,qDAA+B;AAC/B,wDAAwB;AACxB,uCAAoD;AAIpD,MAAM,SAAS,GAAG,mBAAmB,CAAC;AACtC,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAE7C,MAAqB,SAAS;IAC5B,YAAqC,OAAe,EAAmB,YAA+B,EAAE;QAAnE,YAAO,GAAP,OAAO,CAAQ;QAAmB,cAAS,GAAT,SAAS,CAAwB;IAAG,CAAC;IAE5G,KAAK,CAAC,KAAK,CAAwB,SAAgD;QACjF,MAAM,EAAE,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,SAAS,CAAC,CAAC;QACrE,MAAM,wBAAc,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5F,OAAU,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,iBAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACpG,CAAC;IAEO,OAAO,CAAC,gBAAqB;QACnC,MAAM,MAAM,GAAgB,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACtF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE;YAC/B,OAAO,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YAChD,OAAO;SACR;QACD,MAAM,wBAAc,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAChG,CAAC;IAED,WAAW;QACT,OAAO,EAAE,CAAC,UAAU,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc,CACzB,YAAoB,EACpB,YAA+B,EAAE,EACjC,UAAkB,YAAY;QAE9B,IAAI,OAAO,IAAI,YAAY,EAAE;YAC3B,MAAM,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;SAC5E;QACD,MAAM,wBAAc,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;QACrD,OAAO,IAAI,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3C,CAAC;CACF;AAtCD,4BAsCC"}

package/lib/core/Terraform.ts

@@ -2,7 +2,7 @@ import * as fs from "fs-extra";
 import path from "path";
 import { execute, executeInherit } from "./process";
 
-export type TerraformVariableType = string | number | boolean;
+export type TerraformVariableType = string | number | boolean | Record<string, string | number | boolean>;
 type ApplyResult = Record<string, TerraformVariableType>;
 const StateFile = "terraform.tfstate";
 const VariableFile = "terraform.tfvars.json";
@@ -39,7 +39,6 @@ export default class Terraform {
     customEnv: NodeJS.ProcessEnv = {},
     workdir: string = configSource
   ): Promise<Terraform> {
-    await fs.ensureDir(workdir);
     if (workdir != configSource) {
       await fs.copy(configSource, workdir, { recursive: true, overwrite: true });
     }

package/lib/core/TerraformTunnelProxyOperations.d.ts

@@ -1,9 +1,9 @@
-import { TunnelProxyCreatingRequest, TunnelProxyCreatingResult, TunnelProxyOperations } from "../domain/TunnelProxyOperations";
+import { ClashConfigUrl, TunnelProxyCreatingRequest, TunnelProxyOperations } from "../domain/TunnelProxyOperations";
 import { Configuration } from "./Configuration";
 export declare class TerraformTunnelProxyOperations implements TunnelProxyOperations {
     private readonly configuration;
     constructor(configuration: Configuration);
-    create(request: TunnelProxyCreatingRequest): Promise<TunnelProxyCreatingResult>;
+    create(request: TunnelProxyCreatingRequest): Promise<ClashConfigUrl>;
     destroy(): Promise<void>;
 }
 //# sourceMappingURL=TerraformTunnelProxyOperations.d.ts.map

package/lib/core/TerraformTunnelProxyOperations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TerraformTunnelProxyOperations.d.ts","sourceRoot":"","sources":["TerraformTunnelProxyOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,EACzB,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAUhD,qBAAa,8BAA+B,YAAW,qBAAqB;IAC9D,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEnD,MAAM,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAuB/E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAU/B"}
+{"version":3,"file":"TerraformTunnelProxyOperations.d.ts","sourceRoot":"","sources":["TerraformTunnelProxyOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AACpH,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAYhD,qBAAa,8BAA+B,YAAW,qBAAqB;IAC9D,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAEnD,MAAM,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,cAAc,CAAC;IAqCpE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAU/B"}

package/lib/core/TerraformTunnelProxyOperations.js

@@ -8,12 +8,17 @@ const netUtils_1 = require("./netUtils");
 const path_1 = tslib_1.__importDefault(require("path"));
 const Terraform_1 = tslib_1.__importDefault(require("./Terraform"));
 const terraformUtils_1 = require("./terraformUtils");
+const analysis_1 = require("./analysis");
+const Clash_1 = require("./Clash");
 const TerraformConfigSource = path_1.default.resolve(__dirname, "..", "..", "terraform");
 class TerraformTunnelProxyOperations {
     constructor(configuration) {
         this.configuration = configuration;
     }
     async create(request) {
+        await fs.ensureDir(this.configuration.terraformWorkspace);
+        const analysisBundlePath = path_1.default.join(this.configuration.terraformWorkspace, "analysis.tar.gz");
+        await analysis_1.createBundle(analysisBundlePath);
         const terraform = await Terraform_1.default.createInstance(TerraformConfigSource, terraformUtils_1.asEnvironmentVariables(this.configuration.credentialsProviders), this.configuration.terraformWorkspace);
         const applyResult = await terraform.apply({
             proxy_region: request.proxyRegion,
@@ -23,12 +28,19 @@ class TerraformTunnelProxyOperations {
             encryption_algorithm: request.encryptionAlgorithm,
             bucket: request.bucket,
             public_key: request.publicKey,
+            analysis: {
+                queue_name: "fanqiang",
+                bundle_path: analysisBundlePath,
+                s3_rules_key: "clash/domain_rules.yaml",
+            },
         });
         await netUtils_1.waitServiceAvailable(request.port, applyResult.tunnel_public_ip);
-        return {
+        const result = {
             address: applyResult.tunnel_public_ip,
             cloudStorage: new AwsS3CloudStorage_1.AwsS3CloudStorage(request.proxyRegion, request.bucket, applyResult.bucket_domain_name),
         };
+        const ruleUrl = await result.cloudStorage.save("clash/domain_rules.yaml", "payload: []");
+        return result.cloudStorage.save("clash/config.yaml", Clash_1.generateConfigFrom(Object.assign(Object.assign({}, request), { address: result.address }), ruleUrl));
     }
     async destroy() {
         const terraform = await Terraform_1.default.createInstance(TerraformConfigSource, terraformUtils_1.asEnvironmentVariables(this.configuration.credentialsProviders), this.configuration.terraformWorkspace);

package/lib/core/TerraformTunnelProxyOperations.js.map

@@ -1 +1 @@
-{"version":3,"file":"TerraformTunnelProxyOperations.js","sourceRoot":"","sources":["TerraformTunnelProxyOperations.ts"],"names":[],"mappings":";;;;AAMA,2DAAwD;AACxD,qDAA+B;AAC/B,yCAAkD;AAClD,wDAAwB;AACxB,oEAAoC;AACpC,qDAA0D;AAE1D,MAAM,qBAAqB,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AAE/E,MAAa,8BAA8B;IACzC,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE7D,KAAK,CAAC,MAAM,CAAC,OAAmC;QAC9C,MAAM,SAAS,GAAG,MAAM,mBAAS,CAAC,cAAc,CAC9C,qBAAqB,EACrB,uCAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,EAC/D,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACtC,CAAC;QAEF,MAAM,WAAW,GAA6D,MAAM,SAAS,CAAC,KAAK,CAAC;YAClG,YAAY,EAAE,OAAO,CAAC,WAAW;YACjC,aAAa,EAAE,OAAO,CAAC,YAAY;YACnC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,oBAAoB,EAAE,OAAO,CAAC,mBAAmB;YACjD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,OAAO,CAAC,SAAS;SAC9B,CAAC,CAAC;QACH,MAAM,+BAAoB,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAC;QACvE,OAAO;YACL,OAAO,EAAE,WAAW,CAAC,gBAAgB;YACrC,YAAY,EAAE,IAAI,qCAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,kBAAkB,CAAC;SACzG,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,SAAS,GAAG,MAAM,mBAAS,CAAC,cAAc,CAC9C,qBAAqB,EACrB,uCAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,EAC/D,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACtC,CAAC;QACF,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;QACvD,MAAM,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvF,CAAC;CACF;AApCD,wEAoCC"}
+{"version":3,"file":"TerraformTunnelProxyOperations.js","sourceRoot":"","sources":["TerraformTunnelProxyOperations.ts"],"names":[],"mappings":";;;;AAEA,2DAAwD;AACxD,qDAA+B;AAC/B,yCAAkD;AAClD,wDAAwB;AACxB,oEAAoC;AACpC,qDAA0D;AAC1D,yCAA0C;AAC1C,mCAA6C;AAE7C,MAAM,qBAAqB,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AAE/E,MAAa,8BAA8B;IACzC,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE7D,KAAK,CAAC,MAAM,CAAC,OAAmC;QAC9C,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;QAC1D,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;QAC/F,MAAM,uBAAY,CAAC,kBAAkB,CAAC,CAAC;QAEvC,MAAM,SAAS,GAAG,MAAM,mBAAS,CAAC,cAAc,CAC9C,qBAAqB,EACrB,uCAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,EAC/D,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACtC,CAAC;QAEF,MAAM,WAAW,GAA6D,MAAM,SAAS,CAAC,KAAK,CAAC;YAClG,YAAY,EAAE,OAAO,CAAC,WAAW;YACjC,aAAa,EAAE,OAAO,CAAC,YAAY;YACnC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,oBAAoB,EAAE,OAAO,CAAC,mBAAmB;YACjD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,UAAU,EAAE,OAAO,CAAC,SAAS;YAC7B,QAAQ,EAAE;gBACR,UAAU,EAAE,UAAU;gBACtB,WAAW,EAAE,kBAAkB;gBAC/B,YAAY,EAAE,yBAAyB;aACxC;SACF,CAAC,CAAC;QACH,MAAM,+BAAoB,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,gBAAgB,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG;YACb,OAAO,EAAE,WAAW,CAAC,gBAAgB;YACrC,YAAY,EAAE,IAAI,qCAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,kBAAkB,CAAC;SACzG,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,yBAAyB,EAAE,aAAa,CAAC,CAAC;QACzF,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAC7B,mBAAmB,EACnB,0BAAkB,iCAAM,OAAO,KAAE,OAAO,EAAE,MAAM,CAAC,OAAO,KAAI,OAAO,CAAC,CACrE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,SAAS,GAAG,MAAM,mBAAS,CAAC,cAAc,CAC9C,qBAAqB,EACrB,uCAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,EAC/D,IAAI,CAAC,aAAa,CAAC,kBAAkB,CACtC,CAAC;QACF,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;QACvD,MAAM,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACvF,CAAC;CACF;AAlDD,wEAkDC"}

package/lib/core/TerraformTunnelProxyOperations.ts

@@ -1,8 +1,4 @@
-import {
-  TunnelProxyCreatingRequest,
-  TunnelProxyCreatingResult,
-  TunnelProxyOperations,
-} from "../domain/TunnelProxyOperations";
+import { ClashConfigUrl, TunnelProxyCreatingRequest, TunnelProxyOperations } from "../domain/TunnelProxyOperations";
 import { Configuration } from "./Configuration";
 import { AwsS3CloudStorage } from "./AwsS3CloudStorage";
 import * as fs from "fs-extra";
@@ -10,13 +6,19 @@ import { waitServiceAvailable } from "./netUtils";
 import path from "path";
 import Terraform from "./Terraform";
 import { asEnvironmentVariables } from "./terraformUtils";
+import { createBundle } from "./analysis";
+import { generateConfigFrom } from "./Clash";
 
 const TerraformConfigSource = path.resolve(__dirname, "..", "..", "terraform");
 
 export class TerraformTunnelProxyOperations implements TunnelProxyOperations {
   constructor(private readonly configuration: Configuration) {}
 
-  async create(request: TunnelProxyCreatingRequest): Promise<TunnelProxyCreatingResult> {
+  async create(request: TunnelProxyCreatingRequest): Promise<ClashConfigUrl> {
+    await fs.ensureDir(this.configuration.terraformWorkspace);
+    const analysisBundlePath = path.join(this.configuration.terraformWorkspace, "analysis.tar.gz");
+    await createBundle(analysisBundlePath);
+
     const terraform = await Terraform.createInstance(
       TerraformConfigSource,
       asEnvironmentVariables(this.configuration.credentialsProviders),
@@ -31,12 +33,22 @@ export class TerraformTunnelProxyOperations implements TunnelProxyOperations {
       encryption_algorithm: request.encryptionAlgorithm,
       bucket: request.bucket,
       public_key: request.publicKey,
+      analysis: {
+        queue_name: "fanqiang",
+        bundle_path: analysisBundlePath,
+        s3_rules_key: "clash/domain_rules.yaml",
+      },
     });
     await waitServiceAvailable(request.port, applyResult.tunnel_public_ip);
-    return {
+    const result = {
       address: applyResult.tunnel_public_ip,
       cloudStorage: new AwsS3CloudStorage(request.proxyRegion, request.bucket, applyResult.bucket_domain_name),
     };
+    const ruleUrl = await result.cloudStorage.save("clash/domain_rules.yaml", "payload: []");
+    return result.cloudStorage.save(
+      "clash/config.yaml",
+      generateConfigFrom({ ...request, address: result.address }, ruleUrl)
+    );
   }
 
   async destroy(): Promise<void> {

package/lib/core/analysis.d.ts

@@ -0,0 +1,2 @@
+export declare function createBundle(bundlePath: string): Promise<void>;
+//# sourceMappingURL=analysis.d.ts.map

package/lib/core/analysis.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"analysis.d.ts","sourceRoot":"","sources":["analysis.ts"],"names":[],"mappings":"AAGA,wBAAsB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQpE"}

package/lib/core/analysis.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createBundle = void 0;
+const tslib_1 = require("tslib");
+const tar = tslib_1.__importStar(require("tar"));
+const path_1 = tslib_1.__importDefault(require("path"));
+async function createBundle(bundlePath) {
+    await tar.create({
+        file: path_1.default.join(bundlePath),
+        gzip: true,
+        cwd: path_1.default.join(__dirname, "..", "..", "analysis"),
+        filter: p => !p.endsWith("tests.py")
+    }, ["."]);
+}
+exports.createBundle = createBundle;
+//# sourceMappingURL=analysis.js.map

package/lib/core/analysis.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"analysis.js","sourceRoot":"","sources":["analysis.ts"],"names":[],"mappings":";;;;AAAA,iDAA2B;AAC3B,wDAAwB;AAEjB,KAAK,UAAU,YAAY,CAAC,UAAkB;IACnD,MAAM,GAAG,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,UAAU,CAAC;QAC3B,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC;QACjD,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;KACrC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;AAEZ,CAAC;AARD,oCAQC"}

package/lib/core/analysis.ts

@@ -0,0 +1,12 @@
+import * as tar from "tar";
+import path from "path";
+
+export async function createBundle(bundlePath: string): Promise<void> {
+  await tar.create({
+    file: path.join(bundlePath),
+    gzip: true,
+    cwd: path.join(__dirname, "..", "..", "analysis"),
+    filter: p => !p.endsWith("tests.py")
+  }, ["."]);
+
+}

package/lib/domain/TunnelProxyOperations.d.ts

@@ -1,6 +1,6 @@
-import { CloudStorage } from "./CloudStorage";
+export declare type ClashConfigUrl = string;
 export interface TunnelProxyOperations {
-    create(request: TunnelProxyCreatingRequest): Promise<TunnelProxyCreatingResult>;
+    create(request: TunnelProxyCreatingRequest): Promise<ClashConfigUrl>;
     destroy(): Promise<void>;
 }
 export declare type TunnelProxyCreatingRequest = ProxyOptions & InfrastructureOptions;
@@ -15,8 +15,4 @@ export declare type ProxyOptions = {
     encryptionAlgorithm: string;
     password: string;
 };
-export declare type TunnelProxyCreatingResult = {
-    address: string;
-    cloudStorage: CloudStorage;
-};
 //# sourceMappingURL=TunnelProxyOperations.d.ts.map

package/lib/domain/TunnelProxyOperations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TunnelProxyOperations.d.ts","sourceRoot":"","sources":["TunnelProxyOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAEhF,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,oBAAY,0BAA0B,GAAG,YAAY,GAAG,qBAAqB,CAAC;AAC9E,oBAAY,qBAAqB,GAAG;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,oBAAY,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,oBAAY,yBAAyB,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAE,CAAC"}
+{"version":3,"file":"TunnelProxyOperations.d.ts","sourceRoot":"","sources":["TunnelProxyOperations.ts"],"names":[],"mappings":"AAAA,oBAAY,cAAc,GAAG,MAAM,CAAC;AACpC,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAErE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,oBAAY,0BAA0B,GAAG,YAAY,GAAG,qBAAqB,CAAC;AAC9E,oBAAY,qBAAqB,GAAG;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,oBAAY,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC"}

package/lib/domain/TunnelProxyOperations.ts

@@ -1,7 +1,6 @@
-import { CloudStorage } from "./CloudStorage";
-
+export type ClashConfigUrl = string;
 export interface TunnelProxyOperations {
-  create(request: TunnelProxyCreatingRequest): Promise<TunnelProxyCreatingResult>;
+  create(request: TunnelProxyCreatingRequest): Promise<ClashConfigUrl>;
 
   destroy(): Promise<void>;
 }
@@ -18,5 +17,3 @@ export type ProxyOptions = {
   encryptionAlgorithm: string;
   password: string;
 };
-
-export type TunnelProxyCreatingResult = { address: string; cloudStorage: CloudStorage };

package/lib/handlers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["handlers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAyB,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,aAAK,0BAA0B,GAAG,MAAM,CAAC,MAAM,oBAAoB,EAAE,MAAM,CAAC,CAAC;AAE7E,wBAAsB,MAAM,CAC1B,qBAAqB,EAAE,qBAAqB,EAC5C,WAAW,CAAC,EAAE,0BAA0B,GACvC,OAAO,CAAC,IAAI,CAAC,CAef;AAED,wBAAsB,OAAO,CAAC,WAAW,CAAC,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAKrF"}
+{"version":3,"file":"handlers.d.ts","sourceRoot":"","sources":["handlers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAyB,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAEvE,aAAK,0BAA0B,GAAG,MAAM,CAAC,MAAM,oBAAoB,EAAE,MAAM,CAAC,CAAC;AAE7E,wBAAsB,MAAM,CAC1B,qBAAqB,EAAE,qBAAqB,EAC5C,WAAW,CAAC,EAAE,0BAA0B,GACvC,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,wBAAsB,OAAO,CAAC,WAAW,CAAC,EAAE,0BAA0B,GAAG,OAAO,CAAC,IAAI,CAAC,CAKrF"}

package/lib/handlers.js

@@ -3,13 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.destroy = exports.create = void 0;
 const Configuration_1 = require("./core/Configuration");
 const crypto_1 = require("crypto");
-const Clash_1 = require("./domain/Clash");
 const Credentials_1 = require("./core/Credentials");
 async function create(infrastructureOptions, credentials) {
     await runCommand(async (configuration) => {
         const request = Object.assign(Object.assign(Object.assign({}, infrastructureOptions), Configuration_1.ProxyDefaults), { password: crypto_1.randomBytes(20).toString("base64") });
-        const result = await configuration.tunnelProxyOperations.create(request);
-        const clashConfigUrl = await result.cloudStorage.save("clash/config.yaml", Clash_1.generateConfigFrom(Object.assign(Object.assign({}, request), { address: result.address })));
+        const clashConfigUrl = await configuration.tunnelProxyOperations.create(request);
         console.log("Saved Clash config to: " + clashConfigUrl);
     }, credentials);
 }

package/lib/handlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"handlers.js","sourceRoot":"","sources":["handlers.ts"],"names":[],"mappings":";;;AAAA,wDAAuF;AACvF,mCAAqC;AACrC,0CAAoD;AACpD,oDAAiF;AAK1E,KAAK,UAAU,MAAM,CAC1B,qBAA4C,EAC5C,WAAwC;IAExC,MAAM,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;QACvC,MAAM,OAAO,iDACR,qBAAqB,GACrB,6BAAa,KAChB,QAAQ,EAAE,oBAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAC7C,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEzE,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,IAAI,CACnD,mBAAmB,EACnB,0BAAkB,iCAAM,OAAO,KAAE,OAAO,EAAE,MAAM,CAAC,OAAO,IAAG,CAC5D,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,yBAAyB,GAAG,cAAc,CAAC,CAAC;IAC1D,CAAC,EAAE,WAAW,CAAC,CAAC;AAClB,CAAC;AAlBD,wBAkBC;AAEM,KAAK,UAAU,OAAO,CAAC,WAAwC;IACpE,MAAM,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;QACvC,MAAM,aAAa,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;QACpD,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC;IACtE,CAAC,EAAE,WAAW,CAAC,CAAC;AAClB,CAAC;AALD,0BAKC;AAED,KAAK,UAAU,UAAU,CACvB,QAAyD,EACzD,WAAwC;IAExC,MAAM,aAAa,GAAG,MAAM,iCAAiB,EAAE,CAAC;IAChD,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,EAAE;QACpB,aAAa,CAAC,oBAAoB,CAAC,GAAG,GAAG,mCAAqB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;KACjF;IACD,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAE;QACvB,aAAa,CAAC,oBAAoB,CAAC,MAAM,GAAG,mCAAqB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;KACvF;IACD,MAAM,QAAQ,CAAC,aAAa,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"handlers.js","sourceRoot":"","sources":["handlers.ts"],"names":[],"mappings":";;;AAAA,wDAAuF;AACvF,mCAAqC;AAErC,oDAAiF;AAK1E,KAAK,UAAU,MAAM,CAC1B,qBAA4C,EAC5C,WAAwC;IAExC,MAAM,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;QACvC,MAAM,OAAO,iDACR,qBAAqB,GACrB,6BAAa,KAChB,QAAQ,EAAE,oBAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAC7C,CAAC;QACF,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACjF,OAAO,CAAC,GAAG,CAAC,yBAAyB,GAAG,cAAc,CAAC,CAAC;IAC1D,CAAC,EAAE,WAAW,CAAC,CAAC;AAClB,CAAC;AAbD,wBAaC;AAEM,KAAK,UAAU,OAAO,CAAC,WAAwC;IACpE,MAAM,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;QACvC,MAAM,aAAa,CAAC,qBAAqB,CAAC,OAAO,EAAE,CAAC;QACpD,OAAO,CAAC,GAAG,CAAC,sDAAsD,CAAC,CAAC;IACtE,CAAC,EAAE,WAAW,CAAC,CAAC;AAClB,CAAC;AALD,0BAKC;AAED,KAAK,UAAU,UAAU,CACvB,QAAyD,EACzD,WAAwC;IAExC,MAAM,aAAa,GAAG,MAAM,iCAAiB,EAAE,CAAC;IAChD,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,EAAE;QACpB,aAAa,CAAC,oBAAoB,CAAC,GAAG,GAAG,mCAAqB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;KACjF;IACD,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAE;QACvB,aAAa,CAAC,oBAAoB,CAAC,MAAM,GAAG,mCAAqB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;KACvF;IACD,MAAM,QAAQ,CAAC,aAAa,CAAC,CAAC;AAChC,CAAC"}

package/lib/handlers.ts

@@ -1,6 +1,6 @@
 import { Configuration, loadConfiguration, ProxyDefaults } from "./core/Configuration";
 import { randomBytes } from "crypto";
-import { generateConfigFrom } from "./domain/Clash";
+
 import { CredentialsProviders, parseCredentialsToken } from "./core/Credentials";
 import { InfrastructureOptions } from "./domain/TunnelProxyOperations";
 
@@ -16,12 +16,7 @@ export async function create(
       ...ProxyDefaults,
       password: randomBytes(20).toString("base64"),
     };
-    const result = await configuration.tunnelProxyOperations.create(request);
-
-    const clashConfigUrl = await result.cloudStorage.save(
-      "clash/config.yaml",
-      generateConfigFrom({ ...request, address: result.address })
-    );
+    const clashConfigUrl = await configuration.tunnelProxyOperations.create(request);
     console.log("Saved Clash config to: " + clashConfigUrl);
   }, credentials);
 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "fanqiang",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "Tunnel Proxy Auto Deployment",
   "bin": "./bin/fanqiang.js",
   "scripts": {
     "clean": "rimraf \"index.{d.ts,js}{,.map}\" \"{lib,bin}/**/*.{d.ts,js}{,.map}\" \"{terraform,test}/**/{terraform.tfvars.json,terraform.tfstate,terraform.tfstate.backup,.terraform}\"",
     "lint": "eslint --ext .ts . && prettier -c .",
-    "lint:fix": "eslint --ext .ts --fix . && prettier --write .",
+    "lint:fix": "eslint --ext .ts --fix . && prettier --write . && yapf -i -r analysis",
     "lint:terraform": "terraform fmt -recursive",
     "test": "mocha --timeout 0 --require espower-typescript/guess \"test/**/*.ts\"",
     "prepare": "husky install",
@@ -38,6 +38,7 @@
     "@types/mocha": "^8.2.3",
     "@types/node": "^14.14.31",
     "@types/promise-retry": "^1.1.3",
+    "@types/tar": "^6.1.0",
     "@types/tmp": "^0.2.1",
     "@types/yargs": "^17.0.2",
     "@typescript-eslint/eslint-plugin": "^4.28.2",
@@ -70,6 +71,7 @@
     "fs-extra": "^10.0.0",
     "lodash": "^4.17.21",
     "promise-retry": "^2.0.1",
+    "tar": "^6.1.0",
     "tslib": "^2.3.0",
     "yaml": "^1.10.2",
     "yargs": "^17.0.1"

package/terraform/main.tf

@@ -25,6 +25,12 @@ module "proxy" {
   password             = var.password
   port                 = var.port
   public_key           = var.public_key
+  analysis = {
+    queue_name = var.analysis.queue_name
+    bundle_url = "http://${aws_s3_bucket.default.bucket_domain_name}/${aws_s3_bucket_object.analysis_bundle.id}"
+    aws_access_key_id = module.analysis.aws_access_key_id
+    aws_secret_access_key = module.analysis.aws_secret_access_key
+  }
 }
 
 module "tunnel" {
@@ -32,6 +38,20 @@ module "tunnel" {
   proxy_port      = var.port
   proxy_public_ip = module.proxy.public_ip
   public_key      = var.public_key
+  analysis = {
+    queue_name = var.analysis.queue_name
+    queue_region = var.proxy_region
+    bundle_url = "http://${aws_s3_bucket.default.bucket_domain_name}/${aws_s3_bucket_object.analysis_bundle.id}"
+    aws_access_key_id = module.analysis.aws_access_key_id
+    aws_secret_access_key = module.analysis.aws_secret_access_key
+    s3_bucket = aws_s3_bucket.default.id
+    s3_rules_key = var.analysis.s3_rules_key
+  }
+}
+
+module "analysis" {
+  source = "./modules/analysis"
+  queue_name = var.analysis.queue_name
 }
 
 resource "aws_s3_bucket" "default" {
@@ -39,3 +59,11 @@ resource "aws_s3_bucket" "default" {
   acl           = "public-read"
   force_destroy = true
 }
+
+resource "aws_s3_bucket_object" "analysis_bundle" {
+  bucket = aws_s3_bucket.default.id
+  key = "bundles/${basename(var.analysis.bundle_path)}"
+  acl = "public-read"
+  force_destroy = true
+  source = var.analysis.bundle_path
+}

package/terraform/modules/analysis/main.tf

@@ -0,0 +1,29 @@
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "3.60.0"
+    }
+  }
+}
+
+resource "aws_sqs_queue" "default" {
+  name = var.queue_name
+  visibility_timeout_seconds = 60
+  receive_wait_time_seconds = 20
+}
+
+resource "aws_iam_user" "default" {
+  name = "fanqiang-analysis"
+  force_destroy = true
+}
+
+resource "aws_iam_user_policy_attachment" "default" {
+  for_each = toset(["AmazonSQSFullAccess", "AmazonS3FullAccess"])
+  user = aws_iam_user.default.name
+  policy_arn = "arn:aws:iam::aws:policy/${each.key}"
+}
+
+resource "aws_iam_access_key" "default" {
+  user = aws_iam_user.default.name
+}

package/terraform/modules/analysis/output.tf

@@ -0,0 +1,9 @@
+output "user" {
+  value = aws_iam_user.default.name
+}
+output "aws_access_key_id" {
+  value = aws_iam_access_key.default.id
+}
+output "aws_secret_access_key" {
+  value = aws_iam_access_key.default.secret
+}

package/terraform/modules/analysis/variables.tf

@@ -0,0 +1,3 @@
+variable "queue_name" {
+  type = string
+}

package/terraform/modules/proxy/cloud-init.tpl

@@ -1,34 +1,41 @@
 PORT=${port}
 ENCRYPTION_ALGORITHM=${encryption_algorithm}
 PASSWORD=${password}
+ANALYSIS_QUEUE_NAME=${analysis_queue_name}
+ANALYSIS_BUNDLE_URL=${analysis_bundle_url}
+export AWS_ACCESS_KEY_ID=${analysis_aws_access_key_id}
+export AWS_SECRET_ACCESS_KEY=${analysis_aws_secret_access_key}
 
-mkdir -p /etc/shadowsocks /var/lib/shadowsocks /var/log/shadowsocks
+
+mkdir -p /etc/shadowsocks /var/lib/shadowsocks /var/log/shadowsocks /var/lib/fanqiang-analysis /var/log/fanqiang-analysis
+export PATH=$PATH:/var/lib/shadowsocks:/var/lib/fanqiang-analysis
 until ping -c1 github.com &>/dev/null ; do sleep 1 ; done
 
 curl --location https://github.com/shadowsocks/shadowsocks-rust/releases/download/v1.11.1/shadowsocks-v1.11.1.x86_64-unknown-linux-gnu.tar.xz \
   | tar --extract --xz --file=- --directory=/var/lib/shadowsocks
 
 cat > /etc/shadowsocks/log4rs.yml <<EOF
-refresh_rate: 30 seconds
 appenders:
-  file:
-    kind: rolling_file
-    path: /var/log/shadowsocks/ssserver.log
+  stdout:
+    kind: console
     encoder:
-      kind: pattern
       pattern: "{l} {M} {m}{n}"
-    policy:
-      trigger:
-        kind: size
-        limit: 10 mb
-      roller:
-        kind: fixed_window
-        pattern: ssserver.{}.log
-        count: 5
+
 root:
   level: debug
   appenders:
-    - file
+    - stdout
 EOF
 
-/var/lib/shadowsocks/ssserver -s "[::]:$PORT" -m "$ENCRYPTION_ALGORITHM" -k "$PASSWORD" -d --log-config /etc/shadowsocks/log4rs.yml
+if [ -n "$ANALYSIS_QUEUE_NAME" ]
+then
+    yum install python3 jq -y
+    curl $ANALYSIS_BUNDLE_URL | tar --extract --gzip --file=- --directory=/var/lib/fanqiang-analysis
+    chmod a+x /var/lib/fanqiang-analysis/collector.py
+    pip3 install -r /var/lib/fanqiang-analysis/requirements.txt
+    ssserver -s "[::]:$PORT" -m "$ENCRYPTION_ALGORITHM" -k "$PASSWORD" --log-config /etc/shadowsocks/log4rs.yml \
+    | collector.py --region=$(jq --raw-output .v1.region /run/cloud-init/instance-data.json) \
+        --queue=$ANALYSIS_QUEUE_NAME &> /var/log/fanqiang-analysis/collector.log &
+else
+    ssserver -s "[::]:$PORT" -m "$ENCRYPTION_ALGORITHM" -k "$PASSWORD" -d
+fi

package/terraform/modules/proxy/main.tf

@@ -14,9 +14,13 @@ resource "aws_lightsail_instance" "default" {
   name              = var.instance_name
   key_pair_name     = var.public_key != null ? aws_lightsail_key_pair.default[0].id : null
   user_data = templatefile("${path.module}/cloud-init.tpl", {
-    port                 = var.port,
-    encryption_algorithm = var.encryption_algorithm,
+    port                 = var.port
+    encryption_algorithm = var.encryption_algorithm
     password             = var.password
+    analysis_queue_name = var.analysis.queue_name
+    analysis_bundle_url = var.analysis.bundle_url
+    analysis_aws_access_key_id = var.analysis.aws_access_key_id
+    analysis_aws_secret_access_key = var.analysis.aws_secret_access_key
   })
 }
 

package/terraform/modules/proxy/variables.tf

@@ -14,3 +14,17 @@ variable "public_key" {
   type    = string
   default = null
 }
+variable "analysis" {
+  type = object({
+    queue_name = string
+    bundle_url = string
+    aws_access_key_id = string
+    aws_secret_access_key = string
+  })
+  default = {
+    queue_name = ""
+    bundle_url = ""
+    aws_access_key_id = ""
+    aws_secret_access_key = ""
+  }
+}

package/terraform/modules/tunnel/cloud-init.tpl

@@ -3,6 +3,14 @@
 PROXY_PORT=${proxy_port}
 PROXY_ADDRESS=${proxy_address}
 ELASTIC_IP_ALLOCATION_ID=${elastic_ip_allocation_id}
+ANALYSIS_QUEUE_NAME=${analysis_queue_name}
+ANALYSIS_QUEUE_REGION=${analysis_queue_region}
+ANALYSIS_BUNDLE_URL=${analysis_bundle_url}
+S3_BUCKET=${s3_bucket}
+S3_RULES_KEY=${s3_rules_key}
+export AWS_ACCESS_KEY_ID=${analysis_aws_access_key_id}
+export AWS_SECRET_ACCESS_KEY=${analysis_aws_secret_access_key}
+
 
 REGION="$(curl --silent http://100.100.100.200/latest/meta-data/region-id)"
 aliyun configure set --region $REGION --mode EcsRamRole \
@@ -13,7 +21,7 @@ aliyun --endpoint "vpc-vpc.$REGION.aliyuncs.com" vpc AssociateEipAddress \
 
 until ping -c1 aliyun.com &>/dev/null ; do sleep 1 ; done
 
-yum install -y nginx nginx-all-modules
+yum install -y nginx nginx-all-modules python3
 
 cat > /etc/nginx/nginx.conf <<EOF
 user nginx;
@@ -36,3 +44,17 @@ stream {
 EOF
 
 systemctl start nginx
+
+if [ -n "$ANALYSIS_QUEUE_NAME" ]
+then
+    mkdir -p /var/lib/fanqiang-analysis /var/log/fanqiang-analysis /root/.config/clash
+    echo "rules: []" > /root/.config/clash/fanqiang.yaml
+    curl "$ANALYSIS_BUNDLE_URL" | tar --extract --gzip --file=- --directory=/var/lib/fanqiang-analysis
+    chmod a+x /var/lib/fanqiang-analysis/analyzer.py
+    pip3 install -r /var/lib/fanqiang-analysis/requirements.txt
+    /var/lib/fanqiang-analysis/analyzer.py \
+        --region="$ANALYSIS_QUEUE_REGION" \
+        --queue="$ANALYSIS_QUEUE_NAME" \
+        --log=DEBUG \
+        "$S3_BUCKET" "$S3_RULES_KEY" &> /var/log/fanqiang-analysis/analyzer.log
+fi

package/terraform/modules/tunnel/main.tf

@@ -63,9 +63,16 @@ resource "alicloud_ecs_launch_template" "default" {
   spot_strategy        = "SpotAsPriceGo"
   ram_role_name        = alicloud_ram_role.default.id
   user_data = base64encode(templatefile("${path.module}/cloud-init.tpl", {
-    proxy_port               = var.proxy_port,
-    proxy_address            = var.proxy_public_ip,
-    elastic_ip_allocation_id = alicloud_eip_address.default.id,
+    proxy_port               = var.proxy_port
+    proxy_address            = var.proxy_public_ip
+    elastic_ip_allocation_id = alicloud_eip_address.default.id
+    analysis_queue_name = var.analysis.queue_name
+    analysis_queue_region = var.analysis.queue_region
+    analysis_bundle_url = var.analysis.bundle_url
+    analysis_aws_access_key_id = var.analysis.aws_access_key_id
+    analysis_aws_secret_access_key = var.analysis.aws_secret_access_key
+    s3_bucket = var.analysis.s3_bucket
+    s3_rules_key = var.analysis.s3_rules_key
   }))
   system_disk {
     category             = "cloud_efficiency"

package/terraform/modules/tunnel/variables.tf

@@ -8,3 +8,23 @@ variable "public_key" {
   type    = string
   default = null
 }
+variable "analysis" {
+  type = object({
+    queue_name = string
+    queue_region = string
+    bundle_url = string
+    aws_access_key_id = string
+    aws_secret_access_key = string
+    s3_bucket = string
+    s3_rules_key = string
+  })
+  default = {
+    queue_name = ""
+    queue_region = ""
+    bundle_url = ""
+    aws_access_key_id = ""
+    aws_secret_access_key = ""
+    s3_bucket = ""
+    s3_rules_key = ""
+  }
+}

package/terraform/variables.tf

@@ -20,3 +20,10 @@ variable "public_key" {
   type    = string
   default = null
 }
+variable "analysis" {
+  type = object({
+    queue_name = string
+    bundle_path = string
+    s3_rules_key = string
+  })
+}

package/lib/domain/Clash.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Clash.d.ts","sourceRoot":"","sources":["Clash.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,oBAAY,yBAAyB,GAAG,YAAY,GAAG;IACrD,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,yBAAyB,GAAG,MAAM,CA0B/E"}

package/lib/domain/Clash.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Clash.js","sourceRoot":"","sources":["Clash.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAOxB,SAAgB,kBAAkB,CAAC,SAAoC;IACrE,OAAO,cAAI,CAAC,SAAS,CAAC;QACpB,IAAI,EAAE,IAAI;QACV,YAAY,EAAE,IAAI;QAClB,YAAY,EAAE,IAAI;QAClB,aAAa,EAAE,IAAI;QACnB,YAAY,EAAE,IAAI;QAClB,IAAI,EAAE,MAAM;QACZ,GAAG,EAAE;YACH,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,YAAY;YACpB,eAAe,EAAE,YAAY;YAC7B,UAAU,EAAE,CAAC,WAAW,EAAE,cAAc,EAAE,iBAAiB,EAAE,2BAA2B,CAAC;SAC1F;QACD,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,SAAS,CAAC,OAAO;gBACzB,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,MAAM,EAAE,SAAS,CAAC,mBAAmB;gBACrC,QAAQ,EAAE,SAAS,CAAC,QAAQ;aAC7B;SACF;QACD,KAAK,EAAE,CAAC,+BAA+B,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,YAAY,CAAC;KAClG,CAAC,CAAC;AACL,CAAC;AA1BD,gDA0BC"}