fanqiang 2.1.0 → 2.3.0

package/README.md

@@ -33,6 +33,8 @@ Options:
                                                  [string] [default: "us-east-1"]
   --tunnel-region  Aliyun region for tunnel deployment
                                                  [string] [default: "cn-shanghai"]
+  --bucket         AWS S3 bucket name, used to store clash client configuration file
+                                                 [string] [default: "fanqiang-$USER"]
   --help           Show help                                           [boolean]
   --version        Show version number                                 [boolean]
 ```
@@ -43,7 +45,7 @@ You need to configure an AWS IAM user on the local machine before running any co
 supports reading AWS credentials from <code>Shared Credentials File</code>:
 
 - The shared credentials file on Linux, Unix, and macOS: ~/.aws/credentials
-- The shared credentials file on Windows: C:\Users\USER_NAME\.aws\credentials
+- The shared credentials file on Windows: C:\Users\USER_NAME\\.aws\credentials
 
 An example of credentials file:
 
@@ -63,7 +65,7 @@ You need to configure an Aliyun RAM user on a local machine if you want to use -
 supports reading credentials from <code>$HOME/.alibabacloud/credentials</code>:
 
 - The credentials file on Linux, Unix, and macOS: ~/.alibabacloud/credentials
-- The credentials file on Windows: C:\Users\USER_NAME\.alibabacloud\credentials
+- The credentials file on Windows: C:\Users\USER_NAME\\.alibabacloud\credentials
 
 An example of credentials file:
 

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;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIhD,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;IAY/E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAI/B"}
+{"version":3,"file":"TerraformTunnelProxyOperations.d.ts","sourceRoot":"","sources":["TerraformTunnelProxyOperations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,EACzB,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAMhD,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;IAoB/E,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAI/B"}

package/lib/core/TerraformTunnelProxyOperations.js

@@ -5,12 +5,23 @@ const tslib_1 = require("tslib");
 const terraform = tslib_1.__importStar(require("./terraform"));
 const AwsS3CloudStorage_1 = require("./AwsS3CloudStorage");
 const fs = tslib_1.__importStar(require("fs-extra"));
+const net = tslib_1.__importStar(require("net"));
+const promise_retry_1 = tslib_1.__importDefault(require("promise-retry"));
 class TerraformTunnelProxyOperations {
     constructor(configuration) {
         this.configuration = configuration;
     }
     async create(request) {
         const applyResult = await terraform.apply(request, this.configuration.terraformWorkspace, this.configuration.aliyun.credentials);
+        await promise_retry_1.default(async (retry) => {
+            try {
+                await checkServiceAvailable(request.port, applyResult.address, 2000);
+            }
+            catch (error) {
+                console.log("Service is not ready, waiting...");
+                retry(error);
+            }
+        });
         return {
             address: applyResult.address,
             cloudStorage: new AwsS3CloudStorage_1.AwsS3CloudStorage(request.proxyRegion, request.bucket, applyResult.bucketDomain),
@@ -22,4 +33,17 @@ class TerraformTunnelProxyOperations {
     }
 }
 exports.TerraformTunnelProxyOperations = TerraformTunnelProxyOperations;
+async function checkServiceAvailable(port, host, timeout) {
+    const socket = net.connect({ port, host, family: 4, timeout });
+    try {
+        await new Promise((resolve, reject) => {
+            socket.once("connect", resolve);
+            socket.once("timeout", () => reject("timeout"));
+            socket.once("error", (err) => reject(err));
+        });
+    }
+    finally {
+        socket.destroy();
+    }
+}
 //# sourceMappingURL=TerraformTunnelProxyOperations.js.map

package/lib/core/TerraformTunnelProxyOperations.js.map

@@ -1 +1 @@
-{"version":3,"file":"TerraformTunnelProxyOperations.js","sourceRoot":"","sources":["TerraformTunnelProxyOperations.ts"],"names":[],"mappings":";;;;AAKA,+DAAyC;AAEzC,2DAAwD;AACxD,qDAA+B;AAE/B,MAAa,8BAA8B;IACzC,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE7D,KAAK,CAAC,MAAM,CAAC,OAAmC;QAC9C,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,KAAK,CACvC,OAAO,EACP,IAAI,CAAC,aAAa,CAAC,kBAAkB,EACrC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CACtC,CAAC;QACF,OAAO;YACL,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,YAAY,EAAE,IAAI,qCAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,YAAY,CAAC;SACnG,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACtG,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;AAnBD,wEAmBC"}
+{"version":3,"file":"TerraformTunnelProxyOperations.js","sourceRoot":"","sources":["TerraformTunnelProxyOperations.ts"],"names":[],"mappings":";;;;AAKA,+DAAyC;AAEzC,2DAAwD;AACxD,qDAA+B;AAC/B,iDAA2B;AAC3B,0EAAyC;AAEzC,MAAa,8BAA8B;IACzC,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE7D,KAAK,CAAC,MAAM,CAAC,OAAmC;QAC9C,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,KAAK,CACvC,OAAO,EACP,IAAI,CAAC,aAAa,CAAC,kBAAkB,EACrC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CACtC,CAAC;QACF,MAAM,uBAAY,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACjC,IAAI;gBACF,MAAM,qBAAqB,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;aACtE;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;gBAChD,KAAK,CAAC,KAAK,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;QACH,OAAO;YACL,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,YAAY,EAAE,IAAI,qCAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,YAAY,CAAC;SACnG,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACtG,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;AA3BD,wEA2BC;AAED,KAAK,UAAU,qBAAqB,CAAC,IAAY,EAAE,IAAY,EAAE,OAAe;IAC9E,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/D,IAAI;QACF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACpC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAChC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;YAChD,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;KACJ;YAAS;QACR,MAAM,CAAC,OAAO,EAAE,CAAC;KAClB;AACH,CAAC"}

package/lib/core/TerraformTunnelProxyOperations.ts

@@ -7,6 +7,8 @@ import * as terraform from "./terraform";
 import { Configuration } from "./Configuration";
 import { AwsS3CloudStorage } from "./AwsS3CloudStorage";
 import * as fs from "fs-extra";
+import * as net from "net";
+import promiseRetry from "promise-retry";
 
 export class TerraformTunnelProxyOperations implements TunnelProxyOperations {
   constructor(private readonly configuration: Configuration) {}
@@ -17,6 +19,14 @@ export class TerraformTunnelProxyOperations implements TunnelProxyOperations {
       this.configuration.terraformWorkspace,
       this.configuration.aliyun.credentials
     );
+    await promiseRetry(async (retry) => {
+      try {
+        await checkServiceAvailable(request.port, applyResult.address, 2000);
+      } catch (error) {
+        console.log("Service is not ready, waiting...");
+        retry(error);
+      }
+    });
     return {
       address: applyResult.address,
       cloudStorage: new AwsS3CloudStorage(request.proxyRegion, request.bucket, applyResult.bucketDomain),
@@ -28,3 +38,16 @@ export class TerraformTunnelProxyOperations implements TunnelProxyOperations {
     await fs.rm(this.configuration.terraformWorkspace, { force: true, recursive: true });
   }
 }
+
+async function checkServiceAvailable(port: number, host: string, timeout: number): Promise<void> {
+  const socket = net.connect({ port, host, family: 4, timeout });
+  try {
+    await new Promise((resolve, reject) => {
+      socket.once("connect", resolve);
+      socket.once("timeout", () => reject("timeout"));
+      socket.once("error", (err) => reject(err));
+    });
+  } finally {
+    socket.destroy();
+  }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"terraform.d.ts","sourceRoot":"","sources":["terraform.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAmC,MAAM,qBAAqB,CAAC;AAEzF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAK7E,wBAAsB,KAAK,CACzB,OAAO,EAAE,0BAA0B,EACnC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC,CAOpD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAM5F"}
+{"version":3,"file":"terraform.d.ts","sourceRoot":"","sources":["terraform.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAmC,MAAM,qBAAqB,CAAC;AAEzF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAM7E,wBAAsB,KAAK,CACzB,OAAO,EAAE,0BAA0B,EACnC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC,CAOpD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAM5F"}

package/lib/core/terraform.js

@@ -8,9 +8,10 @@ const util = tslib_1.__importStar(require("util"));
 const process = tslib_1.__importStar(require("process"));
 const fs = tslib_1.__importStar(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
+const promise_retry_1 = tslib_1.__importDefault(require("promise-retry"));
 async function apply(request, workdir, credentials) {
     await init(request, workdir);
-    await provisioning(["apply", "-auto-approve"], workdir, aliyunCredentials_1.asTerraformEnvironmentVariables(credentials));
+    await provisioningRetry(["apply", "-auto-approve"], workdir, aliyunCredentials_1.asTerraformEnvironmentVariables(credentials));
     return {
         address: await inspecting(["output", "-raw", "address"], workdir),
         bucketDomain: await inspecting(["output", "-raw", "bucket_domain_name"], workdir),
@@ -22,7 +23,7 @@ async function destroy(workdir, credentials) {
         console.log("Tunnel proxy never created, nothing to destroy");
         return;
     }
-    await provisioning(["destroy", "-auto-approve"], workdir, aliyunCredentials_1.asTerraformEnvironmentVariables(credentials));
+    await provisioningRetry(["destroy", "-auto-approve"], workdir, aliyunCredentials_1.asTerraformEnvironmentVariables(credentials));
 }
 exports.destroy = destroy;
 async function init(request, workdir) {
@@ -37,10 +38,20 @@ async function init(request, workdir) {
     });
     if (!(await fs.pathExists(path.join(workdir, ".terraform")))) {
         await fs.copy(path.resolve(__dirname, "..", "..", "terraform"), workdir, { overwrite: true, recursive: true });
-        await provisioning(["init"], workdir);
+        await provisioningRetry(["init"], workdir);
     }
 }
-async function provisioning(args, cwd, customEnv = {}) {
+async function provisioningRetry(args, cwd, customEnv = {}) {
+    await promise_retry_1.default(async (retry) => {
+        try {
+            await provisioning(args, cwd, customEnv);
+        }
+        catch (error) {
+            retry(error);
+        }
+    });
+}
+async function provisioning(args, cwd, customEnv) {
     return new Promise((resolve, reject) => {
         const p = child_process.spawn("terraform", args, { cwd, stdio: "inherit", env: Object.assign(Object.assign({}, process.env), customEnv) });
         p.on("close", (code) => {

package/lib/core/terraform.js.map

@@ -1 +1 @@
-{"version":3,"file":"terraform.js","sourceRoot":"","sources":["terraform.ts"],"names":[],"mappings":";;;;AAAA,qEAA+C;AAC/C,2DAAyF;AACzF,mDAA6B;AAE7B,yDAAmC;AACnC,qDAA+B;AAC/B,mDAA6B;AAEtB,KAAK,UAAU,KAAK,CACzB,OAAmC,EACnC,OAAe,EACf,WAA8B;IAE9B,MAAM,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7B,MAAM,YAAY,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE,OAAO,EAAE,mDAA+B,CAAC,WAAW,CAAC,CAAC,CAAC;IACtG,OAAO;QACL,OAAO,EAAE,MAAM,UAAU,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC;QACjE,YAAY,EAAE,MAAM,UAAU,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,OAAO,CAAC;KAClF,CAAC;AACJ,CAAC;AAXD,sBAWC;AAEM,KAAK,UAAU,OAAO,CAAC,OAAe,EAAE,WAA8B;IAC3E,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE;QACnC,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;QAC9D,OAAO;KACR;IACD,MAAM,YAAY,CAAC,CAAC,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,EAAE,mDAA+B,CAAC,WAAW,CAAC,CAAC,CAAC;AAC1G,CAAC;AAND,0BAMC;AAED,KAAK,UAAU,IAAI,CAAC,OAAmC,EAAE,OAAe;IACtE,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC5B,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,uBAAuB,CAAC,EAAE;QAC9D,YAAY,EAAE,OAAO,CAAC,WAAW;QACjC,aAAa,EAAE,OAAO,CAAC,YAAY;QACnC,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,oBAAoB,EAAE,OAAO,CAAC,mBAAmB;QACjD,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC,CAAC;IACH,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE;QAC5D,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/G,MAAM,YAAY,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;KACvC;AACH,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,IAAc,EAAE,GAAW,EAAE,YAAoC,EAAE;IAC7F,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,kCAAO,OAAO,CAAC,GAAG,GAAK,SAAS,CAAE,EAAE,CAAC,CAAC;QACnH,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,EAAE,CAAC;aACX;iBAAM;gBACL,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;aAC/B;QACH,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAAc,EAAE,GAAW;IACnD,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;AAC3F,CAAC"}
+{"version":3,"file":"terraform.js","sourceRoot":"","sources":["terraform.ts"],"names":[],"mappings":"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"}

package/lib/core/terraform.ts

@@ -5,6 +5,7 @@ import { TunnelProxyCreatingRequest } from "../domain/TunnelProxyOperations";
 import * as process from "process";
 import * as fs from "fs-extra";
 import * as path from "path";
+import promiseRetry from "promise-retry";
 
 export async function apply(
   request: TunnelProxyCreatingRequest,
@@ -12,7 +13,7 @@ export async function apply(
   credentials: AliyunCredentials
 ): Promise<{ address: string; bucketDomain: string }> {
   await init(request, workdir);
-  await provisioning(["apply", "-auto-approve"], workdir, asTerraformEnvironmentVariables(credentials));
+  await provisioningRetry(["apply", "-auto-approve"], workdir, asTerraformEnvironmentVariables(credentials));
   return {
     address: await inspecting(["output", "-raw", "address"], workdir),
     bucketDomain: await inspecting(["output", "-raw", "bucket_domain_name"], workdir),
@@ -24,7 +25,7 @@ export async function destroy(workdir: string, credentials: AliyunCredentials):
     console.log("Tunnel proxy never created, nothing to destroy");
     return;
   }
-  await provisioning(["destroy", "-auto-approve"], workdir, asTerraformEnvironmentVariables(credentials));
+  await provisioningRetry(["destroy", "-auto-approve"], workdir, asTerraformEnvironmentVariables(credentials));
 }
 
 async function init(request: TunnelProxyCreatingRequest, workdir: string): Promise<void> {
@@ -39,11 +40,21 @@ async function init(request: TunnelProxyCreatingRequest, workdir: string): Promi
   });
   if (!(await fs.pathExists(path.join(workdir, ".terraform")))) {
     await fs.copy(path.resolve(__dirname, "..", "..", "terraform"), workdir, { overwrite: true, recursive: true });
-    await provisioning(["init"], workdir);
+    await provisioningRetry(["init"], workdir);
   }
 }
 
-async function provisioning(args: string[], cwd: string, customEnv: Record<string, string> = {}): Promise<void> {
+async function provisioningRetry(args: string[], cwd: string, customEnv: Record<string, string> = {}): Promise<void> {
+  await promiseRetry(async (retry) => {
+    try {
+      await provisioning(args, cwd, customEnv);
+    } catch (error) {
+      retry(error);
+    }
+  });
+}
+
+async function provisioning(args: string[], cwd: string, customEnv: Record<string, string>): Promise<void> {
   return new Promise<void>((resolve, reject) => {
     const p = child_process.spawn("terraform", args, { cwd, stdio: "inherit", env: { ...process.env, ...customEnv } });
     p.on("close", (code) => {

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

@@ -1 +1 @@
-{"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,CAgB/E"}
+{"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

@@ -7,10 +7,19 @@ function generateConfigFrom(endpoints) {
     return yaml_1.default.stringify({
         port: 7890,
         "socks-port": 7891,
-        mode: "global",
+        "redir-port": 7892,
+        "tproxy-port": 7893,
+        "mixed-port": 7890,
+        mode: "rule",
+        dns: {
+            enable: true,
+            listen: "0.0.0.0:53",
+            "enhanced-mode": "redir-host",
+            nameserver: ["223.5.5.5", "119.29.29.29", "114.114.114.114", "tls://dns.rubyfish.cn:853"],
+        },
         proxies: [
             {
-                name: "shadowsocks",
+                name: "auto",
                 type: "ss",
                 server: endpoints.address,
                 port: endpoints.port,
@@ -18,6 +27,7 @@ function generateConfigFrom(endpoints) {
                 password: endpoints.password,
             },
         ],
+        rules: ["DOMAIN-SUFFIX,google.com,auto", "DOMAIN,ad.com,REJECT", "GEOIP,CN,DIRECT", "MATCH,auto"],
     });
 }
 exports.generateConfigFrom = generateConfigFrom;

package/lib/domain/Clash.js.map

@@ -1 +1 @@
-{"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,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,aAAa;gBACnB,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;KACF,CAAC,CAAC;AACL,CAAC;AAhBD,gDAgBC"}
+{"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"}

package/lib/domain/Clash.ts

@@ -9,10 +9,19 @@ export function generateConfigFrom(endpoints: TunnelProxyConnectionInfo): string
   return yaml.stringify({
     port: 7890,
     "socks-port": 7891,
-    mode: "global",
+    "redir-port": 7892,
+    "tproxy-port": 7893,
+    "mixed-port": 7890,
+    mode: "rule",
+    dns: {
+      enable: true,
+      listen: "0.0.0.0:53",
+      "enhanced-mode": "redir-host",
+      nameserver: ["223.5.5.5", "119.29.29.29", "114.114.114.114", "tls://dns.rubyfish.cn:853"],
+    },
     proxies: [
       {
-        name: "shadowsocks",
+        name: "auto",
         type: "ss",
         server: endpoints.address,
         port: endpoints.port,
@@ -20,5 +29,6 @@ export function generateConfigFrom(endpoints: TunnelProxyConnectionInfo): string
         password: endpoints.password,
       },
     ],
+    rules: ["DOMAIN-SUFFIX,google.com,auto", "DOMAIN,ad.com,REJECT", "GEOIP,CN,DIRECT", "MATCH,auto"],
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fanqiang",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "Tunnel Proxy Auto Deployment",
   "bin": "./bin/fanqiang.js",
   "scripts": {
@@ -23,7 +23,7 @@
   "files": [
     "/bin",
     "/lib",
-    "/cloud-init",
+    "/terraform",
     "index.*"
   ],
   "homepage": "https://github.com/zhifanz/fanqiang#readme",
@@ -32,14 +32,11 @@
     "@commitlint/config-conventional": "^12.1.4",
     "@semantic-release/changelog": "^5.0.1",
     "@semantic-release/git": "^9.0.0",
-    "@types/ali-oss": "^6.0.10",
     "@types/fs-extra": "^9.0.12",
     "@types/lodash": "^4.14.171",
     "@types/mocha": "^8.2.3",
-    "@types/netmask": "^1.0.30",
     "@types/node": "^14.14.31",
-    "@types/qs": "^6.9.7",
-    "@types/tmp": "^0.2.1",
+    "@types/promise-retry": "^1.1.3",
     "@types/yargs": "^17.0.2",
     "@typescript-eslint/eslint-plugin": "^4.28.2",
     "@typescript-eslint/parser": "^4.28.2",
@@ -62,18 +59,12 @@
   },
   "dependencies": {
     "@alicloud/credentials": "^2.1.1",
-    "@alicloud/openapi-client": "^0.3.3",
-    "@alicloud/tea-typescript": "^1.7.1",
-    "@aws-sdk/client-iam": "^3.27.0",
-    "@aws-sdk/client-lightsail": "^3.21.0",
     "@aws-sdk/client-s3": "^3.27.0",
-    "ali-oss": "^6.16.0",
+    "@aws-sdk/node-config-provider": "^3.29.0",
     "dotenv": "^10.0.0",
     "fs-extra": "^10.0.0",
     "lodash": "^4.17.21",
-    "netmask": "^2.0.2",
-    "qs": "^6.10.1",
-    "tmp": "^0.2.1",
+    "promise-retry": "^2.0.1",
     "tslib": "^2.3.0",
     "yaml": "^1.10.2",
     "yargs": "^17.0.1"

package/terraform/cloud-init/proxy-init.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+PORT=${port}
+ENCRYPTION_ALGORITHM=${encryption_algorithm}
+PASSWORD=${password}
+
+curl --location -o /tmp/shadowsocks.tar.xz https://github.com/shadowsocks/shadowsocks-rust/releases/download/v1.11.1/shadowsocks-v1.11.1.x86_64-unknown-linux-gnu.tar.xz
+mkdir /var/lib/shadowsocks
+tar -x -f /tmp/shadowsocks.tar.xz -C /var/lib/shadowsocks
+/var/lib/shadowsocks/ssserver -s "[::]:$PORT" -m "$ENCRYPTION_ALGORITHM" -k "$PASSWORD" -d

package/terraform/cloud-init/tunnel-init.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+PROXY_ADDRESS=${proxy_address}
+PROXY_PORT=${proxy_port}
+ELASTIC_IP_ALLOCATION_ID=${elastic_ip_allocation_id}
+REGION=${region}
+RAM_ROLE_NAME=${ram_role_name}
+
+aliyun configure set --region $REGION --mode EcsRamRole --ram-role-name $RAM_ROLE_NAME
+aliyun --endpoint "vpc-vpc.$REGION.aliyuncs.com" vpc UnassociateEipAddress --AllocationId $ELASTIC_IP_ALLOCATION_ID || true
+aliyun --endpoint "vpc-vpc.$REGION.aliyuncs.com" vpc AssociateEipAddress --AllocationId $ELASTIC_IP_ALLOCATION_ID --InstanceId "i-$${HOSTNAME: 2: 20}"
+sleep 5
+
+yum install nginx -y &>> ~/cloud-init.log
+sleep 5
+yum install nginx-all-modules -y &>> ~/cloud-init.log
+
+cat > /etc/nginx/nginx.conf <<EOF
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+include /usr/share/nginx/modules/*.conf;
+
+events {
+  worker_connections 1024;
+}
+
+stream {
+  server {
+    listen $PROXY_PORT;
+    proxy_pass $PROXY_ADDRESS:$PROXY_PORT;
+  }
+}
+EOF
+
+systemctl start nginx

package/terraform/main.tf

@@ -0,0 +1,25 @@
+terraform {
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+      version = "~> 3.0"
+    }
+    alicloud = {
+      source = "aliyun/alicloud"
+      version = "1.134.0"
+    }
+  }
+}
+provider "aws" {
+  region = var.proxy_region
+}
+provider "alicloud" {
+  region = var.tunnel_region
+}
+
+locals {
+  instance_type = "ecs.t5-lc2m1.nano"
+  image_id = "aliyun_2_1903_x64_20G_alibase_20210726.vhd"
+  internet_max_bandwidth_out = 100
+  max_price_per_hour = "0.05"
+}

package/terraform/outputs.tf

@@ -0,0 +1,6 @@
+output "address" {
+  value = alicloud_eip_address.default.ip_address
+}
+output "bucket_domain_name" {
+  value = aws_s3_bucket.default.bucket_domain_name
+}

package/terraform/proxy.tf

@@ -0,0 +1,34 @@
+resource "aws_lightsail_instance" "default" {
+  availability_zone = data.aws_availability_zones.default.names[0]
+  blueprint_id      = "centos_8"
+  bundle_id         = "nano_2_0"
+  name              = "fanqiang"
+  user_data = templatefile("${path.root}/cloud-init/proxy-init.sh", {
+    port                 = var.port,
+    encryption_algorithm = var.encryption_algorithm,
+    password             = var.password
+  })
+}
+
+resource "aws_lightsail_instance_public_ports" "default" {
+  instance_name = aws_lightsail_instance.default.name
+
+  dynamic "port_info" {
+    for_each = [var.port, 22]
+    content {
+      protocol  = "tcp"
+      from_port = port_info.value
+      to_port   = port_info.value
+    }
+  }
+}
+
+resource "aws_s3_bucket" "default" {
+  bucket = var.bucket
+  acl = "public-read"
+  force_destroy = true
+}
+
+data "aws_availability_zones" "default" {
+  state = "available"
+}

package/terraform/tunnel.tf

@@ -0,0 +1,106 @@
+resource "alicloud_vpc" "default" {
+  cidr_block = "192.168.0.0/16"
+}
+
+resource "alicloud_vswitch" "default" {
+  count = length(data.alicloud_zones.default.ids)
+  zone_id = data.alicloud_zones.default.ids[count.index]
+  cidr_block = "192.168.${count.index}.0/24"
+  vpc_id = alicloud_vpc.default.id
+}
+
+resource "alicloud_security_group" "default" {
+  vpc_id = alicloud_vpc.default.id
+}
+
+resource "alicloud_security_group_rule" "default" {
+  for_each = toset([tostring(var.port), "22"])
+  security_group_id = alicloud_security_group.default.id
+  ip_protocol = "tcp"
+  type = "ingress"
+  cidr_ip = "0.0.0.0/0"
+  port_range = "${each.key}/${each.key}"
+}
+
+resource "alicloud_auto_provisioning_group" "default" {
+  launch_template_id = alicloud_ecs_launch_template.default.id
+  total_target_capacity = "1"
+  pay_as_you_go_target_capacity = "0"
+  spot_target_capacity = "1"
+  auto_provisioning_group_type = "maintain"
+  spot_allocation_strategy = "lowest-price"
+  spot_instance_interruption_behavior = "terminate"
+  excess_capacity_termination_policy = "termination"
+  terminate_instances = true
+  dynamic "launch_template_config" {
+    for_each = alicloud_vswitch.default.*.id
+    content {
+      instance_type = local.instance_type
+      max_price = local.max_price_per_hour
+      vswitch_id = launch_template_config.value
+      weighted_capacity = "1"
+    }
+  }
+}
+
+resource "alicloud_ecs_launch_template" "default" {
+  launch_template_name = "fanqiang"
+  image_id = local.image_id
+  instance_charge_type = "PostPaid"
+  instance_type = local.instance_type
+  security_group_id = alicloud_security_group.default.id
+  key_pair_name = length(data.alicloud_ecs_key_pairs.default) > 0 ? data.alicloud_ecs_key_pairs.default.names[0] : null
+  spot_duration = 0
+  spot_strategy = "SpotAsPriceGo"
+  ram_role_name = alicloud_ram_role.default.id
+  user_data = base64encode(templatefile("${path.root}/cloud-init/tunnel-init.sh", {
+    proxy_port = var.port,
+    proxy_address = aws_lightsail_instance.default.public_ip_address,
+    elastic_ip_allocation_id = alicloud_eip_address.default.id,
+    region = var.tunnel_region
+    ram_role_name = alicloud_ram_role.default.id
+  }))
+  system_disk {
+    category = "cloud_efficiency"
+    delete_with_instance = true
+    size = 40
+  }
+}
+
+data "alicloud_ecs_key_pairs" "default" {}
+
+resource "alicloud_ram_role" "default" {
+  name = "FangqiangEcsEipAccessRole"
+  document = <<EOF
+  {
+    "Statement": [
+      {
+        "Action": "sts:AssumeRole",
+        "Effect": "Allow",
+        "Principal": {
+          "Service": [
+            "ecs.aliyuncs.com"
+          ]
+        }
+      }
+    ],
+    "Version": "1"
+  }
+  EOF
+  force = true
+}
+
+resource "alicloud_ram_role_policy_attachment" "default" {
+  policy_name = "AliyunEIPFullAccess"
+  policy_type = "System"
+  role_name = alicloud_ram_role.default.id
+}
+
+resource "alicloud_eip_address" "default" {
+  bandwidth = local.internet_max_bandwidth_out
+  internet_charge_type = "PayByTraffic"
+}
+
+data "alicloud_zones" "default" {}
+
+

package/terraform/variables.tf

@@ -0,0 +1,18 @@
+variable "proxy_region" {
+  type = string
+}
+variable "tunnel_region" {
+  type = string
+}
+variable "port" {
+  type = number
+}
+variable "password" {
+  type = string
+}
+variable "encryption_algorithm" {
+  type = string
+}
+variable "bucket" {
+  type = string
+}