feat: 合并 Provider 接口定义

surgioproject · Oct 27, 2019 · f197e19 · f197e19
1 parent 9f6685b
commit f197e19
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/generate.ts b/lib/generate.ts
@@ -83,7 +83,8 @@ export async function generate(
   assert(template, '必须指定 artifact 的 template 属性');
   assert(artifact.provider, '必须指定 artifact 的 provider 属性');
 
-  const recipeList = artifact.recipe ? artifact.recipe : [artifact.provider];
+  const combineProviders = artifact.combineProviders || [];
+  const providerList = [artifact.provider].concat(combineProviders);
   const nodeList: PossibleNodeConfigType[] = [];
   const nodeNameList: SimpleNodeConfig[] = [];
   let customFilters: ProviderConfig['customFilters'];
@@ -94,7 +95,7 @@ export async function generate(
     config.binPath.vmess = config.binPath.v2ray;
   }
 
-  for (const providerName of recipeList) {
+  for (const providerName of providerList) {
     const filePath = path.resolve(config.providerDir, `${providerName}.js`);
 
     if (!fs.existsSync(filePath)) {
@@ -119,14 +120,15 @@ export async function generate(
       throw err;
     }
 
+    // Filter 仅使用第一个 Provider 中的定义
     if (!netflixFilter) {
       netflixFilter = provider.netflixFilter || defaultNetflixFilter;
     }
     if (!youtubePremiumFilter) {
       youtubePremiumFilter = provider.youtubePremiumFilter || defaultYoutubePremiumFilter;
     }
     if (!customFilters) {
-      customFilters = provider.customFilters;
+      customFilters = provider.customFilters || {};
     }
 
     nodeConfigList.forEach(nodeConfig => {

diff --git a/lib/types.ts b/lib/types.ts
@@ -57,7 +57,7 @@ export interface ArtifactConfig {
   readonly name: string;
   readonly template: string;
   readonly provider: string;
-  readonly recipe?: readonly string[];
+  readonly combineProviders?: ReadonlyArray<string>;
   readonly customParams?: PlainObjectOf<string|boolean|number>;
   readonly proxyGroupModifier?: ProxyGroupModifier;
 }