fix: provider check (#605)

packages/faas-cli-command-core/src/core.ts

@@ -49,7 +49,8 @@ export class CommandHookCore implements ICommandHooksCore {
 
   // 添加插件
   public addPlugin(Plugin: any) {
-    const provider = this.options.provider;
+    const provider =
+      this.options.service?.provider?.name || this.options.provider;
     const coreInstance: ICoreInstance = this.coreInstance;
     let pluginProvider = '';
     // 支持加载npm 或 本地插件（绝对地址）

packages/faas-cli-command-core/test/core.test.ts

@@ -1,5 +1,6 @@
 import { CommandHookCore } from '../src';
 import TestPlugin from './plugins/test.invoke';
+import { PluginTest2 } from './plugins/test-not-provider.invoke';
 import * as assert from 'assert';
 import { join } from 'path';
 import { readFileSync } from 'fs';
@@ -17,6 +18,7 @@ describe('command-core', () => {
       stopLifecycle: 'invoke:one',
     });
     core.addPlugin(TestPlugin);
+    core.addPlugin(PluginTest2);
     await core.ready();
     await core.invoke(['invoke']);
     assert(result && result.length === 3);

packages/faas-cli-command-core/test/fixtures/userLifecycle/test.txt

@@ -1 +1 @@
-1597737411780
+1597752211550

packages/faas-cli-command-core/test/plugins/test-not-provider.invoke.ts

@@ -0,0 +1,25 @@
+import { BasePlugin } from '../../src';
+
+export class PluginTest2 extends BasePlugin {
+  provider = 'test2';
+  hooks = {
+    'before:invoke:one': () => {
+      this.core.cli.log('before:invoke:one');
+    },
+    'invoke:one': async () => {
+      this.core.cli.log('invoke:one');
+    },
+    'after:invoke:one': () => {
+      this.core.cli.log('after:invoke:one');
+    },
+    'before:invoke:two': async () => {
+      this.core.cli.log('before:invoke:two');
+    },
+    'invoke:two': () => {
+      this.core.cli.log('invoke:two');
+    },
+    'after:invoke:two': async () => {
+      this.core.cli.log('after:invoke:two');
+    },
+  };
+}